599 files changed, 34884 insertions, 22011 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 920c975bb6d4..26ca9031ea49 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -58,7 +58,7 @@ obj-$(CONFIG_GAMEPORT)		+= input/gameport/
 obj-$(CONFIG_INPUT)             += input/
 obj-$(CONFIG_I2O)               += message/
 obj-$(CONFIG_RTC_LIB)           += rtc/
-obj-$(CONFIG_I2C)               += i2c/
+obj-y                           += i2c/
 obj-$(CONFIG_W1)                += w1/
 obj-$(CONFIG_HWMON)             += hwmon/
 obj-$(CONFIG_PHONE)             += telephony/
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ae0654cd11ea..ee5759bef945 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -475,7 +475,7 @@ static void acpi_processor_idle(void)
 
 #ifdef CONFIG_GENERIC_TIME
                 /* TSC halts in C2, so notify users */
-                mark_tsc_unstable();
+                mark_tsc_unstable("possible TSC halt in C2");
 #endif
                 /* Re-enable interrupts */
                 local_irq_enable();
@@ -517,7 +517,7 @@ static void acpi_processor_idle(void)
 
 #ifdef CONFIG_GENERIC_TIME
                 /* TSC halts in C3, so notify users */
-                mark_tsc_unstable();
+                mark_tsc_unstable("TSC halts in C3");
 #endif
                 /* Re-enable interrupts */
                 local_irq_enable();
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 2f2e7964226d..c4efc0c17f8f 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -433,49 +433,6 @@ static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
                            PDE(inode)->data);
 }
 
-static ssize_t
-acpi_processor_write_performance(struct file *file,
-                                 const char __user * buffer,
-                                 size_t count, loff_t * data)
-{
-        int result = 0;
-        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = m->private;
-        struct acpi_processor_performance *perf;
-        char state_string[12] = { '\0' };
-        unsigned int new_state = 0;
-        struct cpufreq_policy policy;
-
-
-        if (!pr || (count > sizeof(state_string) - 1))
-                return -EINVAL;
-
-        perf = pr->performance;
-        if (!perf)
-                return -EINVAL;
-
-        if (copy_from_user(state_string, buffer, count))
-                return -EFAULT;
-
-        state_string[count] = '\0';
-        new_state = simple_strtoul(state_string, NULL, 0);
-
-        if (new_state >= perf->state_count)
-                return -EINVAL;
-
-        cpufreq_get_policy(&policy, pr->id);
-
-        policy.cpu = pr->id;
-        policy.min = perf->states[new_state].core_frequency * 1000;
-        policy.max = perf->states[new_state].core_frequency * 1000;
-
-        result = cpufreq_set_policy(&policy);
-        if (result)
-                return result;
-
-        return count;
-}
-
 static void acpi_cpufreq_add_file(struct acpi_processor *pr)
 {
         struct proc_dir_entry *entry = NULL;
@@ -487,10 +444,9 @@ static void acpi_cpufreq_add_file(struct acpi_processor *pr)
 
         /* add file 'performance' [R/W] */
         entry = create_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
-                                  S_IFREG | S_IRUGO | S_IWUSR,
+                                  S_IFREG | S_IRUGO,
                                   acpi_device_dir(device));
         if (entry){
-                acpi_processor_perf_fops.write = acpi_processor_write_performance;
                 entry->proc_fops = &acpi_processor_perf_fops;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 2d912b71e543..dcde9ddd105a 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file,
         state = simple_strtoul(str, NULL, 0);
 #ifdef CONFIG_SOFTWARE_SUSPEND
         if (state == 4) {
-                error = software_suspend();
+                error = pm_suspend(PM_SUSPEND_DISK);
                 goto Done;
         }
 #endif
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 365c306c7cf8..45dbdc14915f 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -550,13 +550,21 @@ config PATA_WINBOND_VLB
 
 config PATA_PLATFORM
         tristate "Generic platform device PATA support"
-        depends on EMBEDDED
+        depends on EMBEDDED || ARCH_RPC
         help
           This option enables support for generic directly connected ATA
           devices commonly found on embedded systems.
 
           If unsure, say N.
 
+config PATA_ICSIDE
+        tristate "Acorn ICS PATA support"
+        depends on ARM && ARCH_ACORN
+        help
+          On Acorn systems, say Y here if you wish to use the ICS PATA
+          interface card.  This is not required for ICS partition support.
+          If you are unsure, say N to this.
+
 config PATA_IXP4XX_CF
         tristate "IXP4XX Compact Flash support"
         depends on ARCH_IXP4XX
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index b7055e302650..6f42a0e2812d 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_PATA_TRIFLEX)	+= pata_triflex.o
 obj-$(CONFIG_PATA_IXP4XX_CF)    += pata_ixp4xx_cf.o
 obj-$(CONFIG_PATA_SCC)          += pata_scc.o
 obj-$(CONFIG_PATA_PLATFORM)     += pata_platform.o
+obj-$(CONFIG_PATA_ICSIDE)       += pata_icside.o
 # Should be last but one libata driver
 obj-$(CONFIG_ATA_GENERIC)       += ata_generic.o
 # Should be last libata driver
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
new file mode 100644
index 000000000000..dbc8ee2adcf0
--- /dev/null
+++ b/drivers/ata/pata_icside.c
@@ -0,0 +1,686 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <scsi/scsi_host.h>
+#include <linux/ata.h>
+#include <linux/libata.h>
+
+#include <asm/dma.h>
+#include <asm/ecard.h>
+
+#define DRV_NAME        "pata_icside"
+
+#define ICS_IDENT_OFFSET                0x2280
+
+#define ICS_ARCIN_V5_INTRSTAT           0x0000
+#define ICS_ARCIN_V5_INTROFFSET         0x0004
+
+#define ICS_ARCIN_V6_INTROFFSET_1       0x2200
+#define ICS_ARCIN_V6_INTRSTAT_1         0x2290
+#define ICS_ARCIN_V6_INTROFFSET_2       0x3200
+#define ICS_ARCIN_V6_INTRSTAT_2         0x3290
+
+struct portinfo {
+        unsigned int dataoffset;
+        unsigned int ctrloffset;
+        unsigned int stepping;
+};
+
+static const struct portinfo pata_icside_portinfo_v5 = {
+        .dataoffset     = 0x2800,
+        .ctrloffset     = 0x2b80,
+        .stepping       = 6,
+};
+
+static const struct portinfo pata_icside_portinfo_v6_1 = {
+        .dataoffset     = 0x2000,
+        .ctrloffset     = 0x2380,
+        .stepping       = 6,
+};
+
+static const struct portinfo pata_icside_portinfo_v6_2 = {
+        .dataoffset     = 0x3000,
+        .ctrloffset     = 0x3380,
+        .stepping       = 6,
+};
+
+#define PATA_ICSIDE_MAX_SG      128
+
+struct pata_icside_state {
+        void __iomem *irq_port;
+        void __iomem *ioc_base;
+        unsigned int type;
+        unsigned int dma;
+        struct {
+                u8 port_sel;
+                u8 disabled;
+                unsigned int speed[ATA_MAX_DEVICES];
+        } port[2];
+        struct scatterlist sg[PATA_ICSIDE_MAX_SG];
+};
+
+#define ICS_TYPE_A3IN   0
+#define ICS_TYPE_A3USER 1
+#define ICS_TYPE_V6     3
+#define ICS_TYPE_V5     15
+#define ICS_TYPE_NOTYPE ((unsigned int)-1)
+
+/* ---------------- Version 5 PCB Support Functions --------------------- */
+/* Prototype: pata_icside_irqenable_arcin_v5 (struct expansion_card *ec, int irqnr)
+ * Purpose  : enable interrupts from card
+ */
+static void pata_icside_irqenable_arcin_v5 (struct expansion_card *ec, int irqnr)
+{
+        struct pata_icside_state *state = ec->irq_data;
+
+        writeb(0, state->irq_port + ICS_ARCIN_V5_INTROFFSET);
+}
+
+/* Prototype: pata_icside_irqdisable_arcin_v5 (struct expansion_card *ec, int irqnr)
+ * Purpose  : disable interrupts from card
+ */
+static void pata_icside_irqdisable_arcin_v5 (struct expansion_card *ec, int irqnr)
+{
+        struct pata_icside_state *state = ec->irq_data;
+
+        readb(state->irq_port + ICS_ARCIN_V5_INTROFFSET);
+}
+
+static const expansioncard_ops_t pata_icside_ops_arcin_v5 = {
+        .irqenable      = pata_icside_irqenable_arcin_v5,
+        .irqdisable     = pata_icside_irqdisable_arcin_v5,
+};
+
+
+/* ---------------- Version 6 PCB Support Functions --------------------- */
+/* Prototype: pata_icside_irqenable_arcin_v6 (struct expansion_card *ec, int irqnr)
+ * Purpose  : enable interrupts from card
+ */
+static void pata_icside_irqenable_arcin_v6 (struct expansion_card *ec, int irqnr)
+{
+        struct pata_icside_state *state = ec->irq_data;
+        void __iomem *base = state->irq_port;
+
+        if (!state->port[0].disabled)
+                writeb(0, base + ICS_ARCIN_V6_INTROFFSET_1);
+        if (!state->port[1].disabled)
+                writeb(0, base + ICS_ARCIN_V6_INTROFFSET_2);
+}
+
+/* Prototype: pata_icside_irqdisable_arcin_v6 (struct expansion_card *ec, int irqnr)
+ * Purpose  : disable interrupts from card
+ */
+static void pata_icside_irqdisable_arcin_v6 (struct expansion_card *ec, int irqnr)
+{
+        struct pata_icside_state *state = ec->irq_data;
+
+        readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_1);
+        readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_2);
+}
+
+/* Prototype: pata_icside_irqprobe(struct expansion_card *ec)
+ * Purpose  : detect an active interrupt from card
+ */
+static int pata_icside_irqpending_arcin_v6(struct expansion_card *ec)
+{
+        struct pata_icside_state *state = ec->irq_data;
+
+        return readb(state->irq_port + ICS_ARCIN_V6_INTRSTAT_1) & 1 ||
+               readb(state->irq_port + ICS_ARCIN_V6_INTRSTAT_2) & 1;
+}
+
+static const expansioncard_ops_t pata_icside_ops_arcin_v6 = {
+        .irqenable      = pata_icside_irqenable_arcin_v6,
+        .irqdisable     = pata_icside_irqdisable_arcin_v6,
+        .irqpending     = pata_icside_irqpending_arcin_v6,
+};
+
+
+/*
+ * SG-DMA support.
+ *
+ * Similar to the BM-DMA, but we use the RiscPCs IOMD DMA controllers.
+ * There is only one DMA controller per card, which means that only
+ * one drive can be accessed at one time.  NOTE! We do not enforce that
+ * here, but we rely on the main IDE driver spotting that both
+ * interfaces use the same IRQ, which should guarantee this.
+ */
+
+/*
+ * Configure the IOMD to give the appropriate timings for the transfer
+ * mode being requested.  We take the advice of the ATA standards, and
+ * calculate the cycle time based on the transfer mode, and the EIDE
+ * MW DMA specs that the drive provides in the IDENTIFY command.
+ *
+ * We have the following IOMD DMA modes to choose from:
+ *
+ *      Type    Active          Recovery        Cycle
+ *      A       250 (250)       312 (550)       562 (800)
+ *      B       187 (200)       250 (550)       437 (750)
+ *      C       125 (125)       125 (375)       250 (500)
+ *      D       62  (50)        125 (375)       187 (425)
+ *
+ * (figures in brackets are actual measured timings on DIOR/DIOW)
+ *
+ * However, we also need to take care of the read/write active and
+ * recovery timings:
+ *
+ *                      Read    Write
+ *      Mode    Active  -- Recovery --  Cycle   IOMD type
+ *      MW0     215     50      215     480     A
+ *      MW1     80      50      50      150     C
+ *      MW2     70      25      25      120     C
+ */
+static void pata_icside_set_dmamode(struct ata_port *ap, struct ata_device *adev)
+{
+        struct pata_icside_state *state = ap->host->private_data;
+        struct ata_timing t;
+        unsigned int cycle;
+        char iomd_type;
+
+        /*
+         * DMA is based on a 16MHz clock
+         */
+        if (ata_timing_compute(adev, adev->dma_mode, &t, 1000, 1))
+                return;
+
+        /*
+         * Choose the IOMD cycle timing which ensure that the interface
+         * satisfies the measured active, recovery and cycle times.
+         */
+        if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425)
+                iomd_type = 'D', cycle = 187;
+        else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500)
+                iomd_type = 'C', cycle = 250;
+        else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750)
+                iomd_type = 'B', cycle = 437;
+        else
+                iomd_type = 'A', cycle = 562;
+
+        ata_dev_printk(adev, KERN_INFO, "timings: act %dns rec %dns cyc %dns (%c)\n",
+                t.active, t.recover, t.cycle, iomd_type);
+
+        state->port[ap->port_no].speed[adev->devno] = cycle;
+}
+
+static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        struct pata_icside_state *state = ap->host->private_data;
+        struct scatterlist *sg, *rsg = state->sg;
+        unsigned int write = qc->tf.flags & ATA_TFLAG_WRITE;
+
+        /*
+         * We are simplex; BUG if we try to fiddle with DMA
+         * while it's active.
+         */
+        BUG_ON(dma_channel_active(state->dma));
+
+        /*
+         * Copy ATAs scattered sg list into a contiguous array of sg
+         */
+        ata_for_each_sg(sg, qc) {
+                memcpy(rsg, sg, sizeof(*sg));
+                rsg++;
+        }
+
+        /*
+         * Route the DMA signals to the correct interface
+         */
+        writeb(state->port[ap->port_no].port_sel, state->ioc_base);
+
+        set_dma_speed(state->dma, state->port[ap->port_no].speed[qc->dev->devno]);
+        set_dma_sg(state->dma, state->sg, rsg - state->sg);
+        set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ);
+
+        /* issue r/w command */
+        ap->ops->exec_command(ap, &qc->tf);
+}
+
+static void pata_icside_bmdma_start(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        struct pata_icside_state *state = ap->host->private_data;
+
+        BUG_ON(dma_channel_active(state->dma));
+        enable_dma(state->dma);
+}
+
+static void pata_icside_bmdma_stop(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        struct pata_icside_state *state = ap->host->private_data;
+
+        disable_dma(state->dma);
+
+        /* see ata_bmdma_stop */
+        ata_altstatus(ap);
+}
+
+static u8 pata_icside_bmdma_status(struct ata_port *ap)
+{
+        struct pata_icside_state *state = ap->host->private_data;
+        void __iomem *irq_port;
+
+        irq_port = state->irq_port + (ap->port_no ? ICS_ARCIN_V6_INTRSTAT_2 :
+                                                    ICS_ARCIN_V6_INTRSTAT_1);
+
+        return readb(irq_port) & 1 ? ATA_DMA_INTR : 0;
+}
+
+static int icside_dma_init(struct ata_probe_ent *ae, struct expansion_card *ec)
+{
+        struct pata_icside_state *state = ae->private_data;
+        int i;
+
+        for (i = 0; i < ATA_MAX_DEVICES; i++) {
+                state->port[0].speed[i] = 480;
+                state->port[1].speed[i] = 480;
+        }
+
+        if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
+                state->dma = ec->dma;
+                ae->mwdma_mask = 0x07;  /* MW0..2 */
+        }
+
+        return 0;
+}
+
+
+static int pata_icside_port_start(struct ata_port *ap)
+{
+        /* No PRD to alloc */
+        return ata_pad_alloc(ap, ap->dev);
+}
+
+static struct scsi_host_template pata_icside_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .ioctl                  = ata_scsi_ioctl,
+        .queuecommand           = ata_scsi_queuecmd,
+        .can_queue              = ATA_DEF_QUEUE,
+        .this_id                = ATA_SHT_THIS_ID,
+        .sg_tablesize           = PATA_ICSIDE_MAX_SG,
+        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
+        .emulated               = ATA_SHT_EMULATED,
+        .use_clustering         = ATA_SHT_USE_CLUSTERING,
+        .proc_name              = DRV_NAME,
+        .dma_boundary           = ~0, /* no dma boundaries */
+        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
+        .bios_param             = ata_std_bios_param,
+};
+
+/* wish this was exported from libata-core */
+static void ata_dummy_noret(struct ata_port *port)
+{
+}
+
+/*
+ * We need to shut down unused ports to prevent spurious interrupts.
+ * FIXME: the libata core doesn't call this function for PATA interfaces.
+ */
+static void pata_icside_port_disable(struct ata_port *ap)
+{
+        struct pata_icside_state *state = ap->host->private_data;
+
+        ata_port_printk(ap, KERN_ERR, "disabling icside port\n");
+
+        ata_port_disable(ap);
+
+        state->port[ap->port_no].disabled = 1;
+
+        if (state->type == ICS_TYPE_V6) {
+                /*
+                 * Disable interrupts from this port, otherwise we
+                 * receive spurious interrupts from the floating
+                 * interrupt line.
+                 */
+                void __iomem *irq_port = state->irq_port +
+                                (ap->port_no ? ICS_ARCIN_V6_INTROFFSET_2 : ICS_ARCIN_V6_INTROFFSET_1);
+                readb(irq_port);
+        }
+}
+
+static u8 pata_icside_irq_ack(struct ata_port *ap, unsigned int chk_drq)
+{
+        unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
+        u8 status;
+
+        status = ata_busy_wait(ap, bits, 1000);
+        if (status & bits)
+                if (ata_msg_err(ap))
+                        printk(KERN_ERR "abnormal status 0x%X\n", status);
+
+        if (ata_msg_intr(ap))
+                printk(KERN_INFO "%s: irq ack: drv_stat 0x%X\n",
+                        __FUNCTION__, status);
+
+        return status;
+}
+
+static struct ata_port_operations pata_icside_port_ops = {
+        .port_disable           = pata_icside_port_disable,
+
+        .set_dmamode            = pata_icside_set_dmamode,
+
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .exec_command           = ata_exec_command,
+        .check_status           = ata_check_status,
+        .dev_select             = ata_std_dev_select,
+
+        .bmdma_setup            = pata_icside_bmdma_setup,
+        .bmdma_start            = pata_icside_bmdma_start,
+
+        .data_xfer              = ata_data_xfer_noirq,
+
+        /* no need to build any PRD tables for DMA */
+        .qc_prep                = ata_noop_qc_prep,
+        .qc_issue               = ata_qc_issue_prot,
+
+        .freeze                 = ata_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+        .error_handler          = ata_bmdma_error_handler,
+        .post_internal_cmd      = pata_icside_bmdma_stop,
+
+        .irq_handler            = ata_interrupt,
+        .irq_clear              = ata_dummy_noret,
+        .irq_on                 = ata_irq_on,
+        .irq_ack                = pata_icside_irq_ack,
+
+        .port_start             = pata_icside_port_start,
+
+        .bmdma_stop             = pata_icside_bmdma_stop,
+        .bmdma_status           = pata_icside_bmdma_status,
+};
+
+static void
+pata_icside_add_port(struct ata_probe_ent *ae, void __iomem *base,
+                     const struct portinfo *info)
+{
+        struct ata_ioports *ioaddr = &ae->port[ae->n_ports++];
+        void __iomem *cmd = base + info->dataoffset;
+
+        ioaddr->cmd_addr        = cmd;
+        ioaddr->data_addr       = cmd + (ATA_REG_DATA    << info->stepping);
+        ioaddr->error_addr      = cmd + (ATA_REG_ERR     << info->stepping);
+        ioaddr->feature_addr    = cmd + (ATA_REG_FEATURE << info->stepping);
+        ioaddr->nsect_addr      = cmd + (ATA_REG_NSECT   << info->stepping);
+        ioaddr->lbal_addr       = cmd + (ATA_REG_LBAL    << info->stepping);
+        ioaddr->lbam_addr       = cmd + (ATA_REG_LBAM    << info->stepping);
+        ioaddr->lbah_addr       = cmd + (ATA_REG_LBAH    << info->stepping);
+        ioaddr->device_addr     = cmd + (ATA_REG_DEVICE  << info->stepping);
+        ioaddr->status_addr     = cmd + (ATA_REG_STATUS  << info->stepping);
+        ioaddr->command_addr    = cmd + (ATA_REG_CMD     << info->stepping);
+
+        ioaddr->ctl_addr        = base + info->ctrloffset;
+        ioaddr->altstatus_addr  = ioaddr->ctl_addr;
+}
+
+static int __init
+pata_icside_register_v5(struct ata_probe_ent *ae, struct expansion_card *ec)
+{
+        struct pata_icside_state *state = ae->private_data;
+        void __iomem *base;
+
+        base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
+                       ecard_resource_len(ec, ECARD_RES_MEMC));
+        if (!base)
+                return -ENOMEM;
+
+        state->irq_port = base;
+
+        ec->irqaddr = base + ICS_ARCIN_V5_INTRSTAT;
+        ec->irqmask = 1;
+        ec->irq_data = state;
+        ec->ops = &pata_icside_ops_arcin_v5;
+
+        /*
+         * Be on the safe side - disable interrupts
+         */
+        ec->ops->irqdisable(ec, ec->irq);
+
+        pata_icside_add_port(ae, base, &pata_icside_portinfo_v5);
+
+        return 0;
+}
+
+static int __init
+pata_icside_register_v6(struct ata_probe_ent *ae, struct expansion_card *ec)
+{
+        struct pata_icside_state *state = ae->private_data;
+        void __iomem *ioc_base, *easi_base;
+        unsigned int sel = 0;
+        int ret;
+
+        ioc_base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
+                           ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        if (!ioc_base) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        easi_base = ioc_base;
+
+        if (ecard_resource_flags(ec, ECARD_RES_EASI)) {
+                easi_base = ioremap(ecard_resource_start(ec, ECARD_RES_EASI),
+                                    ecard_resource_len(ec, ECARD_RES_EASI));
+                if (!easi_base) {
+                        ret = -ENOMEM;
+                        goto unmap_slot;
+                }
+
+                /*
+                 * Enable access to the EASI region.
+                 */
+                sel = 1 << 5;
+        }
+
+        writeb(sel, ioc_base);
+
+        ec->irq_data = state;
+        ec->ops = &pata_icside_ops_arcin_v6;
+
+        state->irq_port = easi_base;
+        state->ioc_base = ioc_base;
+        state->port[0].port_sel = sel;
+        state->port[1].port_sel = sel | 1;
+
+        /*
+         * Be on the safe side - disable interrupts
+         */
+        ec->ops->irqdisable(ec, ec->irq);
+
+        /*
+         * Find and register the interfaces.
+         */
+        pata_icside_add_port(ae, easi_base, &pata_icside_portinfo_v6_1);
+        pata_icside_add_port(ae, easi_base, &pata_icside_portinfo_v6_2);
+
+        /*
+         * FIXME: work around libata's aversion to calling port_disable.
+         * This permanently disables interrupts on port 0 - bad luck if
+         * you have a drive on that port.
+         */
+        state->port[0].disabled = 1;
+
+        return icside_dma_init(ae, ec);
+
+ unmap_slot:
+        iounmap(ioc_base);
+ out:
+        return ret;
+}
+
+static int __devinit
+pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
+{
+        struct pata_icside_state *state;
+        struct ata_probe_ent ae;
+        void __iomem *idmem;
+        int ret;
+
+        ret = ecard_request_resources(ec);
+        if (ret)
+                goto out;
+
+        state = kzalloc(sizeof(struct pata_icside_state), GFP_KERNEL);
+        if (!state) {
+                ret = -ENOMEM;
+                goto release;
+        }
+
+        state->type = ICS_TYPE_NOTYPE;
+        state->dma = NO_DMA;
+
+        idmem = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
+                        ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        if (idmem) {
+                unsigned int type;
+
+                type = readb(idmem + ICS_IDENT_OFFSET) & 1;
+                type |= (readb(idmem + ICS_IDENT_OFFSET + 4) & 1) << 1;
+                type |= (readb(idmem + ICS_IDENT_OFFSET + 8) & 1) << 2;
+                type |= (readb(idmem + ICS_IDENT_OFFSET + 12) & 1) << 3;
+                iounmap(idmem);
+
+                state->type = type;
+        }
+
+        memset(&ae, 0, sizeof(ae));
+        INIT_LIST_HEAD(&ae.node);
+        ae.dev          = &ec->dev;
+        ae.port_ops     = &pata_icside_port_ops;
+        ae.sht          = &pata_icside_sht;
+        ae.pio_mask     = 0x1f;
+        ae.irq          = ec->irq;
+        ae.port_flags   = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
+        ae._host_flags  = ATA_HOST_SIMPLEX;
+        ae.private_data = state;
+
+        switch (state->type) {
+        case ICS_TYPE_A3IN:
+                dev_warn(&ec->dev, "A3IN unsupported\n");
+                ret = -ENODEV;
+                break;
+
+        case ICS_TYPE_A3USER:
+                dev_warn(&ec->dev, "A3USER unsupported\n");
+                ret = -ENODEV;
+                break;
+
+        case ICS_TYPE_V5:
+                ret = pata_icside_register_v5(&ae, ec);
+                break;
+
+        case ICS_TYPE_V6:
+                ret = pata_icside_register_v6(&ae, ec);
+                break;
+
+        default:
+                dev_warn(&ec->dev, "unknown interface type\n");
+                ret = -ENODEV;
+                break;
+        }
+
+        if (ret == 0)
+                ret = ata_device_add(&ae) == 0 ? -ENODEV : 0;
+
+        if (ret == 0)
+                goto out;
+
+        kfree(state);
+ release:
+        ecard_release_resources(ec);
+ out:
+        return ret;
+}
+
+static void pata_icside_shutdown(struct expansion_card *ec)
+{
+        struct ata_host *host = ecard_get_drvdata(ec);
+        unsigned long flags;
+
+        /*
+         * Disable interrupts from this card.  We need to do
+         * this before disabling EASI since we may be accessing
+         * this register via that region.
+         */
+        local_irq_save(flags);
+        if (ec->ops)
+                ec->ops->irqdisable(ec, ec->irq);
+        local_irq_restore(flags);
+
+        /*
+         * Reset the ROM pointer so that we can read the ROM
+         * after a soft reboot.  This also disables access to
+         * the IDE taskfile via the EASI region.
+         */
+        if (host) {
+                struct pata_icside_state *state = host->private_data;
+                if (state->ioc_base)
+                        writeb(0, state->ioc_base);
+        }
+}
+
+static void __devexit pata_icside_remove(struct expansion_card *ec)
+{
+        struct ata_host *host = ecard_get_drvdata(ec);
+        struct pata_icside_state *state = host->private_data;
+
+        ata_host_detach(host);
+
+        pata_icside_shutdown(ec);
+
+        /*
+         * don't NULL out the drvdata - devres/libata wants it
+         * to free the ata_host structure.
+         */
+        ec->ops = NULL;
+        ec->irq_data = NULL;
+
+        if (state->dma != NO_DMA)
+                free_dma(state->dma);
+        if (state->ioc_base)
+                iounmap(state->ioc_base);
+        if (state->ioc_base != state->irq_port)
+                iounmap(state->irq_port);
+
+        kfree(state);
+        ecard_release_resources(ec);
+}
+
+static const struct ecard_id pata_icside_ids[] = {
+        { MANU_ICS,  PROD_ICS_IDE  },
+        { MANU_ICS2, PROD_ICS2_IDE },
+        { 0xffff, 0xffff }
+};
+
+static struct ecard_driver pata_icside_driver = {
+        .probe          = pata_icside_probe,
+        .remove         = __devexit_p(pata_icside_remove),
+        .shutdown       = pata_icside_shutdown,
+        .id_table       = pata_icside_ids,
+        .drv = {
+                .name   = DRV_NAME,
+        },
+};
+
+static int __init pata_icside_init(void)
+{
+        return ecard_register_driver(&pata_icside_driver);
+}
+
+static void __exit pata_icside_exit(void)
+{
+        ecard_remove_driver(&pata_icside_driver);
+}
+
+MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ICS PATA driver");
+
+module_init(pata_icside_init);
+module_exit(pata_icside_exit);
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 8d60c4eb54fe..2ebd07f2ef81 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -6,7 +6,6 @@
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index e9eb7382ac3a..b39ea3f59c9b 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -2,10 +2,10 @@
 
 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 \
-                           dma-mapping.o devres.o \
+                           cpu.o firmware.o init.o map.o devres.o \
                            attribute_container.o transport_class.o
 obj-y                   += power/
+obj-$(CONFIG_HAS_DMA)   += dma-mapping.o dmapool.o
 obj-$(CONFIG_ISA)       += isa.o
 obj-$(CONFIG_FW_LOADER) += firmware_class.o
 obj-$(CONFIG_NUMA)      += node.o
diff --git a/drivers/base/base.h b/drivers/base/base.h
index d597f2659b23..5512d84452f2 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -45,3 +45,5 @@ struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)
 extern char *make_class_name(const char *name, struct kobject *kobj);
 
 extern void devres_release_all(struct device *dev);
+
+extern struct kset devices_subsys;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 1d76e2349654..dca734819e50 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -17,7 +17,7 @@
 #include "power/power.h"
 
 #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)
+#define to_bus(obj) container_of(obj, struct bus_type, subsys.kobj)
 
 /*
  * sysfs bindings for drivers
@@ -123,7 +123,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 {
         int error;
         if (get_bus(bus)) {
-                error = sysfs_create_file(&bus->subsys.kset.kobj, &attr->attr);
+                error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);
                 put_bus(bus);
         } else
                 error = -EINVAL;
@@ -133,7 +133,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)
 {
         if (get_bus(bus)) {
-                sysfs_remove_file(&bus->subsys.kset.kobj, &attr->attr);
+                sysfs_remove_file(&bus->subsys.kobj, &attr->attr);
                 put_bus(bus);
         }
 }
@@ -397,7 +397,7 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)
 static int make_deprecated_bus_links(struct device *dev)
 {
         return sysfs_create_link(&dev->kobj,
-                                 &dev->bus->subsys.kset.kobj, "bus");
+                                 &dev->bus->subsys.kobj, "bus");
 }
 
 static void remove_deprecated_bus_links(struct device *dev)
@@ -431,7 +431,7 @@ int bus_add_device(struct device * dev)
                 if (error)
                         goto out_id;
                 error = sysfs_create_link(&dev->kobj,
-                                &dev->bus->subsys.kset.kobj, "subsystem");
+                                &dev->bus->subsys.kobj, "subsystem");
                 if (error)
                         goto out_subsys;
                 error = make_deprecated_bus_links(dev);
@@ -810,7 +810,7 @@ int bus_register(struct bus_type * bus)
 
         BLOCKING_INIT_NOTIFIER_HEAD(&bus->bus_notifier);
 
-        retval = kobject_set_name(&bus->subsys.kset.kobj, "%s", bus->name);
+        retval = kobject_set_name(&bus->subsys.kobj, "%s", bus->name);
         if (retval)
                 goto out;
 
@@ -820,13 +820,13 @@ int bus_register(struct bus_type * bus)
                 goto out;
 
         kobject_set_name(&bus->devices.kobj, "devices");
-        bus->devices.subsys = &bus->subsys;
+        bus->devices.kobj.parent = &bus->subsys.kobj;
         retval = kset_register(&bus->devices);
         if (retval)
                 goto bus_devices_fail;
 
         kobject_set_name(&bus->drivers.kobj, "drivers");
-        bus->drivers.subsys = &bus->subsys;
+        bus->drivers.kobj.parent = &bus->subsys.kobj;
         bus->drivers.ktype = &ktype_driver;
         retval = kset_register(&bus->drivers);
         if (retval)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 80bbb2074636..20c4ea6eb50d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -19,10 +19,8 @@
 #include <linux/slab.h>
 #include "base.h"
 
-extern struct subsystem devices_subsys;
-
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
-#define to_class(obj) container_of(obj, struct class, subsys.kset.kobj)
+#define to_class(obj) container_of(obj, struct class, subsys.kobj)
 
 static ssize_t
 class_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
@@ -80,7 +78,7 @@ int class_create_file(struct class * cls, const struct class_attribute * attr)
 {
         int error;
         if (cls) {
-                error = sysfs_create_file(&cls->subsys.kset.kobj, &attr->attr);
+                error = sysfs_create_file(&cls->subsys.kobj, &attr->attr);
         } else
                 error = -EINVAL;
         return error;
@@ -89,7 +87,7 @@ int class_create_file(struct class * cls, const struct class_attribute * attr)
 void class_remove_file(struct class * cls, const struct class_attribute * attr)
 {
         if (cls)
-                sysfs_remove_file(&cls->subsys.kset.kobj, &attr->attr);
+                sysfs_remove_file(&cls->subsys.kobj, &attr->attr);
 }
 
 static struct class *class_get(struct class *cls)
@@ -147,7 +145,7 @@ int class_register(struct class * cls)
         INIT_LIST_HEAD(&cls->interfaces);
         kset_init(&cls->class_dirs);
         init_MUTEX(&cls->sem);
-        error = kobject_set_name(&cls->subsys.kset.kobj, "%s", cls->name);
+        error = kobject_set_name(&cls->subsys.kobj, "%s", cls->name);
         if (error)
                 return error;
 
@@ -611,7 +609,7 @@ int class_device_add(struct class_device *class_dev)
         if (parent_class_dev)
                 class_dev->kobj.parent = &parent_class_dev->kobj;
         else
-                class_dev->kobj.parent = &parent_class->subsys.kset.kobj;
+                class_dev->kobj.parent = &parent_class->subsys.kobj;
 
         error = kobject_add(&class_dev->kobj);
         if (error)
@@ -619,7 +617,7 @@ int class_device_add(struct class_device *class_dev)
 
         /* add the needed attributes to this device */
         error = sysfs_create_link(&class_dev->kobj,
-                                  &parent_class->subsys.kset.kobj, "subsystem");
+                                  &parent_class->subsys.kobj, "subsystem");
         if (error)
                 goto out3;
         class_dev->uevent_attr.attr.name = "uevent";
@@ -917,8 +915,8 @@ int __init classes_init(void)
         /* ick, this is ugly, the things we go through to keep from showing up
          * in sysfs... */
         subsystem_init(&class_obj_subsys);
-        if (!class_obj_subsys.kset.subsys)
-                        class_obj_subsys.kset.subsys = &class_obj_subsys;
+        if (!class_obj_subsys.kobj.parent)
+                class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
         return 0;
 }
 
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 8aa090da1cd7..b78fc1e68264 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -252,7 +252,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
         struct kobject *top_kobj;
         struct kset *kset;
         char *envp[32];
-        char data[PAGE_SIZE];
+        char *data = NULL;
         char *pos;
         int i;
         size_t count = 0;
@@ -276,6 +276,10 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
                 if (!kset->uevent_ops->filter(kset, &dev->kobj))
                         goto out;
 
+        data = (char *)get_zeroed_page(GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
         /* let the kset specific function add its keys */
         pos = data;
         retval = kset->uevent_ops->uevent(kset, &dev->kobj,
@@ -290,6 +294,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
                 count += sprintf(pos, "%s\n", envp[i]);
         }
 out:
+        free_page((unsigned long)data);
         return count;
 }
 
@@ -560,7 +565,7 @@ static struct kobject * get_device_parent(struct device *dev,
         /* Set the parent to the class, not the parent device */
         /* this keeps sysfs from having a symlink to make old udevs happy */
         if (dev->class)
-                return &dev->class->subsys.kset.kobj;
+                return &dev->class->subsys.kobj;
         else if (parent)
                 return &parent->kobj;
 
@@ -572,7 +577,7 @@ static struct kobject *virtual_device_parent(struct device *dev)
         static struct kobject *virtual_dir = NULL;
 
         if (!virtual_dir)
-                virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");
+                virtual_dir = kobject_add_dir(&devices_subsys.kobj, "virtual");
 
         return virtual_dir;
 }
@@ -706,12 +711,12 @@ int device_add(struct device *dev)
         }
 
         if (dev->class) {
-                sysfs_create_link(&dev->kobj, &dev->class->subsys.kset.kobj,
+                sysfs_create_link(&dev->kobj, &dev->class->subsys.kobj,
                                   "subsystem");
                 /* If this is not a "fake" compatible device, then create the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_create_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_create_link(&dev->class->subsys.kobj,
                                           &dev->kobj, dev->bus_id);
                 if (parent) {
                         sysfs_create_link(&dev->kobj, &dev->parent->kobj,
@@ -769,8 +774,8 @@ int device_add(struct device *dev)
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 /* If this is not a "fake" compatible device, remove the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kobj,
                                           dev->bus_id);
                 if (parent) {
 #ifdef CONFIG_SYSFS_DEPRECATED
@@ -870,8 +875,8 @@ void device_del(struct device * dev)
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 /* If this is not a "fake" compatible device, remove the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kobj,
                                           dev->bus_id);
                 if (parent) {
 #ifdef CONFIG_SYSFS_DEPRECATED
@@ -1187,9 +1192,9 @@ int device_rename(struct device *dev, char *new_name)
 #endif
 
         if (dev->class) {
-                sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                sysfs_remove_link(&dev->class->subsys.kobj,
                                   old_symlink_name);
-                sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
+                sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
                                   dev->bus_id);
         }
         put_device(dev);
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 18dba8e78da7..92428e55b0c2 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -226,12 +226,10 @@ static int device_probe_drivers(void *data)
  *
  *      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. If the bus specifies
- *      multithreaded probing, walking the list of drivers is done
- *      on a probing thread.
+ *      pair is found, break out and return.
  *
  *      Returns 1 if the device was bound to a driver;
- *      0 if no matching device was found or multithreaded probing is done;
+ *      0 if no matching device was found;
  *      -ENODEV if the device is not registered.
  *
  *      When called for a USB interface, @dev->parent->sem must be held.
@@ -239,7 +237,6 @@ static int device_probe_drivers(void *data)
 int device_attach(struct device * dev)
 {
         int ret = 0;
-        struct task_struct *probe_task = ERR_PTR(-ENOMEM);
 
         down(&dev->sem);
         if (dev->driver) {
@@ -251,12 +248,7 @@ int device_attach(struct device * dev)
                         ret = 0;
                 }
         } else {
-                if (dev->bus->multithread_probe)
-                        probe_task = kthread_run(device_probe_drivers, dev,
-                                                 "probe-%s", dev->bus_id);
-                if(IS_ERR(probe_task))
-                        ret = bus_for_each_drv(dev->bus, NULL, dev,
-                                               __device_attach);
+                ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
         }
         up(&dev->sem);
         return ret;
@@ -383,33 +375,6 @@ void driver_detach(struct device_driver * drv)
         }
 }
 
-#ifdef CONFIG_PCI_MULTITHREAD_PROBE
-static int __init wait_for_probes(void)
-{
-        DEFINE_WAIT(wait);
-
-        printk(KERN_INFO "%s: waiting for %d threads\n", __FUNCTION__,
-                        atomic_read(&probe_count));
-        if (!atomic_read(&probe_count))
-                return 0;
-        while (atomic_read(&probe_count)) {
-                prepare_to_wait(&probe_waitqueue, &wait, TASK_UNINTERRUPTIBLE);
-                if (atomic_read(&probe_count))
-                        schedule();
-        }
-        finish_wait(&probe_waitqueue, &wait);
-        return 0;
-}
-
-core_initcall_sync(wait_for_probes);
-postcore_initcall_sync(wait_for_probes);
-arch_initcall_sync(wait_for_probes);
-subsys_initcall_sync(wait_for_probes);
-fs_initcall_sync(wait_for_probes);
-device_initcall_sync(wait_for_probes);
-late_initcall_sync(wait_for_probes);
-#endif
-
 EXPORT_SYMBOL_GPL(device_bind_driver);
 EXPORT_SYMBOL_GPL(device_release_driver);
 EXPORT_SYMBOL_GPL(device_attach);
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index cb1b98ae0d58..90c862932169 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -17,13 +17,13 @@
 
 static decl_subsys(firmware, NULL, NULL);
 
-int firmware_register(struct subsystem * s)
+int firmware_register(struct kset *s)
 {
-        kset_set_kset_s(s, firmware_subsys);
+        kobj_set_kset_s(s, firmware_subsys);
         return subsystem_register(s);
 }
 
-void firmware_unregister(struct subsystem * s)
+void firmware_unregister(struct kset *s)
 {
         subsystem_unregister(s);
 }
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 30480f6f2af2..17b5ece8f82c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -292,20 +292,22 @@ EXPORT_SYMBOL_GPL(platform_device_add);
  *      @pdev:  platform device we're removing
  *
  *      Note that this function will also release all memory- and port-based
- *      resources owned by the device (@dev->resource).
+ *      resources owned by the device (@dev->resource).  This function
+ *      must _only_ be externally called in error cases.  All other usage
+ *      is a bug.
  */
 void platform_device_del(struct platform_device *pdev)
 {
         int i;
 
         if (pdev) {
+                device_del(&pdev->dev);
+
                 for (i = 0; i < pdev->num_resources; i++) {
                         struct resource *r = &pdev->resource[i];
                         if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
                                 release_resource(r);
                 }
-
-                device_del(&pdev->dev);
         }
 }
 EXPORT_SYMBOL_GPL(platform_device_del);
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index 58b6f77a1b34..a47ee1b70d20 100644
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -16,8 +16,6 @@
 
 #define to_dev(node) container_of(node, struct device, kobj.entry)
 
-extern struct subsystem devices_subsys;
-
 
 /**
  * We handle system devices differently - we suspend and shut them
@@ -36,7 +34,7 @@ void device_shutdown(void)
 {
         struct device * dev, *devn;
 
-        list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list,
+        list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list,
                                 kobj.entry) {
                 if (dev->bus && dev->bus->shutdown) {
                         dev_dbg(dev, "shutdown\n");
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 04e5db445c74..29f1291966c1 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -25,7 +25,7 @@
 
 #include "base.h"
 
-extern struct subsystem devices_subsys;
+extern struct kset devices_subsys;
 
 #define to_sysdev(k) container_of(k, struct sys_device, kobj)
 #define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)
@@ -138,7 +138,7 @@ int sysdev_class_register(struct sysdev_class * cls)
         pr_debug("Registering sysdev class '%s'\n",
                  kobject_name(&cls->kset.kobj));
         INIT_LIST_HEAD(&cls->drivers);
-        cls->kset.subsys = &system_subsys;
+        cls->kset.kobj.parent = &system_subsys.kobj;
         kset_set_kset_s(cls, system_subsys);
         return kset_register(&cls->kset);
 }
@@ -309,7 +309,7 @@ void sysdev_shutdown(void)
         pr_debug("Shutting Down System Devices\n");
 
         down(&sysdev_drivers_lock);
-        list_for_each_entry_reverse(cls, &system_subsys.kset.list,
+        list_for_each_entry_reverse(cls, &system_subsys.list,
                                     kset.kobj.entry) {
                 struct sys_device * sysdev;
 
@@ -384,7 +384,7 @@ int sysdev_suspend(pm_message_t state)
 
         pr_debug("Suspending System Devices\n");
 
-        list_for_each_entry_reverse(cls, &system_subsys.kset.list,
+        list_for_each_entry_reverse(cls, &system_subsys.list,
                                     kset.kobj.entry) {
 
                 pr_debug("Suspending type '%s':\n",
@@ -457,7 +457,7 @@ gbl_driver:
         }
 
         /* resume other classes */
-        list_for_each_entry_continue(cls, &system_subsys.kset.list,
+        list_for_each_entry_continue(cls, &system_subsys.list,
                                         kset.kobj.entry) {
                 list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
                         pr_debug(" %s\n", kobject_name(&err_dev->kobj));
@@ -483,7 +483,7 @@ int sysdev_resume(void)
 
         pr_debug("Resuming System Devices\n");
 
-        list_for_each_entry(cls, &system_subsys.kset.list, kset.kobj.entry) {
+        list_for_each_entry(cls, &system_subsys.list, kset.kobj.entry) {
                 struct sys_device * sysdev;
 
                 pr_debug("Resuming type '%s':\n",
@@ -501,7 +501,7 @@ int sysdev_resume(void)
 
 int __init system_bus_init(void)
 {
-        system_subsys.kset.kobj.parent = &devices_subsys.kset.kobj;
+        system_subsys.kobj.parent = &devices_subsys.kobj;
         return subsystem_register(&system_subsys);
 }
 
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 5d6562171533..27a139025ced 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1480,7 +1480,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 break;
         case FDFMTEND:
                 floppy_off(drive);
-                invalidate_bdev(inode->i_bdev, 0);
+                invalidate_bdev(inode->i_bdev);
                 break;
         case FDGETPRM:
                 memset((void *)&getprm, 0, sizeof (getprm));
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 1a6aeac5a1c3..01fbdd38e3be 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -194,15 +194,15 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
         sl = sl_tail = NULL;
 
         read_lock(&dev_base_lock);
-        for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {
+        for_each_netdev(ifp) {
                 dev_hold(ifp);
                 if (!is_aoe_netif(ifp))
-                        continue;
+                        goto cont;
 
                 skb = new_skb(sizeof *h + sizeof *ch);
                 if (skb == NULL) {
                         printk(KERN_INFO "aoe: skb alloc failure\n");
-                        continue;
+                        goto cont;
                 }
                 skb_put(skb, sizeof *h + sizeof *ch);
                 skb->dev = ifp;
@@ -221,6 +221,8 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
 
                 skb->next = sl;
                 sl = skb;
+cont:
+                dev_put(ifp);
         }
         read_unlock(&dev_base_lock);
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 6b5b64207407..0d4ccd4a0957 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -833,7 +833,7 @@ out_clr:
         lo->lo_backing_file = NULL;
         lo->lo_flags = 0;
         set_capacity(disks[lo->lo_number], 0);
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(mapping, lo->old_gfp_mask);
         lo->lo_state = Lo_unbound;
@@ -917,7 +917,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
         memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
         memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
         memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         set_capacity(disks[lo->lo_number], 0);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(filp->f_mapping, gfp);
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 485aa87e9bcd..43d4ebcb3b44 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -403,7 +403,7 @@ static void __exit rd_cleanup(void)
                 struct block_device *bdev = rd_bdev[i];
                 rd_bdev[i] = NULL;
                 if (bdev) {
-                        invalidate_bdev(bdev, 1);
+                        invalidate_bdev(bdev);
                         blkdev_put(bdev);
                 }
                 del_gendisk(rd_disks[i]);
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 406af579ac3a..b0238b46dded 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -114,10 +114,16 @@ static struct usb_device_id blacklist_ids[] = {
         { USB_DEVICE(0x0a5c, 0x200a), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
         { USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 },
 
+        /* Broadcom BCM2045 */
+        { USB_DEVICE(0x0a5c, 0x2101), .driver_info = HCI_WRONG_SCO_MTU },
+
         /* IBM/Lenovo ThinkPad with Broadcom chip */
         { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU },
         { USB_DEVICE(0x0a5c, 0x2110), .driver_info = HCI_WRONG_SCO_MTU },
 
+        /* Targus ACB10US */
+        { USB_DEVICE(0x0a5c, 0x2100), .driver_info = HCI_RESET },
+
         /* ANYCOM Bluetooth USB-200 and USB-250 */
         { USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET },
 
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b36f44d4d1bf..3625a05bc3d3 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2384,7 +2384,7 @@ static int cdrom_ioctl_reset(struct cdrom_device_info *cdi,
                 return -EACCES;
         if (!CDROM_CAN(CDC_RESET))
                 return -ENOSYS;
-        invalidate_bdev(bdev, 0);
+        invalidate_bdev(bdev);
         return cdi->ops->reset(cdi);
 }
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d0c978fbc204..a26d91743b24 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -905,8 +905,8 @@ config SONYPI
           To compile this driver as a module, choose M here: the
           module will be called sonypi.
 
-config TANBAC_TB0219
-        tristate "TANBAC TB0219 base board support"
+config GPIO_TB0219
+        tristate "TANBAC TB0219 GPIO support"
         depends on TANBAC_TB022X
         select GPIO_VR41XX
 
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index ae8567cc529c..2f56ecc035aa 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -91,7 +91,7 @@ obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)          += nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio.o
 obj-$(CONFIG_GPIO_VR41XX)       += vr41xx_giu.o
-obj-$(CONFIG_TANBAC_TB0219)     += tb0219.o
+obj-$(CONFIG_GPIO_TB0219)       += tb0219.o
 obj-$(CONFIG_TELCLOCK)          += tlclk.o
 
 obj-$(CONFIG_WATCHDOG)          += watchdog/
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index 5b684fddcc03..4941ddb78939 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -145,6 +145,7 @@ static void *m1541_alloc_page(struct agp_bridge_data *bridge)
         void *addr = agp_generic_alloc_page(agp_bridge);
         u32 temp;
 
+        global_flush_tlb();
         if (!addr)
                 return NULL;
 
@@ -160,6 +161,7 @@ static void ali_destroy_page(void * addr)
         if (addr) {
                 global_cache_flush();   /* is this really needed?  --hch */
                 agp_generic_destroy_page(addr);
+                global_flush_tlb();
         }
 }
 
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index b0acf41c0db9..aa8f3a39a704 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -173,7 +173,7 @@ alpha_core_agp_setup(void)
         /*
          * Build a fake pci_dev struct
          */
-        pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        pdev = alloc_pci_dev();
         if (!pdev)
                 return -ENOMEM;
         pdev->vendor = 0xffff;
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 485720486d60..c9f0f250d78f 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -14,6 +14,7 @@
 #include <linux/agp_backend.h>
 #include <linux/mmzone.h>
 #include <asm/page.h>           /* PAGE_SIZE */
+#include <asm/e820.h>
 #include <asm/k8.h>
 #include "agp.h"
 
@@ -259,7 +260,6 @@ static const struct agp_bridge_driver amd_8151_driver = {
 /* Some basic sanity checks for the aperture. */
 static int __devinit aperture_valid(u64 aper, u32 size)
 {
-        u32 pfn, c;
         if (aper == 0) {
                 printk(KERN_ERR PFX "No aperture\n");
                 return 0;
@@ -272,14 +272,9 @@ static int __devinit aperture_valid(u64 aper, u32 size)
                 printk(KERN_ERR PFX "Aperture out of bounds\n");
                 return 0;
         }
-        pfn = aper >> PAGE_SHIFT;
-        for (c = 0; c < size/PAGE_SIZE; c++) {
-                if (!pfn_valid(pfn + c))
-                        break;
-                if (!PageReserved(pfn_to_page(pfn + c))) {
-                        printk(KERN_ERR PFX "Aperture pointing to RAM\n");
-                        return 0;
-                }
+        if (e820_any_mapped(aper, aper + size, E820_RAM)) {
+                printk(KERN_ERR PFX "Aperture pointing to RAM\n");
+                return 0;
         }
 
         /* Request the Aperture. This catches cases when someone else
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f902d71947ba..45aeb917ec63 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -51,28 +51,6 @@ int agp_memory_reserved;
  */
 EXPORT_SYMBOL_GPL(agp_memory_reserved);
 
-#if defined(CONFIG_X86)
-int map_page_into_agp(struct page *page)
-{
-        int i;
-        i = change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
-        /* Caller's responsibility to call global_flush_tlb() for
-         * performance reasons */
-        return i;
-}
-EXPORT_SYMBOL_GPL(map_page_into_agp);
-
-int unmap_page_from_agp(struct page *page)
-{
-        int i;
-        i = change_page_attr(page, 1, PAGE_KERNEL);
-        /* Caller's responsibility to call global_flush_tlb() for
-         * performance reasons */
-        return i;
-}
-EXPORT_SYMBOL_GPL(unmap_page_from_agp);
-#endif
-
 /*
  * Generic routines for handling agp_memory structures -
  * They use the basic page allocation routines to do the brunt of the work.
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 55392a45a14b..9c69f2e761f5 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -186,8 +186,9 @@ static void *i8xx_alloc_pages(void)
                 return NULL;
 
         if (change_page_attr(page, 4, PAGE_KERNEL_NOCACHE) < 0) {
+                change_page_attr(page, 4, PAGE_KERNEL);
                 global_flush_tlb();
-                __free_page(page);
+                __free_pages(page, 2);
                 return NULL;
         }
         global_flush_tlb();
@@ -209,7 +210,7 @@ static void i8xx_destroy_pages(void *addr)
         global_flush_tlb();
         put_page(page);
         unlock_page(page);
-        free_pages((unsigned long)addr, 2);
+        __free_pages(page, 2);
         atomic_dec(&agp_bridge->current_memory_agp);
 }
 
@@ -315,9 +316,6 @@ static struct agp_memory *alloc_agpphysmem_i8xx(size_t pg_count, int type)
         struct agp_memory *new;
         void *addr;
 
-        if (pg_count != 1 && pg_count != 4)
-                return NULL;
-
         switch (pg_count) {
         case 1: addr = agp_bridge->driver->agp_alloc_page(agp_bridge);
                 global_flush_tlb();
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 0c9dab557c94..6cd7373dcdf4 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -320,11 +320,11 @@ static int __devinit agp_nvidia_probe(struct pci_dev *pdev,
         u8 cap_ptr;
 
         nvidia_private.dev_1 =
-                pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1));
+                pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1));
         nvidia_private.dev_2 =
-                pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2));
+                pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2));
         nvidia_private.dev_3 =
-                pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0));
+                pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0));
 
         if (!nvidia_private.dev_1 || !nvidia_private.dev_2 || !nvidia_private.dev_3) {
                 printk(KERN_INFO PFX "Detected an NVIDIA nForce/nForce2 "
@@ -443,6 +443,9 @@ static int __init agp_nvidia_init(void)
 static void __exit agp_nvidia_cleanup(void)
 {
         pci_unregister_driver(&agp_nvidia_pci_driver);
+        pci_dev_put(nvidia_private.dev_1);
+        pci_dev_put(nvidia_private.dev_2);
+        pci_dev_put(nvidia_private.dev_3);
 }
 
 module_init(agp_nvidia_init);
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 3d83b461ccad..f4562cc22343 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -329,7 +329,7 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
         struct agp_bridge_data *bridge;
         int error = 0;
 
-        fake_bridge_dev = kmalloc(sizeof (struct pci_dev), GFP_KERNEL);
+        fake_bridge_dev = alloc_pci_dev();
         if (!fake_bridge_dev) {
                 error = -ENOMEM;
                 goto fail;
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index ee8f50edde1b..cda608c42bea 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -47,9 +47,8 @@ static void *sgi_tioca_alloc_page(struct agp_bridge_data *bridge)
 
         nid = info->ca_closest_node;
         page = alloc_pages_node(nid, GFP_KERNEL, 0);
-        if (page == NULL) {
-                return 0;
-        }
+        if (!page)
+                return NULL;
 
         get_page(page);
         SetPageLocked(page);
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index 125f4282d955..eb1a1c738190 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -143,96 +143,6 @@ static struct agp_bridge_driver sis_driver = {
         .agp_type_to_mask_type  = agp_generic_type_to_mask_type,
 };
 
-static struct agp_device_ids sis_agp_device_ids[] __devinitdata =
-{
-        {
-                .device_id      = PCI_DEVICE_ID_SI_5591_AGP,
-                .chipset_name   = "5591",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_530,
-                .chipset_name   = "530",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_540,
-                .chipset_name   = "540",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_550,
-                .chipset_name   = "550",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_620,
-                .chipset_name   = "620",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_630,
-                .chipset_name   = "630",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_635,
-                .chipset_name   = "635",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_645,
-                .chipset_name   = "645",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_646,
-                .chipset_name   = "646",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_648,
-                .chipset_name   = "648",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_650,
-                .chipset_name   = "650",
-        },
-        {
-                .device_id  = PCI_DEVICE_ID_SI_651,
-                .chipset_name   = "651",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_655,
-                .chipset_name   = "655",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_661,
-                .chipset_name   = "661",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_730,
-                .chipset_name   = "730",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_735,
-                .chipset_name   = "735",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_740,
-                .chipset_name   = "740",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_741,
-                .chipset_name   = "741",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_745,
-                .chipset_name   = "745",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_746,
-                .chipset_name   = "746",
-        },
-        {
-                .device_id      = PCI_DEVICE_ID_SI_760,
-                .chipset_name   = "760",
-        },
-        { }, /* dummy final entry, always present */
-};
-
-
 // chipsets that require the 'delay hack'
 static int sis_broken_chipsets[] __devinitdata = {
         PCI_DEVICE_ID_SI_648,
@@ -269,29 +179,15 @@ static void __devinit sis_get_driver(struct agp_bridge_data *bridge)
 static int __devinit agp_sis_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *ent)
 {
-        struct agp_device_ids *devs = sis_agp_device_ids;
         struct agp_bridge_data *bridge;
         u8 cap_ptr;
-        int j;
 
         cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);
         if (!cap_ptr)
                 return -ENODEV;
 
-        /* probe for known chipsets */
-        for (j = 0; devs[j].chipset_name; j++) {
-                if (pdev->device == devs[j].device_id) {
-                        printk(KERN_INFO PFX "Detected SiS %s chipset\n",
-                                        devs[j].chipset_name);
-                        goto found;
-                }
-        }
-
-        printk(KERN_ERR PFX "Unsupported SiS chipset (device id: %04x)\n",
-                    pdev->device);
-        return -ENODEV;
 
-found:
+        printk(KERN_INFO PFX "Detected SiS chipset - id:%i\n", pdev->device);
         bridge = agp_alloc_bridge();
         if (!bridge)
                 return -ENOMEM;
@@ -320,12 +216,172 @@ static void __devexit agp_sis_remove(struct pci_dev *pdev)
 
 static struct pci_device_id agp_sis_pci_table[] = {
         {
-        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
-        .class_mask     = ~0,
-        .vendor         = PCI_VENDOR_ID_SI,
-        .device         = PCI_ANY_ID,
-        .subvendor      = PCI_ANY_ID,
-        .subdevice      = PCI_ANY_ID,
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_5591_AGP,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_530,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_540,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_620,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_630,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_635,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_645,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_646,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_648,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_651,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_655,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_661,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_730,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_735,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_740,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_741,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_745,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_746,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_760,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
         },
         { }
 };
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 55212a3811fd..551ef25063ef 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -455,15 +455,6 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
         u32 temp, temp2;
         u8 cap_ptr = 0;
 
-        /* Everything is on func 1 here so we are hardcoding function one */
-        bridge_dev = pci_find_slot((unsigned int)pdev->bus->number,
-                        PCI_DEVFN(0, 1));
-        if (!bridge_dev) {
-                printk(KERN_INFO PFX "Detected a Serverworks chipset "
-                       "but could not find the secondary device.\n");
-                return -ENODEV;
-        }
-
         cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);
 
         switch (pdev->device) {
@@ -483,6 +474,15 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
                 return -ENODEV;
         }
 
+        /* Everything is on func 1 here so we are hardcoding function one */
+        bridge_dev = pci_get_bus_and_slot((unsigned int)pdev->bus->number,
+                        PCI_DEVFN(0, 1));
+        if (!bridge_dev) {
+                printk(KERN_INFO PFX "Detected a Serverworks chipset "
+                       "but could not find the secondary device.\n");
+                return -ENODEV;
+        }
+
         serverworks_private.svrwrks_dev = bridge_dev;
         serverworks_private.gart_addr_ofs = 0x10;
 
@@ -515,7 +515,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
 
         bridge->driver = &sworks_driver;
         bridge->dev_private_data = &serverworks_private,
-        bridge->dev = pdev;
+        bridge->dev = pci_dev_get(pdev);
 
         pci_set_drvdata(pdev, bridge);
         return agp_add_bridge(bridge);
@@ -525,8 +525,11 @@ static void __devexit agp_serverworks_remove(struct pci_dev *pdev)
 {
         struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
 
+        pci_dev_put(bridge->dev);
         agp_remove_bridge(bridge);
         agp_put_bridge(bridge);
+        pci_dev_put(serverworks_private.svrwrks_dev);
+        serverworks_private.svrwrks_dev = NULL;
 }
 
 static struct pci_device_id agp_serverworks_pci_table[] = {
diff --git a/drivers/char/drm/README.drm b/drivers/char/drm/README.drm
index 6441e01e587c..af74cd79a279 100644
--- a/drivers/char/drm/README.drm
+++ b/drivers/char/drm/README.drm
@@ -1,6 +1,6 @@
 ************************************************************
 * For the very latest on DRI development, please see:      *
-*     http://dri.sourceforge.net/                          *
+*     http://dri.freedesktop.org/                          *
 ************************************************************
 
 The Direct Rendering Manager (drm) is a device-independent kernel-level
@@ -26,21 +26,19 @@ ways:
 
 
 Documentation on the DRI is available from:
-    http://precisioninsight.com/piinsights.html
+    http://dri.freedesktop.org/wiki/Documentation
+    http://sourceforge.net/project/showfiles.php?group_id=387
+    http://dri.sourceforge.net/doc/
 
 For specific information about kernel-level support, see:
 
     The Direct Rendering Manager, Kernel Support for the Direct Rendering
     Infrastructure
-    http://precisioninsight.com/dr/drm.html
+    http://dri.sourceforge.net/doc/drm_low_level.html
 
     Hardware Locking for the Direct Rendering Infrastructure
-    http://precisioninsight.com/dr/locking.html
+    http://dri.sourceforge.net/doc/hardware_locking_low_level.html
 
     A Security Analysis of the Direct Rendering Infrastructure
-    http://precisioninsight.com/dr/security.html
+    http://dri.sourceforge.net/doc/security_low_level.html
 
-************************************************************
-* For the very latest on DRI development, please see:      *
-*     http://dri.sourceforge.net/                          *
-************************************************************
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 8db9041e306c..089198491f16 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -654,11 +654,13 @@ typedef struct drm_set_version {
 
 /**
  * Device specific ioctls should only be in their respective headers
- * The device specific ioctl range is from 0x40 to 0x79.
+ * The device specific ioctl range is from 0x40 to 0x99.
+ * Generic IOCTLS restart at 0xA0.
  *
  * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and
  * drmCommandReadWrite().
  */
 #define DRM_COMMAND_BASE                0x40
+#define DRM_COMMAND_END                 0xA0
 
 #endif
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 85d99e21e188..80041d5b792d 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -414,6 +414,10 @@ typedef struct drm_lock_data {
         struct file *filp;              /**< File descr of lock holder (0=kernel) */
         wait_queue_head_t lock_queue;   /**< Queue of blocked processes */
         unsigned long lock_time;        /**< Time of last lock in jiffies */
+        spinlock_t spinlock;
+        uint32_t kernel_waiters;
+        uint32_t user_waiters;
+        int idle_has_lock;
 } drm_lock_data_t;
 
 /**
@@ -590,6 +594,8 @@ struct drm_driver {
         void (*reclaim_buffers) (struct drm_device * dev, struct file * filp);
         void (*reclaim_buffers_locked) (struct drm_device *dev,
                                         struct file *filp);
+        void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
+                                        struct file * filp);
         unsigned long (*get_map_ofs) (drm_map_t * map);
         unsigned long (*get_reg_ofs) (struct drm_device * dev);
         void (*set_version) (struct drm_device * dev, drm_set_version_t * sv);
@@ -764,7 +770,7 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev,
 }
 
 #ifdef __alpha__
-#define drm_get_pci_domain(dev) dev->hose->bus->number
+#define drm_get_pci_domain(dev) dev->hose->index
 #else
 #define drm_get_pci_domain(dev) 0
 #endif
@@ -915,9 +921,18 @@ extern int drm_lock(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg);
 extern int drm_unlock(struct inode *inode, struct file *filp,
                       unsigned int cmd, unsigned long arg);
-extern int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context);
-extern int drm_lock_free(drm_device_t * dev,
-                         __volatile__ unsigned int *lock, unsigned int context);
+extern int drm_lock_take(drm_lock_data_t *lock_data, unsigned int context);
+extern int drm_lock_free(drm_lock_data_t *lock_data, unsigned int context);
+extern void drm_idlelock_take(drm_lock_data_t *lock_data);
+extern void drm_idlelock_release(drm_lock_data_t *lock_data);
+
+/*
+ * These are exported to drivers so that they can implement fencing using
+ * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
+ */
+
+extern int drm_i_have_hw_lock(struct file *filp);
+extern int drm_kernel_take_hw_lock(struct file *filp);
 
                                 /* Buffer management support (drm_bufs.h) */
 extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index a6828cc14e58..c11345856ffe 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -57,7 +57,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
         list_for_each(list, &dev->maplist->head) {
                 drm_map_list_t *entry = list_entry(list, drm_map_list_t, head);
                 if (entry->map && map->type == entry->map->type &&
-                    entry->map->offset == map->offset) {
+                    ((entry->map->offset == map->offset) ||
+                     (map->type == _DRM_SHM && map->flags==_DRM_CONTAINS_LOCK))) {
                         return entry;
                 }
         }
@@ -180,8 +181,20 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
                 if (map->type == _DRM_REGISTERS)
                         map->handle = ioremap(map->offset, map->size);
                 break;
-
         case _DRM_SHM:
+                list = drm_find_matching_map(dev, map);
+                if (list != NULL) {
+                        if(list->map->size != map->size) {
+                                DRM_DEBUG("Matching maps of type %d with "
+                                          "mismatched sizes, (%ld vs %ld)\n",
+                                          map->type, map->size, list->map->size);
+                                list->map->size = map->size;
+                        }
+
+                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        *maplist = list;
+                        return 0;
+                }
                 map->handle = vmalloc_user(map->size);
                 DRM_DEBUG("%lu %d %p\n",
                           map->size, drm_order(map->size), map->handle);
@@ -200,15 +213,45 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
                         dev->sigdata.lock = dev->lock.hw_lock = map->handle;    /* Pointer to lock */
                 }
                 break;
-        case _DRM_AGP:
-                if (drm_core_has_AGP(dev)) {
+        case _DRM_AGP: {
+                drm_agp_mem_t *entry;
+                int valid = 0;
+
+                if (!drm_core_has_AGP(dev)) {
+                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        return -EINVAL;
+                }
 #ifdef __alpha__
-                        map->offset += dev->hose->mem_space->start;
+                map->offset += dev->hose->mem_space->start;
 #endif
-                        map->offset += dev->agp->base;
-                        map->mtrr = dev->agp->agp_mtrr; /* for getmap */
+                /* Note: dev->agp->base may actually be 0 when the DRM
+                 * is not in control of AGP space. But if user space is
+                 * it should already have added the AGP base itself.
+                 */
+                map->offset += dev->agp->base;
+                map->mtrr = dev->agp->agp_mtrr; /* for getmap */
+
+                /* This assumes the DRM is in total control of AGP space.
+                 * It's not always the case as AGP can be in the control
+                 * of user space (i.e. i810 driver). So this loop will get
+                 * skipped and we double check that dev->agp->memory is
+                 * actually set as well as being invalid before EPERM'ing
+                 */
+                for (entry = dev->agp->memory; entry; entry = entry->next) {
+                        if ((map->offset >= entry->bound) &&
+                            (map->offset + map->size <= entry->bound + entry->pages * PAGE_SIZE)) {
+                                valid = 1;
+                                break;
+                        }
                 }
+                if (dev->agp->memory && !valid) {
+                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        return -EPERM;
+                }
+                DRM_DEBUG("AGP offset = 0x%08lx, size = 0x%08lx\n", map->offset, map->size);
+
                 break;
+        }
         case _DRM_SCATTER_GATHER:
                 if (!dev->sg) {
                         drm_free(map, sizeof(*map), DRM_MEM_MAPS);
@@ -267,7 +310,7 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
 
         *maplist = list;
         return 0;
-}
+        }
 
 int drm_addmap(drm_device_t * dev, unsigned int offset,
                unsigned int size, drm_map_type_t type,
@@ -519,6 +562,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
 {
         drm_device_dma_t *dma = dev->dma;
         drm_buf_entry_t *entry;
+        drm_agp_mem_t *agp_entry;
         drm_buf_t *buf;
         unsigned long offset;
         unsigned long agp_offset;
@@ -529,7 +573,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         int page_order;
         int total;
         int byte_count;
-        int i;
+        int i, valid;
         drm_buf_t **temp_buflist;
 
         if (!dma)
@@ -560,6 +604,19 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         if (dev->queue_count)
                 return -EBUSY;  /* Not while in use */
 
+        /* Make sure buffers are located in AGP memory that we own */
+        valid = 0;
+        for (agp_entry = dev->agp->memory; agp_entry; agp_entry = agp_entry->next) {
+                if ((agp_offset >= agp_entry->bound) &&
+                    (agp_offset + total * count <= agp_entry->bound + agp_entry->pages * PAGE_SIZE)) {
+                        valid = 1;
+                        break;
+                }
+        }
+        if (dev->agp->memory && !valid) {
+                DRM_DEBUG("zone invalid\n");
+                return -EINVAL;
+        }
         spin_lock(&dev->count_lock);
         if (dev->buf_use) {
                 spin_unlock(&dev->count_lock);
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index f5b9b2480c14..26bec30ee86e 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -496,11 +496,14 @@ int drm_ioctl(struct inode *inode, struct file *filp,
                   (long)old_encode_dev(priv->head->device),
                   priv->authenticated);
 
-        if (nr < DRIVER_IOCTL_COUNT)
-                ioctl = &drm_ioctls[nr];
-        else if ((nr >= DRM_COMMAND_BASE)
+        if ((nr >= DRIVER_IOCTL_COUNT) &&
+            ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
+                goto err_i1;
+        if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
                  && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
                 ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
+        else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))
+                ioctl = &drm_ioctls[nr];
         else
                 goto err_i1;
 
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 898f47dafec0..3b159cab3bc8 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -46,6 +46,7 @@ static int drm_setup(drm_device_t * dev)
         drm_local_map_t *map;
         int i;
         int ret;
+        u32 sareapage;
 
         if (dev->driver->firstopen) {
                 ret = dev->driver->firstopen(dev);
@@ -56,7 +57,8 @@ static int drm_setup(drm_device_t * dev)
         dev->magicfree.next = NULL;
 
         /* prebuild the SAREA */
-        i = drm_addmap(dev, 0, SAREA_MAX, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
+        sareapage = max_t(unsigned, SAREA_MAX, PAGE_SIZE);
+        i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
         if (i != 0)
                 return i;
 
@@ -84,7 +86,7 @@ static int drm_setup(drm_device_t * dev)
         INIT_LIST_HEAD(&dev->ctxlist->head);
 
         dev->vmalist = NULL;
-        dev->sigdata.lock = dev->lock.hw_lock = NULL;
+        dev->sigdata.lock = NULL;
         init_waitqueue_head(&dev->lock.lock_queue);
         dev->queue_count = 0;
         dev->queue_reserved = 0;
@@ -354,58 +356,56 @@ int drm_release(struct inode *inode, struct file *filp)
                   current->pid, (long)old_encode_dev(priv->head->device),
                   dev->open_count);
 
-        if (priv->lock_count && dev->lock.hw_lock &&
-            _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
-            dev->lock.filp == filp) {
-                DRM_DEBUG("File %p released, freeing lock for context %d\n",
-                          filp, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
-
-                if (dev->driver->reclaim_buffers_locked)
+        if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) {
+                if (drm_i_have_hw_lock(filp)) {
                         dev->driver->reclaim_buffers_locked(dev, filp);
-
-                drm_lock_free(dev, &dev->lock.hw_lock->lock,
-                              _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
-
-                /* FIXME: may require heavy-handed reset of
-                   hardware at this point, possibly
-                   processed via a callback to the X
-                   server. */
-        } else if (dev->driver->reclaim_buffers_locked && priv->lock_count
-                   && dev->lock.hw_lock) {
-                /* The lock is required to reclaim buffers */
-                DECLARE_WAITQUEUE(entry, current);
-
-                add_wait_queue(&dev->lock.lock_queue, &entry);
-                for (;;) {
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                        if (!dev->lock.hw_lock) {
-                                /* Device has been unregistered */
-                                retcode = -EINTR;
-                                break;
+                } else {
+                        unsigned long _end=jiffies + 3*DRM_HZ;
+                        int locked = 0;
+
+                        drm_idlelock_take(&dev->lock);
+
+                        /*
+                         * Wait for a while.
+                         */
+
+                        do{
+                                spin_lock(&dev->lock.spinlock);
+                                locked = dev->lock.idle_has_lock;
+                                spin_unlock(&dev->lock.spinlock);
+                                if (locked)
+                                        break;
+                                schedule();
+                        } while (!time_after_eq(jiffies, _end));
+
+                        if (!locked) {
+                                DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
+                                          "\tdriver to use reclaim_buffers_idlelocked() instead.\n"
+                                          "\tI will go on reclaiming the buffers anyway.\n");
                         }
-                        if (drm_lock_take(&dev->lock.hw_lock->lock,
-                                          DRM_KERNEL_CONTEXT)) {
-                                dev->lock.filp = filp;
-                                dev->lock.lock_time = jiffies;
-                                atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
-                                break;  /* Got lock */
-                        }
-                        /* Contention */
-                        schedule();
-                        if (signal_pending(current)) {
-                                retcode = -ERESTARTSYS;
-                                break;
-                        }
-                }
-                __set_current_state(TASK_RUNNING);
-                remove_wait_queue(&dev->lock.lock_queue, &entry);
-                if (!retcode) {
+
                         dev->driver->reclaim_buffers_locked(dev, filp);
-                        drm_lock_free(dev, &dev->lock.hw_lock->lock,
-                                      DRM_KERNEL_CONTEXT);
+                        drm_idlelock_release(&dev->lock);
                 }
         }
 
+        if (dev->driver->reclaim_buffers_idlelocked && dev->lock.hw_lock) {
+
+                drm_idlelock_take(&dev->lock);
+                dev->driver->reclaim_buffers_idlelocked(dev, filp);
+                drm_idlelock_release(&dev->lock);
+
+        }
+
+        if (drm_i_have_hw_lock(filp)) {
+                DRM_DEBUG("File %p released, freeing lock for context %d\n",
+                          filp, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+
+                drm_lock_free(&dev->lock,
+                              _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+        }
+
+
         if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
             !dev->driver->reclaim_buffers_locked) {
                 dev->driver->reclaim_buffers(dev, filp);
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c
index a0b2d6802ae4..31acb621dcce 100644
--- a/drivers/char/drm/drm_hashtab.c
+++ b/drivers/char/drm/drm_hashtab.c
@@ -43,7 +43,16 @@ int drm_ht_create(drm_open_hash_t *ht, unsigned int order)
         ht->size = 1 << order;
         ht->order = order;
         ht->fill = 0;
-        ht->table = vmalloc(ht->size*sizeof(*ht->table));
+        ht->table = NULL;
+        ht->use_vmalloc = ((ht->size * sizeof(*ht->table)) > PAGE_SIZE);
+        if (!ht->use_vmalloc) {
+                ht->table = drm_calloc(ht->size, sizeof(*ht->table),
+                                       DRM_MEM_HASHTAB);
+        }
+        if (!ht->table) {
+                ht->use_vmalloc = 1;
+                ht->table = vmalloc(ht->size*sizeof(*ht->table));
+        }
         if (!ht->table) {
                 DRM_ERROR("Out of memory for hash table\n");
                 return -ENOMEM;
@@ -183,7 +192,11 @@ int drm_ht_remove_item(drm_open_hash_t *ht, drm_hash_item_t *item)
 void drm_ht_remove(drm_open_hash_t *ht)
 {
         if (ht->table) {
-                vfree(ht->table);
+                if (ht->use_vmalloc)
+                        vfree(ht->table);
+                else
+                        drm_free(ht->table, ht->size * sizeof(*ht->table),
+                                 DRM_MEM_HASHTAB);
                 ht->table = NULL;
         }
 }
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
index 40afec05bff8..613091c970af 100644
--- a/drivers/char/drm/drm_hashtab.h
+++ b/drivers/char/drm/drm_hashtab.h
@@ -47,6 +47,7 @@ typedef struct drm_open_hash{
         unsigned int order;
         unsigned int fill;
         struct hlist_head *table;
+        int use_vmalloc;
 } drm_open_hash_t;
 
 
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index 9d00c51fe2c4..2e75331fd83e 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -424,7 +424,7 @@ static void drm_locked_tasklet_func(unsigned long data)
         spin_lock_irqsave(&dev->tasklet_lock, irqflags);
 
         if (!dev->locked_tasklet_func ||
-            !drm_lock_take(&dev->lock.hw_lock->lock,
+            !drm_lock_take(&dev->lock,
                            DRM_KERNEL_CONTEXT)) {
                 spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
                 return;
@@ -435,7 +435,7 @@ static void drm_locked_tasklet_func(unsigned long data)
 
         dev->locked_tasklet_func(dev);
 
-        drm_lock_free(dev, &dev->lock.hw_lock->lock,
+        drm_lock_free(&dev->lock,
                       DRM_KERNEL_CONTEXT);
 
         dev->locked_tasklet_func = NULL;
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index e9993ba461a2..befd1af19dfe 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -35,9 +35,6 @@
 
 #include "drmP.h"
 
-static int drm_lock_transfer(drm_device_t * dev,
-                             __volatile__ unsigned int *lock,
-                             unsigned int context);
 static int drm_notifier(void *priv);
 
 /**
@@ -80,6 +77,9 @@ int drm_lock(struct inode *inode, struct file *filp,
                         return -EINVAL;
 
         add_wait_queue(&dev->lock.lock_queue, &entry);
+        spin_lock(&dev->lock.spinlock);
+        dev->lock.user_waiters++;
+        spin_unlock(&dev->lock.spinlock);
         for (;;) {
                 __set_current_state(TASK_INTERRUPTIBLE);
                 if (!dev->lock.hw_lock) {
@@ -87,7 +87,7 @@ int drm_lock(struct inode *inode, struct file *filp,
                         ret = -EINTR;
                         break;
                 }
-                if (drm_lock_take(&dev->lock.hw_lock->lock, lock.context)) {
+                if (drm_lock_take(&dev->lock, lock.context)) {
                         dev->lock.filp = filp;
                         dev->lock.lock_time = jiffies;
                         atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
@@ -101,12 +101,14 @@ int drm_lock(struct inode *inode, struct file *filp,
                         break;
                 }
         }
+        spin_lock(&dev->lock.spinlock);
+        dev->lock.user_waiters--;
+        spin_unlock(&dev->lock.spinlock);
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(&dev->lock.lock_queue, &entry);
 
-        DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
-        if (ret)
-                return ret;
+        DRM_DEBUG( "%d %s\n", lock.context, ret ? "interrupted" : "has lock" );
+        if (ret) return ret;
 
         sigemptyset(&dev->sigmask);
         sigaddset(&dev->sigmask, SIGSTOP);
@@ -127,14 +129,12 @@ int drm_lock(struct inode *inode, struct file *filp,
                 }
         }
 
-        /* dev->driver->kernel_context_switch isn't used by any of the x86
-         *  drivers but is used by the Sparc driver.
-         */
         if (dev->driver->kernel_context_switch &&
             dev->last_context != lock.context) {
                 dev->driver->kernel_context_switch(dev, dev->last_context,
                                                    lock.context);
         }
+
         return 0;
 }
 
@@ -184,12 +184,8 @@ int drm_unlock(struct inode *inode, struct file *filp,
         if (dev->driver->kernel_context_switch_unlock)
                 dev->driver->kernel_context_switch_unlock(dev);
         else {
-                drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
-                                  DRM_KERNEL_CONTEXT);
-
-                if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
-                                  DRM_KERNEL_CONTEXT)) {
-                        DRM_ERROR("\n");
+                if (drm_lock_free(&dev->lock,lock.context)) {
+                        /* FIXME: Should really bail out here. */
                 }
         }
 
@@ -206,18 +202,26 @@ int drm_unlock(struct inode *inode, struct file *filp,
  *
  * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
  */
-int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context)
+int drm_lock_take(drm_lock_data_t *lock_data,
+                  unsigned int context)
 {
         unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
 
+        spin_lock(&lock_data->spinlock);
         do {
                 old = *lock;
                 if (old & _DRM_LOCK_HELD)
                         new = old | _DRM_LOCK_CONT;
-                else
-                        new = context | _DRM_LOCK_HELD;
+                else {
+                        new = context | _DRM_LOCK_HELD |
+                                ((lock_data->user_waiters + lock_data->kernel_waiters > 1) ?
+                                 _DRM_LOCK_CONT : 0);
+                }
                 prev = cmpxchg(lock, old, new);
         } while (prev != old);
+        spin_unlock(&lock_data->spinlock);
+
         if (_DRM_LOCKING_CONTEXT(old) == context) {
                 if (old & _DRM_LOCK_HELD) {
                         if (context != DRM_KERNEL_CONTEXT) {
@@ -227,7 +231,8 @@ int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context)
                         return 0;
                 }
         }
-        if (new == (context | _DRM_LOCK_HELD)) {
+
+        if ((_DRM_LOCKING_CONTEXT(new)) == context && (new & _DRM_LOCK_HELD)) {
                 /* Have lock */
                 return 1;
         }
@@ -246,13 +251,13 @@ int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context)
  * Resets the lock file pointer.
  * Marks the lock as held by the given context, via the \p cmpxchg instruction.
  */
-static int drm_lock_transfer(drm_device_t * dev,
-                             __volatile__ unsigned int *lock,
+static int drm_lock_transfer(drm_lock_data_t *lock_data,
                              unsigned int context)
 {
         unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
 
-        dev->lock.filp = NULL;
+        lock_data->filp = NULL;
         do {
                 old = *lock;
                 new = context | _DRM_LOCK_HELD;
@@ -272,23 +277,32 @@ static int drm_lock_transfer(drm_device_t * dev,
  * Marks the lock as not held, via the \p cmpxchg instruction. Wakes any task
  * waiting on the lock queue.
  */
-int drm_lock_free(drm_device_t * dev,
-                  __volatile__ unsigned int *lock, unsigned int context)
+int drm_lock_free(drm_lock_data_t *lock_data, unsigned int context)
 {
         unsigned int old, new, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
+
+        spin_lock(&lock_data->spinlock);
+        if (lock_data->kernel_waiters != 0) {
+                drm_lock_transfer(lock_data, 0);
+                lock_data->idle_has_lock = 1;
+                spin_unlock(&lock_data->spinlock);
+                return 1;
+        }
+        spin_unlock(&lock_data->spinlock);
 
-        dev->lock.filp = NULL;
         do {
                 old = *lock;
-                new = 0;
+                new = _DRM_LOCKING_CONTEXT(old);
                 prev = cmpxchg(lock, old, new);
         } while (prev != old);
+
         if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
                 DRM_ERROR("%d freed heavyweight lock held by %d\n",
                           context, _DRM_LOCKING_CONTEXT(old));
                 return 1;
         }
-        wake_up_interruptible(&dev->lock.lock_queue);
+        wake_up_interruptible(&lock_data->lock_queue);
         return 0;
 }
 
@@ -322,3 +336,67 @@ static int drm_notifier(void *priv)
         } while (prev != old);
         return 0;
 }
+
+/**
+ * This function returns immediately and takes the hw lock
+ * with the kernel context if it is free, otherwise it gets the highest priority when and if
+ * it is eventually released.
+ *
+ * This guarantees that the kernel will _eventually_ have the lock _unless_ it is held
+ * by a blocked process. (In the latter case an explicit wait for the hardware lock would cause
+ * a deadlock, which is why the "idlelock" was invented).
+ *
+ * This should be sufficient to wait for GPU idle without
+ * having to worry about starvation.
+ */
+
+void drm_idlelock_take(drm_lock_data_t *lock_data)
+{
+        int ret = 0;
+
+        spin_lock(&lock_data->spinlock);
+        lock_data->kernel_waiters++;
+        if (!lock_data->idle_has_lock) {
+
+                spin_unlock(&lock_data->spinlock);
+                ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);
+                spin_lock(&lock_data->spinlock);
+
+                if (ret == 1)
+                        lock_data->idle_has_lock = 1;
+        }
+        spin_unlock(&lock_data->spinlock);
+}
+EXPORT_SYMBOL(drm_idlelock_take);
+
+void drm_idlelock_release(drm_lock_data_t *lock_data)
+{
+        unsigned int old, prev;
+        volatile unsigned int *lock = &lock_data->hw_lock->lock;
+
+        spin_lock(&lock_data->spinlock);
+        if (--lock_data->kernel_waiters == 0) {
+                if (lock_data->idle_has_lock) {
+                        do {
+                                old = *lock;
+                                prev = cmpxchg(lock, old, DRM_KERNEL_CONTEXT);
+                        } while (prev != old);
+                        wake_up_interruptible(&lock_data->lock_queue);
+                        lock_data->idle_has_lock = 0;
+                }
+        }
+        spin_unlock(&lock_data->spinlock);
+}
+EXPORT_SYMBOL(drm_idlelock_release);
+
+
+int drm_i_have_hw_lock(struct file *filp)
+{
+        DRM_DEVICE;
+
+        return (priv->lock_count && dev->lock.hw_lock &&
+                _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
+                dev->lock.filp == filp);
+}
+
+EXPORT_SYMBOL(drm_i_have_hw_lock);
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index 9b46b85027d0..2ec1d9f26264 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -274,7 +274,6 @@ int drm_mm_init(drm_mm_t * mm, unsigned long start, unsigned long size)
         return drm_mm_create_tail_node(mm, start, size);
 }
 
-EXPORT_SYMBOL(drm_mm_init);
 
 void drm_mm_takedown(drm_mm_t * mm)
 {
@@ -295,4 +294,3 @@ void drm_mm_takedown(drm_mm_t * mm)
         drm_free(entry, sizeof(*entry), DRM_MEM_MM);
 }
 
-EXPORT_SYMBOL(drm_mm_takedown);
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index ad54b845978b..01cf482d2d00 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -230,10 +230,10 @@
         {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
+        {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
         {0, 0, 0}
 
 #define i810_PCI_IDS \
@@ -296,5 +296,6 @@
         {0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 7fd0da712142..b204498d1a28 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -72,7 +72,7 @@ static struct drm_proc_list {
 #endif
 };
 
-#define DRM_PROC_ENTRIES (sizeof(drm_proc_list)/sizeof(drm_proc_list[0]))
+#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list)
 
 /**
  * Initialize the DRI proc filesystem for a device.
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 120d10256feb..19408adcc775 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -62,6 +62,7 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
         spin_lock_init(&dev->count_lock);
         spin_lock_init(&dev->drw_lock);
         spin_lock_init(&dev->tasklet_lock);
+        spin_lock_init(&dev->lock.spinlock);
         init_timer(&dev->timer);
         mutex_init(&dev->struct_mutex);
         mutex_init(&dev->ctxlist_mutex);
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 54a632848955..35540cfb43dd 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -41,6 +41,30 @@
 static void drm_vm_open(struct vm_area_struct *vma);
 static void drm_vm_close(struct vm_area_struct *vma);
 
+static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
+{
+        pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
+
+#if defined(__i386__) || defined(__x86_64__)
+        if (boot_cpu_data.x86 > 3 && map_type != _DRM_AGP) {
+                pgprot_val(tmp) |= _PAGE_PCD;
+                pgprot_val(tmp) &= ~_PAGE_PWT;
+        }
+#elif defined(__powerpc__)
+        pgprot_val(tmp) |= _PAGE_NO_CACHE;
+        if (map_type == _DRM_REGISTERS)
+                pgprot_val(tmp) |= _PAGE_GUARDED;
+#endif
+#if defined(__ia64__)
+        if (efi_range_is_wc(vma->vm_start, vma->vm_end -
+                                    vma->vm_start))
+                tmp = pgprot_writecombine(tmp);
+        else
+                tmp = pgprot_noncached(tmp);
+#endif
+        return tmp;
+}
+
 /**
  * \c nopage method for AGP virtual memory.
  *
@@ -151,8 +175,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
 
         offset = address - vma->vm_start;
         i = (unsigned long)map->handle + offset;
-        page = (map->type == _DRM_CONSISTENT) ?
-                virt_to_page((void *)i) : vmalloc_to_page((void *)i);
+        page = vmalloc_to_page((void *)i);
         if (!page)
                 return NOPAGE_SIGBUS;
         get_page(page);
@@ -389,7 +412,7 @@ static struct vm_operations_struct drm_vm_sg_ops = {
  * Create a new drm_vma_entry structure as the \p vma private data entry and
  * add it to drm_device::vmalist.
  */
-static void drm_vm_open(struct vm_area_struct *vma)
+static void drm_vm_open_locked(struct vm_area_struct *vma)
 {
         drm_file_t *priv = vma->vm_file->private_data;
         drm_device_t *dev = priv->head->dev;
@@ -401,15 +424,23 @@ static void drm_vm_open(struct vm_area_struct *vma)
 
         vma_entry = drm_alloc(sizeof(*vma_entry), DRM_MEM_VMAS);
         if (vma_entry) {
-                mutex_lock(&dev->struct_mutex);
                 vma_entry->vma = vma;
                 vma_entry->next = dev->vmalist;
                 vma_entry->pid = current->pid;
                 dev->vmalist = vma_entry;
-                mutex_unlock(&dev->struct_mutex);
         }
 }
 
+static void drm_vm_open(struct vm_area_struct *vma)
+{
+        drm_file_t *priv = vma->vm_file->private_data;
+        drm_device_t *dev = priv->head->dev;
+
+        mutex_lock(&dev->struct_mutex);
+        drm_vm_open_locked(vma);
+        mutex_unlock(&dev->struct_mutex);
+}
+
 /**
  * \c close method for all virtual memory types.
  *
@@ -460,7 +491,6 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
         drm_device_dma_t *dma;
         unsigned long length = vma->vm_end - vma->vm_start;
 
-        lock_kernel();
         dev = priv->head->dev;
         dma = dev->dma;
         DRM_DEBUG("start = 0x%lx, end = 0x%lx, page offset = 0x%lx\n",
@@ -468,10 +498,8 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
 
         /* Length must match exact page count */
         if (!dma || (length >> PAGE_SHIFT) != dma->page_count) {
-                unlock_kernel();
                 return -EINVAL;
         }
-        unlock_kernel();
 
         if (!capable(CAP_SYS_ADMIN) &&
             (dma->flags & _DRM_DMA_USE_PCI_RO)) {
@@ -494,7 +522,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
         vma->vm_flags |= VM_RESERVED;   /* Don't swap */
 
         vma->vm_file = filp;    /* Needed for drm_vm_open() */
-        drm_vm_open(vma);
+        drm_vm_open_locked(vma);
         return 0;
 }
 
@@ -529,7 +557,7 @@ EXPORT_SYMBOL(drm_core_get_reg_ofs);
  * according to the mapping type and remaps the pages. Finally sets the file
  * pointer and calls vm_open().
  */
-int drm_mmap(struct file *filp, struct vm_area_struct *vma)
+static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
@@ -565,7 +593,7 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                 return -EPERM;
 
         /* Check for valid size. */
-        if (map->size != vma->vm_end - vma->vm_start)
+        if (map->size < vma->vm_end - vma->vm_start)
                 return -EINVAL;
 
         if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
@@ -600,37 +628,16 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                 /* fall through to _DRM_FRAME_BUFFER... */
         case _DRM_FRAME_BUFFER:
         case _DRM_REGISTERS:
-#if defined(__i386__) || defined(__x86_64__)
-                if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
-                        pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
-                        pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
-                }
-#elif defined(__powerpc__)
-                pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
-                if (map->type == _DRM_REGISTERS)
-                        pgprot_val(vma->vm_page_prot) |= _PAGE_GUARDED;
-#endif
-                vma->vm_flags |= VM_IO; /* not in core dump */
-#if defined(__ia64__)
-                if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start))
-                        vma->vm_page_prot =
-                            pgprot_writecombine(vma->vm_page_prot);
-                else
-                        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-#endif
                 offset = dev->driver->get_reg_ofs(dev);
+                vma->vm_flags |= VM_IO; /* not in core dump */
+                vma->vm_page_prot = drm_io_prot(map->type, vma);
 #ifdef __sparc__
                 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+#endif
                 if (io_remap_pfn_range(vma, vma->vm_start,
                                        (map->offset + offset) >> PAGE_SHIFT,
                                        vma->vm_end - vma->vm_start,
                                        vma->vm_page_prot))
-#else
-                if (io_remap_pfn_range(vma, vma->vm_start,
-                                       (map->offset + offset) >> PAGE_SHIFT,
-                                       vma->vm_end - vma->vm_start,
-                                       vma->vm_page_prot))
-#endif
                         return -EAGAIN;
                 DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
                           " offset = 0x%lx\n",
@@ -638,10 +645,15 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                           vma->vm_start, vma->vm_end, map->offset + offset);
                 vma->vm_ops = &drm_vm_ops;
                 break;
-        case _DRM_SHM:
         case _DRM_CONSISTENT:
-                /* Consistent memory is really like shared memory. It's only
-                 * allocate in a different way */
+                /* Consistent memory is really like shared memory. But
+                 * it's allocated in a different way, so avoid nopage */
+                if (remap_pfn_range(vma, vma->vm_start,
+                    page_to_pfn(virt_to_page(map->handle)),
+                    vma->vm_end - vma->vm_start, vma->vm_page_prot))
+                        return -EAGAIN;
+        /* fall through to _DRM_SHM */
+        case _DRM_SHM:
                 vma->vm_ops = &drm_vm_shm_ops;
                 vma->vm_private_data = (void *)map;
                 /* Don't let this area swap.  Change when
@@ -659,8 +671,20 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
         vma->vm_flags |= VM_RESERVED;   /* Don't swap */
 
         vma->vm_file = filp;    /* Needed for drm_vm_open() */
-        drm_vm_open(vma);
+        drm_vm_open_locked(vma);
         return 0;
 }
 
+int drm_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
+        int ret;
+
+        mutex_lock(&dev->struct_mutex);
+        ret = drm_mmap_locked(filp, vma);
+        mutex_unlock(&dev->struct_mutex);
+
+        return ret;
+}
 EXPORT_SYMBOL(drm_mmap);
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 9354ce3b0093..1ba15d9a171a 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -34,7 +34,8 @@
 #define IS_I965G(dev) (dev->pci_device == 0x2972 || \
                        dev->pci_device == 0x2982 || \
                        dev->pci_device == 0x2992 || \
-                       dev->pci_device == 0x29A2)
+                       dev->pci_device == 0x29A2 || \
+                       dev->pci_device == 0x2A02)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 5ed965688293..c1850ecac302 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1560,8 +1560,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                 if (dev_priv->flags & RADEON_IS_AGP) {
                         base = dev->agp->base;
                         /* Check if valid */
-                        if ((base + dev_priv->gart_size) > dev_priv->fb_location &&
-                            base < (dev_priv->fb_location + dev_priv->fb_size)) {
+                        if ((base + dev_priv->gart_size - 1) >= dev_priv->fb_location &&
+                            base < (dev_priv->fb_location + dev_priv->fb_size - 1)) {
                                 DRM_INFO("Can't use AGP base @0x%08lx, won't fit\n",
                                          dev->agp->base);
                                 base = 0;
@@ -1571,8 +1571,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                 /* If not or if AGP is at 0 (Macs), try to put it elsewhere */
                 if (base == 0) {
                         base = dev_priv->fb_location + dev_priv->fb_size;
-                        if (((base + dev_priv->gart_size) & 0xfffffffful)
-                            < base)
+                        if (base < dev_priv->fb_location ||
+                            ((base + dev_priv->gart_size) & 0xfffffffful) < base)
                                 base = dev_priv->fb_location
                                         - dev_priv->gart_size;
                 }               
diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c
index 3d5b3218b6ff..690e0af8e7c2 100644
--- a/drivers/char/drm/sis_drv.c
+++ b/drivers/char/drm/sis_drv.c
@@ -71,7 +71,7 @@ static struct drm_driver driver = {
         .context_dtor = NULL,
         .dma_quiescent = sis_idle,
         .reclaim_buffers = NULL,
-        .reclaim_buffers_locked = sis_reclaim_buffers_locked,
+        .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,
         .lastclose = sis_lastclose,
         .get_map_ofs = drm_core_get_map_ofs,
         .get_reg_ofs = drm_core_get_reg_ofs,
diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c
index bb9dde8b1911..2d4957ab256a 100644
--- a/drivers/char/drm/via_drv.c
+++ b/drivers/char/drm/via_drv.c
@@ -52,7 +52,8 @@ static struct drm_driver driver = {
         .dma_quiescent = via_driver_dma_quiescent,
         .dri_library_name = dri_library_name,
         .reclaim_buffers = drm_core_reclaim_buffers,
-        .reclaim_buffers_locked = via_reclaim_buffers_locked,
+        .reclaim_buffers_locked = NULL,
+        .reclaim_buffers_idlelocked = via_reclaim_buffers_locked,
         .lastclose = via_lastclose,
         .get_map_ofs = drm_core_get_map_ofs,
         .get_reg_ofs = drm_core_get_reg_ofs,
diff --git a/drivers/char/drm/via_mm.h b/drivers/char/drm/via_mm.h
deleted file mode 100644
index d57efda57c76..000000000000
--- a/drivers/char/drm/via_mm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifndef _via_drm_mm_h_
-#define _via_drm_mm_h_
-
-typedef struct {
-        unsigned int context;
-        unsigned int size;
-        unsigned long offset;
-        unsigned long free;
-} drm_via_mm_t;
-
-typedef struct {
-        unsigned int size;
-        unsigned long handle;
-        void *virtual;
-} drm_via_dma_t;
-
-#endif
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c
index 9ebf84d18655..ec435cb25c4f 100644
--- a/drivers/char/hw_random/via-rng.c
+++ b/drivers/char/hw_random/via-rng.c
@@ -26,7 +26,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/hw_random.h>
 #include <asm/io.h>
 #include <asm/msr.h>
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index cb8d691576da..c06e86ad1dab 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -41,7 +41,6 @@
 #include <linux/input.h>
 #include <linux/reboot.h>
 
-static void kbd_disconnect(struct input_handle *handle);
 extern void ctrl_alt_del(void);
 
 /*
@@ -159,65 +158,41 @@ static int sysrq_alt_use;
 static int sysrq_alt;
 
 /*
- * Translation of scancodes to keycodes. We set them on only the first attached
- * keyboard - for per-keyboard setting, /dev/input/event is more useful.
+ * Translation of scancodes to keycodes. We set them on only the first
+ * keyboard in the list that accepts the scancode and keycode.
+ * Explanation for not choosing the first attached keyboard anymore:
+ *  USB keyboards for example have two event devices: one for all "normal"
+ *  keys and one for extra function keys (like "volume up", "make coffee",
+ *  etc.). So this means that scancodes for the extra function keys won't
+ *  be valid for the first event device, but will be for the second.
  */
 int getkeycode(unsigned int scancode)
 {
-        struct list_head *node;
-        struct input_dev *dev = NULL;
+        struct input_handle *handle;
+        int keycode;
+        int error = -ENODEV;
 
-        list_for_each(node, &kbd_handler.h_list) {
-                struct input_handle *handle = to_handle_h(node);
-                if (handle->dev->keycodesize) {
-                        dev = handle->dev;
-                        break;
-                }
+        list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
+                error = handle->dev->getkeycode(handle->dev, scancode, &keycode);
+                if (!error)
+                        return keycode;
         }
 
-        if (!dev)
-                return -ENODEV;
-
-        if (scancode >= dev->keycodemax)
-                return -EINVAL;
-
-        return INPUT_KEYCODE(dev, scancode);
+        return error;
 }
 
 int setkeycode(unsigned int scancode, unsigned int keycode)
 {
-        struct list_head *node;
-        struct input_dev *dev = NULL;
-        unsigned int i, oldkey;
+        struct input_handle *handle;
+        int error = -ENODEV;
 
-        list_for_each(node, &kbd_handler.h_list) {
-                struct input_handle *handle = to_handle_h(node);
-                if (handle->dev->keycodesize) {
-                        dev = handle->dev;
+        list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
+                error = handle->dev->setkeycode(handle->dev, scancode, keycode);
+                if (!error)
                         break;
-                }
         }
 
-        if (!dev)
-                return -ENODEV;
-
-        if (scancode >= dev->keycodemax)
-                return -EINVAL;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
-        if (dev->keycodesize < sizeof(keycode) && (keycode >> (dev->keycodesize * 8)))
-                return -EINVAL;
-
-        oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode);
-
-        clear_bit(oldkey, dev->keybit);
-        set_bit(keycode, dev->keybit);
-
-        for (i = 0; i < dev->keycodemax; i++)
-                if (INPUT_KEYCODE(dev,i) == oldkey)
-                        set_bit(oldkey, dev->keybit);
-
-        return 0;
+        return error;
 }
 
 /*
@@ -225,10 +200,9 @@ int setkeycode(unsigned int scancode, unsigned int keycode)
  */
 static void kd_nosound(unsigned long ignored)
 {
-        struct list_head *node;
+        struct input_handle *handle;
 
-        list_for_each(node, &kbd_handler.h_list) {
-                struct input_handle *handle = to_handle_h(node);
+        list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
                 if (test_bit(EV_SND, handle->dev->evbit)) {
                         if (test_bit(SND_TONE, handle->dev->sndbit))
                                 input_inject_event(handle, EV_SND, SND_TONE, 0);
@@ -1161,7 +1135,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 
         if ((raw_mode = (kbd->kbdmode == VC_RAW)) && !hw_raw)
                 if (emulate_raw(vc, keycode, !down << 7))
-                        if (keycode < BTN_MISC)
+                        if (keycode < BTN_MISC && printk_ratelimit())
                                 printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode);
 
 #ifdef CONFIG_MAGIC_SYSRQ              /* Handle the SysRq Hack */
@@ -1285,11 +1259,11 @@ static void kbd_event(struct input_handle *handle, unsigned int event_type,
  * likes it, it can open it and get events from it. In this (kbd_connect)
  * function, we should decide which VT to bind that keyboard to initially.
  */
-static struct input_handle *kbd_connect(struct input_handler *handler,
-                                        struct input_dev *dev,
-                                        const struct input_device_id *id)
+static int kbd_connect(struct input_handler *handler, struct input_dev *dev,
+                        const struct input_device_id *id)
 {
         struct input_handle *handle;
+        int error;
         int i;
 
         for (i = KEY_RESERVED; i < BTN_MISC; i++)
@@ -1297,24 +1271,37 @@ static struct input_handle *kbd_connect(struct input_handler *handler,
                         break;
 
         if (i == BTN_MISC && !test_bit(EV_SND, dev->evbit))
-                return NULL;
+                return -ENODEV;
 
         handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
         if (!handle)
-                return NULL;
+                return -ENOMEM;
 
         handle->dev = dev;
         handle->handler = handler;
         handle->name = "kbd";
 
-        input_open_device(handle);
+        error = input_register_handle(handle);
+        if (error)
+                goto err_free_handle;
+
+        error = input_open_device(handle);
+        if (error)
+                goto err_unregister_handle;
+
+        return 0;
 
-        return handle;
+ err_unregister_handle:
+        input_unregister_handle(handle);
+ err_free_handle:
+        kfree(handle);
+        return error;
 }
 
 static void kbd_disconnect(struct input_handle *handle)
 {
         input_close_device(handle);
+        input_unregister_handle(handle);
         kfree(handle);
 }
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 157b1d09ab55..13808f6083a0 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -42,7 +42,6 @@
 #include <linux/timer.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index bb9a43c6cf3d..9f273f032b0f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -19,7 +19,6 @@
  * 
  */
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 7a32df594907..389da364e6b6 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3720,11 +3720,10 @@ int tty_register_driver(struct tty_driver *driver)
         if (driver->flags & TTY_DRIVER_INSTALLED)
                 return 0;
 
-        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
-                p = kmalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL);
+        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
+                p = kzalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
-                memset(p, 0, driver->num * 3 * sizeof(void *));
         }
 
         if (!driver->major) {
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 1e4a8d751a71..2f7ba7a514fe 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -38,7 +38,6 @@
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/fs.h>
-#include <linux/pci.h>
 
 #include <asm/semaphore.h>
 #include <asm/io.h>
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index fc0e0347f9d2..d4fd0fa2f176 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -25,7 +25,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/fs.h>
-#include <linux/pci.h>
+#include <linux/ioport.h>
 #include <linux/scx200.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index d155e81b5c97..993fa7b89253 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -9,6 +9,9 @@ config CPU_FREQ
           clock speed, you need to either enable a dynamic cpufreq governor
           (see below) after boot, or use a userspace tool.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq.
+
           For details, take a look at <file:Documentation/cpu-freq>.
 
           If in doubt, say N.
@@ -16,7 +19,7 @@ config CPU_FREQ
 if CPU_FREQ
 
 config CPU_FREQ_TABLE
-       tristate
+        tristate
 
 config CPU_FREQ_DEBUG
         bool "Enable CPUfreq debugging"
@@ -32,19 +35,26 @@ config CPU_FREQ_DEBUG
                4 to activate CPUfreq governor debugging
 
 config CPU_FREQ_STAT
-       tristate "CPU frequency translation statistics"
-       select CPU_FREQ_TABLE
-       default y
-       help
-         This driver exports CPU frequency statistics information through sysfs
-         file system
+        tristate "CPU frequency translation statistics"
+        select CPU_FREQ_TABLE
+        default y
+        help
+          This driver exports CPU frequency statistics information through sysfs
+          file system.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_stats.
+
+          If in doubt, say N.
 
 config CPU_FREQ_STAT_DETAILS
-       bool "CPU frequency translation statistics details"
-       depends on CPU_FREQ_STAT
-       help
-         This will show detail CPU frequency translation table in sysfs file
-         system
+        bool "CPU frequency translation statistics details"
+        depends on CPU_FREQ_STAT
+        help
+          This will show detail CPU frequency translation table in sysfs file
+          system.
+
+          If in doubt, say N.
 
 # 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
@@ -78,29 +88,38 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
 endchoice
 
 config CPU_FREQ_GOV_PERFORMANCE
-       tristate "'performance' governor"
-       help
+        tristate "'performance' governor"
+        help
           This cpufreq governor sets the frequency statically to the
           highest available CPU frequency.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_performance.
+
           If in doubt, say Y.
 
 config CPU_FREQ_GOV_POWERSAVE
-       tristate "'powersave' governor"
-       help
+        tristate "'powersave' governor"
+        help
           This cpufreq governor sets the frequency statically to the
           lowest available CPU frequency.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_powersave.
+
           If in doubt, say Y.
 
 config CPU_FREQ_GOV_USERSPACE
-       tristate "'userspace' governor for userspace frequency scaling"
-       help
+        tristate "'userspace' governor for userspace frequency scaling"
+        help
           Enable this cpufreq governor when you either want to set the
           CPU frequency manually or when an userspace program shall
           be able to set the CPU dynamically, like on LART 
           <http://www.lartmaker.nl/>.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_userspace.
+
           For details, take a look at <file:Documentation/cpu-freq/>.
 
           If in doubt, say Y.
@@ -116,6 +135,9 @@ config CPU_FREQ_GOV_ONDEMAND
           do fast frequency switching (i.e, very low latency frequency
           transitions). 
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_ondemand.
+
           For details, take a look at linux/Documentation/cpu-freq.
 
           If in doubt, say N.
@@ -136,6 +158,9 @@ config CPU_FREQ_GOV_CONSERVATIVE
           step-by-step latency issues between the minimum and maximum frequency
           transitions in the CPU) you will probably want to use this governor.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_conservative.
+
           For details, take a look at linux/Documentation/cpu-freq.
 
           If in doubt, say N.
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3162010900c9..893dbaf386fb 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -768,6 +768,9 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
                 unlock_policy_rwsem_write(cpu);
                 goto err_out;
         }
+        policy->user_policy.min = policy->cpuinfo.min_freq;
+        policy->user_policy.max = policy->cpuinfo.max_freq;
+        policy->user_policy.governor = policy->governor;
 
 #ifdef CONFIG_SMP
         for_each_cpu_mask(j, policy->cpus) {
@@ -858,10 +861,13 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
 
         policy->governor = NULL; /* to assure that the starting sequence is
                                   * run in cpufreq_set_policy */
-        unlock_policy_rwsem_write(cpu);
 
         /* set default policy */
-        ret = cpufreq_set_policy(&new_policy);
+        ret = __cpufreq_set_policy(policy, &new_policy);
+        policy->user_policy.policy = policy->policy;
+
+        unlock_policy_rwsem_write(cpu);
+
         if (ret) {
                 dprintk("setting policy failed\n");
                 goto err_out_unregister;
@@ -1620,43 +1626,6 @@ error_out:
 }
 
 /**
- *      cpufreq_set_policy - set a new CPUFreq policy
- *      @policy: policy to be set.
- *
- *      Sets a new CPU frequency and voltage scaling policy.
- */
-int cpufreq_set_policy(struct cpufreq_policy *policy)
-{
-        int ret = 0;
-        struct cpufreq_policy *data;
-
-        if (!policy)
-                return -EINVAL;
-
-        data = cpufreq_cpu_get(policy->cpu);
-        if (!data)
-                return -EINVAL;
-
-        if (unlikely(lock_policy_rwsem_write(policy->cpu)))
-                return -EINVAL;
-
-
-        ret = __cpufreq_set_policy(data, policy);
-        data->user_policy.min = data->min;
-        data->user_policy.max = data->max;
-        data->user_policy.policy = data->policy;
-        data->user_policy.governor = data->governor;
-
-        unlock_policy_rwsem_write(policy->cpu);
-
-        cpufreq_cpu_put(data);
-
-        return ret;
-}
-EXPORT_SYMBOL(cpufreq_set_policy);
-
-
-/**
  *      cpufreq_update_policy - re-evaluate an existing cpufreq policy
  *      @cpu: CPU which shall be re-evaluated
  *
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ff8c4beaace4..f21fe66c9eef 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-        tristate "Support for VIA PadLock ACE"
+        bool "Support for VIA PadLock ACE"
         depends on X86_32
         select CRYPTO_ALGAPI
-        default m
+        default y
         help
           Some VIA processors come with an integrated crypto engine
           (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -14,16 +14,6 @@ config CRYPTO_DEV_PADLOCK
           The instructions are used only when the CPU supports them.
           Otherwise software encryption is used.
 
-          Selecting M for this option will compile a helper module
-          padlock.ko that should autoload all below configured
-          algorithms. Don't worry if your hardware does not support
-          some or all of them. In such case padlock.ko will
-          simply write a single line into the kernel log informing
-          about its failure but everything will keep working fine.
-
-          If you are unsure, say M. The compiled module will be
-          called padlock.ko
-
 config CRYPTO_DEV_PADLOCK_AES
         tristate "PadLock driver for AES algorithm"
         depends on CRYPTO_DEV_PADLOCK
@@ -55,7 +45,7 @@ source "arch/s390/crypto/Kconfig"
 
 config CRYPTO_DEV_GEODE
         tristate "Support for the Geode LX AES engine"
-        depends on CRYPTO && X86_32 && PCI
+        depends on X86_32 && PCI
         select CRYPTO_ALGAPI
         select CRYPTO_BLKCIPHER
         default m
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 6059cf869414..d070030f7d7e 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
diff --git a/drivers/crypto/padlock.c b/drivers/crypto/padlock.c
deleted file mode 100644
index d6d7dd5bb98c..000000000000
--- a/drivers/crypto/padlock.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Support for VIA PadLock hardware crypto engine.
- *
- * Copyright (c) 2006  Michal Ludvig <michal@logix.cz>
- *
- * 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.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/crypto.h>
-#include <linux/cryptohash.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/scatterlist.h>
-#include "padlock.h"
-
-static int __init padlock_init(void)
-{
-        int success = 0;
-
-        if (crypto_has_cipher("aes-padlock", 0, 0))
-                success++;
-
-        if (crypto_has_hash("sha1-padlock", 0, 0))
-                success++;
-
-        if (crypto_has_hash("sha256-padlock", 0, 0))
-                success++;
-
-        if (!success) {
-                printk(KERN_WARNING PFX "No VIA PadLock drivers have been loaded.\n");
-                return -ENODEV;
-        }
-
-        printk(KERN_NOTICE PFX "%d drivers are available.\n", success);
-
-        return 0;
-}
-
-static void __exit padlock_fini(void)
-{
-}
-
-module_init(padlock_init);
-module_exit(padlock_fini);
-
-MODULE_DESCRIPTION("Load all configured PadLock algorithms.");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Michal Ludvig");
-
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index c6281ccd4fe7..1324984a4c35 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -409,7 +409,7 @@ static struct kobj_type ktype_efivar = {
 };
 
 static ssize_t
-dummy(struct subsystem *sub, char *buf)
+dummy(struct kset *kset, char *buf)
 {
         return -ENODEV;
 }
@@ -422,7 +422,7 @@ efivar_unregister(struct efivar_entry *var)
 
 
 static ssize_t
-efivar_create(struct subsystem *sub, const char *buf, size_t count)
+efivar_create(struct kset *kset, const char *buf, size_t count)
 {
         struct efi_variable *new_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -480,7 +480,7 @@ efivar_create(struct subsystem *sub, const char *buf, size_t count)
 }
 
 static ssize_t
-efivar_delete(struct subsystem *sub, const char *buf, size_t count)
+efivar_delete(struct kset *kset, const char *buf, size_t count)
 {
         struct efi_variable *del_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -551,11 +551,11 @@ static struct subsys_attribute *var_subsys_attrs[] = {
  * the efivars driver
  */
 static ssize_t
-systab_read(struct subsystem *entry, char *buf)
+systab_read(struct kset *kset, char *buf)
 {
         char *str = buf;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         if (efi.mps != EFI_INVALID_TABLE_ADDR)
@@ -687,7 +687,7 @@ efivars_init(void)
                 goto out_free;
         }
 
-        kset_set_kset_s(&vars_subsys, efi_subsys);
+        kobj_set_kset_s(&vars_subsys, efi_subsys);
 
         error = subsystem_register(&vars_subsys);
 
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 11935f66fcd8..434a61b415a3 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -2,9 +2,7 @@
 # I2C subsystem configuration
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
         tristate "I2C support"
         ---help---
           I2C (pronounce: I-square-C) is a slow serial bus protocol used in
@@ -22,9 +20,14 @@ config I2C
           This I2C support can also be built as a module.  If so, the module
           will be called i2c-core.
 
+if I2C
+
+config I2C_BOARDINFO
+        boolean
+        default y
+
 config I2C_CHARDEV
         tristate "I2C device interface"
-        depends on I2C
         help
           Say Y here to use i2c-* device files, usually found in the /dev
           directory on your system.  They make it possible to have user-space
@@ -40,7 +43,6 @@ source drivers/i2c/chips/Kconfig
 
 config I2C_DEBUG_CORE
         bool "I2C Core debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C core to produce a bunch of debug
           messages to the system log.  Select this if you are having a
@@ -48,7 +50,6 @@ config I2C_DEBUG_CORE
 
 config I2C_DEBUG_ALGO
         bool "I2C Algorithm debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C algorithm drivers to produce a bunch
           of debug messages to the system log.  Select this if you are having
@@ -57,7 +58,6 @@ config I2C_DEBUG_ALGO
 
 config I2C_DEBUG_BUS
         bool "I2C Bus debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C bus drivers to produce a bunch of
           debug messages to the system log.  Select this if you are having
@@ -66,12 +66,10 @@ config I2C_DEBUG_BUS
 
 config I2C_DEBUG_CHIP
         bool "I2C Chip debugging messages"
-        depends on I2C
         help
           Say Y here if you want the I2C chip drivers to produce a bunch of
           debug messages to the system log.  Select this if you are having
           a problem with I2C support and want to see more of what is going
           on.
 
-endmenu
-
+endif # I2C
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 71c5a854ac5d..ba26e6cbe74e 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the i2c core.
 #
 
+obj-$(CONFIG_I2C_BOARDINFO)     += i2c-boardinfo.o
 obj-$(CONFIG_I2C)               += i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)       += i2c-dev.o
 obj-y                           += busses/ chips/ algos/
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index af0203409dd1..58899078810b 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -3,11 +3,9 @@
 #
 
 menu "I2C Algorithms"
-        depends on I2C
 
 config I2C_ALGOBIT
         tristate "I2C bit-banging interfaces"
-        depends on I2C
         help
           This allows you to use a range of I2C adapters called bit-banging
           adapters.  Say Y if you own an I2C adapter belonging to this class
@@ -18,7 +16,6 @@ config I2C_ALGOBIT
 
 config I2C_ALGOPCF
         tristate "I2C PCF 8584 interfaces"
-        depends on I2C
         help
           This allows you to use a range of I2C adapters called PCF adapters.
           Say Y if you own an I2C adapter belonging to this class and then say
@@ -29,7 +26,6 @@ config I2C_ALGOPCF
 
 config I2C_ALGOPCA
         tristate "I2C PCA 9564 interfaces"
-        depends on I2C
         help
           This allows you to use a range of I2C adapters called PCA adapters.
           Say Y if you own an I2C adapter belonging to this class and then say
@@ -40,11 +36,11 @@ config I2C_ALGOPCA
 
 config I2C_ALGO8XX
         tristate "MPC8xx CPM I2C interface"
-        depends on 8xx && I2C
+        depends on 8xx
 
 config I2C_ALGO_SGI
         tristate "I2C SGI interfaces"
-        depends on I2C && (SGI_IP22 || SGI_IP32 || X86_VISWS)
+        depends on SGI_IP22 || SGI_IP32 || X86_VISWS
         help
           Supports the SGI interfaces like the ones found on SGI Indy VINO
           or SGI O2 MACE.
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 95aa5395a5be..8a5f5825bb72 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -33,19 +33,30 @@
 
 
 /* ----- global defines ----------------------------------------------- */
-#define DEB(x) if (i2c_debug>=1) x;
-#define DEB2(x) if (i2c_debug>=2) x;
-#define DEBSTAT(x) if (i2c_debug>=3) x; /* print several statistical values*/
-#define DEBPROTO(x) if (i2c_debug>=9) { x; }
-        /* debug the protocol by showing transferred bits */
 
+#ifdef DEBUG
+#define bit_dbg(level, dev, format, args...) \
+        do { \
+                if (i2c_debug >= level) \
+                        dev_dbg(dev, format, ##args); \
+        } while (0)
+#else
+#define bit_dbg(level, dev, format, args...) \
+        do {} while (0)
+#endif /* DEBUG */
 
 /* ----- global variables --------------------------------------------- */
 
-/* module parameters:
- */
-static int i2c_debug;
 static int bit_test;    /* see if the line-setting functions work       */
+module_param(bit_test, bool, 0);
+MODULE_PARM_DESC(bit_test, "Test the lines of the bus to see if it is stuck");
+
+#ifdef DEBUG
+static int i2c_debug = 1;
+module_param(i2c_debug, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(i2c_debug,
+                 "debug level - 0 off; 1 normal; 2 verbose; 3 very verbose");
+#endif
 
 /* --- setting states on the bus with the right timing: --------------- */
 
@@ -57,19 +68,19 @@ static int bit_test;	/* see if the line-setting functions work	*/
 static inline void sdalo(struct i2c_algo_bit_data *adap)
 {
         setsda(adap,0);
-        udelay(adap->udelay);
+        udelay((adap->udelay + 1) / 2);
 }
 
 static inline void sdahi(struct i2c_algo_bit_data *adap)
 {
         setsda(adap,1);
-        udelay(adap->udelay);
+        udelay((adap->udelay + 1) / 2);
 }
 
 static inline void scllo(struct i2c_algo_bit_data *adap)
 {
         setscl(adap,0);
-        udelay(adap->udelay);
+        udelay(adap->udelay / 2);
 }
 
 /*
@@ -98,7 +109,11 @@ static int sclhi(struct i2c_algo_bit_data *adap)
                 }
                 cond_resched();
         }
-        DEBSTAT(printk(KERN_DEBUG "needed %ld jiffies\n", jiffies-start));
+#ifdef DEBUG
+        if (jiffies != start && i2c_debug >= 3)
+                pr_debug("i2c-algo-bit: needed %ld jiffies for SCL to go "
+                         "high\n", jiffies - start);
+#endif
 
 done:
         udelay(adap->udelay);
@@ -110,30 +125,29 @@ done:
 static void i2c_start(struct i2c_algo_bit_data *adap) 
 {
         /* assert: scl, sda are high */
-        DEBPROTO(printk("S "));
-        sdalo(adap);
+        setsda(adap, 0);
+        udelay(adap->udelay);
         scllo(adap);
 }
 
 static void i2c_repstart(struct i2c_algo_bit_data *adap) 
 {
-        /* scl, sda may not be high */
-        DEBPROTO(printk(" Sr "));
-        setsda(adap,1);
+        /* assert: scl is low */
+        sdahi(adap);
         sclhi(adap);
-        
-        sdalo(adap);
+        setsda(adap, 0);
+        udelay(adap->udelay);
         scllo(adap);
 }
 
 
 static void i2c_stop(struct i2c_algo_bit_data *adap) 
 {
-        DEBPROTO(printk("P\n"));
         /* assert: scl is low */
         sdalo(adap);
         sclhi(adap); 
-        sdahi(adap);
+        setsda(adap, 1);
+        udelay(adap->udelay);
 }
 
 
@@ -145,7 +159,7 @@ static void i2c_stop(struct i2c_algo_bit_data *adap)
  * 0 if the device did not ack
  * -ETIMEDOUT if an error occurred (while raising the scl line)
  */
-static int i2c_outb(struct i2c_adapter *i2c_adap, char c)
+static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c)
 {
         int i;
         int sb;
@@ -154,34 +168,32 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, char c)
 
         /* assert: scl is low */
         for ( i=7 ; i>=0 ; i-- ) {
-                sb = c & ( 1 << i );
+                sb = (c >> i) & 1;
                 setsda(adap,sb);
-                udelay(adap->udelay);
-                DEBPROTO(printk(KERN_DEBUG "%d",sb!=0));
+                udelay((adap->udelay + 1) / 2);
                 if (sclhi(adap)<0) { /* timed out */
-                        sdahi(adap); /* we don't want to block the net */
-                        DEB2(printk(KERN_DEBUG " i2c_outb: 0x%02x, timeout at bit #%d\n", c&0xff, i));
+                        bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
+                                "timeout at bit #%d\n", (int)c, i);
                         return -ETIMEDOUT;
                 };
                 /* do arbitration here: 
                  * if ( sb && ! getsda(adap) ) -> ouch! Get out of here.
                  */
-                setscl(adap, 0 );
-                udelay(adap->udelay);
+                scllo(adap);
         }
         sdahi(adap);
         if (sclhi(adap)<0){ /* timeout */
-            DEB2(printk(KERN_DEBUG " i2c_outb: 0x%02x, timeout at ack\n", c&0xff));
-            return -ETIMEDOUT;
+                bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
+                        "timeout at ack\n", (int)c);
+                return -ETIMEDOUT;
         };
         /* read ack: SDA should be pulled down by slave */
-        ack=getsda(adap);       /* ack: sda is pulled low ->success.     */
-        DEB2(printk(KERN_DEBUG " i2c_outb: 0x%02x , getsda() = %d\n", c & 0xff, ack));
+        ack = !getsda(adap);    /* ack: sda is pulled low -> success */
+        bit_dbg(2, &i2c_adap->dev, "i2c_outb: 0x%02x %s\n", (int)c,
+                ack ? "A" : "NA");
 
-        DEBPROTO( printk(KERN_DEBUG "[%2.2x]",c&0xff) );
-        DEBPROTO(if (0==ack){ printk(KERN_DEBUG " A ");} else printk(KERN_DEBUG " NA ") );
         scllo(adap);
-        return 0==ack;          /* return 1 if device acked      */
+        return ack;
         /* assert: scl is low (sda undef) */
 }
 
@@ -198,19 +210,18 @@ static int i2c_inb(struct i2c_adapter *i2c_adap)
         sdahi(adap);
         for (i=0;i<8;i++) {
                 if (sclhi(adap)<0) { /* timeout */
-                        DEB2(printk(KERN_DEBUG " i2c_inb: timeout at bit #%d\n", 7-i));
+                        bit_dbg(1, &i2c_adap->dev, "i2c_inb: timeout at bit "
+                                "#%d\n", 7 - i);
                         return -ETIMEDOUT;
                 };
                 indata *= 2;
                 if ( getsda(adap) ) 
                         indata |= 0x01;
-                scllo(adap);
+                setscl(adap, 0);
+                udelay(i == 7 ? adap->udelay / 2 : adap->udelay);
         }
         /* assert: scl is low */
-        DEB2(printk(KERN_DEBUG "i2c_inb: 0x%02x\n", indata & 0xff));
-
-        DEBPROTO(printk(KERN_DEBUG " 0x%02x", indata & 0xff));
-        return (int) (indata & 0xff);
+        return indata;
 }
 
 /*
@@ -221,73 +232,67 @@ static int test_bus(struct i2c_algo_bit_data *adap, char* name) {
         int scl,sda;
 
         if (adap->getscl==NULL)
-                printk(KERN_INFO "i2c-algo-bit.o: Testing SDA only, "
-                        "SCL is not readable.\n");
+                pr_info("%s: Testing SDA only, SCL is not readable\n", name);
 
         sda=getsda(adap);
         scl=(adap->getscl==NULL?1:getscl(adap));
-        printk(KERN_DEBUG "i2c-algo-bit.o: (0) scl=%d, sda=%d\n",scl,sda);
         if (!scl || !sda ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: %s seems to be busy.\n", name);
+                printk(KERN_WARNING "%s: bus seems to be busy\n", name);
                 goto bailout;
         }
 
         sdalo(adap);
         sda=getsda(adap);
         scl=(adap->getscl==NULL?1:getscl(adap));
-        printk(KERN_DEBUG "i2c-algo-bit.o: (1) scl=%d, sda=%d\n",scl,sda);
         if ( 0 != sda ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SDA stuck high!\n");
+                printk(KERN_WARNING "%s: SDA stuck high!\n", name);
                 goto bailout;
         }
         if ( 0 == scl ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SCL unexpected low "
-                        "while pulling SDA low!\n");
+                printk(KERN_WARNING "%s: SCL unexpected low "
+                       "while pulling SDA low!\n", name);
                 goto bailout;
         }               
 
         sdahi(adap);
         sda=getsda(adap);
         scl=(adap->getscl==NULL?1:getscl(adap));
-        printk(KERN_DEBUG "i2c-algo-bit.o: (2) scl=%d, sda=%d\n",scl,sda);
         if ( 0 == sda ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SDA stuck low!\n");
+                printk(KERN_WARNING "%s: SDA stuck low!\n", name);
                 goto bailout;
         }
         if ( 0 == scl ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SCL unexpected low "
-                        "while pulling SDA high!\n");
+                printk(KERN_WARNING "%s: SCL unexpected low "
+                       "while pulling SDA high!\n", name);
                 goto bailout;
         }
 
         scllo(adap);
         sda=getsda(adap);
         scl=(adap->getscl==NULL?0:getscl(adap));
-        printk(KERN_DEBUG "i2c-algo-bit.o: (3) scl=%d, sda=%d\n",scl,sda);
         if ( 0 != scl ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SCL stuck high!\n");
+                printk(KERN_WARNING "%s: SCL stuck high!\n", name);
                 goto bailout;
         }
         if ( 0 == sda ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SDA unexpected low "
-                        "while pulling SCL low!\n");
+                printk(KERN_WARNING "%s: SDA unexpected low "
+                       "while pulling SCL low!\n", name);
                 goto bailout;
         }
         
         sclhi(adap);
         sda=getsda(adap);
         scl=(adap->getscl==NULL?1:getscl(adap));
-        printk(KERN_DEBUG "i2c-algo-bit.o: (4) scl=%d, sda=%d\n",scl,sda);
         if ( 0 == scl ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SCL stuck low!\n");
+                printk(KERN_WARNING "%s: SCL stuck low!\n", name);
                 goto bailout;
         }
         if ( 0 == sda ) {
-                printk(KERN_WARNING "i2c-algo-bit.o: SDA unexpected low "
-                        "while pulling SCL high!\n");
+                printk(KERN_WARNING "%s: SDA unexpected low "
+                       "while pulling SCL high!\n", name);
                 goto bailout;
         }
-        printk(KERN_INFO "i2c-algo-bit.o: %s passed test.\n",name);
+        pr_info("%s: Test OK\n", name);
         return 0;
 bailout:
         sdahi(adap);
@@ -312,44 +317,39 @@ static int try_address(struct i2c_adapter *i2c_adap,
         int i,ret = -1;
         for (i=0;i<=retries;i++) {
                 ret = i2c_outb(i2c_adap,addr);
-                if (ret==1)
-                        break;  /* success! */
-                i2c_stop(adap);
-                udelay(5/*adap->udelay*/);
-                if (i==retries)  /* no success */
+                if (ret == 1 || i == retries)
                         break;
-                i2c_start(adap);
+                bit_dbg(3, &i2c_adap->dev, "emitting stop condition\n");
+                i2c_stop(adap);
                 udelay(adap->udelay);
+                yield();
+                bit_dbg(3, &i2c_adap->dev, "emitting start condition\n");
+                i2c_start(adap);
         }
-        DEB2(if (i)
-             printk(KERN_DEBUG "i2c-algo-bit.o: Used %d tries to %s client at 0x%02x : %s\n",
-                    i+1, addr & 1 ? "read" : "write", addr>>1,
-                    ret==1 ? "success" : ret==0 ? "no ack" : "failed, timeout?" )
-            );
+        if (i && ret)
+                bit_dbg(1, &i2c_adap->dev, "Used %d tries to %s client at "
+                        "0x%02x: %s\n", i + 1,
+                        addr & 1 ? "read from" : "write to", addr >> 1,
+                        ret == 1 ? "success" : "failed, timeout?");
         return ret;
 }
 
 static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
 {
-        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
-        char c;
-        const char *temp = msg->buf;
+        const unsigned char *temp = msg->buf;
         int count = msg->len;
         unsigned short nak_ok = msg->flags & I2C_M_IGNORE_NAK; 
         int retval;
         int wrcount=0;
 
         while (count > 0) {
-                c = *temp;
-                DEB2(dev_dbg(&i2c_adap->dev, "sendbytes: writing %2.2X\n", c&0xff));
-                retval = i2c_outb(i2c_adap,c);
+                retval = i2c_outb(i2c_adap, *temp);
                 if ((retval>0) || (nak_ok && (retval==0)))  { /* ok or ignored NAK */
                         count--; 
                         temp++;
                         wrcount++;
                 } else { /* arbitration or no acknowledge */
                         dev_err(&i2c_adap->dev, "sendbytes: error - bailout.\n");
-                        i2c_stop(adap);
                         return (retval<0)? retval : -EFAULT;
                                 /* got a better one ?? */
                 }
@@ -362,7 +362,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
         int inval;
         int rdcount=0;          /* counts bytes read */
         struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
-        char *temp = msg->buf;
+        unsigned char *temp = msg->buf;
         int count = msg->len;
 
         while (count > 0) {
@@ -371,30 +371,44 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         *temp = inval;
                         rdcount++;
                 } else {   /* read timed out */
-                        printk(KERN_ERR "i2c-algo-bit.o: readbytes: i2c_inb timed out.\n");
                         break;
                 }
 
                 temp++;
                 count--;
 
-                if (msg->flags & I2C_M_NO_RD_ACK)
+                if (msg->flags & I2C_M_NO_RD_ACK) {
+                        bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n",
+                                inval);
                         continue;
-
-                if ( count > 0 ) {              /* send ack */
-                        sdalo(adap);
-                        DEBPROTO(printk(" Am "));
-                } else {
-                        sdahi(adap);    /* neg. ack on last byte */
-                        DEBPROTO(printk(" NAm "));
                 }
+
+                /* assert: sda is high */
+                if (count)              /* send ack */
+                        setsda(adap, 0);
+                udelay((adap->udelay + 1) / 2);
+                bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval,
+                        count ? "A" : "NA");
                 if (sclhi(adap)<0) {    /* timeout */
-                        sdahi(adap);
-                        printk(KERN_ERR "i2c-algo-bit.o: readbytes: Timeout at ack\n");
+                        dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n");
                         return -ETIMEDOUT;
                 };
                 scllo(adap);
-                sdahi(adap);
+
+                /* Some SMBus transactions require that we receive the
+                   transaction length as the first read byte. */
+                if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) {
+                        if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
+                                dev_err(&i2c_adap->dev, "readbytes: invalid "
+                                        "block length (%d)\n", inval);
+                                return -EREMOTEIO;
+                        }
+                        /* The original count value accounts for the extra
+                           bytes, that is, either 1 for a regular transaction,
+                           or 2 for a PEC transaction. */
+                        count += inval;
+                        msg->len += inval;
+                }
         }
         return rdcount;
 }
@@ -421,27 +435,31 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
         if ( (flags & I2C_M_TEN)  ) { 
                 /* a ten bit address */
                 addr = 0xf0 | (( msg->addr >> 7) & 0x03);
-                DEB2(printk(KERN_DEBUG "addr0: %d\n",addr));
+                bit_dbg(2, &i2c_adap->dev, "addr0: %d\n", addr);
                 /* try extended address code...*/
                 ret = try_address(i2c_adap, addr, retries);
                 if ((ret != 1) && !nak_ok)  {
-                        printk(KERN_ERR "died at extended address code.\n");
+                        dev_err(&i2c_adap->dev,
+                                "died at extended address code\n");
                         return -EREMOTEIO;
                 }
                 /* the remaining 8 bit address */
                 ret = i2c_outb(i2c_adap,msg->addr & 0x7f);
                 if ((ret != 1) && !nak_ok) {
                         /* the chip did not ack / xmission error occurred */
-                        printk(KERN_ERR "died at 2nd address code.\n");
+                        dev_err(&i2c_adap->dev, "died at 2nd address code\n");
                         return -EREMOTEIO;
                 }
                 if ( flags & I2C_M_RD ) {
+                        bit_dbg(3, &i2c_adap->dev, "emitting repeated "
+                                "start condition\n");
                         i2c_repstart(adap);
                         /* okay, now switch into reading mode */
                         addr |= 0x01;
                         ret = try_address(i2c_adap, addr, retries);
                         if ((ret!=1) && !nak_ok) {
-                                printk(KERN_ERR "died at extended address code.\n");
+                                dev_err(&i2c_adap->dev,
+                                        "died at repeated address code\n");
                                 return -EREMOTEIO;
                         }
                 }
@@ -468,44 +486,62 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
         int i,ret;
         unsigned short nak_ok;
 
+        bit_dbg(3, &i2c_adap->dev, "emitting start condition\n");
         i2c_start(adap);
         for (i=0;i<num;i++) {
                 pmsg = &msgs[i];
                 nak_ok = pmsg->flags & I2C_M_IGNORE_NAK; 
                 if (!(pmsg->flags & I2C_M_NOSTART)) {
                         if (i) {
+                                bit_dbg(3, &i2c_adap->dev, "emitting "
+                                        "repeated start condition\n");
                                 i2c_repstart(adap);
                         }
                         ret = bit_doAddress(i2c_adap, pmsg);
                         if ((ret != 0) && !nak_ok) {
-                            DEB2(printk(KERN_DEBUG "i2c-algo-bit.o: NAK from device addr %2.2x msg #%d\n"
-                                        ,msgs[i].addr,i));
-                            return (ret<0) ? ret : -EREMOTEIO;
+                                bit_dbg(1, &i2c_adap->dev, "NAK from "
+                                        "device addr 0x%02x msg #%d\n",
+                                        msgs[i].addr, i);
+                                goto bailout;
                         }
                 }
                 if (pmsg->flags & I2C_M_RD ) {
                         /* read bytes into buffer*/
                         ret = readbytes(i2c_adap, pmsg);
-                        DEB2(printk(KERN_DEBUG "i2c-algo-bit.o: read %d bytes.\n",ret));
-                        if (ret < pmsg->len ) {
-                                return (ret<0)? ret : -EREMOTEIO;
+                        if (ret >= 1)
+                                bit_dbg(2, &i2c_adap->dev, "read %d byte%s\n",
+                                        ret, ret == 1 ? "" : "s");
+                        if (ret < pmsg->len) {
+                                if (ret >= 0)
+                                        ret = -EREMOTEIO;
+                                goto bailout;
                         }
                 } else {
                         /* write bytes from buffer */
                         ret = sendbytes(i2c_adap, pmsg);
-                        DEB2(printk(KERN_DEBUG "i2c-algo-bit.o: wrote %d bytes.\n",ret));
-                        if (ret < pmsg->len ) {
-                                return (ret<0) ? ret : -EREMOTEIO;
+                        if (ret >= 1)
+                                bit_dbg(2, &i2c_adap->dev, "wrote %d byte%s\n",
+                                        ret, ret == 1 ? "" : "s");
+                        if (ret < pmsg->len) {
+                                if (ret >= 0)
+                                        ret = -EREMOTEIO;
+                                goto bailout;
                         }
                 }
         }
+        ret = i;
+
+bailout:
+        bit_dbg(3, &i2c_adap->dev, "emitting stop condition\n");
         i2c_stop(adap);
-        return num;
+        return ret;
 }
 
 static u32 bit_func(struct i2c_adapter *adap)
 {
         return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | 
+               I2C_FUNC_SMBUS_READ_BLOCK_DATA |
+               I2C_FUNC_SMBUS_BLOCK_PROC_CALL |
                I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
 }
 
@@ -520,7 +556,7 @@ static const struct i2c_algorithm i2c_bit_algo = {
 /* 
  * registering functions to load algorithms at runtime 
  */
-int i2c_bit_add_bus(struct i2c_adapter *adap)
+static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
 {
         struct i2c_algo_bit_data *bit_adap = adap->algo_data;
 
@@ -530,25 +566,39 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
                         return -ENODEV;
         }
 
-        DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
-
         /* register new adapter to i2c module... */
         adap->algo = &i2c_bit_algo;
 
         adap->timeout = 100;    /* default values, should       */
         adap->retries = 3;      /* be replaced by defines       */
 
+        return 0;
+}
+
+int i2c_bit_add_bus(struct i2c_adapter *adap)
+{
+        int err;
+
+        err = i2c_bit_prepare_bus(adap);
+        if (err)
+                return err;
+
         return i2c_add_adapter(adap);
 }
 EXPORT_SYMBOL(i2c_bit_add_bus);
 
+int i2c_bit_add_numbered_bus(struct i2c_adapter *adap)
+{
+        int err;
+
+        err = i2c_bit_prepare_bus(adap);
+        if (err)
+                return err;
+
+        return i2c_add_numbered_adapter(adap);
+}
+EXPORT_SYMBOL(i2c_bit_add_numbered_bus);
+
 MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
 MODULE_DESCRIPTION("I2C-Bus bit-banging algorithm");
 MODULE_LICENSE("GPL");
-
-module_param(bit_test, bool, 0);
-module_param(i2c_debug, int, S_IRUGO | S_IWUSR);
-
-MODULE_PARM_DESC(bit_test, "Test the lines of the bus to see if it is stuck");
-MODULE_PARM_DESC(i2c_debug,
-                 "debug level - 0 off; 1 normal; 2,3 more verbose; 9 bit-protocol");
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index ac2d5053078a..6eaf145e1ada 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -1,6 +1,7 @@
 /*
- * i2c-algo-sgi.c: i2c driver algorithms for SGI adapters.
- * 
+ * i2c-algo-sgi.c: i2c driver algorithm used by the VINO (SGI Indy) and
+ * MACE (SGI O2) chips.
+ *
  * This file is subject to the terms and conditions of the GNU General Public
  * License version 2 as published by the Free Software Foundation.
  *
@@ -162,8 +163,8 @@ static const struct i2c_algorithm sgi_algo = {
         .functionality  = sgi_func,
 };
 
-/* 
- * registering functions to load algorithms at runtime 
+/*
+ * registering functions to load algorithms at runtime
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index ece31d2c6c64..838dc1c19d61 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "I2C Hardware Bus support"
-        depends on I2C
 
 config I2C_ALI1535
         tristate "ALI 1535"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the SMB
           Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -19,7 +18,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
         tristate "ALI 1563"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on PCI && EXPERIMENTAL
         help
           If you say yes to this option, support will be included for the SMB
           Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -31,7 +30,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
         tristate "ALI 15x3"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the
           Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +40,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
         tristate "AMD 756/766/768/8111 and nVidia nForce"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the AMD
           756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -66,7 +65,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
         tristate "AMD 8111"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the
           second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -76,14 +75,14 @@ config I2C_AMD8111
 
 config I2C_AT91
         tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
-        depends on I2C && ARCH_AT91 && EXPERIMENTAL
+        depends on ARCH_AT91 && EXPERIMENTAL
         help
           This supports the use of the I2C interface on Atmel AT91
           processors.
 
 config I2C_AU1550
         tristate "Au1550/Au1200 SMBus interface"
-        depends on I2C && (SOC_AU1550 || SOC_AU1200)
+        depends on SOC_AU1550 || SOC_AU1200
         help
           If you say yes to this option, support will be included for the
           Au1550 and Au1200 SMBus interface.
@@ -91,9 +90,25 @@ config I2C_AU1550
           This driver can also be built as a module.  If so, the module
           will be called i2c-au1550.
 
+config I2C_BLACKFIN_TWI
+        tristate "Blackfin TWI I2C support"
+        depends on BF534 || BF536 || BF537
+        help
+          This is the TWI I2C device driver for Blackfin 534/536/537.
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-bfin-twi.
+
+config I2C_BLACKFIN_TWI_CLK_KHZ
+        int "Blackfin TWI I2C clock (kHz)"
+        depends on I2C_BLACKFIN_TWI
+        range 10 400
+        default 50
+        help
+          The unit of the TWI clock is kHz.
+
 config I2C_ELEKTOR
         tristate "Elektor ISA card"
-        depends on I2C && ISA && BROKEN_ON_SMP
+        depends on ISA && BROKEN_ON_SMP
         select I2C_ALGOPCF
         help
           This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
@@ -102,9 +117,17 @@ config I2C_ELEKTOR
           This support is also available as a module.  If so, the module 
           will be called i2c-elektor.
 
+config I2C_GPIO
+        tristate "GPIO-based bitbanging I2C"
+        depends on GENERIC_GPIO
+        select I2C_ALGOBIT
+        help
+          This is a very simple bitbanging I2C driver utilizing the
+          arch-neutral GPIO API to control the SCL and SDA lines.
+
 config I2C_HYDRA
         tristate "CHRP Apple Hydra Mac I/O I2C interface"
-        depends on I2C && PCI && PPC_CHRP && EXPERIMENTAL
+        depends on PCI && PPC_CHRP && EXPERIMENTAL
         select I2C_ALGOBIT
         help
           This supports the use of the I2C interface in the Apple Hydra Mac
@@ -116,7 +139,7 @@ config I2C_HYDRA
 
 config I2C_I801
         tristate "Intel 82801 (ICH)"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the Intel
           801 family of mainboard I2C interfaces.  Specifically, the following
@@ -139,7 +162,7 @@ config I2C_I801
 
 config I2C_I810
         tristate "Intel 810/815"
-        depends on I2C && PCI
+        depends on PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the Intel
@@ -156,7 +179,7 @@ config I2C_I810
 
 config I2C_PXA
         tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
-        depends on I2C && EXPERIMENTAL && ARCH_PXA
+        depends on EXPERIMENTAL && ARCH_PXA
         help
           If you have devices in the PXA I2C bus, say yes to this option.
           This driver can also be built as a module.  If so, the module
@@ -172,7 +195,7 @@ config I2C_PXA_SLAVE
 
 config I2C_PIIX4
         tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the Intel
           PIIX4 family of mainboard I2C interfaces.  Specifically, the following
@@ -195,7 +218,7 @@ config I2C_PIIX4
 
 config I2C_IBM_IIC
         tristate "IBM PPC 4xx on-chip I2C interface"
-        depends on IBM_OCP && I2C
+        depends on IBM_OCP
         help
           Say Y here if you want to use IIC peripheral found on 
           embedded IBM PPC 4xx based systems. 
@@ -205,7 +228,7 @@ config I2C_IBM_IIC
 
 config I2C_IOP3XX
         tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
-        depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
+        depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
         help
           Say Y here if you want to use the IIC bus controller on
           the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
@@ -215,11 +238,10 @@ config I2C_IOP3XX
 
 config I2C_ISA
         tristate
-        depends on I2C
 
 config I2C_IXP4XX
-        tristate "IXP4xx GPIO-Based I2C Interface"
-        depends on I2C && ARCH_IXP4XX
+        tristate "IXP4xx GPIO-Based I2C Interface (DEPRECATED)"
+        depends on ARCH_IXP4XX
         select I2C_ALGOBIT
         help
           Say Y here if you have an Intel IXP4xx(420,421,422,425) based 
@@ -228,9 +250,12 @@ config I2C_IXP4XX
           This support is also available as a module. If so, the module
           will be called i2c-ixp4xx.
 
+          This driver is deprecated and will be dropped soon. Use i2c-gpio
+          instead.
+
 config I2C_IXP2000
-        tristate "IXP2000 GPIO-Based I2C Interface"
-        depends on I2C && ARCH_IXP2000
+        tristate "IXP2000 GPIO-Based I2C Interface (DEPRECATED)"
+        depends on ARCH_IXP2000
         select I2C_ALGOBIT
         help
           Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based 
@@ -239,9 +264,12 @@ config I2C_IXP2000
           This support is also available as a module. If so, the module
           will be called i2c-ixp2000.
 
+          This driver is deprecated and will be dropped soon. Use i2c-gpio
+          instead.
+
 config I2C_POWERMAC
         tristate "Powermac I2C interface"
-        depends on I2C && PPC_PMAC
+        depends on PPC_PMAC
         default y
         help
           This exposes the various PowerMac i2c interfaces to the linux i2c
@@ -253,7 +281,7 @@ config I2C_POWERMAC
 
 config I2C_MPC
         tristate "MPC107/824x/85xx/52xx/86xx"
-        depends on I2C && PPC32
+        depends on PPC32
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
@@ -265,7 +293,7 @@ config I2C_MPC
 
 config I2C_NFORCE2
         tristate "Nvidia nForce2, nForce3 and nForce4"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the Nvidia
           nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
@@ -275,7 +303,7 @@ config I2C_NFORCE2
 
 config I2C_OCORES
         tristate "OpenCores I2C Controller"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes to this option, support will be included for the
           OpenCores I2C controller. For details see
@@ -286,7 +314,7 @@ config I2C_OCORES
 
 config I2C_OMAP
         tristate "OMAP I2C adapter"
-        depends on I2C && ARCH_OMAP
+        depends on ARCH_OMAP
         default y if MACH_OMAP_H3 || MACH_OMAP_OSK
         help
           If you say yes to this option, support will be included for the
@@ -296,7 +324,7 @@ config I2C_OMAP
 
 config I2C_PARPORT
         tristate "Parallel port adapter"
-        depends on I2C && PARPORT
+        depends on PARPORT
         select I2C_ALGOBIT
         help
           This supports parallel port I2C adapters such as the ones made by
@@ -320,7 +348,6 @@ config I2C_PARPORT
 
 config I2C_PARPORT_LIGHT
         tristate "Parallel port adapter (light)"
-        depends on I2C
         select I2C_ALGOBIT
         help
           This supports parallel port I2C adapters such as the ones made by
@@ -344,13 +371,13 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PASEMI
         tristate "PA Semi SMBus interface"
-        depends on PPC_PASEMI && I2C && PCI
+        depends on PPC_PASEMI && PCI
         help
           Supports the PA Semi PWRficient on-chip SMBus interfaces.
 
 config I2C_PROSAVAGE
         tristate "S3/VIA (Pro)Savage"
-        depends on I2C && PCI
+        depends on PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
@@ -365,19 +392,19 @@ config I2C_PROSAVAGE
 
 config I2C_RPXLITE
         tristate "Embedded Planet RPX Lite/Classic support"
-        depends on (RPXLITE || RPXCLASSIC) && I2C
+        depends on RPXLITE || RPXCLASSIC
         select I2C_ALGO8XX
 
 config I2C_S3C2410
         tristate "S3C2410 I2C Driver"
-        depends on I2C && ARCH_S3C2410
+        depends on ARCH_S3C2410
         help
           Say Y here to include support for I2C controller in the
           Samsung S3C2410 based System-on-Chip devices.
 
 config I2C_SAVAGE4
         tristate "S3 Savage 4"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on PCI && EXPERIMENTAL
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the 
@@ -388,13 +415,25 @@ config I2C_SAVAGE4
 
 config I2C_SIBYTE
         tristate "SiByte SMBus interface"
-        depends on SIBYTE_SB1xxx_SOC && I2C
+        depends on SIBYTE_SB1xxx_SOC
         help
           Supports the SiByte SOC on-chip I2C interfaces (2 channels).
 
+config I2C_SIMTEC
+        tristate "Simtec Generic I2C interface"
+        select I2C_ALGOBIT
+        help
+          If you say yes to this option, support will be inclyded for
+          the Simtec Generic I2C interface. This driver is for the
+          simple I2C bus used on newer Simtec products for general
+          I2C, such as DDC on the Simtec BBD2016A.
+
+          This driver can also be build as a module. If so, the module
+          will be called i2c-simtec.
+
 config SCx200_I2C
-        tristate "NatSemi SCx200 I2C using GPIO pins"
-        depends on SCx200_GPIO && I2C
+        tristate "NatSemi SCx200 I2C using GPIO pins (DEPRECATED)"
+        depends on SCx200_GPIO
         select I2C_ALGOBIT
         help
           Enable the use of two GPIO pins of a SCx200 processor as an I2C bus.
@@ -404,6 +443,9 @@ config SCx200_I2C
           This support is also available as a module.  If so, the module 
           will be called scx200_i2c.
 
+          This driver is deprecated and will be dropped soon. Use i2c-gpio
+          (or scx200_acb) instead.
+
 config SCx200_I2C_SCL
         int "GPIO pin used for SCL"
         depends on SCx200_I2C
@@ -422,7 +464,7 @@ config SCx200_I2C_SDA
 
 config SCx200_ACB
         tristate "Geode ACCESS.bus support"
-        depends on X86_32 && I2C && PCI
+        depends on X86_32 && PCI
         help
           Enable the use of the ACCESS.bus controllers on the Geode SCx200 and
           SC1100 processors and the CS5535 and CS5536 Geode companion devices.
@@ -434,7 +476,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
         tristate "SiS 5595"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the 
           SiS5595 SMBus (a subset of I2C) interface.
@@ -444,7 +486,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
         tristate "SiS 630/730"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the 
           SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -454,7 +496,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
         tristate "SiS 96x"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the SiS
           96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -472,7 +514,7 @@ config I2C_SIS96X
 
 config I2C_STUB
         tristate "I2C/SMBus Test Stub"
-        depends on I2C && EXPERIMENTAL && 'm'
+        depends on EXPERIMENTAL && m
         default 'n'
         help
           This module may be useful to developers of SMBus client drivers,
@@ -483,9 +525,20 @@ config I2C_STUB
 
           If you don't know what to do here, definitely say N.
 
+config I2C_TINY_USB
+        tristate "I2C-Tiny-USB"
+        depends on USB
+        help
+          If you say yes to this option, support will be included for the
+          i2c-tiny-usb, a simple do-it-yourself USB to I2C interface. See
+          http://www.harbaum.org/till/i2c_tiny_usb for hardware details.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-tiny-usb.
+
 config I2C_VERSATILE
         tristate "ARM Versatile/Realview I2C bus support"
-        depends on I2C && (ARCH_VERSATILE || ARCH_REALVIEW)
+        depends on ARCH_VERSATILE || ARCH_REALVIEW
         select I2C_ALGOBIT
         help
           Say yes if you want to support the I2C serial bus on ARMs Versatile
@@ -496,7 +549,7 @@ config I2C_VERSATILE
 
 config I2C_ACORN
         bool "Acorn IOC/IOMD I2C bus support"
-        depends on I2C && ARCH_ACORN
+        depends on ARCH_ACORN
         default y
         select I2C_ALGOBIT
         help
@@ -506,7 +559,7 @@ config I2C_ACORN
 
 config I2C_VIA
         tristate "VIA 82C586B"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on PCI && EXPERIMENTAL
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the VIA
@@ -517,7 +570,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
         tristate "VIA VT82C596/82C686/82xx and CX700"
-        depends on I2C && PCI
+        depends on PCI
         help
           If you say yes to this option, support will be included for the VIA
           VT82C596 and later SMBus interface.  Specifically, the following
@@ -536,7 +589,7 @@ config I2C_VIAPRO
 
 config I2C_VOODOO3
         tristate "Voodoo 3"
-        depends on I2C && PCI
+        depends on PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
@@ -547,7 +600,7 @@ config I2C_VOODOO3
 
 config I2C_PCA_ISA
         tristate "PCA9564 on an ISA bus"
-        depends on I2C
+        depends on ISA
         select I2C_ALGOPCA
         default n
         help
@@ -564,7 +617,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
         tristate "Marvell mv64xxx I2C Controller"
-        depends on I2C && MV64X60 && EXPERIMENTAL
+        depends on MV64X60 && EXPERIMENTAL
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Marvell 64xxx line of host bridges.
@@ -574,7 +627,7 @@ config I2C_MV64XXX
 
 config I2C_PNX
         tristate "I2C bus support for Philips PNX targets"
-        depends on ARCH_PNX4008 && I2C
+        depends on ARCH_PNX4008
         help
           This driver supports the Philips IP3204 I2C IP block master and/or
           slave controller
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 290b54018354..14d1432f698b 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -10,7 +10,9 @@ obj-$(CONFIG_I2C_AMD756_S4882)	+= i2c-amd756-s4882.o
 obj-$(CONFIG_I2C_AMD8111)       += i2c-amd8111.o
 obj-$(CONFIG_I2C_AT91)          += i2c-at91.o
 obj-$(CONFIG_I2C_AU1550)        += i2c-au1550.o
+obj-$(CONFIG_I2C_BLACKFIN_TWI)  += i2c-bfin-twi.o
 obj-$(CONFIG_I2C_ELEKTOR)       += i2c-elektor.o
+obj-$(CONFIG_I2C_GPIO)          += i2c-gpio.o
 obj-$(CONFIG_I2C_HYDRA)         += i2c-hydra.o
 obj-$(CONFIG_I2C_I801)          += i2c-i801.o
 obj-$(CONFIG_I2C_I810)          += i2c-i810.o
@@ -37,10 +39,12 @@ obj-$(CONFIG_I2C_RPXLITE)	+= i2c-rpx.o
 obj-$(CONFIG_I2C_S3C2410)       += i2c-s3c2410.o
 obj-$(CONFIG_I2C_SAVAGE4)       += i2c-savage4.o
 obj-$(CONFIG_I2C_SIBYTE)        += i2c-sibyte.o
+obj-$(CONFIG_I2C_SIMTEC)        += i2c-simtec.o
 obj-$(CONFIG_I2C_SIS5595)       += i2c-sis5595.o
 obj-$(CONFIG_I2C_SIS630)        += i2c-sis630.o
 obj-$(CONFIG_I2C_SIS96X)        += i2c-sis96x.o
 obj-$(CONFIG_I2C_STUB)          += i2c-stub.o
+obj-$(CONFIG_I2C_TINY_USB)      += i2c-tiny-usb.o
 obj-$(CONFIG_I2C_VERSATILE)     += i2c-versatile.o
 obj-$(CONFIG_I2C_ACORN)         += i2c-acorn.o
 obj-$(CONFIG_I2C_VIA)           += i2c-via.o
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 1e277ba5a9f3..f14372ac2fc5 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -497,7 +497,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
         /* set up the sysfs linkage to our parent device */
         ali1535_adapter.dev.parent = &dev->dev;
 
-        snprintf(ali1535_adapter.name, I2C_NAME_SIZE, 
+        snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name),
                 "SMBus ALI1535 adapter at %04x", ali1535_smba);
         return i2c_add_adapter(&ali1535_adapter);
 }
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index e47fe01bf42a..93bf87d70961 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -492,7 +492,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
         /* set up the sysfs linkage to our parent device */
         ali15x3_adapter.dev.parent = &dev->dev;
 
-        snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,
+        snprintf(ali15x3_adapter.name, sizeof(ali15x3_adapter.name),
                 "SMBus ALI15X3 adapter at %04x", ali15x3_smba);
         return i2c_add_adapter(&ali15x3_adapter);
 }
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 0c70f8293341..c9fca7b49267 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -365,7 +365,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
         }
 
         smbus->adapter.owner = THIS_MODULE;
-        snprintf(smbus->adapter.name, I2C_NAME_SIZE,
+        snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
                 "SMBus2 AMD8111 adapter at %04x", smbus->base);
         smbus->adapter.id = I2C_HW_SMBUS_AMD8111;
         smbus->adapter.class = I2C_CLASS_HWMON;
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 67f91bdda089..f35156c58922 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -17,7 +17,6 @@
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
new file mode 100644
index 000000000000..6311039dfe60
--- /dev/null
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -0,0 +1,644 @@
+/*
+ * drivers/i2c/busses/i2c-bfin-twi.c
+ *
+ * Description: Driver for Blackfin Two Wire Interface
+ *
+ * Author:      sonicz  <sonic.zhang@analog.com>
+ *
+ * Copyright (c) 2005-2007 Analog Devices, 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 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/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/mm.h>
+#include <linux/timer.h>
+#include <linux/spinlock.h>
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+
+#include <asm/blackfin.h>
+#include <asm/irq.h>
+
+#define POLL_TIMEOUT       (2 * HZ)
+
+/* SMBus mode*/
+#define TWI_I2C_MODE_STANDARD           0x01
+#define TWI_I2C_MODE_STANDARDSUB        0x02
+#define TWI_I2C_MODE_COMBINED           0x04
+
+struct bfin_twi_iface {
+        struct mutex            twi_lock;
+        int                     irq;
+        spinlock_t              lock;
+        char                    read_write;
+        u8                      command;
+        u8                      *transPtr;
+        int                     readNum;
+        int                     writeNum;
+        int                     cur_mode;
+        int                     manual_stop;
+        int                     result;
+        int                     timeout_count;
+        struct timer_list       timeout_timer;
+        struct i2c_adapter      adap;
+        struct completion       complete;
+};
+
+static struct bfin_twi_iface twi_iface;
+
+static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)
+{
+        unsigned short twi_int_status = bfin_read_TWI_INT_STAT();
+        unsigned short mast_stat = bfin_read_TWI_MASTER_STAT();
+
+        if (twi_int_status & XMTSERV) {
+                /* Transmit next data */
+                if (iface->writeNum > 0) {
+                        bfin_write_TWI_XMT_DATA8(*(iface->transPtr++));
+                        iface->writeNum--;
+                }
+                /* start receive immediately after complete sending in
+                 * combine mode.
+                 */
+                else if (iface->cur_mode == TWI_I2C_MODE_COMBINED) {
+                        bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL()
+                                | MDIR | RSTART);
+                } else if (iface->manual_stop)
+                        bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL()
+                                | STOP);
+                SSYNC();
+                /* Clear status */
+                bfin_write_TWI_INT_STAT(XMTSERV);
+                SSYNC();
+        }
+        if (twi_int_status & RCVSERV) {
+                if (iface->readNum > 0) {
+                        /* Receive next data */
+                        *(iface->transPtr) = bfin_read_TWI_RCV_DATA8();
+                        if (iface->cur_mode == TWI_I2C_MODE_COMBINED) {
+                                /* Change combine mode into sub mode after
+                                 * read first data.
+                                 */
+                                iface->cur_mode = TWI_I2C_MODE_STANDARDSUB;
+                                /* Get read number from first byte in block
+                                 * combine mode.
+                                 */
+                                if (iface->readNum == 1 && iface->manual_stop)
+                                        iface->readNum = *iface->transPtr + 1;
+                        }
+                        iface->transPtr++;
+                        iface->readNum--;
+                } else if (iface->manual_stop) {
+                        bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL()
+                                | STOP);
+                        SSYNC();
+                }
+                /* Clear interrupt source */
+                bfin_write_TWI_INT_STAT(RCVSERV);
+                SSYNC();
+        }
+        if (twi_int_status & MERR) {
+                bfin_write_TWI_INT_STAT(MERR);
+                bfin_write_TWI_INT_MASK(0);
+                bfin_write_TWI_MASTER_STAT(0x3e);
+                bfin_write_TWI_MASTER_CTL(0);
+                SSYNC();
+                iface->result = -1;
+                /* if both err and complete int stats are set, return proper
+                 * results.
+                 */
+                if (twi_int_status & MCOMP) {
+                        bfin_write_TWI_INT_STAT(MCOMP);
+                        bfin_write_TWI_INT_MASK(0);
+                        bfin_write_TWI_MASTER_CTL(0);
+                        SSYNC();
+                        /* If it is a quick transfer, only address bug no data,
+                         * not an err, return 1.
+                         */
+                        if (iface->writeNum == 0 && (mast_stat & BUFRDERR))
+                                iface->result = 1;
+                        /* If address not acknowledged return -1,
+                         * else return 0.
+                         */
+                        else if (!(mast_stat & ANAK))
+                                iface->result = 0;
+                }
+                complete(&iface->complete);
+                return;
+        }
+        if (twi_int_status & MCOMP) {
+                bfin_write_TWI_INT_STAT(MCOMP);
+                SSYNC();
+                if (iface->cur_mode == TWI_I2C_MODE_COMBINED) {
+                        if (iface->readNum == 0) {
+                                /* set the read number to 1 and ask for manual
+                                 * stop in block combine mode
+                                 */
+                                iface->readNum = 1;
+                                iface->manual_stop = 1;
+                                bfin_write_TWI_MASTER_CTL(
+                                        bfin_read_TWI_MASTER_CTL()
+                                        | (0xff << 6));
+                        } else {
+                                /* set the readd number in other
+                                 * combine mode.
+                                 */
+                                bfin_write_TWI_MASTER_CTL(
+                                        (bfin_read_TWI_MASTER_CTL() &
+                                        (~(0xff << 6))) |
+                                        ( iface->readNum << 6));
+                        }
+                        /* remove restart bit and enable master receive */
+                        bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() &
+                                ~RSTART);
+                        bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() |
+                                MEN | MDIR);
+                        SSYNC();
+                } else {
+                        iface->result = 1;
+                        bfin_write_TWI_INT_MASK(0);
+                        bfin_write_TWI_MASTER_CTL(0);
+                        SSYNC();
+                        complete(&iface->complete);
+                }
+        }
+}
+
+/* Interrupt handler */
+static irqreturn_t bfin_twi_interrupt_entry(int irq, void *dev_id)
+{
+        struct bfin_twi_iface *iface = dev_id;
+        unsigned long flags;
+
+        spin_lock_irqsave(&iface->lock, flags);
+        del_timer(&iface->timeout_timer);
+        bfin_twi_handle_interrupt(iface);
+        spin_unlock_irqrestore(&iface->lock, flags);
+        return IRQ_HANDLED;
+}
+
+static void bfin_twi_timeout(unsigned long data)
+{
+        struct bfin_twi_iface *iface = (struct bfin_twi_iface *)data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&iface->lock, flags);
+        bfin_twi_handle_interrupt(iface);
+        if (iface->result == 0) {
+                iface->timeout_count--;
+                if (iface->timeout_count > 0) {
+                        iface->timeout_timer.expires = jiffies + POLL_TIMEOUT;
+                        add_timer(&iface->timeout_timer);
+                } else {
+                        iface->result = -1;
+                        complete(&iface->complete);
+                }
+        }
+        spin_unlock_irqrestore(&iface->lock, flags);
+}
+
+/*
+ * Generic i2c master transfer entrypoint
+ */
+static int bfin_twi_master_xfer(struct i2c_adapter *adap,
+                                struct i2c_msg *msgs, int num)
+{
+        struct bfin_twi_iface *iface = adap->algo_data;
+        struct i2c_msg *pmsg;
+        int i, ret;
+        int rc = 0;
+
+        if (!(bfin_read_TWI_CONTROL() & TWI_ENA))
+                return -ENXIO;
+
+        mutex_lock(&iface->twi_lock);
+
+        while (bfin_read_TWI_MASTER_STAT() & BUSBUSY) {
+                mutex_unlock(&iface->twi_lock);
+                yield();
+                mutex_lock(&iface->twi_lock);
+        }
+
+        ret = 0;
+        for (i = 0; rc >= 0 && i < num; i++) {
+                pmsg = &msgs[i];
+                if (pmsg->flags & I2C_M_TEN) {
+                        dev_err(&(adap->dev), "i2c-bfin-twi: 10 bits addr "
+                                "not supported !\n");
+                        rc = -EINVAL;
+                        break;
+                }
+
+                iface->cur_mode = TWI_I2C_MODE_STANDARD;
+                iface->manual_stop = 0;
+                iface->transPtr = pmsg->buf;
+                iface->writeNum = iface->readNum = pmsg->len;
+                iface->result = 0;
+                iface->timeout_count = 10;
+                /* Set Transmit device address */
+                bfin_write_TWI_MASTER_ADDR(pmsg->addr);
+
+                /* FIFO Initiation. Data in FIFO should be
+                 *  discarded before start a new operation.
+                 */
+                bfin_write_TWI_FIFO_CTL(0x3);
+                SSYNC();
+                bfin_write_TWI_FIFO_CTL(0);
+                SSYNC();
+
+                if (pmsg->flags & I2C_M_RD)
+                        iface->read_write = I2C_SMBUS_READ;
+                else {
+                        iface->read_write = I2C_SMBUS_WRITE;
+                        /* Transmit first data */
+                        if (iface->writeNum > 0) {
+                                bfin_write_TWI_XMT_DATA8(*(iface->transPtr++));
+                                iface->writeNum--;
+                                SSYNC();
+                        }
+                }
+
+                /* clear int stat */
+                bfin_write_TWI_INT_STAT(MERR|MCOMP|XMTSERV|RCVSERV);
+
+                /* Interrupt mask . Enable XMT, RCV interrupt */
+                bfin_write_TWI_INT_MASK(MCOMP | MERR |
+                        ((iface->read_write == I2C_SMBUS_READ)?
+                        RCVSERV : XMTSERV));
+                SSYNC();
+
+                if (pmsg->len > 0 && pmsg->len <= 255)
+                        bfin_write_TWI_MASTER_CTL(pmsg->len << 6);
+                else if (pmsg->len > 255) {
+                        bfin_write_TWI_MASTER_CTL(0xff << 6);
+                        iface->manual_stop = 1;
+                } else
+                        break;
+
+                iface->timeout_timer.expires = jiffies + POLL_TIMEOUT;
+                add_timer(&iface->timeout_timer);
+
+                /* Master enable */
+                bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() | MEN |
+                        ((iface->read_write == I2C_SMBUS_READ) ? MDIR : 0) |
+                        ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ>100) ? FAST : 0));
+                SSYNC();
+
+                wait_for_completion(&iface->complete);
+
+                rc = iface->result;
+                if (rc == 1)
+                        ret++;
+                else if (rc == -1)
+                        break;
+        }
+
+        /* Release mutex */
+        mutex_unlock(&iface->twi_lock);
+
+        return ret;
+}
+
+/*
+ * SMBus type transfer entrypoint
+ */
+
+int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,
+                        unsigned short flags, char read_write,
+                        u8 command, int size, union i2c_smbus_data *data)
+{
+        struct bfin_twi_iface *iface = adap->algo_data;
+        int rc = 0;
+
+        if (!(bfin_read_TWI_CONTROL() & TWI_ENA))
+                return -ENXIO;
+
+        mutex_lock(&iface->twi_lock);
+
+        while (bfin_read_TWI_MASTER_STAT() & BUSBUSY) {
+                mutex_unlock(&iface->twi_lock);
+                yield();
+                mutex_lock(&iface->twi_lock);
+        }
+
+        iface->writeNum = 0;
+        iface->readNum = 0;
+
+        /* Prepare datas & select mode */
+        switch (size) {
+        case I2C_SMBUS_QUICK:
+                iface->transPtr = NULL;
+                iface->cur_mode = TWI_I2C_MODE_STANDARD;
+                break;
+        case I2C_SMBUS_BYTE:
+                if (data == NULL)
+                        iface->transPtr = NULL;
+                else {
+                        if (read_write == I2C_SMBUS_READ)
+                                iface->readNum = 1;
+                        else
+                                iface->writeNum = 1;
+                        iface->transPtr = &data->byte;
+                }
+                iface->cur_mode = TWI_I2C_MODE_STANDARD;
+                break;
+        case I2C_SMBUS_BYTE_DATA:
+                if (read_write == I2C_SMBUS_READ) {
+                        iface->readNum = 1;
+                        iface->cur_mode = TWI_I2C_MODE_COMBINED;
+                } else {
+                        iface->writeNum = 1;
+                        iface->cur_mode = TWI_I2C_MODE_STANDARDSUB;
+                }
+                iface->transPtr = &data->byte;
+                break;
+        case I2C_SMBUS_WORD_DATA:
+                if (read_write == I2C_SMBUS_READ) {
+                        iface->readNum = 2;
+                        iface->cur_mode = TWI_I2C_MODE_COMBINED;
+                } else {
+                        iface->writeNum = 2;
+                        iface->cur_mode = TWI_I2C_MODE_STANDARDSUB;
+                }
+                iface->transPtr = (u8 *)&data->word;
+                break;
+        case I2C_SMBUS_PROC_CALL:
+                iface->writeNum = 2;
+                iface->readNum = 2;
+                iface->cur_mode = TWI_I2C_MODE_COMBINED;
+                iface->transPtr = (u8 *)&data->word;
+                break;
+        case I2C_SMBUS_BLOCK_DATA:
+                if (read_write == I2C_SMBUS_READ) {
+                        iface->readNum = 0;
+                        iface->cur_mode = TWI_I2C_MODE_COMBINED;
+                } else {
+                        iface->writeNum = data->block[0] + 1;
+                        iface->cur_mode = TWI_I2C_MODE_STANDARDSUB;
+                }
+                iface->transPtr = data->block;
+                break;
+        default:
+                return -1;
+        }
+
+        iface->result = 0;
+        iface->manual_stop = 0;
+        iface->read_write = read_write;
+        iface->command = command;
+        iface->timeout_count = 10;
+
+        /* FIFO Initiation. Data in FIFO should be discarded before
+         * start a new operation.
+         */
+        bfin_write_TWI_FIFO_CTL(0x3);
+        SSYNC();
+        bfin_write_TWI_FIFO_CTL(0);
+
+        /* clear int stat */
+        bfin_write_TWI_INT_STAT(MERR|MCOMP|XMTSERV|RCVSERV);
+
+        /* Set Transmit device address */
+        bfin_write_TWI_MASTER_ADDR(addr);
+        SSYNC();
+
+        iface->timeout_timer.expires = jiffies + POLL_TIMEOUT;
+        add_timer(&iface->timeout_timer);
+
+        switch (iface->cur_mode) {
+        case TWI_I2C_MODE_STANDARDSUB:
+                bfin_write_TWI_XMT_DATA8(iface->command);
+                bfin_write_TWI_INT_MASK(MCOMP | MERR |
+                        ((iface->read_write == I2C_SMBUS_READ) ?
+                        RCVSERV : XMTSERV));
+                SSYNC();
+
+                if (iface->writeNum + 1 <= 255)
+                        bfin_write_TWI_MASTER_CTL((iface->writeNum + 1) << 6);
+                else {
+                        bfin_write_TWI_MASTER_CTL(0xff << 6);
+                        iface->manual_stop = 1;
+                }
+                /* Master enable */
+                bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() | MEN |
+                        ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ>100) ? FAST : 0));
+                break;
+        case TWI_I2C_MODE_COMBINED:
+                bfin_write_TWI_XMT_DATA8(iface->command);
+                bfin_write_TWI_INT_MASK(MCOMP | MERR | RCVSERV | XMTSERV);
+                SSYNC();
+
+                if (iface->writeNum > 0)
+                        bfin_write_TWI_MASTER_CTL((iface->writeNum + 1) << 6);
+                else
+                        bfin_write_TWI_MASTER_CTL(0x1 << 6);
+                /* Master enable */
+                bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() | MEN |
+                        ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ>100) ? FAST : 0));
+                break;
+        default:
+                bfin_write_TWI_MASTER_CTL(0);
+                if (size != I2C_SMBUS_QUICK) {
+                        /* Don't access xmit data register when this is a
+                         * read operation.
+                         */
+                        if (iface->read_write != I2C_SMBUS_READ) {
+                                if (iface->writeNum > 0) {
+                                        bfin_write_TWI_XMT_DATA8(*(iface->transPtr++));
+                                        if (iface->writeNum <= 255)
+                                                bfin_write_TWI_MASTER_CTL(iface->writeNum << 6);
+                                        else {
+                                                bfin_write_TWI_MASTER_CTL(0xff << 6);
+                                                iface->manual_stop = 1;
+                                        }
+                                        iface->writeNum--;
+                                } else {
+                                        bfin_write_TWI_XMT_DATA8(iface->command);
+                                        bfin_write_TWI_MASTER_CTL(1 << 6);
+                                }
+                        } else {
+                                if (iface->readNum > 0 && iface->readNum <= 255)
+                                        bfin_write_TWI_MASTER_CTL(iface->readNum << 6);
+                                else if (iface->readNum > 255) {
+                                        bfin_write_TWI_MASTER_CTL(0xff << 6);
+                                        iface->manual_stop = 1;
+                                } else {
+                                        del_timer(&iface->timeout_timer);
+                                        break;
+                                }
+                        }
+                }
+                bfin_write_TWI_INT_MASK(MCOMP | MERR |
+                        ((iface->read_write == I2C_SMBUS_READ) ?
+                        RCVSERV : XMTSERV));
+                SSYNC();
+
+                /* Master enable */
+                bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() | MEN |
+                        ((iface->read_write == I2C_SMBUS_READ) ? MDIR : 0) |
+                        ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ > 100) ? FAST : 0));
+                break;
+        }
+        SSYNC();
+
+        wait_for_completion(&iface->complete);
+
+        rc = (iface->result >= 0) ? 0 : -1;
+
+        /* Release mutex */
+        mutex_unlock(&iface->twi_lock);
+
+        return rc;
+}
+
+/*
+ * Return what the adapter supports
+ */
+static u32 bfin_twi_functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+               I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
+               I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL |
+               I2C_FUNC_I2C;
+}
+
+
+static struct i2c_algorithm bfin_twi_algorithm = {
+        .master_xfer   = bfin_twi_master_xfer,
+        .smbus_xfer    = bfin_twi_smbus_xfer,
+        .functionality = bfin_twi_functionality,
+};
+
+
+static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state)
+{
+/*      struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/
+
+        /* Disable TWI */
+        bfin_write_TWI_CONTROL(bfin_read_TWI_CONTROL() & ~TWI_ENA);
+        SSYNC();
+
+        return 0;
+}
+
+static int i2c_bfin_twi_resume(struct platform_device *dev)
+{
+/*      struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/
+
+        /* Enable TWI */
+        bfin_write_TWI_CONTROL(bfin_read_TWI_CONTROL() | TWI_ENA);
+        SSYNC();
+
+        return 0;
+}
+
+static int i2c_bfin_twi_probe(struct platform_device *dev)
+{
+        struct bfin_twi_iface *iface = &twi_iface;
+        struct i2c_adapter *p_adap;
+        int rc;
+
+        mutex_init(&(iface->twi_lock));
+        spin_lock_init(&(iface->lock));
+        init_completion(&(iface->complete));
+        iface->irq = IRQ_TWI;
+
+        init_timer(&(iface->timeout_timer));
+        iface->timeout_timer.function = bfin_twi_timeout;
+        iface->timeout_timer.data = (unsigned long)iface;
+
+        p_adap = &iface->adap;
+        p_adap->id = I2C_HW_BLACKFIN;
+        strlcpy(p_adap->name, dev->name, sizeof(p_adap->name));
+        p_adap->algo = &bfin_twi_algorithm;
+        p_adap->algo_data = iface;
+        p_adap->class = I2C_CLASS_ALL;
+        p_adap->dev.parent = &dev->dev;
+
+        rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+                IRQF_DISABLED, dev->name, iface);
+        if (rc) {
+                dev_err(&(p_adap->dev), "i2c-bfin-twi: can't get IRQ %d !\n",
+                        iface->irq);
+                return -ENODEV;
+        }
+
+        /* Set TWI internal clock as 10MHz */
+        bfin_write_TWI_CONTROL(((get_sclk() / 1024 / 1024 + 5) / 10) & 0x7F);
+
+        /* Set Twi interface clock as specified */
+        bfin_write_TWI_CLKDIV((( 5*1024 / CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ )
+                        << 8) | (( 5*1024 / CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ )
+                        & 0xFF));
+
+        /* Enable TWI */
+        bfin_write_TWI_CONTROL(bfin_read_TWI_CONTROL() | TWI_ENA);
+        SSYNC();
+
+        rc = i2c_add_adapter(p_adap);
+        if (rc < 0)
+                free_irq(iface->irq, iface);
+        else
+                platform_set_drvdata(dev, iface);
+
+        return rc;
+}
+
+static int i2c_bfin_twi_remove(struct platform_device *pdev)
+{
+        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        i2c_del_adapter(&(iface->adap));
+        free_irq(iface->irq, iface);
+
+        return 0;
+}
+
+static struct platform_driver i2c_bfin_twi_driver = {
+        .probe          = i2c_bfin_twi_probe,
+        .remove         = i2c_bfin_twi_remove,
+        .suspend        = i2c_bfin_twi_suspend,
+        .resume         = i2c_bfin_twi_resume,
+        .driver         = {
+                .name   = "i2c-bfin-twi",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init i2c_bfin_twi_init(void)
+{
+        pr_info("I2C: Blackfin I2C TWI driver\n");
+
+        return platform_driver_register(&i2c_bfin_twi_driver);
+}
+
+static void __exit i2c_bfin_twi_exit(void)
+{
+        platform_driver_unregister(&i2c_bfin_twi_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("I2C-Bus adapter routines for Blackfin TWI");
+MODULE_LICENSE("GPL");
+
+module_init(i2c_bfin_twi_init);
+module_exit(i2c_bfin_twi_exit);
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 834967464814..804f0a551c05 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -35,6 +35,7 @@
 #include <linux/pci.h>
 #include <linux/wait.h>
 
+#include <linux/isa.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pcf.h>
 
@@ -207,7 +208,7 @@ static struct i2c_adapter pcf_isa_ops = {
         .name           = "i2c-elektor",
 };
 
-static int __init i2c_pcfisa_init(void)
+static int __devinit elektor_match(struct device *dev, unsigned int id)
 {
 #ifdef __alpha__
         /* check to see we have memory mapped PCF8584 connected to the
@@ -222,9 +223,8 @@ static int __init i2c_pcfisa_init(void)
                         /* yeap, we've found cypress, let's check config */
                         if (!pci_read_config_byte(cy693_dev, 0x47, &config)) {
 
-                                pr_debug("%s: found cy82c693, config "
-                                         "register 0x47 = 0x%02x\n",
-                                         pcf_isa_ops.name, config);
+                                dev_dbg(dev, "found cy82c693, config "
+                                        "register 0x47 = 0x%02x\n", config);
 
                                 /* UP2000 board has this register set to 0xe1,
                                    but the most significant bit as seems can be
@@ -244,9 +244,9 @@ static int __init i2c_pcfisa_init(void)
                                            8.25 MHz (PCI/4) clock
                                            (this can be read from cypress) */
                                         clock = I2C_PCF_CLK | I2C_PCF_TRNS90;
-                                        pr_info("%s: found API UP2000 like "
-                                                "board, will probe PCF8584 "
-                                                "later\n", pcf_isa_ops.name);
+                                        dev_info(dev, "found API UP2000 like "
+                                                 "board, will probe PCF8584 "
+                                                 "later\n");
                                 }
                         }
                         pci_dev_put(cy693_dev);
@@ -256,22 +256,27 @@ static int __init i2c_pcfisa_init(void)
 
         /* sanity checks for mmapped I/O */
         if (mmapped && base < 0xc8000) {
-                printk(KERN_ERR "%s: incorrect base address (%#x) specified "
-                       "for mmapped I/O\n", pcf_isa_ops.name, base);
-                return -ENODEV;
+                dev_err(dev, "incorrect base address (%#x) specified "
+                       "for mmapped I/O\n", base);
+                return 0;
         }
 
         if (base == 0) {
                 base = DEFAULT_BASE;
         }
+        return 1;
+}
 
+static int __devinit elektor_probe(struct device *dev, unsigned int id)
+{
         init_waitqueue_head(&pcf_wait);
         if (pcf_isa_init())
                 return -ENODEV;
+        pcf_isa_ops.dev.parent = dev;
         if (i2c_pcf_add_bus(&pcf_isa_ops) < 0)
                 goto fail;
 
-        dev_info(&pcf_isa_ops.dev, "found device at %#x\n", base);
+        dev_info(dev, "found device at %#x\n", base);
 
         return 0;
 
@@ -291,7 +296,7 @@ static int __init i2c_pcfisa_init(void)
         return -ENODEV;
 }
 
-static void i2c_pcfisa_exit(void)
+static int __devexit elektor_remove(struct device *dev, unsigned int id)
 {
         i2c_del_adapter(&pcf_isa_ops);
 
@@ -307,6 +312,28 @@ static void i2c_pcfisa_exit(void)
                 iounmap(base_iomem);
                 release_mem_region(base, 2);
         }
+
+        return 0;
+}
+
+static struct isa_driver i2c_elektor_driver = {
+        .match          = elektor_match,
+        .probe          = elektor_probe,
+        .remove         = __devexit_p(elektor_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "i2c-elektor",
+        },
+};
+
+static int __init i2c_pcfisa_init(void)
+{
+        return isa_register_driver(&i2c_elektor_driver, 1);
+}
+
+static void __exit i2c_pcfisa_exit(void)
+{
+        isa_unregister_driver(&i2c_elektor_driver);
 }
 
 MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>");
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
new file mode 100644
index 000000000000..a7dd54654a9a
--- /dev/null
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -0,0 +1,215 @@
+/*
+ * Bitbanging I2C bus driver using the GPIO API
+ *
+ * Copyright (C) 2007 Atmel Corporation
+ *
+ * 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/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/i2c-gpio.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/gpio.h>
+
+/* Toggle SDA by changing the direction of the pin */
+static void i2c_gpio_setsda_dir(void *data, int state)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        if (state)
+                gpio_direction_input(pdata->sda_pin);
+        else
+                gpio_direction_output(pdata->sda_pin, 0);
+}
+
+/*
+ * Toggle SDA by changing the output value of the pin. This is only
+ * valid for pins configured as open drain (i.e. setting the value
+ * high effectively turns off the output driver.)
+ */
+static void i2c_gpio_setsda_val(void *data, int state)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        gpio_set_value(pdata->sda_pin, state);
+}
+
+/* Toggle SCL by changing the direction of the pin. */
+static void i2c_gpio_setscl_dir(void *data, int state)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        if (state)
+                gpio_direction_input(pdata->scl_pin);
+        else
+                gpio_direction_output(pdata->scl_pin, 0);
+}
+
+/*
+ * Toggle SCL by changing the output value of the pin. This is used
+ * for pins that are configured as open drain and for output-only
+ * pins. The latter case will break the i2c protocol, but it will
+ * often work in practice.
+ */
+static void i2c_gpio_setscl_val(void *data, int state)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        gpio_set_value(pdata->scl_pin, state);
+}
+
+int i2c_gpio_getsda(void *data)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        return gpio_get_value(pdata->sda_pin);
+}
+
+int i2c_gpio_getscl(void *data)
+{
+        struct i2c_gpio_platform_data *pdata = data;
+
+        return gpio_get_value(pdata->scl_pin);
+}
+
+static int __init i2c_gpio_probe(struct platform_device *pdev)
+{
+        struct i2c_gpio_platform_data *pdata;
+        struct i2c_algo_bit_data *bit_data;
+        struct i2c_adapter *adap;
+        int ret;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata)
+                return -ENXIO;
+
+        ret = -ENOMEM;
+        adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
+        if (!adap)
+                goto err_alloc_adap;
+        bit_data = kzalloc(sizeof(struct i2c_algo_bit_data), GFP_KERNEL);
+        if (!bit_data)
+                goto err_alloc_bit_data;
+
+        ret = gpio_request(pdata->sda_pin, "sda");
+        if (ret)
+                goto err_request_sda;
+        ret = gpio_request(pdata->scl_pin, "scl");
+        if (ret)
+                goto err_request_scl;
+
+        if (pdata->sda_is_open_drain) {
+                gpio_direction_output(pdata->sda_pin, 1);
+                bit_data->setsda = i2c_gpio_setsda_val;
+        } else {
+                gpio_direction_input(pdata->sda_pin);
+                bit_data->setsda = i2c_gpio_setsda_dir;
+        }
+
+        if (pdata->scl_is_open_drain || pdata->scl_is_output_only) {
+                gpio_direction_output(pdata->scl_pin, 1);
+                bit_data->setscl = i2c_gpio_setscl_val;
+        } else {
+                gpio_direction_input(pdata->scl_pin);
+                bit_data->setscl = i2c_gpio_setscl_dir;
+        }
+
+        if (!pdata->scl_is_output_only)
+                bit_data->getscl = i2c_gpio_getscl;
+        bit_data->getsda = i2c_gpio_getsda;
+
+        if (pdata->udelay)
+                bit_data->udelay = pdata->udelay;
+        else if (pdata->scl_is_output_only)
+                bit_data->udelay = 50;                  /* 10 kHz */
+        else
+                bit_data->udelay = 5;                   /* 100 kHz */
+
+        if (pdata->timeout)
+                bit_data->timeout = pdata->timeout;
+        else
+                bit_data->timeout = HZ / 10;            /* 100 ms */
+
+        bit_data->data = pdata;
+
+        adap->owner = THIS_MODULE;
+        snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
+        adap->algo_data = bit_data;
+        adap->dev.parent = &pdev->dev;
+
+        ret = i2c_bit_add_bus(adap);
+        if (ret)
+                goto err_add_bus;
+
+        platform_set_drvdata(pdev, adap);
+
+        dev_info(&pdev->dev, "using pins %u (SDA) and %u (SCL%s)\n",
+                 pdata->sda_pin, pdata->scl_pin,
+                 pdata->scl_is_output_only
+                 ? ", no clock stretching" : "");
+
+        return 0;
+
+err_add_bus:
+        gpio_free(pdata->scl_pin);
+err_request_scl:
+        gpio_free(pdata->sda_pin);
+err_request_sda:
+        kfree(bit_data);
+err_alloc_bit_data:
+        kfree(adap);
+err_alloc_adap:
+        return ret;
+}
+
+static int __exit i2c_gpio_remove(struct platform_device *pdev)
+{
+        struct i2c_gpio_platform_data *pdata;
+        struct i2c_adapter *adap;
+
+        adap = platform_get_drvdata(pdev);
+        pdata = pdev->dev.platform_data;
+
+        i2c_del_adapter(adap);
+        gpio_free(pdata->scl_pin);
+        gpio_free(pdata->sda_pin);
+        kfree(adap->algo_data);
+        kfree(adap);
+
+        return 0;
+}
+
+static struct platform_driver i2c_gpio_driver = {
+        .driver         = {
+                .name   = "i2c-gpio",
+                .owner  = THIS_MODULE,
+        },
+        .remove         = __exit_p(i2c_gpio_remove),
+};
+
+static int __init i2c_gpio_init(void)
+{
+        int ret;
+
+        ret = platform_driver_probe(&i2c_gpio_driver, i2c_gpio_probe);
+        if (ret)
+                printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret);
+
+        return ret;
+}
+module_init(i2c_gpio_init);
+
+static void __exit i2c_gpio_exit(void)
+{
+        platform_driver_unregister(&i2c_gpio_driver);
+}
+module_exit(i2c_gpio_exit);
+
+MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
+MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index a320e7d82c1f..611b57192c96 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -527,7 +527,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
         /* set up the sysfs linkage to our parent device */
         i801_adapter.dev.parent = &dev->dev;
 
-        snprintf(i801_adapter.name, I2C_NAME_SIZE,
+        snprintf(i801_adapter.name, sizeof(i801_adapter.name),
                 "SMBus I801 adapter at %04lx", i801_smba);
         err = i2c_add_adapter(&i801_adapter);
         if (err) {
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 5f33bc9c1e02..b0e1370075de 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -41,6 +41,10 @@
 #include <linux/platform_device.h>
 #include <linux/completion.h>
 
+/* Exported by i2c-core for i2c-isa only */
+extern void i2c_adapter_dev_release(struct device *dev);
+extern struct class i2c_adapter_class;
+
 static u32 isa_func(struct i2c_adapter *adapter);
 
 /* This is the actual algorithm we define */
@@ -64,16 +68,6 @@ static u32 isa_func(struct i2c_adapter *adapter)
 }
 
 
-/* Copied from i2c-core */
-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);
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
 /* We implement an interface which resembles i2c_{add,del}_driver,
    but for i2c-isa drivers. We don't have to remember and handle lists
    of drivers and adapters so this is much more simple, of course. */
@@ -139,41 +133,18 @@ static int __init i2c_isa_init(void)
         isa_adapter.nr = ANY_I2C_ISA_BUS;
         isa_adapter.dev.parent = &platform_bus;
         sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
-        isa_adapter.dev.driver = &i2c_adapter_driver;
         isa_adapter.dev.release = &i2c_adapter_dev_release;
+        isa_adapter.dev.class = &i2c_adapter_class;
         err = device_register(&isa_adapter.dev);
         if (err) {
                 printk(KERN_ERR "i2c-isa: Failed to register device\n");
                 goto exit;
         }
-        err = device_create_file(&isa_adapter.dev, &dev_attr_name);
-        if (err) {
-                printk(KERN_ERR "i2c-isa: Failed to create name file\n");
-                goto exit_unregister;
-        }
-
-        /* Add this adapter to the i2c_adapter class */
-        memset(&isa_adapter.class_dev, 0x00, sizeof(struct class_device));
-        isa_adapter.class_dev.dev = &isa_adapter.dev;
-        isa_adapter.class_dev.class = &i2c_adapter_class;
-        strlcpy(isa_adapter.class_dev.class_id, isa_adapter.dev.bus_id,
-                BUS_ID_SIZE);
-        err = class_device_register(&isa_adapter.class_dev);
-        if (err) {
-                printk(KERN_ERR "i2c-isa: Failed to register class device\n");
-                goto exit_remove_name;
-        }
 
         dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name);
 
         return 0;
 
-exit_remove_name:
-        device_remove_file(&isa_adapter.dev, &dev_attr_name);
-exit_unregister:
-        init_completion(&isa_adapter.dev_released); /* Needed? */
-        device_unregister(&isa_adapter.dev);
-        wait_for_completion(&isa_adapter.dev_released);
 exit:
         return err;
 }
@@ -201,15 +172,11 @@ static void __exit i2c_isa_exit(void)
         /* Clean up the sysfs representation */
         dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n");
         init_completion(&isa_adapter.dev_released);
-        init_completion(&isa_adapter.class_dev_released);
-        class_device_unregister(&isa_adapter.class_dev);
-        device_remove_file(&isa_adapter.dev, &dev_attr_name);
         device_unregister(&isa_adapter.dev);
 
         /* Wait for sysfs to drop all references */
         dev_dbg(&isa_adapter.dev, "Waiting for sysfs completion\n");
         wait_for_completion(&isa_adapter.dev_released);
-        wait_for_completion(&isa_adapter.class_dev_released);
 
         dev_dbg(&isa_adapter.dev, "%s unregistered\n", isa_adapter.name);
 }
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index efa3ecc5522a..6352121a2827 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -118,7 +118,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
 
         drv_data->adapter.id = I2C_HW_B_IXP2000,
         strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
-                I2C_NAME_SIZE);
+                sizeof(drv_data->adapter.name));
         drv_data->adapter.algo_data = &drv_data->algo_data,
 
         drv_data->adapter.dev.parent = &plat_dev->dev;
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index 08e89b83984a..069ed7f3b395 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -127,7 +127,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
         drv_data->adapter.id = I2C_HW_B_IXP4XX;
         drv_data->adapter.class = I2C_CLASS_HWMON;
         strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
-                I2C_NAME_SIZE);
+                sizeof(drv_data->adapter.name));
         drv_data->adapter.algo_data = &drv_data->algo_data;
 
         drv_data->adapter.dev.parent = &plat_dev->dev;
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index ee65aa1be13a..c6b6898592b1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index a3283b907eb8..a55b3335d1be 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -508,7 +508,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
         }
 
         strlcpy(drv_data->adapter.name, MV64XXX_I2C_CTLR_NAME " adapter",
-                I2C_NAME_SIZE);
+                sizeof(drv_data->adapter.name));
 
         init_waitqueue_head(&drv_data->waitq);
         spin_lock_init(&drv_data->lock);
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 1514ec5b77f8..3cd0d63e7b50 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -33,6 +33,8 @@
     nForce4 MCP-04              0034
     nForce4 MCP51               0264
     nForce4 MCP55               0368
+    nForce MCP61                03EB
+    nForce MCP65                0446
 
     This driver supports the 2 SMBuses that are included in the MCP of the
     nForce2/3/4/5xx chipsets.
@@ -200,6 +202,8 @@ static struct pci_device_id nforce2_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS) },
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS) },
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS) },
+        { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS) },
+        { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SMBUS) },
         { 0 }
 };
 
@@ -240,7 +244,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
         smbus->adapter.algo = &smbus_algorithm;
         smbus->adapter.algo_data = smbus;
         smbus->adapter.dev.parent = &dev->dev;
-        snprintf(smbus->adapter.name, I2C_NAME_SIZE,
+        snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
                 "SMBus nForce2 adapter at %04x", smbus->base);
 
         error = i2c_add_adapter(&smbus->adapter);
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index bcd8367cede1..e471e3bfdc1e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -605,7 +605,8 @@ omap_i2c_probe(struct platform_device *pdev)
         adap->dev.parent = &pdev->dev;
 
         /* i2c device drivers may be active on return from add_adapter() */
-        r = i2c_add_adapter(adap);
+        adap->nr = pdev->id;
+        r = i2c_add_numbered_adapter(adap);
         if (r) {
                 dev_err(dev->dev, "failure adding adapter\n");
                 goto err_free_irq;
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 4bc42810b9aa..49a95e2887bc 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------------ *
- * i2c-parport.c I2C bus over parallel port                                 *
+ * i2c-parport-light.c I2C bus over parallel port                           *
  * ------------------------------------------------------------------------ *
-   Copyright (C) 2003-2004 Jean Delvare <khali@linux-fr.org>
+   Copyright (C) 2003-2007 Jean Delvare <khali@linux-fr.org>
    
    Based on older i2c-velleman.c driver
    Copyright (C) 1995-2000 Simon G. Vogl
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/ioport.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
@@ -34,6 +35,9 @@
 #include "i2c-parport.h"
 
 #define DEFAULT_BASE 0x378
+#define DRVNAME "i2c-parport-light"
+
+static struct platform_device *pdev;
 
 static u16 base;
 module_param(base, ushort, 0);
@@ -106,7 +110,7 @@ static struct i2c_algo_bit_data parport_algo_data = {
         .timeout        = HZ,
 }; 
 
-/* ----- I2c structure ---------------------------------------------------- */
+/* ----- Driver registration ---------------------------------------------- */
 
 static struct i2c_adapter parport_adapter = {
         .owner          = THIS_MODULE,
@@ -116,55 +120,141 @@ static struct i2c_adapter parport_adapter = {
         .name           = "Parallel port adapter (light)",
 };
 
-/* ----- Module loading, unloading and information ------------------------ */
+static int __devinit i2c_parport_probe(struct platform_device *pdev)
+{
+        int err;
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, res->end - res->start + 1, DRVNAME))
+                return -EBUSY;
+
+        /* Reset hardware to a sane state (SCL and SDA high) */
+        parport_setsda(NULL, 1);
+        parport_setscl(NULL, 1);
+        /* Other init if needed (power on...) */
+        if (adapter_parm[type].init.val)
+                line_set(1, &adapter_parm[type].init);
+
+        parport_adapter.dev.parent = &pdev->dev;
+        err = i2c_bit_add_bus(&parport_adapter);
+        if (err) {
+                dev_err(&pdev->dev, "Unable to register with I2C\n");
+                goto exit_region;
+        }
+        return 0;
+
+exit_region:
+        release_region(res->start, res->end - res->start + 1);
+        return err;
+}
+
+static int __devexit i2c_parport_remove(struct platform_device *pdev)
+{
+        struct resource *res;
+
+        i2c_del_adapter(&parport_adapter);
+
+        /* Un-init if needed (power off...) */
+        if (adapter_parm[type].init.val)
+                line_set(0, &adapter_parm[type].init);
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, res->end - res->start + 1);
+        return 0;
+}
+
+static struct platform_driver i2c_parport_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = DRVNAME,
+        },
+        .probe          = i2c_parport_probe,
+        .remove         = __devexit_p(i2c_parport_remove),
+};
+
+static int __init i2c_parport_device_add(u16 address)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + 2,
+                .name   = DRVNAME,
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc(DRVNAME, -1);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
 
 static int __init i2c_parport_init(void)
 {
+        int err;
+
         if (type < 0) {
-                printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
+                printk(KERN_ERR DRVNAME ": adapter type unspecified\n");
                 return -ENODEV;
         }
 
         if (type >= ARRAY_SIZE(adapter_parm)) {
-                printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
+                printk(KERN_ERR DRVNAME ": invalid type (%d)\n", type);
                 return -ENODEV;
         }
 
         if (base == 0) {
-                printk(KERN_INFO "i2c-parport: using default base 0x%x\n", DEFAULT_BASE);
+                pr_info(DRVNAME ": using default base 0x%x\n", DEFAULT_BASE);
                 base = DEFAULT_BASE;
         }
 
-        if (!request_region(base, 3, "i2c-parport"))
-                return -ENODEV;
-
         if (!adapter_parm[type].getscl.val)
                 parport_algo_data.getscl = NULL;
 
-        /* Reset hardware to a sane state (SCL and SDA high) */
-        parport_setsda(NULL, 1);
-        parport_setscl(NULL, 1);
-        /* Other init if needed (power on...) */
-        if (adapter_parm[type].init.val)
-                line_set(1, &adapter_parm[type].init);
+        /* Sets global pdev as a side effect */
+        err = i2c_parport_device_add(base);
+        if (err)
+                goto exit;
 
-        if (i2c_bit_add_bus(&parport_adapter) < 0) {
-                printk(KERN_ERR "i2c-parport: Unable to register with I2C\n");
-                release_region(base, 3);
-                return -ENODEV;
-        }
+        err = platform_driver_register(&i2c_parport_driver);
+        if (err)
+                goto exit_device;
 
         return 0;
+
+exit_device:
+        platform_device_unregister(pdev);
+exit:
+        return err;
 }
 
 static void __exit i2c_parport_exit(void)
 {
-        /* Un-init if needed (power off...) */
-        if (adapter_parm[type].init.val)
-                line_set(0, &adapter_parm[type].init);
-
-        i2c_del_adapter(&parport_adapter);
-        release_region(base, 3);
+        platform_driver_unregister(&i2c_parport_driver);
+        platform_device_unregister(pdev);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 66696a40c7b5..8c953707253f 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------------ *
  * i2c-parport.c I2C bus over parallel port                                 *
  * ------------------------------------------------------------------------ *
-   Copyright (C) 2003-2004 Jean Delvare <khali@linux-fr.org>
+   Copyright (C) 2003-2007 Jean Delvare <khali@linux-fr.org>
    
    Based on older i2c-philips-par.c driver
    Copyright (C) 1995-2000 Simon G. Vogl
@@ -137,19 +137,12 @@ static struct i2c_algo_bit_data parport_algo_data = {
         .setscl         = parport_setscl,
         .getsda         = parport_getsda,
         .getscl         = parport_getscl,
-        .udelay         = 60,
+        .udelay         = 10, /* ~50 kbps */
         .timeout        = HZ,
 }; 
 
 /* ----- I2c and parallel port call-back functions and structures --------- */
 
-static struct i2c_adapter parport_adapter = {
-        .owner          = THIS_MODULE,
-        .class          = I2C_CLASS_HWMON,
-        .id             = I2C_HW_B_LP,
-        .name           = "Parallel port adapter",
-};
-
 static void i2c_parport_attach (struct parport *port)
 {
         struct i2c_par *adapter;
@@ -169,10 +162,17 @@ static void i2c_parport_attach (struct parport *port)
         }
 
         /* Fill the rest of the structure */
-        adapter->adapter = parport_adapter;
+        adapter->adapter.owner = THIS_MODULE;
+        adapter->adapter.class = I2C_CLASS_HWMON;
+        adapter->adapter.id = I2C_HW_B_LP;
+        strlcpy(adapter->adapter.name, "Parallel port adapter",
+                sizeof(adapter->adapter.name));
         adapter->algo_data = parport_algo_data;
-        if (!adapter_parm[type].getscl.val)
+        /* Slow down if we can't sense SCL */
+        if (!adapter_parm[type].getscl.val) {
                 adapter->algo_data.getscl = NULL;
+                adapter->algo_data.udelay = 50; /* ~10 kbps */
+        }
         adapter->algo_data.data = port;
         adapter->adapter.algo_data = &adapter->algo_data;
 
@@ -214,11 +214,12 @@ static void i2c_parport_detach (struct parport *port)
         for (prev = NULL, adapter = adapter_list; adapter;
              prev = adapter, adapter = adapter->next) {
                 if (adapter->pdev->port == port) {
+                        i2c_del_adapter(&adapter->adapter);
+
                         /* Un-init if needed (power off...) */
                         if (adapter_parm[type].init.val)
                                 line_set(port, 0, &adapter_parm[type].init);
                                 
-                        i2c_del_adapter(&adapter->adapter);
                         parport_unregister_device(adapter->pdev);
                         if (prev)
                                 prev->next = adapter->next;
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
index bf89eeef74e9..58e32714afb5 100644
--- a/drivers/i2c/busses/i2c-pasemi.c
+++ b/drivers/i2c/busses/i2c-pasemi.c
@@ -358,7 +358,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev,
         }
 
         smbus->adapter.owner = THIS_MODULE;
-        snprintf(smbus->adapter.name, I2C_NAME_SIZE,
+        snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
                  "PA Semi SMBus adapter at 0x%lx", smbus->base);
         smbus->adapter.class = I2C_CLASS_HWMON;
         smbus->adapter.algo = &smbus_algorithm;
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index cc6536a19eca..5161aaf9341b 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -25,9 +25,9 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/wait.h>
 
+#include <linux/isa.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pca.h>
 
@@ -119,27 +119,26 @@ static struct i2c_adapter pca_isa_ops = {
         .name           = "PCA9564 ISA Adapter",
 };
 
-static int __init pca_isa_init(void)
+static int __devinit pca_isa_probe(struct device *dev, unsigned int id)
 {
-
         init_waitqueue_head(&pca_wait);
 
-        printk(KERN_INFO "i2c-pca-isa: i/o base %#08lx. irq %d\n", base, irq);
+        dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq);
 
         if (!request_region(base, IO_SIZE, "i2c-pca-isa")) {
-                printk(KERN_ERR "i2c-pca-isa: I/O address %#08lx is in use.\n", base);
+                dev_err(dev, "I/O address %#08lx is in use\n", base);
                 goto out;
         }
 
         if (irq > -1) {
                 if (request_irq(irq, pca_handler, 0, "i2c-pca-isa", &pca_isa_ops) < 0) {
-                        printk(KERN_ERR "i2c-pca-isa: Request irq%d failed\n", irq);
+                        dev_err(dev, "Request irq%d failed\n", irq);
                         goto out_region;
                 }
         }
 
         if (i2c_pca_add_bus(&pca_isa_ops) < 0) {
-                printk(KERN_ERR "i2c-pca-isa: Failed to add i2c bus\n");
+                dev_err(dev, "Failed to add i2c bus\n");
                 goto out_irq;
         }
 
@@ -154,7 +153,7 @@ static int __init pca_isa_init(void)
         return -ENODEV;
 }
 
-static void pca_isa_exit(void)
+static int __devexit pca_isa_remove(struct device *dev, unsigned int id)
 {
         i2c_del_adapter(&pca_isa_ops);
 
@@ -163,6 +162,27 @@ static void pca_isa_exit(void)
                 free_irq(irq, &pca_isa_ops);
         }
         release_region(base, IO_SIZE);
+
+        return 0;
+}
+
+static struct isa_driver pca_isa_driver = {
+        .probe          = pca_isa_probe,
+        .remove         = __devexit_p(pca_isa_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "i2c-pca-isa",
+        }
+};
+
+static int __init pca_isa_init(void)
+{
+        return isa_register_driver(&pca_isa_driver, 1);
+}
+
+static void __exit pca_isa_exit(void)
+{
+        isa_unregister_driver(&pca_isa_driver);
 }
 
 MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>");
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 21b180904085..5a52bf5e3fb0 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -428,7 +428,7 @@ static int __devinit piix4_probe(struct pci_dev *dev,
         /* set up the sysfs linkage to our parent device */
         piix4_adapter.dev.parent = &dev->dev;
 
-        snprintf(piix4_adapter.name, I2C_NAME_SIZE,
+        snprintf(piix4_adapter.name, sizeof(piix4_adapter.name),
                 "SMBus PIIX4 adapter at %04x", piix4_smba);
 
         if ((retval = i2c_add_adapter(&piix4_adapter))) {
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 14e83d0aac8c..873544ab598e 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -539,6 +539,18 @@ static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
         writel(icr | ICR_START | ICR_TB, _ICR(i2c));
 }
 
+static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c)
+{
+        u32 icr;
+
+        /*
+         * Clear the STOP and ACK flags
+         */
+        icr = readl(_ICR(i2c));
+        icr &= ~(ICR_STOP | ICR_ACKNAK);
+        writel(icr, _IRC(i2c));
+}
+
 /*
  * We are protected by the adapter bus mutex.
  */
@@ -581,6 +593,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
          * The rest of the processing occurs in the interrupt handler.
          */
         timeout = wait_event_timeout(i2c->wait, i2c->msg_num == 0, HZ * 5);
+        i2c_pxa_stop_message(i2c);
 
         /*
          * We place the return code in i2c->msg_idx.
@@ -825,7 +838,7 @@ static const struct i2c_algorithm i2c_pxa_algorithm = {
 };
 
 static struct pxa_i2c i2c_pxa = {
-        .lock   = SPIN_LOCK_UNLOCKED,
+        .lock   = __SPIN_LOCK_UNLOCKED(i2c_pxa.lock),
         .adap   = {
                 .owner          = THIS_MODULE,
                 .algo           = &i2c_pxa_algorithm,
@@ -839,9 +852,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
 {
         struct pxa_i2c *i2c = &i2c_pxa;
         struct resource *res;
-#ifdef CONFIG_I2C_PXA_SLAVE
         struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
-#endif
         int ret;
         int irq;
 
@@ -889,14 +900,14 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 pxa_gpio_mode(GPIO117_I2CSCL_MD);
                 pxa_gpio_mode(GPIO118_I2CSDA_MD);
 #endif
-                pxa_set_cken(CKEN14_I2C, 1);
+                pxa_set_cken(CKEN_I2C, 1);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
                 local_irq_disable();
                 PCFR |= PCFR_PI2CEN;
                 local_irq_enable();
-                pxa_set_cken(CKEN15_PWRI2C, 1);
+                pxa_set_cken(CKEN_PWRI2C, 1);
 #endif
         }
 
@@ -911,6 +922,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
         i2c->adap.algo_data = i2c;
         i2c->adap.dev.parent = &dev->dev;
 
+        if (plat) {
+                i2c->adap.class = plat->class;
+        }
+
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
                 printk(KERN_INFO "I2C: Failed to add bus\n");
@@ -933,11 +948,11 @@ eadapt:
 ereqirq:
         switch (dev->id) {
         case 0:
-                pxa_set_cken(CKEN14_I2C, 0);
+                pxa_set_cken(CKEN_I2C, 0);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
-                pxa_set_cken(CKEN15_PWRI2C, 0);
+                pxa_set_cken(CKEN_PWRI2C, 0);
                 local_irq_disable();
                 PCFR &= ~PCFR_PI2CEN;
                 local_irq_enable();
@@ -960,11 +975,11 @@ static int i2c_pxa_remove(struct platform_device *dev)
         free_irq(i2c->irq, i2c);
         switch (dev->id) {
         case 0:
-                pxa_set_cken(CKEN14_I2C, 0);
+                pxa_set_cken(CKEN_I2C, 0);
                 break;
 #ifdef CONFIG_PXA27x
         case 1:
-                pxa_set_cken(CKEN15_PWRI2C, 0);
+                pxa_set_cken(CKEN_PWRI2C, 0);
                 local_irq_disable();
                 PCFR &= ~PCFR_PI2CEN;
                 local_irq_enable();
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 556f244aae76..e68a96f589fd 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -61,6 +61,8 @@ struct s3c24xx_i2c {
         unsigned int            msg_idx;
         unsigned int            msg_ptr;
 
+        unsigned int            tx_setup;
+
         enum s3c24xx_i2c_state  state;
 
         void __iomem            *regs;
@@ -199,8 +201,11 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
         dev_dbg(i2c->dev, "START: %08lx to IICSTAT, %02x to DS\n", stat, addr);
         writeb(addr, i2c->regs + S3C2410_IICDS);
         
-        // delay a bit and reset iiccon before setting start (per samsung)
-        udelay(1);
+        /* delay here to ensure the data byte has gotten onto the bus
+         * before the transaction is started */
+
+        ndelay(i2c->tx_setup);
+
         dev_dbg(i2c->dev, "iiccon, %08lx\n", iiccon);
         writel(iiccon, i2c->regs + S3C2410_IICCON);
         
@@ -322,7 +327,15 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
                 if (!is_msgend(i2c)) {
                         byte = i2c->msg->buf[i2c->msg_ptr++];
                         writeb(byte, i2c->regs + S3C2410_IICDS);
-                        
+
+                        /* delay after writing the byte to allow the
+                         * data setup time on the bus, as writing the
+                         * data to the register causes the first bit
+                         * to appear on SDA, and SCL will change as
+                         * soon as the interrupt is acknowledged */
+
+                        ndelay(i2c->tx_setup);
+
                 } else if (!is_lastmsg(i2c)) {
                         /* we need to go to the next i2c message */
 
@@ -570,9 +583,10 @@ static const struct i2c_algorithm s3c24xx_i2c_algorithm = {
 };
 
 static struct s3c24xx_i2c s3c24xx_i2c = {
-        .lock   = SPIN_LOCK_UNLOCKED,
-        .wait   = __WAIT_QUEUE_HEAD_INITIALIZER(s3c24xx_i2c.wait),
-        .adap   = {
+        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_i2c.lock),
+        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(s3c24xx_i2c.wait),
+        .tx_setup       = 50,
+        .adap           = {
                 .name                   = "s3c2410-i2c",
                 .owner                  = THIS_MODULE,
                 .algo                   = &s3c24xx_i2c_algorithm,
@@ -731,26 +745,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
         return 0;
 }
 
-static void s3c24xx_i2c_free(struct s3c24xx_i2c *i2c)
-{
-        if (i2c->clk != NULL && !IS_ERR(i2c->clk)) {
-                clk_disable(i2c->clk);
-                clk_put(i2c->clk);
-                i2c->clk = NULL;
-        }
-
-        if (i2c->regs != NULL) {
-                iounmap(i2c->regs);
-                i2c->regs = NULL;
-        }
-
-        if (i2c->ioarea != NULL) {
-                release_resource(i2c->ioarea);
-                kfree(i2c->ioarea);
-                i2c->ioarea = NULL;
-        }
-}
-
 /* s3c24xx_i2c_probe
  *
  * called by the bus driver when a suitable device is found
@@ -769,7 +763,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         if (IS_ERR(i2c->clk)) {
                 dev_err(&pdev->dev, "cannot get clock\n");
                 ret = -ENOENT;
-                goto out;
+                goto err_noclk;
         }
 
         dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
@@ -782,7 +776,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         if (res == NULL) {
                 dev_err(&pdev->dev, "cannot find IO resource\n");
                 ret = -ENOENT;
-                goto out;
+                goto err_clk;
         }
 
         i2c->ioarea = request_mem_region(res->start, (res->end-res->start)+1,
@@ -791,7 +785,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         if (i2c->ioarea == NULL) {
                 dev_err(&pdev->dev, "cannot request IO\n");
                 ret = -ENXIO;
-                goto out;
+                goto err_clk;
         }
 
         i2c->regs = ioremap(res->start, (res->end-res->start)+1);
@@ -799,7 +793,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         if (i2c->regs == NULL) {
                 dev_err(&pdev->dev, "cannot map IO\n");
                 ret = -ENXIO;
-                goto out;
+                goto err_ioarea;
         }
 
         dev_dbg(&pdev->dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
@@ -813,7 +807,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
         ret = s3c24xx_i2c_init(i2c);
         if (ret != 0)
-                goto out;
+                goto err_iomap;
 
         /* find the IRQ for this unit (note, this relies on the init call to
          * ensure no current IRQs pending 
@@ -823,7 +817,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         if (res == NULL) {
                 dev_err(&pdev->dev, "cannot find IRQ\n");
                 ret = -ENOENT;
-                goto out;
+                goto err_iomap;
         }
 
         ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED,
@@ -831,7 +825,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
         if (ret != 0) {
                 dev_err(&pdev->dev, "cannot claim IRQ\n");
-                goto out;
+                goto err_iomap;
         }
 
         i2c->irq = res;
@@ -841,17 +835,29 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to add bus to i2c core\n");
-                goto out;
+                goto err_irq;
         }
 
         platform_set_drvdata(pdev, i2c);
 
         dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+        return 0;
 
- out:
-        if (ret < 0)
-                s3c24xx_i2c_free(i2c);
+ err_irq:
+        free_irq(i2c->irq->start, i2c);
+
+ err_iomap:
+        iounmap(i2c->regs);
 
+ err_ioarea:
+        release_resource(i2c->ioarea);
+        kfree(i2c->ioarea);
+
+ err_clk:
+        clk_disable(i2c->clk);
+        clk_put(i2c->clk);
+
+ err_noclk:
         return ret;
 }
 
@@ -863,11 +869,17 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 static int s3c24xx_i2c_remove(struct platform_device *pdev)
 {
         struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
-        
-        if (i2c != NULL) {
-                s3c24xx_i2c_free(i2c);
-                platform_set_drvdata(pdev, NULL);
-        }
+
+        i2c_del_adapter(&i2c->adap);
+        free_irq(i2c->irq->start, i2c);
+
+        clk_disable(i2c->clk);
+        clk_put(i2c->clk);
+
+        iounmap(i2c->regs);
+
+        release_resource(i2c->ioarea);
+        kfree(i2c->ioarea);
 
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
new file mode 100644
index 000000000000..10af8d31e12a
--- /dev/null
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2005 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * Simtec Generic I2C Controller
+ *
+ * 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
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+
+#include <asm/io.h>
+
+struct simtec_i2c_data {
+        struct resource         *ioarea;
+        void __iomem            *reg;
+        struct i2c_adapter       adap;
+        struct i2c_algo_bit_data bit;
+};
+
+#define CMD_SET_SDA     (1<<2)
+#define CMD_SET_SCL     (1<<3)
+
+#define STATE_SDA       (1<<0)
+#define STATE_SCL       (1<<1)
+
+/* i2c bit-bus functions */
+
+static void simtec_i2c_setsda(void *pw, int state)
+{
+        struct simtec_i2c_data *pd = pw;
+        writeb(CMD_SET_SDA | (state ? STATE_SDA : 0), pd->reg);
+}
+
+static void simtec_i2c_setscl(void *pw, int state)
+{
+        struct simtec_i2c_data *pd = pw;
+        writeb(CMD_SET_SCL | (state ? STATE_SCL : 0), pd->reg);
+}
+
+static int simtec_i2c_getsda(void *pw)
+{
+        struct simtec_i2c_data *pd = pw;
+        return readb(pd->reg) & STATE_SDA ? 1 : 0;
+}
+
+static int simtec_i2c_getscl(void *pw)
+{
+        struct simtec_i2c_data *pd = pw;
+        return readb(pd->reg) & STATE_SCL ? 1 : 0;
+}
+
+/* device registration */
+
+static int simtec_i2c_probe(struct platform_device *dev)
+{
+        struct simtec_i2c_data *pd;
+        struct resource *res;
+        int size;
+        int ret;
+
+        pd = kzalloc(sizeof(struct simtec_i2c_data), GFP_KERNEL);
+        if (pd == NULL) {
+                dev_err(&dev->dev, "cannot allocate private data\n");
+                return -ENOMEM;
+        }
+
+        platform_set_drvdata(dev, pd);
+
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(&dev->dev, "cannot find IO resource\n");
+                ret = -ENOENT;
+                goto err;
+        }
+
+        size = (res->end-res->start)+1;
+
+        pd->ioarea = request_mem_region(res->start, size, dev->name);
+        if (pd->ioarea == NULL) {
+                dev_err(&dev->dev, "cannot request IO\n");
+                ret = -ENXIO;
+                goto err;
+        }
+
+        pd->reg = ioremap(res->start, size);
+        if (pd->reg == NULL) {
+                dev_err(&dev->dev, "cannot map IO\n");
+                ret = -ENXIO;
+                goto err_res;
+        }
+
+        /* setup the private data */
+
+        pd->adap.owner = THIS_MODULE;
+        pd->adap.algo_data = &pd->bit;
+        pd->adap.dev.parent = &dev->dev;
+
+        strlcpy(pd->adap.name, "Simtec I2C", sizeof(pd->adap.name));
+
+        pd->bit.data = pd;
+        pd->bit.setsda = simtec_i2c_setsda;
+        pd->bit.setscl = simtec_i2c_setscl;
+        pd->bit.getsda = simtec_i2c_getsda;
+        pd->bit.getscl = simtec_i2c_getscl;
+        pd->bit.timeout = HZ;
+        pd->bit.udelay = 20;
+
+        ret = i2c_bit_add_bus(&pd->adap);
+        if (ret)
+                goto err_all;
+
+        return 0;
+
+ err_all:
+        iounmap(pd->reg);
+
+ err_res:
+        release_resource(pd->ioarea);
+        kfree(pd->ioarea);
+
+ err:
+        kfree(pd);
+        return ret;
+}
+
+static int simtec_i2c_remove(struct platform_device *dev)
+{
+        struct simtec_i2c_data *pd = platform_get_drvdata(dev);
+
+        i2c_del_adapter(&pd->adap);
+
+        iounmap(pd->reg);
+        release_resource(pd->ioarea);
+        kfree(pd->ioarea);
+        kfree(pd);
+
+        return 0;
+}
+
+
+/* device driver */
+
+static struct platform_driver simtec_i2c_driver = {
+        .driver         = {
+                .name           = "simtec-i2c",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = simtec_i2c_probe,
+        .remove         = simtec_i2c_remove,
+};
+
+static int __init i2c_adap_simtec_init(void)
+{
+        return platform_driver_register(&simtec_i2c_driver);
+}
+
+static void __exit i2c_adap_simtec_exit(void)
+{
+        platform_driver_unregister(&simtec_i2c_driver);
+}
+
+module_init(i2c_adap_simtec_init);
+module_exit(i2c_adap_simtec_exit);
+
+MODULE_DESCRIPTION("Simtec Generic I2C Bus driver");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 4157b0cd604c..dc235bb8e24d 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -300,7 +300,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
         /* set up the sysfs linkage to our parent device */
         sis96x_adapter.dev.parent = &dev->dev;
 
-        snprintf(sis96x_adapter.name, I2C_NAME_SIZE,
+        snprintf(sis96x_adapter.name, sizeof(sis96x_adapter.name),
                 "SiS96x SMBus adapter at 0x%04x", sis96x_smbus_base);
 
         if ((retval = i2c_add_adapter(&sis96x_adapter))) {
diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
new file mode 100644
index 000000000000..907999049d50
--- /dev/null
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -0,0 +1,277 @@
+/*
+ * driver for the i2c-tiny-usb adapter - 1.0
+ * http://www.harbaum.org/till/i2c_tiny_usb
+ *
+ * Copyright (C) 2006-2007 Till Harbaum (Till@Harbaum.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, version 2.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+
+/* include interfaces to usb layer */
+#include <linux/usb.h>
+
+/* include interface to i2c layer */
+#include <linux/i2c.h>
+
+/* commands via USB, must match command ids in the firmware */
+#define CMD_ECHO                0
+#define CMD_GET_FUNC            1
+#define CMD_SET_DELAY           2
+#define CMD_GET_STATUS          3
+
+#define CMD_I2C_IO              4
+#define CMD_I2C_IO_BEGIN        (1<<0)
+#define CMD_I2C_IO_END          (1<<1)
+
+/* i2c bit delay, default is 10us -> 100kHz */
+static int delay = 10;
+module_param(delay, int, 0);
+MODULE_PARM_DESC(delay, "bit delay in microseconds, "
+                 "e.g. 10 for 100kHz (default is 100kHz)");
+
+static int usb_read(struct i2c_adapter *adapter, int cmd,
+                    int value, int index, void *data, int len);
+
+static int usb_write(struct i2c_adapter *adapter, int cmd,
+                     int value, int index, void *data, int len);
+
+/* ----- begin of i2c layer ---------------------------------------------- */
+
+#define STATUS_IDLE             0
+#define STATUS_ADDRESS_ACK      1
+#define STATUS_ADDRESS_NAK      2
+
+static int usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
+{
+        unsigned char status;
+        struct i2c_msg *pmsg;
+        int i;
+
+        dev_dbg(&adapter->dev, "master xfer %d messages:\n", num);
+
+        for (i = 0 ; i < num ; i++) {
+                int cmd = CMD_I2C_IO;
+
+                if (i == 0)
+                        cmd |= CMD_I2C_IO_BEGIN;
+
+                if (i == num-1)
+                        cmd |= CMD_I2C_IO_END;
+
+                pmsg = &msgs[i];
+
+                dev_dbg(&adapter->dev,
+                        "  %d: %s (flags %d) %d bytes to 0x%02x\n",
+                        i, pmsg->flags & I2C_M_RD ? "read" : "write",
+                        pmsg->flags, pmsg->len, pmsg->addr);
+
+                /* and directly send the message */
+                if (pmsg->flags & I2C_M_RD) {
+                        /* read data */
+                        if (usb_read(adapter, cmd,
+                                     pmsg->flags, pmsg->addr,
+                                     pmsg->buf, pmsg->len) != pmsg->len) {
+                                dev_err(&adapter->dev,
+                                        "failure reading data\n");
+                                return -EREMOTEIO;
+                        }
+                } else {
+                        /* write data */
+                        if (usb_write(adapter, cmd,
+                                      pmsg->flags, pmsg->addr,
+                                      pmsg->buf, pmsg->len) != pmsg->len) {
+                                dev_err(&adapter->dev,
+                                        "failure writing data\n");
+                                return -EREMOTEIO;
+                        }
+                }
+
+                /* read status */
+                if (usb_read(adapter, CMD_GET_STATUS, 0, 0, &status, 1) != 1) {
+                        dev_err(&adapter->dev, "failure reading status\n");
+                        return -EREMOTEIO;
+                }
+
+                dev_dbg(&adapter->dev, "  status = %d\n", status);
+                if (status == STATUS_ADDRESS_NAK)
+                        return -EREMOTEIO;
+        }
+
+        return i;
+}
+
+static u32 usb_func(struct i2c_adapter *adapter)
+{
+        u32 func;
+
+        /* get functionality from adapter */
+        if (usb_read(adapter, CMD_GET_FUNC, 0, 0, &func, sizeof(func)) !=
+            sizeof(func)) {
+                dev_err(&adapter->dev, "failure reading functionality\n");
+                return 0;
+        }
+
+        return func;
+}
+
+/* This is the actual algorithm we define */
+static const struct i2c_algorithm usb_algorithm = {
+        .master_xfer    = usb_xfer,
+        .functionality  = usb_func,
+};
+
+/* ----- end of i2c layer ------------------------------------------------ */
+
+/* ----- begin of usb layer ---------------------------------------------- */
+
+/* The usb i2c interface uses a vid/pid pair donated by */
+/* Future Technology Devices International Ltd. */
+static struct usb_device_id i2c_tiny_usb_table [] = {
+        { USB_DEVICE(0x0403, 0xc631) },
+        { }                     /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table);
+
+/* Structure to hold all of our device specific stuff */
+struct i2c_tiny_usb {
+        struct usb_device *usb_dev; /* the usb device for this device */
+        struct usb_interface *interface; /* the interface for this device */
+        struct i2c_adapter adapter; /* i2c related things */
+};
+
+static int usb_read(struct i2c_adapter *adapter, int cmd,
+                    int value, int index, void *data, int len)
+{
+        struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;
+
+        /* do control transfer */
+        return usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0),
+                               cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE |
+                               USB_DIR_IN, value, index, data, len, 2000);
+}
+
+static int usb_write(struct i2c_adapter *adapter, int cmd,
+                     int value, int index, void *data, int len)
+{
+        struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;
+
+        /* do control transfer */
+        return usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0),
+                               cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                               value, index, data, len, 2000);
+}
+
+static void i2c_tiny_usb_free(struct i2c_tiny_usb *dev)
+{
+        usb_put_dev(dev->usb_dev);
+        kfree(dev);
+}
+
+static int i2c_tiny_usb_probe(struct usb_interface *interface,
+                              const struct usb_device_id *id)
+{
+        struct i2c_tiny_usb *dev;
+        int retval = -ENOMEM;
+        u16 version;
+
+        dev_dbg(&interface->dev, "probing usb device\n");
+
+        /* allocate memory for our device state and initialize it */
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (dev == NULL) {
+                dev_err(&interface->dev, "Out of memory\n");
+                goto error;
+        }
+
+        dev->usb_dev = usb_get_dev(interface_to_usbdev(interface));
+        dev->interface = interface;
+
+        /* save our data pointer in this interface device */
+        usb_set_intfdata(interface, dev);
+
+        version = le16_to_cpu(dev->usb_dev->descriptor.bcdDevice);
+        dev_info(&interface->dev,
+                 "version %x.%02x found at bus %03d address %03d\n",
+                 version >> 8, version & 0xff,
+                 dev->usb_dev->bus->busnum, dev->usb_dev->devnum);
+
+        /* setup i2c adapter description */
+        dev->adapter.owner = THIS_MODULE;
+        dev->adapter.class = I2C_CLASS_HWMON;
+        dev->adapter.algo = &usb_algorithm;
+        dev->adapter.algo_data = dev;
+        snprintf(dev->adapter.name, I2C_NAME_SIZE,
+                 "i2c-tiny-usb at bus %03d device %03d",
+                 dev->usb_dev->bus->busnum, dev->usb_dev->devnum);
+
+        if (usb_write(&dev->adapter, CMD_SET_DELAY,
+                      cpu_to_le16(delay), 0, NULL, 0) != 0) {
+                dev_err(&dev->adapter.dev,
+                        "failure setting delay to %dus\n", delay);
+                retval = -EIO;
+                goto error;
+        }
+
+        dev->adapter.dev.parent = &dev->interface->dev;
+
+        /* and finally attach to i2c layer */
+        i2c_add_adapter(&dev->adapter);
+
+        /* inform user about successful attachment to i2c layer */
+        dev_info(&dev->adapter.dev, "connected i2c-tiny-usb device\n");
+
+        return 0;
+
+ error:
+        if (dev)
+                i2c_tiny_usb_free(dev);
+
+        return retval;
+}
+
+static void i2c_tiny_usb_disconnect(struct usb_interface *interface)
+{
+        struct i2c_tiny_usb *dev = usb_get_intfdata(interface);
+
+        i2c_del_adapter(&dev->adapter);
+        usb_set_intfdata(interface, NULL);
+        i2c_tiny_usb_free(dev);
+
+        dev_dbg(&interface->dev, "disconnected\n");
+}
+
+static struct usb_driver i2c_tiny_usb_driver = {
+        .name           = "i2c-tiny-usb",
+        .probe          = i2c_tiny_usb_probe,
+        .disconnect     = i2c_tiny_usb_disconnect,
+        .id_table       = i2c_tiny_usb_table,
+};
+
+static int __init usb_i2c_tiny_usb_init(void)
+{
+        /* register this driver with the USB subsystem */
+        return usb_register(&i2c_tiny_usb_driver);
+}
+
+static void __exit usb_i2c_tiny_usb_exit(void)
+{
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&i2c_tiny_usb_driver);
+}
+
+module_init(usb_i2c_tiny_usb_init);
+module_exit(usb_i2c_tiny_usb_exit);
+
+/* ----- end of usb layer ------------------------------------------------ */
+
+MODULE_AUTHOR("Till Harbaum <Till@Harbaum.org>");
+MODULE_DESCRIPTION("i2c-tiny-usb driver v1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 03c5fc868548..7a2bc06304fc 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -404,7 +404,7 @@ found:
         }
 
         vt596_adapter.dev.parent = &pdev->dev;
-        snprintf(vt596_adapter.name, I2C_NAME_SIZE,
+        snprintf(vt596_adapter.name, sizeof(vt596_adapter.name),
                  "SMBus Via Pro adapter at %04x", vt596_smba);
 
         vt596_pdev = pci_dev_get(pdev);
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 0b082c5a0195..0db56e7bc34e 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -441,7 +441,7 @@ static __init struct scx200_acb_iface *scx200_create_iface(const char *text,
 
         adapter = &iface->adapter;
         i2c_set_adapdata(adapter, iface);
-        snprintf(adapter->name, I2C_NAME_SIZE, "%s ACB%d", text, index);
+        snprintf(adapter->name, sizeof(adapter->name), "%s ACB%d", text, index);
         adapter->owner = THIS_MODULE;
         adapter->id = I2C_HW_SMBUS_SCX200;
         adapter->algo = &scx200_acb_algorithm;
@@ -599,6 +599,7 @@ static __init int scx200_scan_pci(void)
                 else {
                         int i;
 
+                        pci_dev_put(pdev);
                         for (i = 0; i < MAX_DEVICES; ++i) {
                                 if (base[i] == 0)
                                         continue;
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 87ee3ce58618..ea085a006ead 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "Miscellaneous I2C Chip support"
-        depends on I2C
 
 config SENSORS_DS1337
         tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1337 and DS1339 real-time clock chips.
@@ -17,7 +16,7 @@ config SENSORS_DS1337
 
 config SENSORS_DS1374
         tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1374 real-time clock chips.
@@ -27,7 +26,7 @@ config SENSORS_DS1374
 
 config SENSORS_EEPROM
         tristate "EEPROM reader"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get read-only access to the EEPROM data
           available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -38,7 +37,7 @@ config SENSORS_EEPROM
 
 config SENSORS_PCF8574
         tristate "Philips PCF8574 and PCF8574A"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         default n
         help
           If you say yes here you get support for Philips PCF8574 and 
@@ -52,7 +51,7 @@ config SENSORS_PCF8574
 
 config SENSORS_PCA9539
         tristate "Philips PCA9539 16-bit I/O port"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for the Philips PCA9539
           16-bit I/O port.
@@ -62,7 +61,7 @@ config SENSORS_PCA9539
 
 config SENSORS_PCF8591
         tristate "Philips PCF8591"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         default n
         help
           If you say yes here you get support for Philips PCF8591 chips.
@@ -75,7 +74,7 @@ config SENSORS_PCF8591
 
 config ISP1301_OMAP
         tristate "Philips ISP1301 with OMAP OTG"
-        depends on I2C && ARCH_OMAP_OTG
+        depends on ARCH_OMAP_OTG
         help
           If you say yes here you get support for the Philips ISP1301
           USB-On-The-Go transceiver working with the OMAP OTG controller.
@@ -90,7 +89,7 @@ config ISP1301_OMAP
 # and having mostly OMAP-specific board support
 config TPS65010
         tristate "TPS6501x Power Management chips"
-        depends on I2C && ARCH_OMAP
+        depends on ARCH_OMAP
         default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
         help
           If you say yes here you get support for the TPS6501x series of
@@ -103,7 +102,7 @@ config TPS65010
 
 config SENSORS_M41T00
         tristate "ST M41T00 RTC chip"
-        depends on I2C && PPC32
+        depends on PPC32
         help
           If you say yes here you get support for the ST M41T00 RTC chip.
 
@@ -112,7 +111,7 @@ config SENSORS_M41T00
 
 config SENSORS_MAX6875
         tristate "Maxim MAX6875 Power supply supervisor"
-        depends on I2C && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for the Maxim MAX6875
           EEPROM-programmable, quad power-supply sequencer/supervisor.
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 214fbb1423c5..7ed92dc3d833 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps)
 #if 0
                         /* REVISIT:  this might need its own workqueue
                          * plus tweaks including deadlock avoidance ...
+                         * also needs to get error handling and probably
+                         * an #ifdef CONFIG_SOFTWARE_SUSPEND
                          */
-                        software_suspend();
+                        pm_suspend(PM_SUSPEND_DISK);
 #endif
                         poll = 1;
                 }
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
new file mode 100644
index 000000000000..ffb35f09df03
--- /dev/null
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -0,0 +1,90 @@
+/*
+ * i2c-boardinfo.h - collect pre-declarations of I2C devices
+ *
+ * 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/kernel.h>
+#include <linux/i2c.h>
+
+#include "i2c-core.h"
+
+
+/* These symbols are exported ONLY FOR the i2c core.
+ * No other users will be supported.
+ */
+DEFINE_MUTEX(__i2c_board_lock);
+EXPORT_SYMBOL_GPL(__i2c_board_lock);
+
+LIST_HEAD(__i2c_board_list);
+EXPORT_SYMBOL_GPL(__i2c_board_list);
+
+int __i2c_first_dynamic_bus_num;
+EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
+
+
+/**
+ * i2c_register_board_info - statically declare I2C devices
+ * @busnum: identifies the bus to which these devices belong
+ * @info: vector of i2c device descriptors
+ * @len: how many descriptors in the vector; may be zero to reserve
+ *      the specified bus number.
+ *
+ * Systems using the Linux I2C driver stack can declare tables of board info
+ * while they initialize.  This should be done in board-specific init code
+ * near arch_initcall() time, or equivalent, before any I2C adapter driver is
+ * registered.  For example, mainboard init code could define several devices,
+ * as could the init code for each daughtercard in a board stack.
+ *
+ * The I2C devices will be created later, after the adapter for the relevant
+ * bus has been registered.  After that moment, standard driver model tools
+ * are used to bind "new style" I2C drivers to the devices.  The bus number
+ * for any device declared using this routine is not available for dynamic
+ * allocation.
+ *
+ * The board info passed can safely be __initdata, but be careful of embedded
+ * pointers (for platform_data, functions, etc) since that won't be copied.
+ */
+int __init
+i2c_register_board_info(int busnum,
+        struct i2c_board_info const *info, unsigned len)
+{
+        int status;
+
+        mutex_lock(&__i2c_board_lock);
+
+        /* dynamic bus numbers will be assigned after the last static one */
+        if (busnum >= __i2c_first_dynamic_bus_num)
+                __i2c_first_dynamic_bus_num = busnum + 1;
+
+        for (status = 0; len; len--, info++) {
+                struct i2c_devinfo      *devinfo;
+
+                devinfo = kzalloc(sizeof(*devinfo), GFP_KERNEL);
+                if (!devinfo) {
+                        pr_debug("i2c-core: can't register boardinfo!\n");
+                        status = -ENOMEM;
+                        break;
+                }
+
+                devinfo->busnum = busnum;
+                devinfo->board_info = *info;
+                list_add_tail(&devinfo->list, &__i2c_board_list);
+        }
+
+        mutex_unlock(&__i2c_board_lock);
+
+        return status;
+}
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 21fe1406c8b4..64f8e56d300e 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -35,29 +35,92 @@
 #include <linux/completion.h>
 #include <asm/uaccess.h>
 
+#include "i2c-core.h"
+
 
 static LIST_HEAD(adapters);
 static LIST_HEAD(drivers);
 static DEFINE_MUTEX(core_lists);
 static DEFINE_IDR(i2c_adapter_idr);
 
+#define is_newstyle_driver(d) ((d)->probe || (d)->remove)
 
 /* ------------------------------------------------------------------------- */
 
-/* match always succeeds, as we want the probe() to tell if we really accept this match */
 static int i2c_device_match(struct device *dev, struct device_driver *drv)
 {
-        return 1;
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct i2c_driver       *driver = to_i2c_driver(drv);
+
+        /* make legacy i2c drivers bypass driver model probing entirely;
+         * such drivers scan each i2c adapter/bus themselves.
+         */
+        if (!is_newstyle_driver(driver))
+                return 0;
+
+        /* new style drivers use the same kind of driver matching policy
+         * as platform devices or SPI:  compare device and driver IDs.
+         */
+        return strcmp(client->driver_name, drv->name) == 0;
+}
+
+#ifdef  CONFIG_HOTPLUG
+
+/* uevent helps with hotplug: modprobe -q $(MODALIAS) */
+static int i2c_device_uevent(struct device *dev, char **envp, int num_envp,
+                      char *buffer, int buffer_size)
+{
+        struct i2c_client       *client = to_i2c_client(dev);
+        int                     i = 0, length = 0;
+
+        /* by definition, legacy drivers can't hotplug */
+        if (dev->driver || !client->driver_name)
+                return 0;
+
+        if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
+                        "MODALIAS=%s", client->driver_name))
+                return -ENOMEM;
+        envp[i] = NULL;
+        dev_dbg(dev, "uevent\n");
+        return 0;
 }
 
+#else
+#define i2c_device_uevent       NULL
+#endif  /* CONFIG_HOTPLUG */
+
 static int i2c_device_probe(struct device *dev)
 {
-        return -ENODEV;
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct i2c_driver       *driver = to_i2c_driver(dev->driver);
+
+        if (!driver->probe)
+                return -ENODEV;
+        client->driver = driver;
+        dev_dbg(dev, "probe\n");
+        return driver->probe(client);
 }
 
 static int i2c_device_remove(struct device *dev)
 {
-        return 0;
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct i2c_driver       *driver;
+        int                     status;
+
+        if (!dev->driver)
+                return 0;
+
+        driver = to_i2c_driver(dev->driver);
+        if (driver->remove) {
+                dev_dbg(dev, "remove\n");
+                status = driver->remove(client);
+        } else {
+                dev->driver = NULL;
+                status = 0;
+        }
+        if (status == 0)
+                client->driver = NULL;
+        return status;
 }
 
 static void i2c_device_shutdown(struct device *dev)
@@ -95,122 +158,184 @@ static int i2c_device_resume(struct device * dev)
         return driver->resume(to_i2c_client(dev));
 }
 
+static void i2c_client_release(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        complete(&client->released);
+}
+
+static void i2c_client_dev_release(struct device *dev)
+{
+        kfree(to_i2c_client(dev));
+}
+
+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);
+}
+
+static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return client->driver_name
+                ? sprintf(buf, "%s\n", client->driver_name)
+                : 0;
+}
+
+static struct device_attribute i2c_dev_attrs[] = {
+        __ATTR(name, S_IRUGO, show_client_name, NULL),
+        /* modalias helps coldplug:  modprobe $(cat .../modalias) */
+        __ATTR(modalias, S_IRUGO, show_modalias, NULL),
+        { },
+};
+
 struct bus_type i2c_bus_type = {
         .name           = "i2c",
+        .dev_attrs      = i2c_dev_attrs,
         .match          = i2c_device_match,
+        .uevent         = i2c_device_uevent,
         .probe          = i2c_device_probe,
         .remove         = i2c_device_remove,
         .shutdown       = i2c_device_shutdown,
         .suspend        = i2c_device_suspend,
         .resume         = i2c_device_resume,
 };
+EXPORT_SYMBOL_GPL(i2c_bus_type);
 
-/* ------------------------------------------------------------------------- */
+/**
+ * i2c_new_device - instantiate an i2c device for use with a new style driver
+ * @adap: the adapter managing the device
+ * @info: describes one I2C device; bus_num is ignored
+ *
+ * Create a device to work with a new style i2c driver, where binding is
+ * handled through driver model probe()/remove() methods.  This call is not
+ * appropriate for use by mainboad initialization logic, which usually runs
+ * during an arch_initcall() long before any i2c_adapter could exist.
+ *
+ * This returns the new i2c client, which may be saved for later use with
+ * i2c_unregister_device(); or NULL to indicate an error.
+ */
+struct i2c_client *
+i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
+{
+        struct i2c_client       *client;
+        int                     status;
 
-void i2c_adapter_dev_release(struct device *dev)
+        client = kzalloc(sizeof *client, GFP_KERNEL);
+        if (!client)
+                return NULL;
+
+        client->adapter = adap;
+
+        client->dev.platform_data = info->platform_data;
+        client->flags = info->flags;
+        client->addr = info->addr;
+        client->irq = info->irq;
+
+        strlcpy(client->driver_name, info->driver_name,
+                sizeof(client->driver_name));
+        strlcpy(client->name, info->type, sizeof(client->name));
+
+        /* a new style driver may be bound to this device when we
+         * return from this function, or any later moment (e.g. maybe
+         * hotplugging will load the driver module).  and the device
+         * refcount model is the standard driver model one.
+         */
+        status = i2c_attach_client(client);
+        if (status < 0) {
+                kfree(client);
+                client = NULL;
+        }
+        return client;
+}
+EXPORT_SYMBOL_GPL(i2c_new_device);
+
+
+/**
+ * i2c_unregister_device - reverse effect of i2c_new_device()
+ * @client: value returned from i2c_new_device()
+ */
+void i2c_unregister_device(struct i2c_client *client)
 {
-        struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
-        complete(&adap->dev_released);
+        struct i2c_adapter      *adapter = client->adapter;
+        struct i2c_driver       *driver = client->driver;
+
+        if (driver && !is_newstyle_driver(driver)) {
+                dev_err(&client->dev, "can't unregister devices "
+                        "with legacy drivers\n");
+                WARN_ON(1);
+                return;
+        }
+
+        mutex_lock(&adapter->clist_lock);
+        list_del(&client->list);
+        mutex_unlock(&adapter->clist_lock);
+
+        device_unregister(&client->dev);
 }
+EXPORT_SYMBOL_GPL(i2c_unregister_device);
 
-struct device_driver i2c_adapter_driver = {
-        .owner = THIS_MODULE,
-        .name = "i2c_adapter",
-        .bus = &i2c_bus_type,
-};
 
 /* ------------------------------------------------------------------------- */
 
 /* I2C bus adapters -- one roots each I2C or SMBUS segment */
 
-static void i2c_adapter_class_dev_release(struct class_device *dev)
+void i2c_adapter_dev_release(struct device *dev)
 {
-        struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-        complete(&adap->class_dev_released);
+        struct i2c_adapter *adap = to_i2c_adapter(dev);
+        complete(&adap->dev_released);
 }
+EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);     /* exported to i2c-isa */
 
-static ssize_t i2c_adapter_show_name(struct class_device *cdev, char *buf)
+static ssize_t
+show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct i2c_adapter *adap = class_dev_to_i2c_adapter(cdev);
+        struct i2c_adapter *adap = to_i2c_adapter(dev);
         return sprintf(buf, "%s\n", adap->name);
 }
 
-static struct class_device_attribute i2c_adapter_attrs[] = {
-        __ATTR(name, S_IRUGO, i2c_adapter_show_name, NULL),
+static struct device_attribute i2c_adapter_attrs[] = {
+        __ATTR(name, S_IRUGO, show_adapter_name, NULL),
         { },
 };
 
 struct class i2c_adapter_class = {
         .owner                  = THIS_MODULE,
         .name                   = "i2c-adapter",
-        .class_dev_attrs        = i2c_adapter_attrs,
-        .release                = &i2c_adapter_class_dev_release,
+        .dev_attrs              = i2c_adapter_attrs,
 };
+EXPORT_SYMBOL_GPL(i2c_adapter_class);           /* exported to i2c-isa */
 
-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);
-}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
-
-
-static void i2c_client_release(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        complete(&client->released);
-}
-
-static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
+static void i2c_scan_static_board_info(struct i2c_adapter *adapter)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        return sprintf(buf, "%s\n", client->name);
+        struct i2c_devinfo      *devinfo;
+
+        mutex_lock(&__i2c_board_lock);
+        list_for_each_entry(devinfo, &__i2c_board_list, list) {
+                if (devinfo->busnum == adapter->nr
+                                && !i2c_new_device(adapter,
+                                                &devinfo->board_info))
+                        printk(KERN_ERR "i2c-core: can't create i2c%d-%04x\n",
+                                i2c_adapter_id(adapter),
+                                devinfo->board_info.addr);
+        }
+        mutex_unlock(&__i2c_board_lock);
 }
 
-/*
- * We can't use the DEVICE_ATTR() macro here, as we used the same name for
- * an i2c adapter attribute (above).
- */
-static struct device_attribute dev_attr_client_name =
-        __ATTR(name, S_IRUGO, &show_client_name, NULL);
-
-
-/* ---------------------------------------------------
- * registering functions
- * ---------------------------------------------------
- */
-
-/* -----
- * i2c_add_adapter is called from within the algorithm layer,
- * when a new hw adapter registers. A new device is register to be
- * available for clients.
- */
-int i2c_add_adapter(struct i2c_adapter *adap)
+static int i2c_register_adapter(struct i2c_adapter *adap)
 {
-        int id, res = 0;
+        int res = 0;
         struct list_head   *item;
         struct i2c_driver  *driver;
 
-        mutex_lock(&core_lists);
-
-        if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
-                res = -ENOMEM;
-                goto out_unlock;
-        }
-
-        res = idr_get_new(&i2c_adapter_idr, adap, &id);
-        if (res < 0) {
-                if (res == -EAGAIN)
-                        res = -ENOMEM;
-                goto out_unlock;
-        }
-
-        adap->nr =  id & MAX_ID_MASK;
         mutex_init(&adap->bus_lock);
         mutex_init(&adap->clist_lock);
-        list_add_tail(&adap->list,&adapters);
         INIT_LIST_HEAD(&adap->clients);
 
+        mutex_lock(&core_lists);
+        list_add_tail(&adap->list, &adapters);
+
         /* Add the adapter to the driver core.
          * If the parent pointer is not set up,
          * we add this adapter to the host bus.
@@ -221,27 +346,19 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                          "physical device\n", adap->name);
         }
         sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
-        adap->dev.driver = &i2c_adapter_driver;
         adap->dev.release = &i2c_adapter_dev_release;
+        adap->dev.class = &i2c_adapter_class;
         res = device_register(&adap->dev);
         if (res)
                 goto out_list;
-        res = device_create_file(&adap->dev, &dev_attr_name);
-        if (res)
-                goto out_unregister;
-
-        /* Add this adapter to the i2c_adapter class */
-        memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-        adap->class_dev.dev = &adap->dev;
-        adap->class_dev.class = &i2c_adapter_class;
-        strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-        res = class_device_register(&adap->class_dev);
-        if (res)
-                goto out_remove_name;
 
         dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
 
-        /* inform drivers of new adapters */
+        /* create pre-declared device nodes for new-style drivers */
+        if (adap->nr < __i2c_first_dynamic_bus_num)
+                i2c_scan_static_board_info(adap);
+
+        /* let legacy drivers scan this bus for matching devices */
         list_for_each(item,&drivers) {
                 driver = list_entry(item, struct i2c_driver, list);
                 if (driver->attach_adapter)
@@ -253,18 +370,98 @@ out_unlock:
         mutex_unlock(&core_lists);
         return res;
 
-out_remove_name:
-        device_remove_file(&adap->dev, &dev_attr_name);
-out_unregister:
-        init_completion(&adap->dev_released); /* Needed? */
-        device_unregister(&adap->dev);
-        wait_for_completion(&adap->dev_released);
 out_list:
         list_del(&adap->list);
         idr_remove(&i2c_adapter_idr, adap->nr);
         goto out_unlock;
 }
 
+/**
+ * i2c_add_adapter - declare i2c adapter, use dynamic bus number
+ * @adapter: the adapter to add
+ *
+ * This routine is used to declare an I2C adapter when its bus number
+ * doesn't matter.  Examples: for I2C adapters dynamically added by
+ * USB links or PCI plugin cards.
+ *
+ * When this returns zero, a new bus number was allocated and stored
+ * in adap->nr, and the specified adapter became available for clients.
+ * Otherwise, a negative errno value is returned.
+ */
+int i2c_add_adapter(struct i2c_adapter *adapter)
+{
+        int     id, res = 0;
+
+retry:
+        if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
+                return -ENOMEM;
+
+        mutex_lock(&core_lists);
+        /* "above" here means "above or equal to", sigh */
+        res = idr_get_new_above(&i2c_adapter_idr, adapter,
+                                __i2c_first_dynamic_bus_num, &id);
+        mutex_unlock(&core_lists);
+
+        if (res < 0) {
+                if (res == -EAGAIN)
+                        goto retry;
+                return res;
+        }
+
+        adapter->nr = id;
+        return i2c_register_adapter(adapter);
+}
+EXPORT_SYMBOL(i2c_add_adapter);
+
+/**
+ * i2c_add_numbered_adapter - declare i2c adapter, use static bus number
+ * @adap: the adapter to register (with adap->nr initialized)
+ *
+ * This routine is used to declare an I2C adapter when its bus number
+ * matters.  Example: for I2C adapters from system-on-chip CPUs, or
+ * otherwise built in to the system's mainboard, and where i2c_board_info
+ * is used to properly configure I2C devices.
+ *
+ * If no devices have pre-been declared for this bus, then be sure to
+ * register the adapter before any dynamically allocated ones.  Otherwise
+ * the required bus ID may not be available.
+ *
+ * When this returns zero, the specified adapter became available for
+ * clients using the bus number provided in adap->nr.  Also, the table
+ * of I2C devices pre-declared using i2c_register_board_info() is scanned,
+ * and the appropriate driver model device nodes are created.  Otherwise, a
+ * negative errno value is returned.
+ */
+int i2c_add_numbered_adapter(struct i2c_adapter *adap)
+{
+        int     id;
+        int     status;
+
+        if (adap->nr & ~MAX_ID_MASK)
+                return -EINVAL;
+
+retry:
+        if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)
+                return -ENOMEM;
+
+        mutex_lock(&core_lists);
+        /* "above" here means "above or equal to", sigh;
+         * we need the "equal to" result to force the result
+         */
+        status = idr_get_new_above(&i2c_adapter_idr, adap, adap->nr, &id);
+        if (status == 0 && id != adap->nr) {
+                status = -EBUSY;
+                idr_remove(&i2c_adapter_idr, id);
+        }
+        mutex_unlock(&core_lists);
+        if (status == -EAGAIN)
+                goto retry;
+
+        if (status == 0)
+                status = i2c_register_adapter(adap);
+        return status;
+}
+EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
 
 int i2c_del_adapter(struct i2c_adapter *adap)
 {
@@ -302,9 +499,19 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         /* detach any active clients. This must be done first, because
          * it can fail; in which case we give up. */
         list_for_each_safe(item, _n, &adap->clients) {
+                struct i2c_driver       *driver;
+
                 client = list_entry(item, struct i2c_client, list);
+                driver = client->driver;
+
+                /* new style, follow standard driver model */
+                if (!driver || is_newstyle_driver(driver)) {
+                        i2c_unregister_device(client);
+                        continue;
+                }
 
-                if ((res=client->driver->detach_client(client))) {
+                /* legacy drivers create and remove clients themselves */
+                if ((res = driver->detach_client(client))) {
                         dev_err(&adap->dev, "detach_client failed for client "
                                 "[%s] at address 0x%02x\n", client->name,
                                 client->addr);
@@ -314,17 +521,13 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 
         /* clean up the sysfs representation */
         init_completion(&adap->dev_released);
-        init_completion(&adap->class_dev_released);
-        class_device_unregister(&adap->class_dev);
-        device_remove_file(&adap->dev, &dev_attr_name);
         device_unregister(&adap->dev);
         list_del(&adap->list);
 
         /* wait for sysfs to drop all references */
         wait_for_completion(&adap->dev_released);
-        wait_for_completion(&adap->class_dev_released);
 
-        /* free dynamically allocated bus id */
+        /* free bus id */
         idr_remove(&i2c_adapter_idr, adap->nr);
 
         dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
@@ -333,24 +536,42 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         mutex_unlock(&core_lists);
         return res;
 }
+EXPORT_SYMBOL(i2c_del_adapter);
+
 
+/* ------------------------------------------------------------------------- */
 
-/* -----
- * What follows is the "upwards" interface: commands for talking to clients,
- * which implement the functions to access the physical information of the
- * chips.
+/*
+ * An i2c_driver is used with one or more i2c_client (device) nodes to access
+ * i2c slave chips, on a bus instance associated with some i2c_adapter.  There
+ * are two models for binding the driver to its device:  "new style" drivers
+ * follow the standard Linux driver model and just respond to probe() calls
+ * issued if the driver core sees they match(); "legacy" drivers create device
+ * nodes themselves.
  */
 
 int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 {
-        struct list_head   *item;
-        struct i2c_adapter *adapter;
         int res;
 
+        /* new style driver methods can't mix with legacy ones */
+        if (is_newstyle_driver(driver)) {
+                if (driver->attach_adapter || driver->detach_adapter
+                                || driver->detach_client) {
+                        printk(KERN_WARNING
+                                        "i2c-core: driver [%s] is confused\n",
+                                        driver->driver.name);
+                        return -EINVAL;
+                }
+        }
+
         /* add the driver to the list of i2c drivers in the driver core */
         driver->driver.owner = owner;
         driver->driver.bus = &i2c_bus_type;
 
+        /* for new style drivers, when registration returns the driver core
+         * will have called probe() for all matching-but-unbound devices.
+         */
         res = driver_register(&driver->driver);
         if (res)
                 return res;
@@ -360,10 +581,11 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
         list_add_tail(&driver->list,&drivers);
         pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name);
 
-        /* now look for instances of driver on our adapters */
+        /* legacy drivers scan i2c busses directly */
         if (driver->attach_adapter) {
-                list_for_each(item,&adapters) {
-                        adapter = list_entry(item, struct i2c_adapter, list);
+                struct i2c_adapter *adapter;
+
+                list_for_each_entry(adapter, &adapters, list) {
                         driver->attach_adapter(adapter);
                 }
         }
@@ -373,16 +595,22 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 }
 EXPORT_SYMBOL(i2c_register_driver);
 
-int i2c_del_driver(struct i2c_driver *driver)
+/**
+ * i2c_del_driver - unregister I2C driver
+ * @driver: the driver being unregistered
+ */
+void i2c_del_driver(struct i2c_driver *driver)
 {
         struct list_head   *item1, *item2, *_n;
         struct i2c_client  *client;
         struct i2c_adapter *adap;
 
-        int res = 0;
-
         mutex_lock(&core_lists);
 
+        /* new-style driver? */
+        if (is_newstyle_driver(driver))
+                goto unregister;
+
         /* Have a look at each adapter, if clients of this driver are still
          * attached. If so, detach them to be able to kill the driver
          * afterwards.
@@ -390,11 +618,10 @@ int i2c_del_driver(struct i2c_driver *driver)
         list_for_each(item1,&adapters) {
                 adap = list_entry(item1, struct i2c_adapter, list);
                 if (driver->detach_adapter) {
-                        if ((res = driver->detach_adapter(adap))) {
+                        if (driver->detach_adapter(adap)) {
                                 dev_err(&adap->dev, "detach_adapter failed "
                                         "for driver [%s]\n",
                                         driver->driver.name);
-                                goto out_unlock;
                         }
                 } else {
                         list_for_each_safe(item2, _n, &adap->clients) {
@@ -404,25 +631,26 @@ int i2c_del_driver(struct i2c_driver *driver)
                                 dev_dbg(&adap->dev, "detaching client [%s] "
                                         "at 0x%02x\n", client->name,
                                         client->addr);
-                                if ((res = driver->detach_client(client))) {
+                                if (driver->detach_client(client)) {
                                         dev_err(&adap->dev, "detach_client "
                                                 "failed for client [%s] at "
                                                 "0x%02x\n", client->name,
                                                 client->addr);
-                                        goto out_unlock;
                                 }
                         }
                 }
         }
 
+ unregister:
         driver_unregister(&driver->driver);
         list_del(&driver->list);
         pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
 
- out_unlock:
         mutex_unlock(&core_lists);
-        return 0;
 }
+EXPORT_SYMBOL(i2c_del_driver);
+
+/* ------------------------------------------------------------------------- */
 
 static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
 {
@@ -447,6 +675,7 @@ int i2c_check_addr(struct i2c_adapter *adapter, int addr)
 
         return rval;
 }
+EXPORT_SYMBOL(i2c_check_addr);
 
 int i2c_attach_client(struct i2c_client *client)
 {
@@ -463,9 +692,15 @@ int i2c_attach_client(struct i2c_client *client)
         client->usage_count = 0;
 
         client->dev.parent = &client->adapter->dev;
-        client->dev.driver = &client->driver->driver;
         client->dev.bus = &i2c_bus_type;
-        client->dev.release = &i2c_client_release;
+
+        if (client->driver)
+                client->dev.driver = &client->driver->driver;
+
+        if (client->driver && !is_newstyle_driver(client->driver))
+                client->dev.release = i2c_client_release;
+        else
+                client->dev.release = i2c_client_dev_release;
 
         snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
                 "%d-%04x", i2c_adapter_id(adapter), client->addr);
@@ -474,9 +709,6 @@ int i2c_attach_client(struct i2c_client *client)
         res = device_register(&client->dev);
         if (res)
                 goto out_list;
-        res = device_create_file(&client->dev, &dev_attr_client_name);
-        if (res)
-                goto out_unregister;
         mutex_unlock(&adapter->clist_lock);
 
         if (adapter->client_register)  {
@@ -489,10 +721,6 @@ int i2c_attach_client(struct i2c_client *client)
 
         return 0;
 
-out_unregister:
-        init_completion(&client->released); /* Needed? */
-        device_unregister(&client->dev);
-        wait_for_completion(&client->released);
 out_list:
         list_del(&client->list);
         dev_err(&adapter->dev, "Failed to attach i2c client %s at 0x%02x "
@@ -501,7 +729,7 @@ out_unlock:
         mutex_unlock(&adapter->clist_lock);
         return res;
 }
-
+EXPORT_SYMBOL(i2c_attach_client);
 
 int i2c_detach_client(struct i2c_client *client)
 {
@@ -527,7 +755,6 @@ int i2c_detach_client(struct i2c_client *client)
         mutex_lock(&adapter->clist_lock);
         list_del(&client->list);
         init_completion(&client->released);
-        device_remove_file(&client->dev, &dev_attr_client_name);
         device_unregister(&client->dev);
         mutex_unlock(&adapter->clist_lock);
         wait_for_completion(&client->released);
@@ -535,6 +762,7 @@ int i2c_detach_client(struct i2c_client *client)
  out:
         return res;
 }
+EXPORT_SYMBOL(i2c_detach_client);
 
 static int i2c_inc_use_client(struct i2c_client *client)
 {
@@ -567,6 +795,7 @@ int i2c_use_client(struct i2c_client *client)
 
         return 0;
 }
+EXPORT_SYMBOL(i2c_use_client);
 
 int i2c_release_client(struct i2c_client *client)
 {
@@ -581,6 +810,7 @@ int i2c_release_client(struct i2c_client *client)
 
         return 0;
 }
+EXPORT_SYMBOL(i2c_release_client);
 
 void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
 {
@@ -601,6 +831,7 @@ void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
        }
        mutex_unlock(&adap->clist_lock);
 }
+EXPORT_SYMBOL(i2c_clients_command);
 
 static int __init i2c_init(void)
 {
@@ -609,16 +840,12 @@ static int __init i2c_init(void)
         retval = bus_register(&i2c_bus_type);
         if (retval)
                 return retval;
-        retval = driver_register(&i2c_adapter_driver);
-        if (retval)
-                return retval;
         return class_register(&i2c_adapter_class);
 }
 
 static void __exit i2c_exit(void)
 {
         class_unregister(&i2c_adapter_class);
-        driver_unregister(&i2c_adapter_driver);
         bus_unregister(&i2c_bus_type);
 }
 
@@ -638,8 +865,9 @@ int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
 #ifdef DEBUG
                 for (ret = 0; ret < num; ret++) {
                         dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
-                                "len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
-                                'R' : 'W', msgs[ret].addr, msgs[ret].len);
+                                "len=%d%s\n", ret, (msgs[ret].flags & I2C_M_RD)
+                                ? 'R' : 'W', msgs[ret].addr, msgs[ret].len,
+                                (msgs[ret].flags & I2C_M_RECV_LEN) ? "+" : "");
                 }
 #endif
 
@@ -653,6 +881,7 @@ int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
                 return -ENOSYS;
         }
 }
+EXPORT_SYMBOL(i2c_transfer);
 
 int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
 {
@@ -671,6 +900,7 @@ int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
            transmitted, else error code. */
         return (ret == 1) ? count : ret;
 }
+EXPORT_SYMBOL(i2c_master_send);
 
 int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
 {
@@ -690,7 +920,7 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
            transmitted, else error code. */
         return (ret == 1) ? count : ret;
 }
-
+EXPORT_SYMBOL(i2c_master_recv);
 
 int i2c_control(struct i2c_client *client,
         unsigned int cmd, unsigned long arg)
@@ -712,6 +942,7 @@ int i2c_control(struct i2c_client *client,
         }
         return ret;
 }
+EXPORT_SYMBOL(i2c_control);
 
 /* ----------------------------------------------------
  * the i2c address scanning function
@@ -853,6 +1084,70 @@ int i2c_probe(struct i2c_adapter *adapter,
 
         return 0;
 }
+EXPORT_SYMBOL(i2c_probe);
+
+struct i2c_client *
+i2c_new_probed_device(struct i2c_adapter *adap,
+                      struct i2c_board_info *info,
+                      unsigned short const *addr_list)
+{
+        int i;
+
+        /* Stop here if the bus doesn't support probing */
+        if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_READ_BYTE)) {
+                dev_err(&adap->dev, "Probing not supported\n");
+                return NULL;
+        }
+
+        mutex_lock(&adap->clist_lock);
+        for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) {
+                /* Check address validity */
+                if (addr_list[i] < 0x03 || addr_list[i] > 0x77) {
+                        dev_warn(&adap->dev, "Invalid 7-bit address "
+                                 "0x%02x\n", addr_list[i]);
+                        continue;
+                }
+
+                /* Check address availability */
+                if (__i2c_check_addr(adap, addr_list[i])) {
+                        dev_dbg(&adap->dev, "Address 0x%02x already in "
+                                "use, not probing\n", addr_list[i]);
+                        continue;
+                }
+
+                /* Test address responsiveness
+                   The default probe method is a quick write, but it is known
+                   to corrupt the 24RF08 EEPROMs due to a state machine bug,
+                   and could also irreversibly write-protect some EEPROMs, so
+                   for address ranges 0x30-0x37 and 0x50-0x5f, we use a byte
+                   read instead. Also, some bus drivers don't implement
+                   quick write, so we fallback to a byte read it that case
+                   too. */
+                if ((addr_list[i] & ~0x07) == 0x30
+                 || (addr_list[i] & ~0x0f) == 0x50
+                 || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) {
+                        if (i2c_smbus_xfer(adap, addr_list[i], 0,
+                                           I2C_SMBUS_READ, 0,
+                                           I2C_SMBUS_BYTE, NULL) >= 0)
+                                break;
+                } else {
+                        if (i2c_smbus_xfer(adap, addr_list[i], 0,
+                                           I2C_SMBUS_WRITE, 0,
+                                           I2C_SMBUS_QUICK, NULL) >= 0)
+                                break;
+                }
+        }
+        mutex_unlock(&adap->clist_lock);
+
+        if (addr_list[i] == I2C_CLIENT_END) {
+                dev_dbg(&adap->dev, "Probing failed, no device found\n");
+                return NULL;
+        }
+
+        info->addr = addr_list[i];
+        return i2c_new_device(adap, info);
+}
+EXPORT_SYMBOL_GPL(i2c_new_probed_device);
 
 struct i2c_adapter* i2c_get_adapter(int id)
 {
@@ -866,11 +1161,13 @@ struct i2c_adapter* i2c_get_adapter(int id)
         mutex_unlock(&core_lists);
         return adapter;
 }
+EXPORT_SYMBOL(i2c_get_adapter);
 
 void i2c_put_adapter(struct i2c_adapter *adap)
 {
         module_put(adap->owner);
 }
+EXPORT_SYMBOL(i2c_put_adapter);
 
 /* The SMBus parts */
 
@@ -939,6 +1236,7 @@ s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
         return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                               value,0,I2C_SMBUS_QUICK,NULL);
 }
+EXPORT_SYMBOL(i2c_smbus_write_quick);
 
 s32 i2c_smbus_read_byte(struct i2c_client *client)
 {
@@ -949,12 +1247,14 @@ s32 i2c_smbus_read_byte(struct i2c_client *client)
         else
                 return data.byte;
 }
+EXPORT_SYMBOL(i2c_smbus_read_byte);
 
 s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
 {
         return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                               I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, NULL);
 }
+EXPORT_SYMBOL(i2c_smbus_write_byte);
 
 s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
 {
@@ -965,6 +1265,7 @@ s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
         else
                 return data.byte;
 }
+EXPORT_SYMBOL(i2c_smbus_read_byte_data);
 
 s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
 {
@@ -974,6 +1275,7 @@ s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
                               I2C_SMBUS_WRITE,command,
                               I2C_SMBUS_BYTE_DATA,&data);
 }
+EXPORT_SYMBOL(i2c_smbus_write_byte_data);
 
 s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
 {
@@ -984,6 +1286,7 @@ s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
         else
                 return data.word;
 }
+EXPORT_SYMBOL(i2c_smbus_read_word_data);
 
 s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
 {
@@ -993,6 +1296,23 @@ s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
                               I2C_SMBUS_WRITE,command,
                               I2C_SMBUS_WORD_DATA,&data);
 }
+EXPORT_SYMBOL(i2c_smbus_write_word_data);
+
+/* Returns the number of read bytes */
+s32 i2c_smbus_read_block_data(struct i2c_client *client, u8 command,
+                              u8 *values)
+{
+        union i2c_smbus_data data;
+
+        if (i2c_smbus_xfer(client->adapter, client->addr, client->flags,
+                           I2C_SMBUS_READ, command,
+                           I2C_SMBUS_BLOCK_DATA, &data))
+                return -1;
+
+        memcpy(values, &data.block[1], data.block[0]);
+        return data.block[0];
+}
+EXPORT_SYMBOL(i2c_smbus_read_block_data);
 
 s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
                                u8 length, const u8 *values)
@@ -1007,6 +1327,7 @@ s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
                               I2C_SMBUS_WRITE,command,
                               I2C_SMBUS_BLOCK_DATA,&data);
 }
+EXPORT_SYMBOL(i2c_smbus_write_block_data);
 
 /* Returns the number of read bytes */
 s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
@@ -1021,6 +1342,7 @@ s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *val
         memcpy(values, &data.block[1], data.block[0]);
         return data.block[0];
 }
+EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
 
 s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command,
                                    u8 length, const u8 *values)
@@ -1035,6 +1357,7 @@ s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command,
                               I2C_SMBUS_WRITE, command,
                               I2C_SMBUS_I2C_BLOCK_DATA, &data);
 }
+EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
 
 /* Simulate a SMBus command using the i2c protocol
    No checking of parameters is done!  */
@@ -1098,9 +1421,9 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
                 break;
         case I2C_SMBUS_BLOCK_DATA:
                 if (read_write == I2C_SMBUS_READ) {
-                        dev_err(&adapter->dev, "Block read not supported "
-                               "under I2C emulation!\n");
-                        return -1;
+                        msg[1].flags |= I2C_M_RECV_LEN;
+                        msg[1].len = 1; /* block length will be added by
+                                           the underlying bus driver */
                 } else {
                         msg[0].len = data->block[0] + 2;
                         if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2) {
@@ -1114,9 +1437,21 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
                 }
                 break;
         case I2C_SMBUS_BLOCK_PROC_CALL:
-                dev_dbg(&adapter->dev, "Block process call not supported "
-                       "under I2C emulation!\n");
-                return -1;
+                num = 2; /* Another special case */
+                read_write = I2C_SMBUS_READ;
+                if (data->block[0] > I2C_SMBUS_BLOCK_MAX) {
+                        dev_err(&adapter->dev, "%s called with invalid "
+                                "block proc call size (%d)\n", __FUNCTION__,
+                                data->block[0]);
+                        return -1;
+                }
+                msg[0].len = data->block[0] + 2;
+                for (i = 1; i < msg[0].len; i++)
+                        msgbuf0[i] = data->block[i-1];
+                msg[1].flags |= I2C_M_RECV_LEN;
+                msg[1].len = 1; /* block length will be added by
+                                   the underlying bus driver */
+                break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (read_write == I2C_SMBUS_READ) {
                         msg[1].len = I2C_SMBUS_BLOCK_MAX;
@@ -1180,6 +1515,11 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
                                 for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)
                                         data->block[i+1] = msgbuf1[i];
                                 break;
+                        case I2C_SMBUS_BLOCK_DATA:
+                        case I2C_SMBUS_BLOCK_PROC_CALL:
+                                for (i = 0; i < msgbuf1[0] + 1; i++)
+                                        data->block[i] = msgbuf1[i];
+                                break;
                 }
         return 0;
 }
@@ -1204,43 +1544,7 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
 
         return res;
 }
-
-
-/* Next four are needed by i2c-isa */
-EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
-EXPORT_SYMBOL_GPL(i2c_adapter_driver);
-EXPORT_SYMBOL_GPL(i2c_adapter_class);
-EXPORT_SYMBOL_GPL(i2c_bus_type);
-
-EXPORT_SYMBOL(i2c_add_adapter);
-EXPORT_SYMBOL(i2c_del_adapter);
-EXPORT_SYMBOL(i2c_del_driver);
-EXPORT_SYMBOL(i2c_attach_client);
-EXPORT_SYMBOL(i2c_detach_client);
-EXPORT_SYMBOL(i2c_use_client);
-EXPORT_SYMBOL(i2c_release_client);
-EXPORT_SYMBOL(i2c_clients_command);
-EXPORT_SYMBOL(i2c_check_addr);
-
-EXPORT_SYMBOL(i2c_master_send);
-EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_control);
-EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_get_adapter);
-EXPORT_SYMBOL(i2c_put_adapter);
-EXPORT_SYMBOL(i2c_probe);
-
 EXPORT_SYMBOL(i2c_smbus_xfer);
-EXPORT_SYMBOL(i2c_smbus_write_quick);
-EXPORT_SYMBOL(i2c_smbus_read_byte);
-EXPORT_SYMBOL(i2c_smbus_write_byte);
-EXPORT_SYMBOL(i2c_smbus_read_byte_data);
-EXPORT_SYMBOL(i2c_smbus_write_byte_data);
-EXPORT_SYMBOL(i2c_smbus_read_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_word_data);
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
-EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
 
 MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
 MODULE_DESCRIPTION("I2C-Bus main module");
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
new file mode 100644
index 000000000000..cd5bff874855
--- /dev/null
+++ b/drivers/i2c/i2c-core.h
@@ -0,0 +1,31 @@
+/*
+ * i2c-core.h - interfaces internal to the I2C framework
+ *
+ * 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.
+ */
+
+struct i2c_devinfo {
+        struct list_head        list;
+        int                     busnum;
+        struct i2c_board_info   board_info;
+};
+
+/* board_lock protects board_list and first_dynamic_bus_num.
+ * only i2c core components are allowed to use these symbols.
+ */
+extern struct mutex     __i2c_board_lock;
+extern struct list_head __i2c_board_list;
+extern int              __i2c_first_dynamic_bus_num;
+
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 556455fbfa2b..5e8efc89255a 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -730,7 +730,7 @@ static int speed_cris_ide(ide_drive_t *drive, u8 speed)
 
         if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
                 tune_cris_ide(drive, speed - XFER_PIO_0);
-                return 0;
+                return ide_config_drive_speed(drive, speed);
         }
 
         switch(speed)
@@ -760,7 +760,8 @@ static int speed_cris_ide(ide_drive_t *drive, u8 speed)
                         hold = ATA_DMA2_HOLD;
                         break;
                 default:
-                        return 0;
+                        BUG();
+                        break;
         }
 
         if (speed >= XFER_UDMA_0)
@@ -768,7 +769,7 @@ static int speed_cris_ide(ide_drive_t *drive, u8 speed)
         else
                 cris_ide_set_speed(TYPE_DMA, 0, strobe, hold);
 
-        return 0;
+        return ide_config_drive_speed(drive, speed);
 }
 
 void __init
@@ -821,7 +822,6 @@ init_e100_ide (void)
                 hwif->udma_four = 0;
                 hwif->ultra_mask = cris_ultra_mask;
                 hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
-                hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */
                 hwif->autodma = 1;
                 hwif->drives[0].autodma = 1;
                 hwif->drives[1].autodma = 1;
@@ -1010,7 +1010,6 @@ static int cris_config_drive_for_dma (ide_drive_t *drive)
                 return 0;
 
         speed_cris_ide(drive, speed);
-        ide_config_drive_speed(drive, speed);
 
         return ide_dma_enable(drive);
 }
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index b08c37c9f956..c6522a64d7ec 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -401,6 +401,7 @@ static struct pcmcia_device_id ide_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
         PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
         PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
+        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
         PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
         PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
         PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 990eafe5ea11..73bdf64dbbfc 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -1,7 +1,8 @@
 /*
- * linux/drivers/ide/pci/aec62xx.c              Version 0.11    March 27, 2002
+ * linux/drivers/ide/pci/aec62xx.c              Version 0.21    Apr 21, 2007
  *
  * Copyright (C) 1999-2002      Andre Hedrick <andre@linux-ide.org>
+ * Copyright (C) 2007           MontaVista Software, Inc. <source@mvista.com>
  *
  */
 
@@ -193,18 +194,8 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        u8 speed = 0;
-        u8 new_pio = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL);
-
-        switch(pio) {
-                case 5:         speed = new_pio; break;
-                case 4:         speed = XFER_PIO_4; break;
-                case 3:         speed = XFER_PIO_3; break;
-                case 2:         speed = XFER_PIO_2; break;
-                case 1:         speed = XFER_PIO_1; break;
-                default:        speed = XFER_PIO_0; break;
-        }
-        (void) aec62xx_tune_chipset(drive, speed);
+        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        (void) aec62xx_tune_chipset(drive, pio + XFER_PIO_0);
 }
 
 static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
@@ -213,7 +204,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                aec62xx_tune_drive(drive, 5);
+                aec62xx_tune_drive(drive, 255);
 
         return -1;
 }
@@ -288,11 +279,10 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 
         hwif->ide_dma_check     = &aec62xx_config_drive_xfer_rate;
         hwif->ide_dma_lostirq   = &aec62xx_irq_timeout;
-        hwif->ide_dma_timeout   = &aec62xx_irq_timeout;
+
         if (!noautodma)
                 hwif->autodma = 1;
         hwif->drives[0].autodma = hwif->autodma;
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 83e0aa65a431..946a12746cb5 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -534,7 +534,7 @@ static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
         struct hd_driveid *id   = drive->id;
 
         if ((m5229_revision<=0x20) && (drive->media!=ide_disk))
-                goto no_dma_set;
+                goto ata_pio;
 
         drive->init_speed = 0;
 
@@ -555,20 +555,19 @@ try_dma_modes:
                             (id->dma_1word & hwif->swdma_mask)) {
                                 /* Force if Capable regular DMA modes */
                                 if (!config_chipset_for_dma(drive))
-                                        goto no_dma_set;
+                                        goto ata_pio;
                         }
                 } else if (__ide_dma_good_drive(drive) &&
                            (id->eide_dma_time < 150)) {
                         /* Consult the list of known "good" drives */
                         if (!config_chipset_for_dma(drive))
-                                goto no_dma_set;
+                                goto ata_pio;
                 } else {
                         goto ata_pio;
                 }
         } else {
 ata_pio:
                 hwif->tuneproc(drive, 255);
-no_dma_set:
                 return -1;
         }
 
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 561197f7b5bb..77f51ab6d439 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -1,10 +1,7 @@
-/* $Id: cmd64x.c,v 1.21 2000/01/30 23:23:16
- *
- * linux/drivers/ide/pci/cmd64x.c               Version 1.42    Feb 8, 2007
+/*
+ * linux/drivers/ide/pci/cmd64x.c               Version 1.47    Mar 19, 2007
  *
  * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.
- *           Note, this driver is not used at all on other systems because
- *           there the "BIOS" has done all of the following already.
  *           Due to massive hardware bugs, UltraDMA is only supported
  *           on the 646U2 and not on the 646U.
  *
@@ -39,11 +36,12 @@
  * CMD64x specific registers definition.
  */
 #define CFR             0x50
-#define   CFR_INTR_CH0          0x02
+#define   CFR_INTR_CH0          0x04
 #define CNTRL           0x51
-#define   CNTRL_DIS_RA0         0x40
-#define   CNTRL_DIS_RA1         0x80
-#define   CNTRL_ENA_2ND         0x08
+#define   CNTRL_ENA_1ST         0x04
+#define   CNTRL_ENA_2ND         0x08
+#define   CNTRL_DIS_RA0         0x40
+#define   CNTRL_DIS_RA1         0x80
 
 #define CMDTIM          0x52
 #define ARTTIM0         0x53
@@ -90,86 +88,67 @@ static int n_cmd_devs;
 static char * print_cmd64x_get_info (char *buf, struct pci_dev *dev, int index)
 {
         char *p = buf;
-
-        u8 reg53 = 0, reg54 = 0, reg55 = 0, reg56 = 0;  /* primary */
-        u8 reg57 = 0, reg58 = 0, reg5b;                 /* secondary */
         u8 reg72 = 0, reg73 = 0;                        /* primary */
         u8 reg7a = 0, reg7b = 0;                        /* secondary */
-        u8 reg50 = 0, reg71 = 0;                        /* extra */
+        u8 reg50 = 1, reg51 = 1, reg57 = 0, reg71 = 0;  /* extra */
+        u8 rev = 0;
 
         p += sprintf(p, "\nController: %d\n", index);
-        p += sprintf(p, "CMD%x Chipset.\n", dev->device);
+        p += sprintf(p, "PCI-%x Chipset.\n", dev->device);
+
         (void) pci_read_config_byte(dev, CFR,       &reg50);
-        (void) pci_read_config_byte(dev, ARTTIM0,   &reg53);
-        (void) pci_read_config_byte(dev, DRWTIM0,   &reg54);
-        (void) pci_read_config_byte(dev, ARTTIM1,   &reg55);
-        (void) pci_read_config_byte(dev, DRWTIM1,   &reg56);
-        (void) pci_read_config_byte(dev, ARTTIM2,   &reg57);
-        (void) pci_read_config_byte(dev, DRWTIM2,   &reg58);
-        (void) pci_read_config_byte(dev, DRWTIM3,   &reg5b);
+        (void) pci_read_config_byte(dev, CNTRL,     &reg51);
+        (void) pci_read_config_byte(dev, ARTTIM23,  &reg57);
         (void) pci_read_config_byte(dev, MRDMODE,   &reg71);
         (void) pci_read_config_byte(dev, BMIDESR0,  &reg72);
         (void) pci_read_config_byte(dev, UDIDETCR0, &reg73);
         (void) pci_read_config_byte(dev, BMIDESR1,  &reg7a);
         (void) pci_read_config_byte(dev, UDIDETCR1, &reg7b);
 
-        p += sprintf(p, "--------------- Primary Channel "
-                        "---------------- Secondary Channel "
-                        "-------------\n");
-        p += sprintf(p, "                %sabled           "
-                        "              %sabled\n",
-                (reg72&0x80)?"dis":" en",
-                (reg7a&0x80)?"dis":" en");
-        p += sprintf(p, "--------------- drive0 "
-                "--------- drive1 -------- drive0 "
-                "---------- drive1 ------\n");
-        p += sprintf(p, "DMA enabled:    %s              %s"
-                        "             %s               %s\n",
-                (reg72&0x20)?"yes":"no ", (reg72&0x40)?"yes":"no ",
-                (reg7a&0x20)?"yes":"no ", (reg7a&0x40)?"yes":"no ");
-
-        p += sprintf(p, "DMA Mode:       %s(%s)          %s(%s)",
-                (reg72&0x20)?((reg73&0x01)?"UDMA":" DMA"):" PIO",
-                (reg72&0x20)?(
-                        ((reg73&0x30)==0x30)?(((reg73&0x35)==0x35)?"3":"0"):
-                        ((reg73&0x20)==0x20)?(((reg73&0x25)==0x25)?"3":"1"):
-                        ((reg73&0x10)==0x10)?(((reg73&0x15)==0x15)?"4":"2"):
-                        ((reg73&0x00)==0x00)?(((reg73&0x05)==0x05)?"5":"2"):
-                        "X"):"?",
-                (reg72&0x40)?((reg73&0x02)?"UDMA":" DMA"):" PIO",
-                (reg72&0x40)?(
-                        ((reg73&0xC0)==0xC0)?(((reg73&0xC5)==0xC5)?"3":"0"):
-                        ((reg73&0x80)==0x80)?(((reg73&0x85)==0x85)?"3":"1"):
-                        ((reg73&0x40)==0x40)?(((reg73&0x4A)==0x4A)?"4":"2"):
-                        ((reg73&0x00)==0x00)?(((reg73&0x0A)==0x0A)?"5":"2"):
-                        "X"):"?");
-        p += sprintf(p, "         %s(%s)           %s(%s)\n",
-                (reg7a&0x20)?((reg7b&0x01)?"UDMA":" DMA"):" PIO",
-                (reg7a&0x20)?(
-                        ((reg7b&0x30)==0x30)?(((reg7b&0x35)==0x35)?"3":"0"):
-                        ((reg7b&0x20)==0x20)?(((reg7b&0x25)==0x25)?"3":"1"):
-                        ((reg7b&0x10)==0x10)?(((reg7b&0x15)==0x15)?"4":"2"):
-                        ((reg7b&0x00)==0x00)?(((reg7b&0x05)==0x05)?"5":"2"):
-                        "X"):"?",
-                (reg7a&0x40)?((reg7b&0x02)?"UDMA":" DMA"):" PIO",
-                (reg7a&0x40)?(
-                        ((reg7b&0xC0)==0xC0)?(((reg7b&0xC5)==0xC5)?"3":"0"):
-                        ((reg7b&0x80)==0x80)?(((reg7b&0x85)==0x85)?"3":"1"):
-                        ((reg7b&0x40)==0x40)?(((reg7b&0x4A)==0x4A)?"4":"2"):
-                        ((reg7b&0x00)==0x00)?(((reg7b&0x0A)==0x0A)?"5":"2"):
-                        "X"):"?" );
-        p += sprintf(p, "PIO Mode:       %s                %s"
-                        "               %s                 %s\n",
-                        "?", "?", "?", "?");
-        p += sprintf(p, "                %s                     %s\n",
-                (reg50 & CFR_INTR_CH0) ? "interrupting" : "polling     ",
-                (reg57 & ARTTIM23_INTR_CH1) ? "interrupting" : "polling");
-        p += sprintf(p, "                %s                          %s\n",
-                (reg71 & MRDMODE_INTR_CH0) ? "pending" : "clear  ",
-                (reg71 & MRDMODE_INTR_CH1) ? "pending" : "clear");
-        p += sprintf(p, "                %s                          %s\n",
-                (reg71 & MRDMODE_BLK_CH0) ? "blocked" : "enabled",
-                (reg71 & MRDMODE_BLK_CH1) ? "blocked" : "enabled");
+        /* PCI0643/6 originally didn't have the primary channel enable bit */
+        (void) pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
+        if ((dev->device == PCI_DEVICE_ID_CMD_643) ||
+            (dev->device == PCI_DEVICE_ID_CMD_646 && rev < 3))
+                reg51 |= CNTRL_ENA_1ST;
+
+        p += sprintf(p, "---------------- Primary Channel "
+                        "---------------- Secondary Channel ------------\n");
+        p += sprintf(p, "                 %s                         %s\n",
+                 (reg51 & CNTRL_ENA_1ST) ? "enabled " : "disabled",
+                 (reg51 & CNTRL_ENA_2ND) ? "enabled " : "disabled");
+        p += sprintf(p, "---------------- drive0 --------- drive1 "
+                        "-------- drive0 --------- drive1 ------\n");
+        p += sprintf(p, "DMA enabled:     %s              %s"
+                        "             %s              %s\n",
+                (reg72 & 0x20) ? "yes" : "no ", (reg72 & 0x40) ? "yes" : "no ",
+                (reg7a & 0x20) ? "yes" : "no ", (reg7a & 0x40) ? "yes" : "no ");
+        p += sprintf(p, "UltraDMA mode:   %s (%c)          %s (%c)",
+                ( reg73 & 0x01) ? " on" : "off",
+                ((reg73 & 0x30) == 0x30) ? ((reg73 & 0x04) ? '3' : '0') :
+                ((reg73 & 0x30) == 0x20) ? ((reg73 & 0x04) ? '3' : '1') :
+                ((reg73 & 0x30) == 0x10) ? ((reg73 & 0x04) ? '4' : '2') :
+                ((reg73 & 0x30) == 0x00) ? ((reg73 & 0x04) ? '5' : '2') : '?',
+                ( reg73 & 0x02) ? " on" : "off",
+                ((reg73 & 0xC0) == 0xC0) ? ((reg73 & 0x08) ? '3' : '0') :
+                ((reg73 & 0xC0) == 0x80) ? ((reg73 & 0x08) ? '3' : '1') :
+                ((reg73 & 0xC0) == 0x40) ? ((reg73 & 0x08) ? '4' : '2') :
+                ((reg73 & 0xC0) == 0x00) ? ((reg73 & 0x08) ? '5' : '2') : '?');
+        p += sprintf(p, "         %s (%c)          %s (%c)\n",
+                ( reg7b & 0x01) ? " on" : "off",
+                ((reg7b & 0x30) == 0x30) ? ((reg7b & 0x04) ? '3' : '0') :
+                ((reg7b & 0x30) == 0x20) ? ((reg7b & 0x04) ? '3' : '1') :
+                ((reg7b & 0x30) == 0x10) ? ((reg7b & 0x04) ? '4' : '2') :
+                ((reg7b & 0x30) == 0x00) ? ((reg7b & 0x04) ? '5' : '2') : '?',
+                ( reg7b & 0x02) ? " on" : "off",
+                ((reg7b & 0xC0) == 0xC0) ? ((reg7b & 0x08) ? '3' : '0') :
+                ((reg7b & 0xC0) == 0x80) ? ((reg7b & 0x08) ? '3' : '1') :
+                ((reg7b & 0xC0) == 0x40) ? ((reg7b & 0x08) ? '4' : '2') :
+                ((reg7b & 0xC0) == 0x00) ? ((reg7b & 0x08) ? '5' : '2') : '?');
+        p += sprintf(p, "Interrupt:       %s, %s                 %s, %s\n",
+                (reg71 & MRDMODE_BLK_CH0  ) ? "blocked" : "enabled",
+                (reg50 & CFR_INTR_CH0     ) ? "pending" : "clear  ",
+                (reg71 & MRDMODE_BLK_CH1  ) ? "blocked" : "enabled",
+                (reg57 & ARTTIM23_INTR_CH1) ? "pending" : "clear  ");
 
         return (char *)p;
 }
@@ -179,7 +158,6 @@ static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)
         char *p = buffer;
         int i;
 
-        p += sprintf(p, "\n");
         for (i = 0; i < n_cmd_devs; i++) {
                 struct pci_dev *dev     = cmd_devs[i];
                 p = print_cmd64x_get_info(p, dev, i);
@@ -195,116 +173,103 @@ static u8 quantize_timing(int timing, int quant)
 }
 
 /*
- * This routine writes the prepared setup/active/recovery counts
- * for a drive into the cmd646 chipset registers to active them.
+ * This routine calculates active/recovery counts and then writes them into
+ * the chipset registers.
  */
-static void program_drive_counts (ide_drive_t *drive, int setup_count, int active_count, int recovery_count)
+static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_time)
 {
-        unsigned long flags;
-        struct pci_dev *dev = HWIF(drive)->pci_dev;
-        ide_drive_t *drives = HWIF(drive)->drives;
-        u8 temp_b;
-        static const u8 setup_counts[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0};
-        static const u8 recovery_counts[] =
+        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        int clock_time          = 1000 / system_bus_clock();
+        u8  cycle_count, active_count, recovery_count, drwtim;
+        static const u8 recovery_values[] =
                 {15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};
-        static const u8 arttim_regs[2][2] = {
-                        { ARTTIM0, ARTTIM1 },
-                        { ARTTIM23, ARTTIM23 }
-                };
-        static const u8 drwtim_regs[2][2] = {
-                        { DRWTIM0, DRWTIM1 },
-                        { DRWTIM2, DRWTIM3 }
-                };
-        int channel = (int) HWIF(drive)->channel;
-        int slave = (drives != drive);  /* Is this really the best way to determine this?? */
-
-        cmdprintk("program_drive_count parameters = s(%d),a(%d),r(%d),p(%d)\n",
-                setup_count, active_count, recovery_count, drive->present);
+        static const u8 drwtim_regs[4] = {DRWTIM0, DRWTIM1, DRWTIM2, DRWTIM3};
+
+        cmdprintk("program_cycle_times parameters: total=%d, active=%d\n",
+                  cycle_time, active_time);
+
+        cycle_count     = quantize_timing( cycle_time, clock_time);
+        active_count    = quantize_timing(active_time, clock_time);
+        recovery_count  = cycle_count - active_count;
+
         /*
-         * Set up address setup count registers.
-         * Primary interface has individual count/timing registers for
-         * each drive.  Secondary interface has one common set of registers,
-         * for address setup so we merge these timings, using the slowest
-         * value.
+         * In case we've got too long recovery phase, try to lengthen
+         * the active phase
          */
-        if (channel) {
-                drive->drive_data = setup_count;
-                setup_count = max(drives[0].drive_data,
-                                        drives[1].drive_data);
-                cmdprintk("Secondary interface, setup_count = %d\n",
-                                        setup_count);
+        if (recovery_count > 16) {
+                active_count += recovery_count - 16;
+                recovery_count = 16;
         }
+        if (active_count > 16)          /* shouldn't actually happen... */
+                active_count = 16;
+
+        cmdprintk("Final counts: total=%d, active=%d, recovery=%d\n",
+                  cycle_count, active_count, recovery_count);
 
         /*
          * Convert values to internal chipset representation
          */
-        setup_count = (setup_count > 5) ? 0xc0 : (int) setup_counts[setup_count];
-        active_count &= 0xf; /* Remember, max value is 16 */
-        recovery_count = (int) recovery_counts[recovery_count];
+        recovery_count = recovery_values[recovery_count];
+        active_count  &= 0x0f;
 
-        cmdprintk("Final values = %d,%d,%d\n",
-                setup_count, active_count, recovery_count);
-
-        /*
-         * Now that everything is ready, program the new timings
-         */
-        local_irq_save(flags);
-        /*
-         * Program the address_setup clocks into ARTTIM reg,
-         * and then the active/recovery counts into the DRWTIM reg
-         */
-        (void) pci_read_config_byte(dev, arttim_regs[channel][slave], &temp_b);
-        (void) pci_write_config_byte(dev, arttim_regs[channel][slave],
-                ((u8) setup_count) | (temp_b & 0x3f));
-        (void) pci_write_config_byte(dev, drwtim_regs[channel][slave],
-                (u8) ((active_count << 4) | recovery_count));
-        cmdprintk ("Write %x to %x\n",
-                ((u8) setup_count) | (temp_b & 0x3f),
-                arttim_regs[channel][slave]);
-        cmdprintk ("Write %x to %x\n",
-                (u8) ((active_count << 4) | recovery_count),
-                drwtim_regs[channel][slave]);
-        local_irq_restore(flags);
+        /* Program the active/recovery counts into the DRWTIM register */
+        drwtim = (active_count << 4) | recovery_count;
+        (void) pci_write_config_byte(dev, drwtim_regs[drive->dn], drwtim);
+        cmdprintk("Write 0x%02x to reg 0x%x\n", drwtim, drwtim_regs[drive->dn]);
 }
 
 /*
- * This routine selects drive's best PIO mode, calculates setup/active/recovery
- * counts, and then writes them into the chipset registers.
+ * This routine selects drive's best PIO mode and writes into the chipset
+ * registers setup/active/recovery timings.
  */
 static u8 cmd64x_tune_pio (ide_drive_t *drive, u8 mode_wanted)
 {
-        int setup_time, active_time, cycle_time;
-        u8  cycle_count, setup_count, active_count, recovery_count;
-        u8  pio_mode;
-        int clock_time = 1000 / system_bus_clock();
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
         ide_pio_data_t pio;
-
+        u8 pio_mode, setup_count, arttim = 0;
+        static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0};
+        static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23};
         pio_mode = ide_get_best_pio_mode(drive, mode_wanted, 5, &pio);
-        cycle_time = pio.cycle_time;
 
-        setup_time  = ide_pio_timings[pio_mode].setup_time;
-        active_time = ide_pio_timings[pio_mode].active_time;
+        cmdprintk("%s: PIO mode wanted %d, selected %d (%d ns)%s\n",
+                  drive->name, mode_wanted, pio_mode, pio.cycle_time,
+                  pio.overridden ? " (overriding vendor mode)" : "");
 
-        setup_count  = quantize_timing( setup_time, clock_time);
-        cycle_count  = quantize_timing( cycle_time, clock_time);
-        active_count = quantize_timing(active_time, clock_time);
+        program_cycle_times(drive, pio.cycle_time,
+                            ide_pio_timings[pio_mode].active_time);
 
-        recovery_count = cycle_count - active_count;
-        /* program_drive_counts() takes care of zero recovery cycles */
-        if (recovery_count > 16) {
-                active_count += recovery_count - 16;
-                recovery_count = 16;
+        setup_count = quantize_timing(ide_pio_timings[pio_mode].setup_time,
+                                      1000 / system_bus_clock());
+
+        /*
+         * The primary channel has individual address setup timing registers
+         * for each drive and the hardware selects the slowest timing itself.
+         * The secondary channel has one common register and we have to select
+         * the slowest address setup timing ourselves.
+         */
+        if (hwif->channel) {
+                ide_drive_t *drives = hwif->drives;
+
+                drive->drive_data = setup_count;
+                setup_count = max(drives[0].drive_data, drives[1].drive_data);
         }
-        if (active_count > 16)
-                active_count = 16; /* maximum allowed by cmd64x */
 
-        program_drive_counts (drive, setup_count, active_count, recovery_count);
+        if (setup_count > 5)            /* shouldn't actually happen... */
+                setup_count = 5;
+        cmdprintk("Final address setup count: %d\n", setup_count);
 
-        cmdprintk("%s: PIO mode wanted %d, selected %d (%dns)%s, "
-                "clocks=%d/%d/%d\n",
-                drive->name, mode_wanted, pio_mode, cycle_time,
-                pio.overridden ? " (overriding vendor mode)" : "",
-                setup_count, active_count, recovery_count);
+        /*
+         * Program the address setup clocks into the ARTTIM registers.
+         * Avoid clearing the secondary channel's interrupt bit.
+         */
+        (void) pci_read_config_byte (dev, arttim_regs[drive->dn], &arttim);
+        if (hwif->channel)
+                arttim &= ~ARTTIM23_INTR_CH1;
+        arttim &= ~0xc0;
+        arttim |= setup_values[setup_count];
+        (void) pci_write_config_byte(dev, arttim_regs[drive->dn], arttim);
+        cmdprintk("Write 0x%02x to reg 0x%x\n", arttim, arttim_regs[drive->dn]);
 
         return pio_mode;
 }
@@ -376,61 +341,64 @@ static u8 cmd64x_ratemask (ide_drive_t *drive)
         return mode;
 }
 
-static int cmd64x_tune_chipset (ide_drive_t *drive, u8 xferspeed)
+static int cmd64x_tune_chipset (ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
+        u8 unit                 = drive->dn & 0x01;
+        u8 regU = 0, pciU       = hwif->channel ? UDIDETCR1 : UDIDETCR0;
 
-        u8 unit                 = (drive->select.b.unit & 0x01);
-        u8 regU = 0, pciU       = (hwif->channel) ? UDIDETCR1 : UDIDETCR0;
-        u8 regD = 0, pciD       = (hwif->channel) ? BMIDESR1 : BMIDESR0;
-
-        u8 speed        = ide_rate_filter(cmd64x_ratemask(drive), xferspeed);
+        speed = ide_rate_filter(cmd64x_ratemask(drive), speed);
 
         if (speed >= XFER_SW_DMA_0) {
-                (void) pci_read_config_byte(dev, pciD, &regD);
                 (void) pci_read_config_byte(dev, pciU, &regU);
-                regD &= ~(unit ? 0x40 : 0x20);
                 regU &= ~(unit ? 0xCA : 0x35);
-                (void) pci_write_config_byte(dev, pciD, regD);
-                (void) pci_write_config_byte(dev, pciU, regU);
-                (void) pci_read_config_byte(dev, pciD, &regD);
-                (void) pci_read_config_byte(dev, pciU, &regU);
         }
 
         switch(speed) {
-                case XFER_UDMA_5:       regU |= (unit ? 0x0A : 0x05); break;
-                case XFER_UDMA_4:       regU |= (unit ? 0x4A : 0x15); break;
-                case XFER_UDMA_3:       regU |= (unit ? 0x8A : 0x25); break;
-                case XFER_UDMA_2:       regU |= (unit ? 0x42 : 0x11); break;
-                case XFER_UDMA_1:       regU |= (unit ? 0x82 : 0x21); break;
-                case XFER_UDMA_0:       regU |= (unit ? 0xC2 : 0x31); break;
-                case XFER_MW_DMA_2:     regD |= (unit ? 0x40 : 0x10); break;
-                case XFER_MW_DMA_1:     regD |= (unit ? 0x80 : 0x20); break;
-                case XFER_MW_DMA_0:     regD |= (unit ? 0xC0 : 0x30); break;
-                case XFER_SW_DMA_2:     regD |= (unit ? 0x40 : 0x10); break;
-                case XFER_SW_DMA_1:     regD |= (unit ? 0x80 : 0x20); break;
-                case XFER_SW_DMA_0:     regD |= (unit ? 0xC0 : 0x30); break;
-                case XFER_PIO_5:
-                case XFER_PIO_4:
-                case XFER_PIO_3:
-                case XFER_PIO_2:
-                case XFER_PIO_1:
-                case XFER_PIO_0:
-                        (void) cmd64x_tune_pio(drive, speed - XFER_PIO_0);
-                        break;
-
-                default:
-                        return 1;
+        case XFER_UDMA_5:
+                regU |= unit ? 0x0A : 0x05;
+                break;
+        case XFER_UDMA_4:
+                regU |= unit ? 0x4A : 0x15;
+                break;
+        case XFER_UDMA_3:
+                regU |= unit ? 0x8A : 0x25;
+                break;
+        case XFER_UDMA_2:
+                regU |= unit ? 0x42 : 0x11;
+                break;
+        case XFER_UDMA_1:
+                regU |= unit ? 0x82 : 0x21;
+                break;
+        case XFER_UDMA_0:
+                regU |= unit ? 0xC2 : 0x31;
+                break;
+        case XFER_MW_DMA_2:
+                program_cycle_times(drive, 120, 70);
+                break;
+        case XFER_MW_DMA_1:
+                program_cycle_times(drive, 150, 80);
+                break;
+        case XFER_MW_DMA_0:
+                program_cycle_times(drive, 480, 215);
+                break;
+        case XFER_PIO_5:
+        case XFER_PIO_4:
+        case XFER_PIO_3:
+        case XFER_PIO_2:
+        case XFER_PIO_1:
+        case XFER_PIO_0:
+                (void) cmd64x_tune_pio(drive, speed - XFER_PIO_0);
+                break;
+        default:
+                return 1;
         }
 
-        if (speed >= XFER_SW_DMA_0) {
+        if (speed >= XFER_SW_DMA_0)
                 (void) pci_write_config_byte(dev, pciU, regU);
-                regD |= (unit ? 0x40 : 0x20);
-                (void) pci_write_config_byte(dev, pciD, regD);
-        }
 
-        return (ide_config_drive_speed(drive, speed));
+        return ide_config_drive_speed(drive, speed);
 }
 
 static int config_chipset_for_dma (ide_drive_t *drive)
@@ -457,67 +425,80 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
         return -1;
 }
 
-static int cmd64x_alt_dma_status (struct pci_dev *dev)
+static int cmd648_ide_dma_end (ide_drive_t *drive)
 {
-        switch(dev->device) {
-                case PCI_DEVICE_ID_CMD_648:
-                case PCI_DEVICE_ID_CMD_649:
-                        return 1;
-                default:
-                        break;
-        }
-        return 0;
+        ide_hwif_t *hwif        = HWIF(drive);
+        int err                 = __ide_dma_end(drive);
+        u8  irq_mask            = hwif->channel ? MRDMODE_INTR_CH1 :
+                                                  MRDMODE_INTR_CH0;
+        u8  mrdmode             = inb(hwif->dma_master + 0x01);
+
+        /* clear the interrupt bit */
+        outb(mrdmode | irq_mask, hwif->dma_master + 0x01);
+
+        return err;
 }
 
 static int cmd64x_ide_dma_end (ide_drive_t *drive)
 {
-        u8 dma_stat = 0, dma_cmd = 0;
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
+        int irq_reg             = hwif->channel ? ARTTIM23 : CFR;
+        u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
+                                                  CFR_INTR_CH0;
+        u8  irq_stat            = 0;
+        int err                 = __ide_dma_end(drive);
 
-        drive->waiting_for_dma = 0;
-        /* read DMA command state */
-        dma_cmd = inb(hwif->dma_command);
-        /* stop DMA */
-        outb(dma_cmd & ~1, hwif->dma_command);
-        /* get DMA status */
-        dma_stat = inb(hwif->dma_status);
-        /* clear the INTR & ERROR bits */
-        outb(dma_stat | 6, hwif->dma_status);
-        if (cmd64x_alt_dma_status(dev)) {
-                u8 dma_intr     = 0;
-                u8 dma_mask     = (hwif->channel) ? ARTTIM23_INTR_CH1 :
-                                                    CFR_INTR_CH0;
-                u8 dma_reg      = (hwif->channel) ? ARTTIM2 : CFR;
-                (void) pci_read_config_byte(dev, dma_reg, &dma_intr);
-                /* clear the INTR bit */
-                (void) pci_write_config_byte(dev, dma_reg, dma_intr|dma_mask);
-        }
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
-        /* verify good DMA status */
-        return (dma_stat & 7) != 4;
+        (void) pci_read_config_byte(dev, irq_reg, &irq_stat);
+        /* clear the interrupt bit */
+        (void) pci_write_config_byte(dev, irq_reg, irq_stat | irq_mask);
+
+        return err;
+}
+
+static int cmd648_ide_dma_test_irq (ide_drive_t *drive)
+{
+        ide_hwif_t *hwif        = HWIF(drive);
+        u8 irq_mask             = hwif->channel ? MRDMODE_INTR_CH1 :
+                                                  MRDMODE_INTR_CH0;
+        u8 dma_stat             = inb(hwif->dma_status);
+        u8 mrdmode              = inb(hwif->dma_master + 0x01);
+
+#ifdef DEBUG
+        printk("%s: dma_stat: 0x%02x mrdmode: 0x%02x irq_mask: 0x%02x\n",
+               drive->name, dma_stat, mrdmode, irq_mask);
+#endif
+        if (!(mrdmode & irq_mask))
+                return 0;
+
+        /* return 1 if INTR asserted */
+        if (dma_stat & 4)
+                return 1;
+
+        return 0;
 }
 
 static int cmd64x_ide_dma_test_irq (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif                = HWIF(drive);
-        struct pci_dev *dev             = hwif->pci_dev;
-        u8 dma_alt_stat = 0, mask       = (hwif->channel) ? MRDMODE_INTR_CH1 :
-                                                            MRDMODE_INTR_CH0;
-        u8 dma_stat = inb(hwif->dma_status);
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
+        int irq_reg             = hwif->channel ? ARTTIM23 : CFR;
+        u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
+                                                  CFR_INTR_CH0;
+        u8  dma_stat            = inb(hwif->dma_status);
+        u8  irq_stat            = 0;
+
+        (void) pci_read_config_byte(dev, irq_reg, &irq_stat);
 
-        (void) pci_read_config_byte(dev, MRDMODE, &dma_alt_stat);
 #ifdef DEBUG
-        printk("%s: dma_stat: 0x%02x dma_alt_stat: "
-                "0x%02x mask: 0x%02x\n", drive->name,
-                dma_stat, dma_alt_stat, mask);
+        printk("%s: dma_stat: 0x%02x irq_stat: 0x%02x irq_mask: 0x%02x\n",
+               drive->name, dma_stat, irq_stat, irq_mask);
 #endif
-        if (!(dma_alt_stat & mask))
+        if (!(irq_stat & irq_mask))
                 return 0;
 
         /* return 1 if INTR asserted */
-        if ((dma_stat & 4) == 4)
+        if (dma_stat & 4)
                 return 1;
 
         return 0;
@@ -665,7 +646,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
 
         hwif->ultra_mask = 0x3f;
         hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 
         if (dev->device == PCI_DEVICE_ID_CMD_643)
                 hwif->ultra_mask = 0x80;
@@ -678,17 +658,25 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         if (!(hwif->udma_four))
                 hwif->udma_four = ata66_cmd64x(hwif);
 
-        if (dev->device == PCI_DEVICE_ID_CMD_646) {
+        switch(dev->device) {
+        case PCI_DEVICE_ID_CMD_648:
+        case PCI_DEVICE_ID_CMD_649:
+        alt_irq_bits:
+                hwif->ide_dma_end       = &cmd648_ide_dma_end;
+                hwif->ide_dma_test_irq  = &cmd648_ide_dma_test_irq;
+                break;
+        case PCI_DEVICE_ID_CMD_646:
                 hwif->chipset = ide_cmd646;
                 if (class_rev == 0x01) {
                         hwif->ide_dma_end = &cmd646_1_ide_dma_end;
-                } else {
-                        hwif->ide_dma_end = &cmd64x_ide_dma_end;
-                        hwif->ide_dma_test_irq = &cmd64x_ide_dma_test_irq;
-                }
-        } else {
-                hwif->ide_dma_end = &cmd64x_ide_dma_end;
-                hwif->ide_dma_test_irq = &cmd64x_ide_dma_test_irq;
+                        break;
+                } else if (class_rev >= 0x03)
+                        goto alt_irq_bits;
+                /* fall thru */
+        default:
+                hwif->ide_dma_end       = &cmd64x_ide_dma_end;
+                hwif->ide_dma_test_irq  = &cmd64x_ide_dma_test_irq;
+                break;
         }
 
 
@@ -698,42 +686,75 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         hwif->drives[1].autodma = hwif->autodma;
 }
 
+static int __devinit init_setup_cmd64x(struct pci_dev *dev, ide_pci_device_t *d)
+{
+        return ide_setup_pci_device(dev, d);
+}
+
+static int __devinit init_setup_cmd646(struct pci_dev *dev, ide_pci_device_t *d)
+{
+        u8 rev = 0;
+
+        /*
+         * The original PCI0646 didn't have the primary channel enable bit,
+         * it appeared starting with PCI0646U (i.e. revision ID 3).
+         */
+        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
+        if (rev < 3)
+                d->enablebits[0].reg = 0;
+
+        return ide_setup_pci_device(dev, d);
+}
+
 static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "CMD643",
+                .init_setup     = init_setup_cmd64x,
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .channels       = 2,
                 .autodma        = AUTODMA,
+                .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
         },{     /* 1 */
                 .name           = "CMD646",
+                .init_setup     = init_setup_cmd646,
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-                .enablebits     = {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
+                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
         },{     /* 2 */
                 .name           = "CMD648",
+                .init_setup     = init_setup_cmd64x,
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .channels       = 2,
                 .autodma        = AUTODMA,
+                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
         },{     /* 3 */
                 .name           = "CMD649",
+                .init_setup     = init_setup_cmd64x,
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .channels       = 2,
                 .autodma        = AUTODMA,
+                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
         }
 };
 
+/*
+ * We may have to modify enablebits for PCI0646, so we'd better pass
+ * a local copy of the ide_pci_device_t structure down the call chain...
+ */
 static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        return ide_setup_pci_device(dev, &cmd64x_chipsets[id->driver_data]);
+        ide_pci_device_t d = cmd64x_chipsets[id->driver_data];
+
+        return d.init_setup(dev, &d);
 }
 
 static struct pci_device_id cmd64x_pci_tbl[] = {
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index ab6fa271aeb3..cf9d344d19f8 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/hpt366.c               Version 1.02    Apr 18, 2007
+ * linux/drivers/ide/pci/hpt366.c               Version 1.03    May 4, 2007
  *
  * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
@@ -1527,7 +1527,12 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
         if (rev > 2)
                 goto init_single;
 
+        /*
+         * HPT36x chips are single channel and
+         * do not seem to have the channel enable bit...
+         */
         d->channels = 1;
+        d->enablebits[0].reg = 0;
 
         if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {
                 u8  pin1 = 0, pin2 = 0;
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index a132767f7d90..4e1254813ee0 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -1,8 +1,9 @@
 
 /*
- * linux/drivers/ide/pci/it821x.c               Version 0.09    December 2004
+ * linux/drivers/ide/pci/it821x.c               Version 0.10    Mar 10 2007
  *
  * Copyright (C) 2004           Red Hat <alan@redhat.com>
+ * Copyright (C) 2007           Bartlomiej Zolnierkiewicz
  *
  *  May be copied or modified under the terms of the GNU General Public License
  *  Based in part on the ITE vendor provided SCSI driver.
@@ -104,6 +105,7 @@ static int it8212_noraid;
 /**
  *      it821x_program  -       program the PIO/MWDMA registers
  *      @drive: drive to tune
+ *      @timing: timing info
  *
  *      Program the PIO/MWDMA timing for this channel according to the
  *      current clock.
@@ -127,6 +129,7 @@ static void it821x_program(ide_drive_t *drive, u16 timing)
 /**
  *      it821x_program_udma     -       program the UDMA registers
  *      @drive: drive to tune
+ *      @timing: timing info
  *
  *      Program the UDMA timing for this drive according to the
  *      current clock.
@@ -153,10 +156,9 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)
         }
 }
 
-
 /**
  *      it821x_clock_strategy
- *      @hwif: hardware interface
+ *      @drive: drive to set up
  *
  *      Select between the 50 and 66Mhz base clocks to get the best
  *      results for this interface.
@@ -182,8 +184,11 @@ static void it821x_clock_strategy(ide_drive_t *drive)
                 altclock = itdev->want[0][1];
         }
 
-        /* Master doesn't care does the slave ? */
-        if(clock == ATA_ANY)
+        /*
+         * if both clocks can be used for the mode with the higher priority
+         * use the clock needed by the mode with the lower priority
+         */
+        if (clock == ATA_ANY)
                 clock = altclock;
 
         /* Nobody cares - keep the same clock */
@@ -240,37 +245,56 @@ static u8 it821x_ratemask (ide_drive_t *drive)
 }
 
 /**
- *      it821x_tuneproc -       tune a drive
+ *      it821x_tunepio  -       tune a drive
  *      @drive: drive to tune
- *      @mode_wanted: the target operating mode
- *
- *      Load the timing settings for this device mode into the
- *      controller. By the time we are called the mode has been
- *      modified as neccessary to handle the absence of seperate
- *      master/slave timers for MWDMA/PIO.
+ *      @pio: the desired PIO mode
  *
- *      This code is only used in pass through mode.
+ *      Try to tune the drive/host to the desired PIO mode taking into
+ *      the consideration the maximum PIO mode supported by the other
+ *      device on the cable.
  */
 
-static void it821x_tuneproc (ide_drive_t *drive, byte mode_wanted)
+static int it821x_tunepio(ide_drive_t *drive, u8 set_pio)
 {
         ide_hwif_t *hwif        = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int unit = drive->select.b.unit;
+        ide_drive_t *pair = &hwif->drives[1 - unit];
 
         /* Spec says 89 ref driver uses 88 */
         static u16 pio[]        = { 0xAA88, 0xA382, 0xA181, 0x3332, 0x3121 };
         static u8 pio_want[]    = { ATA_66, ATA_66, ATA_66, ATA_66, ATA_ANY };
 
-        if(itdev->smart)
-                return;
+        /*
+         * Compute the best PIO mode we can for a given device. We must
+         * pick a speed that does not cause problems with the other device
+         * on the cable.
+         */
+        if (pair) {
+                u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4, NULL);
+                /* trim PIO to the slowest of the master/slave */
+                if (pair_pio < set_pio)
+                        set_pio = pair_pio;
+        }
+
+        if (itdev->smart)
+                goto set_drive_speed;
 
         /* We prefer 66Mhz clock for PIO 0-3, don't care for PIO4 */
-        itdev->want[unit][1] = pio_want[mode_wanted];
+        itdev->want[unit][1] = pio_want[set_pio];
         itdev->want[unit][0] = 1;       /* PIO is lowest priority */
-        itdev->pio[unit] = pio[mode_wanted];
+        itdev->pio[unit] = pio[set_pio];
         it821x_clock_strategy(drive);
         it821x_program(drive, itdev->pio[unit]);
+
+set_drive_speed:
+        return ide_config_drive_speed(drive, XFER_PIO_0 + set_pio);
+}
+
+static void it821x_tuneproc(ide_drive_t *drive, u8 pio)
+{
+        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        (void)it821x_tunepio(drive, pio);
 }
 
 /**
@@ -354,40 +378,6 @@ static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
 }
 
 /**
- *      config_it821x_chipset_for_pio   -       set drive timings
- *      @drive: drive to tune
- *      @speed we want
- *
- *      Compute the best pio mode we can for a given device. We must
- *      pick a speed that does not cause problems with the other device
- *      on the cable.
- */
-
-static void config_it821x_chipset_for_pio (ide_drive_t *drive, byte set_speed)
-{
-        u8 unit = drive->select.b.unit;
-        ide_hwif_t *hwif = drive->hwif;
-        ide_drive_t *pair = &hwif->drives[1-unit];
-        u8 speed = 0, set_pio   = ide_get_best_pio_mode(drive, 255, 5, NULL);
-        u8 pair_pio;
-
-        /* We have to deal with this mess in pairs */
-        if(pair != NULL) {
-                pair_pio = ide_get_best_pio_mode(pair, 255, 5, NULL);
-                /* Trim PIO to the slowest of the master/slave */
-                if(pair_pio < set_pio)
-                        set_pio = pair_pio;
-        }
-        it821x_tuneproc(drive, set_pio);
-        speed = XFER_PIO_0 + set_pio;
-        /* XXX - We trim to the lowest of the pair so the other drive
-           will always be fine at this point until we do hotplug passthru */
-
-        if (set_speed)
-                (void) ide_config_drive_speed(drive, speed);
-}
-
-/**
  *      it821x_dma_read -       DMA hook
  *      @drive: drive for DMA
  *
@@ -450,15 +440,17 @@ static int it821x_tune_chipset (ide_drive_t *drive, byte xferspeed)
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         u8 speed                = ide_rate_filter(it821x_ratemask(drive), xferspeed);
 
-        if(!itdev->smart) {
-                switch(speed) {
-                        case XFER_PIO_4:
-                        case XFER_PIO_3:
-                        case XFER_PIO_2:
-                        case XFER_PIO_1:
-                        case XFER_PIO_0:
-                                it821x_tuneproc(drive, (speed - XFER_PIO_0));
-                                break;
+        switch (speed) {
+        case XFER_PIO_4:
+        case XFER_PIO_3:
+        case XFER_PIO_2:
+        case XFER_PIO_1:
+        case XFER_PIO_0:
+                return it821x_tunepio(drive, speed - XFER_PIO_0);
+        }
+
+        if (itdev->smart == 0) {
+                switch (speed) {
                         /* MWDMA tuning is really hard because our MWDMA and PIO
                            timings are kept in the same place. We can switch in the
                            host dma on/off callbacks */
@@ -498,14 +490,12 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 {
         u8 speed        = ide_dma_speed(drive, it821x_ratemask(drive));
 
-        if (speed) {
-                config_it821x_chipset_for_pio(drive, 0);
-                it821x_tune_chipset(drive, speed);
+        if (speed == 0)
+                return 0;
 
-                return ide_dma_enable(drive);
-        }
+        it821x_tune_chipset(drive, speed);
 
-        return 0;
+        return ide_dma_enable(drive);
 }
 
 /**
@@ -523,7 +513,7 @@ static int it821x_config_drive_for_dma (ide_drive_t *drive)
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
                 return 0;
 
-        config_it821x_chipset_for_pio(drive, 1);
+        it821x_tuneproc(drive, 255);
 
         return -1;
 }
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index ae20fb3f6cbc..2cdd629c653d 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -255,9 +255,6 @@ static int config_chipset_for_dma(ide_drive_t *drive)
                 printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name);
         }
 
-        if (drive->media != ide_disk && drive->media != ide_cdrom)
-                return 0;
-
         if (id->capability & 4) {
                 /*
                  * Set IORDY_EN & PREFETCH_EN (this seems to have
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 71eccdf5f817..c0188de3cc66 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/siimage.c              Version 1.11    Jan 27, 2007
+ * linux/drivers/ide/pci/siimage.c              Version 1.12    Mar 10 2007
  *
  * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2003           Red Hat <alan@redhat.com>
@@ -287,11 +287,6 @@ static void config_siimage_chipset_for_pio (ide_drive_t *drive, byte set_speed)
                 (void) ide_config_drive_speed(drive, speed);
 }
 
-static void config_chipset_for_pio (ide_drive_t *drive, byte set_speed)
-{
-        config_siimage_chipset_for_pio(drive, set_speed);
-}
-
 /**
  *      siimage_tune_chipset    -       set controller timings
  *      @drive: Drive to set up
@@ -396,8 +391,6 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 {
         u8 speed        = ide_dma_speed(drive, siimage_ratemask(drive));
 
-        config_chipset_for_pio(drive, !speed);
-
         if (!speed)
                 return 0;
 
@@ -423,7 +416,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                config_chipset_for_pio(drive, 1);
+                config_siimage_chipset_for_pio(drive, 1);
 
         return -1;
 }
@@ -1015,7 +1008,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
 
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 
         if (!is_sata(hwif))
                 hwif->atapi_dma = 1;
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 3a8a76fc78c7..fe3b4b91f854 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -11,6 +11,8 @@
  * Merge in Russell's HW workarounds, fix various problems
  * with the timing registers setup.
  *  -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org
+ *
+ * Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
  */
 
 #include <linux/types.h>
@@ -47,25 +49,19 @@
 #define CTRL_P0EN       (1 << 0)
 
 /*
- * Convert a PIO mode and cycle time to the required on/off
- * times for the interface.  This has protection against run-away
- * timings.
+ * Convert a PIO mode and cycle time to the required on/off times
+ * for the interface.  This has protection against runaway timings.
  */
-static unsigned int get_timing_sl82c105(ide_pio_data_t *p)
+static unsigned int get_pio_timings(ide_pio_data_t *p)
 {
-        unsigned int cmd_on;
-        unsigned int cmd_off;
+        unsigned int cmd_on, cmd_off;
 
-        cmd_on = (ide_pio_timings[p->pio_mode].active_time + 29) / 30;
+        cmd_on  = (ide_pio_timings[p->pio_mode].active_time + 29) / 30;
         cmd_off = (p->cycle_time - 30 * cmd_on + 29) / 30;
 
-        if (cmd_on > 32)
-                cmd_on = 32;
         if (cmd_on == 0)
                 cmd_on = 1;
 
-        if (cmd_off > 32)
-                cmd_off = 32;
         if (cmd_off == 0)
                 cmd_off = 1;
 
@@ -73,100 +69,59 @@ static unsigned int get_timing_sl82c105(ide_pio_data_t *p)
 }
 
 /*
- * Configure the drive and chipset for PIO
+ * Configure the chipset for PIO mode.
  */
-static void config_for_pio(ide_drive_t *drive, int pio, int report, int chipset_only)
+static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        int reg                 = 0x44 + drive->dn * 4;
         ide_pio_data_t p;
-        u16 drv_ctrl = 0x909;
-        unsigned int xfer_mode, reg;
+        u16 drv_ctrl;
 
-        DBG(("config_for_pio(drive:%s, pio:%d, report:%d, chipset_only:%d)\n",
-                drive->name, pio, report, chipset_only));
-                
-        reg = (hwif->channel ? 0x4c : 0x44) + (drive->select.b.unit ? 4 : 0);
+        DBG(("sl82c105_tune_pio(drive:%s, pio:%u)\n", drive->name, pio));
 
         pio = ide_get_best_pio_mode(drive, pio, 5, &p);
 
-        xfer_mode = XFER_PIO_0 + pio;
-
-        if (chipset_only || ide_config_drive_speed(drive, xfer_mode) == 0) {
-                drv_ctrl = get_timing_sl82c105(&p);
-                drive->pio_speed = xfer_mode;
-        } else
-                drive->pio_speed = XFER_PIO_0;
+        drive->drive_data = drv_ctrl = get_pio_timings(&p);
 
-        if (drive->using_dma == 0) {
+        if (!drive->using_dma) {
                 /*
                  * If we are actually using MW DMA, then we can not
                  * reprogram the interface drive control register.
                  */
-                pci_write_config_word(dev, reg, drv_ctrl);
-                pci_read_config_word(dev, reg, &drv_ctrl);
-
-                if (report) {
-                        printk("%s: selected %s (%dns) (%04X)\n", drive->name,
-                               ide_xfer_verbose(xfer_mode), p.cycle_time, drv_ctrl);
-                }
+                pci_write_config_word(dev, reg,  drv_ctrl);
+                pci_read_config_word (dev, reg, &drv_ctrl);
         }
+
+        printk(KERN_DEBUG "%s: selected %s (%dns) (%04X)\n", drive->name,
+               ide_xfer_verbose(pio + XFER_PIO_0), p.cycle_time, drv_ctrl);
+
+        return pio;
 }
 
 /*
- * Configure the drive and the chipset for DMA
+ * Configure the drive for DMA.
+ * We'll program the chipset only when DMA is actually turned on.
  */
-static int config_for_dma (ide_drive_t *drive)
+static int config_for_dma(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
-        unsigned int reg;
-
         DBG(("config_for_dma(drive:%s)\n", drive->name));
 
-        reg = (hwif->channel ? 0x4c : 0x44) + (drive->select.b.unit ? 4 : 0);
-
         if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0)
-                return 1;
+                return 0;
 
-        pci_write_config_word(dev, reg, 0x0240);
-
-        return 0;
+        return ide_dma_enable(drive);
 }
 
 /*
- * Check to see if the drive and
- * chipset is capable of DMA mode
+ * Check to see if the drive and chipset are capable of DMA mode.
  */
-
-static int sl82c105_check_drive (ide_drive_t *drive)
+static int sl82c105_ide_dma_check(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
-        DBG(("sl82c105_check_drive(drive:%s)\n", drive->name));
-
-        do {
-                struct hd_driveid *id = drive->id;
-
-                if (!drive->autodma)
-                        break;
-
-                if (!id || !(id->capability & 1))
-                        break;
+        DBG(("sl82c105_ide_dma_check(drive:%s)\n", drive->name));
 
-                /* Consult the list of known "bad" drives */
-                if (__ide_dma_bad_drive(drive))
-                        break;
-
-                if (id->field_valid & 2) {
-                        if ((id->dma_mword & hwif->mwdma_mask) ||
-                            (id->dma_1word & hwif->swdma_mask))
-                                return 0;
-                }
-
-                if (__ide_dma_good_drive(drive) && id->eide_dma_time < 150)
-                        return 0;
-        } while (0);
+        if (ide_use_dma(drive) && config_for_dma(drive))
+                return 0;
 
         return -1;
 }
@@ -195,14 +150,14 @@ static inline void sl82c105_reset_host(struct pci_dev *dev)
  * This function is called when the IDE timer expires, the drive
  * indicates that it is READY, and we were waiting for DMA to complete.
  */
-static int sl82c105_ide_dma_lost_irq(ide_drive_t *drive)
+static int sl82c105_ide_dma_lostirq(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
-        u32 val, mask = hwif->channel ? CTRL_IDE_IRQB : CTRL_IDE_IRQA;
-        unsigned long dma_base = hwif->dma_base;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
+        u32 val, mask           = hwif->channel ? CTRL_IDE_IRQB : CTRL_IDE_IRQA;
+        u8 dma_cmd;
 
-        printk("sl82c105: lost IRQ: resetting host\n");
+        printk("sl82c105: lost IRQ, resetting host\n");
 
         /*
          * Check the raw interrupt from the drive.
@@ -215,15 +170,15 @@ static int sl82c105_ide_dma_lost_irq(ide_drive_t *drive)
          * Was DMA enabled?  If so, disable it - we're resetting the
          * host.  The IDE layer will be handling the drive for us.
          */
-        val = inb(dma_base);
-        if (val & 1) {
-                outb(val & ~1, dma_base);
+        dma_cmd = inb(hwif->dma_command);
+        if (dma_cmd & 1) {
+                outb(dma_cmd & ~1, hwif->dma_command);
                 printk("sl82c105: DMA was enabled\n");
         }
 
         sl82c105_reset_host(dev);
 
-        /* ide_dmaproc would return 1, so we do as well */
+        /* __ide_dma_lostirq would return 1, so we do as well */
         return 1;
 }
 
@@ -235,10 +190,10 @@ static int sl82c105_ide_dma_lost_irq(ide_drive_t *drive)
  * The generic IDE core will have disabled the BMEN bit before this
  * function is called.
  */
-static void sl82c105_ide_dma_start(ide_drive_t *drive)
+static void sl82c105_dma_start(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
 
         sl82c105_reset_host(dev);
         ide_dma_start(drive);
@@ -246,8 +201,8 @@ static void sl82c105_ide_dma_start(ide_drive_t *drive)
 
 static int sl82c105_ide_dma_timeout(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
 
         DBG(("sl82c105_ide_dma_timeout(drive:%s)\n", drive->name));
 
@@ -255,26 +210,32 @@ static int sl82c105_ide_dma_timeout(ide_drive_t *drive)
         return __ide_dma_timeout(drive);
 }
 
-static int sl82c105_ide_dma_on (ide_drive_t *drive)
+static int sl82c105_ide_dma_on(ide_drive_t *drive)
 {
+        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        int rc, reg             = 0x44 + drive->dn * 4;
+
         DBG(("sl82c105_ide_dma_on(drive:%s)\n", drive->name));
 
-        if (config_for_dma(drive))
-                return 1;
-        printk(KERN_INFO "%s: DMA enabled\n", drive->name);
-        return __ide_dma_on(drive);
+        rc = __ide_dma_on(drive);
+        if (rc == 0) {
+                pci_write_config_word(dev, reg, 0x0200);
+
+                printk(KERN_INFO "%s: DMA enabled\n", drive->name);
+        }
+        return rc;
 }
 
 static void sl82c105_dma_off_quietly(ide_drive_t *drive)
 {
-        u8 speed = XFER_PIO_0;
+        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+        int reg                 = 0x44 + drive->dn * 4;
 
         DBG(("sl82c105_dma_off_quietly(drive:%s)\n", drive->name));
 
+        pci_write_config_word(dev, reg, drive->drive_data);
+
         ide_dma_off_quietly(drive);
-        if (drive->pio_speed)
-                speed = drive->pio_speed - XFER_PIO_0;
-        config_for_pio(drive, speed, 0, 1);
 }
 
 /*
@@ -286,8 +247,8 @@ static void sl82c105_dma_off_quietly(ide_drive_t *drive)
  */
 static void sl82c105_selectproc(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-        struct pci_dev *dev = hwif->pci_dev;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct pci_dev *dev     = hwif->pci_dev;
         u32 val, old, mask;
 
         //DBG(("sl82c105_selectproc(drive:%s)\n", drive->name));
@@ -323,18 +284,12 @@ static void sl82c105_resetproc(ide_drive_t *drive)
  * We only deal with PIO mode here - DMA mode 'using_dma' is not
  * initialised at the point that this function is called.
  */
-static void tune_sl82c105(ide_drive_t *drive, u8 pio)
+static void sl82c105_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        DBG(("tune_sl82c105(drive:%s)\n", drive->name));
-
-        config_for_pio(drive, pio, 1, 0);
+        DBG(("sl82c105_tune_drive(drive:%s, pio:%u)\n", drive->name, pio));
 
-        /*
-         * We support 32-bit I/O on this interface, and it
-         * doesn't have problems with interrupts.
-         */
-        drive->io_32bit = 1;
-        drive->unmask = 1;
+        pio = sl82c105_tune_pio(drive, pio);
+        (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
 /*
@@ -393,7 +348,7 @@ static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev, const c
 }
 
 /*
- * Initialise the chip
+ * Initialise IDE channel
  */
 static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
 {
@@ -401,24 +356,22 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
 
         DBG(("init_hwif_sl82c105(hwif: ide%d)\n", hwif->index));
 
-        hwif->tuneproc = tune_sl82c105;
-        hwif->selectproc = sl82c105_selectproc;
-        hwif->resetproc = sl82c105_resetproc;
+        hwif->tuneproc          = &sl82c105_tune_drive;
+        hwif->selectproc        = &sl82c105_selectproc;
+        hwif->resetproc         = &sl82c105_resetproc;
+
+        /*
+         * We support 32-bit I/O on this interface, and
+         * it doesn't have problems with interrupts.
+         */
+        hwif->drives[0].io_32bit = hwif->drives[1].io_32bit = 1;
+        hwif->drives[0].unmask   = hwif->drives[1].unmask   = 1;
 
         /*
-         * Default to PIO 0 for fallback unless tuned otherwise.
          * We always autotune PIO,  this is done before DMA is checked,
          * so there's no risk of accidentally disabling DMA
          */
-        hwif->drives[0].pio_speed = XFER_PIO_0;
-        hwif->drives[0].autotune = 1;
-        hwif->drives[1].pio_speed = XFER_PIO_0;
-        hwif->drives[1].autotune = 1;
-
-        hwif->atapi_dma = 0;
-        hwif->mwdma_mask = 0;
-        hwif->swdma_mask = 0;
-        hwif->autodma = 0;
+        hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
 
         if (!hwif->dma_base)
                 return;
@@ -429,27 +382,27 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
                  * Never ever EVER under any circumstances enable
                  * DMA when the bridge is this old.
                  */
-                printk("    %s: Winbond 553 bridge revision %d, BM-DMA disabled\n",
-                       hwif->name, rev);
-        } else {
-                hwif->atapi_dma = 1;
-                hwif->mwdma_mask = 0x04;
-
-                hwif->ide_dma_check = &sl82c105_check_drive;
-                hwif->ide_dma_on = &sl82c105_ide_dma_on;
-                hwif->dma_off_quietly = &sl82c105_dma_off_quietly;
-                hwif->ide_dma_lostirq = &sl82c105_ide_dma_lost_irq;
-                hwif->dma_start = &sl82c105_ide_dma_start;
-                hwif->ide_dma_timeout = &sl82c105_ide_dma_timeout;
-
-                if (!noautodma)
-                        hwif->autodma = 1;
-                hwif->drives[0].autodma = hwif->autodma;
-                hwif->drives[1].autodma = hwif->autodma;
-
-                if (hwif->mate)
-                        hwif->serialized = hwif->mate->serialized = 1;
+                printk("    %s: Winbond W83C553 bridge revision %d, "
+                       "BM-DMA disabled\n", hwif->name, rev);
+                return;
         }
+
+        hwif->atapi_dma  = 1;
+        hwif->mwdma_mask = 0x04;
+
+        hwif->ide_dma_check             = &sl82c105_ide_dma_check;
+        hwif->ide_dma_on                = &sl82c105_ide_dma_on;
+        hwif->dma_off_quietly           = &sl82c105_dma_off_quietly;
+        hwif->ide_dma_lostirq           = &sl82c105_ide_dma_lostirq;
+        hwif->dma_start                 = &sl82c105_dma_start;
+        hwif->ide_dma_timeout           = &sl82c105_ide_dma_timeout;
+
+        if (!noautodma)
+                hwif->autodma = 1;
+        hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
+
+        if (hwif->mate)
+                hwif->serialized = hwif->mate->serialized = 1;
 }
 
 static ide_pci_device_t sl82c105_chipset __devinitdata = {
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 6164a9a83396..bd0755c789c5 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -15,7 +15,6 @@
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 842cd0b53e91..eff591deeb46 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -40,7 +40,6 @@
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/random.h>
 #include <linux/rbtree.h>
 #include <linux/spinlock.h>
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 1d796e7c8199..a06bcc65a871 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -43,6 +43,8 @@
 
 #include "core_priv.h"
 
+#define PFX "fmr_pool: "
+
 enum {
         IB_FMR_MAX_REMAPS = 32,
 
@@ -150,7 +152,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
 
 #ifdef DEBUG
                 if (fmr->ref_count !=0) {
-                        printk(KERN_WARNING "Unmapping FMR 0x%08x with ref count %d",
+                        printk(KERN_WARNING PFX "Unmapping FMR 0x%08x with ref count %d",
                                fmr, fmr->ref_count);
                 }
 #endif
@@ -168,7 +170,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
 
         ret = ib_unmap_fmr(&fmr_list);
         if (ret)
-                printk(KERN_WARNING "ib_unmap_fmr returned %d", ret);
+                printk(KERN_WARNING PFX "ib_unmap_fmr returned %d", ret);
 
         spin_lock_irq(&pool->pool_lock);
         list_splice(&unmap_list, &pool->free_list);
@@ -226,20 +228,20 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
         device = pd->device;
         if (!device->alloc_fmr    || !device->dealloc_fmr  ||
             !device->map_phys_fmr || !device->unmap_fmr) {
-                printk(KERN_WARNING "Device %s does not support fast memory regions",
+                printk(KERN_INFO PFX "Device %s does not support FMRs\n",
                        device->name);
                 return ERR_PTR(-ENOSYS);
         }
 
         attr = kmalloc(sizeof *attr, GFP_KERNEL);
         if (!attr) {
-                printk(KERN_WARNING "couldn't allocate device attr struct");
+                printk(KERN_WARNING PFX "couldn't allocate device attr struct");
                 return ERR_PTR(-ENOMEM);
         }
 
         ret = ib_query_device(device, attr);
         if (ret) {
-                printk(KERN_WARNING "couldn't query device");
+                printk(KERN_WARNING PFX "couldn't query device: %d", ret);
                 kfree(attr);
                 return ERR_PTR(ret);
         }
@@ -253,7 +255,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
 
         pool = kmalloc(sizeof *pool, GFP_KERNEL);
         if (!pool) {
-                printk(KERN_WARNING "couldn't allocate pool struct");
+                printk(KERN_WARNING PFX "couldn't allocate pool struct");
                 return ERR_PTR(-ENOMEM);
         }
 
@@ -270,7 +272,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
                         kmalloc(IB_FMR_HASH_SIZE * sizeof *pool->cache_bucket,
                                 GFP_KERNEL);
                 if (!pool->cache_bucket) {
-                        printk(KERN_WARNING "Failed to allocate cache in pool");
+                        printk(KERN_WARNING PFX "Failed to allocate cache in pool");
                         ret = -ENOMEM;
                         goto out_free_pool;
                 }
@@ -294,7 +296,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
                                       "ib_fmr(%s)",
                                       device->name);
         if (IS_ERR(pool->thread)) {
-                printk(KERN_WARNING "couldn't start cleanup thread");
+                printk(KERN_WARNING PFX "couldn't start cleanup thread");
                 ret = PTR_ERR(pool->thread);
                 goto out_free_pool;
         }
@@ -311,8 +313,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
                         fmr = kmalloc(sizeof *fmr + params->max_pages_per_fmr * sizeof (u64),
                                       GFP_KERNEL);
                         if (!fmr) {
-                                printk(KERN_WARNING "failed to allocate fmr struct "
-                                       "for FMR %d", i);
+                                printk(KERN_WARNING PFX "failed to allocate fmr "
+                                       "struct for FMR %d", i);
                                 goto out_fail;
                         }
 
@@ -323,7 +325,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
 
                         fmr->fmr = ib_alloc_fmr(pd, params->access, &fmr_attr);
                         if (IS_ERR(fmr->fmr)) {
-                                printk(KERN_WARNING "fmr_create failed for FMR %d", i);
+                                printk(KERN_WARNING PFX "fmr_create failed "
+                                       "for FMR %d", i);
                                 kfree(fmr);
                                 goto out_fail;
                         }
@@ -378,7 +381,7 @@ void ib_destroy_fmr_pool(struct ib_fmr_pool *pool)
         }
 
         if (i < pool->pool_size)
-                printk(KERN_WARNING "pool still has %d regions registered",
+                printk(KERN_WARNING PFX "pool still has %d regions registered",
                        pool->pool_size - i);
 
         kfree(pool->cache_bucket);
@@ -463,8 +466,7 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,
                 list_add(&fmr->list, &pool->free_list);
                 spin_unlock_irqrestore(&pool->pool_lock, flags);
 
-                printk(KERN_WARNING "fmr_map returns %d\n",
-                       result);
+                printk(KERN_WARNING PFX "fmr_map returns %d\n", result);
 
                 return ERR_PTR(result);
         }
@@ -516,7 +518,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
 
 #ifdef DEBUG
         if (fmr->ref_count < 0)
-                printk(KERN_WARNING "FMR %p has ref count %d < 0",
+                printk(KERN_WARNING PFX "FMR %p has ref count %d < 0",
                        fmr, fmr->ref_count);
 #endif
 
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 891d1fa7b2eb..223b1aa7d92b 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -39,7 +39,6 @@
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/rbtree.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 6edfecf1be72..85ccf13b8041 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2771,7 +2771,7 @@ static int ib_mad_port_open(struct ib_device *device,
         cq_size = (IB_MAD_QP_SEND_SIZE + IB_MAD_QP_RECV_SIZE) * 2;
         port_priv->cq = ib_create_cq(port_priv->device,
                                      ib_mad_thread_completion_handler,
-                                     NULL, port_priv, cq_size);
+                                     NULL, port_priv, cq_size, 0);
         if (IS_ERR(port_priv->cq)) {
                 printk(KERN_ERR PFX "Couldn't create ib_mad CQ\n");
                 ret = PTR_ERR(port_priv->cq);
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index de89717f49fe..9be5cc00a3a9 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -39,7 +39,6 @@
 
 #include <linux/completion.h>
 #include <linux/err.h>
-#include <linux/pci.h>
 #include <linux/workqueue.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index 4a579b3a1c90..1e13ab42b70b 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -34,7 +34,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/random.h>
 
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 9a7eaadb1688..6469406ea9d8 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -40,7 +40,6 @@
 #include <linux/random.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/kref.h>
 #include <linux/idr.h>
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 8199b83052a9..d97ded25c4ff 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -40,7 +40,6 @@
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/poll.h>
 #include <linux/rwsem.h>
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 4fd75afa6a3a..bab66769be14 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -802,6 +802,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
         INIT_LIST_HEAD(&obj->async_list);
 
         cq = file->device->ib_dev->create_cq(file->device->ib_dev, cmd.cqe,
+                                             cmd.comp_vector,
                                              file->ucontext, &udata);
         if (IS_ERR(cq)) {
                 ret = PTR_ERR(cq);
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index f8bc822a3cc3..d44e54799651 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -752,7 +752,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
         spin_unlock(&map_lock);
 
         uverbs_dev->ib_dev           = device;
-        uverbs_dev->num_comp_vectors = 1;
+        uverbs_dev->num_comp_vectors = device->num_comp_vectors;
 
         uverbs_dev->dev = cdev_alloc();
         if (!uverbs_dev->dev)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index ccdf93d30b01..86ed8af9c7e6 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -609,11 +609,11 @@ EXPORT_SYMBOL(ib_destroy_qp);
 struct ib_cq *ib_create_cq(struct ib_device *device,
                            ib_comp_handler comp_handler,
                            void (*event_handler)(struct ib_event *, void *),
-                           void *cq_context, int cqe)
+                           void *cq_context, int cqe, int comp_vector)
 {
         struct ib_cq *cq;
 
-        cq = device->create_cq(device, cqe, NULL, NULL);
+        cq = device->create_cq(device, cqe, comp_vector, NULL, NULL);
 
         if (!IS_ERR(cq)) {
                 cq->device        = device;
diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h
index 04a9db5de881..fa58200217a1 100644
--- a/drivers/infiniband/hw/amso1100/c2.h
+++ b/drivers/infiniband/hw/amso1100/c2.h
@@ -519,7 +519,7 @@ extern void c2_free_cq(struct c2_dev *c2dev, struct c2_cq *cq);
 extern void c2_cq_event(struct c2_dev *c2dev, u32 mq_index);
 extern void c2_cq_clean(struct c2_dev *c2dev, struct c2_qp *qp, u32 mq_index);
 extern int c2_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry);
-extern int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify);
+extern int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags);
 
 /* CM */
 extern int c2_llp_connect(struct iw_cm_id *cm_id,
diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c
index 5175c99ee586..d2b3366786d6 100644
--- a/drivers/infiniband/hw/amso1100/c2_cq.c
+++ b/drivers/infiniband/hw/amso1100/c2_cq.c
@@ -217,17 +217,19 @@ int c2_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
         return npolled;
 }
 
-int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
+int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags)
 {
         struct c2_mq_shared __iomem *shared;
         struct c2_cq *cq;
+        unsigned long flags;
+        int ret = 0;
 
         cq = to_c2cq(ibcq);
         shared = cq->mq.peer;
 
-        if (notify == IB_CQ_NEXT_COMP)
+        if ((notify_flags & IB_CQ_SOLICITED_MASK) == IB_CQ_NEXT_COMP)
                 writeb(C2_CQ_NOTIFICATION_TYPE_NEXT, &shared->notification_type);
-        else if (notify == IB_CQ_SOLICITED)
+        else if ((notify_flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED)
                 writeb(C2_CQ_NOTIFICATION_TYPE_NEXT_SE, &shared->notification_type);
         else
                 return -EINVAL;
@@ -241,7 +243,13 @@ int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
          */
         readb(&shared->armed);
 
-        return 0;
+        if (notify_flags & IB_CQ_REPORT_MISSED_EVENTS) {
+                spin_lock_irqsave(&cq->lock, flags);
+                ret = !c2_mq_empty(&cq->mq);
+                spin_unlock_irqrestore(&cq->lock, flags);
+        }
+
+        return ret;
 }
 
 static void c2_free_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq)
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 607c09bf764c..109166223c09 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -290,7 +290,7 @@ static int c2_destroy_qp(struct ib_qp *ib_qp)
         return 0;
 }
 
-static struct ib_cq *c2_create_cq(struct ib_device *ibdev, int entries,
+static struct ib_cq *c2_create_cq(struct ib_device *ibdev, int entries, int vector,
                                   struct ib_ucontext *context,
                                   struct ib_udata *udata)
 {
@@ -795,6 +795,7 @@ int c2_register_device(struct c2_dev *dev)
         memset(&dev->ibdev.node_guid, 0, sizeof(dev->ibdev.node_guid));
         memcpy(&dev->ibdev.node_guid, dev->pseudo_netdev->dev_addr, 6);
         dev->ibdev.phys_port_cnt = 1;
+        dev->ibdev.num_comp_vectors = 1;
         dev->ibdev.dma_device = &dev->pcidev->dev;
         dev->ibdev.query_device = c2_query_device;
         dev->ibdev.query_port = c2_query_port;
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index f5e9aeec6f6e..76049afc7655 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -114,7 +114,10 @@ int cxio_hal_cq_op(struct cxio_rdev *rdev_p, struct t3_cq *cq,
                                 return -EIO;
                         }
                 }
+
+                return 1;
         }
+
         return 0;
 }
 
diff --git a/drivers/infiniband/hw/cxgb3/cxio_wr.h b/drivers/infiniband/hw/cxgb3/cxio_wr.h
index 90d7b8972cb4..ff7290eacefb 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_wr.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_wr.h
@@ -38,6 +38,7 @@
 #include "firmware_exports.h"
 
 #define T3_MAX_SGE      4
+#define T3_MAX_INLINE   64
 
 #define Q_EMPTY(rptr,wptr) ((rptr)==(wptr))
 #define Q_FULL(rptr,wptr,size_log2)  ( (((wptr)-(rptr))>>(size_log2)) && \
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 3b4b0acd707f..b2faff5abce8 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1109,6 +1109,15 @@ static int abort_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
 
         PDBG("%s ep %p\n", __FUNCTION__, ep);
 
+        /*
+         * We get 2 abort replies from the HW.  The first one must
+         * be ignored except for scribbling that we need one more.
+         */
+        if (!(ep->flags & ABORT_REQ_IN_PROGRESS)) {
+                ep->flags |= ABORT_REQ_IN_PROGRESS;
+                return CPL_RET_BUF_DONE;
+        }
+
         close_complete_upcall(ep);
         state_set(&ep->com, DEAD);
         release_ep_resources(ep);
@@ -1189,6 +1198,7 @@ static int listen_stop(struct iwch_listen_ep *ep)
         }
         req = (struct cpl_close_listserv_req *) skb_put(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+        req->cpu_idx = 0;
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, ep->stid));
         skb->priority = 1;
         ep->com.tdev->send(ep->com.tdev, skb);
@@ -1475,6 +1485,15 @@ static int peer_abort(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
         int ret;
         int state;
 
+        /*
+         * We get 2 peer aborts from the HW.  The first one must
+         * be ignored except for scribbling that we need one more.
+         */
+        if (!(ep->flags & PEER_ABORT_IN_PROGRESS)) {
+                ep->flags |= PEER_ABORT_IN_PROGRESS;
+                return CPL_RET_BUF_DONE;
+        }
+
         if (is_neg_adv_abort(req->status)) {
                 PDBG("%s neg_adv_abort ep %p tid %d\n", __FUNCTION__, ep,
                      ep->hwtid);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.h b/drivers/infiniband/hw/cxgb3/iwch_cm.h
index 0c6f281bd4a0..21a388c313cf 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.h
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.h
@@ -143,6 +143,11 @@ enum iwch_ep_state {
         DEAD,
 };
 
+enum iwch_ep_flags {
+        PEER_ABORT_IN_PROGRESS  = (1 << 0),
+        ABORT_REQ_IN_PROGRESS   = (1 << 1),
+};
+
 struct iwch_ep_common {
         struct iw_cm_id *cm_id;
         struct iwch_qp *qp;
@@ -181,6 +186,7 @@ struct iwch_ep {
         u16 plen;
         u32 ird;
         u32 ord;
+        u32 flags;
 };
 
 static inline struct iwch_ep *to_ep(struct iw_cm_id *cm_id)
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index af28a317016d..a891493fd340 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -139,7 +139,7 @@ static int iwch_destroy_cq(struct ib_cq *ib_cq)
         return 0;
 }
 
-static struct ib_cq *iwch_create_cq(struct ib_device *ibdev, int entries,
+static struct ib_cq *iwch_create_cq(struct ib_device *ibdev, int entries, int vector,
                              struct ib_ucontext *ib_context,
                              struct ib_udata *udata)
 {
@@ -292,7 +292,7 @@ static int iwch_resize_cq(struct ib_cq *cq, int cqe, struct ib_udata *udata)
 #endif
 }
 
-static int iwch_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
+static int iwch_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
 {
         struct iwch_dev *rhp;
         struct iwch_cq *chp;
@@ -303,7 +303,7 @@ static int iwch_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
 
         chp = to_iwch_cq(ibcq);
         rhp = chp->rhp;
-        if (notify == IB_CQ_SOLICITED)
+        if ((flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED)
                 cq_op = CQ_ARM_SE;
         else
                 cq_op = CQ_ARM_AN;
@@ -317,9 +317,11 @@ static int iwch_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
         PDBG("%s rptr 0x%x\n", __FUNCTION__, chp->cq.rptr);
         err = cxio_hal_cq_op(&rhp->rdev, &chp->cq, cq_op, 0);
         spin_unlock_irqrestore(&chp->lock, flag);
-        if (err)
+        if (err < 0)
                 printk(KERN_ERR MOD "Error %d rearming CQID 0x%x\n", err,
                        chp->cq.cqid);
+        if (err > 0 && !(flags & IB_CQ_REPORT_MISSED_EVENTS))
+                err = 0;
         return err;
 }
 
@@ -780,6 +782,9 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd,
         if (rqsize > T3_MAX_RQ_SIZE)
                 return ERR_PTR(-EINVAL);
 
+        if (attrs->cap.max_inline_data > T3_MAX_INLINE)
+                return ERR_PTR(-EINVAL);
+
         /*
          * NOTE: The SQ and total WQ sizes don't need to be
          * a power of two.  However, all the code assumes
@@ -1107,6 +1112,7 @@ int iwch_register_device(struct iwch_dev *dev)
         dev->ibdev.node_type = RDMA_NODE_RNIC;
         memcpy(dev->ibdev.node_desc, IWCH_NODE_DESC, sizeof(IWCH_NODE_DESC));
         dev->ibdev.phys_port_cnt = dev->rdev.port_info.nports;
+        dev->ibdev.num_comp_vectors = 1;
         dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);
         dev->ibdev.query_device = iwch_query_device;
         dev->ibdev.query_port = iwch_query_port;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index 0a472c9b44db..714dddbc9a98 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -471,43 +471,62 @@ int iwch_bind_mw(struct ib_qp *qp,
         return err;
 }
 
-static void build_term_codes(int t3err, u8 *layer_type, u8 *ecode, int tagged)
+static inline void build_term_codes(struct respQ_msg_t *rsp_msg,
+                                    u8 *layer_type, u8 *ecode)
 {
-        switch (t3err) {
+        int status = TPT_ERR_INTERNAL_ERR;
+        int tagged = 0;
+        int opcode = -1;
+        int rqtype = 0;
+        int send_inv = 0;
+
+        if (rsp_msg) {
+                status = CQE_STATUS(rsp_msg->cqe);
+                opcode = CQE_OPCODE(rsp_msg->cqe);
+                rqtype = RQ_TYPE(rsp_msg->cqe);
+                send_inv = (opcode == T3_SEND_WITH_INV) ||
+                           (opcode == T3_SEND_WITH_SE_INV);
+                tagged = (opcode == T3_RDMA_WRITE) ||
+                         (rqtype && (opcode == T3_READ_RESP));
+        }
+
+        switch (status) {
         case TPT_ERR_STAG:
-                if (tagged == 1) {
-                        *layer_type = LAYER_DDP|DDP_TAGGED_ERR;
-                        *ecode = DDPT_INV_STAG;
-                } else if (tagged == 2) {
+                if (send_inv) {
+                        *layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
+                        *ecode = RDMAP_CANT_INV_STAG;
+                } else {
                         *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
                         *ecode = RDMAP_INV_STAG;
                 }
                 break;
         case TPT_ERR_PDID:
+                *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+                if ((opcode == T3_SEND_WITH_INV) ||
+                    (opcode == T3_SEND_WITH_SE_INV))
+                        *ecode = RDMAP_CANT_INV_STAG;
+                else
+                        *ecode = RDMAP_STAG_NOT_ASSOC;
+                break;
         case TPT_ERR_QPID:
+                *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+                *ecode = RDMAP_STAG_NOT_ASSOC;
+                break;
         case TPT_ERR_ACCESS:
-                if (tagged == 1) {
-                        *layer_type = LAYER_DDP|DDP_TAGGED_ERR;
-                        *ecode = DDPT_STAG_NOT_ASSOC;
-                } else if (tagged == 2) {
-                        *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
-                        *ecode = RDMAP_STAG_NOT_ASSOC;
-                }
+                *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+                *ecode = RDMAP_ACC_VIOL;
                 break;
         case TPT_ERR_WRAP:
                 *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
                 *ecode = RDMAP_TO_WRAP;
                 break;
         case TPT_ERR_BOUND:
-                if (tagged == 1) {
+                if (tagged) {
                         *layer_type = LAYER_DDP|DDP_TAGGED_ERR;
                         *ecode = DDPT_BASE_BOUNDS;
-                } else if (tagged == 2) {
+                } else {
                         *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
                         *ecode = RDMAP_BASE_BOUNDS;
-                } else {
-                        *layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
-                        *ecode = DDPU_MSG_TOOBIG;
                 }
                 break;
         case TPT_ERR_INVALIDATE_SHARED_MR:
@@ -591,8 +610,6 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
 {
         union t3_wr *wqe;
         struct terminate_message *term;
-        int status;
-        int tagged = 0;
         struct sk_buff *skb;
 
         PDBG("%s %d\n", __FUNCTION__, __LINE__);
@@ -610,17 +627,7 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
 
         /* immediate data starts here. */
         term = (struct terminate_message *)wqe->send.sgl;
-        if (rsp_msg) {
-                status = CQE_STATUS(rsp_msg->cqe);
-                if (CQE_OPCODE(rsp_msg->cqe) == T3_RDMA_WRITE)
-                        tagged = 1;
-                if ((CQE_OPCODE(rsp_msg->cqe) == T3_READ_REQ) ||
-                    (CQE_OPCODE(rsp_msg->cqe) == T3_READ_RESP))
-                        tagged = 2;
-        } else {
-                status = TPT_ERR_INTERNAL_ERR;
-        }
-        build_term_codes(status, &term->layer_etype, &term->ecode, tagged);
+        build_term_codes(rsp_msg, &term->layer_etype, &term->ecode);
         build_fw_riwrh((void *)wqe, T3_WR_SEND,
                        T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 1,
                        qhp->ep->hwtid, 5);
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index e2cdc1a16fe9..67f0670fe3b1 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -113,7 +113,7 @@ struct ehca_qp* ehca_cq_get_qp(struct ehca_cq *cq, int real_qp_num)
         return ret;
 }
 
-struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe,
+struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
                              struct ib_ucontext *context,
                              struct ib_udata *udata)
 {
diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h
index 95fd59fb4528..e14b029332c8 100644
--- a/drivers/infiniband/hw/ehca/ehca_iverbs.h
+++ b/drivers/infiniband/hw/ehca/ehca_iverbs.h
@@ -123,7 +123,7 @@ int ehca_destroy_eq(struct ehca_shca *shca, struct ehca_eq *eq);
 void *ehca_poll_eq(struct ehca_shca *shca, struct ehca_eq *eq);
 
 
-struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe,
+struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
                              struct ib_ucontext *context,
                              struct ib_udata *udata);
 
@@ -135,7 +135,7 @@ int ehca_poll_cq(struct ib_cq *cq, int num_entries, struct ib_wc *wc);
 
 int ehca_peek_cq(struct ib_cq *cq, int wc_cnt);
 
-int ehca_req_notify_cq(struct ib_cq *cq, enum ib_cq_notify cq_notify);
+int ehca_req_notify_cq(struct ib_cq *cq, enum ib_cq_notify_flags notify_flags);
 
 struct ib_qp *ehca_create_qp(struct ib_pd *pd,
                              struct ib_qp_init_attr *init_attr,
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 50e426592d02..fe90e7454560 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -313,6 +313,7 @@ int ehca_init_device(struct ehca_shca *shca)
 
         shca->ib_device.node_type           = RDMA_NODE_IB_CA;
         shca->ib_device.phys_port_cnt       = shca->num_ports;
+        shca->ib_device.num_comp_vectors    = 1;
         shca->ib_device.dma_device          = &shca->ibmebus_dev->ofdev.dev;
         shca->ib_device.query_device        = ehca_query_device;
         shca->ib_device.query_port          = ehca_query_port;
@@ -375,7 +376,7 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
                 return -EPERM;
         }
 
-        ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void*)(-1), 10);
+        ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void*)(-1), 10, 0);
         if (IS_ERR(ibcq)) {
                 ehca_err(&shca->ib_device, "Cannot create AQP1 CQ.");
                 return PTR_ERR(ibcq);
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index 08d3f892d9f3..caec9dee09e1 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -634,11 +634,13 @@ poll_cq_exit0:
         return ret;
 }
 
-int ehca_req_notify_cq(struct ib_cq *cq, enum ib_cq_notify cq_notify)
+int ehca_req_notify_cq(struct ib_cq *cq, enum ib_cq_notify_flags notify_flags)
 {
         struct ehca_cq *my_cq = container_of(cq, struct ehca_cq, ib_cq);
+        unsigned long spl_flags;
+        int ret = 0;
 
-        switch (cq_notify) {
+        switch (notify_flags & IB_CQ_SOLICITED_MASK) {
         case IB_CQ_SOLICITED:
                 hipz_set_cqx_n0(my_cq, 1);
                 break;
@@ -649,5 +651,11 @@ int ehca_req_notify_cq(struct ib_cq *cq, enum ib_cq_notify cq_notify)
                 return -EINVAL;
         }
 
-        return 0;
+        if (notify_flags & IB_CQ_REPORT_MISSED_EVENTS) {
+                spin_lock_irqsave(&my_cq->spinlock, spl_flags);
+                ret = ipz_qeit_is_valid(&my_cq->ipz_queue);
+                spin_unlock_irqrestore(&my_cq->spinlock, spl_flags);
+        }
+
+        return ret;
 }
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
index 8199c45768a3..57f141a36bce 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.h
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
@@ -140,6 +140,14 @@ static inline void *ipz_qeit_get_inc_valid(struct ipz_queue *queue)
         return cqe;
 }
 
+static inline int ipz_qeit_is_valid(struct ipz_queue *queue)
+{
+        struct ehca_cqe *cqe = ipz_qeit_get(queue);
+        u32 cqe_flags = cqe->cqe_flags;
+
+        return cqe_flags >> 7 == (queue->toggle_state & 1);
+}
+
 /*
  * returns and resets Queue Entry iterator
  * returns address (kv) of first Queue Entry
diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c
index ea78e6dddc90..3e9241badba0 100644
--- a/drivers/infiniband/hw/ipath/ipath_cq.c
+++ b/drivers/infiniband/hw/ipath/ipath_cq.c
@@ -204,7 +204,7 @@ static void send_complete(unsigned long data)
  *
  * Called by ib_create_cq() in the generic verbs code.
  */
-struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
+struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, int comp_vector,
                               struct ib_ucontext *context,
                               struct ib_udata *udata)
 {
@@ -243,33 +243,21 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
          * See ipath_mmap() for details.
          */
         if (udata && udata->outlen >= sizeof(__u64)) {
-                struct ipath_mmap_info *ip;
-                __u64 offset = (__u64) wc;
                 int err;
+                u32 s = sizeof *wc + sizeof(struct ib_wc) * entries;
 
-                err = ib_copy_to_udata(udata, &offset, sizeof(offset));
-                if (err) {
-                        ret = ERR_PTR(err);
+                cq->ip = ipath_create_mmap_info(dev, s, context, wc);
+                if (!cq->ip) {
+                        ret = ERR_PTR(-ENOMEM);
                         goto bail_wc;
                 }
 
-                /* Allocate info for ipath_mmap(). */
-                ip = kmalloc(sizeof(*ip), GFP_KERNEL);
-                if (!ip) {
-                        ret = ERR_PTR(-ENOMEM);
-                        goto bail_wc;
+                err = ib_copy_to_udata(udata, &cq->ip->offset,
+                                       sizeof(cq->ip->offset));
+                if (err) {
+                        ret = ERR_PTR(err);
+                        goto bail_ip;
                 }
-                cq->ip = ip;
-                ip->context = context;
-                ip->obj = wc;
-                kref_init(&ip->ref);
-                ip->mmap_cnt = 0;
-                ip->size = PAGE_ALIGN(sizeof(*wc) +
-                                      sizeof(struct ib_wc) * entries);
-                spin_lock_irq(&dev->pending_lock);
-                ip->next = dev->pending_mmaps;
-                dev->pending_mmaps = ip;
-                spin_unlock_irq(&dev->pending_lock);
         } else
                 cq->ip = NULL;
 
@@ -277,12 +265,18 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
         if (dev->n_cqs_allocated == ib_ipath_max_cqs) {
                 spin_unlock(&dev->n_cqs_lock);
                 ret = ERR_PTR(-ENOMEM);
-                goto bail_wc;
+                goto bail_ip;
         }
 
         dev->n_cqs_allocated++;
         spin_unlock(&dev->n_cqs_lock);
 
+        if (cq->ip) {
+                spin_lock_irq(&dev->pending_lock);
+                list_add(&cq->ip->pending_mmaps, &dev->pending_mmaps);
+                spin_unlock_irq(&dev->pending_lock);
+        }
+
         /*
          * ib_create_cq() will initialize cq->ibcq except for cq->ibcq.cqe.
          * The number of entries should be >= the number requested or return
@@ -301,12 +295,12 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
 
         goto done;
 
+bail_ip:
+        kfree(cq->ip);
 bail_wc:
         vfree(wc);
-
 bail_cq:
         kfree(cq);
-
 done:
         return ret;
 }
@@ -340,17 +334,18 @@ int ipath_destroy_cq(struct ib_cq *ibcq)
 /**
  * ipath_req_notify_cq - change the notification type for a completion queue
  * @ibcq: the completion queue
- * @notify: the type of notification to request
+ * @notify_flags: the type of notification to request
  *
  * Returns 0 for success.
  *
  * This may be called from interrupt context.  Also called by
  * ib_req_notify_cq() in the generic verbs code.
  */
-int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
+int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags)
 {
         struct ipath_cq *cq = to_icq(ibcq);
         unsigned long flags;
+        int ret = 0;
 
         spin_lock_irqsave(&cq->lock, flags);
         /*
@@ -358,9 +353,15 @@ int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
          * any other transitions (see C11-31 and C11-32 in ch. 11.4.2.2).
          */
         if (cq->notify != IB_CQ_NEXT_COMP)
-                cq->notify = notify;
+                cq->notify = notify_flags & IB_CQ_SOLICITED_MASK;
+
+        if ((notify_flags & IB_CQ_REPORT_MISSED_EVENTS) &&
+            cq->queue->head != cq->queue->tail)
+                ret = 1;
+
         spin_unlock_irqrestore(&cq->lock, flags);
-        return 0;
+
+        return ret;
 }
 
 /**
@@ -443,13 +444,12 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)
         if (cq->ip) {
                 struct ipath_ibdev *dev = to_idev(ibcq->device);
                 struct ipath_mmap_info *ip = cq->ip;
+                u32 s = sizeof *wc + sizeof(struct ib_wc) * cqe;
 
-                ip->obj = wc;
-                ip->size = PAGE_ALIGN(sizeof(*wc) +
-                                      sizeof(struct ib_wc) * cqe);
+                ipath_update_mmap_info(dev, ip, s, wc);
                 spin_lock_irq(&dev->pending_lock);
-                ip->next = dev->pending_mmaps;
-                dev->pending_mmaps = ip;
+                if (list_empty(&ip->pending_mmaps))
+                        list_add(&ip->pending_mmaps, &dev->pending_mmaps);
                 spin_unlock_irq(&dev->pending_lock);
         }
 
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index ed55979bfd34..036ed1ef1796 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -38,7 +38,6 @@
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/namei.h>
-#include <linux/pci.h>
 
 #include "ipath_kernel.h"
 
diff --git a/drivers/infiniband/hw/ipath/ipath_layer.c b/drivers/infiniband/hw/ipath/ipath_layer.c
index e46aa4ed2a7e..05a1d2b01d9d 100644
--- a/drivers/infiniband/hw/ipath/ipath_layer.c
+++ b/drivers/infiniband/hw/ipath/ipath_layer.c
@@ -37,7 +37,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/pci.h>
 #include <asm/byteorder.h>
 
 #include "ipath_kernel.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_mmap.c b/drivers/infiniband/hw/ipath/ipath_mmap.c
index a82157db4689..937bc3396b53 100644
--- a/drivers/infiniband/hw/ipath/ipath_mmap.c
+++ b/drivers/infiniband/hw/ipath/ipath_mmap.c
@@ -46,6 +46,11 @@ void ipath_release_mmap_info(struct kref *ref)
 {
         struct ipath_mmap_info *ip =
                 container_of(ref, struct ipath_mmap_info, ref);
+        struct ipath_ibdev *dev = to_idev(ip->context->device);
+
+        spin_lock_irq(&dev->pending_lock);
+        list_del(&ip->pending_mmaps);
+        spin_unlock_irq(&dev->pending_lock);
 
         vfree(ip->obj);
         kfree(ip);
@@ -60,14 +65,12 @@ static void ipath_vma_open(struct vm_area_struct *vma)
         struct ipath_mmap_info *ip = vma->vm_private_data;
 
         kref_get(&ip->ref);
-        ip->mmap_cnt++;
 }
 
 static void ipath_vma_close(struct vm_area_struct *vma)
 {
         struct ipath_mmap_info *ip = vma->vm_private_data;
 
-        ip->mmap_cnt--;
         kref_put(&ip->ref, ipath_release_mmap_info);
 }
 
@@ -87,7 +90,7 @@ int ipath_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
         struct ipath_ibdev *dev = to_idev(context->device);
         unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
         unsigned long size = vma->vm_end - vma->vm_start;
-        struct ipath_mmap_info *ip, **pp;
+        struct ipath_mmap_info *ip, *pp;
         int ret = -EINVAL;
 
         /*
@@ -96,15 +99,16 @@ int ipath_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
          * CQ, QP, or SRQ is soon followed by a call to mmap().
          */
         spin_lock_irq(&dev->pending_lock);
-        for (pp = &dev->pending_mmaps; (ip = *pp); pp = &ip->next) {
+        list_for_each_entry_safe(ip, pp, &dev->pending_mmaps,
+                                 pending_mmaps) {
                 /* Only the creator is allowed to mmap the object */
-                if (context != ip->context || (void *) offset != ip->obj)
+                if (context != ip->context || (__u64) offset != ip->offset)
                         continue;
                 /* Don't allow a mmap larger than the object. */
                 if (size > ip->size)
                         break;
 
-                *pp = ip->next;
+                list_del_init(&ip->pending_mmaps);
                 spin_unlock_irq(&dev->pending_lock);
 
                 ret = remap_vmalloc_range(vma, ip->obj, 0);
@@ -119,3 +123,51 @@ int ipath_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
 done:
         return ret;
 }
+
+/*
+ * Allocate information for ipath_mmap
+ */
+struct ipath_mmap_info *ipath_create_mmap_info(struct ipath_ibdev *dev,
+                                               u32 size,
+                                               struct ib_ucontext *context,
+                                               void *obj) {
+        struct ipath_mmap_info *ip;
+
+        ip = kmalloc(sizeof *ip, GFP_KERNEL);
+        if (!ip)
+                goto bail;
+
+        size = PAGE_ALIGN(size);
+
+        spin_lock_irq(&dev->mmap_offset_lock);
+        if (dev->mmap_offset == 0)
+                dev->mmap_offset = PAGE_SIZE;
+        ip->offset = dev->mmap_offset;
+        dev->mmap_offset += size;
+        spin_unlock_irq(&dev->mmap_offset_lock);
+
+        INIT_LIST_HEAD(&ip->pending_mmaps);
+        ip->size = size;
+        ip->context = context;
+        ip->obj = obj;
+        kref_init(&ip->ref);
+
+bail:
+        return ip;
+}
+
+void ipath_update_mmap_info(struct ipath_ibdev *dev,
+                            struct ipath_mmap_info *ip,
+                            u32 size, void *obj) {
+        size = PAGE_ALIGN(size);
+
+        spin_lock_irq(&dev->mmap_offset_lock);
+        if (dev->mmap_offset == 0)
+                dev->mmap_offset = PAGE_SIZE;
+        ip->offset = dev->mmap_offset;
+        dev->mmap_offset += size;
+        spin_unlock_irq(&dev->mmap_offset_lock);
+
+        ip->size = size;
+        ip->obj = obj;
+}
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index 16db9ac0b402..bfef08ecd342 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -844,34 +844,36 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
          * See ipath_mmap() for details.
          */
         if (udata && udata->outlen >= sizeof(__u64)) {
-                struct ipath_mmap_info *ip;
-                __u64 offset = (__u64) qp->r_rq.wq;
                 int err;
 
-                err = ib_copy_to_udata(udata, &offset, sizeof(offset));
-                if (err) {
-                        ret = ERR_PTR(err);
-                        goto bail_rwq;
-                }
+                if (!qp->r_rq.wq) {
+                        __u64 offset = 0;
 
-                if (qp->r_rq.wq) {
-                        /* Allocate info for ipath_mmap(). */
-                        ip = kmalloc(sizeof(*ip), GFP_KERNEL);
-                        if (!ip) {
+                        err = ib_copy_to_udata(udata, &offset,
+                                               sizeof(offset));
+                        if (err) {
+                                ret = ERR_PTR(err);
+                                goto bail_rwq;
+                        }
+                } else {
+                        u32 s = sizeof(struct ipath_rwq) +
+                                qp->r_rq.size * sz;
+
+                        qp->ip =
+                            ipath_create_mmap_info(dev, s,
+                                                   ibpd->uobject->context,
+                                                   qp->r_rq.wq);
+                        if (!qp->ip) {
                                 ret = ERR_PTR(-ENOMEM);
                                 goto bail_rwq;
                         }
-                        qp->ip = ip;
-                        ip->context = ibpd->uobject->context;
-                        ip->obj = qp->r_rq.wq;
-                        kref_init(&ip->ref);
-                        ip->mmap_cnt = 0;
-                        ip->size = PAGE_ALIGN(sizeof(struct ipath_rwq) +
-                                              qp->r_rq.size * sz);
-                        spin_lock_irq(&dev->pending_lock);
-                        ip->next = dev->pending_mmaps;
-                        dev->pending_mmaps = ip;
-                        spin_unlock_irq(&dev->pending_lock);
+
+                        err = ib_copy_to_udata(udata, &(qp->ip->offset),
+                                               sizeof(qp->ip->offset));
+                        if (err) {
+                                ret = ERR_PTR(err);
+                                goto bail_ip;
+                        }
                 }
         }
 
@@ -885,6 +887,12 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
         dev->n_qps_allocated++;
         spin_unlock(&dev->n_qps_lock);
 
+        if (qp->ip) {
+                spin_lock_irq(&dev->pending_lock);
+                list_add(&qp->ip->pending_mmaps, &dev->pending_mmaps);
+                spin_unlock_irq(&dev->pending_lock);
+        }
+
         ret = &qp->ibqp;
         goto bail;
 
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index b4b88d0b53f5..1915771fd038 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -98,13 +98,21 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
         case OP(RDMA_READ_RESPONSE_LAST):
         case OP(RDMA_READ_RESPONSE_ONLY):
         case OP(ATOMIC_ACKNOWLEDGE):
-                qp->s_ack_state = OP(ACKNOWLEDGE);
+                /*
+                 * We can increment the tail pointer now that the last
+                 * response has been sent instead of only being
+                 * constructed.
+                 */
+                if (++qp->s_tail_ack_queue > IPATH_MAX_RDMA_ATOMIC)
+                        qp->s_tail_ack_queue = 0;
                 /* FALLTHROUGH */
+        case OP(SEND_ONLY):
         case OP(ACKNOWLEDGE):
                 /* Check for no next entry in the queue. */
                 if (qp->r_head_ack_queue == qp->s_tail_ack_queue) {
                         if (qp->s_flags & IPATH_S_ACK_PENDING)
                                 goto normal;
+                        qp->s_ack_state = OP(ACKNOWLEDGE);
                         goto bail;
                 }
 
@@ -117,12 +125,8 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
                         if (len > pmtu) {
                                 len = pmtu;
                                 qp->s_ack_state = OP(RDMA_READ_RESPONSE_FIRST);
-                        } else {
+                        } else
                                 qp->s_ack_state = OP(RDMA_READ_RESPONSE_ONLY);
-                                if (++qp->s_tail_ack_queue >
-                                    IPATH_MAX_RDMA_ATOMIC)
-                                        qp->s_tail_ack_queue = 0;
-                        }
                         ohdr->u.aeth = ipath_compute_aeth(qp);
                         hwords++;
                         qp->s_ack_rdma_psn = e->psn;
@@ -139,8 +143,6 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
                                 cpu_to_be32(e->atomic_data);
                         hwords += sizeof(ohdr->u.at) / sizeof(u32);
                         bth2 = e->psn;
-                        if (++qp->s_tail_ack_queue > IPATH_MAX_RDMA_ATOMIC)
-                                qp->s_tail_ack_queue = 0;
                 }
                 bth0 = qp->s_ack_state << 24;
                 break;
@@ -156,8 +158,6 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
                         ohdr->u.aeth = ipath_compute_aeth(qp);
                         hwords++;
                         qp->s_ack_state = OP(RDMA_READ_RESPONSE_LAST);
-                        if (++qp->s_tail_ack_queue > IPATH_MAX_RDMA_ATOMIC)
-                                qp->s_tail_ack_queue = 0;
                 }
                 bth0 = qp->s_ack_state << 24;
                 bth2 = qp->s_ack_rdma_psn++ & IPATH_PSN_MASK;
@@ -171,7 +171,7 @@ static int ipath_make_rc_ack(struct ipath_qp *qp,
                  * the ACK before setting s_ack_state to ACKNOWLEDGE
                  * (see above).
                  */
-                qp->s_ack_state = OP(ATOMIC_ACKNOWLEDGE);
+                qp->s_ack_state = OP(SEND_ONLY);
                 qp->s_flags &= ~IPATH_S_ACK_PENDING;
                 qp->s_cur_sge = NULL;
                 if (qp->s_nak_state)
@@ -223,23 +223,18 @@ int ipath_make_rc_req(struct ipath_qp *qp,
         /* Sending responses has higher priority over sending requests. */
         if ((qp->r_head_ack_queue != qp->s_tail_ack_queue ||
              (qp->s_flags & IPATH_S_ACK_PENDING) ||
-             qp->s_ack_state != IB_OPCODE_RC_ACKNOWLEDGE) &&
+             qp->s_ack_state != OP(ACKNOWLEDGE)) &&
             ipath_make_rc_ack(qp, ohdr, pmtu, bth0p, bth2p))
                 goto done;
 
         if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK) ||
-            qp->s_rnr_timeout)
+            qp->s_rnr_timeout || qp->s_wait_credit)
                 goto bail;
 
         /* Limit the number of packets sent without an ACK. */
         if (ipath_cmp24(qp->s_psn, qp->s_last_psn + IPATH_PSN_CREDIT) > 0) {
                 qp->s_wait_credit = 1;
                 dev->n_rc_stalls++;
-                spin_lock(&dev->pending_lock);
-                if (list_empty(&qp->timerwait))
-                        list_add_tail(&qp->timerwait,
-                                      &dev->pending[dev->pending_index]);
-                spin_unlock(&dev->pending_lock);
                 goto bail;
         }
 
@@ -587,9 +582,12 @@ static void send_rc_ack(struct ipath_qp *qp)
         u32 hwords;
         struct ipath_ib_header hdr;
         struct ipath_other_headers *ohdr;
+        unsigned long flags;
 
         /* Don't send ACK or NAK if a RDMA read or atomic is pending. */
-        if (qp->r_head_ack_queue != qp->s_tail_ack_queue)
+        if (qp->r_head_ack_queue != qp->s_tail_ack_queue ||
+            (qp->s_flags & IPATH_S_ACK_PENDING) ||
+            qp->s_ack_state != OP(ACKNOWLEDGE))
                 goto queue_ack;
 
         /* Construct the header. */
@@ -640,11 +638,11 @@ static void send_rc_ack(struct ipath_qp *qp)
         dev->n_rc_qacks++;
 
 queue_ack:
-        spin_lock_irq(&qp->s_lock);
+        spin_lock_irqsave(&qp->s_lock, flags);
         qp->s_flags |= IPATH_S_ACK_PENDING;
         qp->s_nak_state = qp->r_nak_state;
         qp->s_ack_psn = qp->r_ack_psn;
-        spin_unlock_irq(&qp->s_lock);
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 
         /* Call ipath_do_rc_send() in another thread. */
         tasklet_hi_schedule(&qp->s_task);
@@ -1261,6 +1259,7 @@ ack_err:
         wc.dlid_path_bits = 0;
         wc.port_num = 0;
         ipath_sqerror_qp(qp, &wc);
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 bail:
         return;
 }
@@ -1294,6 +1293,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
         struct ipath_ack_entry *e;
         u8 i, prev;
         int old_req;
+        unsigned long flags;
 
         if (diff > 0) {
                 /*
@@ -1327,7 +1327,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
         psn &= IPATH_PSN_MASK;
         e = NULL;
         old_req = 1;
-        spin_lock_irq(&qp->s_lock);
+        spin_lock_irqsave(&qp->s_lock, flags);
         for (i = qp->r_head_ack_queue; ; i = prev) {
                 if (i == qp->s_tail_ack_queue)
                         old_req = 0;
@@ -1425,7 +1425,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
                  * after all the previous RDMA reads and atomics.
                  */
                 if (i == qp->r_head_ack_queue) {
-                        spin_unlock_irq(&qp->s_lock);
+                        spin_unlock_irqrestore(&qp->s_lock, flags);
                         qp->r_nak_state = 0;
                         qp->r_ack_psn = qp->r_psn - 1;
                         goto send_ack;
@@ -1439,11 +1439,10 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
                 break;
         }
         qp->r_nak_state = 0;
-        spin_unlock_irq(&qp->s_lock);
         tasklet_hi_schedule(&qp->s_task);
 
 unlock_done:
-        spin_unlock_irq(&qp->s_lock);
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 done:
         return 1;
 
@@ -1453,10 +1452,12 @@ send_ack:
 
 static void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)
 {
-        spin_lock_irq(&qp->s_lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&qp->s_lock, flags);
         qp->state = IB_QPS_ERR;
         ipath_error_qp(qp, err);
-        spin_unlock_irq(&qp->s_lock);
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 }
 
 /**
diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c
index 94033503400c..03acae66ba81 100644
--- a/drivers/infiniband/hw/ipath/ipath_srq.c
+++ b/drivers/infiniband/hw/ipath/ipath_srq.c
@@ -139,33 +139,24 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd,
          * See ipath_mmap() for details.
          */
         if (udata && udata->outlen >= sizeof(__u64)) {
-                struct ipath_mmap_info *ip;
-                __u64 offset = (__u64) srq->rq.wq;
                 int err;
+                u32 s = sizeof(struct ipath_rwq) + srq->rq.size * sz;
 
-                err = ib_copy_to_udata(udata, &offset, sizeof(offset));
-                if (err) {
-                        ret = ERR_PTR(err);
+                srq->ip =
+                    ipath_create_mmap_info(dev, s,
+                                           ibpd->uobject->context,
+                                           srq->rq.wq);
+                if (!srq->ip) {
+                        ret = ERR_PTR(-ENOMEM);
                         goto bail_wq;
                 }
 
-                /* Allocate info for ipath_mmap(). */
-                ip = kmalloc(sizeof(*ip), GFP_KERNEL);
-                if (!ip) {
-                        ret = ERR_PTR(-ENOMEM);
-                        goto bail_wq;
+                err = ib_copy_to_udata(udata, &srq->ip->offset,
+                                       sizeof(srq->ip->offset));
+                if (err) {
+                        ret = ERR_PTR(err);
+                        goto bail_ip;
                 }
-                srq->ip = ip;
-                ip->context = ibpd->uobject->context;
-                ip->obj = srq->rq.wq;
-                kref_init(&ip->ref);
-                ip->mmap_cnt = 0;
-                ip->size = PAGE_ALIGN(sizeof(struct ipath_rwq) +
-                                      srq->rq.size * sz);
-                spin_lock_irq(&dev->pending_lock);
-                ip->next = dev->pending_mmaps;
-                dev->pending_mmaps = ip;
-                spin_unlock_irq(&dev->pending_lock);
         } else
                 srq->ip = NULL;
 
@@ -181,21 +172,27 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd,
         if (dev->n_srqs_allocated == ib_ipath_max_srqs) {
                 spin_unlock(&dev->n_srqs_lock);
                 ret = ERR_PTR(-ENOMEM);
-                goto bail_wq;
+                goto bail_ip;
         }
 
         dev->n_srqs_allocated++;
         spin_unlock(&dev->n_srqs_lock);
 
+        if (srq->ip) {
+                spin_lock_irq(&dev->pending_lock);
+                list_add(&srq->ip->pending_mmaps, &dev->pending_mmaps);
+                spin_unlock_irq(&dev->pending_lock);
+        }
+
         ret = &srq->ibsrq;
         goto done;
 
+bail_ip:
+        kfree(srq->ip);
 bail_wq:
         vfree(srq->rq.wq);
-
 bail_srq:
         kfree(srq);
-
 done:
         return ret;
 }
@@ -312,13 +309,13 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                 if (srq->ip) {
                         struct ipath_mmap_info *ip = srq->ip;
                         struct ipath_ibdev *dev = to_idev(srq->ibsrq.device);
+                        u32 s = sizeof(struct ipath_rwq) + size * sz;
 
-                        ip->obj = wq;
-                        ip->size = PAGE_ALIGN(sizeof(struct ipath_rwq) +
-                                              size * sz);
+                        ipath_update_mmap_info(dev, ip, s, wq);
                         spin_lock_irq(&dev->pending_lock);
-                        ip->next = dev->pending_mmaps;
-                        dev->pending_mmaps = ip;
+                        if (list_empty(&ip->pending_mmaps))
+                                list_add(&ip->pending_mmaps,
+                                         &dev->pending_mmaps);
                         spin_unlock_irq(&dev->pending_lock);
                 }
         } else if (attr_mask & IB_SRQ_LIMIT) {
diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/infiniband/hw/ipath/ipath_stats.c
index 9307f7187ca5..d8b5e4cefe25 100644
--- a/drivers/infiniband/hw/ipath/ipath_stats.c
+++ b/drivers/infiniband/hw/ipath/ipath_stats.c
@@ -31,8 +31,6 @@
  * SOFTWARE.
  */
 
-#include <linux/pci.h>
-
 #include "ipath_kernel.h"
 
 struct infinipath_stats ipath_stats;
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index ffa6318ad0cc..4dc398d5e011 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -32,7 +32,6 @@
  */
 
 #include <linux/ctype.h>
-#include <linux/pci.h>
 
 #include "ipath_kernel.h"
 #include "ipath_common.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 18c6df2052c2..12933e77c7e9 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1476,7 +1476,10 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
                 ret = -ENOMEM;
                 goto err_lk;
         }
+        INIT_LIST_HEAD(&idev->pending_mmaps);
         spin_lock_init(&idev->pending_lock);
+        idev->mmap_offset = PAGE_SIZE;
+        spin_lock_init(&idev->mmap_offset_lock);
         INIT_LIST_HEAD(&idev->pending[0]);
         INIT_LIST_HEAD(&idev->pending[1]);
         INIT_LIST_HEAD(&idev->pending[2]);
@@ -1558,6 +1561,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
                 (1ull << IB_USER_VERBS_CMD_POST_SRQ_RECV);
         dev->node_type = RDMA_NODE_IB_CA;
         dev->phys_port_cnt = 1;
+        dev->num_comp_vectors = 1;
         dev->dma_device = &dd->pcidev->dev;
         dev->query_device = ipath_query_device;
         dev->modify_device = ipath_modify_device;
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 7c4929f1cb5b..7064fc222727 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -173,12 +173,12 @@ struct ipath_ah {
  * this as its vm_private_data.
  */
 struct ipath_mmap_info {
-        struct ipath_mmap_info *next;
+        struct list_head pending_mmaps;
         struct ib_ucontext *context;
         void *obj;
+        __u64 offset;
         struct kref ref;
         unsigned size;
-        unsigned mmap_cnt;
 };
 
 /*
@@ -422,7 +422,7 @@ struct ipath_qp {
 #define IPATH_S_RDMAR_PENDING   0x04
 #define IPATH_S_ACK_PENDING     0x08
 
-#define IPATH_PSN_CREDIT        2048
+#define IPATH_PSN_CREDIT        512
 
 /*
  * Since struct ipath_swqe is not a fixed size, we can't simply index into
@@ -485,9 +485,10 @@ struct ipath_opcode_stats {
 
 struct ipath_ibdev {
         struct ib_device ibdev;
-        struct list_head dev_list;
         struct ipath_devdata *dd;
-        struct ipath_mmap_info *pending_mmaps;
+        struct list_head pending_mmaps;
+        spinlock_t mmap_offset_lock;
+        u32 mmap_offset;
         int ib_unit;            /* This is the device number */
         u16 sm_lid;             /* in host order */
         u8 sm_sl;
@@ -734,13 +735,13 @@ int ipath_destroy_srq(struct ib_srq *ibsrq);
 
 int ipath_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry);
 
-struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
+struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, int comp_vector,
                               struct ib_ucontext *context,
                               struct ib_udata *udata);
 
 int ipath_destroy_cq(struct ib_cq *ibcq);
 
-int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify notify);
+int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags);
 
 int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata);
 
@@ -768,6 +769,15 @@ int ipath_dealloc_fmr(struct ib_fmr *ibfmr);
 
 void ipath_release_mmap_info(struct kref *ref);
 
+struct ipath_mmap_info *ipath_create_mmap_info(struct ipath_ibdev *dev,
+                                               u32 size,
+                                               struct ib_ucontext *context,
+                                               void *obj);
+
+void ipath_update_mmap_info(struct ipath_ibdev *dev,
+                            struct ipath_mmap_info *ip,
+                            u32 size, void *obj);
+
 int ipath_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 
 void ipath_no_bufs_available(struct ipath_qp *qp, struct ipath_ibdev *dev);
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index efd79ef109a6..cf0868f6e965 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -726,11 +726,12 @@ repoll:
         return err == 0 || err == -EAGAIN ? npolled : err;
 }
 
-int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify)
+int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags)
 {
         __be32 doorbell[2];
 
-        doorbell[0] = cpu_to_be32((notify == IB_CQ_SOLICITED ?
+        doorbell[0] = cpu_to_be32(((flags & IB_CQ_SOLICITED_MASK) ==
+                                   IB_CQ_SOLICITED ?
                                    MTHCA_TAVOR_CQ_DB_REQ_NOT_SOL :
                                    MTHCA_TAVOR_CQ_DB_REQ_NOT)      |
                                   to_mcq(cq)->cqn);
@@ -743,7 +744,7 @@ int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify)
         return 0;
 }
 
-int mthca_arbel_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
+int mthca_arbel_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
 {
         struct mthca_cq *cq = to_mcq(ibcq);
         __be32 doorbell[2];
@@ -755,7 +756,8 @@ int mthca_arbel_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
 
         doorbell[0] = ci;
         doorbell[1] = cpu_to_be32((cq->cqn << 8) | (2 << 5) | (sn << 3) |
-                                  (notify == IB_CQ_SOLICITED ? 1 : 2));
+                                  ((flags & IB_CQ_SOLICITED_MASK) ==
+                                   IB_CQ_SOLICITED ? 1 : 2));
 
         mthca_write_db_rec(doorbell, cq->arm_db);
 
@@ -766,7 +768,7 @@ int mthca_arbel_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
         wmb();
 
         doorbell[0] = cpu_to_be32((sn << 28)                       |
-                                  (notify == IB_CQ_SOLICITED ?
+                                  ((flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED ?
                                    MTHCA_ARBEL_CQ_DB_REQ_NOT_SOL :
                                    MTHCA_ARBEL_CQ_DB_REQ_NOT)      |
                                   cq->cqn);
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index b7e42efaf43d..9bae3cc60603 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -495,8 +495,8 @@ void mthca_unmap_eq_icm(struct mthca_dev *dev);
 
 int mthca_poll_cq(struct ib_cq *ibcq, int num_entries,
                   struct ib_wc *entry);
-int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify);
-int mthca_arbel_arm_cq(struct ib_cq *cq, enum ib_cq_notify notify);
+int mthca_tavor_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
+int mthca_arbel_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
 int mthca_init_cq(struct mthca_dev *dev, int nent,
                   struct mthca_ucontext *ctx, u32 pdn,
                   struct mthca_cq *cq);
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h
index 594144145f45..a1ab06847b75 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
@@ -38,7 +38,6 @@
 #define MTHCA_MEMFREE_H
 
 #include <linux/list.h>
-#include <linux/pci.h>
 #include <linux/mutex.h>
 
 #define MTHCA_ICM_CHUNK_LEN \
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 47e6fd46d9c2..1c05486c3c68 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -663,6 +663,7 @@ static int mthca_destroy_qp(struct ib_qp *qp)
 }
 
 static struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
+                                     int comp_vector,
                                      struct ib_ucontext *context,
                                      struct ib_udata *udata)
 {
@@ -1292,6 +1293,7 @@ int mthca_register_device(struct mthca_dev *dev)
                 (1ull << IB_USER_VERBS_CMD_DETACH_MCAST);
         dev->ib_dev.node_type            = RDMA_NODE_IB_CA;
         dev->ib_dev.phys_port_cnt        = dev->limits.num_ports;
+        dev->ib_dev.num_comp_vectors     = 1;
         dev->ib_dev.dma_device           = &dev->pdev->dev;
         dev->ib_dev.query_device         = mthca_query_device;
         dev->ib_dev.query_port           = mthca_query_port;
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 8fe6fee7a97a..fee60c852d14 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -701,6 +701,19 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
                 qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_PRIMARY_ADDR_PATH);
         }
 
+        if (ibqp->qp_type == IB_QPT_RC &&
+            cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {
+                u8 sched_queue = ibqp->uobject ? 0x2 : 0x1;
+
+                if (mthca_is_memfree(dev))
+                        qp_context->rlkey_arbel_sched_queue |= sched_queue;
+                else
+                        qp_context->tavor_sched_queue |= cpu_to_be32(sched_queue);
+
+                qp_param->opt_param_mask |=
+                        cpu_to_be32(MTHCA_QP_OPTPAR_SCHED_QUEUE);
+        }
+
         if (attr_mask & IB_QP_TIMEOUT) {
                 qp_context->pri_path.ackto = attr->timeout << 3;
                 qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_ACK_TIMEOUT);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index fd558267d1cb..87310eeb6df0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -41,7 +41,6 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
-#include <linux/pci.h>
 #include <linux/kref.h>
 #include <linux/if_infiniband.h>
 #include <linux/mutex.h>
@@ -311,6 +310,7 @@ extern struct workqueue_struct *ipoib_workqueue;
 
 /* functions */
 
+int ipoib_poll(struct net_device *dev, int *budget);
 void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr);
 
 struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 0c4e59b906cd..785bc8505f2a 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -370,7 +370,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
 
         if (!likely(wr_id & IPOIB_CM_RX_UPDATE_MASK)) {
                 p = wc->qp->qp_context;
-                if (time_after_eq(jiffies, p->jiffies + IPOIB_CM_RX_UPDATE_TIME)) {
+                if (p && time_after_eq(jiffies, p->jiffies + IPOIB_CM_RX_UPDATE_TIME)) {
                         spin_lock_irqsave(&priv->lock, flags);
                         p->jiffies = jiffies;
                         /* Move this entry to list head, but do
@@ -416,7 +416,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb->dev = dev;
         /* XXX get correct PACKET_ type here */
         skb->pkt_type = PACKET_HOST;
-        netif_rx_ni(skb);
+        netif_receive_skb(skb);
 
 repost:
         if (unlikely(ipoib_cm_post_receive(dev, wr_id)))
@@ -592,7 +592,9 @@ int ipoib_cm_dev_open(struct net_device *dev)
         priv->cm.id = ib_create_cm_id(priv->ca, ipoib_cm_rx_handler, dev);
         if (IS_ERR(priv->cm.id)) {
                 printk(KERN_WARNING "%s: failed to create CM ID\n", priv->ca->name);
-                return IS_ERR(priv->cm.id);
+                ret = PTR_ERR(priv->cm.id);
+                priv->cm.id = NULL;
+                return ret;
         }
 
         ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num),
@@ -601,6 +603,7 @@ int ipoib_cm_dev_open(struct net_device *dev)
                 printk(KERN_WARNING "%s: failed to listen on ID 0x%llx\n", priv->ca->name,
                        IPOIB_CM_IETF_ID | priv->qp->qp_num);
                 ib_destroy_cm_id(priv->cm.id);
+                priv->cm.id = NULL;
                 return ret;
         }
         return 0;
@@ -611,10 +614,11 @@ void ipoib_cm_dev_stop(struct net_device *dev)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_cm_rx *p;
 
-        if (!IPOIB_CM_SUPPORTED(dev->dev_addr))
+        if (!IPOIB_CM_SUPPORTED(dev->dev_addr) || !priv->cm.id)
                 return;
 
         ib_destroy_cm_id(priv->cm.id);
+        priv->cm.id = NULL;
         spin_lock_irq(&priv->lock);
         while (!list_empty(&priv->cm.passive_ids)) {
                 p = list_entry(priv->cm.passive_ids.next, typeof(*p), list);
@@ -789,7 +793,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
         }
 
         p->cq = ib_create_cq(priv->ca, ipoib_cm_tx_completion, NULL, p,
-                             ipoib_sendq_size + 1);
+                             ipoib_sendq_size + 1, 0);
         if (IS_ERR(p->cq)) {
                 ret = PTR_ERR(p->cq);
                 ipoib_warn(priv, "failed to allocate tx cq: %d\n", ret);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 1bdb9101911a..68d72c6f7ffb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -226,7 +226,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                 skb->dev = dev;
                 /* XXX get correct PACKET_ type here */
                 skb->pkt_type = PACKET_HOST;
-                netif_rx_ni(skb);
+                netif_receive_skb(skb);
         } else {
                 ipoib_dbg_data(priv, "dropping loopback packet\n");
                 dev_kfree_skb_any(skb);
@@ -280,28 +280,63 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
                            wc->status, wr_id, wc->vendor_err);
 }
 
-static void ipoib_ib_handle_wc(struct net_device *dev, struct ib_wc *wc)
+int ipoib_poll(struct net_device *dev, int *budget)
 {
-        if (wc->wr_id & IPOIB_CM_OP_SRQ)
-                ipoib_cm_handle_rx_wc(dev, wc);
-        else if (wc->wr_id & IPOIB_OP_RECV)
-                ipoib_ib_handle_rx_wc(dev, wc);
-        else
-                ipoib_ib_handle_tx_wc(dev, wc);
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        int max = min(*budget, dev->quota);
+        int done;
+        int t;
+        int empty;
+        int n, i;
+
+        done  = 0;
+        empty = 0;
+
+        while (max) {
+                t = min(IPOIB_NUM_WC, max);
+                n = ib_poll_cq(priv->cq, t, priv->ibwc);
+
+                for (i = 0; i < n; ++i) {
+                        struct ib_wc *wc = priv->ibwc + i;
+
+                        if (wc->wr_id & IPOIB_CM_OP_SRQ) {
+                                ++done;
+                                --max;
+                                ipoib_cm_handle_rx_wc(dev, wc);
+                        } else if (wc->wr_id & IPOIB_OP_RECV) {
+                                ++done;
+                                --max;
+                                ipoib_ib_handle_rx_wc(dev, wc);
+                        } else
+                                ipoib_ib_handle_tx_wc(dev, wc);
+                }
+
+                if (n != t) {
+                        empty = 1;
+                        break;
+                }
+        }
+
+        dev->quota -= done;
+        *budget    -= done;
+
+        if (empty) {
+                netif_rx_complete(dev);
+                if (unlikely(ib_req_notify_cq(priv->cq,
+                                              IB_CQ_NEXT_COMP |
+                                              IB_CQ_REPORT_MISSED_EVENTS)) &&
+                    netif_rx_reschedule(dev, 0))
+                        return 1;
+
+                return 0;
+        }
+
+        return 1;
 }
 
 void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
 {
-        struct net_device *dev = (struct net_device *) dev_ptr;
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        int n, i;
-
-        ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);
-        do {
-                n = ib_poll_cq(cq, IPOIB_NUM_WC, priv->ibwc);
-                for (i = 0; i < n; ++i)
-                        ipoib_ib_handle_wc(dev, priv->ibwc + i);
-        } while (n == IPOIB_NUM_WC);
+        netif_rx_schedule(dev_ptr);
 }
 
 static inline int post_send(struct ipoib_dev_priv *priv,
@@ -514,9 +549,10 @@ int ipoib_ib_dev_stop(struct net_device *dev)
         struct ib_qp_attr qp_attr;
         unsigned long begin;
         struct ipoib_tx_buf *tx_req;
-        int i;
+        int i, n;
 
         clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
+        netif_poll_disable(dev);
 
         ipoib_cm_dev_stop(dev);
 
@@ -568,6 +604,18 @@ int ipoib_ib_dev_stop(struct net_device *dev)
                         goto timeout;
                 }
 
+                do {
+                        n = ib_poll_cq(priv->cq, IPOIB_NUM_WC, priv->ibwc);
+                        for (i = 0; i < n; ++i) {
+                                if (priv->ibwc[i].wr_id & IPOIB_CM_OP_SRQ)
+                                        ipoib_cm_handle_rx_wc(dev, priv->ibwc + i);
+                                else if (priv->ibwc[i].wr_id & IPOIB_OP_RECV)
+                                        ipoib_ib_handle_rx_wc(dev, priv->ibwc + i);
+                                else
+                                        ipoib_ib_handle_tx_wc(dev, priv->ibwc + i);
+                        }
+                } while (n == IPOIB_NUM_WC);
+
                 msleep(1);
         }
 
@@ -596,6 +644,9 @@ timeout:
                 msleep(1);
         }
 
+        netif_poll_enable(dev);
+        ib_req_notify_cq(priv->cq, IB_CQ_NEXT_COMP);
+
         return 0;
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index b4c380c5a3ba..0a428f2b05c7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -948,6 +948,8 @@ static void ipoib_setup(struct net_device *dev)
         dev->hard_header         = ipoib_hard_header;
         dev->set_multicast_list  = ipoib_set_mcast_list;
         dev->neigh_setup         = ipoib_neigh_setup_dev;
+        dev->poll                = ipoib_poll;
+        dev->weight              = 100;
 
         dev->watchdog_timeo      = HZ;
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 7f3ec205e35f..5c3c6a43a52b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -187,7 +187,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
         if (!ret)
                 size += ipoib_recvq_size;
 
-        priv->cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size);
+        priv->cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size, 0);
         if (IS_ERR(priv->cq)) {
                 printk(KERN_WARNING "%s: failed to create CQ\n", ca->name);
                 goto out_free_mr;
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 278fcbccc2d9..3651072f6c1f 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -201,7 +201,7 @@ static int iser_post_receive_control(struct iscsi_conn *conn)
          * what's common for both schemes is that the connection is not started
          */
         if (conn->c_stage != ISCSI_CONN_STARTED)
-                rx_data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
+                rx_data_size = ISCSI_DEF_MAX_RECV_SEG_LEN;
         else /* FIXME till user space sets conn->max_recv_dlength correctly */
                 rx_data_size = 128;
 
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 1fc967464a28..89d6008bb673 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -76,7 +76,7 @@ static int iser_create_device_ib_res(struct iser_device *device)
                                   iser_cq_callback,
                                   iser_cq_event_callback,
                                   (void *)device,
-                                  ISER_MAX_CQ_LEN);
+                                  ISER_MAX_CQ_LEN, 0);
         if (IS_ERR(device->cq))
                 goto cq_err;
 
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 5e8ac577f0ad..39bf057fbc43 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -197,7 +197,7 @@ static int srp_create_target_ib(struct srp_target_port *target)
                 return -ENOMEM;
 
         target->cq = ib_create_cq(target->srp_host->dev->dev, srp_completion,
-                                  NULL, target, SRP_CQ_SIZE);
+                                  NULL, target, SRP_CQ_SIZE, 0);
         if (IS_ERR(target->cq)) {
                 ret = PTR_ERR(target->cq);
                 goto out;
@@ -1468,6 +1468,25 @@ static ssize_t show_dgid(struct class_device *cdev, char *buf)
                        be16_to_cpu(((__be16 *) target->path.dgid.raw)[7]));
 }
 
+static ssize_t show_orig_dgid(struct class_device *cdev, char *buf)
+{
+        struct srp_target_port *target = host_to_target(class_to_shost(cdev));
+
+        if (target->state == SRP_TARGET_DEAD ||
+            target->state == SRP_TARGET_REMOVED)
+                return -ENODEV;
+
+        return sprintf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                       be16_to_cpu(target->orig_dgid[0]),
+                       be16_to_cpu(target->orig_dgid[1]),
+                       be16_to_cpu(target->orig_dgid[2]),
+                       be16_to_cpu(target->orig_dgid[3]),
+                       be16_to_cpu(target->orig_dgid[4]),
+                       be16_to_cpu(target->orig_dgid[5]),
+                       be16_to_cpu(target->orig_dgid[6]),
+                       be16_to_cpu(target->orig_dgid[7]));
+}
+
 static ssize_t show_zero_req_lim(struct class_device *cdev, char *buf)
 {
         struct srp_target_port *target = host_to_target(class_to_shost(cdev));
@@ -1498,6 +1517,7 @@ static CLASS_DEVICE_ATTR(ioc_guid,	  S_IRUGO, show_ioc_guid,	 NULL);
 static CLASS_DEVICE_ATTR(service_id,      S_IRUGO, show_service_id,      NULL);
 static CLASS_DEVICE_ATTR(pkey,            S_IRUGO, show_pkey,            NULL);
 static CLASS_DEVICE_ATTR(dgid,            S_IRUGO, show_dgid,            NULL);
+static CLASS_DEVICE_ATTR(orig_dgid,       S_IRUGO, show_orig_dgid,       NULL);
 static CLASS_DEVICE_ATTR(zero_req_lim,    S_IRUGO, show_zero_req_lim,    NULL);
 static CLASS_DEVICE_ATTR(local_ib_port,   S_IRUGO, show_local_ib_port,   NULL);
 static CLASS_DEVICE_ATTR(local_ib_device, S_IRUGO, show_local_ib_device, NULL);
@@ -1508,6 +1528,7 @@ static struct class_device_attribute *srp_host_attrs[] = {
         &class_device_attr_service_id,
         &class_device_attr_pkey,
         &class_device_attr_dgid,
+        &class_device_attr_orig_dgid,
         &class_device_attr_zero_req_lim,
         &class_device_attr_local_ib_port,
         &class_device_attr_local_ib_device,
@@ -1516,7 +1537,8 @@ static struct class_device_attribute *srp_host_attrs[] = {
 
 static struct scsi_host_template srp_template = {
         .module                         = THIS_MODULE,
-        .name                           = DRV_NAME,
+        .name                           = "InfiniBand SRP initiator",
+        .proc_name                      = DRV_NAME,
         .info                           = srp_target_info,
         .queuecommand                   = srp_queuecommand,
         .eh_abort_handler               = srp_abort,
@@ -1662,6 +1684,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                                 target->path.dgid.raw[i] = simple_strtoul(dgid, NULL, 16);
                         }
                         kfree(p);
+                        memcpy(target->orig_dgid, target->path.dgid.raw, 16);
                         break;
 
                 case SRP_OPT_PKEY:
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index 2f3319c719a5..1d53c7bc368f 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -129,6 +129,7 @@ struct srp_target_port {
         unsigned int            scsi_id;
 
         struct ib_sa_path_rec   path;
+        __be16                  orig_dgid[8];
         struct ib_sa_query     *path_query;
         int                     path_query_id;
 
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index da575deb3c7a..b4cd10653c4f 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)      += joydev.o
 obj-$(CONFIG_INPUT_EVDEV)       += evdev.o
 obj-$(CONFIG_INPUT_TSDEV)       += tsdev.o
-obj-$(CONFIG_INPUT_POWER)       += power.o
 obj-$(CONFIG_INPUT_EVBUG)       += evbug.o
 
 obj-$(CONFIG_INPUT_KEYBOARD)    += keyboard/
diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c
index 5a9653c3128a..c21f2f127234 100644
--- a/drivers/input/evbug.c
+++ b/drivers/input/evbug.c
@@ -38,31 +38,43 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Input driver event debug module");
 MODULE_LICENSE("GPL");
 
-static char evbug_name[] = "evbug";
-
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
         printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n",
                 handle->dev->phys, type, code, value);
 }
 
-static struct input_handle *evbug_connect(struct input_handler *handler, struct input_dev *dev,
-                                          const struct input_device_id *id)
+static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
+                         const struct input_device_id *id)
 {
         struct input_handle *handle;
+        int error;
 
-        if (!(handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL)))
-                return NULL;
+        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
+        if (!handle)
+                return -ENOMEM;
 
         handle->dev = dev;
         handle->handler = handler;
-        handle->name = evbug_name;
+        handle->name = "evbug";
+
+        error = input_register_handle(handle);
+        if (error)
+                goto err_free_handle;
 
-        input_open_device(handle);
+        error = input_open_device(handle);
+        if (error)
+                goto err_unregister_handle;
 
         printk(KERN_DEBUG "evbug.c: Connected device: \"%s\", %s\n", dev->name, dev->phys);
 
-        return handle;
+        return 0;
+
+ err_unregister_handle:
+        input_unregister_handle(handle);
+ err_free_handle:
+        kfree(handle);
+        return error;
 }
 
 static void evbug_disconnect(struct input_handle *handle)
@@ -70,7 +82,7 @@ static void evbug_disconnect(struct input_handle *handle)
         printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n", handle->dev->phys);
 
         input_close_device(handle);
-
+        input_unregister_handle(handle);
         kfree(handle);
 }
 
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 6439f378f6cc..1f6fcec0c6fc 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -29,11 +29,11 @@ struct evdev {
         char name[16];
         struct input_handle handle;
         wait_queue_head_t wait;
-        struct evdev_list *grab;
-        struct list_head list;
+        struct evdev_client *grab;
+        struct list_head client_list;
 };
 
-struct evdev_list {
+struct evdev_client {
         struct input_event buffer[EVDEV_BUFFER_SIZE];
         int head;
         int tail;
@@ -47,28 +47,28 @@ static struct evdev *evdev_table[EVDEV_MINORS];
 static void evdev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
         struct evdev *evdev = handle->private;
-        struct evdev_list *list;
+        struct evdev_client *client;
 
         if (evdev->grab) {
-                list = evdev->grab;
+                client = evdev->grab;
 
-                do_gettimeofday(&list->buffer[list->head].time);
-                list->buffer[list->head].type = type;
-                list->buffer[list->head].code = code;
-                list->buffer[list->head].value = value;
-                list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
+                do_gettimeofday(&client->buffer[client->head].time);
+                client->buffer[client->head].type = type;
+                client->buffer[client->head].code = code;
+                client->buffer[client->head].value = value;
+                client->head = (client->head + 1) & (EVDEV_BUFFER_SIZE - 1);
 
-                kill_fasync(&list->fasync, SIGIO, POLL_IN);
+                kill_fasync(&client->fasync, SIGIO, POLL_IN);
         } else
-                list_for_each_entry(list, &evdev->list, node) {
+                list_for_each_entry(client, &evdev->client_list, node) {
 
-                        do_gettimeofday(&list->buffer[list->head].time);
-                        list->buffer[list->head].type = type;
-                        list->buffer[list->head].code = code;
-                        list->buffer[list->head].value = value;
-                        list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
+                        do_gettimeofday(&client->buffer[client->head].time);
+                        client->buffer[client->head].type = type;
+                        client->buffer[client->head].code = code;
+                        client->buffer[client->head].value = value;
+                        client->head = (client->head + 1) & (EVDEV_BUFFER_SIZE - 1);
 
-                        kill_fasync(&list->fasync, SIGIO, POLL_IN);
+                        kill_fasync(&client->fasync, SIGIO, POLL_IN);
                 }
 
         wake_up_interruptible(&evdev->wait);
@@ -76,22 +76,23 @@ static void evdev_event(struct input_handle *handle, unsigned int type, unsigned
 
 static int evdev_fasync(int fd, struct file *file, int on)
 {
+        struct evdev_client *client = file->private_data;
         int retval;
-        struct evdev_list *list = file->private_data;
 
-        retval = fasync_helper(fd, file, on, &list->fasync);
+        retval = fasync_helper(fd, file, on, &client->fasync);
 
         return retval < 0 ? retval : 0;
 }
 
 static int evdev_flush(struct file *file, fl_owner_t id)
 {
-        struct evdev_list *list = file->private_data;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
 
-        if (!list->evdev->exist)
+        if (!evdev->exist)
                 return -ENODEV;
 
-        return input_flush_device(&list->evdev->handle, file);
+        return input_flush_device(&evdev->handle, file);
 }
 
 static void evdev_free(struct evdev *evdev)
@@ -100,48 +101,62 @@ static void evdev_free(struct evdev *evdev)
         kfree(evdev);
 }
 
-static int evdev_release(struct inode * inode, struct file * file)
+static int evdev_release(struct inode *inode, struct file *file)
 {
-        struct evdev_list *list = file->private_data;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
 
-        if (list->evdev->grab == list) {
-                input_release_device(&list->evdev->handle);
-                list->evdev->grab = NULL;
+        if (evdev->grab == client) {
+                input_release_device(&evdev->handle);
+                evdev->grab = NULL;
         }
 
         evdev_fasync(-1, file, 0);
-        list_del(&list->node);
+        list_del(&client->node);
+        kfree(client);
 
-        if (!--list->evdev->open) {
-                if (list->evdev->exist)
-                        input_close_device(&list->evdev->handle);
+        if (!--evdev->open) {
+                if (evdev->exist)
+                        input_close_device(&evdev->handle);
                 else
-                        evdev_free(list->evdev);
+                        evdev_free(evdev);
         }
 
-        kfree(list);
         return 0;
 }
 
-static int evdev_open(struct inode * inode, struct file * file)
+static int evdev_open(struct inode *inode, struct file *file)
 {
-        struct evdev_list *list;
+        struct evdev_client *client;
+        struct evdev *evdev;
         int i = iminor(inode) - EVDEV_MINOR_BASE;
+        int error;
 
-        if (i >= EVDEV_MINORS || !evdev_table[i] || !evdev_table[i]->exist)
+        if (i >= EVDEV_MINORS)
                 return -ENODEV;
 
-        if (!(list = kzalloc(sizeof(struct evdev_list), GFP_KERNEL)))
+        evdev = evdev_table[i];
+
+        if (!evdev || !evdev->exist)
+                return -ENODEV;
+
+        client = kzalloc(sizeof(struct evdev_client), GFP_KERNEL);
+        if (!client)
                 return -ENOMEM;
 
-        list->evdev = evdev_table[i];
-        list_add_tail(&list->node, &evdev_table[i]->list);
-        file->private_data = list;
+        client->evdev = evdev;
+        list_add_tail(&client->node, &evdev->client_list);
 
-        if (!list->evdev->open++)
-                if (list->evdev->exist)
-                        input_open_device(&list->evdev->handle);
+        if (!evdev->open++ && evdev->exist) {
+                error = input_open_device(&evdev->handle);
+                if (error) {
+                        list_del(&client->node);
+                        kfree(client);
+                        return error;
+                }
+        }
 
+        file->private_data = client;
         return 0;
 }
 
@@ -243,54 +258,55 @@ static int evdev_event_to_user(char __user *buffer, const struct input_event *ev
 
 #endif /* CONFIG_COMPAT */
 
-static ssize_t evdev_write(struct file * file, const char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t evdev_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct evdev_list *list = file->private_data;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
         struct input_event event;
         int retval = 0;
 
-        if (!list->evdev->exist)
+        if (!evdev->exist)
                 return -ENODEV;
 
         while (retval < count) {
 
                 if (evdev_event_from_user(buffer + retval, &event))
                         return -EFAULT;
-                input_inject_event(&list->evdev->handle, event.type, event.code, event.value);
+                input_inject_event(&evdev->handle, event.type, event.code, event.value);
                 retval += evdev_event_size();
         }
 
         return retval;
 }
 
-static ssize_t evdev_read(struct file * file, char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t evdev_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct evdev_list *list = file->private_data;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
         int retval;
 
         if (count < evdev_event_size())
                 return -EINVAL;
 
-        if (list->head == list->tail && list->evdev->exist && (file->f_flags & O_NONBLOCK))
+        if (client->head == client->tail && evdev->exist && (file->f_flags & O_NONBLOCK))
                 return -EAGAIN;
 
-        retval = wait_event_interruptible(list->evdev->wait,
-                list->head != list->tail || (!list->evdev->exist));
-
+        retval = wait_event_interruptible(evdev->wait,
+                client->head != client->tail || !evdev->exist);
         if (retval)
                 return retval;
 
-        if (!list->evdev->exist)
+        if (!evdev->exist)
                 return -ENODEV;
 
-        while (list->head != list->tail && retval + evdev_event_size() <= count) {
+        while (client->head != client->tail && retval + evdev_event_size() <= count) {
 
-                struct input_event *event = (struct input_event *) list->buffer + list->tail;
+                struct input_event *event = (struct input_event *) client->buffer + client->tail;
 
                 if (evdev_event_to_user(buffer + retval, event))
                         return -EFAULT;
 
-                list->tail = (list->tail + 1) & (EVDEV_BUFFER_SIZE - 1);
+                client->tail = (client->tail + 1) & (EVDEV_BUFFER_SIZE - 1);
                 retval += evdev_event_size();
         }
 
@@ -300,11 +316,12 @@ static ssize_t evdev_read(struct file * file, char __user * buffer, size_t count
 /* No kernel lock - fine */
 static unsigned int evdev_poll(struct file *file, poll_table *wait)
 {
-        struct evdev_list *list = file->private_data;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
 
-        poll_wait(file, &list->evdev->wait, wait);
-        return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) |
-                (list->evdev->exist ? 0 : (POLLHUP | POLLERR));
+        poll_wait(file, &evdev->wait, wait);
+        return ((client->head == client->tail) ? 0 : (POLLIN | POLLRDNORM)) |
+                (evdev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
 #ifdef CONFIG_COMPAT
@@ -387,8 +404,8 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p)
 static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
                                 void __user *p, int compat_mode)
 {
-        struct evdev_list *list = file->private_data;
-        struct evdev *evdev = list->evdev;
+        struct evdev_client *client = file->private_data;
+        struct evdev *evdev = client->evdev;
         struct input_dev *dev = evdev->handle.dev;
         struct input_absinfo abs;
         struct ff_effect effect;
@@ -434,32 +451,21 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
                 case EVIOCGKEYCODE:
                         if (get_user(t, ip))
                                 return -EFAULT;
-                        if (t < 0 || t >= dev->keycodemax || !dev->keycodesize)
-                                return -EINVAL;
-                        if (put_user(INPUT_KEYCODE(dev, t), ip + 1))
+
+                        error = dev->getkeycode(dev, t, &v);
+                        if (error)
+                                return error;
+
+                        if (put_user(v, ip + 1))
                                 return -EFAULT;
+
                         return 0;
 
                 case EVIOCSKEYCODE:
-                        if (get_user(t, ip))
+                        if (get_user(t, ip) || get_user(v, ip + 1))
                                 return -EFAULT;
-                        if (t < 0 || t >= dev->keycodemax || !dev->keycodesize)
-                                return -EINVAL;
-                        if (get_user(v, ip + 1))
-                                return -EFAULT;
-                        if (v < 0 || v > KEY_MAX)
-                                return -EINVAL;
-                        if (dev->keycodesize < sizeof(v) && (v >> (dev->keycodesize * 8)))
-                                return -EINVAL;
-
-                        u = SET_INPUT_KEYCODE(dev, t, v);
-                        clear_bit(u, dev->keybit);
-                        set_bit(v, dev->keybit);
-                        for (i = 0; i < dev->keycodemax; i++)
-                                if (INPUT_KEYCODE(dev, i) == u)
-                                        set_bit(u, dev->keybit);
 
-                        return 0;
+                        return dev->setkeycode(dev, t, v);
 
                 case EVIOCSFF:
                         if (copy_from_user(&effect, p, sizeof(effect)))
@@ -487,10 +493,10 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
                                         return -EBUSY;
                                 if (input_grab_device(&evdev->handle))
                                         return -EBUSY;
-                                evdev->grab = list;
+                                evdev->grab = client;
                                 return 0;
                         } else {
-                                if (evdev->grab != list)
+                                if (evdev->grab != client)
                                         return -EINVAL;
                                 input_release_device(&evdev->handle);
                                 evdev->grab = NULL;
@@ -616,23 +622,26 @@ static const struct file_operations evdev_fops = {
         .flush =        evdev_flush
 };
 
-static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev,
-                                          const struct input_device_id *id)
+static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
+                         const struct input_device_id *id)
 {
         struct evdev *evdev;
         struct class_device *cdev;
+        dev_t devt;
         int minor;
+        int error;
 
         for (minor = 0; minor < EVDEV_MINORS && evdev_table[minor]; minor++);
         if (minor == EVDEV_MINORS) {
                 printk(KERN_ERR "evdev: no more free evdev devices\n");
-                return NULL;
+                return -ENFILE;
         }
 
-        if (!(evdev = kzalloc(sizeof(struct evdev), GFP_KERNEL)))
-                return NULL;
+        evdev = kzalloc(sizeof(struct evdev), GFP_KERNEL);
+        if (!evdev)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&evdev->list);
+        INIT_LIST_HEAD(&evdev->client_list);
         init_waitqueue_head(&evdev->wait);
 
         evdev->exist = 1;
@@ -645,23 +654,45 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
 
         evdev_table[minor] = evdev;
 
-        cdev = class_device_create(&input_class, &dev->cdev,
-                        MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, evdev->name);
+        devt = MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
+
+        cdev = class_device_create(&input_class, &dev->cdev, devt,
+                                   dev->cdev.dev, evdev->name);
+        if (IS_ERR(cdev)) {
+                error = PTR_ERR(cdev);
+                goto err_free_evdev;
+        }
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
-                          evdev->name);
+        error = sysfs_create_link(&input_class.subsys.kobj,
+                                  &cdev->kobj, evdev->name);
+        if (error)
+                goto err_cdev_destroy;
+
+        error = input_register_handle(&evdev->handle);
+        if (error)
+                goto err_remove_link;
 
-        return &evdev->handle;
+        return 0;
+
+ err_remove_link:
+        sysfs_remove_link(&input_class.subsys.kobj, evdev->name);
+ err_cdev_destroy:
+        class_device_destroy(&input_class, devt);
+ err_free_evdev:
+        kfree(evdev);
+        evdev_table[minor] = NULL;
+        return error;
 }
 
 static void evdev_disconnect(struct input_handle *handle)
 {
         struct evdev *evdev = handle->private;
-        struct evdev_list *list;
+        struct evdev_client *client;
+
+        input_unregister_handle(handle);
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, evdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
         evdev->exist = 0;
@@ -670,8 +701,8 @@ static void evdev_disconnect(struct input_handle *handle)
                 input_flush_device(handle, NULL);
                 input_close_device(handle);
                 wake_up_interruptible(&evdev->wait);
-                list_for_each_entry(list, &evdev->list, node)
-                        kill_fasync(&list->fasync, SIGIO, POLL_HUP);
+                list_for_each_entry(client, &evdev->client_list, node)
+                        kill_fasync(&client->fasync, SIGIO, POLL_HUP);
         } else
                 evdev_free(evdev);
 }
diff --git a/drivers/input/input.c b/drivers/input/input.c
index a9a706f8fff9..915e9ab7cab0 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -299,12 +299,87 @@ void input_close_device(struct input_handle *handle)
 }
 EXPORT_SYMBOL(input_close_device);
 
-static void input_link_handle(struct input_handle *handle)
+static int input_fetch_keycode(struct input_dev *dev, int scancode)
 {
-        list_add_tail(&handle->d_node, &handle->dev->h_list);
-        list_add_tail(&handle->h_node, &handle->handler->h_list);
+        switch (dev->keycodesize) {
+                case 1:
+                        return ((u8 *)dev->keycode)[scancode];
+
+                case 2:
+                        return ((u16 *)dev->keycode)[scancode];
+
+                default:
+                        return ((u32 *)dev->keycode)[scancode];
+        }
+}
+
+static int input_default_getkeycode(struct input_dev *dev,
+                                    int scancode, int *keycode)
+{
+        if (!dev->keycodesize)
+                return -EINVAL;
+
+        if (scancode < 0 || scancode >= dev->keycodemax)
+                return -EINVAL;
+
+        *keycode = input_fetch_keycode(dev, scancode);
+
+        return 0;
+}
+
+static int input_default_setkeycode(struct input_dev *dev,
+                                    int scancode, int keycode)
+{
+        int old_keycode;
+        int i;
+
+        if (scancode < 0 || scancode >= dev->keycodemax)
+                return -EINVAL;
+
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+
+        if (!dev->keycodesize)
+                return -EINVAL;
+
+        if (dev->keycodesize < sizeof(keycode) && (keycode >> (dev->keycodesize * 8)))
+                return -EINVAL;
+
+        switch (dev->keycodesize) {
+                case 1: {
+                        u8 *k = (u8 *)dev->keycode;
+                        old_keycode = k[scancode];
+                        k[scancode] = keycode;
+                        break;
+                }
+                case 2: {
+                        u16 *k = (u16 *)dev->keycode;
+                        old_keycode = k[scancode];
+                        k[scancode] = keycode;
+                        break;
+                }
+                default: {
+                        u32 *k = (u32 *)dev->keycode;
+                        old_keycode = k[scancode];
+                        k[scancode] = keycode;
+                        break;
+                }
+        }
+
+        clear_bit(old_keycode, dev->keybit);
+        set_bit(keycode, dev->keybit);
+
+        for (i = 0; i < dev->keycodemax; i++) {
+                if (input_fetch_keycode(dev, i) == old_keycode) {
+                        set_bit(old_keycode, dev->keybit);
+                        break; /* Setting the bit twice is useless, so break */
+                }
+        }
+
+        return 0;
 }
 
+
 #define MATCH_BIT(bit, max) \
                 for (i = 0; i < NBITS(max); i++) \
                         if ((id->bit[i] & dev->bit[i]) != id->bit[i]) \
@@ -351,6 +426,29 @@ static const struct input_device_id *input_match_device(const struct input_devic
         return NULL;
 }
 
+static int input_attach_handler(struct input_dev *dev, struct input_handler *handler)
+{
+        const struct input_device_id *id;
+        int error;
+
+        if (handler->blacklist && input_match_device(handler->blacklist, dev))
+                return -ENODEV;
+
+        id = input_match_device(handler->id_table, dev);
+        if (!id)
+                return -ENODEV;
+
+        error = handler->connect(handler, dev, id);
+        if (error && error != -ENODEV)
+                printk(KERN_ERR
+                        "input: failed to attach handler %s to device %s, "
+                        "error: %d\n",
+                        handler->name, kobject_name(&dev->cdev.kobj), error);
+
+        return error;
+}
+
+
 #ifdef CONFIG_PROC_FS
 
 static struct proc_dir_entry *proc_bus_input_dir;
@@ -439,6 +537,7 @@ static int input_devices_seq_show(struct seq_file *seq, void *v)
         seq_printf(seq, "N: Name=\"%s\"\n", dev->name ? dev->name : "");
         seq_printf(seq, "P: Phys=%s\n", dev->phys ? dev->phys : "");
         seq_printf(seq, "S: Sysfs=%s\n", path ? path : "");
+        seq_printf(seq, "U: Uniq=%s\n", dev->uniq ? dev->uniq : "");
         seq_printf(seq, "H: Handlers=");
 
         list_for_each_entry(handle, &dev->h_list, d_node)
@@ -753,6 +852,13 @@ static struct attribute_group input_dev_caps_attr_group = {
         .attrs  = input_dev_caps_attrs,
 };
 
+static struct attribute_group *input_dev_attr_groups[] = {
+        &input_dev_attr_group,
+        &input_dev_id_attr_group,
+        &input_dev_caps_attr_group,
+        NULL
+};
+
 static void input_dev_release(struct class_device *class_dev)
 {
         struct input_dev *dev = to_input_dev(class_dev);
@@ -906,6 +1012,7 @@ struct input_dev *input_allocate_device(void)
         dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
         if (dev) {
                 dev->cdev.class = &input_class;
+                dev->cdev.groups = input_dev_attr_groups;
                 class_device_initialize(&dev->cdev);
                 mutex_init(&dev->mutex);
                 INIT_LIST_HEAD(&dev->h_list);
@@ -934,23 +1041,71 @@ EXPORT_SYMBOL(input_allocate_device);
  */
 void input_free_device(struct input_dev *dev)
 {
-        if (dev) {
-
-                mutex_lock(&dev->mutex);
-                dev->name = dev->phys = dev->uniq = NULL;
-                mutex_unlock(&dev->mutex);
-
+        if (dev)
                 input_put_device(dev);
-        }
 }
 EXPORT_SYMBOL(input_free_device);
 
+/**
+ * input_set_capability - mark device as capable of a certain event
+ * @dev: device that is capable of emitting or accepting event
+ * @type: type of the event (EV_KEY, EV_REL, etc...)
+ * @code: event code
+ *
+ * In addition to setting up corresponding bit in appropriate capability
+ * bitmap the function also adjusts dev->evbit.
+ */
+void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code)
+{
+        switch (type) {
+        case EV_KEY:
+                __set_bit(code, dev->keybit);
+                break;
+
+        case EV_REL:
+                __set_bit(code, dev->relbit);
+                break;
+
+        case EV_ABS:
+                __set_bit(code, dev->absbit);
+                break;
+
+        case EV_MSC:
+                __set_bit(code, dev->mscbit);
+                break;
+
+        case EV_SW:
+                __set_bit(code, dev->swbit);
+                break;
+
+        case EV_LED:
+                __set_bit(code, dev->ledbit);
+                break;
+
+        case EV_SND:
+                __set_bit(code, dev->sndbit);
+                break;
+
+        case EV_FF:
+                __set_bit(code, dev->ffbit);
+                break;
+
+        default:
+                printk(KERN_ERR
+                        "input_set_capability: unknown type %u (code %u)\n",
+                        type, code);
+                dump_stack();
+                return;
+        }
+
+        __set_bit(type, dev->evbit);
+}
+EXPORT_SYMBOL(input_set_capability);
+
 int input_register_device(struct input_dev *dev)
 {
         static atomic_t input_no = ATOMIC_INIT(0);
-        struct input_handle *handle;
         struct input_handler *handler;
-        const struct input_device_id *id;
         const char *path;
         int error;
 
@@ -969,55 +1124,41 @@ int input_register_device(struct input_dev *dev)
                 dev->rep[REP_PERIOD] = 33;
         }
 
+        if (!dev->getkeycode)
+                dev->getkeycode = input_default_getkeycode;
+
+        if (!dev->setkeycode)
+                dev->setkeycode = input_default_setkeycode;
+
         list_add_tail(&dev->node, &input_dev_list);
 
         snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),
                  "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
 
+        if (!dev->cdev.dev)
+                dev->cdev.dev = dev->dev.parent;
+
         error = class_device_add(&dev->cdev);
         if (error)
                 return error;
 
-        error = sysfs_create_group(&dev->cdev.kobj, &input_dev_attr_group);
-        if (error)
-                goto fail1;
-
-        error = sysfs_create_group(&dev->cdev.kobj, &input_dev_id_attr_group);
-        if (error)
-                goto fail2;
-
-        error = sysfs_create_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
-        if (error)
-                goto fail3;
-
         path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
         printk(KERN_INFO "input: %s as %s\n",
                 dev->name ? dev->name : "Unspecified device", path ? path : "N/A");
         kfree(path);
 
         list_for_each_entry(handler, &input_handler_list, node)
-                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
-                        if ((id = input_match_device(handler->id_table, dev)))
-                                if ((handle = handler->connect(handler, dev, id))) {
-                                        input_link_handle(handle);
-                                        if (handler->start)
-                                                handler->start(handle);
-                                }
+                input_attach_handler(dev, handler);
 
         input_wakeup_procfs_readers();
 
         return 0;
-
- fail3: sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
- fail2: sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
- fail1: class_device_del(&dev->cdev);
-        return error;
 }
 EXPORT_SYMBOL(input_register_device);
 
 void input_unregister_device(struct input_dev *dev)
 {
-        struct list_head *node, *next;
+        struct input_handle *handle, *next;
         int code;
 
         for (code = 0; code <= KEY_MAX; code++)
@@ -1027,19 +1168,12 @@ void input_unregister_device(struct input_dev *dev)
 
         del_timer_sync(&dev->timer);
 
-        list_for_each_safe(node, next, &dev->h_list) {
-                struct input_handle * handle = to_handle(node);
-                list_del_init(&handle->d_node);
-                list_del_init(&handle->h_node);
+        list_for_each_entry_safe(handle, next, &dev->h_list, d_node)
                 handle->handler->disconnect(handle);
-        }
+        WARN_ON(!list_empty(&dev->h_list));
 
         list_del_init(&dev->node);
 
-        sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
-        sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
-        sysfs_remove_group(&dev->cdev.kobj, &input_dev_attr_group);
-
         class_device_unregister(&dev->cdev);
 
         input_wakeup_procfs_readers();
@@ -1049,8 +1183,6 @@ EXPORT_SYMBOL(input_unregister_device);
 int input_register_handler(struct input_handler *handler)
 {
         struct input_dev *dev;
-        struct input_handle *handle;
-        const struct input_device_id *id;
 
         INIT_LIST_HEAD(&handler->h_list);
 
@@ -1064,13 +1196,7 @@ int input_register_handler(struct input_handler *handler)
         list_add_tail(&handler->node, &input_handler_list);
 
         list_for_each_entry(dev, &input_dev_list, node)
-                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
-                        if ((id = input_match_device(handler->id_table, dev)))
-                                if ((handle = handler->connect(handler, dev, id))) {
-                                        input_link_handle(handle);
-                                        if (handler->start)
-                                                handler->start(handle);
-                                }
+                input_attach_handler(dev, handler);
 
         input_wakeup_procfs_readers();
         return 0;
@@ -1079,14 +1205,11 @@ EXPORT_SYMBOL(input_register_handler);
 
 void input_unregister_handler(struct input_handler *handler)
 {
-        struct list_head *node, *next;
+        struct input_handle *handle, *next;
 
-        list_for_each_safe(node, next, &handler->h_list) {
-                struct input_handle * handle = to_handle_h(node);
-                list_del_init(&handle->h_node);
-                list_del_init(&handle->d_node);
+        list_for_each_entry_safe(handle, next, &handler->h_list, h_node)
                 handler->disconnect(handle);
-        }
+        WARN_ON(!list_empty(&handler->h_list));
 
         list_del_init(&handler->node);
 
@@ -1097,6 +1220,27 @@ void input_unregister_handler(struct input_handler *handler)
 }
 EXPORT_SYMBOL(input_unregister_handler);
 
+int input_register_handle(struct input_handle *handle)
+{
+        struct input_handler *handler = handle->handler;
+
+        list_add_tail(&handle->d_node, &handle->dev->h_list);
+        list_add_tail(&handle->h_node, &handler->h_list);
+
+        if (handler->start)
+                handler->start(handle);
+
+        return 0;
+}
+EXPORT_SYMBOL(input_register_handle);
+
+void input_unregister_handle(struct input_handle *handle)
+{
+        list_del_init(&handle->h_node);
+        list_del_init(&handle->d_node);
+}
+EXPORT_SYMBOL(input_unregister_handle);
+
 static int input_open_file(struct inode *inode, struct file *file)
 {
         struct input_handler *handler = input_table[iminor(inode) >> 5];
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 9f3529ad3fda..9bcc5425049b 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -43,7 +43,7 @@ struct joydev {
         char name[16];
         struct input_handle handle;
         wait_queue_head_t wait;
-        struct list_head list;
+        struct list_head client_list;
         struct js_corr corr[ABS_MAX + 1];
         struct JS_DATA_SAVE_TYPE glue;
         int nabs;
@@ -55,7 +55,7 @@ struct joydev {
         __s16 abs[ABS_MAX + 1];
 };
 
-struct joydev_list {
+struct joydev_client {
         struct js_event buffer[JOYDEV_BUFFER_SIZE];
         int head;
         int tail;
@@ -87,7 +87,7 @@ static int joydev_correct(int value, struct js_corr *corr)
 static void joydev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
         struct joydev *joydev = handle->private;
-        struct joydev_list *list;
+        struct joydev_client *client;
         struct js_event event;
 
         switch (type) {
@@ -115,15 +115,15 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne
 
         event.time = jiffies_to_msecs(jiffies);
 
-        list_for_each_entry(list, &joydev->list, node) {
+        list_for_each_entry(client, &joydev->client_list, node) {
 
-                memcpy(list->buffer + list->head, &event, sizeof(struct js_event));
+                memcpy(client->buffer + client->head, &event, sizeof(struct js_event));
 
-                if (list->startup == joydev->nabs + joydev->nkey)
-                        if (list->tail == (list->head = (list->head + 1) & (JOYDEV_BUFFER_SIZE - 1)))
-                                list->startup = 0;
+                if (client->startup == joydev->nabs + joydev->nkey)
+                        if (client->tail == (client->head = (client->head + 1) & (JOYDEV_BUFFER_SIZE - 1)))
+                                client->startup = 0;
 
-                kill_fasync(&list->fasync, SIGIO, POLL_IN);
+                kill_fasync(&client->fasync, SIGIO, POLL_IN);
         }
 
         wake_up_interruptible(&joydev->wait);
@@ -132,9 +132,9 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne
 static int joydev_fasync(int fd, struct file *file, int on)
 {
         int retval;
-        struct joydev_list *list = file->private_data;
+        struct joydev_client *client = file->private_data;
 
-        retval = fasync_helper(fd, file, on, &list->fasync);
+        retval = fasync_helper(fd, file, on, &client->fasync);
 
         return retval < 0 ? retval : 0;
 }
@@ -145,60 +145,73 @@ static void joydev_free(struct joydev *joydev)
         kfree(joydev);
 }
 
-static int joydev_release(struct inode * inode, struct file * file)
+static int joydev_release(struct inode *inode, struct file *file)
 {
-        struct joydev_list *list = file->private_data;
+        struct joydev_client *client = file->private_data;
+        struct joydev *joydev = client->joydev;
 
         joydev_fasync(-1, file, 0);
 
-        list_del(&list->node);
+        list_del(&client->node);
+        kfree(client);
 
-        if (!--list->joydev->open) {
-                if (list->joydev->exist)
-                        input_close_device(&list->joydev->handle);
+        if (!--joydev->open) {
+                if (joydev->exist)
+                        input_close_device(&joydev->handle);
                 else
-                        joydev_free(list->joydev);
+                        joydev_free(joydev);
         }
 
-        kfree(list);
         return 0;
 }
 
 static int joydev_open(struct inode *inode, struct file *file)
 {
-        struct joydev_list *list;
+        struct joydev_client *client;
+        struct joydev *joydev;
         int i = iminor(inode) - JOYDEV_MINOR_BASE;
+        int error;
+
+        if (i >= JOYDEV_MINORS)
+                return -ENODEV;
 
-        if (i >= JOYDEV_MINORS || !joydev_table[i])
+        joydev = joydev_table[i];
+        if (!joydev || !joydev->exist)
                 return -ENODEV;
 
-        if (!(list = kzalloc(sizeof(struct joydev_list), GFP_KERNEL)))
+        client = kzalloc(sizeof(struct joydev_client), GFP_KERNEL);
+        if (!client)
                 return -ENOMEM;
 
-        list->joydev = joydev_table[i];
-        list_add_tail(&list->node, &joydev_table[i]->list);
-        file->private_data = list;
+        client->joydev = joydev;
+        list_add_tail(&client->node, &joydev->client_list);
 
-        if (!list->joydev->open++)
-                if (list->joydev->exist)
-                        input_open_device(&list->joydev->handle);
+        if (!joydev->open++ && joydev->exist) {
+                error = input_open_device(&joydev->handle);
+                if (error) {
+                        list_del(&client->node);
+                        kfree(client);
+                        return error;
+                }
+        }
 
+        file->private_data = client;
         return 0;
 }
 
-static ssize_t joydev_write(struct file * file, const char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t joydev_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
         return -EINVAL;
 }
 
 static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
-        struct joydev_list *list = file->private_data;
-        struct joydev *joydev = list->joydev;
+        struct joydev_client *client = file->private_data;
+        struct joydev *joydev = client->joydev;
         struct input_dev *input = joydev->handle.dev;
         int retval = 0;
 
-        if (!list->joydev->exist)
+        if (!joydev->exist)
                 return -ENODEV;
 
         if (count < sizeof(struct js_event))
@@ -217,56 +230,55 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo
                 if (copy_to_user(buf, &data, sizeof(struct JS_DATA_TYPE)))
                         return -EFAULT;
 
-                list->startup = 0;
-                list->tail = list->head;
+                client->startup = 0;
+                client->tail = client->head;
 
                 return sizeof(struct JS_DATA_TYPE);
         }
 
-        if (list->startup == joydev->nabs + joydev->nkey &&
-            list->head == list->tail && (file->f_flags & O_NONBLOCK))
+        if (client->startup == joydev->nabs + joydev->nkey &&
+            client->head == client->tail && (file->f_flags & O_NONBLOCK))
                 return -EAGAIN;
 
-        retval = wait_event_interruptible(list->joydev->wait,
-                                          !list->joydev->exist ||
-                                          list->startup < joydev->nabs + joydev->nkey ||
-                                          list->head != list->tail);
-
+        retval = wait_event_interruptible(joydev->wait,
+                                          !joydev->exist ||
+                                          client->startup < joydev->nabs + joydev->nkey ||
+                                          client->head != client->tail);
         if (retval)
                 return retval;
 
-        if (!list->joydev->exist)
+        if (!joydev->exist)
                 return -ENODEV;
 
-        while (list->startup < joydev->nabs + joydev->nkey && retval + sizeof(struct js_event) <= count) {
+        while (client->startup < joydev->nabs + joydev->nkey && retval + sizeof(struct js_event) <= count) {
 
                 struct js_event event;
 
                 event.time = jiffies_to_msecs(jiffies);
 
-                if (list->startup < joydev->nkey) {
+                if (client->startup < joydev->nkey) {
                         event.type = JS_EVENT_BUTTON | JS_EVENT_INIT;
-                        event.number = list->startup;
+                        event.number = client->startup;
                         event.value = !!test_bit(joydev->keypam[event.number], input->key);
                 } else {
                         event.type = JS_EVENT_AXIS | JS_EVENT_INIT;
-                        event.number = list->startup - joydev->nkey;
+                        event.number = client->startup - joydev->nkey;
                         event.value = joydev->abs[event.number];
                 }
 
                 if (copy_to_user(buf + retval, &event, sizeof(struct js_event)))
                         return -EFAULT;
 
-                list->startup++;
+                client->startup++;
                 retval += sizeof(struct js_event);
         }
 
-        while (list->head != list->tail && retval + sizeof(struct js_event) <= count) {
+        while (client->head != client->tail && retval + sizeof(struct js_event) <= count) {
 
-                if (copy_to_user(buf + retval, list->buffer + list->tail, sizeof(struct js_event)))
+                if (copy_to_user(buf + retval, client->buffer + client->tail, sizeof(struct js_event)))
                         return -EFAULT;
 
-                list->tail = (list->tail + 1) & (JOYDEV_BUFFER_SIZE - 1);
+                client->tail = (client->tail + 1) & (JOYDEV_BUFFER_SIZE - 1);
                 retval += sizeof(struct js_event);
         }
 
@@ -276,11 +288,12 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo
 /* No kernel lock - fine */
 static unsigned int joydev_poll(struct file *file, poll_table *wait)
 {
-        struct joydev_list *list = file->private_data;
+        struct joydev_client *client = file->private_data;
+        struct joydev *joydev = client->joydev;
 
-        poll_wait(file, &list->joydev->wait, wait);
-        return ((list->head != list->tail || list->startup < list->joydev->nabs + list->joydev->nkey) ?
-                (POLLIN | POLLRDNORM) : 0) | (list->joydev->exist ? 0 : (POLLHUP | POLLERR));
+        poll_wait(file, &joydev->wait, wait);
+        return ((client->head != client->tail || client->startup < joydev->nabs + joydev->nkey) ?
+                (POLLIN | POLLRDNORM) : 0) | (joydev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
 static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __user *argp)
@@ -374,8 +387,8 @@ static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __u
 #ifdef CONFIG_COMPAT
 static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct joydev_list *list = file->private_data;
-        struct joydev *joydev = list->joydev;
+        struct joydev_client *client = file->private_data;
+        struct joydev *joydev = client->joydev;
         void __user *argp = (void __user *)arg;
         s32 tmp32;
         struct JS_DATA_SAVE_TYPE_32 ds32;
@@ -428,8 +441,8 @@ static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo
 
 static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct joydev_list *list = file->private_data;
-        struct joydev *joydev = list->joydev;
+        struct joydev_client *client = file->private_data;
+        struct joydev *joydev = client->joydev;
         void __user *argp = (void __user *)arg;
 
         if (!joydev->exist)
@@ -465,23 +478,26 @@ static const struct file_operations joydev_fops = {
         .fasync =       joydev_fasync,
 };
 
-static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev,
-                                           const struct input_device_id *id)
+static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
+                          const struct input_device_id *id)
 {
         struct joydev *joydev;
         struct class_device *cdev;
+        dev_t devt;
         int i, j, t, minor;
+        int error;
 
         for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);
         if (minor == JOYDEV_MINORS) {
                 printk(KERN_ERR "joydev: no more free joydev devices\n");
-                return NULL;
+                return -ENFILE;
         }
 
-        if (!(joydev = kzalloc(sizeof(struct joydev), GFP_KERNEL)))
-                return NULL;
+        joydev = kzalloc(sizeof(struct joydev), GFP_KERNEL);
+        if (!joydev)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&joydev->list);
+        INIT_LIST_HEAD(&joydev->client_list);
         init_waitqueue_head(&joydev->wait);
 
         joydev->minor = minor;
@@ -534,31 +550,54 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
 
         joydev_table[minor] = joydev;
 
-        cdev = class_device_create(&input_class, &dev->cdev,
-                        MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, joydev->name);
+        devt = MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
+
+        cdev = class_device_create(&input_class, &dev->cdev, devt,
+                                   dev->cdev.dev, joydev->name);
+        if (IS_ERR(cdev)) {
+                error = PTR_ERR(cdev);
+                goto err_free_joydev;
+        }
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
-                          joydev->name);
+        error = sysfs_create_link(&input_class.subsys.kobj,
+                                  &cdev->kobj, joydev->name);
+        if (error)
+                goto err_cdev_destroy;
+
+        error = input_register_handle(&joydev->handle);
+        if (error)
+                goto err_remove_link;
+
+        return 0;
 
-        return &joydev->handle;
+ err_remove_link:
+        sysfs_remove_link(&input_class.subsys.kobj, joydev->name);
+ err_cdev_destroy:
+        class_device_destroy(&input_class, devt);
+ err_free_joydev:
+        joydev_table[minor] = NULL;
+        kfree(joydev);
+        return error;
 }
 
+
 static void joydev_disconnect(struct input_handle *handle)
 {
         struct joydev *joydev = handle->private;
-        struct joydev_list *list;
+        struct joydev_client *client;
+
+        input_unregister_handle(handle);
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, joydev->name);
         class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
         joydev->exist = 0;
 
         if (joydev->open) {
                 input_close_device(handle);
                 wake_up_interruptible(&joydev->wait);
-                list_for_each_entry(list, &joydev->list, node)
-                        kill_fasync(&list->fasync, SIGIO, POLL_HUP);
+                list_for_each_entry(client, &joydev->client_list, node)
+                        kill_fasync(&client->fasync, SIGIO, POLL_HUP);
         } else
                 joydev_free(joydev);
 }
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index b11a4bbc84c4..ff701ab10d74 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -241,7 +241,7 @@ static void a3d_adc_close(struct gameport *gameport)
 
 static int a3d_open(struct input_dev *dev)
 {
-        struct a3d *a3d = dev->private;
+        struct a3d *a3d = input_get_drvdata(dev);
 
         gameport_start_polling(a3d->gameport);
         return 0;
@@ -253,7 +253,7 @@ static int a3d_open(struct input_dev *dev)
 
 static void a3d_close(struct input_dev *dev)
 {
-        struct a3d *a3d = dev->private;
+        struct a3d *a3d = input_get_drvdata(dev);
 
         gameport_stop_polling(a3d->gameport);
 }
@@ -314,11 +314,12 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;
         input_dev->id.product = a3d->mode;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &gameport->dev;
-        input_dev->private = a3d;
+        input_dev->dev.parent = &gameport->dev;
         input_dev->open = a3d_open;
         input_dev->close = a3d_close;
 
+        input_set_drvdata(input_dev, a3d);
+
         if (a3d->mode == A3D_MODE_PXL) {
 
                 int axes[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER };
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 6279ced8a35b..28140c4a110d 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -290,7 +290,7 @@ static void adi_poll(struct gameport *gameport)
 
 static int adi_open(struct input_dev *dev)
 {
-        struct adi_port *port = dev->private;
+        struct adi_port *port = input_get_drvdata(dev);
 
         gameport_start_polling(port->gameport);
         return 0;
@@ -302,7 +302,7 @@ static int adi_open(struct input_dev *dev)
 
 static void adi_close(struct input_dev *dev)
 {
-        struct adi_port *port = dev->private;
+        struct adi_port *port = input_get_drvdata(dev);
 
         gameport_stop_polling(port->gameport);
 }
@@ -424,8 +424,9 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half)
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;
         input_dev->id.product = adi->id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &port->gameport->dev;
-        input_dev->private = port;
+        input_dev->dev.parent = &port->gameport->dev;
+
+        input_set_drvdata(input_dev, port);
 
         input_dev->open = adi_open;
         input_dev->close = adi_close;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 51f1e4bfff3e..1c1afb5d4684 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -343,7 +343,7 @@ static void analog_poll(struct gameport *gameport)
 
 static int analog_open(struct input_dev *dev)
 {
-        struct analog_port *port = dev->private;
+        struct analog_port *port = input_get_drvdata(dev);
 
         gameport_start_polling(port->gameport);
         return 0;
@@ -355,7 +355,7 @@ static int analog_open(struct input_dev *dev)
 
 static void analog_close(struct input_dev *dev)
 {
-        struct analog_port *port = dev->private;
+        struct analog_port *port = input_get_drvdata(dev);
 
         gameport_stop_polling(port->gameport);
 }
@@ -449,10 +449,13 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_ANALOG;
         input_dev->id.product = analog->mask >> 4;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &port->gameport->dev;
+
+        input_set_drvdata(input_dev, port);
 
         input_dev->open = analog_open;
         input_dev->close = analog_close;
-        input_dev->private = port;
+
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
         for (i = j = 0; i < 4; i++)
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 034ec39c251d..d3352a849b85 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -142,7 +142,7 @@ static void cobra_poll(struct gameport *gameport)
 
 static int cobra_open(struct input_dev *dev)
 {
-        struct cobra *cobra = dev->private;
+        struct cobra *cobra = input_get_drvdata(dev);
 
         gameport_start_polling(cobra->gameport);
         return 0;
@@ -150,7 +150,7 @@ static int cobra_open(struct input_dev *dev)
 
 static void cobra_close(struct input_dev *dev)
 {
-        struct cobra *cobra = dev->private;
+        struct cobra *cobra = input_get_drvdata(dev);
 
         gameport_stop_polling(cobra->gameport);
 }
@@ -211,8 +211,9 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;
                 input_dev->id.product = 0x0008;
                 input_dev->id.version = 0x0100;
-                input_dev->cdev.dev = &gameport->dev;
-                input_dev->private = cobra;
+                input_dev->dev.parent = &gameport->dev;
+
+                input_set_drvdata(input_dev, cobra);
 
                 input_dev->open = cobra_open;
                 input_dev->close = cobra_close;
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index b41bd2eb37dd..c27593bf9978 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -518,7 +518,7 @@ static void db9_timer(unsigned long private)
 
 static int db9_open(struct input_dev *dev)
 {
-        struct db9 *db9 = dev->private;
+        struct db9 *db9 = input_get_drvdata(dev);
         struct parport *port = db9->pd->port;
         int err;
 
@@ -542,7 +542,7 @@ static int db9_open(struct input_dev *dev)
 
 static void db9_close(struct input_dev *dev)
 {
-        struct db9 *db9 = dev->private;
+        struct db9 *db9 = input_get_drvdata(dev);
         struct parport *port = db9->pd->port;
 
         mutex_lock(&db9->mutex);
@@ -625,7 +625,8 @@ static struct db9 __init *db9_probe(int parport, int mode)
                 input_dev->id.vendor = 0x0002;
                 input_dev->id.product = mode;
                 input_dev->id.version = 0x0100;
-                input_dev->private = db9;
+
+                input_set_drvdata(input_dev, db9);
 
                 input_dev->open = db9_open;
                 input_dev->close = db9_close;
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 711e4b3e9e61..c71b58fe225d 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -591,7 +591,7 @@ static void gc_timer(unsigned long private)
 
 static int gc_open(struct input_dev *dev)
 {
-        struct gc *gc = dev->private;
+        struct gc *gc = input_get_drvdata(dev);
         int err;
 
         err = mutex_lock_interruptible(&gc->mutex);
@@ -610,7 +610,7 @@ static int gc_open(struct input_dev *dev)
 
 static void gc_close(struct input_dev *dev)
 {
-        struct gc *gc = dev->private;
+        struct gc *gc = input_get_drvdata(dev);
 
         mutex_lock(&gc->mutex);
         if (!--gc->used) {
@@ -646,7 +646,8 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = pad_type;
         input_dev->id.version = 0x0100;
-        input_dev->private = gc;
+
+        input_set_drvdata(input_dev, gc);
 
         input_dev->open = gc_open;
         input_dev->close = gc_close;
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index bacbab5d1b6f..d514aebf7554 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -220,7 +220,7 @@ static void gf2k_poll(struct gameport *gameport)
 
 static int gf2k_open(struct input_dev *dev)
 {
-        struct gf2k *gf2k = dev->private;
+        struct gf2k *gf2k = input_get_drvdata(dev);
 
         gameport_start_polling(gf2k->gameport);
         return 0;
@@ -228,7 +228,7 @@ static int gf2k_open(struct input_dev *dev)
 
 static void gf2k_close(struct input_dev *dev)
 {
-        struct gf2k *gf2k = dev->private;
+        struct gf2k *gf2k = input_get_drvdata(dev);
 
         gameport_stop_polling(gf2k->gameport);
 }
@@ -308,11 +308,13 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_GENIUS;
         input_dev->id.product = gf2k->id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &gameport->dev;
-        input_dev->private = gf2k;
+        input_dev->dev.parent = &gameport->dev;
+
+        input_set_drvdata(input_dev, gf2k);
 
         input_dev->open = gf2k_open;
         input_dev->close = gf2k_close;
+
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
         for (i = 0; i < gf2k_axes[gf2k->id]; i++)
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 17a90c436de8..73eb5ab6f140 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -285,7 +285,7 @@ static void grip_poll(struct gameport *gameport)
 
 static int grip_open(struct input_dev *dev)
 {
-        struct grip *grip = dev->private;
+        struct grip *grip = input_get_drvdata(dev);
 
         gameport_start_polling(grip->gameport);
         return 0;
@@ -293,7 +293,7 @@ static int grip_open(struct input_dev *dev)
 
 static void grip_close(struct input_dev *dev)
 {
-        struct grip *grip = dev->private;
+        struct grip *grip = input_get_drvdata(dev);
 
         gameport_stop_polling(grip->gameport);
 }
@@ -363,8 +363,9 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
                 input_dev->id.product = grip->mode[i];
                 input_dev->id.version = 0x0100;
-                input_dev->cdev.dev = &gameport->dev;
-                input_dev->private = grip;
+                input_dev->dev.parent = &gameport->dev;
+
+                input_set_drvdata(input_dev, grip);
 
                 input_dev->open = grip_open;
                 input_dev->close = grip_close;
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 8120a9c40773..555319e6378c 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -562,7 +562,7 @@ static void grip_poll(struct gameport *gameport)
 
 static int grip_open(struct input_dev *dev)
 {
-        struct grip_mp *grip = dev->private;
+        struct grip_mp *grip = input_get_drvdata(dev);
 
         gameport_start_polling(grip->gameport);
         return 0;
@@ -574,9 +574,9 @@ static int grip_open(struct input_dev *dev)
 
 static void grip_close(struct input_dev *dev)
 {
-        struct grip_mp *grip = dev->private;
+        struct grip_mp *grip = input_get_drvdata(dev);
 
-        gameport_start_polling(grip->gameport);
+        gameport_stop_polling(grip->gameport);
 }
 
 /*
@@ -599,8 +599,9 @@ static int register_slot(int slot, struct grip_mp *grip)
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
         input_dev->id.product = 0x0100 + port->mode;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &grip->gameport->dev;
-        input_dev->private = grip;
+        input_dev->dev.parent = &grip->gameport->dev;
+
+        input_set_drvdata(input_dev, grip);
 
         input_dev->open = grip_open;
         input_dev->close = grip_close;
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index dbc5d92858b8..d4e8073caf27 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -156,7 +156,7 @@ static void guillemot_poll(struct gameport *gameport)
 
 static int guillemot_open(struct input_dev *dev)
 {
-        struct guillemot *guillemot = dev->private;
+        struct guillemot *guillemot = input_get_drvdata(dev);
 
         gameport_start_polling(guillemot->gameport);
         return 0;
@@ -168,7 +168,7 @@ static int guillemot_open(struct input_dev *dev)
 
 static void guillemot_close(struct input_dev *dev)
 {
-        struct guillemot *guillemot = dev->private;
+        struct guillemot *guillemot = input_get_drvdata(dev);
 
         gameport_stop_polling(guillemot->gameport);
 }
@@ -231,8 +231,9 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_GUILLEMOT;
         input_dev->id.product = guillemot_type[i].id;
         input_dev->id.version = (int)data[14] << 8 | data[15];
-        input_dev->cdev.dev = &gameport->dev;
-        input_dev->private = guillemot;
+        input_dev->dev.parent = &gameport->dev;
+
+        input_set_drvdata(input_dev, guillemot);
 
         input_dev->open = guillemot_open;
         input_dev->close = guillemot_close;
diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c
index 8fb0c19cc60e..f2a4381d0ab8 100644
--- a/drivers/input/joystick/iforce/iforce-ff.c
+++ b/drivers/input/joystick/iforce/iforce-ff.c
@@ -2,7 +2,7 @@
  * $Id: iforce-ff.c,v 1.9 2002/02/02 19:28:35 jdeneux Exp $
  *
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001-2002 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
@@ -205,7 +205,7 @@ static int need_condition_modifier(struct ff_effect *old, struct ff_effect *new)
         int i;
 
         if (new->type != FF_SPRING && new->type != FF_FRICTION) {
-                printk(KERN_WARNING "iforce.c: bad effect type in need_condition_modifier\n");
+                warn("bad effect type in need_condition_modifier");
                 return 0;
         }
 
@@ -227,7 +227,7 @@ static int need_condition_modifier(struct ff_effect *old, struct ff_effect *new)
 static int need_magnitude_modifier(struct ff_effect *old, struct ff_effect *effect)
 {
         if (effect->type != FF_CONSTANT) {
-                printk(KERN_WARNING "iforce.c: bad effect type in need_envelope_modifier\n");
+                warn("bad effect type in need_envelope_modifier");
                 return 0;
         }
 
@@ -258,7 +258,7 @@ static int need_envelope_modifier(struct ff_effect *old, struct ff_effect *effec
                 break;
 
         default:
-                printk(KERN_WARNING "iforce.c: bad effect type in need_envelope_modifier\n");
+                warn("bad effect type in need_envelope_modifier");
         }
 
         return 0;
@@ -271,7 +271,7 @@ static int need_envelope_modifier(struct ff_effect *old, struct ff_effect *effec
 static int need_period_modifier(struct ff_effect *old, struct ff_effect *new)
 {
         if (new->type != FF_PERIODIC) {
-                printk(KERN_WARNING "iforce.c: bad effect type in need_period_modifier\n");
+                warn("bad effect type in need_period_modifier");
                 return 0;
         }
         return (old->u.periodic.period != new->u.periodic.period
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index 3393a37fec39..fb129c479a66 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -2,7 +2,7 @@
  * $Id: iforce-main.c,v 1.19 2002/07/07 10:22:50 jdeneux Exp $
  *
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001-2002 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
@@ -29,7 +29,7 @@
 
 #include "iforce.h"
 
-MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>, Johann Deneux <deneux@ifrance.com>");
+MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>, Johann Deneux <johann.deneux@gmail.com>");
 MODULE_DESCRIPTION("USB/RS232 I-Force joysticks and wheels driver");
 MODULE_LICENSE("GPL");
 
@@ -220,7 +220,7 @@ static void iforce_release(struct input_dev *dev)
                 /* Check: no effects should be present in memory */
                 for (i = 0; i < dev->ff->max_effects; i++) {
                         if (test_bit(FF_CORE_IS_USED, iforce->core_effects[i].flags)) {
-                                printk(KERN_WARNING "iforce_release: Device still owns effects\n");
+                                warn("iforce_release: Device still owns effects");
                                 break;
                         }
                 }
@@ -232,7 +232,7 @@ static void iforce_release(struct input_dev *dev)
         switch (iforce->bus) {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
                 case IFORCE_USB:
-                        usb_unlink_urb(iforce->irq);
+                        usb_kill_urb(iforce->irq);
 
                         /* The device was unplugged before the file
                          * was released */
@@ -287,13 +287,13 @@ int iforce_init_device(struct iforce *iforce)
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
         case IFORCE_USB:
                 input_dev->id.bustype = BUS_USB;
-                input_dev->cdev.dev = &iforce->usbdev->dev;
+                input_dev->dev.parent = &iforce->usbdev->dev;
                 break;
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_232
         case IFORCE_232:
                 input_dev->id.bustype = BUS_RS232;
-                input_dev->cdev.dev = &iforce->serio->dev;
+                input_dev->dev.parent = &iforce->serio->dev;
                 break;
 #endif
         }
@@ -324,7 +324,7 @@ int iforce_init_device(struct iforce *iforce)
                         break;
 
         if (i == 20) { /* 5 seconds */
-                printk(KERN_ERR "iforce-main.c: Timeout waiting for response from device.\n");
+                err("Timeout waiting for response from device.");
                 error = -ENODEV;
                 goto fail;
         }
@@ -336,26 +336,26 @@ int iforce_init_device(struct iforce *iforce)
         if (!iforce_get_id_packet(iforce, "M"))
                 input_dev->id.vendor = (iforce->edata[2] << 8) | iforce->edata[1];
         else
-                printk(KERN_WARNING "iforce-main.c: Device does not respond to id packet M\n");
+                warn("Device does not respond to id packet M");
 
         if (!iforce_get_id_packet(iforce, "P"))
                 input_dev->id.product = (iforce->edata[2] << 8) | iforce->edata[1];
         else
-                printk(KERN_WARNING "iforce-main.c: Device does not respond to id packet P\n");
+                warn("Device does not respond to id packet P");
 
         if (!iforce_get_id_packet(iforce, "B"))
                 iforce->device_memory.end = (iforce->edata[2] << 8) | iforce->edata[1];
         else
-                printk(KERN_WARNING "iforce-main.c: Device does not respond to id packet B\n");
+                warn("Device does not respond to id packet B");
 
         if (!iforce_get_id_packet(iforce, "N"))
                 ff_effects = iforce->edata[1];
         else
-                printk(KERN_WARNING "iforce-main.c: Device does not respond to id packet N\n");
+                warn("Device does not respond to id packet N");
 
         /* Check if the device can store more effects than the driver can really handle */
         if (ff_effects > IFORCE_EFFECTS_MAX) {
-                printk(KERN_WARNING "iforce: Limiting number of effects to %d (device reports %d)\n",
+                warn("Limiting number of effects to %d (device reports %d)",
                        IFORCE_EFFECTS_MAX, ff_effects);
                 ff_effects = IFORCE_EFFECTS_MAX;
         }
@@ -457,8 +457,6 @@ int iforce_init_device(struct iforce *iforce)
         if (error)
                 goto fail;
 
-        printk(KERN_DEBUG "iforce->dev->open = %p\n", iforce->dev->open);
-
         return 0;
 
  fail:  input_free_device(input_dev);
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 808f05932a6f..21c4e13d3a50 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -2,7 +2,7 @@
  * $Id: iforce-packets.c,v 1.16 2002/07/07 10:22:50 jdeneux Exp $
  *
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001-2002 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
@@ -39,10 +39,10 @@ void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data)
 {
         int i;
 
-        printk(KERN_DEBUG "iforce.c: %s ( cmd = %04x, data = ", msg, cmd);
+        printk(KERN_DEBUG __FILE__ ": %s cmd = %04x, data = ", msg, cmd);
         for (i = 0; i < LO(cmd); i++)
                 printk("%02x ", data[i]);
-        printk(")\n");
+        printk("\n");
 }
 
 /*
@@ -65,8 +65,9 @@ int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data)
         head = iforce->xmit.head;
         tail = iforce->xmit.tail;
 
+
         if (CIRC_SPACE(head, tail, XMIT_SIZE) < n+2) {
-                printk(KERN_WARNING "iforce.c: not enough space in xmit buffer to send new packet\n");
+                warn("not enough space in xmit buffer to send new packet");
                 spin_unlock_irqrestore(&iforce->xmit_lock, flags);
                 return -1;
         }
@@ -126,8 +127,6 @@ int iforce_control_playback(struct iforce* iforce, u16 id, unsigned int value)
 {
         unsigned char data[3];
 
-printk(KERN_DEBUG "iforce-packets.c: control_playback %d %d\n", id, value);
-
         data[0] = LO(id);
         data[1] = (value > 0) ? ((value > 1) ? 0x41 : 0x01) : 0;
         data[2] = LO(value);
@@ -151,7 +150,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr)
                         return 0;
                 }
         }
-        printk(KERN_WARNING "iforce-packets.c: unused effect %04x updated !!!\n", addr);
+        warn("unused effect %04x updated !!!", addr);
         return -1;
 }
 
@@ -162,7 +161,7 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
         static int being_used = 0;
 
         if (being_used)
-                printk(KERN_WARNING "iforce-packets.c: re-entrant call to iforce_process %d\n", being_used);
+                warn("re-entrant call to iforce_process %d", being_used);
         being_used++;
 
 #ifdef CONFIG_JOYSTICK_IFORCE_232
@@ -266,7 +265,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
                         return -1;
                 }
 #else
-                printk(KERN_ERR "iforce_get_id_packet: iforce->bus = USB!\n");
+                err("iforce_get_id_packet: iforce->bus = USB!");
 #endif
                 break;
 
@@ -284,13 +283,12 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
                         return -1;
                 }
 #else
-                printk(KERN_ERR "iforce_get_id_packet: iforce->bus = SERIO!\n");
+                err("iforce_get_id_packet: iforce->bus = SERIO!");
 #endif
                 break;
 
         default:
-                printk(KERN_ERR "iforce_get_id_packet: iforce->bus = %d\n",
-                       iforce->bus);
+                err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);
                 break;
         }
 
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index ec4be535f483..7b4bc19cef27 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -2,7 +2,7 @@
  * $Id: iforce-serio.c,v 1.4 2002/01/28 22:45:00 jdeneux Exp $
  *
  *  Copyright (c) 2000-2001 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 80cdebcbcb99..750099d8e3c6 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -2,7 +2,7 @@
  * $Id: iforce-usb.c,v 1.16 2002/06/09 11:08:04 jdeneux Exp $
  *
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001-2002 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
@@ -65,7 +65,7 @@ void iforce_usb_xmit(struct iforce *iforce)
         XMIT_INC(iforce->xmit.tail, n);
 
         if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {
-                printk(KERN_WARNING "iforce-usb.c: iforce_usb_xmit: usb_submit_urb failed %d\n", n);
+                warn("usb_submit_urb failed %d\n", n);
         }
 
         /* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
@@ -110,7 +110,7 @@ static void iforce_usb_out(struct urb *urb)
         struct iforce *iforce = urb->context;
 
         if (urb->status) {
-                printk(KERN_DEBUG "iforce_usb_out: urb->status %d, exiting", urb->status);
+                dbg("urb->status %d, exiting", urb->status);
                 return;
         }
 
@@ -190,10 +190,9 @@ fail:
 /* Called by iforce_delete() */
 void iforce_usb_delete(struct iforce* iforce)
 {
-        usb_unlink_urb(iforce->irq);
-/* Is it ok to unlink those ? */
-        usb_unlink_urb(iforce->out);
-        usb_unlink_urb(iforce->ctrl);
+        usb_kill_urb(iforce->irq);
+        usb_kill_urb(iforce->out);
+        usb_kill_urb(iforce->ctrl);
 
         usb_free_urb(iforce->irq);
         usb_free_urb(iforce->out);
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index ffaeaefa1a42..dadcf4fb92ae 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -2,7 +2,7 @@
  * $Id: iforce.h,v 1.13 2002/07/07 10:22:50 jdeneux Exp $
  *
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
- *  Copyright (c) 2001-2002 Johann Deneux <deneux@ifrance.com>
+ *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
  *
  *  USB/RS232 I-Force joysticks and wheels.
  */
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index fec8b3d0967d..1aec1e9d7c59 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -185,7 +185,7 @@ static void interact_poll(struct gameport *gameport)
 
 static int interact_open(struct input_dev *dev)
 {
-        struct interact *interact = dev->private;
+        struct interact *interact = input_get_drvdata(dev);
 
         gameport_start_polling(interact->gameport);
         return 0;
@@ -197,7 +197,7 @@ static int interact_open(struct input_dev *dev)
 
 static void interact_close(struct input_dev *dev)
 {
-        struct interact *interact = dev->private;
+        struct interact *interact = input_get_drvdata(dev);
 
         gameport_stop_polling(interact->gameport);
 }
@@ -262,7 +262,9 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_INTERACT;
         input_dev->id.product = interact_type[i].id;
         input_dev->id.version = 0x0100;
-        input_dev->private = interact;
+        input_dev->dev.parent = &gameport->dev;
+
+        input_set_drvdata(input_dev, interact);
 
         input_dev->open = interact_open;
         input_dev->close = interact_close;
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 4112789f1196..b35604ee43ae 100644
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -168,8 +168,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_MAGELLAN;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = magellan;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index e58b22c018e4..2adf73f63c94 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -509,7 +509,7 @@ static void sw_poll(struct gameport *gameport)
 
 static int sw_open(struct input_dev *dev)
 {
-        struct sw *sw = dev->private;
+        struct sw *sw = input_get_drvdata(dev);
 
         gameport_start_polling(sw->gameport);
         return 0;
@@ -517,7 +517,7 @@ static int sw_open(struct input_dev *dev)
 
 static void sw_close(struct input_dev *dev)
 {
-        struct sw *sw = dev->private;
+        struct sw *sw = input_get_drvdata(dev);
 
         gameport_stop_polling(sw->gameport);
 }
@@ -751,8 +751,9 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->id.vendor = GAMEPORT_ID_VENDOR_MICROSOFT;
                 input_dev->id.product = sw->type;
                 input_dev->id.version = 0x0100;
-                input_dev->cdev.dev = &gameport->dev;
-                input_dev->private = sw;
+                input_dev->dev.parent = &gameport->dev;
+
+                input_set_drvdata(input_dev, sw);
 
                 input_dev->open = sw_open;
                 input_dev->close = sw_close;
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index 08bf113e62eb..abb7c4cf54ad 100644
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -226,8 +226,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_SPACEBALL;
         input_dev->id.product = id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = spaceball;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index c9c79211af71..c4937f1e837c 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -183,8 +183,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_SPACEORB;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = spaceorb;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index ecb0916215fa..8581ee991d4e 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -154,8 +154,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_STINGER;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = stinger;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_A)] = BIT(BTN_A) | BIT(BTN_B) | BIT(BTN_C) | BIT(BTN_X) |
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index bb23ed2a04a6..3b36ee04f726 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -265,7 +265,7 @@ static void tmdc_poll(struct gameport *gameport)
 
 static int tmdc_open(struct input_dev *dev)
 {
-        struct tmdc *tmdc = dev->private;
+        struct tmdc *tmdc = input_get_drvdata(dev);
 
         gameport_start_polling(tmdc->gameport);
         return 0;
@@ -273,7 +273,7 @@ static int tmdc_open(struct input_dev *dev)
 
 static void tmdc_close(struct input_dev *dev)
 {
-        struct tmdc *tmdc = dev->private;
+        struct tmdc *tmdc = input_get_drvdata(dev);
 
         gameport_stop_polling(tmdc->gameport);
 }
@@ -326,8 +326,9 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
         input_dev->id.vendor = GAMEPORT_ID_VENDOR_THRUSTMASTER;
         input_dev->id.product = model->id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &tmdc->gameport->dev;
-        input_dev->private = tmdc;
+        input_dev->dev.parent = &tmdc->gameport->dev;
+
+        input_set_drvdata(input_dev, tmdc);
 
         input_dev->open = tmdc_open;
         input_dev->close = tmdc_close;
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 037d3487fcc7..0f2c60823b0b 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -122,7 +122,7 @@ static void tgfx_timer(unsigned long private)
 
 static int tgfx_open(struct input_dev *dev)
 {
-        struct tgfx *tgfx = dev->private;
+        struct tgfx *tgfx = input_get_drvdata(dev);
         int err;
 
         err = mutex_lock_interruptible(&tgfx->sem);
@@ -141,7 +141,7 @@ static int tgfx_open(struct input_dev *dev)
 
 static void tgfx_close(struct input_dev *dev)
 {
-        struct tgfx *tgfx = dev->private;
+        struct tgfx *tgfx = input_get_drvdata(dev);
 
         mutex_lock(&tgfx->sem);
         if (!--tgfx->used) {
@@ -224,7 +224,8 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                 input_dev->id.product = n_buttons[i];
                 input_dev->id.version = 0x0100;
 
-                input_dev->private = tgfx;
+                input_set_drvdata(input_dev, tgfx);
+
                 input_dev->open = tgfx_open;
                 input_dev->close = tgfx_close;
 
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index 9cf17d6ced82..c91504ec38eb 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -205,11 +205,9 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_TWIDJOY;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = twidjoy;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
         input_set_abs_params(input_dev, ABS_X, -50, 50, 4, 4);
         input_set_abs_params(input_dev, ABS_Y, -50, 50, 4, 4);
 
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 29d339acf430..4e85f72eefd7 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -160,8 +160,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_WARRIOR;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = warrior;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index f17e9c7d4b36..9f42e4d3649e 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -164,6 +164,17 @@ config KEYBOARD_AMIGA
           To compile this driver as a module, choose M here: the
           module will be called amikbd.
 
+config KEYBOARD_ATARI
+        tristate "Atari keyboard"
+        depends on ATARI
+        select ATARI_KBD_CORE
+        help
+          Say Y here if you are running Linux on any Atari and have a keyboard
+          attached.
+
+          To compile this driver as a module, choose M here: the
+          module will be called atakbd.
+
 config KEYBOARD_HIL_OLD
         tristate "HP HIL keyboard support (simple driver)"
         depends on GSC || HP300
@@ -203,6 +214,15 @@ config KEYBOARD_OMAP
           To compile this driver as a module, choose M here: the
           module will be called omap-keypad.
 
+config KEYBOARD_PXA27x
+        tristate "PXA27x keyboard support"
+        depends on PXA27x
+        help
+          Enable support for PXA27x matrix keyboard controller
+
+          To compile this driver as a module, choose M here: the
+          module will be called pxa27x_keyboard.
+
 config KEYBOARD_AAED2000
         tristate "AAED-2000 keyboard"
         depends on MACH_AAED2000
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 586a0fe53be6..28d211b87b14 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
 obj-$(CONFIG_KEYBOARD_LKKBD)            += lkkbd.o
 obj-$(CONFIG_KEYBOARD_XTKBD)            += xtkbd.o
 obj-$(CONFIG_KEYBOARD_AMIGA)            += amikbd.o
+obj-$(CONFIG_KEYBOARD_ATARI)            += atakbd.o
 obj-$(CONFIG_KEYBOARD_LOCOMO)           += locomokbd.o
 obj-$(CONFIG_KEYBOARD_NEWTON)           += newtonkbd.o
 obj-$(CONFIG_KEYBOARD_STOWAWAY)         += stowaway.o
@@ -17,6 +18,7 @@ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
 obj-$(CONFIG_KEYBOARD_HIL)              += hil_kbd.o
 obj-$(CONFIG_KEYBOARD_HIL_OLD)          += hilkbd.o
 obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
+obj-$(CONFIG_KEYBOARD_PXA27x)           += pxa27x_keyboard.o
 obj-$(CONFIG_KEYBOARD_AAED2000)         += aaed2000_kbd.o
 obj-$(CONFIG_KEYBOARD_GPIO)             += gpio_keys.o
 
diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c
index 65fcb6af63a8..3a37505f067c 100644
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
@@ -97,7 +97,7 @@ static void aaedkbd_work(void *data)
 
 static int aaedkbd_open(struct input_dev *indev)
 {
-        struct aaedkbd *aaedkbd = indev->private;
+        struct aaedkbd *aaedkbd = input_get_drvdata(indev);
 
         schedule_delayed_work(&aaedkbd->workq, msecs_to_jiffies(SCAN_INTERVAL));
 
@@ -106,7 +106,7 @@ static int aaedkbd_open(struct input_dev *indev)
 
 static void aaedkbd_close(struct input_dev *indev)
 {
-        struct aaedkbd *aaedkbd = indev->private;
+        struct aaedkbd *aaedkbd = input_get_drvdata(indev);
 
         cancel_delayed_work(&aaedkbd->workq);
         flush_scheduled_work();
@@ -141,8 +141,9 @@ static int __devinit aaedkbd_probe(struct platform_device *pdev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &pdev->dev;
-        input_dev->private = aaedkbd;
+        input_dev->dev.parent = &pdev->dev;
+
+        input_set_drvdata(input_dev, aaedkbd);
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
         input_dev->keycode = aaedkbd->keycode;
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
new file mode 100644
index 000000000000..ded1d6ac6ff3
--- /dev/null
+++ b/drivers/input/keyboard/atakbd.c
@@ -0,0 +1,134 @@
+/*
+ *  atakbd.c
+ *
+ *  Copyright (c) 2005 Michael Schmitz
+ *
+ * Based on amikbd.c, which is
+ *
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
+ *
+ *  Based on the work of:
+ *      Hamish Macdonald
+ */
+
+/*
+ * Atari keyboard driver for Linux/m68k
+ *
+ * The low level init and interrupt stuff is handled in arch/mm68k/atari/atakeyb.c
+ * (the keyboard ACIA also handles the mouse and joystick data, and the keyboard
+ * interrupt is shared with the MIDI ACIA so MIDI data also get handled there).
+ * This driver only deals with handing key events off to the input layer.
+ */
+
+/*
+ * 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
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+
+#include <asm/atariints.h>
+#include <asm/atarihw.h>
+#include <asm/atarikb.h>
+#include <asm/irq.h>
+
+MODULE_AUTHOR("Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>");
+MODULE_DESCRIPTION("Atari keyboard driver");
+MODULE_LICENSE("GPL");
+
+static unsigned char atakbd_keycode[0x72];
+
+static struct input_dev *atakbd_dev;
+
+static void atakbd_interrupt(unsigned char scancode, char down)
+{
+
+        if (scancode < 0x72) {          /* scancodes < 0xf2 are keys */
+
+                // report raw events here?
+
+                scancode = atakbd_keycode[scancode];
+
+                if (scancode == KEY_CAPSLOCK) { /* CapsLock is a toggle switch key on Amiga */
+                        input_report_key(atakbd_dev, scancode, 1);
+                        input_report_key(atakbd_dev, scancode, 0);
+                        input_sync(atakbd_dev);
+                } else {
+                        input_report_key(atakbd_dev, scancode, down);
+                        input_sync(atakbd_dev);
+                }
+        } else                          /* scancodes >= 0xf2 are mouse data, most likely */
+                printk(KERN_INFO "atakbd: unhandled scancode %x\n", scancode);
+
+        return;
+}
+
+static int __init atakbd_init(void)
+{
+        int i;
+
+        if (!ATARIHW_PRESENT(ST_MFP))
+                return -EIO;
+
+        // TODO: request_mem_region if not done in arch code
+
+        if (!(atakbd_dev = input_allocate_device()))
+                return -ENOMEM;
+
+        // need to init core driver if not already done so
+        if (atari_keyb_init())
+                return -ENODEV;
+
+        atakbd_dev->name = "Atari Keyboard";
+        atakbd_dev->phys = "atakbd/input0";
+        atakbd_dev->id.bustype = BUS_ATARI;
+        atakbd_dev->id.vendor = 0x0001;
+        atakbd_dev->id.product = 0x0001;
+        atakbd_dev->id.version = 0x0100;
+
+        atakbd_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        atakbd_dev->keycode = atakbd_keycode;
+        atakbd_dev->keycodesize = sizeof(unsigned char);
+        atakbd_dev->keycodemax = ARRAY_SIZE(atakbd_keycode);
+
+        for (i = 1; i < 0x72; i++) {
+                atakbd_keycode[i] = i;
+                set_bit(atakbd_keycode[i], atakbd_dev->keybit);
+        }
+
+        input_register_device(atakbd_dev);
+
+        atari_input_keyboard_interrupt_hook = atakbd_interrupt;
+
+        printk(KERN_INFO "input: %s at IKBD ACIA\n", atakbd_dev->name);
+
+        return 0;
+}
+
+static void __exit atakbd_exit(void)
+{
+        atari_input_keyboard_interrupt_hook = NULL;
+        input_unregister_device(atakbd_dev);
+}
+
+module_init(atakbd_init);
+module_exit(atakbd_exit);
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 663877076bc7..be1fe46cd308 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -586,7 +586,7 @@ static void atkbd_event_work(struct work_struct *work)
 
 static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct atkbd *atkbd = dev->private;
+        struct atkbd *atkbd = input_get_drvdata(dev);
 
         if (!atkbd->write)
                 return -1;
@@ -883,8 +883,9 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)
         input_dev->id.product = atkbd->translated ? 1 : atkbd->set;
         input_dev->id.version = atkbd->id;
         input_dev->event = atkbd_event;
-        input_dev->private = atkbd;
-        input_dev->cdev.dev = &atkbd->ps2dev.serio->dev;
+        input_dev->dev.parent = &atkbd->ps2dev.serio->dev;
+
+        input_set_drvdata(input_dev, atkbd);
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_MSC);
 
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 1016c94e65db..6578bfff644b 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -323,8 +323,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &pdev->dev;
-        input_dev->private = corgikbd;
+        input_dev->dev.parent = &pdev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
         input_dev->keycode = corgikbd->keycode;
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index ccf6df387b62..739212252b09 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -35,11 +35,14 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
         struct input_dev *input = platform_get_drvdata(pdev);
 
         for (i = 0; i < pdata->nbuttons; i++) {
-                int gpio = pdata->buttons[i].gpio;
+                struct gpio_keys_button *button = &pdata->buttons[i];
+                int gpio = button->gpio;
+
                 if (irq == gpio_to_irq(gpio)) {
-                        int state = (gpio_get_value(gpio) ? 1 : 0) ^ (pdata->buttons[i].active_low);
+                        unsigned int type = button->type ?: EV_KEY;
+                        int state = (gpio_get_value(gpio) ? 1 : 0) ^ button->active_low;
 
-                        input_report_key(input, pdata->buttons[i].keycode, state);
+                        input_event(input, type, button->code, !!state);
                         input_sync(input);
                 }
         }
@@ -63,8 +66,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
         input->name = pdev->name;
         input->phys = "gpio-keys/input0";
-        input->cdev.dev = &pdev->dev;
-        input->private = pdata;
+        input->dev.parent = &pdev->dev;
 
         input->id.bustype = BUS_HOST;
         input->id.vendor = 0x0001;
@@ -72,19 +74,21 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
         input->id.version = 0x0100;
 
         for (i = 0; i < pdata->nbuttons; i++) {
-                int code = pdata->buttons[i].keycode;
-                int irq = gpio_to_irq(pdata->buttons[i].gpio);
+                struct gpio_keys_button *button = &pdata->buttons[i];
+                int irq = gpio_to_irq(button->gpio);
+                unsigned int type = button->type ?: EV_KEY;
 
                 set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
                 error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
-                                     pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys",
+                                     button->desc ? button->desc : "gpio_keys",
                                      pdev);
                 if (error) {
                         printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n",
                                 irq, error);
                         goto fail;
                 }
-                set_bit(code, input->keybit);
+
+                input_set_capability(input, type, button->code);
         }
 
         error = input_register_device(input);
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 7cc9728b04df..cdd254f2e6c7 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -51,7 +51,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 
 #define HIL_KBD_SET1_UPBIT 0x01
 #define HIL_KBD_SET1_SHIFT 1
-static unsigned int hil_kbd_set1[HIL_KEYCODES_SET1_TBLSIZE] = 
+static unsigned int hil_kbd_set1[HIL_KEYCODES_SET1_TBLSIZE] __read_mostly =
         { HIL_KEYCODES_SET1 };
 
 #define HIL_KBD_SET2_UPBIT 0x01
@@ -60,10 +60,10 @@ static unsigned int hil_kbd_set1[HIL_KEYCODES_SET1_TBLSIZE] =
 
 #define HIL_KBD_SET3_UPBIT 0x80
 #define HIL_KBD_SET3_SHIFT 0
-static unsigned int hil_kbd_set3[HIL_KEYCODES_SET3_TBLSIZE] =
+static unsigned int hil_kbd_set3[HIL_KEYCODES_SET3_TBLSIZE] __read_mostly =
         { HIL_KEYCODES_SET3 };
 
-static char hil_language[][16] = { HIL_LOCALE_MAP };
+static const char hil_language[][16] = { HIL_LOCALE_MAP };
 
 struct hil_kbd {
         struct input_dev *dev;
@@ -94,10 +94,12 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
         idx = kbd->idx4/4;
         p = data[idx - 1];
 
-        if ((p & ~HIL_CMDCT_POL) == 
-            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL)) goto report;
-        if ((p & ~HIL_CMDCT_RPL) == 
-            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_RPL)) goto report;
+        if ((p & ~HIL_CMDCT_POL) ==
+            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL))
+                goto report;
+        if ((p & ~HIL_CMDCT_RPL) ==
+            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_RPL))
+                goto report;
 
         /* Not a poll response.  See if we are loading config records. */
         switch (p & HIL_PKT_DATA_MASK) {
@@ -107,27 +109,32 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
                 for (; i < HIL_KBD_MAX_LENGTH; i++)
                         kbd->idd[i] = 0;
                 break;
+
         case HIL_CMD_RSC:
                 for (i = 0; i < idx; i++)
                         kbd->rsc[i] = kbd->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_KBD_MAX_LENGTH; i++)
                         kbd->rsc[i] = 0;
                 break;
+
         case HIL_CMD_EXD:
                 for (i = 0; i < idx; i++)
                         kbd->exd[i] = kbd->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_KBD_MAX_LENGTH; i++)
                         kbd->exd[i] = 0;
                 break;
+
         case HIL_CMD_RNM:
                 for (i = 0; i < idx; i++)
                         kbd->rnm[i] = kbd->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_KBD_MAX_LENGTH + 1; i++)
                         kbd->rnm[i] = '\0';
                 break;
+
         default:
                 /* These occur when device isn't present */
-                if (p == (HIL_ERR_INT | HIL_PKT_CMD)) break; 
+                if (p == (HIL_ERR_INT | HIL_PKT_CMD))
+                        break;
                 /* Anything else we'd like to know about. */
                 printk(KERN_WARNING PREFIX "Device sent unknown record %x\n", p);
                 break;
@@ -139,16 +146,19 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
         switch (kbd->data[0] & HIL_POL_CHARTYPE_MASK) {
         case HIL_POL_CHARTYPE_NONE:
                 break;
+
         case HIL_POL_CHARTYPE_ASCII:
                 while (cnt < idx - 1)
                         input_report_key(dev, kbd->data[cnt++] & 0x7f, 1);
                 break;
+
         case HIL_POL_CHARTYPE_RSVD1:
         case HIL_POL_CHARTYPE_RSVD2:
         case HIL_POL_CHARTYPE_BINARY:
                 while (cnt < idx - 1)
                         input_report_key(dev, kbd->data[cnt++], 1);
                 break;
+
         case HIL_POL_CHARTYPE_SET1:
                 while (cnt < idx - 1) {
                         unsigned int key;
@@ -161,6 +171,7 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
                                 input_report_key(dev, key, !up);
                 }
                 break;
+
         case HIL_POL_CHARTYPE_SET2:
                 while (cnt < idx - 1) {
                         unsigned int key;
@@ -173,6 +184,7 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
                                 input_report_key(dev, key, !up);
                 }
                 break;
+
         case HIL_POL_CHARTYPE_SET3:
                 while (cnt < idx - 1) {
                         unsigned int key;
@@ -191,42 +203,43 @@ static void hil_kbd_process_record(struct hil_kbd *kbd)
         up(&kbd->sem);
 }
 
-static void hil_kbd_process_err(struct hil_kbd *kbd) {
+static void hil_kbd_process_err(struct hil_kbd *kbd)
+{
         printk(KERN_WARNING PREFIX "errored HIL packet\n");
         kbd->idx4 = 0;
         up(&kbd->sem);
 }
 
-static irqreturn_t hil_kbd_interrupt(struct serio *serio, 
-              unsigned char data, unsigned int flags)
+static irqreturn_t hil_kbd_interrupt(struct serio *serio,
+                                unsigned char data, unsigned int flags)
 {
         struct hil_kbd *kbd;
         hil_packet packet;
         int idx;
 
         kbd = serio_get_drvdata(serio);
-        if (kbd == NULL) {
-                BUG();
-                return IRQ_HANDLED;
-        }
+        BUG_ON(kbd == NULL);
 
         if (kbd->idx4 >= (HIL_KBD_MAX_LENGTH * sizeof(hil_packet))) {
                 hil_kbd_process_err(kbd);
                 return IRQ_HANDLED;
         }
         idx = kbd->idx4/4;
-        if (!(kbd->idx4 % 4)) kbd->data[idx] = 0;
+        if (!(kbd->idx4 % 4))
+                kbd->data[idx] = 0;
         packet = kbd->data[idx];
         packet |= ((hil_packet)data) << ((3 - (kbd->idx4 % 4)) * 8);
         kbd->data[idx] = packet;
 
         /* Records of N 4-byte hil_packets must terminate with a command. */
-        if ((++(kbd->idx4)) % 4) return IRQ_HANDLED;
+        if ((++(kbd->idx4)) % 4)
+                return IRQ_HANDLED;
         if ((packet & 0xffff0000) != HIL_ERR_INT) {
                 hil_kbd_process_err(kbd);
                 return IRQ_HANDLED;
         }
-        if (packet & HIL_PKT_CMD) hil_kbd_process_record(kbd);
+        if (packet & HIL_PKT_CMD)
+                hil_kbd_process_record(kbd);
         return IRQ_HANDLED;
 }
 
@@ -235,10 +248,7 @@ static void hil_kbd_disconnect(struct serio *serio)
         struct hil_kbd *kbd;
 
         kbd = serio_get_drvdata(serio);
-        if (kbd == NULL) {
-                BUG();
-                return;
-        }
+        BUG_ON(kbd == NULL);
 
         serio_close(serio);
         input_unregister_device(kbd->dev);
@@ -259,42 +269,40 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         if (!kbd->dev)
                 goto bail0;
 
-        kbd->dev->private = kbd;
-
         if (serio_open(serio, drv))
                 goto bail1;
 
         serio_set_drvdata(serio, kbd);
         kbd->serio = serio;
 
-        init_MUTEX_LOCKED(&(kbd->sem));
+        init_MUTEX_LOCKED(&kbd->sem);
 
         /* Get device info.  MLC driver supplies devid/status/etc. */
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_IDD);
-        down(&(kbd->sem));
+        down(&kbd->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_RSC);
-        down(&(kbd->sem));
+        down(&kbd->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_RNM);
-        down(&(kbd->sem));
+        down(&kbd->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_EXD);
-        down(&(kbd->sem));
+        down(&kbd->sem);
 
-        up(&(kbd->sem));
+        up(&kbd->sem);
 
         did = kbd->idd[0];
         idd = kbd->idd + 1;
@@ -310,12 +318,11 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
                 goto bail2;
         }
 
-        if(HIL_IDD_NUM_BUTTONS(idd) || HIL_IDD_NUM_AXES_PER_SET(*idd)) {
+        if (HIL_IDD_NUM_BUTTONS(idd) || HIL_IDD_NUM_AXES_PER_SET(*idd)) {
                 printk(KERN_INFO PREFIX "keyboards only, no combo devices supported.\n");
                 goto bail2;
         }
 
-
         kbd->dev->evbit[0]      = BIT(EV_KEY) | BIT(EV_REP);
         kbd->dev->ledbit[0]     = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
         kbd->dev->keycodemax    = HIL_KEYCODES_SET1_TBLSIZE;
@@ -328,7 +335,7 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         kbd->dev->id.vendor     = PCI_VENDOR_ID_HP;
         kbd->dev->id.product    = 0x0001; /* TODO: get from kbd->rsc */
         kbd->dev->id.version    = 0x0100; /* TODO: get from kbd->rsc */
-        kbd->dev->cdev.dev      = &serio->dev;
+        kbd->dev->dev.parent    = &serio->dev;
 
         for (i = 0; i < 128; i++) {
                 set_bit(hil_kbd_set1[i], kbd->dev->keybit);
@@ -344,8 +351,8 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_EK1); /* Enable Keyswitch Autorepeat 1 */
-        down(&(kbd->sem));
-        up(&(kbd->sem));
+        down(&kbd->sem);
+        up(&kbd->sem);
 
         return 0;
  bail2:
@@ -368,26 +375,26 @@ static struct serio_device_id hil_kbd_ids[] = {
         { 0 }
 };
 
-struct serio_driver hil_kbd_serio_drv = {
+static struct serio_driver hil_kbd_serio_drv = {
         .driver         = {
                 .name   = "hil_kbd",
         },
         .description    = "HP HIL keyboard driver",
         .id_table       = hil_kbd_ids,
-        .connect        = hil_kbd_connect,
-        .disconnect     = hil_kbd_disconnect,
-        .interrupt      = hil_kbd_interrupt
+        .connect        = hil_kbd_connect,
+        .disconnect     = hil_kbd_disconnect,
+        .interrupt      = hil_kbd_interrupt
 };
 
 static int __init hil_kbd_init(void)
 {
         return serio_register_driver(&hil_kbd_serio_drv);
 }
-                
+
 static void __exit hil_kbd_exit(void)
 {
         serio_unregister_driver(&hil_kbd_serio_drv);
 }
-                        
+
 module_init(hil_kbd_init);
 module_exit(hil_kbd_exit);
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 4de4dc297d50..499b6974457f 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 1998 Philip Blundell <philb@gnu.org>
  *  Copyright (C) 1999 Matthew Wilcox <willy@bofh.ai>
- *  Copyright (C) 1999-2006 Helge Deller <deller@gmx.de>
+ *  Copyright (C) 1999-2007 Helge Deller <deller@gmx.de>
  *
  *  Very basic HP Human Interface Loop (HIL) driver.
  *  This driver handles the keyboard on HP300 (m68k) and on some
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL v2");
 
 #elif defined(CONFIG_HP300)
 
- #define HILBASE                0xf0428000 /* HP300 (m86k) port address */
+ #define HILBASE                0xf0428000UL /* HP300 (m68k) port address */
  #define HIL_DATA               0x1
  #define HIL_CMD                0x3
  #define HIL_IRQ                2
@@ -89,7 +89,7 @@ MODULE_LICENSE("GPL v2");
 #define HIL_READKBDSADR         0xF9
 #define HIL_WRITEKBDSADR        0xE9
 
-static unsigned int hphilkeyb_keycode[HIL_KEYCODES_SET1_TBLSIZE] =
+static unsigned int hphilkeyb_keycode[HIL_KEYCODES_SET1_TBLSIZE] __read_mostly =
         { HIL_KEYCODES_SET1 };
 
 /* HIL structure */
@@ -211,10 +211,10 @@ hil_keyb_init(void)
                 return -ENODEV; /* already initialized */
         }
 
+        spin_lock_init(&hil_dev.lock);
         hil_dev.dev = input_allocate_device();
         if (!hil_dev.dev)
                 return -ENOMEM;
-        hil_dev.dev->private = &hil_dev;
 
 #if defined(CONFIG_HP300)
         if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 3d4d0a0ede28..1b08f4e79dd2 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -515,7 +515,7 @@ static int
 lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
                 int value)
 {
-        struct lkkbd *lk = dev->private;
+        struct lkkbd *lk = input_get_drvdata (dev);
         unsigned char leds_on = 0;
         unsigned char leds_off = 0;
 
@@ -666,9 +666,10 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_LKKBD;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
         input_dev->event = lkkbd_event;
-        input_dev->private = lk;
+
+        input_set_drvdata (input_dev, lk);
 
         set_bit (EV_KEY, input_dev->evbit);
         set_bit (EV_LED, input_dev->evbit);
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index 2ade5186cc41..7a41b271f222 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -231,7 +231,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->private = locomokbd;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
         input_dev->keycode = locomokbd->keycode;
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index aa29b50765c9..b97a41e3ee56 100644
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -104,8 +104,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_NEWTON;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = nkbd;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
         input_dev->keycode = nkbd->keycode;
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 5680a6d95b2b..3a228634f101 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -370,8 +370,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
                 set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
         input_dev->name = "omap-keypad";
         input_dev->phys = "omap-keypad/input0";
-        input_dev->cdev.dev = &pdev->dev;
-        input_dev->private = omap_kp;
+        input_dev->dev.parent = &pdev->dev;
 
         input_dev->id.bustype = BUS_HOST;
         input_dev->id.vendor = 0x0001;
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c
new file mode 100644
index 000000000000..06eaf766d9d2
--- /dev/null
+++ b/drivers/input/keyboard/pxa27x_keyboard.c
@@ -0,0 +1,258 @@
+/*
+ * linux/drivers/input/keyboard/pxa27x_keyboard.c
+ *
+ * Driver for the pxa27x matrix keyboard controller.
+ *
+ * Created:     Feb 22, 2007
+ * Author:      Rodolfo Giometti <giometti@linux.it>
+ *
+ * Based on a previous implementations by Kevin O'Connor
+ * <kevin_at_koconnor.net> and Alex Osborne <bobofdoom@gmail.com> and
+ * on some suggestions by Nicolas Pitre <nico@cam.org>.
+ *
+ * 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/init.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <asm/arch/hardware.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/irqs.h>
+#include <asm/arch/pxa27x_keyboard.h>
+
+#define DRIVER_NAME             "pxa27x-keyboard"
+
+#define KPASMKP(col)            (col/2 == 0 ? KPASMKP0 : \
+                                 col/2 == 1 ? KPASMKP1 : \
+                                 col/2 == 2 ? KPASMKP2 : KPASMKP3)
+#define KPASMKPx_MKC(row, col)  (1 << (row + 16 * (col % 2)))
+
+static irqreturn_t pxakbd_irq_handler(int irq, void *dev_id)
+{
+        struct platform_device *pdev = dev_id;
+        struct pxa27x_keyboard_platform_data *pdata = pdev->dev.platform_data;
+        struct input_dev *input_dev = platform_get_drvdata(pdev);
+        unsigned long kpc = KPC;
+        int p, row, col, rel;
+
+        if (kpc & KPC_DI) {
+                unsigned long kpdk = KPDK;
+
+                if (!(kpdk & KPDK_DKP)) {
+                        /* better luck next time */
+                } else if (kpc & KPC_REE0) {
+                        unsigned long kprec = KPREC;
+                        KPREC = 0x7f;
+
+                        if (kprec & KPREC_OF0)
+                                rel = (kprec & 0xff) + 0x7f;
+                        else if (kprec & KPREC_UF0)
+                                rel = (kprec & 0xff) - 0x7f - 0xff;
+                        else
+                                rel = (kprec & 0xff) - 0x7f;
+
+                        if (rel) {
+                                input_report_rel(input_dev, REL_WHEEL, rel);
+                                input_sync(input_dev);
+                        }
+                }
+        }
+
+        if (kpc & KPC_MI) {
+                /* report the status of every button */
+                for (row = 0; row < pdata->nr_rows; row++) {
+                        for (col = 0; col < pdata->nr_cols; col++) {
+                                p = KPASMKP(col) & KPASMKPx_MKC(row, col) ?
+                                        1 : 0;
+                                pr_debug("keycode %x - pressed %x\n",
+                                                pdata->keycodes[row][col], p);
+                                input_report_key(input_dev,
+                                                pdata->keycodes[row][col], p);
+                        }
+                }
+                input_sync(input_dev);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int pxakbd_open(struct input_dev *dev)
+{
+        /* Set keypad control register */
+        KPC |= (KPC_ASACT |
+                KPC_MS_ALL |
+                (2 << 6) | KPC_REE0 | KPC_DK_DEB_SEL |
+                KPC_ME | KPC_MIE | KPC_DE | KPC_DIE);
+
+        KPC &= ~KPC_AS;         /* disable automatic scan */
+        KPC &= ~KPC_IMKP;       /* do not ignore multiple keypresses */
+
+        /* Set rotary count to mid-point value */
+        KPREC = 0x7F;
+
+        /* Enable unit clock */
+        pxa_set_cken(CKEN19_KEYPAD, 1);
+
+        return 0;
+}
+
+static void pxakbd_close(struct input_dev *dev)
+{
+        /* Disable clock unit */
+        pxa_set_cken(CKEN19_KEYPAD, 0);
+}
+
+#ifdef CONFIG_PM
+static int pxakbd_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct pxa27x_keyboard_platform_data *pdata = pdev->dev.platform_data;
+
+        /* Save controller status */
+        pdata->reg_kpc = KPC;
+        pdata->reg_kprec = KPREC;
+
+        return 0;
+}
+
+static int pxakbd_resume(struct platform_device *pdev)
+{
+        struct pxa27x_keyboard_platform_data *pdata = pdev->dev.platform_data;
+        struct input_dev *input_dev = platform_get_drvdata(pdev);
+
+        mutex_lock(&input_dev->mutex);
+
+        if (input_dev->users) {
+                /* Restore controller status */
+                KPC = pdata->reg_kpc;
+                KPREC = pdata->reg_kprec;
+
+                /* Enable unit clock */
+                pxa_set_cken(CKEN19_KEYPAD, 1);
+        }
+
+        mutex_unlock(&input_dev->mutex);
+
+        return 0;
+}
+#else
+#define pxakbd_suspend  NULL
+#define pxakbd_resume   NULL
+#endif
+
+static int __devinit pxakbd_probe(struct platform_device *pdev)
+{
+        struct pxa27x_keyboard_platform_data *pdata = pdev->dev.platform_data;
+        struct input_dev *input_dev;
+        int i, row, col, error;
+
+        /* Create and register the input driver. */
+        input_dev = input_allocate_device();
+        if (!input_dev) {
+                printk(KERN_ERR "Cannot request keypad device\n");
+                return -ENOMEM;
+        }
+
+        input_dev->name = DRIVER_NAME;
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->open = pxakbd_open;
+        input_dev->close = pxakbd_close;
+        input_dev->dev.parent = &pdev->dev;
+
+        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
+        input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
+        for (row = 0; row < pdata->nr_rows; row++) {
+                for (col = 0; col < pdata->nr_cols; col++) {
+                        int code = pdata->keycodes[row][col];
+                        if (code > 0)
+                                set_bit(code, input_dev->keybit);
+                }
+        }
+
+        error = request_irq(IRQ_KEYPAD, pxakbd_irq_handler, IRQF_DISABLED,
+                            DRIVER_NAME, pdev);
+        if (error) {
+                printk(KERN_ERR "Cannot request keypad IRQ\n");
+                pxa_set_cken(CKEN19_KEYPAD, 0);
+                goto err_free_dev;
+        }
+
+        platform_set_drvdata(pdev, input_dev);
+
+        /* Register the input device */
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_free_irq;
+
+        /* Setup GPIOs. */
+        for (i = 0; i < pdata->nr_rows + pdata->nr_cols; i++)
+                pxa_gpio_mode(pdata->gpio_modes[i]);
+
+        /*
+         * Store rows/cols info into keyboard registers.
+         */
+
+        KPC |= (pdata->nr_rows - 1) << 26;
+        KPC |= (pdata->nr_cols - 1) << 23;
+
+        for (col = 0; col < pdata->nr_cols; col++)
+                KPC |= KPC_MS0 << col;
+
+        return 0;
+
+ err_free_irq:
+        platform_set_drvdata(pdev, NULL);
+        free_irq(IRQ_KEYPAD, pdev);
+ err_free_dev:
+        input_free_device(input_dev);
+        return error;
+}
+
+static int __devexit pxakbd_remove(struct platform_device *pdev)
+{
+        struct input_dev *input_dev = platform_get_drvdata(pdev);
+
+        input_unregister_device(input_dev);
+        free_irq(IRQ_KEYPAD, pdev);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver pxakbd_driver = {
+        .probe          = pxakbd_probe,
+        .remove         = __devexit_p(pxakbd_remove),
+        .suspend        = pxakbd_suspend,
+        .resume         = pxakbd_resume,
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
+};
+
+static int __init pxakbd_init(void)
+{
+        return platform_driver_register(&pxakbd_driver);
+}
+
+static void __exit pxakbd_exit(void)
+{
+        platform_driver_unregister(&pxakbd_driver);
+}
+
+module_init(pxakbd_init);
+module_exit(pxakbd_exit);
+
+MODULE_DESCRIPTION("PXA27x Matrix Keyboard Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 8a2166c77ff4..41b80385476c 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -372,10 +372,9 @@ static int __init spitzkbd_probe(struct platform_device *dev)
 
         spitzkbd->input = input_dev;
 
-        input_dev->private = spitzkbd;
         input_dev->name = "Spitz Keyboard";
         input_dev->phys = spitzkbd->phys;
-        input_dev->cdev.dev = &dev->dev;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->id.bustype = BUS_HOST;
         input_dev->id.vendor = 0x0001;
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c
index f7b5c5b81451..b44b0684d543 100644
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -108,8 +108,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_STOWAWAY;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = skbd;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
         input_dev->keycode = skbd->keycode;
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index cc0238366414..1d4e39624cfe 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -146,7 +146,7 @@ out:
 
 static int sunkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct sunkbd *sunkbd = dev->private;
+        struct sunkbd *sunkbd = input_get_drvdata(dev);
 
         switch (type) {
 
@@ -271,8 +271,10 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor  = SERIO_SUNKBD;
         input_dev->id.product = sunkbd->type;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = sunkbd;
+        input_dev->dev.parent = &serio->dev;
+
+        input_set_drvdata(input_dev, sunkbd);
+
         input_dev->event = sunkbd_event;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_SND) | BIT(EV_REP);
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index a82093432138..f3a56eb58ed1 100644
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -108,8 +108,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor  = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = xtkbd;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
         input_dev->keycode = xtkbd->keycode;
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 41b42587f5e9..1d0d3e765db6 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -40,6 +40,16 @@ config INPUT_M68K_BEEP
         tristate "M68k Beeper support"
         depends on M68K
 
+config INPUT_COBALT_BTNS
+        tristate "Cobalt button interface"
+        depends on MIPS_COBALT
+        select INPUT_POLLDEV
+        help
+          Say Y here if you want to support MIPS Cobalt button interface.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cobalt_btns.
+
 config INPUT_WISTRON_BTNS
         tristate "x86 Wistron laptop button interface"
         depends on X86 && !X86_64
@@ -81,8 +91,19 @@ config INPUT_UINPUT
           To compile this driver as a module, choose M here: the
           module will be called uinput.
 
+config INPUT_POLLDEV
+        tristate "Polled input device skeleton"
+        help
+          Say Y here if you are using a driver for an input
+          device that periodically polls hardware state. This
+          option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
+
+          To compile this driver as a module, choose M here: the
+          module will be called input-polldev.
+
 config HP_SDC_RTC
-        tristate "HP SDC Real Time Clock"       
+        tristate "HP SDC Real Time Clock"
         depends on GSC || HP300
         select HP_SDC
         help
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index e0a8d58c9e9b..21e3cca0d33e 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,10 +4,12 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_INPUT_POLLDEV)             += input-polldev.o
 obj-$(CONFIG_INPUT_SPARCSPKR)           += sparcspkr.o
 obj-$(CONFIG_INPUT_PCSPKR)              += pcspkr.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
+obj-$(CONFIG_INPUT_COBALT_BTNS)         += cobalt_btns.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)        += wistron_btns.o
 obj-$(CONFIG_INPUT_ATLAS_BTNS)          += atlas_btns.o
 obj-$(CONFIG_HP_SDC_RTC)                += hp_sdc_rtc.o
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
new file mode 100644
index 000000000000..064b07936019
--- /dev/null
+++ b/drivers/input/misc/cobalt_btns.c
@@ -0,0 +1,172 @@
+/*
+ *  Cobalt button interface driver.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/init.h>
+#include <linux/input-polldev.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#define BUTTONS_POLL_INTERVAL   30      /* msec */
+#define BUTTONS_COUNT_THRESHOLD 3
+#define BUTTONS_STATUS_MASK     0xfe000000
+
+struct buttons_dev {
+        struct input_polled_dev *poll_dev;
+        void __iomem *reg;
+};
+
+struct buttons_map {
+        uint32_t mask;
+        int keycode;
+        int count;
+};
+
+static struct buttons_map buttons_map[] = {
+        { 0x02000000, KEY_RESTART, },
+        { 0x04000000, KEY_LEFT, },
+        { 0x08000000, KEY_UP, },
+        { 0x10000000, KEY_DOWN, },
+        { 0x20000000, KEY_RIGHT, },
+        { 0x40000000, KEY_ENTER, },
+        { 0x80000000, KEY_SELECT, },
+};
+
+static void handle_buttons(struct input_polled_dev *dev)
+{
+        struct buttons_map *button = buttons_map;
+        struct buttons_dev *bdev = dev->private;
+        struct input_dev *input = dev->input;
+        uint32_t status;
+        int i;
+
+        status = readl(bdev->reg);
+        status = ~status & BUTTONS_STATUS_MASK;
+
+        for (i = 0; i < ARRAY_SIZE(buttons_map); i++) {
+                if (status & button->mask) {
+                        button->count++;
+                } else {
+                        if (button->count >= BUTTONS_COUNT_THRESHOLD) {
+                                input_report_key(input, button->keycode, 0);
+                                input_sync(input);
+                        }
+                        button->count = 0;
+                }
+
+                if (button->count == BUTTONS_COUNT_THRESHOLD) {
+                        input_report_key(input, button->keycode, 1);
+                        input_sync(input);
+                }
+
+                button++;
+        }
+}
+
+static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
+{
+        struct buttons_dev *bdev;
+        struct input_polled_dev *poll_dev;
+        struct input_dev *input;
+        struct resource *res;
+        int error, i;
+
+        bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
+        poll_dev = input_allocate_polled_device();
+        if (!bdev || !poll_dev) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        poll_dev->private = bdev;
+        poll_dev->poll = handle_buttons;
+        poll_dev->poll_interval = BUTTONS_POLL_INTERVAL;
+
+        input = poll_dev->input;
+        input->name = "Cobalt buttons";
+        input->phys = "cobalt/input0";
+        input->id.bustype = BUS_HOST;
+        input->cdev.dev = &pdev->dev;
+
+        input->evbit[0] = BIT(EV_KEY);
+        for (i = 0; i < ARRAY_SIZE(buttons_map); i++) {
+                set_bit(buttons_map[i].keycode, input->keybit);
+                buttons_map[i].count = 0;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                error = -EBUSY;
+                goto err_free_mem;
+        }
+
+        bdev->poll_dev = poll_dev;
+        bdev->reg = ioremap(res->start, res->end - res->start + 1);
+        dev_set_drvdata(&pdev->dev, bdev);
+
+        error = input_register_polled_device(poll_dev);
+        if (error)
+                goto err_iounmap;
+
+        return 0;
+
+ err_iounmap:
+        iounmap(bdev->reg);
+ err_free_mem:
+        input_free_polled_device(poll_dev);
+        kfree(bdev);
+        dev_set_drvdata(&pdev->dev, NULL);
+        return error;
+}
+
+static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct buttons_dev *bdev = dev_get_drvdata(dev);
+
+        input_unregister_polled_device(bdev->poll_dev);
+        input_free_polled_device(bdev->poll_dev);
+        iounmap(bdev->reg);
+        kfree(bdev);
+        dev_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver cobalt_buttons_driver = {
+        .probe  = cobalt_buttons_probe,
+        .remove = __devexit_p(cobalt_buttons_remove),
+        .driver = {
+                .name   = "Cobalt buttons",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init cobalt_buttons_init(void)
+{
+        return platform_driver_register(&cobalt_buttons_driver);
+}
+
+static void __exit cobalt_buttons_exit(void)
+{
+        platform_driver_unregister(&cobalt_buttons_driver);
+}
+
+module_init(cobalt_buttons_init);
+module_exit(cobalt_buttons_exit);
diff --git a/drivers/input/misc/input-polldev.c b/drivers/input/misc/input-polldev.c
new file mode 100644
index 000000000000..1b2b9c9c5d88
--- /dev/null
+++ b/drivers/input/misc/input-polldev.c
@@ -0,0 +1,171 @@
+/*
+ * Generic implementation of a polled input device
+
+ * Copyright (c) 2007 Dmitry Torokhov
+ *
+ * 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/jiffies.h>
+#include <linux/mutex.h>
+#include <linux/input-polldev.h>
+
+static DEFINE_MUTEX(polldev_mutex);
+static int polldev_users;
+static struct workqueue_struct *polldev_wq;
+
+static int input_polldev_start_workqueue(void)
+{
+        int retval;
+
+        retval = mutex_lock_interruptible(&polldev_mutex);
+        if (retval)
+                return retval;
+
+        if (!polldev_users) {
+                polldev_wq = create_singlethread_workqueue("ipolldevd");
+                if (!polldev_wq) {
+                        printk(KERN_ERR "input-polldev: failed to create "
+                                "ipolldevd workqueue\n");
+                        retval = -ENOMEM;
+                        goto out;
+                }
+        }
+
+        polldev_users++;
+
+ out:
+        mutex_unlock(&polldev_mutex);
+        return retval;
+}
+
+static void input_polldev_stop_workqueue(void)
+{
+        mutex_lock(&polldev_mutex);
+
+        if (!--polldev_users)
+                destroy_workqueue(polldev_wq);
+
+        mutex_unlock(&polldev_mutex);
+}
+
+static void input_polled_device_work(struct work_struct *work)
+{
+        struct input_polled_dev *dev =
+                container_of(work, struct input_polled_dev, work.work);
+
+        dev->poll(dev);
+        queue_delayed_work(polldev_wq, &dev->work,
+                           msecs_to_jiffies(dev->poll_interval));
+}
+
+static int input_open_polled_device(struct input_dev *input)
+{
+        struct input_polled_dev *dev = input->private;
+        int error;
+
+        error = input_polldev_start_workqueue();
+        if (error)
+                return error;
+
+        if (dev->flush)
+                dev->flush(dev);
+
+        queue_delayed_work(polldev_wq, &dev->work,
+                           msecs_to_jiffies(dev->poll_interval));
+
+        return 0;
+}
+
+static void input_close_polled_device(struct input_dev *input)
+{
+        struct input_polled_dev *dev = input->private;
+
+        cancel_rearming_delayed_workqueue(polldev_wq, &dev->work);
+        input_polldev_stop_workqueue();
+}
+
+/**
+ * input_allocate_polled_device - allocated memory polled device
+ *
+ * The function allocates memory for a polled device and also
+ * for an input device associated with this polled device.
+ */
+struct input_polled_dev *input_allocate_polled_device(void)
+{
+        struct input_polled_dev *dev;
+
+        dev = kzalloc(sizeof(struct input_polled_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        dev->input = input_allocate_device();
+        if (!dev->input) {
+                kfree(dev);
+                return NULL;
+        }
+
+        return dev;
+}
+EXPORT_SYMBOL(input_allocate_polled_device);
+
+/**
+ * input_free_polled_device - free memory allocated for polled device
+ * @dev: device to free
+ *
+ * The function frees memory allocated for polling device and drops
+ * reference to the associated input device (if present).
+ */
+void input_free_polled_device(struct input_polled_dev *dev)
+{
+        if (dev) {
+                input_free_device(dev->input);
+                kfree(dev);
+        }
+}
+EXPORT_SYMBOL(input_free_polled_device);
+
+/**
+ * input_register_polled_device - register polled device
+ * @dev: device to register
+ *
+ * The function registers previously initialized polled input device
+ * with input layer. The device should be allocated with call to
+ * input_allocate_polled_device(). Callers should also set up poll()
+ * method and set up capabilities (id, name, phys, bits) of the
+ * corresponing input_dev structure.
+ */
+int input_register_polled_device(struct input_polled_dev *dev)
+{
+        struct input_dev *input = dev->input;
+
+        INIT_DELAYED_WORK(&dev->work, input_polled_device_work);
+        if (!dev->poll_interval)
+                dev->poll_interval = 500;
+        input->private = dev;
+        input->open = input_open_polled_device;
+        input->close = input_close_polled_device;
+
+        return input_register_device(input);
+}
+EXPORT_SYMBOL(input_register_polled_device);
+
+/**
+ * input_unregister_polled_device - unregister polled device
+ * @dev: device to unregister
+ *
+ * The function unregisters previously registered polled input
+ * device from input layer. Polling is stopped and device is
+ * ready to be freed with call to input_free_polled_device().
+ * Callers should not attempt to access dev->input pointer
+ * after calling this function.
+ */
+void input_unregister_polled_device(struct input_polled_dev *dev)
+{
+        input_unregister_device(dev->input);
+        dev->input = NULL;
+}
+EXPORT_SYMBOL(input_unregister_polled_device);
+
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 105c6fc27823..3d4b619dadab 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
 
 static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        unsigned int pin = (unsigned int) dev->private;
+        unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
         unsigned int count = 0;
 
         if (type != EV_SND)
@@ -99,14 +99,15 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
         if (!input_dev)
                 return -ENOMEM;
 
-        input_dev->private = (void *) dev->id;
+        input_set_drvdata(input_dev, (void *) dev->id);
+
         input_dev->name = "ixp4xx beeper",
         input_dev->phys = "ixp4xx/gpio";
         input_dev->id.bustype = BUS_HOST;
         input_dev->id.vendor  = 0x001f;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &dev->dev;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->evbit[0] = BIT(EV_SND);
         input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
@@ -136,7 +137,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
 static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
 {
         struct input_dev *input_dev = platform_get_drvdata(dev);
-        unsigned int pin = (unsigned int) input_dev->private;
+        unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
 
         input_unregister_device(input_dev);
         platform_set_drvdata(dev, NULL);
@@ -153,7 +154,7 @@ static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
 static void ixp4xx_spkr_shutdown(struct platform_device *dev)
 {
         struct input_dev *input_dev = platform_get_drvdata(dev);
-        unsigned int pin = (unsigned int) input_dev->private;
+        unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
 
         /* turn off the speaker */
         disable_irq(IRQ_IXP4XX_TIMER2);
diff --git a/drivers/input/misc/m68kspkr.c b/drivers/input/misc/m68kspkr.c
index 8d6c3837badb..e9f26e766b4d 100644
--- a/drivers/input/misc/m68kspkr.c
+++ b/drivers/input/misc/m68kspkr.c
@@ -63,7 +63,7 @@ static int __devinit m68kspkr_probe(struct platform_device *dev)
         input_dev->id.vendor  = 0x001f;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &dev->dev;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->evbit[0] = BIT(EV_SND);
         input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index afd322185bbf..31989dcd922c 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -78,7 +78,7 @@ static int __devinit pcspkr_probe(struct platform_device *dev)
         pcspkr_dev->id.vendor = 0x001f;
         pcspkr_dev->id.product = 0x0001;
         pcspkr_dev->id.version = 0x0100;
-        pcspkr_dev->cdev.dev = &dev->dev;
+        pcspkr_dev->dev.parent = &dev->dev;
 
         pcspkr_dev->evbit[0] = BIT(EV_SND);
         pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 106c94f33b93..e36ec1d92be8 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -28,7 +28,7 @@ struct sparcspkr_state {
 
 static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
+        struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
         unsigned int count = 0;
         unsigned long flags;
 
@@ -61,7 +61,7 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in
 
 static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
+        struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
         unsigned int count = 0;
         unsigned long flags;
 
@@ -113,7 +113,7 @@ static int __devinit sparcspkr_probe(struct device *dev)
         input_dev->id.vendor = 0x001f;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = dev;
+        input_dev->dev.parent = dev;
 
         input_dev->evbit[0] = BIT(EV_SND);
         input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 42556232c523..031467eadd31 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -41,9 +41,7 @@
 
 static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct uinput_device    *udev;
-
-        udev = dev->private;
+        struct uinput_device    *udev = input_get_drvdata(dev);
 
         udev->buff[udev->head].type = type;
         udev->buff[udev->head].code = code;
@@ -136,7 +134,7 @@ static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *eff
         request.u.upload.effect = effect;
         request.u.upload.old = old;
 
-        retval = uinput_request_reserve_slot(dev->private, &request);
+        retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request);
         if (!retval)
                 retval = uinput_request_submit(dev, &request);
 
@@ -156,7 +154,7 @@ static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id)
         request.code = UI_FF_ERASE;
         request.u.effect_id = effect_id;
 
-        retval = uinput_request_reserve_slot(dev->private, &request);
+        retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request);
         if (!retval)
                 retval = uinput_request_submit(dev, &request);
 
@@ -274,7 +272,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
                 return -ENOMEM;
 
         udev->dev->event = uinput_dev_event;
-        udev->dev->private = udev;
+        input_set_drvdata(udev->dev, udev);
 
         return 0;
 }
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index e1183aeb8ed5..961aad7a0476 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -50,7 +50,7 @@
 MODULE_AUTHOR("Miloslav Trmac <mitr@volny.cz>");
 MODULE_DESCRIPTION("Wistron laptop button driver");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION("0.1");
+MODULE_VERSION("0.2");
 
 static int force; /* = 0; */
 module_param(force, bool, 0);
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(force, "Load even if computer is not in database");
 
 static char *keymap_name; /* = NULL; */
 module_param_named(keymap, keymap_name, charp, 0);
-MODULE_PARM_DESC(keymap, "Keymap name, if it can't be autodetected");
+MODULE_PARM_DESC(keymap, "Keymap name, if it can't be autodetected [generic, 1557/MS2141]");
 
 static struct platform_device *wistron_device;
 
@@ -233,10 +233,20 @@ static void bios_set_state(u8 subsys, int enable)
 struct key_entry {
         char type;              /* See KE_* below */
         u8 code;
-        unsigned keycode;       /* For KE_KEY */
+        union {
+                u16 keycode;            /* For KE_KEY */
+                struct {                /* For KE_SW */
+                        u8 code;
+                        u8 value;
+                } sw;
+        };
 };
 
-enum { KE_END, KE_KEY, KE_WIFI, KE_BLUETOOTH };
+enum { KE_END, KE_KEY, KE_SW, KE_WIFI, KE_BLUETOOTH };
+
+#define FE_MAIL_LED 0x01
+#define FE_WIFI_LED 0x02
+#define FE_UNTESTED 0x80
 
 static const struct key_entry *keymap; /* = NULL; Current key map */
 static int have_wifi;
@@ -256,93 +266,341 @@ static int __init dmi_matched(struct dmi_system_id *dmi)
         return 1;
 }
 
-static struct key_entry keymap_empty[] = {
+static struct key_entry keymap_empty[] __initdata = {
         { KE_END, 0 }
 };
 
-static struct key_entry keymap_fs_amilo_pro_v2000[] = {
-        { KE_KEY,  0x01, KEY_HELP },
-        { KE_KEY,  0x11, KEY_PROG1 },
-        { KE_KEY,  0x12, KEY_PROG2 },
-        { KE_WIFI, 0x30, 0 },
-        { KE_KEY,  0x31, KEY_MAIL },
-        { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {
+        { KE_KEY,  0x01, {KEY_HELP} },
+        { KE_KEY,  0x11, {KEY_PROG1} },
+        { KE_KEY,  0x12, {KEY_PROG2} },
+        { KE_WIFI, 0x30 },
+        { KE_KEY,  0x31, {KEY_MAIL} },
+        { KE_KEY,  0x36, {KEY_WWW} },
         { KE_END,  0 }
 };
 
-static struct key_entry keymap_fujitsu_n3510[] = {
-        { KE_KEY, 0x11, KEY_PROG1 },
-        { KE_KEY, 0x12, KEY_PROG2 },
-        { KE_KEY, 0x36, KEY_WWW },
-        { KE_KEY, 0x31, KEY_MAIL },
-        { KE_KEY, 0x71, KEY_STOPCD },
-        { KE_KEY, 0x72, KEY_PLAYPAUSE },
-        { KE_KEY, 0x74, KEY_REWIND },
-        { KE_KEY, 0x78, KEY_FORWARD },
+static struct key_entry keymap_fujitsu_n3510[] __initdata = {
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x71, {KEY_STOPCD} },
+        { KE_KEY, 0x72, {KEY_PLAYPAUSE} },
+        { KE_KEY, 0x74, {KEY_REWIND} },
+        { KE_KEY, 0x78, {KEY_FORWARD} },
         { KE_END, 0 }
 };
 
-static struct key_entry keymap_wistron_ms2111[] = {
-        { KE_KEY,  0x11, KEY_PROG1 },
-        { KE_KEY,  0x12, KEY_PROG2 },
-        { KE_KEY,  0x13, KEY_PROG3 },
-        { KE_KEY,  0x31, KEY_MAIL },
-        { KE_KEY,  0x36, KEY_WWW },
-        { KE_END,  0 }
+static struct key_entry keymap_wistron_ms2111[] __initdata = {
+        { KE_KEY,  0x11, {KEY_PROG1} },
+        { KE_KEY,  0x12, {KEY_PROG2} },
+        { KE_KEY,  0x13, {KEY_PROG3} },
+        { KE_KEY,  0x31, {KEY_MAIL} },
+        { KE_KEY,  0x36, {KEY_WWW} },
+        { KE_END, FE_MAIL_LED }
+};
+
+static struct key_entry keymap_wistron_md40100[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x37, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+        { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
 };
 
-static struct key_entry keymap_wistron_ms2141[] = {
-        { KE_KEY,  0x11, KEY_PROG1 },
-        { KE_KEY,  0x12, KEY_PROG2 },
-        { KE_WIFI, 0x30, 0 },
-        { KE_KEY,  0x22, KEY_REWIND },
-        { KE_KEY,  0x23, KEY_FORWARD },
-        { KE_KEY,  0x24, KEY_PLAYPAUSE },
-        { KE_KEY,  0x25, KEY_STOPCD },
-        { KE_KEY,  0x31, KEY_MAIL },
-        { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_wistron_ms2141[] __initdata = {
+        { KE_KEY,  0x11, {KEY_PROG1} },
+        { KE_KEY,  0x12, {KEY_PROG2} },
+        { KE_WIFI, 0x30 },
+        { KE_KEY,  0x22, {KEY_REWIND} },
+        { KE_KEY,  0x23, {KEY_FORWARD} },
+        { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+        { KE_KEY,  0x25, {KEY_STOPCD} },
+        { KE_KEY,  0x31, {KEY_MAIL} },
+        { KE_KEY,  0x36, {KEY_WWW} },
         { KE_END,  0 }
 };
 
-static struct key_entry keymap_acer_aspire_1500[] = {
-        { KE_KEY, 0x11, KEY_PROG1 },
-        { KE_KEY, 0x12, KEY_PROG2 },
-        { KE_WIFI, 0x30, 0 },
-        { KE_KEY, 0x31, KEY_MAIL },
-        { KE_KEY, 0x36, KEY_WWW },
-        { KE_BLUETOOTH, 0x44, 0 },
-        { KE_END, 0 }
+static struct key_entry keymap_acer_aspire_1500[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_WIFI, 0x30 },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x49, {KEY_CONFIG} },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_UNTESTED }
 };
 
-static struct key_entry keymap_acer_travelmate_240[] = {
-        { KE_KEY, 0x31, KEY_MAIL },
-        { KE_KEY, 0x36, KEY_WWW },
-        { KE_KEY, 0x11, KEY_PROG1 },
-        { KE_KEY, 0x12, KEY_PROG2 },
-        { KE_BLUETOOTH, 0x44, 0 },
-        { KE_WIFI, 0x30, 0 },
-        { KE_END, 0 }
+static struct key_entry keymap_acer_aspire_1600[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x49, {KEY_CONFIG} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+/* 3020 has been tested */
+static struct key_entry keymap_acer_aspire_5020[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x6a, {KEY_CONFIG} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_2410[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x6d, {KEY_POWER} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x6a, {KEY_CONFIG} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_110[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+        { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_SW, 0x4a, {.sw = {SW_LID, 1}} }, /* lid close */
+        { KE_SW, 0x4b, {.sw = {SW_LID, 0}} }, /* lid open */
+        { KE_WIFI, 0x30 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_300[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+        { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
 };
 
-static struct key_entry keymap_aopen_1559as[] = {
-        { KE_KEY,  0x01, KEY_HELP },
-        { KE_KEY,  0x06, KEY_PROG3 },
-        { KE_KEY,  0x11, KEY_PROG1 },
-        { KE_KEY,  0x12, KEY_PROG2 },
-        { KE_WIFI, 0x30, 0 },
-        { KE_KEY,  0x31, KEY_MAIL },
-        { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_acer_travelmate_380[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} }, /* not 370 */
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_WIFI, 0x30 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+/* unusual map */
+static struct key_entry keymap_acer_travelmate_220[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_MAIL} },
+        { KE_KEY, 0x12, {KEY_WWW} },
+        { KE_KEY, 0x13, {KEY_PROG2} },
+        { KE_KEY, 0x31, {KEY_PROG1} },
+        { KE_END, FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_230[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_END, FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_240[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_WIFI, 0x30 },
+        { KE_END, FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_350[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_MAIL} },
+        { KE_KEY, 0x14, {KEY_PROG3} },
+        { KE_KEY, 0x15, {KEY_WWW} },
+        { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_360[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_MAIL} },
+        { KE_KEY, 0x14, {KEY_PROG3} },
+        { KE_KEY, 0x15, {KEY_WWW} },
+        { KE_KEY, 0x40, {KEY_WLAN} },
+        { KE_END, FE_WIFI_LED | FE_UNTESTED } /* no mail led */
+};
+
+/* Wifi subsystem only activates the led. Therefore we need to pass
+ * wifi event as a normal key, then userspace can really change the wifi state.
+ * TODO we need to export led state to userspace (wifi and mail) */
+static struct key_entry keymap_acer_travelmate_610[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_KEY, 0x14, {KEY_MAIL} },
+        { KE_KEY, 0x15, {KEY_WWW} },
+        { KE_KEY, 0x40, {KEY_WLAN} },
+        { KE_END, FE_MAIL_LED | FE_WIFI_LED }
+};
+
+static struct key_entry keymap_acer_travelmate_630[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x08, {KEY_MUTE} }, /* not 620 */
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+        { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_WIFI, 0x30 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_aopen_1559as[] __initdata = {
+        { KE_KEY,  0x01, {KEY_HELP} },
+        { KE_KEY,  0x06, {KEY_PROG3} },
+        { KE_KEY,  0x11, {KEY_PROG1} },
+        { KE_KEY,  0x12, {KEY_PROG2} },
+        { KE_WIFI, 0x30 },
+        { KE_KEY,  0x31, {KEY_MAIL} },
+        { KE_KEY,  0x36, {KEY_WWW} },
         { KE_END,  0 },
 };
 
-static struct key_entry keymap_fs_amilo_d88x0[] = {
-        { KE_KEY, 0x01, KEY_HELP },
-        { KE_KEY, 0x08, KEY_MUTE },
-        { KE_KEY, 0x31, KEY_MAIL },
-        { KE_KEY, 0x36, KEY_WWW },
-        { KE_KEY, 0x11, KEY_PROG1 },
-        { KE_KEY, 0x12, KEY_PROG2 },
-        { KE_KEY, 0x13, KEY_PROG3 },
+static struct key_entry keymap_fs_amilo_d88x0[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_md2900[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_WIFI, 0x30 },
+        { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_md96500[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+        { KE_KEY, 0x06, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+        { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+        { KE_KEY, 0x22, {KEY_REWIND} },
+        { KE_KEY, 0x23, {KEY_FORWARD} },
+        { KE_KEY, 0x24, {KEY_PLAYPAUSE} },
+        { KE_KEY, 0x25, {KEY_STOPCD} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
+        { KE_END, FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_generic[] __initdata = {
+        { KE_KEY, 0x01, {KEY_HELP} },
+        { KE_KEY, 0x02, {KEY_CONFIG} },
+        { KE_KEY, 0x03, {KEY_POWER} },
+        { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+        { KE_KEY, 0x06, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+        { KE_KEY, 0x08, {KEY_MUTE} },
+        { KE_KEY, 0x11, {KEY_PROG1} },
+        { KE_KEY, 0x12, {KEY_PROG2} },
+        { KE_KEY, 0x13, {KEY_PROG3} },
+        { KE_KEY, 0x14, {KEY_MAIL} },
+        { KE_KEY, 0x15, {KEY_WWW} },
+        { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+        { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+        { KE_KEY, 0x22, {KEY_REWIND} },
+        { KE_KEY, 0x23, {KEY_FORWARD} },
+        { KE_KEY, 0x24, {KEY_PLAYPAUSE} },
+        { KE_KEY, 0x25, {KEY_STOPCD} },
+        { KE_KEY, 0x31, {KEY_MAIL} },
+        { KE_KEY, 0x36, {KEY_WWW} },
+        { KE_KEY, 0x37, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+        { KE_KEY, 0x40, {KEY_WLAN} },
+        { KE_KEY, 0x49, {KEY_CONFIG} },
+        { KE_SW, 0x4a, {.sw = {SW_LID, 1}} }, /* lid close */
+        { KE_SW, 0x4b, {.sw = {SW_LID, 0}} }, /* lid open */
+        { KE_KEY, 0x6a, {KEY_CONFIG} },
+        { KE_KEY, 0x6d, {KEY_POWER} },
+        { KE_KEY, 0x71, {KEY_STOPCD} },
+        { KE_KEY, 0x72, {KEY_PLAYPAUSE} },
+        { KE_KEY, 0x74, {KEY_REWIND} },
+        { KE_KEY, 0x78, {KEY_FORWARD} },
+        { KE_WIFI, 0x30 },
+        { KE_BLUETOOTH, 0x44 },
         { KE_END, 0 }
 };
 
@@ -390,6 +648,133 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer Aspire 1600",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1600"),
+                },
+                .driver_data = keymap_acer_aspire_1600
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer Aspire 3020",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3020"),
+                },
+                .driver_data = keymap_acer_aspire_5020
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer Aspire 5020",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5020"),
+                },
+                .driver_data = keymap_acer_aspire_5020
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 2100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2100"),
+                },
+                .driver_data = keymap_acer_aspire_5020
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 2410",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2410"),
+                },
+                .driver_data = keymap_acer_travelmate_2410
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate C300",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C300"),
+                },
+                .driver_data = keymap_acer_travelmate_300
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate C100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C100"),
+                },
+                .driver_data = keymap_acer_travelmate_300
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate C110",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C110"),
+                },
+                .driver_data = keymap_acer_travelmate_110
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 380",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 380"),
+                },
+                .driver_data = keymap_acer_travelmate_380
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 370",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 370"),
+                },
+                .driver_data = keymap_acer_travelmate_380 /* keyboard minus 1 key */
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 220",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 220"),
+                },
+                .driver_data = keymap_acer_travelmate_220
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 260",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 260"),
+                },
+                .driver_data = keymap_acer_travelmate_220
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 230",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 230"),
+                        /* acerhk looks for "TravelMate F4..." ?! */
+                },
+                .driver_data = keymap_acer_travelmate_230
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 280",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 280"),
+                },
+                .driver_data = keymap_acer_travelmate_230
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer TravelMate 240",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -399,6 +784,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer TravelMate 250",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 250"),
+                },
+                .driver_data = keymap_acer_travelmate_240
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer TravelMate 2424NWXCi",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -408,6 +802,51 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer TravelMate 350",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 350"),
+                },
+                .driver_data = keymap_acer_travelmate_350
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 360",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
+                },
+                .driver_data = keymap_acer_travelmate_360
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 610",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 610"),
+                },
+                .driver_data = keymap_acer_travelmate_610
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 620",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 620"),
+                },
+                .driver_data = keymap_acer_travelmate_630
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Acer TravelMate 630",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 630"),
+                },
+                .driver_data = keymap_acer_travelmate_630
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "AOpen 1559AS",
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "E2U"),
@@ -426,6 +865,51 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Medion MD 40100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "WID2000"),
+                },
+                .driver_data = keymap_wistron_md40100
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Medion MD 2900",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2000"),
+                },
+                .driver_data = keymap_wistron_md2900
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Medion MD 96500",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2040"),
+                },
+                .driver_data = keymap_wistron_md96500
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Medion MD 95400",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2050"),
+                },
+                .driver_data = keymap_wistron_md96500
+        },
+        {
+                .callback = dmi_matched,
+                .ident = "Fujitsu Siemens Amilo D7820",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), /* not sure */
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Amilo D"),
+                },
+                .driver_data = keymap_fs_amilo_d88x0
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Fujitsu Siemens Amilo D88x0",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
@@ -436,17 +920,39 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         { NULL, }
 };
 
+/* Copy the good keymap, as the original ones are free'd */
+static int __init copy_keymap(void)
+{
+        const struct key_entry *key;
+        struct key_entry *new_keymap;
+        unsigned int length = 1;
+
+        for (key = keymap; key->type != KE_END; key++)
+                length++;
+
+        new_keymap = kmalloc(length * sizeof(struct key_entry), GFP_KERNEL);
+        if (!new_keymap)
+                return -ENOMEM;
+
+        memcpy(new_keymap, keymap, length * sizeof(struct key_entry));
+        keymap = new_keymap;
+
+        return 0;
+}
+
 static int __init select_keymap(void)
 {
+        dmi_check_system(dmi_ids);
         if (keymap_name != NULL) {
                 if (strcmp (keymap_name, "1557/MS2141") == 0)
                         keymap = keymap_wistron_ms2141;
+                else if (strcmp (keymap_name, "generic") == 0)
+                        keymap = keymap_wistron_generic;
                 else {
                         printk(KERN_ERR "wistron_btns: Keymap unknown\n");
                         return -EINVAL;
                 }
         }
-        dmi_check_system(dmi_ids);
         if (keymap == NULL) {
                 if (!force) {
                         printk(KERN_ERR "wistron_btns: System unknown\n");
@@ -454,7 +960,8 @@ static int __init select_keymap(void)
                 }
                 keymap = keymap_empty;
         }
-        return 0;
+
+        return copy_keymap();
 }
 
  /* Input layer interface */
@@ -476,12 +983,28 @@ static int __devinit setup_input_dev(void)
         input_dev->cdev.dev = &wistron_device->dev;
 
         for (key = keymap; key->type != KE_END; key++) {
-                if (key->type == KE_KEY) {
-                        input_dev->evbit[LONG(EV_KEY)] = BIT(EV_KEY);
-                        set_bit(key->keycode, input_dev->keybit);
+                switch (key->type) {
+                        case KE_KEY:
+                                set_bit(EV_KEY, input_dev->evbit);
+                                set_bit(key->keycode, input_dev->keybit);
+                                break;
+
+                        case KE_SW:
+                                set_bit(EV_SW, input_dev->evbit);
+                                set_bit(key->sw.code, input_dev->swbit);
+                                break;
+
+                        default:
+                                ;
                 }
         }
 
+        /* reads information flags on KE_END */
+        if (key->code & FE_UNTESTED)
+                printk(KERN_WARNING "Untested laptop multimedia keys, "
+                        "please report success or failure to eric.piel"
+                        "@tremplin-utc.net\n");
+
         error = input_register_device(input_dev);
         if (error) {
                 input_free_device(input_dev);
@@ -499,6 +1022,12 @@ static void report_key(unsigned keycode)
         input_sync(input_dev);
 }
 
+static void report_switch(unsigned code, int value)
+{
+        input_report_switch(input_dev, code, value);
+        input_sync(input_dev);
+}
+
  /* Driver core */
 
 static int wifi_enabled;
@@ -519,6 +1048,10 @@ static void handle_key(u8 code)
                                 report_key(key->keycode);
                                 break;
 
+                        case KE_SW:
+                                report_switch(key->sw.code, key->sw.value);
+                                break;
+
                         case KE_WIFI:
                                 if (have_wifi) {
                                         wifi_enabled = !wifi_enabled;
@@ -534,6 +1067,7 @@ static void handle_key(u8 code)
                                 break;
 
                         case KE_END:
+                                break;
                         default:
                                 BUG();
                         }
@@ -690,6 +1224,7 @@ static void __exit wb_module_exit(void)
         platform_device_unregister(wistron_device);
         platform_driver_unregister(&wistron_driver);
         unmap_bios();
+        kfree(keymap);
 }
 
 module_init(wb_module_init);
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 35d998c3e578..81dd8c7211a7 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -37,6 +37,65 @@ config MOUSE_PS2
           To compile this driver as a module, choose M here: the
           module will be called psmouse.
 
+config MOUSE_PS2_ALPS
+        bool "ALPS PS/2 mouse protocol extension" if EMBEDDED
+        default y
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have an ALPS PS/2 touchpad connected to
+          your system.
+
+          If unsure, say Y.
+
+config MOUSE_PS2_LOGIPS2PP
+        bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED
+        default y
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have a Logictech PS/2++ mouse connected to
+          your system.
+
+          If unsure, say Y.
+
+config MOUSE_PS2_SYNAPTICS
+        bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED
+        default y
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have a Synaptics PS/2 TouchPad connected to
+          your system.
+
+          If unsure, say Y.
+
+config MOUSE_PS2_LIFEBOOK
+        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
+        default y
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have a Fujitsu B-series Lifebook PS/2
+          TouchScreen connected to your system.
+
+          If unsure, say Y.
+
+config MOUSE_PS2_TRACKPOINT
+        bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED
+        default y
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have an IBM Trackpoint PS/2 mouse connected
+          to your system.
+
+          If unsure, say Y.
+
+config MOUSE_PS2_TOUCHKIT
+        bool "eGalax TouchKit PS/2 protocol extension"
+        depends on MOUSE_PS2
+        ---help---
+          Say Y here if you have an eGalax TouchKit PS/2 touchscreen
+          connected to your system.
+
+          If unsure, say N.
+
 config MOUSE_SERIAL
         tristate "Serial mouse"
         select SERIO
@@ -96,6 +155,17 @@ config MOUSE_AMIGA
           To compile this driver as a module, choose M here: the
           module will be called amimouse.
 
+config MOUSE_ATARI
+        tristate "Atari mouse"
+        depends on ATARI
+        select ATARI_KBD_CORE
+        help
+          Say Y here if you have an Atari and want its native mouse
+          supported by the kernel.
+
+          To compile this driver as a module, choose M here: the
+          module will be called atarimouse.
+
 config MOUSE_RISCPC
         tristate "Acorn RiscPC mouse"
         depends on ARCH_ACORN
@@ -118,7 +188,7 @@ config MOUSE_VSXXXAA
           digitizer (VSXXX-AB) DEC produced.
 
 config MOUSE_HIL
-        tristate "HIL pointers (mice etc)."     
+        tristate "HIL pointers (mice etc)."
         depends on GSC || HP300
         select HP_SDC
         select HIL_MLC
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 21a1de61a79b..6a8f622927f2 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -5,6 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_MOUSE_AMIGA)       += amimouse.o
+obj-$(CONFIG_MOUSE_ATARI)       += atarimouse.o
 obj-$(CONFIG_MOUSE_RISCPC)      += rpcmouse.o
 obj-$(CONFIG_MOUSE_INPORT)      += inport.o
 obj-$(CONFIG_MOUSE_LOGIBM)      += logibm.o
@@ -14,4 +15,10 @@ obj-$(CONFIG_MOUSE_SERIAL)	+= sermouse.o
 obj-$(CONFIG_MOUSE_HIL)         += hil_ptr.o
 obj-$(CONFIG_MOUSE_VSXXXAA)     += vsxxxaa.o
 
-psmouse-objs  := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o trackpoint.o
+psmouse-objs := psmouse-base.o synaptics.o
+
+psmouse-$(CONFIG_MOUSE_PS2_ALPS)        += alps.o
+psmouse-$(CONFIG_MOUSE_PS2_LOGIPS2PP)   += logips2pp.o
+psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK)    += lifebook.o
+psmouse-$(CONFIG_MOUSE_PS2_TRACKPOINT)  += trackpoint.o
+psmouse-$(CONFIG_MOUSE_PS2_TOUCHKIT)    += touchkit_ps2.o
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4e71a66fc7fc..cf3e4664e72b 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -424,14 +424,15 @@ int alps_init(struct psmouse *psmouse)
         struct input_dev *dev1 = psmouse->dev, *dev2;
         int version;
 
-        psmouse->private = priv = kzalloc(sizeof(struct alps_data), GFP_KERNEL);
+        priv = kzalloc(sizeof(struct alps_data), GFP_KERNEL);
         dev2 = input_allocate_device();
         if (!priv || !dev2)
                 goto init_fail;
 
         priv->dev2 = dev2;
 
-        if (!(priv->i = alps_get_model(psmouse, &version)))
+        priv->i = alps_get_model(psmouse, &version);
+        if (!priv->i)
                 goto init_fail;
 
         if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))
@@ -480,7 +481,8 @@ int alps_init(struct psmouse *psmouse)
         dev2->relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
         dev2->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
 
-        input_register_device(priv->dev2);
+        if (input_register_device(priv->dev2))
+                goto init_fail;
 
         psmouse->protocol_handler = alps_process_byte;
         psmouse->poll = alps_poll;
@@ -491,9 +493,11 @@ int alps_init(struct psmouse *psmouse)
         /* We are having trouble resyncing ALPS touchpads so disable it for now */
         psmouse->resync_time = 0;
 
+        psmouse->private = priv;
         return 0;
 
 init_fail:
+        psmouse_reset(psmouse);
         input_free_device(dev2);
         kfree(priv);
         return -1;
@@ -504,7 +508,8 @@ int alps_detect(struct psmouse *psmouse, int set_properties)
         int version;
         const struct alps_model_info *model;
 
-        if (!(model = alps_get_model(psmouse, &version)))
+        model = alps_get_model(psmouse, &version);
+        if (!model)
                 return -1;
 
         if (set_properties) {
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 69db7325a494..4bbddc99962b 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -12,9 +12,6 @@
 #ifndef _ALPS_H
 #define _ALPS_H
 
-int alps_detect(struct psmouse *psmouse, int set_properties);
-int alps_init(struct psmouse *psmouse);
-
 struct alps_model_info {
         unsigned char signature[3];
         unsigned char byte0, mask0;
@@ -23,10 +20,23 @@ struct alps_model_info {
 
 struct alps_data {
         struct input_dev *dev2;         /* Relative device */
-        char name[32];                  /* Name */
         char phys[32];                  /* Phys */
         const struct alps_model_info *i;/* Info */
         int prev_fin;                   /* Finger bit from previous packet */
 };
 
+#ifdef CONFIG_MOUSE_PS2_ALPS
+int alps_detect(struct psmouse *psmouse, int set_properties);
+int alps_init(struct psmouse *psmouse);
+#else
+inline int alps_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+inline int alps_init(struct psmouse *psmouse)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_ALPS */
+
 #endif
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
new file mode 100644
index 000000000000..43ab6566fb65
--- /dev/null
+++ b/drivers/input/mouse/atarimouse.c
@@ -0,0 +1,160 @@
+/*
+ *  Atari mouse driver for Linux/m68k
+ *
+ *  Copyright (c) 2005 Michael Schmitz
+ *
+ *  Based on:
+ *  Amiga mouse driver for Linux/m68k
+ *
+ *  Copyright (c) 2000-2002 Vojtech Pavlik
+ *
+ */
+/*
+ * The low level init and interrupt stuff is handled in arch/mm68k/atari/atakeyb.c
+ * (the keyboard ACIA also handles the mouse and joystick data, and the keyboard
+ * interrupt is shared with the MIDI ACIA so MIDI data also get handled there).
+ * This driver only deals with handing key events off to the input layer.
+ *
+ * Largely based on the old:
+ *
+ * Atari Mouse Driver for Linux
+ * by Robert de Vries (robert@and.nl) 19Jul93
+ *
+ * 16 Nov 1994 Andreas Schwab
+ * Compatibility with busmouse
+ * Support for three button mouse (shamelessly stolen from MiNT)
+ * third button wired to one of the joystick directions on joystick 1
+ *
+ * 1996/02/11 Andreas Schwab
+ * Module support
+ * Allow multiple open's
+ *
+ * Converted to use new generic busmouse code.  5 Apr 1998
+ *   Russell King <rmk@arm.uk.linux.org>
+ */
+
+
+/*
+ * 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/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+
+#include <asm/irq.h>
+#include <asm/setup.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+#include <asm/atarihw.h>
+#include <asm/atarikb.h>
+#include <asm/atariints.h>
+
+MODULE_AUTHOR("Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>");
+MODULE_DESCRIPTION("Atari mouse driver");
+MODULE_LICENSE("GPL");
+
+static int mouse_threshold[2] = {2,2};
+
+#ifdef __MODULE__
+MODULE_PARM(mouse_threshold, "2i");
+#endif
+#ifdef FIXED_ATARI_JOYSTICK
+extern int atari_mouse_buttons;
+#endif
+static int atamouse_used = 0;
+
+static struct input_dev *atamouse_dev;
+
+static void atamouse_interrupt(char *buf)
+{
+        int buttons, dx, dy;
+
+/*      ikbd_mouse_disable(); */
+
+        buttons = (buf[0] & 1) | ((buf[0] & 2) << 1);
+#ifdef FIXED_ATARI_JOYSTICK
+        buttons |= atari_mouse_buttons & 2;
+        atari_mouse_buttons = buttons;
+#endif
+/*      ikbd_mouse_rel_pos(); */
+
+        /* only relative events get here */
+        dx =  buf[1];
+        dy = -buf[2];
+
+        input_report_rel(atamouse_dev, REL_X, dx);
+        input_report_rel(atamouse_dev, REL_Y, dy);
+
+        input_report_key(atamouse_dev, BTN_LEFT,   buttons & 0x1);
+        input_report_key(atamouse_dev, BTN_MIDDLE, buttons & 0x2);
+        input_report_key(atamouse_dev, BTN_RIGHT,  buttons & 0x4);
+
+        input_sync(atamouse_dev);
+
+        return;
+}
+
+static int atamouse_open(struct input_dev *dev)
+{
+        if (atamouse_used++)
+                return 0;
+
+#ifdef FIXED_ATARI_JOYSTICK
+        atari_mouse_buttons = 0;
+#endif
+        ikbd_mouse_y0_top();
+        ikbd_mouse_thresh(mouse_threshold[0], mouse_threshold[1]);
+        ikbd_mouse_rel_pos();
+        atari_input_mouse_interrupt_hook = atamouse_interrupt;
+        return 0;
+}
+
+static void atamouse_close(struct input_dev *dev)
+{
+        if (!--atamouse_used) {
+                ikbd_mouse_disable();
+                atari_mouse_interrupt_hook = NULL;
+        }
+}
+
+static int __init atamouse_init(void)
+{
+        if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
+                return -ENODEV;
+
+        if (!(atamouse_dev = input_allocate_device()))
+                return -ENOMEM;
+
+        if (!(atari_keyb_init()))
+                return -ENODEV;
+
+        atamouse_dev->name = "Atari mouse";
+        atamouse_dev->phys = "atamouse/input0";
+        atamouse_dev->id.bustype = BUS_ATARI;
+        atamouse_dev->id.vendor = 0x0001;
+        atamouse_dev->id.product = 0x0002;
+        atamouse_dev->id.version = 0x0100;
+
+        atamouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+        atamouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        atamouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        atamouse_dev->open = atamouse_open;
+        atamouse_dev->close = atamouse_close;
+
+        input_register_device(atamouse_dev);
+
+        printk(KERN_INFO "input: %s at keyboard ACIA\n", atamouse_dev->name);
+        return 0;
+}
+
+static void __exit atamouse_exit(void)
+{
+        input_unregister_device(atamouse_dev);
+}
+
+module_init(atamouse_init);
+module_exit(atamouse_exit);
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index bfb174fe3230..449bf4dcbbcc 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -88,10 +88,12 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
         idx = ptr->idx4/4;
         p = data[idx - 1];
 
-        if ((p & ~HIL_CMDCT_POL) == 
-            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL)) goto report;
-        if ((p & ~HIL_CMDCT_RPL) == 
-            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_RPL)) goto report;
+        if ((p & ~HIL_CMDCT_POL) ==
+            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL))
+                goto report;
+        if ((p & ~HIL_CMDCT_RPL) ==
+            (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_RPL))
+                goto report;
 
         /* Not a poll response.  See if we are loading config records. */
         switch (p & HIL_PKT_DATA_MASK) {
@@ -101,27 +103,32 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
                 for (; i < HIL_PTR_MAX_LENGTH; i++)
                         ptr->idd[i] = 0;
                 break;
+
         case HIL_CMD_RSC:
                 for (i = 0; i < idx; i++)
                         ptr->rsc[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_PTR_MAX_LENGTH; i++)
                         ptr->rsc[i] = 0;
                 break;
+
         case HIL_CMD_EXD:
                 for (i = 0; i < idx; i++)
                         ptr->exd[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_PTR_MAX_LENGTH; i++)
                         ptr->exd[i] = 0;
                 break;
+
         case HIL_CMD_RNM:
                 for (i = 0; i < idx; i++)
                         ptr->rnm[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
                 for (; i < HIL_PTR_MAX_LENGTH + 1; i++)
-                        ptr->rnm[i] = '\0';
+                        ptr->rnm[i] = 0;
                 break;
+
         default:
                 /* These occur when device isn't present */
-                if (p == (HIL_ERR_INT | HIL_PKT_CMD)) break; 
+                if (p == (HIL_ERR_INT | HIL_PKT_CMD))
+                        break;
                 /* Anything else we'd like to know about. */
                 printk(KERN_WARNING PREFIX "Device sent unknown record %x\n", p);
                 break;
@@ -130,7 +137,8 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
 
  report:
         if ((p & HIL_CMDCT_POL) != idx - 1) {
-                printk(KERN_WARNING PREFIX "Malformed poll packet %x (idx = %i)\n", p, idx);
+                printk(KERN_WARNING PREFIX
+                        "Malformed poll packet %x (idx = %i)\n", p, idx);
                 goto out;
         }
 
@@ -139,7 +147,7 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
         laxis += i;
 
         ax16 = ptr->idd[1] & HIL_IDD_HEADER_16BIT; /* 8 or 16bit resolution */
-        absdev = ptr->idd[1] & HIL_IDD_HEADER_ABS; 
+        absdev = ptr->idd[1] & HIL_IDD_HEADER_ABS;
 
         for (cnt = 1; i < laxis; i++) {
                 unsigned int lo,hi,val;
@@ -157,7 +165,8 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
                         input_report_abs(dev, ABS_X + i, val);
                 } else {
                         val = (int) (((int8_t)lo) | ((int8_t)hi<<8));
-                        if (i%3) val *= -1;
+                        if (i%3)
+                                val *= -1;
                         input_report_rel(dev, REL_X + i, val);
                 }
         }
@@ -168,10 +177,11 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
                 btn = ptr->data[cnt++];
                 up = btn & 1;
                 btn &= 0xfe;
-                if (btn == 0x8e) {
+                if (btn == 0x8e)
                         continue; /* TODO: proximity == touch? */
-                }
-                else if ((btn > 0x8c) || (btn < 0x80)) continue;
+                else
+                        if ((btn > 0x8c) || (btn < 0x80))
+                                continue;
                 btn = (btn - 0x80) >> 1;
                 btn = ptr->btnmap[btn];
                 input_report_key(dev, btn, !up);
@@ -182,14 +192,14 @@ static void hil_ptr_process_record(struct hil_ptr *ptr)
         up(&ptr->sem);
 }
 
-static void hil_ptr_process_err(struct hil_ptr *ptr) {
+static void hil_ptr_process_err(struct hil_ptr *ptr)
+{
         printk(KERN_WARNING PREFIX "errored HIL packet\n");
         ptr->idx4 = 0;
         up(&ptr->sem);
-        return;
 }
 
-static irqreturn_t hil_ptr_interrupt(struct serio *serio, 
+static irqreturn_t hil_ptr_interrupt(struct serio *serio,
         unsigned char data, unsigned int flags)
 {
         struct hil_ptr *ptr;
@@ -197,29 +207,29 @@ static irqreturn_t hil_ptr_interrupt(struct serio *serio,
         int idx;
 
         ptr = serio_get_drvdata(serio);
-        if (ptr == NULL) {
-                BUG();
-                return IRQ_HANDLED;
-        }
+        BUG_ON(ptr == NULL);
 
         if (ptr->idx4 >= (HIL_PTR_MAX_LENGTH * sizeof(hil_packet))) {
                 hil_ptr_process_err(ptr);
                 return IRQ_HANDLED;
         }
         idx = ptr->idx4/4;
-        if (!(ptr->idx4 % 4)) ptr->data[idx] = 0;
+        if (!(ptr->idx4 % 4))
+                ptr->data[idx] = 0;
         packet = ptr->data[idx];
         packet |= ((hil_packet)data) << ((3 - (ptr->idx4 % 4)) * 8);
         ptr->data[idx] = packet;
 
         /* Records of N 4-byte hil_packets must terminate with a command. */
-        if ((++(ptr->idx4)) % 4) return IRQ_HANDLED;
+        if ((++(ptr->idx4)) % 4)
+                return IRQ_HANDLED;
         if ((packet & 0xffff0000) != HIL_ERR_INT) {
                 hil_ptr_process_err(ptr);
                 return IRQ_HANDLED;
         }
-        if (packet & HIL_PKT_CMD) 
+        if (packet & HIL_PKT_CMD)
                 hil_ptr_process_record(ptr);
+
         return IRQ_HANDLED;
 }
 
@@ -228,10 +238,7 @@ static void hil_ptr_disconnect(struct serio *serio)
         struct hil_ptr *ptr;
 
         ptr = serio_get_drvdata(serio);
-        if (ptr == NULL) {
-                BUG();
-                return;
-        }
+        BUG_ON(ptr == NULL);
 
         serio_close(serio);
         input_unregister_device(ptr->dev);
@@ -241,7 +248,7 @@ static void hil_ptr_disconnect(struct serio *serio)
 static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 {
         struct hil_ptr   *ptr;
-        char             *txt;
+        const char       *txt;
         unsigned int     i, naxsets, btntype;
         uint8_t          did, *idd;
 
@@ -252,42 +259,40 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         if (!ptr->dev)
                 goto bail0;
 
-        ptr->dev->private = ptr;
-
         if (serio_open(serio, driver))
                 goto bail1;
 
         serio_set_drvdata(serio, ptr);
         ptr->serio = serio;
 
-        init_MUTEX_LOCKED(&(ptr->sem));
+        init_MUTEX_LOCKED(&ptr->sem);
 
         /* Get device info.  MLC driver supplies devid/status/etc. */
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_IDD);
-        down(&(ptr->sem));
+        down(&ptr->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_RSC);
-        down(&(ptr->sem));
+        down(&ptr->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_RNM);
-        down(&(ptr->sem));
+        down(&ptr->sem);
 
         serio->write(serio, 0);
         serio->write(serio, 0);
         serio->write(serio, HIL_PKT_CMD >> 8);
         serio->write(serio, HIL_CMD_EXD);
-        down(&(ptr->sem));
+        down(&ptr->sem);
 
-        up(&(ptr->sem));
+        up(&ptr->sem);
 
         did = ptr->idd[0];
         idd = ptr->idd + 1;
@@ -301,12 +306,12 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
                 ptr->dev->evbit[0] = BIT(EV_ABS);
                 txt = "absolute";
         }
-        if (!ptr->dev->evbit[0]) {
+        if (!ptr->dev->evbit[0])
                 goto bail2;
-        }
 
         ptr->nbtn = HIL_IDD_NUM_BUTTONS(idd);
-        if (ptr->nbtn) ptr->dev->evbit[0] |= BIT(EV_KEY);
+        if (ptr->nbtn)
+                ptr->dev->evbit[0] |= BIT(EV_KEY);
 
         naxsets = HIL_IDD_NUM_AXSETS(*idd);
         ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
@@ -315,7 +320,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
                         did, txt);
         printk(KERN_INFO PREFIX "HIL pointer has %i buttons and %i sets of %i axes\n",
                         ptr->nbtn, naxsets, ptr->naxes);
-        
+
         btntype = BTN_MISC;
         if ((did & HIL_IDD_DID_ABS_TABLET_MASK) == HIL_IDD_DID_ABS_TABLET)
 #ifdef TABLET_SIMULATES_MOUSE
@@ -325,7 +330,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 #endif
         if ((did & HIL_IDD_DID_ABS_TSCREEN_MASK) == HIL_IDD_DID_ABS_TSCREEN)
                 btntype = BTN_TOUCH;
-                
+
         if ((did & HIL_IDD_DID_REL_MOUSE_MASK) == HIL_IDD_DID_REL_MOUSE)
                 btntype = BTN_MOUSE;
 
@@ -341,12 +346,10 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         }
 
         if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
-                for (i = 0; i < ptr->naxes; i++) {
+                for (i = 0; i < ptr->naxes; i++)
                         set_bit(REL_X + i, ptr->dev->relbit);
-                }
-                for (i = 3; (i < ptr->naxes + 3) && (naxsets > 1); i++) {
+                for (i = 3; (i < ptr->naxes + 3) && (naxsets > 1); i++)
                         set_bit(REL_X + i, ptr->dev->relbit);
-                }
         } else {
                 for (i = 0; i < ptr->naxes; i++) {
                         set_bit(ABS_X + i, ptr->dev->absbit);
@@ -375,7 +378,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         ptr->dev->id.vendor     = PCI_VENDOR_ID_HP;
         ptr->dev->id.product    = 0x0001; /* TODO: get from ptr->rsc */
         ptr->dev->id.version    = 0x0100; /* TODO: get from ptr->rsc */
-        ptr->dev->cdev.dev      = &serio->dev;
+        ptr->dev->dev.parent    = &serio->dev;
 
         input_register_device(ptr->dev);
         printk(KERN_INFO "input: %s (%s), ID: %d\n",
@@ -419,11 +422,11 @@ static int __init hil_ptr_init(void)
 {
         return serio_register_driver(&hil_ptr_serio_driver);
 }
-                
+
 static void __exit hil_ptr_exit(void)
 {
         serio_unregister_driver(&hil_ptr_serio_driver);
 }
-                        
+
 module_init(hil_ptr_init);
 module_exit(hil_ptr_exit);
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 29542f0631cb..1740cadd9594 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -20,6 +20,27 @@
 #include "psmouse.h"
 #include "lifebook.h"
 
+struct lifebook_data {
+        struct input_dev *dev2;         /* Relative device */
+        char phys[32];
+};
+
+static const char *desired_serio_phys;
+
+static int lifebook_set_serio_phys(struct dmi_system_id *d)
+{
+        desired_serio_phys = d->driver_data;
+        return 0;
+}
+
+static unsigned char lifebook_use_6byte_proto;
+
+static int lifebook_set_6byte_proto(struct dmi_system_id *d)
+{
+        lifebook_use_6byte_proto = 1;
+        return 0;
+}
+
 static struct dmi_system_id lifebook_dmi_table[] = {
         {
                 .ident = "FLORA-ie 55mi",
@@ -56,6 +77,24 @@ static struct dmi_system_id lifebook_dmi_table[] = {
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
                 },
+                .callback = lifebook_set_serio_phys,
+                .driver_data = "isa0060/serio3",
+        },
+        {
+                .ident = "Panasonic CF-28",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
+                },
+                .callback = lifebook_set_6byte_proto,
+        },
+        {
+                .ident = "Panasonic CF-29",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
+                },
+                .callback = lifebook_set_6byte_proto,
         },
         {
                 .ident = "Lifebook B142",
@@ -68,30 +107,70 @@ static struct dmi_system_id lifebook_dmi_table[] = {
 
 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
 {
+        struct lifebook_data *priv = psmouse->private;
+        struct input_dev *dev1 = psmouse->dev;
+        struct input_dev *dev2 = priv->dev2;
         unsigned char *packet = psmouse->packet;
-        struct input_dev *dev = psmouse->dev;
+        int relative_packet = packet[0] & 0x08;
 
-        if (psmouse->pktcnt != 3)
-                return PSMOUSE_GOOD_DATA;
+        if (relative_packet || !lifebook_use_6byte_proto) {
+                if (psmouse->pktcnt != 3)
+                        return PSMOUSE_GOOD_DATA;
+        } else {
+                switch (psmouse->pktcnt) {
+                case 1:
+                        return (packet[0] & 0xf8) == 0x00 ?
+                                PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
+                case 2:
+                        return PSMOUSE_GOOD_DATA;
+                case 3:
+                        return ((packet[2] & 0x30) << 2) == (packet[2] & 0xc0) ?
+                                PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
+                case 4:
+                        return (packet[3] & 0xf8) == 0xc0 ?
+                                PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
+                case 5:
+                        return (packet[4] & 0xc0) == (packet[2] & 0xc0) ?
+                                PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
+                case 6:
+                        if (((packet[5] & 0x30) << 2) != (packet[5] & 0xc0))
+                                return PSMOUSE_BAD_DATA;
+                        if ((packet[5] & 0xc0) != (packet[1] & 0xc0))
+                                return PSMOUSE_BAD_DATA;
+                        break; /* report data */
+                }
+        }
 
-        /* calculate X and Y */
-        if ((packet[0] & 0x08) == 0x00) {
-                input_report_abs(dev, ABS_X,
+        if (relative_packet) {
+                if (!dev2)
+                        printk(KERN_WARNING "lifebook.c: got relative packet "
+                                "but no relative device set up\n");
+        } else if (lifebook_use_6byte_proto) {
+                input_report_abs(dev1, ABS_X,
+                                 ((packet[1] & 0x3f) << 6) | (packet[2] & 0x3f));
+                input_report_abs(dev1, ABS_Y,
+                                 4096 - (((packet[4] & 0x3f) << 6) | (packet[5] & 0x3f)));
+        } else {
+                input_report_abs(dev1, ABS_X,
                                  (packet[1] | ((packet[0] & 0x30) << 4)));
-                input_report_abs(dev, ABS_Y,
+                input_report_abs(dev1, ABS_Y,
                                  1024 - (packet[2] | ((packet[0] & 0xC0) << 2)));
-        } else {
-                input_report_rel(dev, REL_X,
-                                ((packet[0] & 0x10) ? packet[1] - 256 : packet[1]));
-                input_report_rel(dev, REL_Y,
-                                 -(int)((packet[0] & 0x20) ? packet[2] - 256 : packet[2]));
         }
 
-        input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
-        input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
-        input_report_key(dev, BTN_TOUCH, packet[0] & 0x04);
+        input_report_key(dev1, BTN_TOUCH, packet[0] & 0x04);
+        input_sync(dev1);
 
-        input_sync(dev);
+        if (dev2) {
+                if (relative_packet) {
+                        input_report_rel(dev2, REL_X,
+                                ((packet[0] & 0x10) ? packet[1] - 256 : packet[1]));
+                        input_report_rel(dev2, REL_Y,
+                                 -(int)((packet[0] & 0x20) ? packet[2] - 256 : packet[2]));
+                }
+                input_report_key(dev2, BTN_LEFT, packet[0] & 0x01);
+                input_report_key(dev2, BTN_RIGHT, packet[0] & 0x02);
+                input_sync(dev2);
+        }
 
         return PSMOUSE_FULL_PACKET;
 }
@@ -109,12 +188,20 @@ static int lifebook_absolute_mode(struct psmouse *psmouse)
            you leave this call out the touchsreen will never send
            absolute coordinates
         */
-        param = 0x07;
+        param = lifebook_use_6byte_proto ? 0x08 : 0x07;
         ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
 
         return 0;
 }
 
+static void lifebook_relative_mode(struct psmouse *psmouse)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        unsigned char param = 0x06;
+
+        ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
+}
+
 static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolution)
 {
         static const unsigned char params[] = { 0, 1, 2, 2, 3 };
@@ -131,6 +218,8 @@ static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolu
 static void lifebook_disconnect(struct psmouse *psmouse)
 {
         psmouse_reset(psmouse);
+        kfree(psmouse->private);
+        psmouse->private = NULL;
 }
 
 int lifebook_detect(struct psmouse *psmouse, int set_properties)
@@ -138,6 +227,10 @@ int lifebook_detect(struct psmouse *psmouse, int set_properties)
         if (!dmi_check_system(lifebook_dmi_table))
                 return -1;
 
+        if (desired_serio_phys &&
+            strcmp(psmouse->ps2dev.serio->phys, desired_serio_phys))
+                return -1;
+
         if (set_properties) {
                 psmouse->vendor = "Fujitsu";
                 psmouse->name = "Lifebook TouchScreen";
@@ -146,24 +239,78 @@ int lifebook_detect(struct psmouse *psmouse, int set_properties)
         return 0;
 }
 
+static int lifebook_create_relative_device(struct psmouse *psmouse)
+{
+        struct input_dev *dev2;
+        struct lifebook_data *priv;
+        int error = -ENOMEM;
+
+        priv = kzalloc(sizeof(struct lifebook_data), GFP_KERNEL);
+        dev2 = input_allocate_device();
+        if (!priv || !dev2)
+                goto err_out;
+
+        priv->dev2 = dev2;
+        snprintf(priv->phys, sizeof(priv->phys),
+                 "%s/input1", psmouse->ps2dev.serio->phys);
+
+        dev2->phys = priv->phys;
+        dev2->name = "PS/2 Touchpad";
+        dev2->id.bustype = BUS_I8042;
+        dev2->id.vendor  = 0x0002;
+        dev2->id.product = PSMOUSE_LIFEBOOK;
+        dev2->id.version = 0x0000;
+        dev2->dev.parent = &psmouse->ps2dev.serio->dev;
+
+        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+        dev2->relbit[LONG(REL_X)] = BIT(REL_X) | BIT(REL_Y);
+        dev2->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
+
+        error = input_register_device(priv->dev2);
+        if (error)
+                goto err_out;
+
+        psmouse->private = priv;
+        return 0;
+
+ err_out:
+        input_free_device(dev2);
+        kfree(priv);
+        return error;
+}
+
 int lifebook_init(struct psmouse *psmouse)
 {
-        struct input_dev *input_dev = psmouse->dev;
+        struct input_dev *dev1 = psmouse->dev;
+        int max_coord = lifebook_use_6byte_proto ? 1024 : 4096;
 
         if (lifebook_absolute_mode(psmouse))
                 return -1;
 
-        input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        input_set_abs_params(input_dev, ABS_X, 0, 1024, 0, 0);
-        input_set_abs_params(input_dev, ABS_Y, 0, 1024, 0, 0);
+        dev1->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+        dev1->relbit[0] = 0;
+        dev1->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
+        input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);
+
+        if (!desired_serio_phys) {
+                if (lifebook_create_relative_device(psmouse)) {
+                        lifebook_relative_mode(psmouse);
+                        return -1;
+                }
+        }
 
         psmouse->protocol_handler = lifebook_process_byte;
         psmouse->set_resolution = lifebook_set_resolution;
         psmouse->disconnect = lifebook_disconnect;
         psmouse->reconnect  = lifebook_absolute_mode;
+
+        psmouse->model = lifebook_use_6byte_proto ? 6 : 3;
+
+        /*
+         * Use packet size = 3 even when using 6-byte protocol because
+         * that's what POLL will return on Lifebooks (according to spec).
+         */
         psmouse->pktsize = 3;
 
         return 0;
diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
index be1c0943825d..c1647cf036c2 100644
--- a/drivers/input/mouse/lifebook.h
+++ b/drivers/input/mouse/lifebook.h
@@ -11,7 +11,18 @@
 #ifndef _LIFEBOOK_H
 #define _LIFEBOOK_H
 
+#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
 int lifebook_detect(struct psmouse *psmouse, int set_properties);
 int lifebook_init(struct psmouse *psmouse);
+#else
+inline int lifebook_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+inline int lifebook_init(struct psmouse *psmouse)
+{
+        return -ENOSYS;
+}
+#endif
 
 #endif
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index d3ddea26b8ca..9df74b72e6c4 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -200,6 +200,7 @@ static void ps2pp_disconnect(struct psmouse *psmouse)
 static const struct ps2pp_info *get_model_info(unsigned char model)
 {
         static const struct ps2pp_info ps2pp_list[] = {
+                {  1,   0,                      0 },    /* Simple 2-button mouse */
                 { 12,   0,                      PS2PP_SIDE_BTN},
                 { 13,   0,                      0 },
                 { 15,   PS2PP_KIND_MX,                                  /* MX1000 */
@@ -338,12 +339,12 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
         param[1] = 0;
         ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
 
-        if (!param[1])
-                return -1;
-
         model = ((param[0] >> 4) & 0x07) | ((param[0] << 3) & 0x78);
         buttons = param[1];
 
+        if (!model || !buttons)
+                return -1;
+
         if ((model_info = get_model_info(model)) != NULL) {
 
 /*
diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
index 64a8ec52ea6d..6e5712525fd6 100644
--- a/drivers/input/mouse/logips2pp.h
+++ b/drivers/input/mouse/logips2pp.h
@@ -11,6 +11,13 @@
 #ifndef _LOGIPS2PP_H
 #define _LOGIPS2PP_H
 
+#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
 int ps2pp_init(struct psmouse *psmouse, int set_properties);
+#else
+inline int ps2pp_init(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_LOGIPS2PP */
 
 #endif
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 0fe5869d7d4c..f15f695777f8 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -28,6 +28,7 @@
 #include "alps.h"
 #include "lifebook.h"
 #include "trackpoint.h"
+#include "touchkit_ps2.h"
 
 #define DRIVER_DESC     "PS/2 mouse driver"
 
@@ -569,7 +570,9 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 return PSMOUSE_THINKPS;
 
 /*
- * Try Synaptics TouchPad
+ * Try Synaptics TouchPad. Note that probing is done even if Synaptics protocol
+ * support is disabled in config - we need to know if it is synaptics so we
+ * can reset it properly after probing for intellimouse.
  */
         if (max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse, set_properties) == 0) {
                 synaptics_hardware = 1;
@@ -605,14 +608,20 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 }
         }
 
-        if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0)
-                return PSMOUSE_GENPS;
+        if (max_proto > PSMOUSE_IMEX) {
+
+                if (genius_detect(psmouse, set_properties) == 0)
+                        return PSMOUSE_GENPS;
 
-        if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
-                return PSMOUSE_PS2PP;
+                if (ps2pp_init(psmouse, set_properties) == 0)
+                        return PSMOUSE_PS2PP;
 
-        if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
-                return PSMOUSE_TRACKPOINT;
+                if (trackpoint_detect(psmouse, set_properties) == 0)
+                        return PSMOUSE_TRACKPOINT;
+
+                if (touchkit_ps2_detect(psmouse, set_properties) == 0)
+                        return PSMOUSE_TOUCHKIT_PS2;
+        }
 
 /*
  * Reset to defaults in case the device got confused by extended
@@ -654,12 +663,14 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .maxproto       = 1,
                 .detect         = ps2bare_detect,
         },
+#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
         {
                 .type           = PSMOUSE_PS2PP,
                 .name           = "PS2++",
                 .alias          = "logitech",
                 .detect         = ps2pp_init,
         },
+#endif
         {
                 .type           = PSMOUSE_THINKPS,
                 .name           = "ThinkPS/2",
@@ -686,6 +697,7 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .maxproto       = 1,
                 .detect         = im_explorer_detect,
         },
+#ifdef CONFIG_MOUSE_PS2_SYNAPTICS
         {
                 .type           = PSMOUSE_SYNAPTICS,
                 .name           = "SynPS/2",
@@ -693,6 +705,8 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .detect         = synaptics_detect,
                 .init           = synaptics_init,
         },
+#endif
+#ifdef CONFIG_MOUSE_PS2_ALPS
         {
                 .type           = PSMOUSE_ALPS,
                 .name           = "AlpsPS/2",
@@ -700,18 +714,31 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .detect         = alps_detect,
                 .init           = alps_init,
         },
+#endif
+#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
         {
                 .type           = PSMOUSE_LIFEBOOK,
                 .name           = "LBPS/2",
                 .alias          = "lifebook",
                 .init           = lifebook_init,
         },
+#endif
+#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
         {
                 .type           = PSMOUSE_TRACKPOINT,
                 .name           = "TPPS/2",
                 .alias          = "trackpoint",
                 .detect         = trackpoint_detect,
         },
+#endif
+#ifdef CONFIG_MOUSE_PS2_TOUCHKIT
+        {
+                .type           = PSMOUSE_TOUCHKIT_PS2,
+                .name           = "touchkitPS/2",
+                .alias          = "touchkit",
+                .detect         = touchkit_ps2_detect,
+        },
+#endif
         {
                 .type           = PSMOUSE_AUTO,
                 .name           = "auto",
@@ -823,12 +850,6 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
 static void psmouse_initialize(struct psmouse *psmouse)
 {
 /*
- * We set the mouse into streaming mode.
- */
-
-        ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSTREAM);
-
-/*
  * We set the mouse report rate, resolution and scaling.
  */
 
@@ -1062,8 +1083,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
 {
         struct input_dev *input_dev = psmouse->dev;
 
-        input_dev->private = psmouse;
-        input_dev->cdev.dev = &psmouse->ps2dev.serio->dev;
+        input_dev->dev.parent = &psmouse->ps2dev.serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
         input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index cf1de95b6f27..3964e8acbc54 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -87,6 +87,7 @@ enum psmouse_type {
         PSMOUSE_ALPS,
         PSMOUSE_LIFEBOOK,
         PSMOUSE_TRACKPOINT,
+        PSMOUSE_TOUCHKIT_PS2,
         PSMOUSE_AUTO            /* This one should always be last */
 };
 
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index a85d74710b44..77b8ee2b9651 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -69,7 +69,8 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data)
         switch (sermouse->count) {
 
                 case 0:
-                        if ((data & 0xf8) != 0x80) return;
+                        if ((data & 0xf8) != 0x80)
+                                return;
                         input_report_key(dev, BTN_LEFT,   !(data & 4));
                         input_report_key(dev, BTN_RIGHT,  !(data & 1));
                         input_report_key(dev, BTN_MIDDLE, !(data & 2));
@@ -107,7 +108,10 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
         struct input_dev *dev = sermouse->dev;
         signed char *buf = sermouse->buf;
 
-        if (data & 0x40) sermouse->count = 0;
+        if (data & 0x40)
+                sermouse->count = 0;
+        else if (sermouse->count == 0)
+                return;
 
         switch (sermouse->count) {
 
@@ -169,7 +173,8 @@ static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
 
                 case 5:
                 case 7: /* Ignore anything besides MZ++ */
-                        if (sermouse->type != SERIO_MZPP) break;
+                        if (sermouse->type != SERIO_MZPP)
+                                break;
 
                         switch (buf[1]) {
 
@@ -206,13 +211,16 @@ static irqreturn_t sermouse_interrupt(struct serio *serio,
 {
         struct sermouse *sermouse = serio_get_drvdata(serio);
 
-        if (time_after(jiffies, sermouse->last + HZ/10)) sermouse->count = 0;
+        if (time_after(jiffies, sermouse->last + HZ/10))
+                sermouse->count = 0;
+
         sermouse->last = jiffies;
 
         if (sermouse->type > SERIO_SUN)
                 sermouse_process_ms(sermouse, data);
         else
                 sermouse_process_msc(sermouse, data);
+
         return IRQ_HANDLED;
 }
 
@@ -258,12 +266,11 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor  = sermouse->type;
         input_dev->id.product = c;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
         input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
         input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        input_dev->private = sermouse;
 
         if (c & 0x01) set_bit(BTN_MIDDLE, input_dev->keybit);
         if (c & 0x02) set_bit(BTN_SIDE, input_dev->keybit);
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index f0f9413d762c..c77788bf932d 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -40,33 +40,70 @@
 #define YMIN_NOMINAL 1408
 #define YMAX_NOMINAL 4448
 
+
 /*****************************************************************************
- *      Synaptics communications functions
+ *      Stuff we need even when we do not want native Synaptics support
  ****************************************************************************/
 
 /*
- * Send a command to the synpatics touchpad by special commands
+ * Set the synaptics touchpad mode byte by special commands
  */
-static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c, unsigned char *param)
+static int synaptics_mode_cmd(struct psmouse *psmouse, unsigned char mode)
 {
-        if (psmouse_sliced_command(psmouse, c))
+        unsigned char param[1];
+
+        if (psmouse_sliced_command(psmouse, mode))
                 return -1;
-        if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETINFO))
+        param[0] = SYN_PS_SET_MODE2;
+        if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_SETRATE))
                 return -1;
         return 0;
 }
 
+int synaptics_detect(struct psmouse *psmouse, int set_properties)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        unsigned char param[4];
+
+        param[0] = 0;
+
+        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
+        ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
+
+        if (param[1] != 0x47)
+                return -ENODEV;
+
+        if (set_properties) {
+                psmouse->vendor = "Synaptics";
+                psmouse->name = "TouchPad";
+        }
+
+        return 0;
+}
+
+void synaptics_reset(struct psmouse *psmouse)
+{
+        /* reset touchpad back to relative mode, gestures enabled */
+        synaptics_mode_cmd(psmouse, 0);
+}
+
+#ifdef CONFIG_MOUSE_PS2_SYNAPTICS
+
+/*****************************************************************************
+ *      Synaptics communications functions
+ ****************************************************************************/
+
 /*
- * Set the synaptics touchpad mode byte by special commands
+ * Send a command to the synpatics touchpad by special commands
  */
-static int synaptics_mode_cmd(struct psmouse *psmouse, unsigned char mode)
+static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c, unsigned char *param)
 {
-        unsigned char param[1];
-
-        if (psmouse_sliced_command(psmouse, mode))
+        if (psmouse_sliced_command(psmouse, c))
                 return -1;
-        param[0] = SYN_PS_SET_MODE2;
-        if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_SETRATE))
+        if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETINFO))
                 return -1;
         return 0;
 }
@@ -529,12 +566,6 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
         clear_bit(REL_Y, dev->relbit);
 }
 
-void synaptics_reset(struct psmouse *psmouse)
-{
-        /* reset touchpad back to relative mode, gestures enabled */
-        synaptics_mode_cmd(psmouse, 0);
-}
-
 static void synaptics_disconnect(struct psmouse *psmouse)
 {
         synaptics_reset(psmouse);
@@ -569,30 +600,6 @@ static int synaptics_reconnect(struct psmouse *psmouse)
         return 0;
 }
 
-int synaptics_detect(struct psmouse *psmouse, int set_properties)
-{
-        struct ps2dev *ps2dev = &psmouse->ps2dev;
-        unsigned char param[4];
-
-        param[0] = 0;
-
-        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
-        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
-        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
-        ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
-        ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
-
-        if (param[1] != 0x47)
-                return -1;
-
-        if (set_properties) {
-                psmouse->vendor = "Synaptics";
-                psmouse->name = "TouchPad";
-        }
-
-        return 0;
-}
-
 #if defined(__i386__)
 #include <linux/dmi.h>
 static struct dmi_system_id toshiba_dmi_table[] = {
@@ -648,6 +655,16 @@ int synaptics_init(struct psmouse *psmouse)
 
         set_input_params(psmouse->dev, priv);
 
+        /*
+         * Encode touchpad model so that it can be used to set
+         * input device->id.version and be visible to userspace.
+         * Because version is __u16 we have to drop something.
+         * Hardware info bits seem to be good candidates as they
+         * are documented to be for Synaptics corp. internal use.
+         */
+        psmouse->model = ((priv->model_id & 0x00ff0000) >> 8) |
+                          (priv->model_id & 0x000000ff);
+
         psmouse->protocol_handler = synaptics_process_byte;
         psmouse->set_rate = synaptics_set_rate;
         psmouse->disconnect = synaptics_disconnect;
@@ -680,4 +697,12 @@ int synaptics_init(struct psmouse *psmouse)
         return -1;
 }
 
+#else /* CONFIG_MOUSE_PS2_SYNAPTICS */
+
+int synaptics_init(struct psmouse *psmouse)
+{
+        return -ENOSYS;
+}
+
+#endif /* CONFIG_MOUSE_PS2_SYNAPTICS */
 
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 68fff1dcd7de..02aa4cf7bc77 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -9,10 +9,6 @@
 #ifndef _SYNAPTICS_H
 #define _SYNAPTICS_H
 
-extern int synaptics_detect(struct psmouse *psmouse, int set_properties);
-extern int synaptics_init(struct psmouse *psmouse);
-extern void synaptics_reset(struct psmouse *psmouse);
-
 /* synaptics queries */
 #define SYN_QUE_IDENTIFY                0x00
 #define SYN_QUE_MODES                   0x01
@@ -62,9 +58,9 @@ extern void synaptics_reset(struct psmouse *psmouse);
 #define SYN_MODE_WMODE(m)               ((m) & (1 << 0))
 
 /* synaptics identify query bits */
-#define SYN_ID_MODEL(i)                 (((i) >> 4) & 0x0f)
-#define SYN_ID_MAJOR(i)                 ((i) & 0x0f)
-#define SYN_ID_MINOR(i)                 (((i) >> 16) & 0xff)
+#define SYN_ID_MODEL(i)                 (((i) >> 4) & 0x0f)
+#define SYN_ID_MAJOR(i)                 ((i) & 0x0f)
+#define SYN_ID_MINOR(i)                 (((i) >> 16) & 0xff)
 #define SYN_ID_IS_SYNAPTICS(i)          ((((i) >> 8) & 0xff) == 0x47)
 
 /* synaptics special commands */
@@ -98,8 +94,8 @@ struct synaptics_hw_state {
 struct synaptics_data {
         /* Data read from the touchpad */
         unsigned long int model_id;             /* Model-ID */
-        unsigned long int capabilities;         /* Capabilities */
-        unsigned long int ext_cap;              /* Extended Capabilities */
+        unsigned long int capabilities;         /* Capabilities */
+        unsigned long int ext_cap;              /* Extended Capabilities */
         unsigned long int identity;             /* Identification */
 
         unsigned char pkt_type;                 /* packet type - old, new, etc */
@@ -107,4 +103,8 @@ struct synaptics_data {
         int scroll;
 };
 
+int synaptics_detect(struct psmouse *psmouse, int set_properties);
+int synaptics_init(struct psmouse *psmouse);
+void synaptics_reset(struct psmouse *psmouse);
+
 #endif /* _SYNAPTICS_H */
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c
new file mode 100644
index 000000000000..7b977fd23571
--- /dev/null
+++ b/drivers/input/mouse/touchkit_ps2.c
@@ -0,0 +1,100 @@
+/* ----------------------------------------------------------------------------
+ * touchkit_ps2.c  --  Driver for eGalax TouchKit PS/2 Touchscreens
+ *
+ * Copyright (C) 2005 by Stefan Lucke
+ * Copyright (C) 2004 by Daniel Ritz
+ * Copyright (C) by Todd E. Johnson (mtouchusb.c)
+ *
+ * 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.
+ *
+ * Based upon touchkitusb.c
+ *
+ * Vendor documentation is available in support section of:
+ * http://www.egalax.com.tw/
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include <linux/input.h>
+#include <linux/serio.h>
+#include <linux/libps2.h>
+
+#include "psmouse.h"
+#include "touchkit_ps2.h"
+
+#define TOUCHKIT_MAX_XC                 0x07ff
+#define TOUCHKIT_MAX_YC                 0x07ff
+
+#define TOUCHKIT_CMD                    0x0a
+#define TOUCHKIT_CMD_LENGTH             1
+
+#define TOUCHKIT_CMD_ACTIVE             'A'
+#define TOUCHKIT_CMD_FIRMWARE_VERSION   'D'
+#define TOUCHKIT_CMD_CONTROLLER_TYPE    'E'
+
+#define TOUCHKIT_SEND_PARMS(s, r, c)    ((s) << 12 | (r) << 8 | (c))
+
+#define TOUCHKIT_GET_TOUCHED(packet)    (((packet)[0]) & 0x01)
+#define TOUCHKIT_GET_X(packet)          (((packet)[1] << 7) | (packet)[2])
+#define TOUCHKIT_GET_Y(packet)          (((packet)[3] << 7) | (packet)[4])
+
+static psmouse_ret_t touchkit_ps2_process_byte(struct psmouse *psmouse)
+{
+        unsigned char *packet = psmouse->packet;
+        struct input_dev *dev = psmouse->dev;
+
+        if (psmouse->pktcnt != 5)
+                return PSMOUSE_GOOD_DATA;
+
+        input_report_abs(dev, ABS_X, TOUCHKIT_GET_X(packet));
+        input_report_abs(dev, ABS_Y, TOUCHKIT_GET_Y(packet));
+        input_report_key(dev, BTN_TOUCH, TOUCHKIT_GET_TOUCHED(packet));
+        input_sync(dev);
+
+        return PSMOUSE_FULL_PACKET;
+}
+
+int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
+{
+        struct input_dev *dev = psmouse->dev;
+        unsigned char param[3];
+        int command;
+
+        param[0] = TOUCHKIT_CMD_LENGTH;
+        param[1] = TOUCHKIT_CMD_ACTIVE;
+        command = TOUCHKIT_SEND_PARMS(2, 3, TOUCHKIT_CMD);
+
+        if (ps2_command(&psmouse->ps2dev, param, command))
+                return -ENODEV;
+
+        if (param[0] != TOUCHKIT_CMD || param[1] != 0x01 ||
+            param[2] != TOUCHKIT_CMD_ACTIVE)
+                return -ENODEV;
+
+        if (set_properties) {
+                dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                set_bit(BTN_TOUCH, dev->keybit);
+                input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
+                input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
+
+                psmouse->vendor = "eGalax";
+                psmouse->name = "Touchscreen";
+                psmouse->protocol_handler = touchkit_ps2_process_byte;
+                psmouse->pktsize = 5;
+        }
+
+        return 0;
+}
diff --git a/drivers/input/mouse/touchkit_ps2.h b/drivers/input/mouse/touchkit_ps2.h
new file mode 100644
index 000000000000..61e9dfd8419f
--- /dev/null
+++ b/drivers/input/mouse/touchkit_ps2.h
@@ -0,0 +1,24 @@
+/* ----------------------------------------------------------------------------
+ * touchkit_ps2.h  --  Driver for eGalax TouchKit PS/2 Touchscreens
+ *
+ * Copyright (C) 2005 by Stefan Lucke
+ * Copyright (c) 2005 Vojtech Pavlik
+ *
+ * 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.
+ */
+
+#ifndef _TOUCHKIT_PS2_H
+#define _TOUCHKIT_PS2_H
+
+#ifdef CONFIG_MOUSE_PS2_TOUCHKIT
+int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);
+#else
+inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_TOUCHKIT */
+
+#endif
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 050298b1a09d..c10a6e7d0101 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -142,6 +142,13 @@ struct trackpoint_data
         unsigned char ext_dev;
 };
 
-extern int trackpoint_detect(struct psmouse *psmouse, int set_properties);
+#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
+int trackpoint_detect(struct psmouse *psmouse, int set_properties);
+#else
+inline int trackpoint_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_TRACKPOINT */
 
 #endif /* _TRACKPOINT_H */
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index c3d64fcc858d..4a321576f345 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -508,8 +508,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
         input_dev->name = mouse->name;
         input_dev->phys = mouse->phys;
         input_dev->id.bustype = BUS_RS232;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = mouse;
+        input_dev->dev.parent = &serio->dev;
 
         set_bit (EV_KEY, input_dev->evbit);             /* We have buttons */
         set_bit (EV_REL, input_dev->evbit);
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 664bcc8116fc..7678e9876550 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -63,9 +63,12 @@ struct mousedev {
         int minor;
         char name[16];
         wait_queue_head_t wait;
-        struct list_head list;
+        struct list_head client_list;
         struct input_handle handle;
 
+        struct list_head mixdev_node;
+        int mixdev_open;
+
         struct mousedev_hw_data packet;
         unsigned int pkt_count;
         int old_x[4], old_y[4];
@@ -85,7 +88,7 @@ struct mousedev_motion {
 };
 
 #define PACKET_QUEUE_LEN        16
-struct mousedev_list {
+struct mousedev_client {
         struct fasync_struct *fasync;
         struct mousedev *mousedev;
         struct list_head node;
@@ -111,6 +114,7 @@ static struct input_handler mousedev_handler;
 
 static struct mousedev *mousedev_table[MOUSEDEV_MINORS];
 static struct mousedev mousedev_mix;
+static LIST_HEAD(mousedev_mix_list);
 
 #define fx(i)  (mousedev->old_x[(mousedev->pkt_count - (i)) & 03])
 #define fy(i)  (mousedev->old_y[(mousedev->pkt_count - (i)) & 03])
@@ -120,32 +124,33 @@ static void mousedev_touchpad_event(struct input_dev *dev, struct mousedev *mous
         int size, tmp;
         enum { FRACTION_DENOM = 128 };
 
-        if (mousedev->touch) {
-                size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
-                if (size == 0)
-                        size = 256 * 2;
-
-                switch (code) {
-                        case ABS_X:
-                                fx(0) = value;
-                                if (mousedev->pkt_count >= 2) {
-                                        tmp = ((value - fx(2)) * (256 * FRACTION_DENOM)) / size;
-                                        tmp += mousedev->frac_dx;
-                                        mousedev->packet.dx = tmp / FRACTION_DENOM;
-                                        mousedev->frac_dx = tmp - mousedev->packet.dx * FRACTION_DENOM;
-                                }
-                                break;
+        switch (code) {
+                case ABS_X:
+                        fx(0) = value;
+                        if (mousedev->touch && mousedev->pkt_count >= 2) {
+                                size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
+                                if (size == 0)
+                                        size = 256 * 2;
+                                tmp = ((value - fx(2)) * (256 * FRACTION_DENOM)) / size;
+                                tmp += mousedev->frac_dx;
+                                mousedev->packet.dx = tmp / FRACTION_DENOM;
+                                mousedev->frac_dx = tmp - mousedev->packet.dx * FRACTION_DENOM;
+                        }
+                        break;
 
-                        case ABS_Y:
-                                fy(0) = value;
-                                if (mousedev->pkt_count >= 2) {
-                                        tmp = -((value - fy(2)) * (256 * FRACTION_DENOM)) / size;
-                                        tmp += mousedev->frac_dy;
-                                        mousedev->packet.dy = tmp / FRACTION_DENOM;
-                                        mousedev->frac_dy = tmp - mousedev->packet.dy * FRACTION_DENOM;
-                                }
-                                break;
-                }
+                case ABS_Y:
+                        fy(0) = value;
+                        if (mousedev->touch && mousedev->pkt_count >= 2) {
+                                /* use X size to keep the same scale */
+                                size = dev->absmax[ABS_X] - dev->absmin[ABS_X];
+                                if (size == 0)
+                                        size = 256 * 2;
+                                tmp = -((value - fy(2)) * (256 * FRACTION_DENOM)) / size;
+                                tmp += mousedev->frac_dy;
+                                mousedev->packet.dy = tmp / FRACTION_DENOM;
+                                mousedev->frac_dy = tmp - mousedev->packet.dy * FRACTION_DENOM;
+                        }
+                        break;
         }
 }
 
@@ -223,47 +228,47 @@ static void mousedev_key_event(struct mousedev *mousedev, unsigned int code, int
 
 static void mousedev_notify_readers(struct mousedev *mousedev, struct mousedev_hw_data *packet)
 {
-        struct mousedev_list *list;
+        struct mousedev_client *client;
         struct mousedev_motion *p;
         unsigned long flags;
         int wake_readers = 0;
 
-        list_for_each_entry(list, &mousedev->list, node) {
-                spin_lock_irqsave(&list->packet_lock, flags);
+        list_for_each_entry(client, &mousedev->client_list, node) {
+                spin_lock_irqsave(&client->packet_lock, flags);
 
-                p = &list->packets[list->head];
-                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];
+                p = &client->packets[client->head];
+                if (client->ready && p->buttons != mousedev->packet.buttons) {
+                        unsigned int new_head = (client->head + 1) % PACKET_QUEUE_LEN;
+                        if (new_head != client->tail) {
+                                p = &client->packets[client->head = new_head];
                                 memset(p, 0, sizeof(struct mousedev_motion));
                         }
                 }
 
                 if (packet->abs_event) {
-                        p->dx += packet->x - list->pos_x;
-                        p->dy += packet->y - list->pos_y;
-                        list->pos_x = packet->x;
-                        list->pos_y = packet->y;
+                        p->dx += packet->x - client->pos_x;
+                        p->dy += packet->y - client->pos_y;
+                        client->pos_x = packet->x;
+                        client->pos_y = packet->y;
                 }
 
-                list->pos_x += packet->dx;
-                list->pos_x = list->pos_x < 0 ? 0 : (list->pos_x >= xres ? xres : list->pos_x);
-                list->pos_y += packet->dy;
-                list->pos_y = list->pos_y < 0 ? 0 : (list->pos_y >= yres ? yres : list->pos_y);
+                client->pos_x += packet->dx;
+                client->pos_x = client->pos_x < 0 ? 0 : (client->pos_x >= xres ? xres : client->pos_x);
+                client->pos_y += packet->dy;
+                client->pos_y = client->pos_y < 0 ? 0 : (client->pos_y >= yres ? yres : client->pos_y);
 
                 p->dx += packet->dx;
                 p->dy += packet->dy;
                 p->dz += packet->dz;
                 p->buttons = mousedev->packet.buttons;
 
-                if (p->dx || p->dy || p->dz || p->buttons != list->last_buttons)
-                        list->ready = 1;
+                if (p->dx || p->dy || p->dz || p->buttons != client->last_buttons)
+                        client->ready = 1;
 
-                spin_unlock_irqrestore(&list->packet_lock, flags);
+                spin_unlock_irqrestore(&client->packet_lock, flags);
 
-                if (list->ready) {
-                        kill_fasync(&list->fasync, SIGIO, POLL_IN);
+                if (client->ready) {
+                        kill_fasync(&client->fasync, SIGIO, POLL_IN);
                         wake_readers = 1;
                 }
         }
@@ -351,9 +356,9 @@ static void mousedev_event(struct input_handle *handle, unsigned int type, unsig
 static int mousedev_fasync(int fd, struct file *file, int on)
 {
         int retval;
-        struct mousedev_list *list = file->private_data;
+        struct mousedev_client *client = file->private_data;
 
-        retval = fasync_helper(fd, file, on, &list->fasync);
+        retval = fasync_helper(fd, file, on, &client->fasync);
 
         return retval < 0 ? retval : 0;
 }
@@ -364,50 +369,95 @@ static void mousedev_free(struct mousedev *mousedev)
         kfree(mousedev);
 }
 
-static void mixdev_release(void)
+static int mixdev_add_device(struct mousedev *mousedev)
 {
-        struct input_handle *handle;
+        int error;
 
-        list_for_each_entry(handle, &mousedev_handler.h_list, h_node) {
-                struct mousedev *mousedev = handle->private;
+        if (mousedev_mix.open) {
+                error = input_open_device(&mousedev->handle);
+                if (error)
+                        return error;
 
-                if (!mousedev->open) {
-                        if (mousedev->exist)
-                                input_close_device(&mousedev->handle);
-                        else
-                                mousedev_free(mousedev);
+                mousedev->open++;
+                mousedev->mixdev_open++;
+        }
+
+        list_add_tail(&mousedev->mixdev_node, &mousedev_mix_list);
+
+        return 0;
+}
+
+static void mixdev_remove_device(struct mousedev *mousedev)
+{
+        if (mousedev->mixdev_open) {
+                mousedev->mixdev_open = 0;
+                if (!--mousedev->open && mousedev->exist)
+                        input_close_device(&mousedev->handle);
+        }
+
+        list_del_init(&mousedev->mixdev_node);
+}
+
+static void mixdev_open_devices(void)
+{
+        struct mousedev *mousedev;
+
+        list_for_each_entry(mousedev, &mousedev_mix_list, mixdev_node) {
+                if (mousedev->exist && !mousedev->open) {
+                        if (input_open_device(&mousedev->handle))
+                                continue;
+
+                        mousedev->open++;
+                        mousedev->mixdev_open++;
+                }
+        }
+}
+
+static void mixdev_close_devices(void)
+{
+        struct mousedev *mousedev, *next;
+
+        list_for_each_entry_safe(mousedev, next, &mousedev_mix_list, mixdev_node) {
+                if (mousedev->mixdev_open) {
+                        mousedev->mixdev_open = 0;
+                        if (!--mousedev->open) {
+                                if (mousedev->exist)
+                                        input_close_device(&mousedev->handle);
+                                else
+                                        mousedev_free(mousedev);
+                        }
                 }
         }
 }
 
-static int mousedev_release(struct inode * inode, struct file * file)
+static int mousedev_release(struct inode *inode, struct file *file)
 {
-        struct mousedev_list *list = file->private_data;
+        struct mousedev_client *client = file->private_data;
+        struct mousedev *mousedev = client->mousedev;
 
         mousedev_fasync(-1, file, 0);
 
-        list_del(&list->node);
+        list_del(&client->node);
+        kfree(client);
 
-        if (!--list->mousedev->open) {
-                if (list->mousedev->minor == MOUSEDEV_MIX)
-                        mixdev_release();
-                else if (!mousedev_mix.open) {
-                        if (list->mousedev->exist)
-                                input_close_device(&list->mousedev->handle);
-                        else
-                                mousedev_free(list->mousedev);
-                }
+        if (!--mousedev->open) {
+                if (mousedev->minor == MOUSEDEV_MIX)
+                        mixdev_close_devices();
+                else if (mousedev->exist)
+                        input_close_device(&mousedev->handle);
+                else
+                        mousedev_free(mousedev);
         }
 
-        kfree(list);
         return 0;
 }
 
-static int mousedev_open(struct inode * inode, struct file * file)
+
+static int mousedev_open(struct inode *inode, struct file *file)
 {
-        struct mousedev_list *list;
-        struct input_handle *handle;
+        struct mousedev_client *client;
         struct mousedev *mousedev;
+        int error;
         int i;
 
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -417,31 +467,37 @@ static int mousedev_open(struct inode * inode, struct file * file)
 #endif
                 i = iminor(inode) - MOUSEDEV_MINOR_BASE;
 
-        if (i >= MOUSEDEV_MINORS || !mousedev_table[i])
+        if (i >= MOUSEDEV_MINORS)
+                return -ENODEV;
+
+        mousedev = mousedev_table[i];
+        if (!mousedev)
                 return -ENODEV;
 
-        if (!(list = kzalloc(sizeof(struct mousedev_list), GFP_KERNEL)))
+        client = kzalloc(sizeof(struct mousedev_client), GFP_KERNEL);
+        if (!client)
                 return -ENOMEM;
 
-        spin_lock_init(&list->packet_lock);
-        list->pos_x = xres / 2;
-        list->pos_y = yres / 2;
-        list->mousedev = mousedev_table[i];
-        list_add_tail(&list->node, &mousedev_table[i]->list);
-        file->private_data = list;
-
-        if (!list->mousedev->open++) {
-                if (list->mousedev->minor == MOUSEDEV_MIX) {
-                        list_for_each_entry(handle, &mousedev_handler.h_list, h_node) {
-                                mousedev = handle->private;
-                                if (!mousedev->open && mousedev->exist)
-                                        input_open_device(handle);
+        spin_lock_init(&client->packet_lock);
+        client->pos_x = xres / 2;
+        client->pos_y = yres / 2;
+        client->mousedev = mousedev;
+        list_add_tail(&client->node, &mousedev->client_list);
+
+        if (!mousedev->open++) {
+                if (mousedev->minor == MOUSEDEV_MIX)
+                        mixdev_open_devices();
+                else if (mousedev->exist) {
+                        error = input_open_device(&mousedev->handle);
+                        if (error) {
+                                list_del(&client->node);
+                                kfree(client);
+                                return error;
                         }
-                } else
-                        if (!mousedev_mix.open && list->mousedev->exist)
-                                input_open_device(&list->mousedev->handle);
+                }
         }
 
+        file->private_data = client;
         return 0;
 }
 
@@ -450,13 +506,13 @@ static inline int mousedev_limit_delta(int delta, int limit)
         return delta > limit ? limit : (delta < -limit ? -limit : delta);
 }
 
-static void mousedev_packet(struct mousedev_list *list, signed char *ps2_data)
+static void mousedev_packet(struct mousedev_client *client, signed char *ps2_data)
 {
         struct mousedev_motion *p;
         unsigned long flags;
 
-        spin_lock_irqsave(&list->packet_lock, flags);
-        p = &list->packets[list->tail];
+        spin_lock_irqsave(&client->packet_lock, flags);
+        p = &client->packets[client->tail];
 
         ps2_data[0] = 0x08 | ((p->dx < 0) << 4) | ((p->dy < 0) << 5) | (p->buttons & 0x07);
         ps2_data[1] = mousedev_limit_delta(p->dx, 127);
@@ -464,44 +520,44 @@ static void mousedev_packet(struct mousedev_list *list, signed char *ps2_data)
         p->dx -= ps2_data[1];
         p->dy -= ps2_data[2];
 
-        switch (list->mode) {
+        switch (client->mode) {
                 case MOUSEDEV_EMUL_EXPS:
                         ps2_data[3] = mousedev_limit_delta(p->dz, 7);
                         p->dz -= ps2_data[3];
                         ps2_data[3] = (ps2_data[3] & 0x0f) | ((p->buttons & 0x18) << 1);
-                        list->bufsiz = 4;
+                        client->bufsiz = 4;
                         break;
 
                 case MOUSEDEV_EMUL_IMPS:
                         ps2_data[0] |= ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
                         ps2_data[3] = mousedev_limit_delta(p->dz, 127);
                         p->dz -= ps2_data[3];
-                        list->bufsiz = 4;
+                        client->bufsiz = 4;
                         break;
 
                 case MOUSEDEV_EMUL_PS2:
                 default:
                         ps2_data[0] |= ((p->buttons & 0x10) >> 3) | ((p->buttons & 0x08) >> 1);
                         p->dz = 0;
-                        list->bufsiz = 3;
+                        client->bufsiz = 3;
                         break;
         }
 
         if (!p->dx && !p->dy && !p->dz) {
-                if (list->tail == list->head) {
-                        list->ready = 0;
-                        list->last_buttons = p->buttons;
+                if (client->tail == client->head) {
+                        client->ready = 0;
+                        client->last_buttons = p->buttons;
                 } else
-                        list->tail = (list->tail + 1) % PACKET_QUEUE_LEN;
+                        client->tail = (client->tail + 1) % PACKET_QUEUE_LEN;
         }
 
-        spin_unlock_irqrestore(&list->packet_lock, flags);
+        spin_unlock_irqrestore(&client->packet_lock, flags);
 }
 
 
-static ssize_t mousedev_write(struct file * file, const char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t mousedev_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct mousedev_list *list = file->private_data;
+        struct mousedev_client *client = file->private_data;
         unsigned char c;
         unsigned int i;
 
@@ -510,95 +566,95 @@ static ssize_t mousedev_write(struct file * file, const char __user * buffer, si
                 if (get_user(c, buffer + i))
                         return -EFAULT;
 
-                if (c == mousedev_imex_seq[list->imexseq]) {
-                        if (++list->imexseq == MOUSEDEV_SEQ_LEN) {
-                                list->imexseq = 0;
-                                list->mode = MOUSEDEV_EMUL_EXPS;
+                if (c == mousedev_imex_seq[client->imexseq]) {
+                        if (++client->imexseq == MOUSEDEV_SEQ_LEN) {
+                                client->imexseq = 0;
+                                client->mode = MOUSEDEV_EMUL_EXPS;
                         }
                 } else
-                        list->imexseq = 0;
+                        client->imexseq = 0;
 
-                if (c == mousedev_imps_seq[list->impsseq]) {
-                        if (++list->impsseq == MOUSEDEV_SEQ_LEN) {
-                                list->impsseq = 0;
-                                list->mode = MOUSEDEV_EMUL_IMPS;
+                if (c == mousedev_imps_seq[client->impsseq]) {
+                        if (++client->impsseq == MOUSEDEV_SEQ_LEN) {
+                                client->impsseq = 0;
+                                client->mode = MOUSEDEV_EMUL_IMPS;
                         }
                 } else
-                        list->impsseq = 0;
+                        client->impsseq = 0;
 
-                list->ps2[0] = 0xfa;
+                client->ps2[0] = 0xfa;
 
                 switch (c) {
 
                         case 0xeb: /* Poll */
-                                mousedev_packet(list, &list->ps2[1]);
-                                list->bufsiz++; /* account for leading ACK */
+                                mousedev_packet(client, &client->ps2[1]);
+                                client->bufsiz++; /* account for leading ACK */
                                 break;
 
                         case 0xf2: /* Get ID */
-                                switch (list->mode) {
-                                        case MOUSEDEV_EMUL_PS2:  list->ps2[1] = 0; break;
-                                        case MOUSEDEV_EMUL_IMPS: list->ps2[1] = 3; break;
-                                        case MOUSEDEV_EMUL_EXPS: list->ps2[1] = 4; break;
+                                switch (client->mode) {
+                                        case MOUSEDEV_EMUL_PS2:  client->ps2[1] = 0; break;
+                                        case MOUSEDEV_EMUL_IMPS: client->ps2[1] = 3; break;
+                                        case MOUSEDEV_EMUL_EXPS: client->ps2[1] = 4; break;
                                 }
-                                list->bufsiz = 2;
+                                client->bufsiz = 2;
                                 break;
 
                         case 0xe9: /* Get info */
-                                list->ps2[1] = 0x60; list->ps2[2] = 3; list->ps2[3] = 200;
-                                list->bufsiz = 4;
+                                client->ps2[1] = 0x60; client->ps2[2] = 3; client->ps2[3] = 200;
+                                client->bufsiz = 4;
                                 break;
 
                         case 0xff: /* Reset */
-                                list->impsseq = list->imexseq = 0;
-                                list->mode = MOUSEDEV_EMUL_PS2;
-                                list->ps2[1] = 0xaa; list->ps2[2] = 0x00;
-                                list->bufsiz = 3;
+                                client->impsseq = client->imexseq = 0;
+                                client->mode = MOUSEDEV_EMUL_PS2;
+                                client->ps2[1] = 0xaa; client->ps2[2] = 0x00;
+                                client->bufsiz = 3;
                                 break;
 
                         default:
-                                list->bufsiz = 1;
+                                client->bufsiz = 1;
                                 break;
                 }
 
-                list->buffer = list->bufsiz;
+                client->buffer = client->bufsiz;
         }
 
-        kill_fasync(&list->fasync, SIGIO, POLL_IN);
+        kill_fasync(&client->fasync, SIGIO, POLL_IN);
 
-        wake_up_interruptible(&list->mousedev->wait);
+        wake_up_interruptible(&client->mousedev->wait);
 
         return count;
 }
 
-static ssize_t mousedev_read(struct file * file, char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t mousedev_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct mousedev_list *list = file->private_data;
+        struct mousedev_client *client = file->private_data;
         int retval = 0;
 
-        if (!list->ready && !list->buffer && (file->f_flags & O_NONBLOCK))
+        if (!client->ready && !client->buffer && (file->f_flags & O_NONBLOCK))
                 return -EAGAIN;
 
-        retval = wait_event_interruptible(list->mousedev->wait,
-                                          !list->mousedev->exist || list->ready || list->buffer);
+        retval = wait_event_interruptible(client->mousedev->wait,
+                                          !client->mousedev->exist || client->ready || client->buffer);
 
         if (retval)
                 return retval;
 
-        if (!list->mousedev->exist)
+        if (!client->mousedev->exist)
                 return -ENODEV;
 
-        if (!list->buffer && list->ready) {
-                mousedev_packet(list, list->ps2);
-                list->buffer = list->bufsiz;
+        if (!client->buffer && client->ready) {
+                mousedev_packet(client, client->ps2);
+                client->buffer = client->bufsiz;
         }
 
-        if (count > list->buffer)
-                count = list->buffer;
+        if (count > client->buffer)
+                count = client->buffer;
 
-        list->buffer -= count;
+        client->buffer -= count;
 
-        if (copy_to_user(buffer, list->ps2 + list->bufsiz - list->buffer - count, count))
+        if (copy_to_user(buffer, client->ps2 + client->bufsiz - client->buffer - count, count))
                 return -EFAULT;
 
         return count;
@@ -607,11 +663,12 @@ static ssize_t mousedev_read(struct file * file, char __user * buffer, size_t co
 /* No kernel lock - fine */
 static unsigned int mousedev_poll(struct file *file, poll_table *wait)
 {
-        struct mousedev_list *list = file->private_data;
+        struct mousedev_client *client = file->private_data;
+        struct mousedev *mousedev = client->mousedev;
 
-        poll_wait(file, &list->mousedev->wait, wait);
-        return ((list->ready || list->buffer) ? (POLLIN | POLLRDNORM) : 0) |
-                (list->mousedev->exist ? 0 : (POLLHUP | POLLERR));
+        poll_wait(file, &mousedev->wait, wait);
+        return ((client->ready || client->buffer) ? (POLLIN | POLLRDNORM) : 0) |
+                (mousedev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
 static const struct file_operations mousedev_fops = {
@@ -624,23 +681,27 @@ static const struct file_operations mousedev_fops = {
         .fasync =       mousedev_fasync,
 };
 
-static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev,
-                                             const struct input_device_id *id)
+static int mousedev_connect(struct input_handler *handler, struct input_dev *dev,
+                            const struct input_device_id *id)
 {
         struct mousedev *mousedev;
         struct class_device *cdev;
-        int minor = 0;
+        dev_t devt;
+        int minor;
+        int error;
 
         for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++);
         if (minor == MOUSEDEV_MINORS) {
                 printk(KERN_ERR "mousedev: no more free mousedev devices\n");
-                return NULL;
+                return -ENFILE;
         }
 
-        if (!(mousedev = kzalloc(sizeof(struct mousedev), GFP_KERNEL)))
-                return NULL;
+        mousedev = kzalloc(sizeof(struct mousedev), GFP_KERNEL);
+        if (!mousedev)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&mousedev->list);
+        INIT_LIST_HEAD(&mousedev->client_list);
+        INIT_LIST_HEAD(&mousedev->mixdev_node);
         init_waitqueue_head(&mousedev->wait);
 
         mousedev->minor = minor;
@@ -651,42 +712,66 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru
         mousedev->handle.private = mousedev;
         sprintf(mousedev->name, "mouse%d", minor);
 
-        if (mousedev_mix.open)
-                input_open_device(&mousedev->handle);
-
         mousedev_table[minor] = mousedev;
 
-        cdev = class_device_create(&input_class, &dev->cdev,
-                        MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, mousedev->name);
+        devt = MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
+
+        cdev = class_device_create(&input_class, &dev->cdev, devt,
+                                   dev->cdev.dev, mousedev->name);
+        if (IS_ERR(cdev)) {
+                error = PTR_ERR(cdev);
+                goto err_free_mousedev;
+        }
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
-                          mousedev->name);
+        error = sysfs_create_link(&input_class.subsys.kobj,
+                                  &cdev->kobj, mousedev->name);
+        if (error)
+                goto err_cdev_destroy;
+
+        error = input_register_handle(&mousedev->handle);
+        if (error)
+                goto err_remove_link;
+
+        error = mixdev_add_device(mousedev);
+        if (error)
+                goto err_unregister_handle;
+
+        return 0;
 
-        return &mousedev->handle;
+ err_unregister_handle:
+        input_unregister_handle(&mousedev->handle);
+ err_remove_link:
+        sysfs_remove_link(&input_class.subsys.kobj, mousedev->name);
+ err_cdev_destroy:
+        class_device_destroy(&input_class, devt);
+ err_free_mousedev:
+        mousedev_table[minor] = NULL;
+        kfree(mousedev);
+        return error;
 }
 
 static void mousedev_disconnect(struct input_handle *handle)
 {
         struct mousedev *mousedev = handle->private;
-        struct mousedev_list *list;
+        struct mousedev_client *client;
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name);
+        input_unregister_handle(handle);
+
+        sysfs_remove_link(&input_class.subsys.kobj, mousedev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
         mousedev->exist = 0;
 
+        mixdev_remove_device(mousedev);
+
         if (mousedev->open) {
                 input_close_device(handle);
                 wake_up_interruptible(&mousedev->wait);
-                list_for_each_entry(list, &mousedev->list, node)
-                        kill_fasync(&list->fasync, SIGIO, POLL_HUP);
-        } else {
-                if (mousedev_mix.open)
-                        input_close_device(handle);
+                list_for_each_entry(client, &mousedev->client_list, node)
+                        kill_fasync(&client->fasync, SIGIO, POLL_HUP);
+        } else
                 mousedev_free(mousedev);
-        }
 }
 
 static const struct input_device_id mousedev_ids[] = {
@@ -714,7 +799,7 @@ static const struct input_device_id mousedev_ids[] = {
                 .absbit = { BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) | BIT(ABS_TOOL_WIDTH) },
         },      /* A touchpad */
 
-        { },    /* Terminating entry */
+        { },    /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(input, mousedev_ids);
@@ -746,7 +831,7 @@ static int __init mousedev_init(void)
                 return error;
 
         memset(&mousedev_mix, 0, sizeof(struct mousedev));
-        INIT_LIST_HEAD(&mousedev_mix.list);
+        INIT_LIST_HEAD(&mousedev_mix.client_list);
         init_waitqueue_head(&mousedev_mix.wait);
         mousedev_table[MOUSEDEV_MIX] = &mousedev_mix;
         mousedev_mix.exist = 1;
diff --git a/drivers/input/power.c b/drivers/input/power.c
deleted file mode 100644
index ee82464a2fa7..000000000000
--- a/drivers/input/power.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * $Id: power.c,v 1.10 2001/09/25 09:17:15 vojtech Exp $
- *
- *  Copyright (c) 2001 "Crazy" James Simmons
- *
- *  Input driver Power Management.
- *
- *  Sponsored by Transvirtual Technology.
- */
-
-/*
- * 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
- *
- * Should you need to contact me, the author, you can do so by
- * e-mail - mail your message to <jsimmons@transvirtual.com>.
- */
-
-#include <linux/module.h>
-#include <linux/input.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/tty.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-
-static struct input_handler power_handler;
-
-/*
- * Power management can't be done in a interrupt context. So we have to
- * use keventd.
- */
-static int suspend_button_pushed = 0;
-static void suspend_button_task_handler(void *data)
-{
-        udelay(200); /* debounce */
-        suspend_button_pushed = 0;
-}
-
-static DECLARE_WORK(suspend_button_task, suspend_button_task_handler, NULL);
-
-static void power_event(struct input_handle *handle, unsigned int type,
-                        unsigned int code, int down)
-{
-        struct input_dev *dev = handle->dev;
-
-        printk("Entering power_event\n");
-
-        if (type == EV_PWR) {
-                switch (code) {
-                        case KEY_SUSPEND:
-                                printk("Powering down entire device\n");
-
-                                if (!suspend_button_pushed) {
-                                        suspend_button_pushed = 1;
-                                        schedule_work(&suspend_button_task);
-                                }
-                                break;
-                        case KEY_POWER:
-                                /* Hum power down the machine. */
-                                break;
-                        default:
-                                return;
-                }
-        }
-
-        if (type == EV_KEY) {
-                switch (code) {
-                        case KEY_SUSPEND:
-                                printk("Powering down input device\n");
-                                /* This is risky. See pm.h for details. */
-                                if (dev->state != PM_RESUME)
-                                        dev->state = PM_RESUME;
-                                else
-                                        dev->state = PM_SUSPEND;
-                                pm_send(dev->pm_dev, dev->state, dev);
-                                break;
-                        case KEY_POWER:
-                                /* Turn the input device off completely ? */
-                                break;
-                        default:
-                                return;
-                }
-        }
-        return;
-}
-
-static struct input_handle *power_connect(struct input_handler *handler,
-                                          struct input_dev *dev,
-                                          const struct input_device_id *id)
-{
-        struct input_handle *handle;
-
-        if (!(handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL)))
-                return NULL;
-
-        handle->dev = dev;
-        handle->handler = handler;
-
-        input_open_device(handle);
-
-        printk(KERN_INFO "power.c: Adding power management to input layer\n");
-        return handle;
-}
-
-static void power_disconnect(struct input_handle *handle)
-{
-        input_close_device(handle);
-        kfree(handle);
-}
-
-static const struct input_device_id power_ids[] = {
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT(EV_KEY) },
-                .keybit = { [LONG(KEY_SUSPEND)] = BIT(KEY_SUSPEND) }
-        },
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT(EV_KEY) },
-                .keybit = { [LONG(KEY_POWER)] = BIT(KEY_POWER) }
-        },
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT(EV_PWR) },
-        },
-        { },    /* Terminating entry */
-};
-
-MODULE_DEVICE_TABLE(input, power_ids);
-
-static struct input_handler power_handler = {
-        .event =        power_event,
-        .connect =      power_connect,
-        .disconnect =   power_disconnect,
-        .name =         "power",
-        .id_table =     power_ids,
-};
-
-static int __init power_init(void)
-{
-        return input_register_handler(&power_handler);
-}
-
-static void __exit power_exit(void)
-{
-        input_unregister_handler(&power_handler);
-}
-
-module_init(power_init);
-module_exit(power_exit);
-
-MODULE_AUTHOR("James Simmons <jsimmons@transvirtual.com>");
-MODULE_DESCRIPTION("Input Power Management driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 4fa93ff30919..93a1a6ba216a 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -32,11 +32,11 @@
  *
  *      Driver theory of operation:
  *
- *      Some access methods and an ISR is defined by the sub-driver 
- *      (e.g. hp_sdc_mlc.c).  These methods are expected to provide a 
- *      few bits of logic in addition to raw access to the HIL MLC, 
- *      specifically, the ISR, which is entirely registered by the 
- *      sub-driver and invoked directly, must check for record 
+ *      Some access methods and an ISR is defined by the sub-driver
+ *      (e.g. hp_sdc_mlc.c).  These methods are expected to provide a
+ *      few bits of logic in addition to raw access to the HIL MLC,
+ *      specifically, the ISR, which is entirely registered by the
+ *      sub-driver and invoked directly, must check for record
  *      termination or packet match, at which point a semaphore must
  *      be cleared and then the hil_mlcs_tasklet must be scheduled.
  *
@@ -47,7 +47,7 @@
  *      itself if output is pending.  (This rescheduling should be replaced
  *      at some point with a sub-driver-specific mechanism.)
  *
- *      A timer task prods the tasklet once per second to prevent 
+ *      A timer task prods the tasklet once per second to prevent
  *      hangups when attached devices do not return expected data
  *      and to initiate probes of the loop for new devices.
  */
@@ -83,69 +83,85 @@ DECLARE_TASKLET_DISABLED(hil_mlcs_tasklet, hil_mlcs_process, 0);
 
 /********************** Device info/instance management **********************/
 
-static void hil_mlc_clear_di_map (hil_mlc *mlc, int val) {
+static void hil_mlc_clear_di_map(hil_mlc *mlc, int val)
+{
         int j;
-        for (j = val; j < 7 ; j++) {
+
+        for (j = val; j < 7 ; j++)
                 mlc->di_map[j] = -1;
-        }
 }
 
-static void hil_mlc_clear_di_scratch (hil_mlc *mlc) {
-        memset(&(mlc->di_scratch), 0, sizeof(mlc->di_scratch));
+static void hil_mlc_clear_di_scratch(hil_mlc *mlc)
+{
+        memset(&mlc->di_scratch, 0, sizeof(mlc->di_scratch));
 }
 
-static void hil_mlc_copy_di_scratch (hil_mlc *mlc, int idx) {
-        memcpy(&(mlc->di[idx]), &(mlc->di_scratch), sizeof(mlc->di_scratch));
+static void hil_mlc_copy_di_scratch(hil_mlc *mlc, int idx)
+{
+        memcpy(&mlc->di[idx], &mlc->di_scratch, sizeof(mlc->di_scratch));
 }
 
-static int hil_mlc_match_di_scratch (hil_mlc *mlc) {
+static int hil_mlc_match_di_scratch(hil_mlc *mlc)
+{
         int idx;
 
         for (idx = 0; idx < HIL_MLC_DEVMEM; idx++) {
-                int j, found;
+                int j, found = 0;
 
                 /* In-use slots are not eligible. */
-                found = 0;
-                for (j = 0; j < 7 ; j++) {
-                        if (mlc->di_map[j] == idx) found++;
-                }
-                if (found) continue;
-                if (!memcmp(mlc->di + idx, 
-                            &(mlc->di_scratch), 
-                            sizeof(mlc->di_scratch))) break;
+                for (j = 0; j < 7 ; j++)
+                        if (mlc->di_map[j] == idx)
+                                found++;
+
+                if (found)
+                        continue;
+
+                if (!memcmp(mlc->di + idx, &mlc->di_scratch,
+                                sizeof(mlc->di_scratch)))
+                        break;
         }
-        return((idx >= HIL_MLC_DEVMEM) ? -1 : idx);
+        return idx >= HIL_MLC_DEVMEM ? -1 : idx;
 }
 
-static int hil_mlc_find_free_di(hil_mlc *mlc) {
+static int hil_mlc_find_free_di(hil_mlc *mlc)
+{
         int idx;
-        /* TODO: Pick all-zero slots first, failing that, 
-         * randomize the slot picked among those eligible. 
+
+        /* TODO: Pick all-zero slots first, failing that,
+         * randomize the slot picked among those eligible.
          */
         for (idx = 0; idx < HIL_MLC_DEVMEM; idx++) {
-                int j, found;
-                found = 0;
-                for (j = 0; j < 7 ; j++) {
-                        if (mlc->di_map[j] == idx) found++;
-                }
-                if (!found) break;
+                int j, found = 0;
+
+                for (j = 0; j < 7 ; j++)
+                        if (mlc->di_map[j] == idx)
+                                found++;
+
+                if (!found)
+                        break;
         }
-        return(idx); /* Note: It is guaranteed at least one above will match */
+
+        return idx; /* Note: It is guaranteed at least one above will match */
 }
 
-static inline void hil_mlc_clean_serio_map(hil_mlc *mlc) {
+static inline void hil_mlc_clean_serio_map(hil_mlc *mlc)
+{
         int idx;
+
         for (idx = 0; idx < HIL_MLC_DEVMEM; idx++) {
-                int j, found;
-                found = 0;
-                for (j = 0; j < 7 ; j++) {
-                        if (mlc->di_map[j] == idx) found++;
-                }
-                if (!found) mlc->serio_map[idx].di_revmap = -1;
+                int j, found = 0;
+
+                for (j = 0; j < 7 ; j++)
+                        if (mlc->di_map[j] == idx)
+                                found++;
+
+                if (!found)
+                        mlc->serio_map[idx].di_revmap = -1;
         }
 }
 
-static void hil_mlc_send_polls(hil_mlc *mlc) {
+static void hil_mlc_send_polls(hil_mlc *mlc)
+{
         int did, i, cnt;
         struct serio *serio;
         struct serio_driver *drv;
@@ -157,26 +173,31 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
 
         while (mlc->icount < 15 - i) {
                 hil_packet p;
+
                 p = mlc->ipacket[i];
                 if (did != (p & HIL_PKT_ADDR_MASK) >> 8) {
-                        if (drv == NULL || drv->interrupt == NULL) goto skip;
+                        if (drv && drv->interrupt) {
+                                drv->interrupt(serio, 0, 0);
+                                drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
+                                drv->interrupt(serio, HIL_PKT_CMD >> 8,  0);
+                                drv->interrupt(serio, HIL_CMD_POL + cnt, 0);
+                        }
 
-                        drv->interrupt(serio, 0, 0);
-                        drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
-                        drv->interrupt(serio, HIL_PKT_CMD >> 8,  0);
-                        drv->interrupt(serio, HIL_CMD_POL + cnt, 0);
-                skip:
                         did = (p & HIL_PKT_ADDR_MASK) >> 8;
                         serio = did ? mlc->serio[mlc->di_map[did-1]] : NULL;
                         drv = (serio != NULL) ? serio->drv : NULL;
                         cnt = 0;
                 }
-                cnt++; i++;
-                if (drv == NULL || drv->interrupt == NULL) continue;
-                drv->interrupt(serio, (p >> 24), 0);
-                drv->interrupt(serio, (p >> 16) & 0xff, 0);
-                drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0);
-                drv->interrupt(serio, p & 0xff, 0);
+
+                cnt++;
+                i++;
+
+                if (drv && drv->interrupt) {
+                        drv->interrupt(serio, (p >> 24), 0);
+                        drv->interrupt(serio, (p >> 16) & 0xff, 0);
+                        drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0);
+                        drv->interrupt(serio, p & 0xff, 0);
+                }
         }
 }
 
@@ -215,12 +236,16 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
 #define HILSEN_DOZE     (HILSEN_SAME | HILSEN_SCHED | HILSEN_BREAK)
 #define HILSEN_SLEEP    (HILSEN_SAME | HILSEN_BREAK)
 
-static int hilse_match(hil_mlc *mlc, int unused) {
+static int hilse_match(hil_mlc *mlc, int unused)
+{
         int rc;
+
         rc = hil_mlc_match_di_scratch(mlc);
         if (rc == -1) {
                 rc = hil_mlc_find_free_di(mlc);
-                if (rc == -1) goto err;
+                if (rc == -1)
+                        goto err;
+
 #ifdef HIL_MLC_DEBUG
                 printk(KERN_DEBUG PREFIX "new in slot %i\n", rc);
 #endif
@@ -231,6 +256,7 @@ static int hilse_match(hil_mlc *mlc, int unused) {
                 serio_rescan(mlc->serio[rc]);
                 return -1;
         }
+
         mlc->di_map[mlc->ddi] = rc;
 #ifdef HIL_MLC_DEBUG
         printk(KERN_DEBUG PREFIX "same in slot %i\n", rc);
@@ -238,152 +264,177 @@ static int hilse_match(hil_mlc *mlc, int unused) {
         mlc->serio_map[rc].di_revmap = mlc->ddi;
         hil_mlc_clean_serio_map(mlc);
         return 0;
+
  err:
         printk(KERN_ERR PREFIX "Residual device slots exhausted, close some serios!\n");
         return 1;
 }
 
 /* An LCV used to prevent runaway loops, forces 5 second sleep when reset. */
-static int hilse_init_lcv(hil_mlc *mlc, int unused) {
+static int hilse_init_lcv(hil_mlc *mlc, int unused)
+{
         struct timeval tv;
 
         do_gettimeofday(&tv);
 
-        if(mlc->lcv == 0) goto restart;  /* First init, no need to dally */
-        if(tv.tv_sec - mlc->lcv_tv.tv_sec < 5) return -1;
- restart:
+        if (mlc->lcv && (tv.tv_sec - mlc->lcv_tv.tv_sec) < 5)
+                return -1;
+
         mlc->lcv_tv = tv;
         mlc->lcv = 0;
+
         return 0;
 }
 
-static int hilse_inc_lcv(hil_mlc *mlc, int lim) {
-        if (mlc->lcv++ >= lim) return -1;
-        return 0;
+static int hilse_inc_lcv(hil_mlc *mlc, int lim)
+{
+        return mlc->lcv++ >= lim ? -1 : 0;
 }
 
 #if 0
-static int hilse_set_lcv(hil_mlc *mlc, int val) {
+static int hilse_set_lcv(hil_mlc *mlc, int val)
+{
         mlc->lcv = val;
+
         return 0;
 }
 #endif
 
 /* Management of the discovered device index (zero based, -1 means no devs) */
-static int hilse_set_ddi(hil_mlc *mlc, int val) {
+static int hilse_set_ddi(hil_mlc *mlc, int val)
+{
         mlc->ddi = val;
         hil_mlc_clear_di_map(mlc, val + 1);
+
         return 0;
 }
 
-static int hilse_dec_ddi(hil_mlc *mlc, int unused) {
+static int hilse_dec_ddi(hil_mlc *mlc, int unused)
+{
         mlc->ddi--;
-        if (mlc->ddi <= -1) { 
+        if (mlc->ddi <= -1) {
                 mlc->ddi = -1;
                 hil_mlc_clear_di_map(mlc, 0);
                 return -1;
         }
         hil_mlc_clear_di_map(mlc, mlc->ddi + 1);
+
         return 0;
 }
 
-static int hilse_inc_ddi(hil_mlc *mlc, int unused) {
-        if (mlc->ddi >= 6) {
-                BUG();
-                return -1;
-        }
+static int hilse_inc_ddi(hil_mlc *mlc, int unused)
+{
+        BUG_ON(mlc->ddi >= 6);
         mlc->ddi++;
+
         return 0;
 }
 
-static int hilse_take_idd(hil_mlc *mlc, int unused) {
+static int hilse_take_idd(hil_mlc *mlc, int unused)
+{
         int i;
 
-        /* Help the state engine: 
-         * Is this a real IDD response or just an echo? 
+        /* Help the state engine:
+         * Is this a real IDD response or just an echo?
          *
-         * Real IDD response does not start with a command. 
+         * Real IDD response does not start with a command.
          */
-        if (mlc->ipacket[0] & HIL_PKT_CMD) goto bail;
+        if (mlc->ipacket[0] & HIL_PKT_CMD)
+                goto bail;
+
         /* Should have the command echoed further down. */
         for (i = 1; i < 16; i++) {
-                if (((mlc->ipacket[i] & HIL_PKT_ADDR_MASK) == 
+                if (((mlc->ipacket[i] & HIL_PKT_ADDR_MASK) ==
                      (mlc->ipacket[0] & HIL_PKT_ADDR_MASK)) &&
-                    (mlc->ipacket[i] & HIL_PKT_CMD) && 
+                    (mlc->ipacket[i] & HIL_PKT_CMD) &&
                     ((mlc->ipacket[i] & HIL_PKT_DATA_MASK) == HIL_CMD_IDD))
                         break;
         }
-        if (i > 15) goto bail;
+        if (i > 15)
+                goto bail;
+
         /* And the rest of the packets should still be clear. */
-        while (++i < 16) {
-                if (mlc->ipacket[i]) break;
-        }
-        if (i < 16) goto bail;
-        for (i = 0; i < 16; i++) {
-                mlc->di_scratch.idd[i] = 
+        while (++i < 16)
+                if (mlc->ipacket[i])
+                        break;
+
+        if (i < 16)
+                goto bail;
+
+        for (i = 0; i < 16; i++)
+                mlc->di_scratch.idd[i] =
                         mlc->ipacket[i] & HIL_PKT_DATA_MASK;
-        }
+
         /* Next step is to see if RSC supported */
-        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_RSC) 
+        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_RSC)
                 return HILSEN_NEXT;
-        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_EXD) 
+
+        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_EXD)
                 return HILSEN_DOWN | 4;
+
         return 0;
+
  bail:
         mlc->ddi--;
+
         return -1; /* This should send us off to ACF */
 }
 
-static int hilse_take_rsc(hil_mlc *mlc, int unused) {
+static int hilse_take_rsc(hil_mlc *mlc, int unused)
+{
         int i;
 
-        for (i = 0; i < 16; i++) {
-                mlc->di_scratch.rsc[i] = 
+        for (i = 0; i < 16; i++)
+                mlc->di_scratch.rsc[i] =
                         mlc->ipacket[i] & HIL_PKT_DATA_MASK;
-        }
+
         /* Next step is to see if EXD supported (IDD has already been read) */
-        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_EXD) 
+        if (mlc->di_scratch.idd[1] & HIL_IDD_HEADER_EXD)
                 return HILSEN_NEXT;
+
         return 0;
 }
 
-static int hilse_take_exd(hil_mlc *mlc, int unused) {
+static int hilse_take_exd(hil_mlc *mlc, int unused)
+{
         int i;
 
-        for (i = 0; i < 16; i++) {
-                mlc->di_scratch.exd[i] = 
+        for (i = 0; i < 16; i++)
+                mlc->di_scratch.exd[i] =
                         mlc->ipacket[i] & HIL_PKT_DATA_MASK;
-        }
+
         /* Next step is to see if RNM supported. */
-        if (mlc->di_scratch.exd[0] & HIL_EXD_HEADER_RNM) 
+        if (mlc->di_scratch.exd[0] & HIL_EXD_HEADER_RNM)
                 return HILSEN_NEXT;
+
         return 0;
 }
 
-static int hilse_take_rnm(hil_mlc *mlc, int unused) {
+static int hilse_take_rnm(hil_mlc *mlc, int unused)
+{
         int i;
 
-        for (i = 0; i < 16; i++) {
-                mlc->di_scratch.rnm[i] = 
+        for (i = 0; i < 16; i++)
+                mlc->di_scratch.rnm[i] =
                         mlc->ipacket[i] & HIL_PKT_DATA_MASK;
-        }
-        do {
-          char nam[17];
-          snprintf(nam, 16, "%s", mlc->di_scratch.rnm);
-          nam[16] = '\0';
-          printk(KERN_INFO PREFIX "Device name gotten: %s\n", nam);
-        } while (0);
+
+        printk(KERN_INFO PREFIX "Device name gotten: %16s\n",
+                        mlc->di_scratch.rnm);
+
         return 0;
 }
 
-static int hilse_operate(hil_mlc *mlc, int repoll) { 
+static int hilse_operate(hil_mlc *mlc, int repoll)
+{
 
-        if (mlc->opercnt == 0) hil_mlcs_probe = 0;
+        if (mlc->opercnt == 0)
+                hil_mlcs_probe = 0;
         mlc->opercnt = 1;
 
         hil_mlc_send_polls(mlc);
 
-        if (!hil_mlcs_probe) return 0;
+        if (!hil_mlcs_probe)
+                return 0;
         hil_mlcs_probe = 0;
         mlc->opercnt = 0;
         return 1;
@@ -408,7 +459,7 @@ static int hilse_operate(hil_mlc *mlc, int repoll) {
 #define OUT_LAST(pack) \
 { HILSE_OUT_LAST,       { .packet = pack }, 0, 0, 0, 0 },
 
-struct hilse_node hil_mlc_se[HILSEN_END] = {
+const struct hilse_node hil_mlc_se[HILSEN_END] = {
 
         /* 0  HILSEN_START */
         FUNC(hilse_init_lcv, 0, HILSEN_NEXT,    HILSEN_SLEEP,   0)
@@ -428,7 +479,7 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
         EXPECT(HIL_ERR_INT | TEST_PACKET(0xa),
                2000,            HILSEN_NEXT,    HILSEN_RESTART, HILSEN_RESTART)
         OUT(HIL_CTRL_ONLY | 0)                  /* Disable test mode */
-        
+
         /* 9  HILSEN_DHR */
         FUNC(hilse_init_lcv, 0, HILSEN_NEXT,    HILSEN_SLEEP,   0)
 
@@ -439,7 +490,7 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
         IN(300000,              HILSEN_DHR2,    HILSEN_DHR2,    HILSEN_NEXT)
 
         /* 14 HILSEN_IFC */
-        OUT(HIL_PKT_CMD | HIL_CMD_IFC)
+        OUT(HIL_PKT_CMD | HIL_CMD_IFC)
         EXPECT(HIL_PKT_CMD | HIL_CMD_IFC | HIL_ERR_INT,
                20000,           HILSEN_DISC,    HILSEN_DHR2,    HILSEN_NEXT )
 
@@ -455,7 +506,7 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
 
         /* 18 HILSEN_HEAL */
         OUT_LAST(HIL_CMD_ELB)
-        EXPECT_LAST(HIL_CMD_ELB | HIL_ERR_INT, 
+        EXPECT_LAST(HIL_CMD_ELB | HIL_ERR_INT,
                     20000,      HILSEN_REPOLL,  HILSEN_DSR,     HILSEN_NEXT)
         FUNC(hilse_dec_ddi, 0,  HILSEN_HEAL,    HILSEN_NEXT,    0)
 
@@ -503,7 +554,7 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
 
         /* 44 HILSEN_PROBE */
         OUT_LAST(HIL_PKT_CMD | HIL_CMD_EPT)
-        IN(10000,               HILSEN_DISC,    HILSEN_DSR,     HILSEN_NEXT)
+        IN(10000,               HILSEN_DISC,    HILSEN_DSR,     HILSEN_NEXT)
         OUT_DISC(HIL_PKT_CMD | HIL_CMD_ELB)
         IN(10000,               HILSEN_DISC,    HILSEN_DSR,     HILSEN_NEXT)
         OUT(HIL_PKT_CMD | HIL_CMD_ACF | 1)
@@ -514,7 +565,7 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
         /* 52 HILSEN_DSR */
         FUNC(hilse_set_ddi, -1, HILSEN_NEXT,    0,              0)
         OUT(HIL_PKT_CMD | HIL_CMD_DSR)
-        IN(20000,               HILSEN_DHR,     HILSEN_DHR,     HILSEN_IFC)
+        IN(20000,               HILSEN_DHR,     HILSEN_DHR,     HILSEN_IFC)
 
         /* 55 HILSEN_REPOLL */
         OUT(HIL_PKT_CMD | HIL_CMD_RPL)
@@ -523,14 +574,15 @@ struct hilse_node hil_mlc_se[HILSEN_END] = {
         FUNC(hilse_operate, 1,  HILSEN_OPERATE, HILSEN_IFC,     HILSEN_PROBE)
 
         /* 58 HILSEN_IFCACF */
-        OUT(HIL_PKT_CMD | HIL_CMD_IFC)
+        OUT(HIL_PKT_CMD | HIL_CMD_IFC)
         EXPECT(HIL_PKT_CMD | HIL_CMD_IFC | HIL_ERR_INT,
                20000,           HILSEN_ACF2,    HILSEN_DHR2,    HILSEN_HEAL)
 
         /* 60 HILSEN_END */
 };
 
-static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) {
+static inline void hilse_setup_input(hil_mlc *mlc, const struct hilse_node *node)
+{
 
         switch (node->act) {
         case HILSE_EXPECT_DISC:
@@ -555,29 +607,27 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) {
         do_gettimeofday(&(mlc->instart));
         mlc->icount = 15;
         memset(mlc->ipacket, 0, 16 * sizeof(hil_packet));
-        BUG_ON(down_trylock(&(mlc->isem)));
-
-        return;
+        BUG_ON(down_trylock(&mlc->isem));
 }
 
 #ifdef HIL_MLC_DEBUG
-static int doze = 0;
+static int doze;
 static int seidx; /* For debug */
-static int kick = 1;
 #endif
 
-static int hilse_donode (hil_mlc *mlc) {
-        struct hilse_node *node;
+static int hilse_donode(hil_mlc *mlc)
+{
+        const struct hilse_node *node;
         int nextidx = 0;
         int sched_long = 0;
         unsigned long flags;
 
 #ifdef HIL_MLC_DEBUG
-        if (mlc->seidx && (mlc->seidx != seidx)  && mlc->seidx != 41 && mlc->seidx != 42 && mlc->seidx != 43) {
-          printk(KERN_DEBUG PREFIX "z%i \n%s {%i}", doze, kick ? "K" : "", mlc->seidx);
+        if (mlc->seidx && mlc->seidx != seidx &&
+            mlc->seidx != 41 && mlc->seidx != 42 && mlc->seidx != 43) {
+                printk(KERN_DEBUG PREFIX "z%i \n {%i}", doze, mlc->seidx);
                 doze = 0;
         }
-        kick = 0;
 
         seidx = mlc->seidx;
 #endif
@@ -588,52 +638,61 @@ static int hilse_donode (hil_mlc *mlc) {
                 hil_packet pack;
 
         case HILSE_FUNC:
-                if (node->object.func == NULL) break;
+                BUG_ON(node->object.func == NULL);
                 rc = node->object.func(mlc, node->arg);
-                nextidx = (rc > 0) ? node->ugly : 
+                nextidx = (rc > 0) ? node->ugly :
                         ((rc < 0) ? node->bad : node->good);
-                if (nextidx == HILSEN_FOLLOW) nextidx = rc;
+                if (nextidx == HILSEN_FOLLOW)
+                        nextidx = rc;
                 break;
+
         case HILSE_EXPECT_LAST:
         case HILSE_EXPECT_DISC:
         case HILSE_EXPECT:
         case HILSE_IN:
                 /* Already set up from previous HILSE_OUT_* */
-                write_lock_irqsave(&(mlc->lock), flags);
+                write_lock_irqsave(&mlc->lock, flags);
                 rc = mlc->in(mlc, node->arg);
                 if (rc == 2)  {
                         nextidx = HILSEN_DOZE;
                         sched_long = 1;
-                        write_unlock_irqrestore(&(mlc->lock), flags);
+                        write_unlock_irqrestore(&mlc->lock, flags);
                         break;
                 }
-                if (rc == 1)            nextidx = node->ugly;
-                else if (rc == 0)       nextidx = node->good;
-                else                    nextidx = node->bad;
+                if (rc == 1)
+                        nextidx = node->ugly;
+                else if (rc == 0)
+                        nextidx = node->good;
+                else
+                        nextidx = node->bad;
                 mlc->istarted = 0;
-                write_unlock_irqrestore(&(mlc->lock), flags);
+                write_unlock_irqrestore(&mlc->lock, flags);
                 break;
+
         case HILSE_OUT_LAST:
-                write_lock_irqsave(&(mlc->lock), flags);
+                write_lock_irqsave(&mlc->lock, flags);
                 pack = node->object.packet;
                 pack |= ((mlc->ddi + 1) << HIL_PKT_ADDR_SHIFT);
                 goto out;
+
         case HILSE_OUT_DISC:
-                write_lock_irqsave(&(mlc->lock), flags);
+                write_lock_irqsave(&mlc->lock, flags);
                 pack = node->object.packet;
                 pack |= ((mlc->ddi + 2) << HIL_PKT_ADDR_SHIFT);
                 goto out;
+
         case HILSE_OUT:
-                write_lock_irqsave(&(mlc->lock), flags);
+                write_lock_irqsave(&mlc->lock, flags);
                 pack = node->object.packet;
         out:
-                if (mlc->istarted) goto out2;
+                if (mlc->istarted)
+                        goto out2;
                 /* Prepare to receive input */
                 if ((node + 1)->act & HILSE_IN)
                         hilse_setup_input(mlc, node + 1);
 
         out2:
-                write_unlock_irqrestore(&(mlc->lock), flags);
+                write_unlock_irqrestore(&mlc->lock, flags);
 
                 if (down_trylock(&mlc->osem)) {
                         nextidx = HILSEN_DOZE;
@@ -641,60 +700,71 @@ static int hilse_donode (hil_mlc *mlc) {
                 }
                 up(&mlc->osem);
 
-                write_lock_irqsave(&(mlc->lock), flags);
-                if (!(mlc->ostarted)) {
+                write_lock_irqsave(&mlc->lock, flags);
+                if (!mlc->ostarted) {
                         mlc->ostarted = 1;
                         mlc->opacket = pack;
                         mlc->out(mlc);
                         nextidx = HILSEN_DOZE;
-                        write_unlock_irqrestore(&(mlc->lock), flags);
+                        write_unlock_irqrestore(&mlc->lock, flags);
                         break;
                 }
                 mlc->ostarted = 0;
                 do_gettimeofday(&(mlc->instart));
-                write_unlock_irqrestore(&(mlc->lock), flags);
+                write_unlock_irqrestore(&mlc->lock, flags);
                 nextidx = HILSEN_NEXT;
                 break;
+
         case HILSE_CTS:
+                write_lock_irqsave(&mlc->lock, flags);
                 nextidx = mlc->cts(mlc) ? node->bad : node->good;
+                write_unlock_irqrestore(&mlc->lock, flags);
                 break;
+
         default:
                 BUG();
-                nextidx = 0;
-                break;
         }
 
 #ifdef HIL_MLC_DEBUG
-        if (nextidx == HILSEN_DOZE) doze++;
+        if (nextidx == HILSEN_DOZE)
+                doze++;
 #endif
 
         while (nextidx & HILSEN_SCHED) {
                 struct timeval tv;
 
-                if (!sched_long) goto sched;
+                if (!sched_long)
+                        goto sched;
 
                 do_gettimeofday(&tv);
-                tv.tv_usec += 1000000 * (tv.tv_sec - mlc->instart.tv_sec);
+                tv.tv_usec += USEC_PER_SEC * (tv.tv_sec - mlc->instart.tv_sec);
                 tv.tv_usec -= mlc->instart.tv_usec;
                 if (tv.tv_usec >= mlc->intimeout) goto sched;
-                tv.tv_usec = (mlc->intimeout - tv.tv_usec) * HZ / 1000000;
+                tv.tv_usec = (mlc->intimeout - tv.tv_usec) * HZ / USEC_PER_SEC;
                 if (!tv.tv_usec) goto sched;
                 mod_timer(&hil_mlcs_kicker, jiffies + tv.tv_usec);
                 break;
         sched:
                 tasklet_schedule(&hil_mlcs_tasklet);
                 break;
-        } 
-        if (nextidx & HILSEN_DOWN) mlc->seidx += nextidx & HILSEN_MASK;
-        else if (nextidx & HILSEN_UP) mlc->seidx -= nextidx & HILSEN_MASK;
-        else mlc->seidx = nextidx & HILSEN_MASK;
+        }
+
+        if (nextidx & HILSEN_DOWN)
+                mlc->seidx += nextidx & HILSEN_MASK;
+        else if (nextidx & HILSEN_UP)
+                mlc->seidx -= nextidx & HILSEN_MASK;
+        else
+                mlc->seidx = nextidx & HILSEN_MASK;
+
+        if (nextidx & HILSEN_BREAK)
+                return 1;
 
-        if (nextidx & HILSEN_BREAK)     return 1;
         return 0;
 }
 
 /******************** tasklet context functions **************************/
-static void hil_mlcs_process(unsigned long unused) {
+static void hil_mlcs_process(unsigned long unused)
+{
         struct list_head *tmp;
 
         read_lock(&hil_mlcs_lock);
@@ -702,19 +772,20 @@ static void hil_mlcs_process(unsigned long unused) {
                 struct hil_mlc *mlc = list_entry(tmp, hil_mlc, list);
                 while (hilse_donode(mlc) == 0) {
 #ifdef HIL_MLC_DEBUG
-                  if (mlc->seidx != 41 && 
-                      mlc->seidx != 42 && 
-                      mlc->seidx != 43) 
-                    printk(KERN_DEBUG PREFIX " + ");
+                        if (mlc->seidx != 41 &&
+                            mlc->seidx != 42 &&
+                            mlc->seidx != 43)
+                                printk(KERN_DEBUG PREFIX " + ");
 #endif
-                };
+                }
         }
         read_unlock(&hil_mlcs_lock);
 }
 
 /************************* Keepalive timer task *********************/
 
-void hil_mlcs_timer (unsigned long data) {
+void hil_mlcs_timer(unsigned long data)
+{
         hil_mlcs_probe = 1;
         tasklet_schedule(&hil_mlcs_tasklet);
         /* Re-insert the periodic task. */
@@ -724,28 +795,25 @@ void hil_mlcs_timer (unsigned long data) {
 
 /******************** user/kernel context functions **********************/
 
-static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
+static int hil_mlc_serio_write(struct serio *serio, unsigned char c)
+{
         struct hil_mlc_serio_map *map;
         struct hil_mlc *mlc;
         struct serio_driver *drv;
         uint8_t *idx, *last;
 
         map = serio->port_data;
-        if (map == NULL) {
-                BUG();
-                return -EIO;
-        }
+        BUG_ON(map == NULL);
+
         mlc = map->mlc;
-        if (mlc == NULL) {
-                BUG();
-                return -EIO;
-        }
-        mlc->serio_opacket[map->didx] |= 
+        BUG_ON(mlc == NULL);
+
+        mlc->serio_opacket[map->didx] |=
                 ((hil_packet)c) << (8 * (3 - mlc->serio_oidx[map->didx]));
 
         if (mlc->serio_oidx[map->didx] >= 3) {
                 /* for now only commands */
-                if (!(mlc->serio_opacket[map->didx] & HIL_PKT_CMD)) 
+                if (!(mlc->serio_opacket[map->didx] & HIL_PKT_CMD))
                         return -EIO;
                 switch (mlc->serio_opacket[map->didx] & HIL_PKT_DATA_MASK) {
                 case HIL_CMD_IDD:
@@ -771,12 +839,11 @@ static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
         return -EIO;
  emu:
         drv = serio->drv;
-        if (drv == NULL) {
-                BUG();
-                return -EIO;
-        }
+        BUG_ON(drv == NULL);
+
         last = idx + 15;
-        while ((last != idx) && (*last == 0)) last--;
+        while ((last != idx) && (*last == 0))
+                last--;
 
         while (idx != last) {
                 drv->interrupt(serio, 0, 0);
@@ -789,14 +856,15 @@ static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
         drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
         drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
         drv->interrupt(serio, *idx, 0);
-        
+
         mlc->serio_oidx[map->didx] = 0;
         mlc->serio_opacket[map->didx] = 0;
 
         return 0;
 }
 
-static int hil_mlc_serio_open(struct serio *serio) {
+static int hil_mlc_serio_open(struct serio *serio)
+{
         struct hil_mlc_serio_map *map;
         struct hil_mlc *mlc;
 
@@ -804,67 +872,57 @@ static int hil_mlc_serio_open(struct serio *serio) {
                 return -EBUSY;
 
         map = serio->port_data;
-        if (map == NULL) {
-                BUG();
-                return -ENODEV;
-        }
+        BUG_ON(map == NULL);
+
         mlc = map->mlc;
-        if (mlc == NULL) {
-                BUG();
-                return -ENODEV;
-        }
+        BUG_ON(mlc == NULL);
 
         return 0;
 }
 
-static void hil_mlc_serio_close(struct serio *serio) {
+static void hil_mlc_serio_close(struct serio *serio)
+{
         struct hil_mlc_serio_map *map;
         struct hil_mlc *mlc;
 
         map = serio->port_data;
-        if (map == NULL) {
-                BUG();
-                return;
-        }
+        BUG_ON(map == NULL);
+
         mlc = map->mlc;
-        if (mlc == NULL) {
-                BUG();
-                return;
-        }
+        BUG_ON(mlc == NULL);
 
         serio_set_drvdata(serio, NULL);
         serio->drv = NULL;
         /* TODO wake up interruptable */
 }
 
-static struct serio_device_id hil_mlc_serio_id = {
+static const struct serio_device_id hil_mlc_serio_id = {
         .type = SERIO_HIL_MLC,
         .proto = SERIO_HIL,
         .extra = SERIO_ANY,
         .id = SERIO_ANY,
 };
 
-int hil_mlc_register(hil_mlc *mlc) {
+int hil_mlc_register(hil_mlc *mlc)
+{
         int i;
-        unsigned long flags;
+        unsigned long flags;
 
-        if (mlc == NULL) {
-                return -EINVAL;
-        }
+        BUG_ON(mlc == NULL);
 
         mlc->istarted = 0;
-        mlc->ostarted = 0;
+        mlc->ostarted = 0;
 
-        rwlock_init(&mlc->lock);
-        init_MUTEX(&(mlc->osem));
+        rwlock_init(&mlc->lock);
+        init_MUTEX(&mlc->osem);
 
-        init_MUTEX(&(mlc->isem));
-        mlc->icount = -1;
-        mlc->imatch = 0;
+        init_MUTEX(&mlc->isem);
+        mlc->icount = -1;
+        mlc->imatch = 0;
 
         mlc->opercnt = 0;
 
-        init_MUTEX_LOCKED(&(mlc->csem));
+        init_MUTEX_LOCKED(&(mlc->csem));
 
         hil_mlc_clear_di_scratch(mlc);
         hil_mlc_clear_di_map(mlc, 0);
@@ -873,6 +931,8 @@ int hil_mlc_register(hil_mlc *mlc) {
                 hil_mlc_copy_di_scratch(mlc, i);
                 mlc_serio = kzalloc(sizeof(*mlc_serio), GFP_KERNEL);
                 mlc->serio[i] = mlc_serio;
+                snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i);
+                snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i);
                 mlc_serio->id                   = hil_mlc_serio_id;
                 mlc_serio->write                = hil_mlc_serio_write;
                 mlc_serio->open                 = hil_mlc_serio_open;
@@ -897,19 +957,18 @@ int hil_mlc_register(hil_mlc *mlc) {
         return 0;
 }
 
-int hil_mlc_unregister(hil_mlc *mlc) {
+int hil_mlc_unregister(hil_mlc *mlc)
+{
         struct list_head *tmp;
-        unsigned long flags;
+        unsigned long flags;
         int i;
 
-        if (mlc == NULL)
-                return -EINVAL;
+        BUG_ON(mlc == NULL);
 
         write_lock_irqsave(&hil_mlcs_lock, flags);
-        list_for_each(tmp, &hil_mlcs) {
+        list_for_each(tmp, &hil_mlcs)
                 if (list_entry(tmp, hil_mlc, list) == mlc)
                         goto found;
-        }
 
         /* not found in list */
         write_unlock_irqrestore(&hil_mlcs_lock, flags);
@@ -918,7 +977,7 @@ int hil_mlc_unregister(hil_mlc *mlc) {
 
  found:
         list_del(tmp);
-        write_unlock_irqrestore(&hil_mlcs_lock, flags);
+        write_unlock_irqrestore(&hil_mlcs_lock, flags);
 
         for (i = 0; i < HIL_MLC_DEVMEM; i++) {
                 serio_unregister_port(mlc->serio[i]);
@@ -942,7 +1001,7 @@ static int __init hil_mlc_init(void)
 
         return 0;
 }
-                
+
 static void __exit hil_mlc_exit(void)
 {
         del_timer(&hil_mlcs_kicker);
@@ -950,6 +1009,6 @@ static void __exit hil_mlc_exit(void)
         tasklet_disable(&hil_mlcs_tasklet);
         tasklet_kill(&hil_mlcs_tasklet);
 }
-                        
+
 module_init(hil_mlc_init);
 module_exit(hil_mlc_exit);
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index b57370dc4e3d..6af199805ffc 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -34,27 +34,27 @@
  *
  * Driver theory of operation:
  *
- * hp_sdc_put does all writing to the SDC.  ISR can run on a different 
- * CPU than hp_sdc_put, but only one CPU runs hp_sdc_put at a time 
+ * hp_sdc_put does all writing to the SDC.  ISR can run on a different
+ * CPU than hp_sdc_put, but only one CPU runs hp_sdc_put at a time
  * (it cannot really benefit from SMP anyway.)  A tasket fit this perfectly.
  *
- * All data coming back from the SDC is sent via interrupt and can be read 
- * fully in the ISR, so there are no latency/throughput problems there.  
- * The problem is with output, due to the slow clock speed of the SDC 
- * compared to the CPU.  This should not be too horrible most of the time, 
- * but if used with HIL devices that support the multibyte transfer command, 
- * keeping outbound throughput flowing at the 6500KBps that the HIL is 
+ * All data coming back from the SDC is sent via interrupt and can be read
+ * fully in the ISR, so there are no latency/throughput problems there.
+ * The problem is with output, due to the slow clock speed of the SDC
+ * compared to the CPU.  This should not be too horrible most of the time,
+ * but if used with HIL devices that support the multibyte transfer command,
+ * keeping outbound throughput flowing at the 6500KBps that the HIL is
  * capable of is more than can be done at HZ=100.
  *
- * Busy polling for IBF clear wastes CPU cycles and bus cycles.  hp_sdc.ibf 
- * is set to 0 when the IBF flag in the status register has cleared.  ISR 
- * may do this, and may also access the parts of queued transactions related 
- * to reading data back from the SDC, but otherwise will not touch the 
+ * Busy polling for IBF clear wastes CPU cycles and bus cycles.  hp_sdc.ibf
+ * is set to 0 when the IBF flag in the status register has cleared.  ISR
+ * may do this, and may also access the parts of queued transactions related
+ * to reading data back from the SDC, but otherwise will not touch the
  * hp_sdc state. Whenever a register is written hp_sdc.ibf is set to 1.
  *
  * The i8042 write index and the values in the 4-byte input buffer
  * starting at 0x70 are kept track of in hp_sdc.wi, and .r7[], respectively,
- * to minimize the amount of IO needed to the SDC.  However these values 
+ * to minimize the amount of IO needed to the SDC.  However these values
  * do not need to be locked since they are only ever accessed by hp_sdc_put.
  *
  * A timer task schedules the tasklet once per second just to make
@@ -100,39 +100,46 @@ EXPORT_SYMBOL(hp_sdc_release_timer_irq);
 EXPORT_SYMBOL(hp_sdc_release_hil_irq);
 EXPORT_SYMBOL(hp_sdc_release_cooked_irq);
 
+EXPORT_SYMBOL(__hp_sdc_enqueue_transaction);
 EXPORT_SYMBOL(hp_sdc_enqueue_transaction);
 EXPORT_SYMBOL(hp_sdc_dequeue_transaction);
 
 static hp_i8042_sdc     hp_sdc; /* All driver state is kept in here. */
 
 /*************** primitives for use in any context *********************/
-static inline uint8_t hp_sdc_status_in8 (void) {
+static inline uint8_t hp_sdc_status_in8(void)
+{
         uint8_t status;
         unsigned long flags;
 
         write_lock_irqsave(&hp_sdc.ibf_lock, flags);
         status = sdc_readb(hp_sdc.status_io);
-        if (!(status & HP_SDC_STATUS_IBF)) hp_sdc.ibf = 0;
+        if (!(status & HP_SDC_STATUS_IBF))
+                hp_sdc.ibf = 0;
         write_unlock_irqrestore(&hp_sdc.ibf_lock, flags);
 
         return status;
 }
 
-static inline uint8_t hp_sdc_data_in8 (void) {
-        return sdc_readb(hp_sdc.data_io); 
+static inline uint8_t hp_sdc_data_in8(void)
+{
+        return sdc_readb(hp_sdc.data_io);
 }
 
-static inline void hp_sdc_status_out8 (uint8_t val) {
+static inline void hp_sdc_status_out8(uint8_t val)
+{
         unsigned long flags;
 
         write_lock_irqsave(&hp_sdc.ibf_lock, flags);
         hp_sdc.ibf = 1;
-        if ((val & 0xf0) == 0xe0) hp_sdc.wi = 0xff;
+        if ((val & 0xf0) == 0xe0)
+                hp_sdc.wi = 0xff;
         sdc_writeb(val, hp_sdc.status_io);
         write_unlock_irqrestore(&hp_sdc.ibf_lock, flags);
 }
 
-static inline void hp_sdc_data_out8 (uint8_t val) {
+static inline void hp_sdc_data_out8(uint8_t val)
+{
         unsigned long flags;
 
         write_lock_irqsave(&hp_sdc.ibf_lock, flags);
@@ -141,11 +148,12 @@ static inline void hp_sdc_data_out8 (uint8_t val) {
         write_unlock_irqrestore(&hp_sdc.ibf_lock, flags);
 }
 
-/*      Care must be taken to only invoke hp_sdc_spin_ibf when 
- *      absolutely needed, or in rarely invoked subroutines.  
- *      Not only does it waste CPU cycles, it also wastes bus cycles. 
+/*      Care must be taken to only invoke hp_sdc_spin_ibf when
+ *      absolutely needed, or in rarely invoked subroutines.
+ *      Not only does it waste CPU cycles, it also wastes bus cycles.
  */
-static inline void hp_sdc_spin_ibf(void) {
+static inline void hp_sdc_spin_ibf(void)
+{
         unsigned long flags;
         rwlock_t *lock;
 
@@ -158,19 +166,21 @@ static inline void hp_sdc_spin_ibf(void) {
         }
         read_unlock(lock);
         write_lock(lock);
-        while (sdc_readb(hp_sdc.status_io) & HP_SDC_STATUS_IBF) {};
+        while (sdc_readb(hp_sdc.status_io) & HP_SDC_STATUS_IBF)
+                { }
         hp_sdc.ibf = 0;
         write_unlock_irqrestore(lock, flags);
 }
 
 
 /************************ Interrupt context functions ************************/
-static void hp_sdc_take (int irq, void *dev_id, uint8_t status, uint8_t data) {
+static void hp_sdc_take(int irq, void *dev_id, uint8_t status, uint8_t data)
+{
         hp_sdc_transaction *curr;
 
         read_lock(&hp_sdc.rtq_lock);
         if (hp_sdc.rcurr < 0) {
-                read_unlock(&hp_sdc.rtq_lock);
+                read_unlock(&hp_sdc.rtq_lock);
                 return;
         }
         curr = hp_sdc.tq[hp_sdc.rcurr];
@@ -183,25 +193,27 @@ static void hp_sdc_take (int irq, void *dev_id, uint8_t status, uint8_t data) {
 
         if (hp_sdc.rqty <= 0) {
                 /* All data has been gathered. */
-                if(curr->seq[curr->actidx] & HP_SDC_ACT_SEMAPHORE) {
-                        if (curr->act.semaphore) up(curr->act.semaphore);
-                }
-                if(curr->seq[curr->actidx] & HP_SDC_ACT_CALLBACK) {
+                if (curr->seq[curr->actidx] & HP_SDC_ACT_SEMAPHORE)
+                        if (curr->act.semaphore)
+                                up(curr->act.semaphore);
+
+                if (curr->seq[curr->actidx] & HP_SDC_ACT_CALLBACK)
                         if (curr->act.irqhook)
                                 curr->act.irqhook(irq, dev_id, status, data);
-                }
+
                 curr->actidx = curr->idx;
                 curr->idx++;
                 /* Return control of this transaction */
                 write_lock(&hp_sdc.rtq_lock);
-                hp_sdc.rcurr = -1; 
+                hp_sdc.rcurr = -1;
                 hp_sdc.rqty = 0;
                 write_unlock(&hp_sdc.rtq_lock);
                 tasklet_schedule(&hp_sdc.task);
         }
 }
 
-static irqreturn_t hp_sdc_isr(int irq, void *dev_id) {
+static irqreturn_t hp_sdc_isr(int irq, void *dev_id)
+{
         uint8_t status, data;
 
         status = hp_sdc_status_in8();
@@ -209,67 +221,74 @@ static irqreturn_t hp_sdc_isr(int irq, void *dev_id) {
         data =   hp_sdc_data_in8();
 
         /* For now we are ignoring these until we get the SDC to behave. */
-        if (((status & 0xf1) == 0x51) && data == 0x82) {
-          return IRQ_HANDLED;
-        }
+        if (((status & 0xf1) == 0x51) && data == 0x82)
+                return IRQ_HANDLED;
 
-        switch(status & HP_SDC_STATUS_IRQMASK) {
-              case 0: /* This case is not documented. */
+        switch (status & HP_SDC_STATUS_IRQMASK) {
+        case 0: /* This case is not documented. */
                 break;
-              case HP_SDC_STATUS_USERTIMER:
-              case HP_SDC_STATUS_PERIODIC:
-              case HP_SDC_STATUS_TIMER:
+
+        case HP_SDC_STATUS_USERTIMER:
+        case HP_SDC_STATUS_PERIODIC:
+        case HP_SDC_STATUS_TIMER:
                 read_lock(&hp_sdc.hook_lock);
-                if (hp_sdc.timer != NULL)
+                if (hp_sdc.timer != NULL)
                         hp_sdc.timer(irq, dev_id, status, data);
                 read_unlock(&hp_sdc.hook_lock);
                 break;
-              case HP_SDC_STATUS_REG:
+
+        case HP_SDC_STATUS_REG:
                 hp_sdc_take(irq, dev_id, status, data);
                 break;
-              case HP_SDC_STATUS_HILCMD:
-              case HP_SDC_STATUS_HILDATA:
+
+        case HP_SDC_STATUS_HILCMD:
+        case HP_SDC_STATUS_HILDATA:
                 read_lock(&hp_sdc.hook_lock);
                 if (hp_sdc.hil != NULL)
                         hp_sdc.hil(irq, dev_id, status, data);
                 read_unlock(&hp_sdc.hook_lock);
                 break;
-              case HP_SDC_STATUS_PUP:
+
+        case HP_SDC_STATUS_PUP:
                 read_lock(&hp_sdc.hook_lock);
                 if (hp_sdc.pup != NULL)
                         hp_sdc.pup(irq, dev_id, status, data);
-                else printk(KERN_INFO PREFIX "HP SDC reports successful PUP.\n");
+                else
+                        printk(KERN_INFO PREFIX "HP SDC reports successful PUP.\n");
                 read_unlock(&hp_sdc.hook_lock);
                 break;
-              default:
+
+        default:
                 read_lock(&hp_sdc.hook_lock);
                 if (hp_sdc.cooked != NULL)
                         hp_sdc.cooked(irq, dev_id, status, data);
                 read_unlock(&hp_sdc.hook_lock);
                 break;
         }
+
         return IRQ_HANDLED;
 }
 
 
-static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id) {
+static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id)
+{
         int status;
-        
+
         status = hp_sdc_status_in8();
         printk(KERN_WARNING PREFIX "NMI !\n");
 
-#if 0   
+#if 0
         if (status & HP_SDC_NMISTATUS_FHS) {
                 read_lock(&hp_sdc.hook_lock);
-                if (hp_sdc.timer != NULL)
+                if (hp_sdc.timer != NULL)
                         hp_sdc.timer(irq, dev_id, status, 0);
                 read_unlock(&hp_sdc.hook_lock);
-        }
-        else {
+        } else {
                 /* TODO: pass this on to the HIL handler, or do SAK here? */
                 printk(KERN_WARNING PREFIX "HIL NMI\n");
         }
 #endif
+
         return IRQ_HANDLED;
 }
 
@@ -278,13 +297,17 @@ static irqreturn_t hp_sdc_nmisr(int irq, void *dev_id) {
 
 unsigned long hp_sdc_put(void);
 
-static void hp_sdc_tasklet(unsigned long foo) {
-
+static void hp_sdc_tasklet(unsigned long foo)
+{
         write_lock_irq(&hp_sdc.rtq_lock);
+
         if (hp_sdc.rcurr >= 0) {
                 struct timeval tv;
+
                 do_gettimeofday(&tv);
-                if (tv.tv_sec > hp_sdc.rtv.tv_sec) tv.tv_usec += 1000000;
+                if (tv.tv_sec > hp_sdc.rtv.tv_sec)
+                        tv.tv_usec += USEC_PER_SEC;
+
                 if (tv.tv_usec - hp_sdc.rtv.tv_usec > HP_SDC_MAX_REG_DELAY) {
                         hp_sdc_transaction *curr;
                         uint8_t tmp;
@@ -300,27 +323,29 @@ static void hp_sdc_tasklet(unsigned long foo) {
                         hp_sdc.rqty = 0;
                         tmp = curr->seq[curr->actidx];
                         curr->seq[curr->actidx] |= HP_SDC_ACT_DEAD;
-                        if(tmp & HP_SDC_ACT_SEMAPHORE) {
-                                if (curr->act.semaphore) 
+                        if (tmp & HP_SDC_ACT_SEMAPHORE)
+                                if (curr->act.semaphore)
                                         up(curr->act.semaphore);
-                        }
-                        if(tmp & HP_SDC_ACT_CALLBACK) {
+
+                        if (tmp & HP_SDC_ACT_CALLBACK) {
                                 /* Note this means that irqhooks may be called
                                  * in tasklet/bh context.
                                  */
-                                if (curr->act.irqhook) 
+                                if (curr->act.irqhook)
                                         curr->act.irqhook(0, NULL, 0, 0);
                         }
+
                         curr->actidx = curr->idx;
                         curr->idx++;
-                        hp_sdc.rcurr = -1; 
+                        hp_sdc.rcurr = -1;
                 }
         }
         write_unlock_irq(&hp_sdc.rtq_lock);
         hp_sdc_put();
 }
 
-unsigned long hp_sdc_put(void) {
+unsigned long hp_sdc_put(void)
+{
         hp_sdc_transaction *curr;
         uint8_t act;
         int idx, curridx;
@@ -333,19 +358,24 @@ unsigned long hp_sdc_put(void) {
            requires output, so we skip to the administrativa. */
         if (hp_sdc.ibf) {
                 hp_sdc_status_in8();
-                if (hp_sdc.ibf) goto finish;
+                if (hp_sdc.ibf)
+                        goto finish;
         }
 
  anew:
         /* See if we are in the middle of a sequence. */
-        if (hp_sdc.wcurr < 0) hp_sdc.wcurr = 0;
+        if (hp_sdc.wcurr < 0)
+                hp_sdc.wcurr = 0;
         read_lock_irq(&hp_sdc.rtq_lock);
-        if (hp_sdc.rcurr == hp_sdc.wcurr) hp_sdc.wcurr++;
+        if (hp_sdc.rcurr == hp_sdc.wcurr)
+                hp_sdc.wcurr++;
         read_unlock_irq(&hp_sdc.rtq_lock);
-        if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN) hp_sdc.wcurr = 0;
+        if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN)
+                hp_sdc.wcurr = 0;
         curridx = hp_sdc.wcurr;
 
-        if (hp_sdc.tq[curridx] != NULL) goto start;
+        if (hp_sdc.tq[curridx] != NULL)
+                goto start;
 
         while (++curridx != hp_sdc.wcurr) {
                 if (curridx >= HP_SDC_QUEUE_LEN) {
@@ -358,7 +388,8 @@ unsigned long hp_sdc_put(void) {
                         continue;
                 }
                 read_unlock_irq(&hp_sdc.rtq_lock);
-                if (hp_sdc.tq[curridx] != NULL) break; /* Found one. */
+                if (hp_sdc.tq[curridx] != NULL)
+                        break; /* Found one. */
         }
         if (curridx == hp_sdc.wcurr) { /* There's nothing queued to do. */
                 curridx = -1;
@@ -374,7 +405,8 @@ unsigned long hp_sdc_put(void) {
                 goto finish;
         }
 
-        if (hp_sdc.wcurr == -1) goto done;
+        if (hp_sdc.wcurr == -1)
+                goto done;
 
         curr = hp_sdc.tq[curridx];
         idx = curr->actidx;
@@ -383,20 +415,23 @@ unsigned long hp_sdc_put(void) {
                 hp_sdc.tq[curridx] = NULL;
                 /* Interleave outbound data between the transactions. */
                 hp_sdc.wcurr++;
-                if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN) hp_sdc.wcurr = 0;
-                goto finish;    
+                if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN)
+                        hp_sdc.wcurr = 0;
+                goto finish;
         }
 
         act = curr->seq[idx];
         idx++;
 
         if (curr->idx >= curr->endidx) {
-                if (act & HP_SDC_ACT_DEALLOC) kfree(curr);
+                if (act & HP_SDC_ACT_DEALLOC)
+                        kfree(curr);
                 hp_sdc.tq[curridx] = NULL;
                 /* Interleave outbound data between the transactions. */
                 hp_sdc.wcurr++;
-                if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN) hp_sdc.wcurr = 0;
-                goto finish;    
+                if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN)
+                        hp_sdc.wcurr = 0;
+                goto finish;
         }
 
         while (act & HP_SDC_ACT_PRECMD) {
@@ -409,9 +444,10 @@ unsigned long hp_sdc_put(void) {
                 curr->idx++;
                 /* act finished? */
                 if ((act & HP_SDC_ACT_DURING) == HP_SDC_ACT_PRECMD)
-                  goto actdone;
+                        goto actdone;
                 /* skip quantity field if data-out sequence follows. */
-                if (act & HP_SDC_ACT_DATAOUT) curr->idx++;
+                if (act & HP_SDC_ACT_DATAOUT)
+                        curr->idx++;
                 goto finish;
         }
         if (act & HP_SDC_ACT_DATAOUT) {
@@ -423,15 +459,15 @@ unsigned long hp_sdc_put(void) {
                         hp_sdc_data_out8(curr->seq[curr->idx]);
                         curr->idx++;
                         /* act finished? */
-                        if ((curr->idx - idx >= qty) && 
-                            ((act & HP_SDC_ACT_DURING) == HP_SDC_ACT_DATAOUT))
+                        if (curr->idx - idx >= qty &&
+                            (act & HP_SDC_ACT_DURING) == HP_SDC_ACT_DATAOUT)
                                 goto actdone;
                         goto finish;
                 }
                 idx += qty;
                 act &= ~HP_SDC_ACT_DATAOUT;
-        }
-        else while (act & HP_SDC_ACT_DATAREG) {
+        } else
+            while (act & HP_SDC_ACT_DATAREG) {
                 int mask;
                 uint8_t w7[4];
 
@@ -445,26 +481,30 @@ unsigned long hp_sdc_put(void) {
                         act &= ~HP_SDC_ACT_DATAREG;
                         break;
                 }
-                
+
                 w7[0] = (mask & 1) ? curr->seq[++idx] : hp_sdc.r7[0];
                 w7[1] = (mask & 2) ? curr->seq[++idx] : hp_sdc.r7[1];
                 w7[2] = (mask & 4) ? curr->seq[++idx] : hp_sdc.r7[2];
                 w7[3] = (mask & 8) ? curr->seq[++idx] : hp_sdc.r7[3];
-                
+
                 if (hp_sdc.wi > 0x73 || hp_sdc.wi < 0x70 ||
-                        w7[hp_sdc.wi-0x70] == hp_sdc.r7[hp_sdc.wi-0x70]) {
+                    w7[hp_sdc.wi - 0x70] == hp_sdc.r7[hp_sdc.wi - 0x70]) {
                         int i = 0;
 
-                        /* Need to point the write index register */    
-                        while ((i < 4) && w7[i] == hp_sdc.r7[i]) i++;
+                        /* Need to point the write index register */
+                        while (i < 4 && w7[i] == hp_sdc.r7[i])
+                                i++;
+
                         if (i < 4) {
                                 hp_sdc_status_out8(HP_SDC_CMD_SET_D0 + i);
                                 hp_sdc.wi = 0x70 + i;
                                 goto finish;
                         }
+
                         idx++;
                         if ((act & HP_SDC_ACT_DURING) == HP_SDC_ACT_DATAREG)
                                 goto actdone;
+
                         curr->idx = idx;
                         act &= ~HP_SDC_ACT_DATAREG;
                         break;
@@ -476,12 +516,13 @@ unsigned long hp_sdc_put(void) {
                 {
                         int i = 0;
 
-                        while ((i < 4) && w7[i] == hp_sdc.r7[i]) i++;
+                        while ((i < 4) && w7[i] == hp_sdc.r7[i])
+                                i++;
                         if (i >= 4) {
                                 curr->idx = idx + 1;
-                                if ((act & HP_SDC_ACT_DURING) == 
+                                if ((act & HP_SDC_ACT_DURING) ==
                                     HP_SDC_ACT_DATAREG)
-                                        goto actdone;
+                                        goto actdone;
                         }
                 }
                 goto finish;
@@ -497,7 +538,7 @@ unsigned long hp_sdc_put(void) {
 
 
         if (act & HP_SDC_ACT_POSTCMD) {
-                uint8_t postcmd;
+                uint8_t postcmd;
 
                 /* curr->idx should == idx at this point. */
                 postcmd = curr->seq[idx];
@@ -505,12 +546,12 @@ unsigned long hp_sdc_put(void) {
                 if (act & HP_SDC_ACT_DATAIN) {
 
                         /* Start a new read */
-                        hp_sdc.rqty = curr->seq[curr->idx];
+                        hp_sdc.rqty = curr->seq[curr->idx];
                         do_gettimeofday(&hp_sdc.rtv);
                         curr->idx++;
                         /* Still need to lock here in case of spurious irq. */
                         write_lock_irq(&hp_sdc.rtq_lock);
-                        hp_sdc.rcurr = curridx; 
+                        hp_sdc.rcurr = curridx;
                         write_unlock_irq(&hp_sdc.rtq_lock);
                         hp_sdc_status_out8(postcmd);
                         goto finish;
@@ -519,75 +560,86 @@ unsigned long hp_sdc_put(void) {
                 goto actdone;
         }
 
-actdone:
-        if (act & HP_SDC_ACT_SEMAPHORE) {
+ actdone:
+        if (act & HP_SDC_ACT_SEMAPHORE)
                 up(curr->act.semaphore);
-        }
-        else if (act & HP_SDC_ACT_CALLBACK) {
+        else if (act & HP_SDC_ACT_CALLBACK)
                 curr->act.irqhook(0,NULL,0,0);
-        }
+
         if (curr->idx >= curr->endidx) { /* This transaction is over. */
-                if (act & HP_SDC_ACT_DEALLOC) kfree(curr);
+                if (act & HP_SDC_ACT_DEALLOC)
+                        kfree(curr);
                 hp_sdc.tq[curridx] = NULL;
-        }
-        else {
+        } else {
                 curr->actidx = idx + 1;
                 curr->idx = idx + 2;
         }
         /* Interleave outbound data between the transactions. */
         hp_sdc.wcurr++;
-        if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN) hp_sdc.wcurr = 0;
+        if (hp_sdc.wcurr >= HP_SDC_QUEUE_LEN)
+                hp_sdc.wcurr = 0;
 
  finish:
-        /* If by some quirk IBF has cleared and our ISR has run to 
+        /* If by some quirk IBF has cleared and our ISR has run to
            see that that has happened, do it all again. */
-        if (!hp_sdc.ibf && limit++ < 20) goto anew;
+        if (!hp_sdc.ibf && limit++ < 20)
+                goto anew;
 
  done:
-        if (hp_sdc.wcurr >= 0) tasklet_schedule(&hp_sdc.task);
+        if (hp_sdc.wcurr >= 0)
+                tasklet_schedule(&hp_sdc.task);
         write_unlock(&hp_sdc.lock);
+
         return 0;
 }
 
 /******* Functions called in either user or kernel context ****/
-int hp_sdc_enqueue_transaction(hp_sdc_transaction *this) {
-        unsigned long flags;
+int __hp_sdc_enqueue_transaction(hp_sdc_transaction *this)
+{
         int i;
 
         if (this == NULL) {
-                tasklet_schedule(&hp_sdc.task);
+                BUG();
                 return -EINVAL;
-        };
-
-        write_lock_irqsave(&hp_sdc.lock, flags);
+        }
 
         /* Can't have same transaction on queue twice */
-        for (i=0; i < HP_SDC_QUEUE_LEN; i++)
-                if (hp_sdc.tq[i] == this) goto fail;
+        for (i = 0; i < HP_SDC_QUEUE_LEN; i++)
+                if (hp_sdc.tq[i] == this)
+                        goto fail;
 
         this->actidx = 0;
         this->idx = 1;
 
         /* Search for empty slot */
-        for (i=0; i < HP_SDC_QUEUE_LEN; i++) {
+        for (i = 0; i < HP_SDC_QUEUE_LEN; i++)
                 if (hp_sdc.tq[i] == NULL) {
                         hp_sdc.tq[i] = this;
-                        write_unlock_irqrestore(&hp_sdc.lock, flags);
                         tasklet_schedule(&hp_sdc.task);
                         return 0;
                 }
-        }
-        write_unlock_irqrestore(&hp_sdc.lock, flags);
+
         printk(KERN_WARNING PREFIX "No free slot to add transaction.\n");
         return -EBUSY;
 
  fail:
-        write_unlock_irqrestore(&hp_sdc.lock,flags);
         printk(KERN_WARNING PREFIX "Transaction add failed: transaction already queued?\n");
         return -EINVAL;
 }
 
-int hp_sdc_dequeue_transaction(hp_sdc_transaction *this) {
+int hp_sdc_enqueue_transaction(hp_sdc_transaction *this) {
+        unsigned long flags;
+        int ret;
+
+        write_lock_irqsave(&hp_sdc.lock, flags);
+        ret = __hp_sdc_enqueue_transaction(this);
+        write_unlock_irqrestore(&hp_sdc.lock,flags);
+
+        return ret;
+}
+
+int hp_sdc_dequeue_transaction(hp_sdc_transaction *this)
+{
         unsigned long flags;
         int i;
 
@@ -595,8 +647,9 @@ int hp_sdc_dequeue_transaction(hp_sdc_transaction *this) {
 
         /* TODO: don't remove it if it's not done. */
 
-        for (i=0; i < HP_SDC_QUEUE_LEN; i++)
-                if (hp_sdc.tq[i] == this) hp_sdc.tq[i] = NULL;
+        for (i = 0; i < HP_SDC_QUEUE_LEN; i++)
+                if (hp_sdc.tq[i] == this)
+                        hp_sdc.tq[i] = NULL;
 
         write_unlock_irqrestore(&hp_sdc.lock, flags);
         return 0;
@@ -605,11 +658,11 @@ int hp_sdc_dequeue_transaction(hp_sdc_transaction *this) {
 
 
 /********************** User context functions **************************/
-int hp_sdc_request_timer_irq(hp_sdc_irqhook *callback) {
-
-        if (callback == NULL || hp_sdc.dev == NULL) {
+int hp_sdc_request_timer_irq(hp_sdc_irqhook *callback)
+{
+        if (callback == NULL || hp_sdc.dev == NULL)
                 return -EINVAL;
-        }
+
         write_lock_irq(&hp_sdc.hook_lock);
         if (hp_sdc.timer != NULL) {
                 write_unlock_irq(&hp_sdc.hook_lock);
@@ -629,11 +682,11 @@ int hp_sdc_request_timer_irq(hp_sdc_irqhook *callback) {
         return 0;
 }
 
-int hp_sdc_request_hil_irq(hp_sdc_irqhook *callback) {
-
-        if (callback == NULL || hp_sdc.dev == NULL) {
+int hp_sdc_request_hil_irq(hp_sdc_irqhook *callback)
+{
+        if (callback == NULL || hp_sdc.dev == NULL)
                 return -EINVAL;
-        }
+
         write_lock_irq(&hp_sdc.hook_lock);
         if (hp_sdc.hil != NULL) {
                 write_unlock_irq(&hp_sdc.hook_lock);
@@ -650,11 +703,11 @@ int hp_sdc_request_hil_irq(hp_sdc_irqhook *callback) {
         return 0;
 }
 
-int hp_sdc_request_cooked_irq(hp_sdc_irqhook *callback) {
-
-        if (callback == NULL || hp_sdc.dev == NULL) {
+int hp_sdc_request_cooked_irq(hp_sdc_irqhook *callback)
+{
+        if (callback == NULL || hp_sdc.dev == NULL)
                 return -EINVAL;
-        }
+
         write_lock_irq(&hp_sdc.hook_lock);
         if (hp_sdc.cooked != NULL) {
                 write_unlock_irq(&hp_sdc.hook_lock);
@@ -672,9 +725,8 @@ int hp_sdc_request_cooked_irq(hp_sdc_irqhook *callback) {
         return 0;
 }
 
-int hp_sdc_release_timer_irq(hp_sdc_irqhook *callback) {
-
-
+int hp_sdc_release_timer_irq(hp_sdc_irqhook *callback)
+{
         write_lock_irq(&hp_sdc.hook_lock);
         if ((callback != hp_sdc.timer) ||
             (hp_sdc.timer == NULL)) {
@@ -694,8 +746,8 @@ int hp_sdc_release_timer_irq(hp_sdc_irqhook *callback) {
         return 0;
 }
 
-int hp_sdc_release_hil_irq(hp_sdc_irqhook *callback) {
-
+int hp_sdc_release_hil_irq(hp_sdc_irqhook *callback)
+{
         write_lock_irq(&hp_sdc.hook_lock);
         if ((callback != hp_sdc.hil) ||
             (hp_sdc.hil == NULL)) {
@@ -715,8 +767,8 @@ int hp_sdc_release_hil_irq(hp_sdc_irqhook *callback) {
         return 0;
 }
 
-int hp_sdc_release_cooked_irq(hp_sdc_irqhook *callback) {
-
+int hp_sdc_release_cooked_irq(hp_sdc_irqhook *callback)
+{
         write_lock_irq(&hp_sdc.hook_lock);
         if ((callback != hp_sdc.cooked) ||
             (hp_sdc.cooked == NULL)) {
@@ -738,7 +790,8 @@ int hp_sdc_release_cooked_irq(hp_sdc_irqhook *callback) {
 
 /************************* Keepalive timer task *********************/
 
-void hp_sdc_kicker (unsigned long data) {
+void hp_sdc_kicker (unsigned long data)
+{
         tasklet_schedule(&hp_sdc.task);
         /* Re-insert the periodic task. */
         mod_timer(&hp_sdc.kicker, jiffies + HZ);
@@ -748,12 +801,12 @@ void hp_sdc_kicker (unsigned long data) {
 
 #if defined(__hppa__)
 
-static struct parisc_device_id hp_sdc_tbl[] = {
+static const struct parisc_device_id hp_sdc_tbl[] = {
         {
-                .hw_type =      HPHW_FIO, 
+                .hw_type =      HPHW_FIO,
                 .hversion_rev = HVERSION_REV_ANY_ID,
                 .hversion =     HVERSION_ANY_ID,
-                .sversion =     0x73, 
+                .sversion =     0x73,
          },
         { 0, }
 };
@@ -772,16 +825,15 @@ static struct parisc_driver hp_sdc_driver = {
 
 static int __init hp_sdc_init(void)
 {
-        int i;
         char *errstr;
         hp_sdc_transaction t_sync;
         uint8_t ts_sync[6];
         struct semaphore s_sync;
 
-        rwlock_init(&hp_sdc.lock);
-        rwlock_init(&hp_sdc.ibf_lock);
-        rwlock_init(&hp_sdc.rtq_lock);
-        rwlock_init(&hp_sdc.hook_lock);
+        rwlock_init(&hp_sdc.lock);
+        rwlock_init(&hp_sdc.ibf_lock);
+        rwlock_init(&hp_sdc.rtq_lock);
+        rwlock_init(&hp_sdc.hook_lock);
 
         hp_sdc.timer            = NULL;
         hp_sdc.hil              = NULL;
@@ -796,7 +848,8 @@ static int __init hp_sdc_init(void)
         hp_sdc.r7[3]            = 0xff;
         hp_sdc.ibf              = 1;
 
-        for (i = 0; i < HP_SDC_QUEUE_LEN; i++) hp_sdc.tq[i] = NULL;
+        memset(&hp_sdc.tq, 0, sizeof(hp_sdc.tq));
+
         hp_sdc.wcurr            = -1;
         hp_sdc.rcurr            = -1;
         hp_sdc.rqty             = 0;
@@ -804,27 +857,32 @@ static int __init hp_sdc_init(void)
         hp_sdc.dev_err = -ENODEV;
 
         errstr = "IO not found for";
-        if (!hp_sdc.base_io) goto err0;
+        if (!hp_sdc.base_io)
+                goto err0;
 
         errstr = "IRQ not found for";
-        if (!hp_sdc.irq) goto err0;
+        if (!hp_sdc.irq)
+                goto err0;
 
         hp_sdc.dev_err = -EBUSY;
 
 #if defined(__hppa__)
         errstr = "IO not available for";
-        if (request_region(hp_sdc.data_io, 2, hp_sdc_driver.name)) goto err0;
-#endif  
+        if (request_region(hp_sdc.data_io, 2, hp_sdc_driver.name))
+                goto err0;
+#endif
 
         errstr = "IRQ not available for";
-        if(request_irq(hp_sdc.irq, &hp_sdc_isr, 0, "HP SDC",
-                       (void *) hp_sdc.base_io)) goto err1;
+        if (request_irq(hp_sdc.irq, &hp_sdc_isr, IRQF_SHARED|IRQF_SAMPLE_RANDOM,
+                        "HP SDC", &hp_sdc))
+                goto err1;
 
         errstr = "NMI not available for";
-        if (request_irq(hp_sdc.nmi, &hp_sdc_nmisr, 0, "HP SDC NMI", 
-                        (void *) hp_sdc.base_io)) goto err2;
+        if (request_irq(hp_sdc.nmi, &hp_sdc_nmisr, IRQF_SHARED,
+                        "HP SDC NMI", &hp_sdc))
+                goto err2;
 
-        printk(KERN_INFO PREFIX "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n", 
+        printk(KERN_INFO PREFIX "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n",
                (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);
 
         hp_sdc_status_in8();
@@ -854,13 +912,14 @@ static int __init hp_sdc_init(void)
         hp_sdc.dev_err = 0;
         return 0;
  err2:
-        free_irq(hp_sdc.irq, NULL);
+        free_irq(hp_sdc.irq, &hp_sdc);
  err1:
         release_region(hp_sdc.data_io, 2);
  err0:
-        printk(KERN_WARNING PREFIX ": %s SDC IO=0x%p IRQ=0x%x NMI=0x%x\n", 
+        printk(KERN_WARNING PREFIX ": %s SDC IO=0x%p IRQ=0x%x NMI=0x%x\n",
                 errstr, (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);
         hp_sdc.dev = NULL;
+
         return hp_sdc.dev_err;
 }
 
@@ -868,8 +927,10 @@ static int __init hp_sdc_init(void)
 
 static int __init hp_sdc_init_hppa(struct parisc_device *d)
 {
-        if (!d) return 1;
-        if (hp_sdc.dev != NULL) return 1;       /* We only expect one SDC */
+        if (!d)
+                return 1;
+        if (hp_sdc.dev != NULL)
+                return 1;       /* We only expect one SDC */
 
         hp_sdc.dev              = d;
         hp_sdc.irq              = d->irq;
@@ -898,18 +959,16 @@ static void hp_sdc_exit(void)
         /* Wait until we know this has been processed by the i8042 */
         hp_sdc_spin_ibf();
 
-        free_irq(hp_sdc.nmi, NULL);
-        free_irq(hp_sdc.irq, NULL);
+        free_irq(hp_sdc.nmi, &hp_sdc);
+        free_irq(hp_sdc.irq, &hp_sdc);
         write_unlock_irq(&hp_sdc.lock);
 
         del_timer(&hp_sdc.kicker);
 
         tasklet_kill(&hp_sdc.task);
 
-/*        release_region(hp_sdc.data_io, 2); */
-
 #if defined(__hppa__)
-        if (unregister_parisc_driver(&hp_sdc_driver)) 
+        if (unregister_parisc_driver(&hp_sdc_driver))
                 printk(KERN_WARNING PREFIX "Error unregistering HP SDC");
 #endif
 }
@@ -923,7 +982,7 @@ static int __init hp_sdc_register(void)
         mm_segment_t fs;
         unsigned char i;
 #endif
-        
+
         hp_sdc.dev = NULL;
         hp_sdc.dev_err = 0;
 #if defined(__hppa__)
@@ -960,8 +1019,8 @@ static int __init hp_sdc_register(void)
         tq_init.seq             = tq_init_seq;
         tq_init.act.semaphore   = &tq_init_sem;
 
-        tq_init_seq[0] = 
-          HP_SDC_ACT_POSTCMD | HP_SDC_ACT_DATAIN | HP_SDC_ACT_SEMAPHORE;
+        tq_init_seq[0] =
+                HP_SDC_ACT_POSTCMD | HP_SDC_ACT_DATAIN | HP_SDC_ACT_SEMAPHORE;
         tq_init_seq[1] = HP_SDC_CMD_READ_KCC;
         tq_init_seq[2] = 1;
         tq_init_seq[3] = 0;
@@ -979,13 +1038,13 @@ static int __init hp_sdc_register(void)
         }
         hp_sdc.r11 = tq_init_seq[4];
         if (hp_sdc.r11 & HP_SDC_CFG_NEW) {
-                char *str;
+                const char *str;
                 printk(KERN_INFO PREFIX "New style SDC\n");
                 tq_init_seq[1] = HP_SDC_CMD_READ_XTD;
                 tq_init.actidx          = 0;
                 tq_init.idx             = 1;
                 down(&tq_init_sem);
-                hp_sdc_enqueue_transaction(&tq_init);           
+                hp_sdc_enqueue_transaction(&tq_init);
                 down(&tq_init_sem);
                 up(&tq_init_sem);
                 if ((tq_init_seq[0] & HP_SDC_ACT_DEAD) == HP_SDC_ACT_DEAD) {
@@ -995,15 +1054,13 @@ static int __init hp_sdc_register(void)
                 hp_sdc.r7e = tq_init_seq[4];
                 HP_SDC_XTD_REV_STRINGS(hp_sdc.r7e & HP_SDC_XTD_REV, str)
                 printk(KERN_INFO PREFIX "Revision: %s\n", str);
-                if (hp_sdc.r7e & HP_SDC_XTD_BEEPER) {
+                if (hp_sdc.r7e & HP_SDC_XTD_BEEPER)
                         printk(KERN_INFO PREFIX "TI SN76494 beeper present\n");
-                }
-                if (hp_sdc.r7e & HP_SDC_XTD_BBRTC) {
+                if (hp_sdc.r7e & HP_SDC_XTD_BBRTC)
                         printk(KERN_INFO PREFIX "OKI MSM-58321 BBRTC present\n");
-                }
                 printk(KERN_INFO PREFIX "Spunking the self test register to force PUP "
                        "on next firmware reset.\n");
-                tq_init_seq[0] = HP_SDC_ACT_PRECMD | 
+                tq_init_seq[0] = HP_SDC_ACT_PRECMD |
                         HP_SDC_ACT_DATAOUT | HP_SDC_ACT_SEMAPHORE;
                 tq_init_seq[1] = HP_SDC_CMD_SET_STR;
                 tq_init_seq[2] = 1;
@@ -1012,14 +1069,12 @@ static int __init hp_sdc_register(void)
                 tq_init.idx             = 1;
                 tq_init.endidx          = 4;
                 down(&tq_init_sem);
-                hp_sdc_enqueue_transaction(&tq_init);           
+                hp_sdc_enqueue_transaction(&tq_init);
                 down(&tq_init_sem);
                 up(&tq_init_sem);
-        }
-        else {
-                printk(KERN_INFO PREFIX "Old style SDC (1820-%s).\n", 
+        } else
+                printk(KERN_INFO PREFIX "Old style SDC (1820-%s).\n",
                        (hp_sdc.r11 & HP_SDC_CFG_REV) ? "3300" : "2564/3087");
-        }
 
         return 0;
 }
@@ -1027,13 +1082,13 @@ static int __init hp_sdc_register(void)
 module_init(hp_sdc_register);
 module_exit(hp_sdc_exit);
 
-/* Timing notes:  These measurements taken on my 64MHz 7100-LC (715/64) 
+/* Timing notes:  These measurements taken on my 64MHz 7100-LC (715/64)
  *                                              cycles cycles-adj    time
  * between two consecutive mfctl(16)'s:              4        n/a    63ns
  * hp_sdc_spin_ibf when idle:                      119        115   1.7us
  * gsc_writeb status register:                      83         79   1.2us
  * IBF to clear after sending SET_IM:             6204       6006    93us
- * IBF to clear after sending LOAD_RT:            4467       4352    68us  
+ * IBF to clear after sending LOAD_RT:            4467       4352    68us
  * IBF to clear after sending two LOAD_RTs:      18974      18859   295us
  * READ_T1, read status/data, IRQ, call handler: 35564        n/a   556us
  * cmd to ~IBF READ_T1 2nd time right after:   5158403        n/a    81ms
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index aa4a8a4ccfdb..c45ea74d53e4 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -58,12 +58,13 @@ struct hp_sdc_mlc_priv_s {
 } hp_sdc_mlc_priv;
 
 /************************* Interrupt context ******************************/
-static void hp_sdc_mlc_isr (int irq, void *dev_id, 
-                            uint8_t status, uint8_t data) {
-        int idx;
+static void hp_sdc_mlc_isr (int irq, void *dev_id,
+                            uint8_t status, uint8_t data)
+{
+        int idx;
         hil_mlc *mlc = &hp_sdc_mlc;
 
-        write_lock(&(mlc->lock));
+        write_lock(&mlc->lock);
         if (mlc->icount < 0) {
                 printk(KERN_WARNING PREFIX "HIL Overflow!\n");
                 up(&mlc->isem);
@@ -73,239 +74,232 @@ static void hp_sdc_mlc_isr (int irq, void *dev_id,
         if ((status & HP_SDC_STATUS_IRQMASK) == HP_SDC_STATUS_HILDATA) {
                 mlc->ipacket[idx] |= data | HIL_ERR_INT;
                 mlc->icount--;
-                if (hp_sdc_mlc_priv.got5x) goto check;
-                if (!idx) goto check;
-                if ((mlc->ipacket[idx-1] & HIL_PKT_ADDR_MASK) !=
+                if (hp_sdc_mlc_priv.got5x || !idx)
+                        goto check;
+                if ((mlc->ipacket[idx - 1] & HIL_PKT_ADDR_MASK) !=
                     (mlc->ipacket[idx] & HIL_PKT_ADDR_MASK)) {
                         mlc->ipacket[idx] &= ~HIL_PKT_ADDR_MASK;
-                        mlc->ipacket[idx] |= (mlc->ipacket[idx-1] 
-                                                    & HIL_PKT_ADDR_MASK);
+                        mlc->ipacket[idx] |= (mlc->ipacket[idx - 1]
+                                                & HIL_PKT_ADDR_MASK);
                 }
                 goto check;
         }
         /* We know status is 5X */
-        if (data & HP_SDC_HIL_ISERR) goto err;
-        mlc->ipacket[idx] = 
+        if (data & HP_SDC_HIL_ISERR)
+                goto err;
+        mlc->ipacket[idx] =
                 (data & HP_SDC_HIL_R1MASK) << HIL_PKT_ADDR_SHIFT;
         hp_sdc_mlc_priv.got5x = 1;
         goto out;
 
  check:
         hp_sdc_mlc_priv.got5x = 0;
-        if (mlc->imatch == 0) goto done;
-        if ((mlc->imatch == (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL)) 
-            && (mlc->ipacket[idx] == (mlc->imatch | idx))) goto done;
-        if (mlc->ipacket[idx] == mlc->imatch) goto done;
+        if (mlc->imatch == 0)
+                goto done;
+        if ((mlc->imatch == (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL))
+            && (mlc->ipacket[idx] == (mlc->imatch | idx)))
+                goto done;
+        if (mlc->ipacket[idx] == mlc->imatch)
+                goto done;
         goto out;
 
- err:                           
+ err:
         printk(KERN_DEBUG PREFIX "err code %x\n", data);
+
         switch (data) {
         case HP_SDC_HIL_RC_DONE:
                 printk(KERN_WARNING PREFIX "Bastard SDC reconfigured loop!\n");
                 break;
+
         case HP_SDC_HIL_ERR:
-                mlc->ipacket[idx] |= HIL_ERR_INT | HIL_ERR_PERR | 
-                  HIL_ERR_FERR | HIL_ERR_FOF;
+                mlc->ipacket[idx] |= HIL_ERR_INT | HIL_ERR_PERR |
+                                        HIL_ERR_FERR | HIL_ERR_FOF;
                 break;
+
         case HP_SDC_HIL_TO:
                 mlc->ipacket[idx] |= HIL_ERR_INT | HIL_ERR_LERR;
                 break;
+
         case HP_SDC_HIL_RC:
                 printk(KERN_WARNING PREFIX "Bastard SDC decided to reconfigure loop!\n");
                 break;
+
         default:
                 printk(KERN_WARNING PREFIX "Unkown HIL Error status (%x)!\n", data);
                 break;
         }
+
         /* No more data will be coming due to an error. */
  done:
         tasklet_schedule(mlc->tasklet);
-        up(&(mlc->isem));
+        up(&mlc->isem);
  out:
-        write_unlock(&(mlc->lock));
+        write_unlock(&mlc->lock);
 }
 
 
 /******************** Tasklet or userspace context functions ****************/
 
-static int hp_sdc_mlc_in (hil_mlc *mlc, suseconds_t timeout) {
-        unsigned long flags;
+static int hp_sdc_mlc_in(hil_mlc *mlc, suseconds_t timeout)
+{
         struct hp_sdc_mlc_priv_s *priv;
         int rc = 2;
 
         priv = mlc->priv;
 
-        write_lock_irqsave(&(mlc->lock), flags);
-
         /* Try to down the semaphore */
-        if (down_trylock(&(mlc->isem))) {
+        if (down_trylock(&mlc->isem)) {
                 struct timeval tv;
                 if (priv->emtestmode) {
-                        mlc->ipacket[0] = 
-                                HIL_ERR_INT | (mlc->opacket & 
-                                               (HIL_PKT_CMD | 
-                                                HIL_PKT_ADDR_MASK | 
+                        mlc->ipacket[0] =
+                                HIL_ERR_INT | (mlc->opacket &
+                                               (HIL_PKT_CMD |
+                                                HIL_PKT_ADDR_MASK |
                                                 HIL_PKT_DATA_MASK));
                         mlc->icount = 14;
                         /* printk(KERN_DEBUG PREFIX ">[%x]\n", mlc->ipacket[0]); */
                         goto wasup;
                 }
                 do_gettimeofday(&tv);
-                tv.tv_usec += 1000000 * (tv.tv_sec - mlc->instart.tv_sec);
+                tv.tv_usec += USEC_PER_SEC * (tv.tv_sec - mlc->instart.tv_sec);
                 if (tv.tv_usec - mlc->instart.tv_usec > mlc->intimeout) {
-                  /*              printk("!%i %i", 
-                                  tv.tv_usec - mlc->instart.tv_usec, 
-                                  mlc->intimeout);
-                  */
+                        /*      printk("!%i %i",
+                                tv.tv_usec - mlc->instart.tv_usec,
+                                mlc->intimeout);
+                         */
                         rc = 1;
-                        up(&(mlc->isem));
+                        up(&mlc->isem);
                 }
                 goto done;
         }
  wasup:
-        up(&(mlc->isem));
+        up(&mlc->isem);
         rc = 0;
-        goto done;
  done:
-        write_unlock_irqrestore(&(mlc->lock), flags);
         return rc;
 }
 
-static int hp_sdc_mlc_cts (hil_mlc *mlc) {
+static int hp_sdc_mlc_cts(hil_mlc *mlc)
+{
         struct hp_sdc_mlc_priv_s *priv;
-        unsigned long flags;
 
-        priv = mlc->priv;       
-
-        write_lock_irqsave(&(mlc->lock), flags);
+        priv = mlc->priv;
 
         /* Try to down the semaphores -- they should be up. */
-        if (down_trylock(&(mlc->isem))) {
-                BUG();
-                goto busy;
-        }
-        if (down_trylock(&(mlc->osem))) {
-                BUG();
-                up(&(mlc->isem));
-                goto busy;
-        }
-        up(&(mlc->isem));
-        up(&(mlc->osem));
+        BUG_ON(down_trylock(&mlc->isem));
+        BUG_ON(down_trylock(&mlc->osem));
+
+        up(&mlc->isem);
+        up(&mlc->osem);
 
-        if (down_trylock(&(mlc->csem))) {
-                if (priv->trans.act.semaphore != &(mlc->csem)) goto poll;
-                goto busy;
+        if (down_trylock(&mlc->csem)) {
+                if (priv->trans.act.semaphore != &mlc->csem)
+                        goto poll;
+                else
+                        goto busy;
         }
-        if (!(priv->tseq[4] & HP_SDC_USE_LOOP)) goto done;
+
+        if (!(priv->tseq[4] & HP_SDC_USE_LOOP))
+                goto done;
 
  poll:
-        priv->trans.act.semaphore = &(mlc->csem);
+        priv->trans.act.semaphore = &mlc->csem;
         priv->trans.actidx = 0;
         priv->trans.idx = 1;
         priv->trans.endidx = 5;
-        priv->tseq[0] = 
+        priv->tseq[0] =
                 HP_SDC_ACT_POSTCMD | HP_SDC_ACT_DATAIN | HP_SDC_ACT_SEMAPHORE;
         priv->tseq[1] = HP_SDC_CMD_READ_USE;
         priv->tseq[2] = 1;
         priv->tseq[3] = 0;
         priv->tseq[4] = 0;
-        hp_sdc_enqueue_transaction(&(priv->trans));
+        __hp_sdc_enqueue_transaction(&priv->trans);
  busy:
-        write_unlock_irqrestore(&(mlc->lock), flags);
         return 1;
  done:
-        priv->trans.act.semaphore = &(mlc->osem);
-        up(&(mlc->csem));
-        write_unlock_irqrestore(&(mlc->lock), flags);
+        priv->trans.act.semaphore = &mlc->osem;
+        up(&mlc->csem);
         return 0;
 }
 
-static void hp_sdc_mlc_out (hil_mlc *mlc) {
+static void hp_sdc_mlc_out(hil_mlc *mlc)
+{
         struct hp_sdc_mlc_priv_s *priv;
-        unsigned long flags;
 
         priv = mlc->priv;
 
-        write_lock_irqsave(&(mlc->lock), flags);
-        
         /* Try to down the semaphore -- it should be up. */
-        if (down_trylock(&(mlc->osem))) {
-                BUG();
-                goto done;
-        }
+        BUG_ON(down_trylock(&mlc->osem));
 
-        if (mlc->opacket & HIL_DO_ALTER_CTRL) goto do_control;
+        if (mlc->opacket & HIL_DO_ALTER_CTRL)
+                goto do_control;
 
  do_data:
         if (priv->emtestmode) {
-                up(&(mlc->osem));
-                goto done;
+                up(&mlc->osem);
+                return;
         }
         /* Shouldn't be sending commands when loop may be busy */
-        if (down_trylock(&(mlc->csem))) {
-                BUG();
-                goto done;
-        }
-        up(&(mlc->csem));
+        BUG_ON(down_trylock(&mlc->csem));
+        up(&mlc->csem);
 
         priv->trans.actidx = 0;
         priv->trans.idx = 1;
-        priv->trans.act.semaphore = &(mlc->osem);
+        priv->trans.act.semaphore = &mlc->osem;
         priv->trans.endidx = 6;
-        priv->tseq[0] = 
+        priv->tseq[0] =
                 HP_SDC_ACT_DATAREG | HP_SDC_ACT_POSTCMD | HP_SDC_ACT_SEMAPHORE;
         priv->tseq[1] = 0x7;
-        priv->tseq[2] = 
-                (mlc->opacket & 
+        priv->tseq[2] =
+                (mlc->opacket &
                  (HIL_PKT_ADDR_MASK | HIL_PKT_CMD))
                    >> HIL_PKT_ADDR_SHIFT;
-        priv->tseq[3] = 
-                (mlc->opacket & HIL_PKT_DATA_MASK) 
+        priv->tseq[3] =
+                (mlc->opacket & HIL_PKT_DATA_MASK)
                   >> HIL_PKT_DATA_SHIFT;
         priv->tseq[4] = 0;  /* No timeout */
-        if (priv->tseq[3] == HIL_CMD_DHR) priv->tseq[4] = 1;
+        if (priv->tseq[3] == HIL_CMD_DHR)
+                priv->tseq[4] = 1;
         priv->tseq[5] = HP_SDC_CMD_DO_HIL;
         goto enqueue;
 
  do_control:
         priv->emtestmode = mlc->opacket & HIL_CTRL_TEST;
-        
+
         /* we cannot emulate this, it should not be used. */
         BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE);
-        
-        if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only;
-        if (mlc->opacket & HIL_CTRL_APE) { 
-                BUG(); /* Should not send command/data after engaging APE */
-                goto done;
-        }
-        /* Disengaging APE this way would not be valid either since 
+
+        if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY)
+                goto control_only;
+
+        /* Should not send command/data after engaging APE */
+        BUG_ON(mlc->opacket & HIL_CTRL_APE);
+
+        /* Disengaging APE this way would not be valid either since
          * the loop must be allowed to idle.
          *
-         * So, it works out that we really never actually send control 
-         * and data when using SDC, we just send the data. 
+         * So, it works out that we really never actually send control
+         * and data when using SDC, we just send the data.
          */
         goto do_data;
 
  control_only:
         priv->trans.actidx = 0;
         priv->trans.idx = 1;
-        priv->trans.act.semaphore = &(mlc->osem);
+        priv->trans.act.semaphore = &mlc->osem;
         priv->trans.endidx = 4;
-        priv->tseq[0] = 
+        priv->tseq[0] =
           HP_SDC_ACT_PRECMD | HP_SDC_ACT_DATAOUT | HP_SDC_ACT_SEMAPHORE;
         priv->tseq[1] = HP_SDC_CMD_SET_LPC;
         priv->tseq[2] = 1;
-        //      priv->tseq[3] = (mlc->ddc + 1) | HP_SDC_LPS_ACSUCC;
+        /* priv->tseq[3] = (mlc->ddc + 1) | HP_SDC_LPS_ACSUCC; */
         priv->tseq[3] = 0;
         if (mlc->opacket & HIL_CTRL_APE) {
                 priv->tseq[3] |= HP_SDC_LPC_APE_IPF;
-                down_trylock(&(mlc->csem));
-        } 
+                down_trylock(&mlc->csem);
+        }
  enqueue:
-        hp_sdc_enqueue_transaction(&(priv->trans));
- done:
-        write_unlock_irqrestore(&(mlc->lock), flags);
+        hp_sdc_enqueue_transaction(&priv->trans);
 }
 
 static int __init hp_sdc_mlc_init(void)
@@ -316,18 +310,18 @@ static int __init hp_sdc_mlc_init(void)
 
         hp_sdc_mlc_priv.emtestmode = 0;
         hp_sdc_mlc_priv.trans.seq = hp_sdc_mlc_priv.tseq;
-        hp_sdc_mlc_priv.trans.act.semaphore = &(mlc->osem);
+        hp_sdc_mlc_priv.trans.act.semaphore = &mlc->osem;
         hp_sdc_mlc_priv.got5x = 0;
 
-        mlc->cts                = &hp_sdc_mlc_cts;
-        mlc->in                 = &hp_sdc_mlc_in;
-        mlc->out                = &hp_sdc_mlc_out;
+        mlc->cts = &hp_sdc_mlc_cts;
+        mlc->in = &hp_sdc_mlc_in;
+        mlc->out = &hp_sdc_mlc_out;
+        mlc->priv = &hp_sdc_mlc_priv;
 
         if (hil_mlc_register(mlc)) {
                 printk(KERN_WARNING PREFIX "Failed to register MLC structure with hil_mlc\n");
                 goto err0;
         }
-        mlc->priv               = &hp_sdc_mlc_priv;
 
         if (hp_sdc_request_hil_irq(&hp_sdc_mlc_isr)) {
                 printk(KERN_WARNING PREFIX "Request for raw HIL ISR hook denied\n");
@@ -335,10 +329,9 @@ static int __init hp_sdc_mlc_init(void)
         }
         return 0;
  err1:
-        if (hil_mlc_unregister(mlc)) {
+        if (hil_mlc_unregister(mlc))
                 printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
                         "This is bad.  Could cause an oops.\n");
-        }
  err0:
         return -EBUSY;
 }
@@ -346,14 +339,14 @@ static int __init hp_sdc_mlc_init(void)
 static void __exit hp_sdc_mlc_exit(void)
 {
         hil_mlc *mlc = &hp_sdc_mlc;
-        if (hp_sdc_release_hil_irq(&hp_sdc_mlc_isr)) {
+
+        if (hp_sdc_release_hil_irq(&hp_sdc_mlc_isr))
                 printk(KERN_ERR PREFIX "Failed to release the raw HIL ISR hook.\n"
                         "This is bad.  Could cause an oops.\n");
-        }
-        if (hil_mlc_unregister(mlc)) {
+
+        if (hil_mlc_unregister(mlc))
                 printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
                         "This is bad.  Could cause an oops.\n");
-        }
 }
 
 module_init(hp_sdc_mlc_init);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index d36bd5475b6d..6858bc58f0fd 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -160,6 +160,28 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                /*
+                 * No data is coming from the touchscreen unless KBC
+                 * is in legacy mode.
+                 */
+                .ident = "Panasonic CF-29",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
+                },
+        },
+        {
+                /*
+                 * Errors on MUX ports are reported without raising AUXDATA
+                 * causing "spurious NAK" messages.
+                 */
+                .ident = "HP Pavilion DV4017EA",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"),
+                },
+        },
+        {
                 .ident = "Toshiba P10",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -280,6 +302,8 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
 };
 
 static struct pnp_device_id pnp_aux_devids[] = {
+        { .id = "FJC6000", .driver_data = 0 },
+        { .id = "FJC6001", .driver_data = 0 },
         { .id = "PNP0f03", .driver_data = 0 },
         { .id = "PNP0f0b", .driver_data = 0 },
         { .id = "PNP0f0e", .driver_data = 0 },
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index db9cca3b65e0..7c17377a65b9 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -768,6 +768,13 @@ static void i8042_controller_reset(void)
         i8042_flush();
 
 /*
+ * Disable both KBD and AUX interfaces so they don't get in the way
+ */
+
+        i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;
+        i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);
+
+/*
  * Disable MUX mode if present.
  */
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 0a26e0663542..693e3b2a65a3 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -39,7 +39,8 @@
 /*
  * This code has been heavily tested on a Nokia 770, and lightly
  * tested on other ads7846 devices (OSK/Mistral, Lubbock).
- * Support for ads7843 and ads7845 has only been stubbed in.
+ * Support for ads7843 tested on Atmel at91sam926x-EK.
+ * Support for ads7845 has only been stubbed in.
  *
  * IRQ handling needs a workaround because of a shortcoming in handling
  * edge triggered IRQs on some platforms like the OMAP1/2. These
@@ -246,18 +247,16 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 
         /* REVISIT:  take a few more samples, and compare ... */
 
-        /* maybe off internal vREF */
-        if (use_internal) {
-                req->ref_off = REF_OFF;
-                req->xfer[4].tx_buf = &req->ref_off;
-                req->xfer[4].len = 1;
-                spi_message_add_tail(&req->xfer[4], &req->msg);
-
-                req->xfer[5].rx_buf = &req->scratch;
-                req->xfer[5].len = 2;
-                CS_CHANGE(req->xfer[5]);
-                spi_message_add_tail(&req->xfer[5], &req->msg);
-        }
+        /* converter in low power mode & enable PENIRQ */
+        req->ref_off = PWRDOWN;
+        req->xfer[4].tx_buf = &req->ref_off;
+        req->xfer[4].len = 1;
+        spi_message_add_tail(&req->xfer[4], &req->msg);
+
+        req->xfer[5].rx_buf = &req->scratch;
+        req->xfer[5].len = 2;
+        CS_CHANGE(req->xfer[5]);
+        spi_message_add_tail(&req->xfer[5], &req->msg);
 
         ts->irq_disabled = 1;
         disable_irq(spi->irq);
@@ -536,6 +535,9 @@ static void ads7846_rx(void *ads)
         } else
                 Rt = 0;
 
+        if (ts->model == 7843)
+                Rt = ts->pressure_max / 2;
+
         /* Sample found inconsistent by debouncing or pressure is beyond
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
@@ -897,7 +899,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         input_dev->name = "ADS784x Touchscreen";
         input_dev->phys = ts->phys;
-        input_dev->cdev.dev = &spi->dev;
+        input_dev->dev.parent = &spi->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index e2945582828e..e6a31d118786 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -300,8 +300,7 @@ static int __init corgits_probe(struct platform_device *pdev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0002;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &pdev->dev;
-        input_dev->private = corgi_ts;
+        input_dev->dev.parent = &pdev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 9d61cd133d01..557d781719f1 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -312,14 +312,13 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
         init_completion(&elo->cmd_done);
         snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys);
 
-        input_dev->private = elo;
         input_dev->name = "Elo Serial TouchScreen";
         input_dev->phys = elo->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_ELO;
         input_dev->id.product = elo->id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 9157eb148e84..39d602600d7c 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -130,13 +130,13 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
         gunze->dev = input_dev;
         snprintf(gunze->phys, sizeof(serio->phys), "%s/input0", serio->phys);
 
-        input_dev->private = gunze;
         input_dev->name = "Gunze AHL-51S TouchScreen";
         input_dev->phys = gunze->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_GUNZE;
         input_dev->id.product = 0x0051;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0);
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index c4116d4f64e7..09ed7803cb8f 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -147,7 +147,7 @@ enum flite_pwr {
 unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
 {
         unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness;
-        struct h3600_dev *ts = dev->private;
+        struct h3600_dev *ts = input_get_drvdata(dev);
 
         /* Must be in this order */
         ts->serio->write(ts->serio, 1);
@@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type,
                          unsigned int code, int value)
 {
 #if 0
-        struct h3600_dev *ts = dev->private;
+        struct h3600_dev *ts = input_get_drvdata(dev);
 
         switch (type) {
                 case EV_LED: {
@@ -367,8 +367,9 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_H3600;
         input_dev->id.product = 0x0666;  /* FIXME !!! We can ask the hardware */
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = ts;
+        input_dev->dev.parent = &serio->dev;
+
+        input_set_drvdata(input_dev, ts);
 
         input_dev->event = h3600ts_event;
 
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 249087472740..61c15024c2a0 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -21,7 +21,7 @@
 static void do_softint(void *data);
 
 static struct input_dev *hp680_ts_dev;
-static DECLARE_WORK(work, do_softint, 0);
+static DECLARE_WORK(work, do_softint);
 
 static void do_softint(void *data)
 {
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c
index c3c2d735d0ec..4ec3b1f940c8 100644
--- a/drivers/input/touchscreen/mtouch.c
+++ b/drivers/input/touchscreen/mtouch.c
@@ -144,13 +144,13 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)
         mtouch->dev = input_dev;
         snprintf(mtouch->phys, sizeof(mtouch->phys), "%s/input0", serio->phys);
 
-        input_dev->private = mtouch;
         input_dev->name = "MicroTouch Serial TouchScreen";
         input_dev->phys = mtouch->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_MICROTOUCH;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(mtouch->dev, ABS_X, MTOUCH_MIN_XC, MTOUCH_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index bd2767991ae9..f2c0d3c7149c 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -105,14 +105,13 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
         pm->dev = input_dev;
         snprintf(pm->phys, sizeof(pm->phys), "%s/input0", serio->phys);
 
-        input_dev->private = pm;
         input_dev->name = "Penmount Serial TouchScreen";
         input_dev->phys = pm->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_PENMOUNT;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 35ba46c6ad2d..3def7bb1df44 100644
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -118,13 +118,13 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
         tr->dev = input_dev;
         snprintf(tr->phys, sizeof(tr->phys), "%s/input0", serio->phys);
 
-        input_dev->private = tr;
         input_dev->name = "Touchright Serial TouchScreen";
         input_dev->phys = tr->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_TOUCHRIGHT;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index 4dc073dacabb..ac4bdcf18666 100644
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -125,13 +125,13 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
         tw->dev = input_dev;
         snprintf(tw->phys, sizeof(tw->phys), "%s/input0", serio->phys);
 
-        input_dev->private = tw;
         input_dev->name = "Touchwindow Serial TouchScreen";
         input_dev->phys = tw->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_TOUCHWIN;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index e8606c48c9c3..6582816a0477 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -97,6 +97,8 @@ struct ucb1400 {
 };
 
 static int adcsync;
+static int ts_delay = 55; /* us */
+static int ts_delay_pressure;   /* us */
 
 static inline u16 ucb1400_reg_read(struct ucb1400 *ucb, u16 reg)
 {
@@ -159,6 +161,7 @@ static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
                         UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
                         UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        udelay(ts_delay_pressure);
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);
 }
 
@@ -180,7 +183,7 @@ static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
 
-        udelay(55);
+        udelay(ts_delay);
 
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);
 }
@@ -203,7 +206,7 @@ static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
 
-        udelay(55);
+        udelay(ts_delay);
 
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPX);
 }
@@ -369,7 +372,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)
 
 static int ucb1400_ts_open(struct input_dev *idev)
 {
-        struct ucb1400 *ucb = idev->private;
+        struct ucb1400 *ucb = input_get_drvdata(idev);
         int ret = 0;
 
         BUG_ON(ucb->ts_task);
@@ -385,7 +388,7 @@ static int ucb1400_ts_open(struct input_dev *idev)
 
 static void ucb1400_ts_close(struct input_dev *idev)
 {
-        struct ucb1400 *ucb = idev->private;
+        struct ucb1400 *ucb = input_get_drvdata(idev);
 
         if (ucb->ts_task)
                 kthread_stop(ucb->ts_task);
@@ -507,8 +510,9 @@ static int ucb1400_ts_probe(struct device *dev)
         }
         printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb->irq);
 
-        idev->private           = ucb;
-        idev->cdev.dev          = dev;
+        input_set_drvdata(idev, ucb);
+
+        idev->dev.parent        = dev;
         idev->name              = "UCB1400 touchscreen interface";
         idev->id.vendor         = ucb1400_reg_read(ucb, AC97_VENDOR_ID1);
         idev->id.product        = id;
@@ -571,7 +575,15 @@ static void __exit ucb1400_ts_exit(void)
         driver_unregister(&ucb1400_ts_driver);
 }
 
-module_param(adcsync, int, 0444);
+module_param(adcsync, bool, 0444);
+MODULE_PARM_DESC(adcsync, "Synchronize touch readings with ADCSYNC pin.");
+
+module_param(ts_delay, int, 0444);
+MODULE_PARM_DESC(ts_delay, "Delay between panel setup and position read. Default = 55us.");
+
+module_param(ts_delay_pressure, int, 0444);
+MODULE_PARM_DESC(ts_delay_pressure,
+                  "delay between panel setup and pressure read.  Default = 0us.");
 
 module_init(ucb1400_ts_init);
 module_exit(ucb1400_ts_exit);
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 0300dca8591d..5e5b5c91d75b 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -111,13 +111,13 @@ struct tsdev {
         int minor;
         char name[8];
         wait_queue_head_t wait;
-        struct list_head list;
+        struct list_head client_list;
         struct input_handle handle;
         int x, y, pressure;
         struct ts_calibration cal;
 };
 
-struct tsdev_list {
+struct tsdev_client {
         struct fasync_struct *fasync;
         struct list_head node;
         struct tsdev *tsdev;
@@ -139,38 +139,49 @@ static struct tsdev *tsdev_table[TSDEV_MINORS/2];
 
 static int tsdev_fasync(int fd, struct file *file, int on)
 {
-        struct tsdev_list *list = file->private_data;
+        struct tsdev_client *client = file->private_data;
         int retval;
 
-        retval = fasync_helper(fd, file, on, &list->fasync);
+        retval = fasync_helper(fd, file, on, &client->fasync);
         return retval < 0 ? retval : 0;
 }
 
 static int tsdev_open(struct inode *inode, struct file *file)
 {
         int i = iminor(inode) - TSDEV_MINOR_BASE;
-        struct tsdev_list *list;
+        struct tsdev_client *client;
+        struct tsdev *tsdev;
+        int error;
 
         printk(KERN_WARNING "tsdev (compaq touchscreen emulation) is scheduled "
                 "for removal.\nSee Documentation/feature-removal-schedule.txt "
                 "for details.\n");
 
-        if (i >= TSDEV_MINORS || !tsdev_table[i & TSDEV_MINOR_MASK])
+        if (i >= TSDEV_MINORS)
+                return -ENODEV;
+
+        tsdev = tsdev_table[i & TSDEV_MINOR_MASK];
+        if (!tsdev || !tsdev->exist)
                 return -ENODEV;
 
-        if (!(list = kzalloc(sizeof(struct tsdev_list), GFP_KERNEL)))
+        client = kzalloc(sizeof(struct tsdev_client), GFP_KERNEL);
+        if (!client)
                 return -ENOMEM;
 
-        list->raw = (i >= TSDEV_MINORS/2) ? 1 : 0;
+        client->tsdev = tsdev;
+        client->raw = (i >= TSDEV_MINORS / 2) ? 1 : 0;
+        list_add_tail(&client->node, &tsdev->client_list);
 
-        i &= TSDEV_MINOR_MASK;
-        list->tsdev = tsdev_table[i];
-        list_add_tail(&list->node, &tsdev_table[i]->list);
-        file->private_data = list;
+        if (!tsdev->open++ && tsdev->exist) {
+                error = input_open_device(&tsdev->handle);
+                if (error) {
+                        list_del(&client->node);
+                        kfree(client);
+                        return error;
+                }
+        }
 
-        if (!list->tsdev->open++)
-                if (list->tsdev->exist)
-                        input_open_device(&list->tsdev->handle);
+        file->private_data = client;
         return 0;
 }
 
@@ -182,45 +193,48 @@ static void tsdev_free(struct tsdev *tsdev)
 
 static int tsdev_release(struct inode *inode, struct file *file)
 {
-        struct tsdev_list *list = file->private_data;
+        struct tsdev_client *client = file->private_data;
+        struct tsdev *tsdev = client->tsdev;
 
         tsdev_fasync(-1, file, 0);
-        list_del(&list->node);
 
-        if (!--list->tsdev->open) {
-                if (list->tsdev->exist)
-                        input_close_device(&list->tsdev->handle);
+        list_del(&client->node);
+        kfree(client);
+
+        if (!--tsdev->open) {
+                if (tsdev->exist)
+                        input_close_device(&tsdev->handle);
                 else
-                        tsdev_free(list->tsdev);
+                        tsdev_free(tsdev);
         }
-        kfree(list);
+
         return 0;
 }
 
 static ssize_t tsdev_read(struct file *file, char __user *buffer, size_t count,
-                          loff_t * ppos)
+                          loff_t *ppos)
 {
-        struct tsdev_list *list = file->private_data;
+        struct tsdev_client *client = file->private_data;
+        struct tsdev *tsdev = client->tsdev;
         int retval = 0;
 
-        if (list->head == list->tail && list->tsdev->exist && (file->f_flags & O_NONBLOCK))
+        if (client->head == client->tail && tsdev->exist && (file->f_flags & O_NONBLOCK))
                 return -EAGAIN;
 
-        retval = wait_event_interruptible(list->tsdev->wait,
-                        list->head != list->tail || !list->tsdev->exist);
-
+        retval = wait_event_interruptible(tsdev->wait,
+                        client->head != client->tail || !tsdev->exist);
         if (retval)
                 return retval;
 
-        if (!list->tsdev->exist)
+        if (!tsdev->exist)
                 return -ENODEV;
 
-        while (list->head != list->tail &&
+        while (client->head != client->tail &&
                retval + sizeof (struct ts_event) <= count) {
-                if (copy_to_user (buffer + retval, list->event + list->tail,
+                if (copy_to_user (buffer + retval, client->event + client->tail,
                                   sizeof (struct ts_event)))
                         return -EFAULT;
-                list->tail = (list->tail + 1) & (TSDEV_BUFFER_SIZE - 1);
+                client->tail = (client->tail + 1) & (TSDEV_BUFFER_SIZE - 1);
                 retval += sizeof (struct ts_event);
         }
 
@@ -228,32 +242,33 @@ static ssize_t tsdev_read(struct file *file, char __user *buffer, size_t count,
 }
 
 /* No kernel lock - fine */
-static unsigned int tsdev_poll(struct file *file, poll_table * wait)
+static unsigned int tsdev_poll(struct file *file, poll_table *wait)
 {
-        struct tsdev_list *list = file->private_data;
+        struct tsdev_client *client = file->private_data;
+        struct tsdev *tsdev = client->tsdev;
 
-        poll_wait(file, &list->tsdev->wait, wait);
-        return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) |
-                (list->tsdev->exist ? 0 : (POLLHUP | POLLERR));
+        poll_wait(file, &tsdev->wait, wait);
+        return ((client->head == client->tail) ? 0 : (POLLIN | POLLRDNORM)) |
+                (tsdev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
 static int tsdev_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        struct tsdev_list *list = file->private_data;
-        struct tsdev *tsdev = list->tsdev;
+        struct tsdev_client *client = file->private_data;
+        struct tsdev *tsdev = client->tsdev;
         int retval = 0;
 
         switch (cmd) {
         case TS_GET_CAL:
-                if (copy_to_user ((void __user *)arg, &tsdev->cal,
-                                  sizeof (struct ts_calibration)))
+                if (copy_to_user((void __user *)arg, &tsdev->cal,
+                                 sizeof (struct ts_calibration)))
                         retval = -EFAULT;
                 break;
 
         case TS_SET_CAL:
-                if (copy_from_user (&tsdev->cal, (void __user *)arg,
-                                    sizeof (struct ts_calibration)))
+                if (copy_from_user(&tsdev->cal, (void __user *)arg,
+                                   sizeof (struct ts_calibration)))
                         retval = -EFAULT;
                 break;
 
@@ -279,7 +294,7 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,
                         unsigned int code, int value)
 {
         struct tsdev *tsdev = handle->private;
-        struct tsdev_list *list;
+        struct tsdev_client *client;
         struct timeval time;
 
         switch (type) {
@@ -343,18 +358,18 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,
         if (type != EV_SYN || code != SYN_REPORT)
                 return;
 
-        list_for_each_entry(list, &tsdev->list, node) {
+        list_for_each_entry(client, &tsdev->client_list, node) {
                 int x, y, tmp;
 
                 do_gettimeofday(&time);
-                list->event[list->head].millisecs = time.tv_usec / 100;
-                list->event[list->head].pressure = tsdev->pressure;
+                client->event[client->head].millisecs = time.tv_usec / 100;
+                client->event[client->head].pressure = tsdev->pressure;
 
                 x = tsdev->x;
                 y = tsdev->y;
 
                 /* Calibration */
-                if (!list->raw) {
+                if (!client->raw) {
                         x = ((x * tsdev->cal.xscale) >> 8) + tsdev->cal.xtrans;
                         y = ((y * tsdev->cal.yscale) >> 8) + tsdev->cal.ytrans;
                         if (tsdev->cal.xyswap) {
@@ -362,33 +377,35 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,
                         }
                 }
 
-                list->event[list->head].x = x;
-                list->event[list->head].y = y;
-                list->head = (list->head + 1) & (TSDEV_BUFFER_SIZE - 1);
-                kill_fasync(&list->fasync, SIGIO, POLL_IN);
+                client->event[client->head].x = x;
+                client->event[client->head].y = y;
+                client->head = (client->head + 1) & (TSDEV_BUFFER_SIZE - 1);
+                kill_fasync(&client->fasync, SIGIO, POLL_IN);
         }
         wake_up_interruptible(&tsdev->wait);
 }
 
-static struct input_handle *tsdev_connect(struct input_handler *handler,
-                                          struct input_dev *dev,
-                                          const struct input_device_id *id)
+static int tsdev_connect(struct input_handler *handler, struct input_dev *dev,
+                         const struct input_device_id *id)
 {
         struct tsdev *tsdev;
         struct class_device *cdev;
+        dev_t devt;
         int minor, delta;
+        int error;
 
         for (minor = 0; minor < TSDEV_MINORS / 2 && tsdev_table[minor]; minor++);
         if (minor >= TSDEV_MINORS / 2) {
                 printk(KERN_ERR
                        "tsdev: You have way too many touchscreens\n");
-                return NULL;
+                return -ENFILE;
         }
 
-        if (!(tsdev = kzalloc(sizeof(struct tsdev), GFP_KERNEL)))
-                return NULL;
+        tsdev = kzalloc(sizeof(struct tsdev), GFP_KERNEL);
+        if (!tsdev)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&tsdev->list);
+        INIT_LIST_HEAD(&tsdev->client_list);
         init_waitqueue_head(&tsdev->wait);
 
         sprintf(tsdev->name, "ts%d", minor);
@@ -415,23 +432,45 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
 
         tsdev_table[minor] = tsdev;
 
-        cdev = class_device_create(&input_class, &dev->cdev,
-                        MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, tsdev->name);
+        devt = MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
+
+        cdev = class_device_create(&input_class, &dev->cdev, devt,
+                                   dev->cdev.dev, tsdev->name);
+        if (IS_ERR(cdev)) {
+                error = PTR_ERR(cdev);
+                goto err_free_tsdev;
+        }
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
-                          tsdev->name);
+        error = sysfs_create_link(&input_class.subsys.kobj,
+                                  &cdev->kobj, tsdev->name);
+        if (error)
+                goto err_cdev_destroy;
+
+        error = input_register_handle(&tsdev->handle);
+        if (error)
+                goto err_remove_link;
 
-        return &tsdev->handle;
+        return 0;
+
+ err_remove_link:
+        sysfs_remove_link(&input_class.subsys.kobj, tsdev->name);
+ err_cdev_destroy:
+        class_device_destroy(&input_class, devt);
+ err_free_tsdev:
+        tsdev_table[minor] = NULL;
+        kfree(tsdev);
+        return error;
 }
 
 static void tsdev_disconnect(struct input_handle *handle)
 {
         struct tsdev *tsdev = handle->private;
-        struct tsdev_list *list;
+        struct tsdev_client *client;
+
+        input_unregister_handle(handle);
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, tsdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
         tsdev->exist = 0;
@@ -439,8 +478,8 @@ static void tsdev_disconnect(struct input_handle *handle)
         if (tsdev->open) {
                 input_close_device(handle);
                 wake_up_interruptible(&tsdev->wait);
-                list_for_each_entry(list, &tsdev->list, node)
-                        kill_fasync(&list->fasync, SIGIO, POLL_HUP);
+                list_for_each_entry(client, &tsdev->client_list, node)
+                        kill_fasync(&client->fasync, SIGIO, POLL_HUP);
         } else
                 tsdev_free(tsdev);
 }
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 38f648f9b0ed..02c6fbaeccf8 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -19,7 +19,6 @@
 #include "isac.h"
 #include "hscx.h"
 #include "isdnl1.h"
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/ppp_defs.h>
 #include <asm/io.h>
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index f7e83a86f444..4c7dedac0e51 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
-#include <linux/pci.h>
 #include <linux/smp_lock.h>
 
 #include "hysdn_defs.h"
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 0d122bf889db..41634fde8e13 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -51,16 +51,19 @@
 #define UNMAPPED_GVA (~(gpa_t)0)
 
 #define KVM_MAX_VCPUS 1
+#define KVM_ALIAS_SLOTS 4
 #define KVM_MEMORY_SLOTS 4
 #define KVM_NUM_MMU_PAGES 256
 #define KVM_MIN_FREE_MMU_PAGES 5
 #define KVM_REFILL_PAGES 25
+#define KVM_MAX_CPUID_ENTRIES 40
 
 #define FX_IMAGE_SIZE 512
 #define FX_IMAGE_ALIGN 16
 #define FX_BUF_SIZE (2 * FX_IMAGE_SIZE + FX_IMAGE_ALIGN)
 
 #define DE_VECTOR 0
+#define NM_VECTOR 7
 #define DF_VECTOR 8
 #define TS_VECTOR 10
 #define NP_VECTOR 11
@@ -73,6 +76,8 @@
 
 #define IOPL_SHIFT 12
 
+#define KVM_PIO_PAGE_OFFSET 1
+
 /*
  * Address types:
  *
@@ -106,6 +111,7 @@ struct kvm_pte_chain {
  *   bits 4:7 - page table level for this shadow (1-4)
  *   bits 8:9 - page table quadrant for 2-level guests
  *   bit   16 - "metaphysical" - gfn is not a real page (huge page/real mode)
+ *   bits 17:18 - "access" - the user and writable bits of a huge page pde
  */
 union kvm_mmu_page_role {
         unsigned word;
@@ -115,6 +121,7 @@ union kvm_mmu_page_role {
                 unsigned quadrant : 2;
                 unsigned pad_for_nice_hex_output : 6;
                 unsigned metaphysical : 1;
+                unsigned hugepage_access : 2;
         };
 };
 
@@ -133,7 +140,6 @@ struct kvm_mmu_page {
         unsigned long slot_bitmap; /* One bit set per slot which has memory
                                     * in this shadow page.
                                     */
-        int global;              /* Set if all ptes in this page are global */
         int multimapped;         /* More than one parent_pte? */
         int root_count;          /* Currently serving as active root */
         union {
@@ -219,6 +225,34 @@ enum {
         VCPU_SREG_LDTR,
 };
 
+struct kvm_pio_request {
+        unsigned long count;
+        int cur_count;
+        struct page *guest_pages[2];
+        unsigned guest_page_offset;
+        int in;
+        int size;
+        int string;
+        int down;
+        int rep;
+};
+
+struct kvm_stat {
+        u32 pf_fixed;
+        u32 pf_guest;
+        u32 tlb_flush;
+        u32 invlpg;
+
+        u32 exits;
+        u32 io_exits;
+        u32 mmio_exits;
+        u32 signal_exits;
+        u32 irq_window_exits;
+        u32 halt_exits;
+        u32 request_irq_exits;
+        u32 irq_exits;
+};
+
 struct kvm_vcpu {
         struct kvm *kvm;
         union {
@@ -228,6 +262,8 @@ struct kvm_vcpu {
         struct mutex mutex;
         int   cpu;
         int   launched;
+        u64 host_tsc;
+        struct kvm_run *run;
         int interrupt_window_open;
         unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */
 #define NR_IRQ_WORDS KVM_IRQ_BITMAP_SIZE(unsigned long)
@@ -266,6 +302,7 @@ struct kvm_vcpu {
         char fx_buf[FX_BUF_SIZE];
         char *host_fx_image;
         char *guest_fx_image;
+        int fpu_active;
 
         int mmio_needed;
         int mmio_read_completed;
@@ -273,6 +310,14 @@ struct kvm_vcpu {
         int mmio_size;
         unsigned char mmio_data[8];
         gpa_t mmio_phys_addr;
+        gva_t mmio_fault_cr2;
+        struct kvm_pio_request pio;
+        void *pio_data;
+
+        int sigset_active;
+        sigset_t sigset;
+
+        struct kvm_stat stat;
 
         struct {
                 int active;
@@ -284,6 +329,15 @@ struct kvm_vcpu {
                         u32 ar;
                 } tr, es, ds, fs, gs;
         } rmode;
+
+        int cpuid_nent;
+        struct kvm_cpuid_entry cpuid_entries[KVM_MAX_CPUID_ENTRIES];
+};
+
+struct kvm_mem_alias {
+        gfn_t base_gfn;
+        unsigned long npages;
+        gfn_t target_gfn;
 };
 
 struct kvm_memory_slot {
@@ -296,6 +350,8 @@ struct kvm_memory_slot {
 
 struct kvm {
         spinlock_t lock; /* protects everything except vcpus */
+        int naliases;
+        struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS];
         int nmemslots;
         struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS];
         /*
@@ -312,22 +368,6 @@ struct kvm {
         struct file *filp;
 };
 
-struct kvm_stat {
-        u32 pf_fixed;
-        u32 pf_guest;
-        u32 tlb_flush;
-        u32 invlpg;
-
-        u32 exits;
-        u32 io_exits;
-        u32 mmio_exits;
-        u32 signal_exits;
-        u32 irq_window_exits;
-        u32 halt_exits;
-        u32 request_irq_exits;
-        u32 irq_exits;
-};
-
 struct descriptor_table {
         u16 limit;
         unsigned long base;
@@ -358,10 +398,8 @@ struct kvm_arch_ops {
         void (*set_segment)(struct kvm_vcpu *vcpu,
                             struct kvm_segment *var, int seg);
         void (*get_cs_db_l_bits)(struct kvm_vcpu *vcpu, int *db, int *l);
-        void (*decache_cr0_cr4_guest_bits)(struct kvm_vcpu *vcpu);
+        void (*decache_cr4_guest_bits)(struct kvm_vcpu *vcpu);
         void (*set_cr0)(struct kvm_vcpu *vcpu, unsigned long cr0);
-        void (*set_cr0_no_modeswitch)(struct kvm_vcpu *vcpu,
-                                      unsigned long cr0);
         void (*set_cr3)(struct kvm_vcpu *vcpu, unsigned long cr3);
         void (*set_cr4)(struct kvm_vcpu *vcpu, unsigned long cr4);
         void (*set_efer)(struct kvm_vcpu *vcpu, u64 efer);
@@ -391,7 +429,6 @@ struct kvm_arch_ops {
                                 unsigned char *hypercall_addr);
 };
 
-extern struct kvm_stat kvm_stat;
 extern struct kvm_arch_ops *kvm_arch_ops;
 
 #define kvm_printf(kvm, fmt ...) printk(KERN_DEBUG fmt)
@@ -400,28 +437,29 @@ extern struct kvm_arch_ops *kvm_arch_ops;
 int kvm_init_arch(struct kvm_arch_ops *ops, struct module *module);
 void kvm_exit_arch(void);
 
+int kvm_mmu_module_init(void);
+void kvm_mmu_module_exit(void);
+
 void kvm_mmu_destroy(struct kvm_vcpu *vcpu);
 int kvm_mmu_create(struct kvm_vcpu *vcpu);
 int kvm_mmu_setup(struct kvm_vcpu *vcpu);
 
 int kvm_mmu_reset_context(struct kvm_vcpu *vcpu);
 void kvm_mmu_slot_remove_write_access(struct kvm_vcpu *vcpu, int slot);
+void kvm_mmu_zap_all(struct kvm_vcpu *vcpu);
 
 hpa_t gpa_to_hpa(struct kvm_vcpu *vcpu, gpa_t gpa);
 #define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
 #define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
 static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
 hpa_t gva_to_hpa(struct kvm_vcpu *vcpu, gva_t gva);
+struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva);
 
 void kvm_emulator_want_group7_invlpg(void);
 
 extern hpa_t bad_page_address;
 
-static inline struct page *gfn_to_page(struct kvm_memory_slot *slot, gfn_t gfn)
-{
-        return slot->phys_mem[gfn - slot->base_gfn];
-}
-
+struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);
 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
 void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
 
@@ -444,6 +482,10 @@ void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long value,
 
 struct x86_emulate_ctxt;
 
+int kvm_setup_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,
+                  int size, unsigned long count, int string, int down,
+                  gva_t address, int rep, unsigned port);
+void kvm_emulate_cpuid(struct kvm_vcpu *vcpu);
 int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address);
 int emulate_clts(struct kvm_vcpu *vcpu);
 int emulator_get_dr(struct x86_emulate_ctxt* ctxt, int dr,
@@ -493,12 +535,6 @@ static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
         return vcpu->mmu.page_fault(vcpu, gva, error_code);
 }
 
-static inline struct page *_gfn_to_page(struct kvm *kvm, gfn_t gfn)
-{
-        struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);
-        return (slot) ? slot->phys_mem[gfn - slot->base_gfn] : NULL;
-}
-
 static inline int is_long_mode(struct kvm_vcpu *vcpu)
 {
 #ifdef CONFIG_X86_64
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index dc7a8c78cbf9..c8b8cfa332bb 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -51,27 +51,27 @@ static DEFINE_SPINLOCK(kvm_lock);
 static LIST_HEAD(vm_list);
 
 struct kvm_arch_ops *kvm_arch_ops;
-struct kvm_stat kvm_stat;
-EXPORT_SYMBOL_GPL(kvm_stat);
+
+#define STAT_OFFSET(x) offsetof(struct kvm_vcpu, stat.x)
 
 static struct kvm_stats_debugfs_item {
         const char *name;
-        u32 *data;
+        int offset;
         struct dentry *dentry;
 } debugfs_entries[] = {
-        { "pf_fixed", &kvm_stat.pf_fixed },
-        { "pf_guest", &kvm_stat.pf_guest },
-        { "tlb_flush", &kvm_stat.tlb_flush },
-        { "invlpg", &kvm_stat.invlpg },
-        { "exits", &kvm_stat.exits },
-        { "io_exits", &kvm_stat.io_exits },
-        { "mmio_exits", &kvm_stat.mmio_exits },
-        { "signal_exits", &kvm_stat.signal_exits },
-        { "irq_window", &kvm_stat.irq_window_exits },
-        { "halt_exits", &kvm_stat.halt_exits },
-        { "request_irq", &kvm_stat.request_irq_exits },
-        { "irq_exits", &kvm_stat.irq_exits },
-        { NULL, NULL }
+        { "pf_fixed", STAT_OFFSET(pf_fixed) },
+        { "pf_guest", STAT_OFFSET(pf_guest) },
+        { "tlb_flush", STAT_OFFSET(tlb_flush) },
+        { "invlpg", STAT_OFFSET(invlpg) },
+        { "exits", STAT_OFFSET(exits) },
+        { "io_exits", STAT_OFFSET(io_exits) },
+        { "mmio_exits", STAT_OFFSET(mmio_exits) },
+        { "signal_exits", STAT_OFFSET(signal_exits) },
+        { "irq_window", STAT_OFFSET(irq_window_exits) },
+        { "halt_exits", STAT_OFFSET(halt_exits) },
+        { "request_irq", STAT_OFFSET(request_irq_exits) },
+        { "irq_exits", STAT_OFFSET(irq_exits) },
+        { NULL }
 };
 
 static struct dentry *debugfs_dir;
@@ -346,6 +346,17 @@ static void kvm_free_physmem(struct kvm *kvm)
                 kvm_free_physmem_slot(&kvm->memslots[i], NULL);
 }
 
+static void free_pio_guest_pages(struct kvm_vcpu *vcpu)
+{
+        int i;
+
+        for (i = 0; i < 2; ++i)
+                if (vcpu->pio.guest_pages[i]) {
+                        __free_page(vcpu->pio.guest_pages[i]);
+                        vcpu->pio.guest_pages[i] = NULL;
+                }
+}
+
 static void kvm_free_vcpu(struct kvm_vcpu *vcpu)
 {
         if (!vcpu->vmcs)
@@ -355,6 +366,11 @@ static void kvm_free_vcpu(struct kvm_vcpu *vcpu)
         kvm_mmu_destroy(vcpu);
         vcpu_put(vcpu);
         kvm_arch_ops->vcpu_free(vcpu);
+        free_page((unsigned long)vcpu->run);
+        vcpu->run = NULL;
+        free_page((unsigned long)vcpu->pio_data);
+        vcpu->pio_data = NULL;
+        free_pio_guest_pages(vcpu);
 }
 
 static void kvm_free_vcpus(struct kvm *kvm)
@@ -404,12 +420,12 @@ static int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)
         u64 pdpte;
         u64 *pdpt;
         int ret;
-        struct kvm_memory_slot *memslot;
+        struct page *page;
 
         spin_lock(&vcpu->kvm->lock);
-        memslot = gfn_to_memslot(vcpu->kvm, pdpt_gfn);
-        /* FIXME: !memslot - emulate? 0xff? */
-        pdpt = kmap_atomic(gfn_to_page(memslot, pdpt_gfn), KM_USER0);
+        page = gfn_to_page(vcpu->kvm, pdpt_gfn);
+        /* FIXME: !page - emulate? 0xff? */
+        pdpt = kmap_atomic(page, KM_USER0);
 
         ret = 1;
         for (i = 0; i < 4; ++i) {
@@ -494,7 +510,6 @@ EXPORT_SYMBOL_GPL(set_cr0);
 
 void lmsw(struct kvm_vcpu *vcpu, unsigned long msw)
 {
-        kvm_arch_ops->decache_cr0_cr4_guest_bits(vcpu);
         set_cr0(vcpu, (vcpu->cr0 & ~0x0ful) | (msw & 0x0f));
 }
 EXPORT_SYMBOL_GPL(lmsw);
@@ -830,7 +845,73 @@ out:
         return r;
 }
 
-struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
+/*
+ * Set a new alias region.  Aliases map a portion of physical memory into
+ * another portion.  This is useful for memory windows, for example the PC
+ * VGA region.
+ */
+static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm,
+                                         struct kvm_memory_alias *alias)
+{
+        int r, n;
+        struct kvm_mem_alias *p;
+
+        r = -EINVAL;
+        /* General sanity checks */
+        if (alias->memory_size & (PAGE_SIZE - 1))
+                goto out;
+        if (alias->guest_phys_addr & (PAGE_SIZE - 1))
+                goto out;
+        if (alias->slot >= KVM_ALIAS_SLOTS)
+                goto out;
+        if (alias->guest_phys_addr + alias->memory_size
+            < alias->guest_phys_addr)
+                goto out;
+        if (alias->target_phys_addr + alias->memory_size
+            < alias->target_phys_addr)
+                goto out;
+
+        spin_lock(&kvm->lock);
+
+        p = &kvm->aliases[alias->slot];
+        p->base_gfn = alias->guest_phys_addr >> PAGE_SHIFT;
+        p->npages = alias->memory_size >> PAGE_SHIFT;
+        p->target_gfn = alias->target_phys_addr >> PAGE_SHIFT;
+
+        for (n = KVM_ALIAS_SLOTS; n > 0; --n)
+                if (kvm->aliases[n - 1].npages)
+                        break;
+        kvm->naliases = n;
+
+        spin_unlock(&kvm->lock);
+
+        vcpu_load(&kvm->vcpus[0]);
+        spin_lock(&kvm->lock);
+        kvm_mmu_zap_all(&kvm->vcpus[0]);
+        spin_unlock(&kvm->lock);
+        vcpu_put(&kvm->vcpus[0]);
+
+        return 0;
+
+out:
+        return r;
+}
+
+static gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
+{
+        int i;
+        struct kvm_mem_alias *alias;
+
+        for (i = 0; i < kvm->naliases; ++i) {
+                alias = &kvm->aliases[i];
+                if (gfn >= alias->base_gfn
+                    && gfn < alias->base_gfn + alias->npages)
+                        return alias->target_gfn + gfn - alias->base_gfn;
+        }
+        return gfn;
+}
+
+static struct kvm_memory_slot *__gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
 {
         int i;
 
@@ -843,7 +924,24 @@ struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
         }
         return NULL;
 }
-EXPORT_SYMBOL_GPL(gfn_to_memslot);
+
+struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
+{
+        gfn = unalias_gfn(kvm, gfn);
+        return __gfn_to_memslot(kvm, gfn);
+}
+
+struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn)
+{
+        struct kvm_memory_slot *slot;
+
+        gfn = unalias_gfn(kvm, gfn);
+        slot = __gfn_to_memslot(kvm, gfn);
+        if (!slot)
+                return NULL;
+        return slot->phys_mem[gfn - slot->base_gfn];
+}
+EXPORT_SYMBOL_GPL(gfn_to_page);
 
 void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
 {
@@ -871,7 +969,7 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
 }
 
 static int emulator_read_std(unsigned long addr,
-                             unsigned long *val,
+                             void *val,
                              unsigned int bytes,
                              struct x86_emulate_ctxt *ctxt)
 {
@@ -883,20 +981,20 @@ static int emulator_read_std(unsigned long addr,
                 unsigned offset = addr & (PAGE_SIZE-1);
                 unsigned tocopy = min(bytes, (unsigned)PAGE_SIZE - offset);
                 unsigned long pfn;
-                struct kvm_memory_slot *memslot;
-                void *page;
+                struct page *page;
+                void *page_virt;
 
                 if (gpa == UNMAPPED_GVA)
                         return X86EMUL_PROPAGATE_FAULT;
                 pfn = gpa >> PAGE_SHIFT;
-                memslot = gfn_to_memslot(vcpu->kvm, pfn);
-                if (!memslot)
+                page = gfn_to_page(vcpu->kvm, pfn);
+                if (!page)
                         return X86EMUL_UNHANDLEABLE;
-                page = kmap_atomic(gfn_to_page(memslot, pfn), KM_USER0);
+                page_virt = kmap_atomic(page, KM_USER0);
 
-                memcpy(data, page + offset, tocopy);
+                memcpy(data, page_virt + offset, tocopy);
 
-                kunmap_atomic(page, KM_USER0);
+                kunmap_atomic(page_virt, KM_USER0);
 
                 bytes -= tocopy;
                 data += tocopy;
@@ -907,7 +1005,7 @@ static int emulator_read_std(unsigned long addr,
 }
 
 static int emulator_write_std(unsigned long addr,
-                              unsigned long val,
+                              const void *val,
                               unsigned int bytes,
                               struct x86_emulate_ctxt *ctxt)
 {
@@ -917,7 +1015,7 @@ static int emulator_write_std(unsigned long addr,
 }
 
 static int emulator_read_emulated(unsigned long addr,
-                                  unsigned long *val,
+                                  void *val,
                                   unsigned int bytes,
                                   struct x86_emulate_ctxt *ctxt)
 {
@@ -945,37 +1043,37 @@ static int emulator_read_emulated(unsigned long addr,
 }
 
 static int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
-                               unsigned long val, int bytes)
+                               const void *val, int bytes)
 {
-        struct kvm_memory_slot *m;
         struct page *page;
         void *virt;
 
         if (((gpa + bytes - 1) >> PAGE_SHIFT) != (gpa >> PAGE_SHIFT))
                 return 0;
-        m = gfn_to_memslot(vcpu->kvm, gpa >> PAGE_SHIFT);
-        if (!m)
+        page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT);
+        if (!page)
                 return 0;
-        page = gfn_to_page(m, gpa >> PAGE_SHIFT);
         kvm_mmu_pre_write(vcpu, gpa, bytes);
         mark_page_dirty(vcpu->kvm, gpa >> PAGE_SHIFT);
         virt = kmap_atomic(page, KM_USER0);
-        memcpy(virt + offset_in_page(gpa), &val, bytes);
+        memcpy(virt + offset_in_page(gpa), val, bytes);
         kunmap_atomic(virt, KM_USER0);
         kvm_mmu_post_write(vcpu, gpa, bytes);
         return 1;
 }
 
 static int emulator_write_emulated(unsigned long addr,
-                                   unsigned long val,
+                                   const void *val,
                                    unsigned int bytes,
                                    struct x86_emulate_ctxt *ctxt)
 {
         struct kvm_vcpu *vcpu = ctxt->vcpu;
         gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, addr);
 
-        if (gpa == UNMAPPED_GVA)
+        if (gpa == UNMAPPED_GVA) {
+                kvm_arch_ops->inject_page_fault(vcpu, addr, 2);
                 return X86EMUL_PROPAGATE_FAULT;
+        }
 
         if (emulator_write_phys(vcpu, gpa, val, bytes))
                 return X86EMUL_CONTINUE;
@@ -984,14 +1082,14 @@ static int emulator_write_emulated(unsigned long addr,
         vcpu->mmio_phys_addr = gpa;
         vcpu->mmio_size = bytes;
         vcpu->mmio_is_write = 1;
-        memcpy(vcpu->mmio_data, &val, bytes);
+        memcpy(vcpu->mmio_data, val, bytes);
 
         return X86EMUL_CONTINUE;
 }
 
 static int emulator_cmpxchg_emulated(unsigned long addr,
-                                     unsigned long old,
-                                     unsigned long new,
+                                     const void *old,
+                                     const void *new,
                                      unsigned int bytes,
                                      struct x86_emulate_ctxt *ctxt)
 {
@@ -1004,30 +1102,6 @@ static int emulator_cmpxchg_emulated(unsigned long addr,
         return emulator_write_emulated(addr, new, bytes, ctxt);
 }
 
-#ifdef CONFIG_X86_32
-
-static int emulator_cmpxchg8b_emulated(unsigned long addr,
-                                       unsigned long old_lo,
-                                       unsigned long old_hi,
-                                       unsigned long new_lo,
-                                       unsigned long new_hi,
-                                       struct x86_emulate_ctxt *ctxt)
-{
-        static int reported;
-        int r;
-
-        if (!reported) {
-                reported = 1;
-                printk(KERN_WARNING "kvm: emulating exchange8b as write\n");
-        }
-        r = emulator_write_emulated(addr, new_lo, 4, ctxt);
-        if (r != X86EMUL_CONTINUE)
-                return r;
-        return emulator_write_emulated(addr+4, new_hi, 4, ctxt);
-}
-
-#endif
-
 static unsigned long get_segment_base(struct kvm_vcpu *vcpu, int seg)
 {
         return kvm_arch_ops->get_segment_base(vcpu, seg);
@@ -1042,7 +1116,6 @@ int emulate_clts(struct kvm_vcpu *vcpu)
 {
         unsigned long cr0;
 
-        kvm_arch_ops->decache_cr0_cr4_guest_bits(vcpu);
         cr0 = vcpu->cr0 & ~CR0_TS_MASK;
         kvm_arch_ops->set_cr0(vcpu, cr0);
         return X86EMUL_CONTINUE;
@@ -1102,9 +1175,6 @@ struct x86_emulate_ops emulate_ops = {
         .read_emulated       = emulator_read_emulated,
         .write_emulated      = emulator_write_emulated,
         .cmpxchg_emulated    = emulator_cmpxchg_emulated,
-#ifdef CONFIG_X86_32
-        .cmpxchg8b_emulated  = emulator_cmpxchg8b_emulated,
-#endif
 };
 
 int emulate_instruction(struct kvm_vcpu *vcpu,
@@ -1116,6 +1186,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
         int r;
         int cs_db, cs_l;
 
+        vcpu->mmio_fault_cr2 = cr2;
         kvm_arch_ops->cache_regs(vcpu);
 
         kvm_arch_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
@@ -1166,8 +1237,10 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
         kvm_arch_ops->decache_regs(vcpu);
         kvm_arch_ops->set_rflags(vcpu, emulate_ctxt.eflags);
 
-        if (vcpu->mmio_is_write)
+        if (vcpu->mmio_is_write) {
+                vcpu->mmio_needed = 0;
                 return EMULATE_DO_MMIO;
+        }
 
         return EMULATE_DONE;
 }
@@ -1177,7 +1250,7 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
         unsigned long nr, a0, a1, a2, a3, a4, a5, ret;
 
-        kvm_arch_ops->decache_regs(vcpu);
+        kvm_arch_ops->cache_regs(vcpu);
         ret = -KVM_EINVAL;
 #ifdef CONFIG_X86_64
         if (is_long_mode(vcpu)) {
@@ -1201,10 +1274,19 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)
         }
         switch (nr) {
         default:
-                ;
+                run->hypercall.args[0] = a0;
+                run->hypercall.args[1] = a1;
+                run->hypercall.args[2] = a2;
+                run->hypercall.args[3] = a3;
+                run->hypercall.args[4] = a4;
+                run->hypercall.args[5] = a5;
+                run->hypercall.ret = ret;
+                run->hypercall.longmode = is_long_mode(vcpu);
+                kvm_arch_ops->decache_regs(vcpu);
+                return 0;
         }
         vcpu->regs[VCPU_REGS_RAX] = ret;
-        kvm_arch_ops->cache_regs(vcpu);
+        kvm_arch_ops->decache_regs(vcpu);
         return 1;
 }
 EXPORT_SYMBOL_GPL(kvm_hypercall);
@@ -1237,7 +1319,7 @@ void realmode_lmsw(struct kvm_vcpu *vcpu, unsigned long msw,
 
 unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr)
 {
-        kvm_arch_ops->decache_cr0_cr4_guest_bits(vcpu);
+        kvm_arch_ops->decache_cr4_guest_bits(vcpu);
         switch (cr) {
         case 0:
                 return vcpu->cr0;
@@ -1442,6 +1524,10 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
                 printk(KERN_WARNING "%s: MSR_IA32_MC0_STATUS 0x%llx, nop\n",
                        __FUNCTION__, data);
                 break;
+        case MSR_IA32_MCG_STATUS:
+                printk(KERN_WARNING "%s: MSR_IA32_MCG_STATUS 0x%llx, nop\n",
+                        __FUNCTION__, data);
+                break;
         case MSR_IA32_UCODE_REV:
         case MSR_IA32_UCODE_WRITE:
         case 0x200 ... 0x2ff: /* MTRRs */
@@ -1478,6 +1564,8 @@ static int set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
 
 void kvm_resched(struct kvm_vcpu *vcpu)
 {
+        if (!need_resched())
+                return;
         vcpu_put(vcpu);
         cond_resched();
         vcpu_load(vcpu);
@@ -1502,29 +1590,250 @@ void save_msrs(struct vmx_msr_entry *e, int n)
 }
 EXPORT_SYMBOL_GPL(save_msrs);
 
+void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)
+{
+        int i;
+        u32 function;
+        struct kvm_cpuid_entry *e, *best;
+
+        kvm_arch_ops->cache_regs(vcpu);
+        function = vcpu->regs[VCPU_REGS_RAX];
+        vcpu->regs[VCPU_REGS_RAX] = 0;
+        vcpu->regs[VCPU_REGS_RBX] = 0;
+        vcpu->regs[VCPU_REGS_RCX] = 0;
+        vcpu->regs[VCPU_REGS_RDX] = 0;
+        best = NULL;
+        for (i = 0; i < vcpu->cpuid_nent; ++i) {
+                e = &vcpu->cpuid_entries[i];
+                if (e->function == function) {
+                        best = e;
+                        break;
+                }
+                /*
+                 * Both basic or both extended?
+                 */
+                if (((e->function ^ function) & 0x80000000) == 0)
+                        if (!best || e->function > best->function)
+                                best = e;
+        }
+        if (best) {
+                vcpu->regs[VCPU_REGS_RAX] = best->eax;
+                vcpu->regs[VCPU_REGS_RBX] = best->ebx;
+                vcpu->regs[VCPU_REGS_RCX] = best->ecx;
+                vcpu->regs[VCPU_REGS_RDX] = best->edx;
+        }
+        kvm_arch_ops->decache_regs(vcpu);
+        kvm_arch_ops->skip_emulated_instruction(vcpu);
+}
+EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);
+
+static int pio_copy_data(struct kvm_vcpu *vcpu)
+{
+        void *p = vcpu->pio_data;
+        void *q;
+        unsigned bytes;
+        int nr_pages = vcpu->pio.guest_pages[1] ? 2 : 1;
+
+        kvm_arch_ops->vcpu_put(vcpu);
+        q = vmap(vcpu->pio.guest_pages, nr_pages, VM_READ|VM_WRITE,
+                 PAGE_KERNEL);
+        if (!q) {
+                kvm_arch_ops->vcpu_load(vcpu);
+                free_pio_guest_pages(vcpu);
+                return -ENOMEM;
+        }
+        q += vcpu->pio.guest_page_offset;
+        bytes = vcpu->pio.size * vcpu->pio.cur_count;
+        if (vcpu->pio.in)
+                memcpy(q, p, bytes);
+        else
+                memcpy(p, q, bytes);
+        q -= vcpu->pio.guest_page_offset;
+        vunmap(q);
+        kvm_arch_ops->vcpu_load(vcpu);
+        free_pio_guest_pages(vcpu);
+        return 0;
+}
+
+static int complete_pio(struct kvm_vcpu *vcpu)
+{
+        struct kvm_pio_request *io = &vcpu->pio;
+        long delta;
+        int r;
+
+        kvm_arch_ops->cache_regs(vcpu);
+
+        if (!io->string) {
+                if (io->in)
+                        memcpy(&vcpu->regs[VCPU_REGS_RAX], vcpu->pio_data,
+                               io->size);
+        } else {
+                if (io->in) {
+                        r = pio_copy_data(vcpu);
+                        if (r) {
+                                kvm_arch_ops->cache_regs(vcpu);
+                                return r;
+                        }
+                }
+
+                delta = 1;
+                if (io->rep) {
+                        delta *= io->cur_count;
+                        /*
+                         * The size of the register should really depend on
+                         * current address size.
+                         */
+                        vcpu->regs[VCPU_REGS_RCX] -= delta;
+                }
+                if (io->down)
+                        delta = -delta;
+                delta *= io->size;
+                if (io->in)
+                        vcpu->regs[VCPU_REGS_RDI] += delta;
+                else
+                        vcpu->regs[VCPU_REGS_RSI] += delta;
+        }
+
+        kvm_arch_ops->decache_regs(vcpu);
+
+        io->count -= io->cur_count;
+        io->cur_count = 0;
+
+        if (!io->count)
+                kvm_arch_ops->skip_emulated_instruction(vcpu);
+        return 0;
+}
+
+int kvm_setup_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,
+                  int size, unsigned long count, int string, int down,
+                  gva_t address, int rep, unsigned port)
+{
+        unsigned now, in_page;
+        int i;
+        int nr_pages = 1;
+        struct page *page;
+
+        vcpu->run->exit_reason = KVM_EXIT_IO;
+        vcpu->run->io.direction = in ? KVM_EXIT_IO_IN : KVM_EXIT_IO_OUT;
+        vcpu->run->io.size = size;
+        vcpu->run->io.data_offset = KVM_PIO_PAGE_OFFSET * PAGE_SIZE;
+        vcpu->run->io.count = count;
+        vcpu->run->io.port = port;
+        vcpu->pio.count = count;
+        vcpu->pio.cur_count = count;
+        vcpu->pio.size = size;
+        vcpu->pio.in = in;
+        vcpu->pio.string = string;
+        vcpu->pio.down = down;
+        vcpu->pio.guest_page_offset = offset_in_page(address);
+        vcpu->pio.rep = rep;
+
+        if (!string) {
+                kvm_arch_ops->cache_regs(vcpu);
+                memcpy(vcpu->pio_data, &vcpu->regs[VCPU_REGS_RAX], 4);
+                kvm_arch_ops->decache_regs(vcpu);
+                return 0;
+        }
+
+        if (!count) {
+                kvm_arch_ops->skip_emulated_instruction(vcpu);
+                return 1;
+        }
+
+        now = min(count, PAGE_SIZE / size);
+
+        if (!down)
+                in_page = PAGE_SIZE - offset_in_page(address);
+        else
+                in_page = offset_in_page(address) + size;
+        now = min(count, (unsigned long)in_page / size);
+        if (!now) {
+                /*
+                 * String I/O straddles page boundary.  Pin two guest pages
+                 * so that we satisfy atomicity constraints.  Do just one
+                 * transaction to avoid complexity.
+                 */
+                nr_pages = 2;
+                now = 1;
+        }
+        if (down) {
+                /*
+                 * String I/O in reverse.  Yuck.  Kill the guest, fix later.
+                 */
+                printk(KERN_ERR "kvm: guest string pio down\n");
+                inject_gp(vcpu);
+                return 1;
+        }
+        vcpu->run->io.count = now;
+        vcpu->pio.cur_count = now;
+
+        for (i = 0; i < nr_pages; ++i) {
+                spin_lock(&vcpu->kvm->lock);
+                page = gva_to_page(vcpu, address + i * PAGE_SIZE);
+                if (page)
+                        get_page(page);
+                vcpu->pio.guest_pages[i] = page;
+                spin_unlock(&vcpu->kvm->lock);
+                if (!page) {
+                        inject_gp(vcpu);
+                        free_pio_guest_pages(vcpu);
+                        return 1;
+                }
+        }
+
+        if (!vcpu->pio.in)
+                return pio_copy_data(vcpu);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(kvm_setup_pio);
+
 static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         int r;
+        sigset_t sigsaved;
 
         vcpu_load(vcpu);
 
+        if (vcpu->sigset_active)
+                sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
+
         /* re-sync apic's tpr */
         vcpu->cr8 = kvm_run->cr8;
 
-        if (kvm_run->emulated) {
-                kvm_arch_ops->skip_emulated_instruction(vcpu);
-                kvm_run->emulated = 0;
+        if (vcpu->pio.cur_count) {
+                r = complete_pio(vcpu);
+                if (r)
+                        goto out;
         }
 
-        if (kvm_run->mmio_completed) {
+        if (vcpu->mmio_needed) {
                 memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);
                 vcpu->mmio_read_completed = 1;
+                vcpu->mmio_needed = 0;
+                r = emulate_instruction(vcpu, kvm_run,
+                                        vcpu->mmio_fault_cr2, 0);
+                if (r == EMULATE_DO_MMIO) {
+                        /*
+                         * Read-modify-write.  Back to userspace.
+                         */
+                        kvm_run->exit_reason = KVM_EXIT_MMIO;
+                        r = 0;
+                        goto out;
+                }
         }
 
-        vcpu->mmio_needed = 0;
+        if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) {
+                kvm_arch_ops->cache_regs(vcpu);
+                vcpu->regs[VCPU_REGS_RAX] = kvm_run->hypercall.ret;
+                kvm_arch_ops->decache_regs(vcpu);
+        }
 
         r = kvm_arch_ops->run(vcpu, kvm_run);
 
+out:
+        if (vcpu->sigset_active)
+                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
+
         vcpu_put(vcpu);
         return r;
 }
@@ -1633,7 +1942,7 @@ static int kvm_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
         sregs->gdt.limit = dt.limit;
         sregs->gdt.base = dt.base;
 
-        kvm_arch_ops->decache_cr0_cr4_guest_bits(vcpu);
+        kvm_arch_ops->decache_cr4_guest_bits(vcpu);
         sregs->cr0 = vcpu->cr0;
         sregs->cr2 = vcpu->cr2;
         sregs->cr3 = vcpu->cr3;
@@ -1665,16 +1974,6 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
 
         vcpu_load(vcpu);
 
-        set_segment(vcpu, &sregs->cs, VCPU_SREG_CS);
-        set_segment(vcpu, &sregs->ds, VCPU_SREG_DS);
-        set_segment(vcpu, &sregs->es, VCPU_SREG_ES);
-        set_segment(vcpu, &sregs->fs, VCPU_SREG_FS);
-        set_segment(vcpu, &sregs->gs, VCPU_SREG_GS);
-        set_segment(vcpu, &sregs->ss, VCPU_SREG_SS);
-
-        set_segment(vcpu, &sregs->tr, VCPU_SREG_TR);
-        set_segment(vcpu, &sregs->ldt, VCPU_SREG_LDTR);
-
         dt.limit = sregs->idt.limit;
         dt.base = sregs->idt.base;
         kvm_arch_ops->set_idt(vcpu, &dt);
@@ -1694,10 +1993,10 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
 #endif
         vcpu->apic_base = sregs->apic_base;
 
-        kvm_arch_ops->decache_cr0_cr4_guest_bits(vcpu);
+        kvm_arch_ops->decache_cr4_guest_bits(vcpu);
 
         mmu_reset_needed |= vcpu->cr0 != sregs->cr0;
-        kvm_arch_ops->set_cr0_no_modeswitch(vcpu, sregs->cr0);
+        kvm_arch_ops->set_cr0(vcpu, sregs->cr0);
 
         mmu_reset_needed |= vcpu->cr4 != sregs->cr4;
         kvm_arch_ops->set_cr4(vcpu, sregs->cr4);
@@ -1714,6 +2013,16 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
                 if (vcpu->irq_pending[i])
                         __set_bit(i, &vcpu->irq_summary);
 
+        set_segment(vcpu, &sregs->cs, VCPU_SREG_CS);
+        set_segment(vcpu, &sregs->ds, VCPU_SREG_DS);
+        set_segment(vcpu, &sregs->es, VCPU_SREG_ES);
+        set_segment(vcpu, &sregs->fs, VCPU_SREG_FS);
+        set_segment(vcpu, &sregs->gs, VCPU_SREG_GS);
+        set_segment(vcpu, &sregs->ss, VCPU_SREG_SS);
+
+        set_segment(vcpu, &sregs->tr, VCPU_SREG_TR);
+        set_segment(vcpu, &sregs->ldt, VCPU_SREG_LDTR);
+
         vcpu_put(vcpu);
 
         return 0;
@@ -1887,6 +2196,36 @@ static int kvm_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
         return r;
 }
 
+static struct page *kvm_vcpu_nopage(struct vm_area_struct *vma,
+                                    unsigned long address,
+                                    int *type)
+{
+        struct kvm_vcpu *vcpu = vma->vm_file->private_data;
+        unsigned long pgoff;
+        struct page *page;
+
+        *type = VM_FAULT_MINOR;
+        pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+        if (pgoff == 0)
+                page = virt_to_page(vcpu->run);
+        else if (pgoff == KVM_PIO_PAGE_OFFSET)
+                page = virt_to_page(vcpu->pio_data);
+        else
+                return NOPAGE_SIGBUS;
+        get_page(page);
+        return page;
+}
+
+static struct vm_operations_struct kvm_vcpu_vm_ops = {
+        .nopage = kvm_vcpu_nopage,
+};
+
+static int kvm_vcpu_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        vma->vm_ops = &kvm_vcpu_vm_ops;
+        return 0;
+}
+
 static int kvm_vcpu_release(struct inode *inode, struct file *filp)
 {
         struct kvm_vcpu *vcpu = filp->private_data;
@@ -1899,6 +2238,7 @@ static struct file_operations kvm_vcpu_fops = {
         .release        = kvm_vcpu_release,
         .unlocked_ioctl = kvm_vcpu_ioctl,
         .compat_ioctl   = kvm_vcpu_ioctl,
+        .mmap           = kvm_vcpu_mmap,
 };
 
 /*
@@ -1947,6 +2287,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
 {
         int r;
         struct kvm_vcpu *vcpu;
+        struct page *page;
 
         r = -EINVAL;
         if (!valid_vcpu(n))
@@ -1961,9 +2302,22 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
                 return -EEXIST;
         }
 
+        page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+        r = -ENOMEM;
+        if (!page)
+                goto out_unlock;
+        vcpu->run = page_address(page);
+
+        page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+        r = -ENOMEM;
+        if (!page)
+                goto out_free_run;
+        vcpu->pio_data = page_address(page);
+
         vcpu->host_fx_image = (char*)ALIGN((hva_t)vcpu->fx_buf,
                                            FX_IMAGE_ALIGN);
         vcpu->guest_fx_image = vcpu->host_fx_image + FX_IMAGE_SIZE;
+        vcpu->cr0 = 0x10;
 
         r = kvm_arch_ops->vcpu_create(vcpu);
         if (r < 0)
@@ -1990,11 +2344,107 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
 
 out_free_vcpus:
         kvm_free_vcpu(vcpu);
+out_free_run:
+        free_page((unsigned long)vcpu->run);
+        vcpu->run = NULL;
+out_unlock:
         mutex_unlock(&vcpu->mutex);
 out:
         return r;
 }
 
+static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
+                                    struct kvm_cpuid *cpuid,
+                                    struct kvm_cpuid_entry __user *entries)
+{
+        int r;
+
+        r = -E2BIG;
+        if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
+                goto out;
+        r = -EFAULT;
+        if (copy_from_user(&vcpu->cpuid_entries, entries,
+                           cpuid->nent * sizeof(struct kvm_cpuid_entry)))
+                goto out;
+        vcpu->cpuid_nent = cpuid->nent;
+        return 0;
+
+out:
+        return r;
+}
+
+static int kvm_vcpu_ioctl_set_sigmask(struct kvm_vcpu *vcpu, sigset_t *sigset)
+{
+        if (sigset) {
+                sigdelsetmask(sigset, sigmask(SIGKILL)|sigmask(SIGSTOP));
+                vcpu->sigset_active = 1;
+                vcpu->sigset = *sigset;
+        } else
+                vcpu->sigset_active = 0;
+        return 0;
+}
+
+/*
+ * fxsave fpu state.  Taken from x86_64/processor.h.  To be killed when
+ * we have asm/x86/processor.h
+ */
+struct fxsave {
+        u16     cwd;
+        u16     swd;
+        u16     twd;
+        u16     fop;
+        u64     rip;
+        u64     rdp;
+        u32     mxcsr;
+        u32     mxcsr_mask;
+        u32     st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
+#ifdef CONFIG_X86_64
+        u32     xmm_space[64];  /* 16*16 bytes for each XMM-reg = 256 bytes */
+#else
+        u32     xmm_space[32];  /* 8*16 bytes for each XMM-reg = 128 bytes */
+#endif
+};
+
+static int kvm_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
+{
+        struct fxsave *fxsave = (struct fxsave *)vcpu->guest_fx_image;
+
+        vcpu_load(vcpu);
+
+        memcpy(fpu->fpr, fxsave->st_space, 128);
+        fpu->fcw = fxsave->cwd;
+        fpu->fsw = fxsave->swd;
+        fpu->ftwx = fxsave->twd;
+        fpu->last_opcode = fxsave->fop;
+        fpu->last_ip = fxsave->rip;
+        fpu->last_dp = fxsave->rdp;
+        memcpy(fpu->xmm, fxsave->xmm_space, sizeof fxsave->xmm_space);
+
+        vcpu_put(vcpu);
+
+        return 0;
+}
+
+static int kvm_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
+{
+        struct fxsave *fxsave = (struct fxsave *)vcpu->guest_fx_image;
+
+        vcpu_load(vcpu);
+
+        memcpy(fxsave->st_space, fpu->fpr, 128);
+        fxsave->cwd = fpu->fcw;
+        fxsave->swd = fpu->fsw;
+        fxsave->twd = fpu->ftwx;
+        fxsave->fop = fpu->last_opcode;
+        fxsave->rip = fpu->last_ip;
+        fxsave->rdp = fpu->last_dp;
+        memcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space);
+
+        vcpu_put(vcpu);
+
+        return 0;
+}
+
 static long kvm_vcpu_ioctl(struct file *filp,
                            unsigned int ioctl, unsigned long arg)
 {
@@ -2003,21 +2453,12 @@ static long kvm_vcpu_ioctl(struct file *filp,
         int r = -EINVAL;
 
         switch (ioctl) {
-        case KVM_RUN: {
-                struct kvm_run kvm_run;
-
-                r = -EFAULT;
-                if (copy_from_user(&kvm_run, argp, sizeof kvm_run))
+        case KVM_RUN:
+                r = -EINVAL;
+                if (arg)
                         goto out;
-                r = kvm_vcpu_ioctl_run(vcpu, &kvm_run);
-                if (r < 0 &&  r != -EINTR)
-                        goto out;
-                if (copy_to_user(argp, &kvm_run, sizeof kvm_run)) {
-                        r = -EFAULT;
-                        goto out;
-                }
+                r = kvm_vcpu_ioctl_run(vcpu, vcpu->run);
                 break;
-        }
         case KVM_GET_REGS: {
                 struct kvm_regs kvm_regs;
 
@@ -2113,6 +2554,66 @@ static long kvm_vcpu_ioctl(struct file *filp,
         case KVM_SET_MSRS:
                 r = msr_io(vcpu, argp, do_set_msr, 0);
                 break;
+        case KVM_SET_CPUID: {
+                struct kvm_cpuid __user *cpuid_arg = argp;
+                struct kvm_cpuid cpuid;
+
+                r = -EFAULT;
+                if (copy_from_user(&cpuid, cpuid_arg, sizeof cpuid))
+                        goto out;
+                r = kvm_vcpu_ioctl_set_cpuid(vcpu, &cpuid, cpuid_arg->entries);
+                if (r)
+                        goto out;
+                break;
+        }
+        case KVM_SET_SIGNAL_MASK: {
+                struct kvm_signal_mask __user *sigmask_arg = argp;
+                struct kvm_signal_mask kvm_sigmask;
+                sigset_t sigset, *p;
+
+                p = NULL;
+                if (argp) {
+                        r = -EFAULT;
+                        if (copy_from_user(&kvm_sigmask, argp,
+                                           sizeof kvm_sigmask))
+                                goto out;
+                        r = -EINVAL;
+                        if (kvm_sigmask.len != sizeof sigset)
+                                goto out;
+                        r = -EFAULT;
+                        if (copy_from_user(&sigset, sigmask_arg->sigset,
+                                           sizeof sigset))
+                                goto out;
+                        p = &sigset;
+                }
+                r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+                break;
+        }
+        case KVM_GET_FPU: {
+                struct kvm_fpu fpu;
+
+                memset(&fpu, 0, sizeof fpu);
+                r = kvm_vcpu_ioctl_get_fpu(vcpu, &fpu);
+                if (r)
+                        goto out;
+                r = -EFAULT;
+                if (copy_to_user(argp, &fpu, sizeof fpu))
+                        goto out;
+                r = 0;
+                break;
+        }
+        case KVM_SET_FPU: {
+                struct kvm_fpu fpu;
+
+                r = -EFAULT;
+                if (copy_from_user(&fpu, argp, sizeof fpu))
+                        goto out;
+                r = kvm_vcpu_ioctl_set_fpu(vcpu, &fpu);
+                if (r)
+                        goto out;
+                r = 0;
+                break;
+        }
         default:
                 ;
         }
@@ -2155,6 +2656,17 @@ static long kvm_vm_ioctl(struct file *filp,
                         goto out;
                 break;
         }
+        case KVM_SET_MEMORY_ALIAS: {
+                struct kvm_memory_alias alias;
+
+                r = -EFAULT;
+                if (copy_from_user(&alias, argp, sizeof alias))
+                        goto out;
+                r = kvm_vm_ioctl_set_memory_alias(kvm, &alias);
+                if (r)
+                        goto out;
+                break;
+        }
         default:
                 ;
         }
@@ -2168,15 +2680,11 @@ static struct page *kvm_vm_nopage(struct vm_area_struct *vma,
 {
         struct kvm *kvm = vma->vm_file->private_data;
         unsigned long pgoff;
-        struct kvm_memory_slot *slot;
         struct page *page;
 
         *type = VM_FAULT_MINOR;
         pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
-        slot = gfn_to_memslot(kvm, pgoff);
-        if (!slot)
-                return NOPAGE_SIGBUS;
-        page = gfn_to_page(slot, pgoff);
+        page = gfn_to_page(kvm, pgoff);
         if (!page)
                 return NOPAGE_SIGBUS;
         get_page(page);
@@ -2248,13 +2756,19 @@ static long kvm_dev_ioctl(struct file *filp,
                           unsigned int ioctl, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
-        int r = -EINVAL;
+        long r = -EINVAL;
 
         switch (ioctl) {
         case KVM_GET_API_VERSION:
+                r = -EINVAL;
+                if (arg)
+                        goto out;
                 r = KVM_API_VERSION;
                 break;
         case KVM_CREATE_VM:
+                r = -EINVAL;
+                if (arg)
+                        goto out;
                 r = kvm_dev_ioctl_create_vm();
                 break;
         case KVM_GET_MSR_INDEX_LIST: {
@@ -2284,6 +2798,18 @@ static long kvm_dev_ioctl(struct file *filp,
                 r = 0;
                 break;
         }
+        case KVM_CHECK_EXTENSION:
+                /*
+                 * No extensions defined at present.
+                 */
+                r = 0;
+                break;
+        case KVM_GET_VCPU_MMAP_SIZE:
+                r = -EINVAL;
+                if (arg)
+                        goto out;
+                r = 2 * PAGE_SIZE;
+                break;
         default:
                 ;
         }
@@ -2299,7 +2825,7 @@ static struct file_operations kvm_chardev_ops = {
 };
 
 static struct miscdevice kvm_dev = {
-        MISC_DYNAMIC_MINOR,
+        KVM_MINOR,
         "kvm",
         &kvm_chardev_ops,
 };
@@ -2385,14 +2911,39 @@ static struct notifier_block kvm_cpu_notifier = {
         .priority = 20, /* must be > scheduler priority */
 };
 
+static u64 stat_get(void *_offset)
+{
+        unsigned offset = (long)_offset;
+        u64 total = 0;
+        struct kvm *kvm;
+        struct kvm_vcpu *vcpu;
+        int i;
+
+        spin_lock(&kvm_lock);
+        list_for_each_entry(kvm, &vm_list, vm_list)
+                for (i = 0; i < KVM_MAX_VCPUS; ++i) {
+                        vcpu = &kvm->vcpus[i];
+                        total += *(u32 *)((void *)vcpu + offset);
+                }
+        spin_unlock(&kvm_lock);
+        return total;
+}
+
+static void stat_set(void *offset, u64 val)
+{
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(stat_fops, stat_get, stat_set, "%llu\n");
+
 static __init void kvm_init_debug(void)
 {
         struct kvm_stats_debugfs_item *p;
 
         debugfs_dir = debugfs_create_dir("kvm", NULL);
         for (p = debugfs_entries; p->name; ++p)
-                p->dentry = debugfs_create_u32(p->name, 0444, debugfs_dir,
-                                               p->data);
+                p->dentry = debugfs_create_file(p->name, 0444, debugfs_dir,
+                                                (void *)(long)p->offset,
+                                                &stat_fops);
 }
 
 static void kvm_exit_debug(void)
@@ -2522,6 +3073,10 @@ static __init int kvm_init(void)
         static struct page *bad_page;
         int r;
 
+        r = kvm_mmu_module_init();
+        if (r)
+                goto out4;
+
         r = register_filesystem(&kvm_fs_type);
         if (r)
                 goto out3;
@@ -2550,6 +3105,8 @@ out:
 out2:
         unregister_filesystem(&kvm_fs_type);
 out3:
+        kvm_mmu_module_exit();
+out4:
         return r;
 }
 
@@ -2559,6 +3116,7 @@ static __exit void kvm_exit(void)
         __free_page(pfn_to_page(bad_page_address >> PAGE_SHIFT));
         mntput(kvmfs_mnt);
         unregister_filesystem(&kvm_fs_type);
+        kvm_mmu_module_exit();
 }
 
 module_init(kvm_init)
diff --git a/drivers/kvm/kvm_svm.h b/drivers/kvm/kvm_svm.h
index 624f1ca48657..a869983d683d 100644
--- a/drivers/kvm/kvm_svm.h
+++ b/drivers/kvm/kvm_svm.h
@@ -9,17 +9,15 @@
 #include "svm.h"
 #include "kvm.h"
 
-static const u32 host_save_msrs[] = {
+static const u32 host_save_user_msrs[] = {
 #ifdef CONFIG_X86_64
         MSR_STAR, MSR_LSTAR, MSR_CSTAR, MSR_SYSCALL_MASK, MSR_KERNEL_GS_BASE,
-        MSR_FS_BASE, MSR_GS_BASE,
+        MSR_FS_BASE,
 #endif
         MSR_IA32_SYSENTER_CS, MSR_IA32_SYSENTER_ESP, MSR_IA32_SYSENTER_EIP,
-        MSR_IA32_DEBUGCTLMSR, /*MSR_IA32_LASTBRANCHFROMIP,
-        MSR_IA32_LASTBRANCHTOIP, MSR_IA32_LASTINTFROMIP,MSR_IA32_LASTINTTOIP,*/
 };
 
-#define NR_HOST_SAVE_MSRS ARRAY_SIZE(host_save_msrs)
+#define NR_HOST_SAVE_USER_MSRS ARRAY_SIZE(host_save_user_msrs)
 #define NUM_DB_REGS 4
 
 struct vcpu_svm {
@@ -28,13 +26,12 @@ struct vcpu_svm {
         struct svm_cpu_data *svm_data;
         uint64_t asid_generation;
 
-        unsigned long cr0;
-        unsigned long cr4;
         unsigned long db_regs[NUM_DB_REGS];
 
         u64 next_rip;
 
-        u64 host_msrs[NR_HOST_SAVE_MSRS];
+        u64 host_user_msrs[NR_HOST_SAVE_USER_MSRS];
+        u64 host_gs_base;
         unsigned long host_cr2;
         unsigned long host_db_regs[NUM_DB_REGS];
         unsigned long host_dr6;
diff --git a/drivers/kvm/kvm_vmx.h b/drivers/kvm/kvm_vmx.h
deleted file mode 100644
index d139f73fb6e1..000000000000
--- a/drivers/kvm/kvm_vmx.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __KVM_VMX_H
-#define __KVM_VMX_H
-
-#ifdef CONFIG_X86_64
-/*
- * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
- * mechanism (cpu bug AA24)
- */
-#define NR_BAD_MSRS 2
-#else
-#define NR_BAD_MSRS 0
-#endif
-
-#endif
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index cab26f301eab..e8e228118de9 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -52,11 +52,15 @@ static void kvm_mmu_audit(struct kvm_vcpu *vcpu, const char *msg) {}
 static int dbg = 1;
 #endif
 
+#ifndef MMU_DEBUG
+#define ASSERT(x) do { } while (0)
+#else
 #define ASSERT(x)                                                       \
         if (!(x)) {                                                     \
                 printk(KERN_WARNING "assertion failed %s:%d: %s\n",     \
                        __FILE__, __LINE__, #x);                         \
         }
+#endif
 
 #define PT64_PT_BITS 9
 #define PT64_ENT_PER_PAGE (1 << PT64_PT_BITS)
@@ -159,6 +163,9 @@ struct kvm_rmap_desc {
         struct kvm_rmap_desc *more;
 };
 
+static struct kmem_cache *pte_chain_cache;
+static struct kmem_cache *rmap_desc_cache;
+
 static int is_write_protection(struct kvm_vcpu *vcpu)
 {
         return vcpu->cr0 & CR0_WP_MASK;
@@ -196,14 +203,15 @@ static int is_rmap_pte(u64 pte)
 }
 
 static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache,
-                                  size_t objsize, int min)
+                                  struct kmem_cache *base_cache, int min,
+                                  gfp_t gfp_flags)
 {
         void *obj;
 
         if (cache->nobjs >= min)
                 return 0;
         while (cache->nobjs < ARRAY_SIZE(cache->objects)) {
-                obj = kzalloc(objsize, GFP_NOWAIT);
+                obj = kmem_cache_zalloc(base_cache, gfp_flags);
                 if (!obj)
                         return -ENOMEM;
                 cache->objects[cache->nobjs++] = obj;
@@ -217,20 +225,35 @@ static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc)
                 kfree(mc->objects[--mc->nobjs]);
 }
 
-static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu)
+static int __mmu_topup_memory_caches(struct kvm_vcpu *vcpu, gfp_t gfp_flags)
 {
         int r;
 
         r = mmu_topup_memory_cache(&vcpu->mmu_pte_chain_cache,
-                                   sizeof(struct kvm_pte_chain), 4);
+                                   pte_chain_cache, 4, gfp_flags);
         if (r)
                 goto out;
         r = mmu_topup_memory_cache(&vcpu->mmu_rmap_desc_cache,
-                                   sizeof(struct kvm_rmap_desc), 1);
+                                   rmap_desc_cache, 1, gfp_flags);
 out:
         return r;
 }
 
+static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu)
+{
+        int r;
+
+        r = __mmu_topup_memory_caches(vcpu, GFP_NOWAIT);
+        if (r < 0) {
+                spin_unlock(&vcpu->kvm->lock);
+                kvm_arch_ops->vcpu_put(vcpu);
+                r = __mmu_topup_memory_caches(vcpu, GFP_KERNEL);
+                kvm_arch_ops->vcpu_load(vcpu);
+                spin_lock(&vcpu->kvm->lock);
+        }
+        return r;
+}
+
 static void mmu_free_memory_caches(struct kvm_vcpu *vcpu)
 {
         mmu_free_memory_cache(&vcpu->mmu_pte_chain_cache);
@@ -390,13 +413,11 @@ static void rmap_write_protect(struct kvm_vcpu *vcpu, u64 gfn)
 {
         struct kvm *kvm = vcpu->kvm;
         struct page *page;
-        struct kvm_memory_slot *slot;
         struct kvm_rmap_desc *desc;
         u64 *spte;
 
-        slot = gfn_to_memslot(kvm, gfn);
-        BUG_ON(!slot);
-        page = gfn_to_page(slot, gfn);
+        page = gfn_to_page(kvm, gfn);
+        BUG_ON(!page);
 
         while (page_private(page)) {
                 if (!(page_private(page) & 1))
@@ -417,6 +438,7 @@ static void rmap_write_protect(struct kvm_vcpu *vcpu, u64 gfn)
         }
 }
 
+#ifdef MMU_DEBUG
 static int is_empty_shadow_page(hpa_t page_hpa)
 {
         u64 *pos;
@@ -431,15 +453,15 @@ static int is_empty_shadow_page(hpa_t page_hpa)
                 }
         return 1;
 }
+#endif
 
 static void kvm_mmu_free_page(struct kvm_vcpu *vcpu, hpa_t page_hpa)
 {
         struct kvm_mmu_page *page_head = page_header(page_hpa);
 
         ASSERT(is_empty_shadow_page(page_hpa));
-        list_del(&page_head->link);
         page_head->page_hpa = page_hpa;
-        list_add(&page_head->link, &vcpu->free_pages);
+        list_move(&page_head->link, &vcpu->free_pages);
         ++vcpu->kvm->n_free_mmu_pages;
 }
 
@@ -457,11 +479,9 @@ static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu,
                 return NULL;
 
         page = list_entry(vcpu->free_pages.next, struct kvm_mmu_page, link);
-        list_del(&page->link);
-        list_add(&page->link, &vcpu->kvm->active_mmu_pages);
+        list_move(&page->link, &vcpu->kvm->active_mmu_pages);
         ASSERT(is_empty_shadow_page(page->page_hpa));
         page->slot_bitmap = 0;
-        page->global = 1;
         page->multimapped = 0;
         page->parent_pte = parent_pte;
         --vcpu->kvm->n_free_mmu_pages;
@@ -569,6 +589,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
                                              gva_t gaddr,
                                              unsigned level,
                                              int metaphysical,
+                                             unsigned hugepage_access,
                                              u64 *parent_pte)
 {
         union kvm_mmu_page_role role;
@@ -582,6 +603,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
         role.glevels = vcpu->mmu.root_level;
         role.level = level;
         role.metaphysical = metaphysical;
+        role.hugepage_access = hugepage_access;
         if (vcpu->mmu.root_level <= PT32_ROOT_LEVEL) {
                 quadrant = gaddr >> (PAGE_SHIFT + (PT64_PT_BITS * level));
                 quadrant &= (1 << ((PT32_PT_BITS - PT64_PT_BITS) * level)) - 1;
@@ -669,10 +691,8 @@ static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu,
         if (!page->root_count) {
                 hlist_del(&page->hash_link);
                 kvm_mmu_free_page(vcpu, page->page_hpa);
-        } else {
-                list_del(&page->link);
-                list_add(&page->link, &vcpu->kvm->active_mmu_pages);
-        }
+        } else
+                list_move(&page->link, &vcpu->kvm->active_mmu_pages);
 }
 
 static int kvm_mmu_unprotect_page(struct kvm_vcpu *vcpu, gfn_t gfn)
@@ -714,14 +734,12 @@ hpa_t safe_gpa_to_hpa(struct kvm_vcpu *vcpu, gpa_t gpa)
 
 hpa_t gpa_to_hpa(struct kvm_vcpu *vcpu, gpa_t gpa)
 {
-        struct kvm_memory_slot *slot;
         struct page *page;
 
         ASSERT((gpa & HPA_ERR_MASK) == 0);
-        slot = gfn_to_memslot(vcpu->kvm, gpa >> PAGE_SHIFT);
-        if (!slot)
+        page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT);
+        if (!page)
                 return gpa | HPA_ERR_MASK;
-        page = gfn_to_page(slot, gpa >> PAGE_SHIFT);
         return ((hpa_t)page_to_pfn(page) << PAGE_SHIFT)
                 | (gpa & (PAGE_SIZE-1));
 }
@@ -735,6 +753,15 @@ hpa_t gva_to_hpa(struct kvm_vcpu *vcpu, gva_t gva)
         return gpa_to_hpa(vcpu, gpa);
 }
 
+struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva)
+{
+        gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, gva);
+
+        if (gpa == UNMAPPED_GVA)
+                return NULL;
+        return pfn_to_page(gpa_to_hpa(vcpu, gpa) >> PAGE_SHIFT);
+}
+
 static void nonpaging_new_cr3(struct kvm_vcpu *vcpu)
 {
 }
@@ -772,7 +799,7 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, hpa_t p)
                                 >> PAGE_SHIFT;
                         new_table = kvm_mmu_get_page(vcpu, pseudo_gfn,
                                                      v, level - 1,
-                                                     1, &table[index]);
+                                                     1, 0, &table[index]);
                         if (!new_table) {
                                 pgprintk("nonpaging_map: ENOMEM\n");
                                 return -ENOMEM;
@@ -804,10 +831,12 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
         for (i = 0; i < 4; ++i) {
                 hpa_t root = vcpu->mmu.pae_root[i];
 
-                ASSERT(VALID_PAGE(root));
-                root &= PT64_BASE_ADDR_MASK;
-                page = page_header(root);
-                --page->root_count;
+                if (root) {
+                        ASSERT(VALID_PAGE(root));
+                        root &= PT64_BASE_ADDR_MASK;
+                        page = page_header(root);
+                        --page->root_count;
+                }
                 vcpu->mmu.pae_root[i] = INVALID_PAGE;
         }
         vcpu->mmu.root_hpa = INVALID_PAGE;
@@ -827,7 +856,7 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
 
                 ASSERT(!VALID_PAGE(root));
                 page = kvm_mmu_get_page(vcpu, root_gfn, 0,
-                                        PT64_ROOT_LEVEL, 0, NULL);
+                                        PT64_ROOT_LEVEL, 0, 0, NULL);
                 root = page->page_hpa;
                 ++page->root_count;
                 vcpu->mmu.root_hpa = root;
@@ -838,13 +867,17 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
                 hpa_t root = vcpu->mmu.pae_root[i];
 
                 ASSERT(!VALID_PAGE(root));
-                if (vcpu->mmu.root_level == PT32E_ROOT_LEVEL)
+                if (vcpu->mmu.root_level == PT32E_ROOT_LEVEL) {
+                        if (!is_present_pte(vcpu->pdptrs[i])) {
+                                vcpu->mmu.pae_root[i] = 0;
+                                continue;
+                        }
                         root_gfn = vcpu->pdptrs[i] >> PAGE_SHIFT;
-                else if (vcpu->mmu.root_level == 0)
+                } else if (vcpu->mmu.root_level == 0)
                         root_gfn = 0;
                 page = kvm_mmu_get_page(vcpu, root_gfn, i << 30,
                                         PT32_ROOT_LEVEL, !is_paging(vcpu),
-                                        NULL);
+                                        0, NULL);
                 root = page->page_hpa;
                 ++page->root_count;
                 vcpu->mmu.pae_root[i] = root | PT_PRESENT_MASK;
@@ -903,7 +936,7 @@ static int nonpaging_init_context(struct kvm_vcpu *vcpu)
 
 static void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu)
 {
-        ++kvm_stat.tlb_flush;
+        ++vcpu->stat.tlb_flush;
         kvm_arch_ops->tlb_flush(vcpu);
 }
 
@@ -918,11 +951,6 @@ static void paging_new_cr3(struct kvm_vcpu *vcpu)
         kvm_arch_ops->set_cr3(vcpu, vcpu->mmu.root_hpa);
 }
 
-static void mark_pagetable_nonglobal(void *shadow_pte)
-{
-        page_header(__pa(shadow_pte))->global = 0;
-}
-
 static inline void set_pte_common(struct kvm_vcpu *vcpu,
                              u64 *shadow_pte,
                              gpa_t gaddr,
@@ -940,9 +968,6 @@ static inline void set_pte_common(struct kvm_vcpu *vcpu,
 
         *shadow_pte |= access_bits;
 
-        if (!(*shadow_pte & PT_GLOBAL_MASK))
-                mark_pagetable_nonglobal(shadow_pte);
-
         if (is_error_hpa(paddr)) {
                 *shadow_pte |= gaddr;
                 *shadow_pte |= PT_SHADOW_IO_MARK;
@@ -1316,6 +1341,51 @@ void kvm_mmu_slot_remove_write_access(struct kvm_vcpu *vcpu, int slot)
         }
 }
 
+void kvm_mmu_zap_all(struct kvm_vcpu *vcpu)
+{
+        destroy_kvm_mmu(vcpu);
+
+        while (!list_empty(&vcpu->kvm->active_mmu_pages)) {
+                struct kvm_mmu_page *page;
+
+                page = container_of(vcpu->kvm->active_mmu_pages.next,
+                                    struct kvm_mmu_page, link);
+                kvm_mmu_zap_page(vcpu, page);
+        }
+
+        mmu_free_memory_caches(vcpu);
+        kvm_arch_ops->tlb_flush(vcpu);
+        init_kvm_mmu(vcpu);
+}
+
+void kvm_mmu_module_exit(void)
+{
+        if (pte_chain_cache)
+                kmem_cache_destroy(pte_chain_cache);
+        if (rmap_desc_cache)
+                kmem_cache_destroy(rmap_desc_cache);
+}
+
+int kvm_mmu_module_init(void)
+{
+        pte_chain_cache = kmem_cache_create("kvm_pte_chain",
+                                            sizeof(struct kvm_pte_chain),
+                                            0, 0, NULL, NULL);
+        if (!pte_chain_cache)
+                goto nomem;
+        rmap_desc_cache = kmem_cache_create("kvm_rmap_desc",
+                                            sizeof(struct kvm_rmap_desc),
+                                            0, 0, NULL, NULL);
+        if (!rmap_desc_cache)
+                goto nomem;
+
+        return 0;
+
+nomem:
+        kvm_mmu_module_exit();
+        return -ENOMEM;
+}
+
 #ifdef AUDIT
 
 static const char *audit_msg;
@@ -1338,7 +1408,7 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte,
         for (i = 0; i < PT64_ENT_PER_PAGE; ++i, va += va_delta) {
                 u64 ent = pt[i];
 
-                if (!ent & PT_PRESENT_MASK)
+                if (!(ent & PT_PRESENT_MASK))
                         continue;
 
                 va = canonicalize(va);
@@ -1360,7 +1430,7 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte,
 
 static void audit_mappings(struct kvm_vcpu *vcpu)
 {
-        int i;
+        unsigned i;
 
         if (vcpu->mmu.root_level == 4)
                 audit_mappings_page(vcpu, vcpu->mmu.root_hpa, 0, 4);
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
index f3bcee904651..73ffbffb1097 100644
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
@@ -148,8 +148,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
                         break;
                 }
 
-                if (walker->level != 3 || is_long_mode(vcpu))
-                        walker->inherited_ar &= walker->table[index];
+                walker->inherited_ar &= walker->table[index];
                 table_gfn = (*ptep & PT_BASE_ADDR_MASK) >> PAGE_SHIFT;
                 paddr = safe_gpa_to_hpa(vcpu, *ptep & PT_BASE_ADDR_MASK);
                 kunmap_atomic(walker->table, KM_USER0);
@@ -248,6 +247,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 u64 shadow_pte;
                 int metaphysical;
                 gfn_t table_gfn;
+                unsigned hugepage_access = 0;
 
                 if (is_present_pte(*shadow_ent) || is_io_pte(*shadow_ent)) {
                         if (level == PT_PAGE_TABLE_LEVEL)
@@ -277,6 +277,9 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 if (level - 1 == PT_PAGE_TABLE_LEVEL
                     && walker->level == PT_DIRECTORY_LEVEL) {
                         metaphysical = 1;
+                        hugepage_access = *guest_ent;
+                        hugepage_access &= PT_USER_MASK | PT_WRITABLE_MASK;
+                        hugepage_access >>= PT_WRITABLE_SHIFT;
                         table_gfn = (*guest_ent & PT_BASE_ADDR_MASK)
                                 >> PAGE_SHIFT;
                 } else {
@@ -284,7 +287,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                         table_gfn = walker->table_gfn[level - 2];
                 }
                 shadow_page = kvm_mmu_get_page(vcpu, table_gfn, addr, level-1,
-                                               metaphysical, shadow_ent);
+                                               metaphysical, hugepage_access,
+                                               shadow_ent);
                 shadow_addr = shadow_page->page_hpa;
                 shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK
                         | PT_WRITABLE_MASK | PT_USER_MASK;
@@ -444,7 +448,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
         if (is_io_pte(*shadow_pte))
                 return 1;
 
-        ++kvm_stat.pf_fixed;
+        ++vcpu->stat.pf_fixed;
         kvm_mmu_audit(vcpu, "post page fault (fixed)");
 
         return write_pt;
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 3d8ea7ac2ecc..9c15f32eea18 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -44,6 +44,10 @@ MODULE_LICENSE("GPL");
 #define KVM_EFER_LMA (1 << 10)
 #define KVM_EFER_LME (1 << 8)
 
+#define SVM_FEATURE_NPT  (1 << 0)
+#define SVM_FEATURE_LBRV (1 << 1)
+#define SVM_DEATURE_SVML (1 << 2)
+
 unsigned long iopm_base;
 unsigned long msrpm_base;
 
@@ -59,15 +63,16 @@ struct kvm_ldttss_desc {
 struct svm_cpu_data {
         int cpu;
 
-        uint64_t asid_generation;
-        uint32_t max_asid;
-        uint32_t next_asid;
+        u64 asid_generation;
+        u32 max_asid;
+        u32 next_asid;
         struct kvm_ldttss_desc *tss_desc;
 
         struct page *save_area;
 };
 
 static DEFINE_PER_CPU(struct svm_cpu_data *, svm_data);
+static uint32_t svm_features;
 
 struct svm_init_data {
         int cpu;
@@ -82,6 +87,11 @@ static u32 msrpm_ranges[] = {0, 0xc0000000, 0xc0010000};
 
 #define MAX_INST_SIZE 15
 
+static inline u32 svm_has(u32 feat)
+{
+        return svm_features & feat;
+}
+
 static unsigned get_addr_size(struct kvm_vcpu *vcpu)
 {
         struct vmcb_save_area *sa = &vcpu->svm->vmcb->save;
@@ -203,13 +213,6 @@ static void inject_ud(struct kvm_vcpu *vcpu)
                                                 UD_VECTOR;
 }
 
-static void inject_db(struct kvm_vcpu *vcpu)
-{
-        vcpu->svm->vmcb->control.event_inj =    SVM_EVTINJ_VALID |
-                                                SVM_EVTINJ_TYPE_EXEPT |
-                                                DB_VECTOR;
-}
-
 static int is_page_fault(uint32_t info)
 {
         info &= SVM_EVTINJ_VEC_MASK | SVM_EVTINJ_TYPE_MASK | SVM_EVTINJ_VALID;
@@ -309,6 +312,7 @@ static void svm_hardware_enable(void *garbage)
         svm_data->asid_generation = 1;
         svm_data->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
         svm_data->next_asid = svm_data->max_asid + 1;
+        svm_features = cpuid_edx(SVM_CPUID_FUNC);
 
         asm volatile ( "sgdt %0" : "=m"(gdt_descr) );
         gdt = (struct desc_struct *)gdt_descr.address;
@@ -459,7 +463,6 @@ static void init_vmcb(struct vmcb *vmcb)
 {
         struct vmcb_control_area *control = &vmcb->control;
         struct vmcb_save_area *save = &vmcb->save;
-        u64 tsc;
 
         control->intercept_cr_read =    INTERCEPT_CR0_MASK |
                                         INTERCEPT_CR3_MASK |
@@ -511,12 +514,13 @@ static void init_vmcb(struct vmcb *vmcb)
                                 (1ULL << INTERCEPT_VMSAVE) |
                                 (1ULL << INTERCEPT_STGI) |
                                 (1ULL << INTERCEPT_CLGI) |
-                                (1ULL << INTERCEPT_SKINIT);
+                                (1ULL << INTERCEPT_SKINIT) |
+                                (1ULL << INTERCEPT_MONITOR) |
+                                (1ULL << INTERCEPT_MWAIT);
 
         control->iopm_base_pa = iopm_base;
         control->msrpm_base_pa = msrpm_base;
-        rdtscll(tsc);
-        control->tsc_offset = -tsc;
+        control->tsc_offset = 0;
         control->int_ctl = V_INTR_MASKING_MASK;
 
         init_seg(&save->es);
@@ -576,12 +580,15 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
         vcpu->svm->vmcb = page_address(page);
         memset(vcpu->svm->vmcb, 0, PAGE_SIZE);
         vcpu->svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT;
-        vcpu->svm->cr0 = 0x00000010;
         vcpu->svm->asid_generation = 0;
         memset(vcpu->svm->db_regs, 0, sizeof(vcpu->svm->db_regs));
         init_vmcb(vcpu->svm->vmcb);
 
         fx_init(vcpu);
+        vcpu->fpu_active = 1;
+        vcpu->apic_base = 0xfee00000 |
+                        /*for vcpu 0*/ MSR_IA32_APICBASE_BSP |
+                        MSR_IA32_APICBASE_ENABLE;
 
         return 0;
 
@@ -602,11 +609,34 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)
 
 static void svm_vcpu_load(struct kvm_vcpu *vcpu)
 {
-        get_cpu();
+        int cpu, i;
+
+        cpu = get_cpu();
+        if (unlikely(cpu != vcpu->cpu)) {
+                u64 tsc_this, delta;
+
+                /*
+                 * Make sure that the guest sees a monotonically
+                 * increasing TSC.
+                 */
+                rdtscll(tsc_this);
+                delta = vcpu->host_tsc - tsc_this;
+                vcpu->svm->vmcb->control.tsc_offset += delta;
+                vcpu->cpu = cpu;
+        }
+
+        for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++)
+                rdmsrl(host_save_user_msrs[i], vcpu->svm->host_user_msrs[i]);
 }
 
 static void svm_vcpu_put(struct kvm_vcpu *vcpu)
 {
+        int i;
+
+        for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++)
+                wrmsrl(host_save_user_msrs[i], vcpu->svm->host_user_msrs[i]);
+
+        rdtscll(vcpu->host_tsc);
         put_cpu();
 }
 
@@ -714,7 +744,7 @@ static void svm_set_gdt(struct kvm_vcpu *vcpu, struct descriptor_table *dt)
         vcpu->svm->vmcb->save.gdtr.base = dt->base ;
 }
 
-static void svm_decache_cr0_cr4_guest_bits(struct kvm_vcpu *vcpu)
+static void svm_decache_cr4_guest_bits(struct kvm_vcpu *vcpu)
 {
 }
 
@@ -733,9 +763,15 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
                 }
         }
 #endif
-        vcpu->svm->cr0 = cr0;
-        vcpu->svm->vmcb->save.cr0 = cr0 | CR0_PG_MASK | CR0_WP_MASK;
+        if ((vcpu->cr0 & CR0_TS_MASK) && !(cr0 & CR0_TS_MASK)) {
+                vcpu->svm->vmcb->control.intercept_exceptions &= ~(1 << NM_VECTOR);
+                vcpu->fpu_active = 1;
+        }
+
         vcpu->cr0 = cr0;
+        cr0 |= CR0_PG_MASK | CR0_WP_MASK;
+        cr0 &= ~(CR0_CD_MASK | CR0_NW_MASK);
+        vcpu->svm->vmcb->save.cr0 = cr0;
 }
 
 static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
@@ -785,18 +821,16 @@ static int svm_guest_debug(struct kvm_vcpu *vcpu, struct kvm_debug_guest *dbg)
 
 static void load_host_msrs(struct kvm_vcpu *vcpu)
 {
-        int i;
-
-        for ( i = 0; i < NR_HOST_SAVE_MSRS; i++)
-                wrmsrl(host_save_msrs[i], vcpu->svm->host_msrs[i]);
+#ifdef CONFIG_X86_64
+        wrmsrl(MSR_GS_BASE, vcpu->svm->host_gs_base);
+#endif
 }
 
 static void save_host_msrs(struct kvm_vcpu *vcpu)
 {
-        int i;
-
-        for ( i = 0; i < NR_HOST_SAVE_MSRS; i++)
-                rdmsrl(host_save_msrs[i], vcpu->svm->host_msrs[i]);
+#ifdef CONFIG_X86_64
+        rdmsrl(MSR_GS_BASE, vcpu->svm->host_gs_base);
+#endif
 }
 
 static void new_asid(struct kvm_vcpu *vcpu, struct svm_cpu_data *svm_data)
@@ -890,7 +924,7 @@ static int pf_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         case EMULATE_DONE:
                 return 1;
         case EMULATE_DO_MMIO:
-                ++kvm_stat.mmio_exits;
+                ++vcpu->stat.mmio_exits;
                 kvm_run->exit_reason = KVM_EXIT_MMIO;
                 return 0;
         case EMULATE_FAIL:
@@ -904,6 +938,16 @@ static int pf_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         return 0;
 }
 
+static int nm_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
+{
+       vcpu->svm->vmcb->control.intercept_exceptions &= ~(1 << NM_VECTOR);
+       if (!(vcpu->cr0 & CR0_TS_MASK))
+               vcpu->svm->vmcb->save.cr0 &= ~CR0_TS_MASK;
+       vcpu->fpu_active = 1;
+
+       return 1;
+}
+
 static int shutdown_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         /*
@@ -981,7 +1025,7 @@ static int io_get_override(struct kvm_vcpu *vcpu,
         return 0;
 }
 
-static unsigned long io_adress(struct kvm_vcpu *vcpu, int ins, u64 *address)
+static unsigned long io_adress(struct kvm_vcpu *vcpu, int ins, gva_t *address)
 {
         unsigned long addr_mask;
         unsigned long *reg;
@@ -1025,38 +1069,38 @@ static unsigned long io_adress(struct kvm_vcpu *vcpu, int ins, u64 *address)
 static int io_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         u32 io_info = vcpu->svm->vmcb->control.exit_info_1; //address size bug?
-        int _in = io_info & SVM_IOIO_TYPE_MASK;
+        int size, down, in, string, rep;
+        unsigned port;
+        unsigned long count;
+        gva_t address = 0;
 
-        ++kvm_stat.io_exits;
+        ++vcpu->stat.io_exits;
 
         vcpu->svm->next_rip = vcpu->svm->vmcb->control.exit_info_2;
 
-        kvm_run->exit_reason = KVM_EXIT_IO;
-        kvm_run->io.port = io_info >> 16;
-        kvm_run->io.direction = (_in) ? KVM_EXIT_IO_IN : KVM_EXIT_IO_OUT;
-        kvm_run->io.size = ((io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT);
-        kvm_run->io.string = (io_info & SVM_IOIO_STR_MASK) != 0;
-        kvm_run->io.rep = (io_info & SVM_IOIO_REP_MASK) != 0;
+        in = (io_info & SVM_IOIO_TYPE_MASK) != 0;
+        port = io_info >> 16;
+        size = (io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT;
+        string = (io_info & SVM_IOIO_STR_MASK) != 0;
+        rep = (io_info & SVM_IOIO_REP_MASK) != 0;
+        count = 1;
+        down = (vcpu->svm->vmcb->save.rflags & X86_EFLAGS_DF) != 0;
 
-        if (kvm_run->io.string) {
+        if (string) {
                 unsigned addr_mask;
 
-                addr_mask = io_adress(vcpu, _in, &kvm_run->io.address);
+                addr_mask = io_adress(vcpu, in, &address);
                 if (!addr_mask) {
                         printk(KERN_DEBUG "%s: get io address failed\n",
                                __FUNCTION__);
                         return 1;
                 }
 
-                if (kvm_run->io.rep) {
-                        kvm_run->io.count
-                                = vcpu->regs[VCPU_REGS_RCX] & addr_mask;
-                        kvm_run->io.string_down = (vcpu->svm->vmcb->save.rflags
-                                                   & X86_EFLAGS_DF) != 0;
-                }
-        } else
-                kvm_run->io.value = vcpu->svm->vmcb->save.rax;
-        return 0;
+                if (rep)
+                        count = vcpu->regs[VCPU_REGS_RCX] & addr_mask;
+        }
+        return kvm_setup_pio(vcpu, kvm_run, in, size, count, string, down,
+                             address, rep, port);
 }
 
 static int nop_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -1072,13 +1116,14 @@ static int halt_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 return 1;
 
         kvm_run->exit_reason = KVM_EXIT_HLT;
-        ++kvm_stat.halt_exits;
+        ++vcpu->stat.halt_exits;
         return 0;
 }
 
 static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-        vcpu->svm->vmcb->save.rip += 3;
+        vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 3;
+        skip_emulated_instruction(vcpu);
         return kvm_hypercall(vcpu, kvm_run);
 }
 
@@ -1098,8 +1143,8 @@ static int task_switch_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_r
 static int cpuid_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 2;
-        kvm_run->exit_reason = KVM_EXIT_CPUID;
-        return 0;
+        kvm_emulate_cpuid(vcpu);
+        return 1;
 }
 
 static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -1239,7 +1284,7 @@ static int interrupt_window_interception(struct kvm_vcpu *vcpu,
          */
         if (kvm_run->request_interrupt_window &&
             !vcpu->irq_summary) {
-                ++kvm_stat.irq_window_exits;
+                ++vcpu->stat.irq_window_exits;
                 kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
                 return 0;
         }
@@ -1267,6 +1312,7 @@ static int (*svm_exit_handlers[])(struct kvm_vcpu *vcpu,
         [SVM_EXIT_WRITE_DR5]                    = emulate_on_interception,
         [SVM_EXIT_WRITE_DR7]                    = emulate_on_interception,
         [SVM_EXIT_EXCP_BASE + PF_VECTOR]        = pf_interception,
+        [SVM_EXIT_EXCP_BASE + NM_VECTOR]        = nm_interception,
         [SVM_EXIT_INTR]                         = nop_on_interception,
         [SVM_EXIT_NMI]                          = nop_on_interception,
         [SVM_EXIT_SMI]                          = nop_on_interception,
@@ -1288,6 +1334,8 @@ static int (*svm_exit_handlers[])(struct kvm_vcpu *vcpu,
         [SVM_EXIT_STGI]                         = invalid_op_interception,
         [SVM_EXIT_CLGI]                         = invalid_op_interception,
         [SVM_EXIT_SKINIT]                       = invalid_op_interception,
+        [SVM_EXIT_MONITOR]                      = invalid_op_interception,
+        [SVM_EXIT_MWAIT]                        = invalid_op_interception,
 };
 
 
@@ -1295,8 +1343,6 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         u32 exit_code = vcpu->svm->vmcb->control.exit_code;
 
-        kvm_run->exit_type = KVM_EXIT_TYPE_VM_EXIT;
-
         if (is_external_interrupt(vcpu->svm->vmcb->control.exit_int_info) &&
             exit_code != SVM_EXIT_EXCP_BASE + PF_VECTOR)
                 printk(KERN_ERR "%s: unexpected exit_ini_info 0x%x "
@@ -1307,12 +1353,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         if (exit_code >= ARRAY_SIZE(svm_exit_handlers)
             || svm_exit_handlers[exit_code] == 0) {
                 kvm_run->exit_reason = KVM_EXIT_UNKNOWN;
-                printk(KERN_ERR "%s: 0x%x @ 0x%llx cr0 0x%lx rflags 0x%llx\n",
-                       __FUNCTION__,
-                       exit_code,
-                       vcpu->svm->vmcb->save.rip,
-                       vcpu->cr0,
-                       vcpu->svm->vmcb->save.rflags);
+                kvm_run->hw.hardware_exit_reason = exit_code;
                 return 0;
         }
 
@@ -1461,8 +1502,10 @@ again:
                 load_db_regs(vcpu->svm->db_regs);
         }
 
-        fx_save(vcpu->host_fx_image);
-        fx_restore(vcpu->guest_fx_image);
+        if (vcpu->fpu_active) {
+                fx_save(vcpu->host_fx_image);
+                fx_restore(vcpu->guest_fx_image);
+        }
 
         asm volatile (
 #ifdef CONFIG_X86_64
@@ -1573,8 +1616,10 @@ again:
 #endif
                 : "cc", "memory" );
 
-        fx_save(vcpu->guest_fx_image);
-        fx_restore(vcpu->host_fx_image);
+        if (vcpu->fpu_active) {
+                fx_save(vcpu->guest_fx_image);
+                fx_restore(vcpu->host_fx_image);
+        }
 
         if ((vcpu->svm->vmcb->save.dr7 & 0xff))
                 load_db_regs(vcpu->svm->host_db_regs);
@@ -1606,8 +1651,9 @@ again:
         vcpu->svm->next_rip = 0;
 
         if (vcpu->svm->vmcb->control.exit_code == SVM_EXIT_ERR) {
-                kvm_run->exit_type = KVM_EXIT_TYPE_FAIL_ENTRY;
-                kvm_run->exit_reason = vcpu->svm->vmcb->control.exit_code;
+                kvm_run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+                kvm_run->fail_entry.hardware_entry_failure_reason
+                        = vcpu->svm->vmcb->control.exit_code;
                 post_kvm_run_save(vcpu, kvm_run);
                 return 0;
         }
@@ -1615,14 +1661,16 @@ again:
         r = handle_exit(vcpu, kvm_run);
         if (r > 0) {
                 if (signal_pending(current)) {
-                        ++kvm_stat.signal_exits;
+                        ++vcpu->stat.signal_exits;
                         post_kvm_run_save(vcpu, kvm_run);
+                        kvm_run->exit_reason = KVM_EXIT_INTR;
                         return -EINTR;
                 }
 
                 if (dm_request_for_irq_injection(vcpu, kvm_run)) {
-                        ++kvm_stat.request_irq_exits;
+                        ++vcpu->stat.request_irq_exits;
                         post_kvm_run_save(vcpu, kvm_run);
+                        kvm_run->exit_reason = KVM_EXIT_INTR;
                         return -EINTR;
                 }
                 kvm_resched(vcpu);
@@ -1641,6 +1689,12 @@ static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root)
 {
         vcpu->svm->vmcb->save.cr3 = root;
         force_new_asid(vcpu);
+
+        if (vcpu->fpu_active) {
+                vcpu->svm->vmcb->control.intercept_exceptions |= (1 << NM_VECTOR);
+                vcpu->svm->vmcb->save.cr0 |= CR0_TS_MASK;
+                vcpu->fpu_active = 0;
+        }
 }
 
 static void svm_inject_page_fault(struct kvm_vcpu *vcpu,
@@ -1649,7 +1703,7 @@ static void svm_inject_page_fault(struct kvm_vcpu *vcpu,
 {
         uint32_t exit_int_info = vcpu->svm->vmcb->control.exit_int_info;
 
-        ++kvm_stat.pf_guest;
+        ++vcpu->stat.pf_guest;
 
         if (is_page_fault(exit_int_info)) {
 
@@ -1709,9 +1763,8 @@ static struct kvm_arch_ops svm_arch_ops = {
         .get_segment = svm_get_segment,
         .set_segment = svm_set_segment,
         .get_cs_db_l_bits = svm_get_cs_db_l_bits,
-        .decache_cr0_cr4_guest_bits = svm_decache_cr0_cr4_guest_bits,
+        .decache_cr4_guest_bits = svm_decache_cr4_guest_bits,
         .set_cr0 = svm_set_cr0,
-        .set_cr0_no_modeswitch = svm_set_cr0,
         .set_cr3 = svm_set_cr3,
         .set_cr4 = svm_set_cr4,
         .set_efer = svm_set_efer,
diff --git a/drivers/kvm/svm.h b/drivers/kvm/svm.h
index df731c3fb588..5e93814400ce 100644
--- a/drivers/kvm/svm.h
+++ b/drivers/kvm/svm.h
@@ -44,6 +44,9 @@ enum {
         INTERCEPT_RDTSCP,
         INTERCEPT_ICEBP,
         INTERCEPT_WBINVD,
+        INTERCEPT_MONITOR,
+        INTERCEPT_MWAIT,
+        INTERCEPT_MWAIT_COND,
 };
 
 
@@ -298,6 +301,9 @@ struct __attribute__ ((__packed__)) vmcb {
 #define SVM_EXIT_RDTSCP         0x087
 #define SVM_EXIT_ICEBP          0x088
 #define SVM_EXIT_WBINVD         0x089
+#define SVM_EXIT_MONITOR        0x08a
+#define SVM_EXIT_MWAIT          0x08b
+#define SVM_EXIT_MWAIT_COND     0x08c
 #define SVM_EXIT_NPF            0x400
 
 #define SVM_EXIT_ERR            -1
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index fbbf9d6b299f..724db0027f00 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -17,7 +17,6 @@
 
 #include "kvm.h"
 #include "vmx.h"
-#include "kvm_vmx.h"
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -70,6 +69,10 @@ static struct kvm_vmx_segment_field {
         VMX_SEGMENT_FIELD(LDTR),
 };
 
+/*
+ * Keep MSR_K6_STAR at the end, as setup_msrs() will try to optimize it
+ * away by decrementing the array size.
+ */
 static const u32 vmx_msr_index[] = {
 #ifdef CONFIG_X86_64
         MSR_SYSCALL_MASK, MSR_LSTAR, MSR_CSTAR, MSR_KERNEL_GS_BASE,
@@ -78,6 +81,19 @@ static const u32 vmx_msr_index[] = {
 };
 #define NR_VMX_MSR ARRAY_SIZE(vmx_msr_index)
 
+#ifdef CONFIG_X86_64
+static unsigned msr_offset_kernel_gs_base;
+#define NR_64BIT_MSRS 4
+/*
+ * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
+ * mechanism (cpu bug AA24)
+ */
+#define NR_BAD_MSRS 2
+#else
+#define NR_64BIT_MSRS 0
+#define NR_BAD_MSRS 0
+#endif
+
 static inline int is_page_fault(u32 intr_info)
 {
         return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
@@ -85,6 +101,13 @@ static inline int is_page_fault(u32 intr_info)
                 (INTR_TYPE_EXCEPTION | PF_VECTOR | INTR_INFO_VALID_MASK);
 }
 
+static inline int is_no_device(u32 intr_info)
+{
+        return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
+                             INTR_INFO_VALID_MASK)) ==
+                (INTR_TYPE_EXCEPTION | NM_VECTOR | INTR_INFO_VALID_MASK);
+}
+
 static inline int is_external_interrupt(u32 intr_info)
 {
         return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
@@ -200,6 +223,16 @@ static void vmcs_write64(unsigned long field, u64 value)
 #endif
 }
 
+static void vmcs_clear_bits(unsigned long field, u32 mask)
+{
+        vmcs_writel(field, vmcs_readl(field) & ~mask);
+}
+
+static void vmcs_set_bits(unsigned long field, u32 mask)
+{
+        vmcs_writel(field, vmcs_readl(field) | mask);
+}
+
 /*
  * Switches to specified vcpu, until a matching vcpu_put(), but assumes
  * vcpu mutex is already taken.
@@ -297,6 +330,44 @@ static void vmx_inject_gp(struct kvm_vcpu *vcpu, unsigned error_code)
 }
 
 /*
+ * Set up the vmcs to automatically save and restore system
+ * msrs.  Don't touch the 64-bit msrs if the guest is in legacy
+ * mode, as fiddling with msrs is very expensive.
+ */
+static void setup_msrs(struct kvm_vcpu *vcpu)
+{
+        int nr_skip, nr_good_msrs;
+
+        if (is_long_mode(vcpu))
+                nr_skip = NR_BAD_MSRS;
+        else
+                nr_skip = NR_64BIT_MSRS;
+        nr_good_msrs = vcpu->nmsrs - nr_skip;
+
+        /*
+         * MSR_K6_STAR is only needed on long mode guests, and only
+         * if efer.sce is enabled.
+         */
+        if (find_msr_entry(vcpu, MSR_K6_STAR)) {
+                --nr_good_msrs;
+#ifdef CONFIG_X86_64
+                if (is_long_mode(vcpu) && (vcpu->shadow_efer & EFER_SCE))
+                        ++nr_good_msrs;
+#endif
+        }
+
+        vmcs_writel(VM_ENTRY_MSR_LOAD_ADDR,
+                    virt_to_phys(vcpu->guest_msrs + nr_skip));
+        vmcs_writel(VM_EXIT_MSR_STORE_ADDR,
+                    virt_to_phys(vcpu->guest_msrs + nr_skip));
+        vmcs_writel(VM_EXIT_MSR_LOAD_ADDR,
+                    virt_to_phys(vcpu->host_msrs + nr_skip));
+        vmcs_write32(VM_EXIT_MSR_STORE_COUNT, nr_good_msrs); /* 22.2.2 */
+        vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, nr_good_msrs);  /* 22.2.2 */
+        vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, nr_good_msrs); /* 22.2.2 */
+}
+
+/*
  * reads and returns guest's timestamp counter "register"
  * guest_tsc = host_tsc + tsc_offset    -- 21.3
  */
@@ -712,6 +783,8 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
 
         vmcs_write32(GUEST_CS_AR_BYTES, 0xf3);
         vmcs_write32(GUEST_CS_LIMIT, 0xffff);
+        if (vmcs_readl(GUEST_CS_BASE) == 0xffff0000)
+                vmcs_writel(GUEST_CS_BASE, 0xf0000);
         vmcs_write16(GUEST_CS_SELECTOR, vmcs_readl(GUEST_CS_BASE) >> 4);
 
         fix_rmode_seg(VCPU_SREG_ES, &vcpu->rmode.es);
@@ -754,11 +827,8 @@ static void exit_lmode(struct kvm_vcpu *vcpu)
 
 #endif
 
-static void vmx_decache_cr0_cr4_guest_bits(struct kvm_vcpu *vcpu)
+static void vmx_decache_cr4_guest_bits(struct kvm_vcpu *vcpu)
 {
-        vcpu->cr0 &= KVM_GUEST_CR0_MASK;
-        vcpu->cr0 |= vmcs_readl(GUEST_CR0) & ~KVM_GUEST_CR0_MASK;
-
         vcpu->cr4 &= KVM_GUEST_CR4_MASK;
         vcpu->cr4 |= vmcs_readl(GUEST_CR4) & ~KVM_GUEST_CR4_MASK;
 }
@@ -780,22 +850,11 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
         }
 #endif
 
-        vmcs_writel(CR0_READ_SHADOW, cr0);
-        vmcs_writel(GUEST_CR0,
-                    (cr0 & ~KVM_GUEST_CR0_MASK) | KVM_VM_CR0_ALWAYS_ON);
-        vcpu->cr0 = cr0;
-}
-
-/*
- * Used when restoring the VM to avoid corrupting segment registers
- */
-static void vmx_set_cr0_no_modeswitch(struct kvm_vcpu *vcpu, unsigned long cr0)
-{
-        if (!vcpu->rmode.active && !(cr0 & CR0_PE_MASK))
-                enter_rmode(vcpu);
+        if (!(cr0 & CR0_TS_MASK)) {
+                vcpu->fpu_active = 1;
+                vmcs_clear_bits(EXCEPTION_BITMAP, CR0_TS_MASK);
+        }
 
-        vcpu->rmode.active = ((cr0 & CR0_PE_MASK) == 0);
-        update_exception_bitmap(vcpu);
         vmcs_writel(CR0_READ_SHADOW, cr0);
         vmcs_writel(GUEST_CR0,
                     (cr0 & ~KVM_GUEST_CR0_MASK) | KVM_VM_CR0_ALWAYS_ON);
@@ -805,6 +864,12 @@ static void vmx_set_cr0_no_modeswitch(struct kvm_vcpu *vcpu, unsigned long cr0)
 static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
 {
         vmcs_writel(GUEST_CR3, cr3);
+
+        if (!(vcpu->cr0 & CR0_TS_MASK)) {
+                vcpu->fpu_active = 0;
+                vmcs_set_bits(GUEST_CR0, CR0_TS_MASK);
+                vmcs_set_bits(EXCEPTION_BITMAP, 1 << NM_VECTOR);
+        }
 }
 
 static void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
@@ -835,6 +900,7 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
 
                 msr->data = efer & ~EFER_LME;
         }
+        setup_msrs(vcpu);
 }
 
 #endif
@@ -878,7 +944,14 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
         vmcs_writel(sf->base, var->base);
         vmcs_write32(sf->limit, var->limit);
         vmcs_write16(sf->selector, var->selector);
-        if (var->unusable)
+        if (vcpu->rmode.active && var->s) {
+                /*
+                 * Hack real-mode segments into vm86 compatibility.
+                 */
+                if (var->base == 0xffff0000 && var->selector == 0xf000)
+                        vmcs_writel(sf->base, 0xf0000);
+                ar = 0xf3;
+        } else if (var->unusable)
                 ar = 1 << 16;
         else {
                 ar = var->type & 15;
@@ -933,9 +1006,9 @@ static int init_rmode_tss(struct kvm* kvm)
         gfn_t fn = rmode_tss_base(kvm) >> PAGE_SHIFT;
         char *page;
 
-        p1 = _gfn_to_page(kvm, fn++);
-        p2 = _gfn_to_page(kvm, fn++);
-        p3 = _gfn_to_page(kvm, fn);
+        p1 = gfn_to_page(kvm, fn++);
+        p2 = gfn_to_page(kvm, fn++);
+        p3 = gfn_to_page(kvm, fn);
 
         if (!p1 || !p2 || !p3) {
                 kvm_printf(kvm,"%s: gfn_to_page failed\n", __FUNCTION__);
@@ -991,7 +1064,6 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
         struct descriptor_table dt;
         int i;
         int ret = 0;
-        int nr_good_msrs;
         extern asmlinkage void kvm_vmx_return(void);
 
         if (!init_rmode_tss(vcpu->kvm)) {
@@ -1136,23 +1208,17 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
                 vcpu->host_msrs[j].reserved = 0;
                 vcpu->host_msrs[j].data = data;
                 vcpu->guest_msrs[j] = vcpu->host_msrs[j];
+#ifdef CONFIG_X86_64
+                if (index == MSR_KERNEL_GS_BASE)
+                        msr_offset_kernel_gs_base = j;
+#endif
                 ++vcpu->nmsrs;
         }
-        printk(KERN_DEBUG "kvm: msrs: %d\n", vcpu->nmsrs);
 
-        nr_good_msrs = vcpu->nmsrs - NR_BAD_MSRS;
-        vmcs_writel(VM_ENTRY_MSR_LOAD_ADDR,
-                    virt_to_phys(vcpu->guest_msrs + NR_BAD_MSRS));
-        vmcs_writel(VM_EXIT_MSR_STORE_ADDR,
-                    virt_to_phys(vcpu->guest_msrs + NR_BAD_MSRS));
-        vmcs_writel(VM_EXIT_MSR_LOAD_ADDR,
-                    virt_to_phys(vcpu->host_msrs + NR_BAD_MSRS));
+        setup_msrs(vcpu);
+
         vmcs_write32_fixedbits(MSR_IA32_VMX_EXIT_CTLS, VM_EXIT_CONTROLS,
                                (HOST_IS_64 << 9));  /* 22.2,1, 20.7.1 */
-        vmcs_write32(VM_EXIT_MSR_STORE_COUNT, nr_good_msrs); /* 22.2.2 */
-        vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, nr_good_msrs);  /* 22.2.2 */
-        vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, nr_good_msrs); /* 22.2.2 */
-
 
         /* 22.2.1, 20.8.1 */
         vmcs_write32_fixedbits(MSR_IA32_VMX_ENTRY_CTLS,
@@ -1164,7 +1230,7 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
         vmcs_writel(TPR_THRESHOLD, 0);
 #endif
 
-        vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK);
+        vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);
         vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);
 
         vcpu->cr0 = 0x60000010;
@@ -1190,7 +1256,7 @@ static void inject_rmode_irq(struct kvm_vcpu *vcpu, int irq)
         u16 sp =  vmcs_readl(GUEST_RSP);
         u32 ss_limit = vmcs_read32(GUEST_SS_LIMIT);
 
-        if (sp > ss_limit || sp - 6 > sp) {
+        if (sp > ss_limit || sp < 6 ) {
                 vcpu_printf(vcpu, "%s: #SS, rsp 0x%lx ss 0x%lx limit 0x%x\n",
                             __FUNCTION__,
                             vmcs_readl(GUEST_RSP),
@@ -1330,6 +1396,15 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 asm ("int $2");
                 return 1;
         }
+
+        if (is_no_device(intr_info)) {
+                vcpu->fpu_active = 1;
+                vmcs_clear_bits(EXCEPTION_BITMAP, 1 << NM_VECTOR);
+                if (!(vcpu->cr0 & CR0_TS_MASK))
+                        vmcs_clear_bits(GUEST_CR0, CR0_TS_MASK);
+                return 1;
+        }
+
         error_code = 0;
         rip = vmcs_readl(GUEST_RIP);
         if (intr_info & INTR_INFO_DELIEVER_CODE_MASK)
@@ -1355,7 +1430,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 case EMULATE_DONE:
                         return 1;
                 case EMULATE_DO_MMIO:
-                        ++kvm_stat.mmio_exits;
+                        ++vcpu->stat.mmio_exits;
                         kvm_run->exit_reason = KVM_EXIT_MMIO;
                         return 0;
                  case EMULATE_FAIL:
@@ -1384,7 +1459,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 static int handle_external_interrupt(struct kvm_vcpu *vcpu,
                                      struct kvm_run *kvm_run)
 {
-        ++kvm_stat.irq_exits;
+        ++vcpu->stat.irq_exits;
         return 1;
 }
 
@@ -1394,7 +1469,7 @@ static int handle_triple_fault(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         return 0;
 }
 
-static int get_io_count(struct kvm_vcpu *vcpu, u64 *count)
+static int get_io_count(struct kvm_vcpu *vcpu, unsigned long *count)
 {
         u64 inst;
         gva_t rip;
@@ -1439,33 +1514,35 @@ static int get_io_count(struct kvm_vcpu *vcpu, u64 *count)
 done:
         countr_size *= 8;
         *count = vcpu->regs[VCPU_REGS_RCX] & (~0ULL >> (64 - countr_size));
+        //printk("cx: %lx\n", vcpu->regs[VCPU_REGS_RCX]);
         return 1;
 }
 
 static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         u64 exit_qualification;
+        int size, down, in, string, rep;
+        unsigned port;
+        unsigned long count;
+        gva_t address;
 
-        ++kvm_stat.io_exits;
+        ++vcpu->stat.io_exits;
         exit_qualification = vmcs_read64(EXIT_QUALIFICATION);
-        kvm_run->exit_reason = KVM_EXIT_IO;
-        if (exit_qualification & 8)
-                kvm_run->io.direction = KVM_EXIT_IO_IN;
-        else
-                kvm_run->io.direction = KVM_EXIT_IO_OUT;
-        kvm_run->io.size = (exit_qualification & 7) + 1;
-        kvm_run->io.string = (exit_qualification & 16) != 0;
-        kvm_run->io.string_down
-                = (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_DF) != 0;
-        kvm_run->io.rep = (exit_qualification & 32) != 0;
-        kvm_run->io.port = exit_qualification >> 16;
-        if (kvm_run->io.string) {
-                if (!get_io_count(vcpu, &kvm_run->io.count))
+        in = (exit_qualification & 8) != 0;
+        size = (exit_qualification & 7) + 1;
+        string = (exit_qualification & 16) != 0;
+        down = (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_DF) != 0;
+        count = 1;
+        rep = (exit_qualification & 32) != 0;
+        port = exit_qualification >> 16;
+        address = 0;
+        if (string) {
+                if (rep && !get_io_count(vcpu, &count))
                         return 1;
-                kvm_run->io.address = vmcs_readl(GUEST_LINEAR_ADDRESS);
-        } else
-                kvm_run->io.value = vcpu->regs[VCPU_REGS_RAX]; /* rax */
-        return 0;
+                address = vmcs_readl(GUEST_LINEAR_ADDRESS);
+        }
+        return kvm_setup_pio(vcpu, kvm_run, in, size, count, string, down,
+                             address, rep, port);
 }
 
 static void
@@ -1514,6 +1591,15 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                         return 1;
                 };
                 break;
+        case 2: /* clts */
+                vcpu_load_rsp_rip(vcpu);
+                vcpu->fpu_active = 1;
+                vmcs_clear_bits(EXCEPTION_BITMAP, 1 << NM_VECTOR);
+                vmcs_clear_bits(GUEST_CR0, CR0_TS_MASK);
+                vcpu->cr0 &= ~CR0_TS_MASK;
+                vmcs_writel(CR0_READ_SHADOW, vcpu->cr0);
+                skip_emulated_instruction(vcpu);
+                return 1;
         case 1: /*mov from cr*/
                 switch (cr) {
                 case 3:
@@ -1523,8 +1609,6 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                         skip_emulated_instruction(vcpu);
                         return 1;
                 case 8:
-                        printk(KERN_DEBUG "handle_cr: read CR8 "
-                               "cpu erratum AA15\n");
                         vcpu_load_rsp_rip(vcpu);
                         vcpu->regs[reg] = vcpu->cr8;
                         vcpu_put_rsp_rip(vcpu);
@@ -1583,8 +1667,8 @@ static int handle_dr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 static int handle_cpuid(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-        kvm_run->exit_reason = KVM_EXIT_CPUID;
-        return 0;
+        kvm_emulate_cpuid(vcpu);
+        return 1;
 }
 
 static int handle_rdmsr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -1639,7 +1723,7 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu,
         if (kvm_run->request_interrupt_window &&
             !vcpu->irq_summary) {
                 kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
-                ++kvm_stat.irq_window_exits;
+                ++vcpu->stat.irq_window_exits;
                 return 0;
         }
         return 1;
@@ -1652,13 +1736,13 @@ static int handle_halt(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 return 1;
 
         kvm_run->exit_reason = KVM_EXIT_HLT;
-        ++kvm_stat.halt_exits;
+        ++vcpu->stat.halt_exits;
         return 0;
 }
 
 static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-        vmcs_writel(GUEST_RIP, vmcs_readl(GUEST_RIP)+3);
+        skip_emulated_instruction(vcpu);
         return kvm_hypercall(vcpu, kvm_run);
 }
 
@@ -1699,7 +1783,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
                                 exit_reason != EXIT_REASON_EXCEPTION_NMI )
                 printk(KERN_WARNING "%s: unexpected, valid vectoring info and "
                        "exit reason is 0x%x\n", __FUNCTION__, exit_reason);
-        kvm_run->instruction_length = vmcs_read32(VM_EXIT_INSTRUCTION_LEN);
         if (exit_reason < kvm_vmx_max_exit_handlers
             && kvm_vmx_exit_handlers[exit_reason])
                 return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run);
@@ -1763,11 +1846,21 @@ again:
         if (vcpu->guest_debug.enabled)
                 kvm_guest_debug_pre(vcpu);
 
-        fx_save(vcpu->host_fx_image);
-        fx_restore(vcpu->guest_fx_image);
+        if (vcpu->fpu_active) {
+                fx_save(vcpu->host_fx_image);
+                fx_restore(vcpu->guest_fx_image);
+        }
+        /*
+         * Loading guest fpu may have cleared host cr0.ts
+         */
+        vmcs_writel(HOST_CR0, read_cr0());
 
-        save_msrs(vcpu->host_msrs, vcpu->nmsrs);
-        load_msrs(vcpu->guest_msrs, NR_BAD_MSRS);
+#ifdef CONFIG_X86_64
+        if (is_long_mode(vcpu)) {
+                save_msrs(vcpu->host_msrs + msr_offset_kernel_gs_base, 1);
+                load_msrs(vcpu->guest_msrs, NR_BAD_MSRS);
+        }
+#endif
 
         asm (
                 /* Store host registers */
@@ -1909,21 +2002,28 @@ again:
 
                 reload_tss();
         }
-        ++kvm_stat.exits;
+        ++vcpu->stat.exits;
 
-        save_msrs(vcpu->guest_msrs, NR_BAD_MSRS);
-        load_msrs(vcpu->host_msrs, NR_BAD_MSRS);
+#ifdef CONFIG_X86_64
+        if (is_long_mode(vcpu)) {
+                save_msrs(vcpu->guest_msrs, NR_BAD_MSRS);
+                load_msrs(vcpu->host_msrs, NR_BAD_MSRS);
+        }
+#endif
+
+        if (vcpu->fpu_active) {
+                fx_save(vcpu->guest_fx_image);
+                fx_restore(vcpu->host_fx_image);
+        }
 
-        fx_save(vcpu->guest_fx_image);
-        fx_restore(vcpu->host_fx_image);
         vcpu->interrupt_window_open = (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & 3) == 0;
 
         asm ("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 
-        kvm_run->exit_type = 0;
         if (fail) {
-                kvm_run->exit_type = KVM_EXIT_TYPE_FAIL_ENTRY;
-                kvm_run->exit_reason = vmcs_read32(VM_INSTRUCTION_ERROR);
+                kvm_run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+                kvm_run->fail_entry.hardware_entry_failure_reason
+                        = vmcs_read32(VM_INSTRUCTION_ERROR);
                 r = 0;
         } else {
                 /*
@@ -1933,19 +2033,20 @@ again:
                         profile_hit(KVM_PROFILING, (void *)vmcs_readl(GUEST_RIP));
 
                 vcpu->launched = 1;
-                kvm_run->exit_type = KVM_EXIT_TYPE_VM_EXIT;
                 r = kvm_handle_exit(kvm_run, vcpu);
                 if (r > 0) {
                         /* Give scheduler a change to reschedule. */
                         if (signal_pending(current)) {
-                                ++kvm_stat.signal_exits;
+                                ++vcpu->stat.signal_exits;
                                 post_kvm_run_save(vcpu, kvm_run);
+                                kvm_run->exit_reason = KVM_EXIT_INTR;
                                 return -EINTR;
                         }
 
                         if (dm_request_for_irq_injection(vcpu, kvm_run)) {
-                                ++kvm_stat.request_irq_exits;
+                                ++vcpu->stat.request_irq_exits;
                                 post_kvm_run_save(vcpu, kvm_run);
+                                kvm_run->exit_reason = KVM_EXIT_INTR;
                                 return -EINTR;
                         }
 
@@ -1969,7 +2070,7 @@ static void vmx_inject_page_fault(struct kvm_vcpu *vcpu,
 {
         u32 vect_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
 
-        ++kvm_stat.pf_guest;
+        ++vcpu->stat.pf_guest;
 
         if (is_page_fault(vect_info)) {
                 printk(KERN_DEBUG "inject_page_fault: "
@@ -2026,6 +2127,7 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)
         vmcs_clear(vmcs);
         vcpu->vmcs = vmcs;
         vcpu->launched = 0;
+        vcpu->fpu_active = 1;
 
         return 0;
 
@@ -2062,9 +2164,8 @@ static struct kvm_arch_ops vmx_arch_ops = {
         .get_segment = vmx_get_segment,
         .set_segment = vmx_set_segment,
         .get_cs_db_l_bits = vmx_get_cs_db_l_bits,
-        .decache_cr0_cr4_guest_bits = vmx_decache_cr0_cr4_guest_bits,
+        .decache_cr4_guest_bits = vmx_decache_cr4_guest_bits,
         .set_cr0 = vmx_set_cr0,
-        .set_cr0_no_modeswitch = vmx_set_cr0_no_modeswitch,
         .set_cr3 = vmx_set_cr3,
         .set_cr4 = vmx_set_cr4,
 #ifdef CONFIG_X86_64
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 7513cddb929f..7ade09086aa5 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -833,8 +833,9 @@ done_prefixes:
                 dst.ptr = (unsigned long *)cr2;
                 dst.bytes = (d & ByteOp) ? 1 : op_bytes;
                 if (d & BitOp) {
-                        dst.ptr += src.val / BITS_PER_LONG;
-                        dst.bytes = sizeof(long);
+                        unsigned long mask = ~(dst.bytes * 8 - 1);
+
+                        dst.ptr = (void *)dst.ptr + (src.val & mask) / 8;
                 }
                 if (!(d & Mov) && /* optimisation - avoid slow emulated read */
                     ((rc = ops->read_emulated((unsigned long)dst.ptr,
@@ -1044,7 +1045,7 @@ done_prefixes:
                         if ((rc = ops->write_std(
                                      register_address(ctxt->ss_base,
                                                       _regs[VCPU_REGS_RSP]),
-                                     dst.val, dst.bytes, ctxt)) != 0)
+                                     &dst.val, dst.bytes, ctxt)) != 0)
                                 goto done;
                         dst.val = dst.orig_val; /* skanky: disable writeback */
                         break;
@@ -1077,12 +1078,12 @@ writeback:
                 case OP_MEM:
                         if (lock_prefix)
                                 rc = ops->cmpxchg_emulated((unsigned long)dst.
-                                                           ptr, dst.orig_val,
-                                                           dst.val, dst.bytes,
+                                                           ptr, &dst.orig_val,
+                                                           &dst.val, dst.bytes,
                                                            ctxt);
                         else
                                 rc = ops->write_emulated((unsigned long)dst.ptr,
-                                                         dst.val, dst.bytes,
+                                                         &dst.val, dst.bytes,
                                                          ctxt);
                         if (rc != 0)
                                 goto done;
@@ -1320,36 +1321,8 @@ twobyte_special_insn:
                 realmode_set_cr(ctxt->vcpu, modrm_reg, modrm_val, &_eflags);
                 break;
         case 0xc7:              /* Grp9 (cmpxchg8b) */
-#if defined(__i386__)
-                {
-                        unsigned long old_lo, old_hi;
-                        if (((rc = ops->read_emulated(cr2 + 0, &old_lo, 4,
-                                                      ctxt)) != 0)
-                            || ((rc = ops->read_emulated(cr2 + 4, &old_hi, 4,
-                                                         ctxt)) != 0))
-                                goto done;
-                        if ((old_lo != _regs[VCPU_REGS_RAX])
-                            || (old_hi != _regs[VCPU_REGS_RDX])) {
-                                _regs[VCPU_REGS_RAX] = old_lo;
-                                _regs[VCPU_REGS_RDX] = old_hi;
-                                _eflags &= ~EFLG_ZF;
-                        } else if (ops->cmpxchg8b_emulated == NULL) {
-                                rc = X86EMUL_UNHANDLEABLE;
-                                goto done;
-                        } else {
-                                if ((rc = ops->cmpxchg8b_emulated(cr2, old_lo,
-                                                          old_hi,
-                                                          _regs[VCPU_REGS_RBX],
-                                                          _regs[VCPU_REGS_RCX],
-                                                          ctxt)) != 0)
-                                        goto done;
-                                _eflags |= EFLG_ZF;
-                        }
-                        break;
-                }
-#elif defined(CONFIG_X86_64)
                 {
-                        unsigned long old, new;
+                        u64 old, new;
                         if ((rc = ops->read_emulated(cr2, &old, 8, ctxt)) != 0)
                                 goto done;
                         if (((u32) (old >> 0) != (u32) _regs[VCPU_REGS_RAX]) ||
@@ -1358,15 +1331,15 @@ twobyte_special_insn:
                                 _regs[VCPU_REGS_RDX] = (u32) (old >> 32);
                                 _eflags &= ~EFLG_ZF;
                         } else {
-                                new = (_regs[VCPU_REGS_RCX] << 32) | (u32) _regs[VCPU_REGS_RBX];
-                                if ((rc = ops->cmpxchg_emulated(cr2, old,
-                                                          new, 8, ctxt)) != 0)
+                                new = ((u64)_regs[VCPU_REGS_RCX] << 32)
+                                        | (u32) _regs[VCPU_REGS_RBX];
+                                if ((rc = ops->cmpxchg_emulated(cr2, &old,
+                                                          &new, 8, ctxt)) != 0)
                                         goto done;
                                 _eflags |= EFLG_ZF;
                         }
                         break;
                 }
-#endif
         }
         goto writeback;
 
diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h
index 5d41bd55125e..ea3407d7feee 100644
--- a/drivers/kvm/x86_emulate.h
+++ b/drivers/kvm/x86_emulate.h
@@ -59,8 +59,7 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_std)(unsigned long addr,
-                        unsigned long *val,
+        int (*read_std)(unsigned long addr, void *val,
                         unsigned int bytes, struct x86_emulate_ctxt * ctxt);
 
         /*
@@ -71,8 +70,7 @@ struct x86_emulate_ops {
          *                required).
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_std)(unsigned long addr,
-                         unsigned long val,
+        int (*write_std)(unsigned long addr, const void *val,
                          unsigned int bytes, struct x86_emulate_ctxt * ctxt);
 
         /*
@@ -82,7 +80,7 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
         int (*read_emulated) (unsigned long addr,
-                              unsigned long *val,
+                              void *val,
                               unsigned int bytes,
                               struct x86_emulate_ctxt * ctxt);
 
@@ -94,7 +92,7 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
         int (*write_emulated) (unsigned long addr,
-                               unsigned long val,
+                               const void *val,
                                unsigned int bytes,
                                struct x86_emulate_ctxt * ctxt);
 
@@ -107,29 +105,11 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to access using CMPXCHG.
          */
         int (*cmpxchg_emulated) (unsigned long addr,
-                                 unsigned long old,
-                                 unsigned long new,
+                                 const void *old,
+                                 const void *new,
                                  unsigned int bytes,
                                  struct x86_emulate_ctxt * ctxt);
 
-        /*
-         * cmpxchg8b_emulated: Emulate an atomic (LOCKed) CMPXCHG8B operation on an
-         *                     emulated/special memory area.
-         *  @addr:  [IN ] Linear address to access.
-         *  @old:   [IN ] Value expected to be current at @addr.
-         *  @new:   [IN ] Value to write to @addr.
-         * NOTES:
-         *  1. This function is only ever called when emulating a real CMPXCHG8B.
-         *  2. This function is *never* called on x86/64 systems.
-         *  2. Not defining this function (i.e., specifying NULL) is equivalent
-         *     to defining a function that always returns X86EMUL_UNHANDLEABLE.
-         */
-        int (*cmpxchg8b_emulated) (unsigned long addr,
-                                   unsigned long old_lo,
-                                   unsigned long old_hi,
-                                   unsigned long new_lo,
-                                   unsigned long new_hi,
-                                   struct x86_emulate_ctxt * ctxt);
 };
 
 struct cpu_user_regs;
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 35233de460ad..3d0354e96a97 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -459,7 +459,8 @@ therm_of_probe( struct of_device *dev, const struct of_device_id *match )
 static int
 therm_of_remove( struct of_device *dev )
 {
-        return i2c_del_driver( &g4fan_driver );
+        i2c_del_driver( &g4fan_driver );
+        return 0;
 }
 
 static struct of_device_id therm_of_match[] = {{
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index 76d21775fc35..741a93a3eb61 100644
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -82,6 +82,7 @@ static unsigned char cuda_rbuf[16];
 static unsigned char *reply_ptr;
 static int reading_reply;
 static int data_index;
+static int cuda_irq;
 #ifdef CONFIG_PPC
 static struct device_node *vias;
 #endif
@@ -160,10 +161,8 @@ int __init find_via_cuda(void)
     /* Clear and enable interrupts, but only on PPC. On 68K it's done  */
     /* for us by the main VIA driver in arch/m68k/mac/via.c        */
 
-#ifndef CONFIG_MAC
     out_8(&via[IFR], 0x7f);     /* clear interrupts by writing 1s */
     out_8(&via[IER], IER_SET|SR_INT); /* enable interrupt from SR */
-#endif
 
     /* enable autopoll */
     cuda_request(&req, NULL, 3, CUDA_PACKET, CUDA_AUTOPOLL, 1);
@@ -181,24 +180,22 @@ int __init find_via_cuda(void)
 
 static int __init via_cuda_start(void)
 {
-    unsigned int irq;
-
     if (via == NULL)
         return -ENODEV;
 
 #ifdef CONFIG_MAC
-    irq = IRQ_MAC_ADB;
+    cuda_irq = IRQ_MAC_ADB;
 #else /* CONFIG_MAC */
-    irq = irq_of_parse_and_map(vias, 0);
-    if (irq == NO_IRQ) {
+    cuda_irq = irq_of_parse_and_map(vias, 0);
+    if (cuda_irq == NO_IRQ) {
         printk(KERN_ERR "via-cuda: can't map interrupts for %s\n",
                vias->full_name);
         return -ENODEV;
     }
-#endif /* CONFIG_MAP */
+#endif /* CONFIG_MAC */
 
-    if (request_irq(irq, cuda_interrupt, 0, "ADB", cuda_interrupt)) {
-        printk(KERN_ERR "via-cuda: can't request irq %d\n", irq);
+    if (request_irq(cuda_irq, cuda_interrupt, 0, "ADB", cuda_interrupt)) {
+        printk(KERN_ERR "via-cuda: can't request irq %d\n", cuda_irq);
         return -EAGAIN;
     }
 
@@ -238,6 +235,7 @@ cuda_init(void)
         printk(KERN_ERR "cuda_init_via() failed\n");
         return -ENODEV;
     }
+    out_8(&via[IER], IER_SET|SR_INT); /* enable interrupt from SR */
 
     return via_cuda_start();
 #endif
@@ -263,15 +261,17 @@ cuda_init_via(void)
     out_8(&via[B], in_8(&via[B]) | TACK | TIP);                 /* negate them */
     out_8(&via[ACR] ,(in_8(&via[ACR]) & ~SR_CTRL) | SR_EXT);    /* SR data in */
     (void)in_8(&via[SR]);                                               /* clear any left-over data */
-#ifndef CONFIG_MAC
+#ifdef CONFIG_PPC
     out_8(&via[IER], 0x7f);                                     /* disable interrupts from VIA */
     (void)in_8(&via[IER]);
+#else
+    out_8(&via[IER], SR_INT);                                   /* disable SR interrupt from VIA */
 #endif
 
     /* delay 4ms and then clear any pending interrupt */
     mdelay(4);
     (void)in_8(&via[SR]);
-    out_8(&via[IFR], in_8(&via[IFR]) & 0x7f);
+    out_8(&via[IFR], SR_INT);
 
     /* sync with the CUDA - assert TACK without TIP */
     out_8(&via[B], in_8(&via[B]) & ~TACK);
@@ -282,7 +282,7 @@ cuda_init_via(void)
     /* wait for the interrupt and then clear it */
     WAIT_FOR(in_8(&via[IFR]) & SR_INT, "CUDA response to sync (2)");
     (void)in_8(&via[SR]);
-    out_8(&via[IFR], in_8(&via[IFR]) & 0x7f);
+    out_8(&via[IFR], SR_INT);
 
     /* finish the sync by negating TACK */
     out_8(&via[B], in_8(&via[B]) | TACK);
@@ -291,7 +291,7 @@ cuda_init_via(void)
     WAIT_FOR(in_8(&via[B]) & TREQ, "CUDA response to sync (3)");
     WAIT_FOR(in_8(&via[IFR]) & SR_INT, "CUDA response to sync (4)");
     (void)in_8(&via[SR]);
-    out_8(&via[IFR], in_8(&via[IFR]) & 0x7f);
+    out_8(&via[IFR], SR_INT);
     out_8(&via[B], in_8(&via[B]) | TIP);        /* should be unnecessary */
 
     return 0;
@@ -428,16 +428,12 @@ cuda_start(void)
 void
 cuda_poll(void)
 {
-    unsigned long flags;
-
     /* cuda_interrupt only takes a normal lock, we disable
      * interrupts here to avoid re-entering and thus deadlocking.
-     * An option would be to disable only the IRQ source with
-     * disable_irq(), would that work on m68k ? --BenH
      */
-    local_irq_save(flags);
+    disable_irq(cuda_irq);
     cuda_interrupt(0, NULL);
-    local_irq_restore(flags);
+    enable_irq(cuda_irq);
 }
 
 static irqreturn_t
@@ -448,15 +444,25 @@ cuda_interrupt(int irq, void *arg)
     unsigned char ibuf[16];
     int ibuf_len = 0;
     int complete = 0;
-    unsigned char virq;
     
     spin_lock(&cuda_lock);
 
-    virq = in_8(&via[IFR]) & 0x7f;
-    out_8(&via[IFR], virq);   
-    if ((virq & SR_INT) == 0) {
-        spin_unlock(&cuda_lock);
-        return IRQ_NONE;
+    /* On powermacs, this handler is registered for the VIA IRQ. But it uses
+     * just the shift register IRQ -- other VIA interrupt sources are disabled.
+     * On m68k macs, the VIA IRQ sources are dispatched individually. Unless
+     * we are polling, the shift register IRQ flag has already been cleared.
+     */
+
+#ifdef CONFIG_MAC
+    if (!arg)
+#endif
+    {
+        if ((in_8(&via[IFR]) & SR_INT) == 0) {
+            spin_unlock(&cuda_lock);
+            return IRQ_NONE;
+        } else {
+            out_8(&via[IFR], SR_INT);
+        }
     }
     
     status = (~in_8(&via[B]) & (TIP|TREQ)) | (in_8(&via[ACR]) & SR_OUT);
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 1b3bad62a1be..01b8eca7ccd5 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -12,6 +12,15 @@
  * 1999-08-02 (jmt) - Initial rewrite for Unified ADB.
  * 2000-03-29 Tony Mantler <tonym@mac.linux-m68k.org>
  *                              - Big overhaul, should actually work now.
+ * 2006-12-31 Finn Thain <fthain@telegraphics.com.au> - Another overhaul.
+ *
+ * Suggested reading:
+ *   Inside Macintosh, ch. 5 ADB Manager
+ *   Guide to the Macinstosh Family Hardware, ch. 8 Apple Desktop Bus
+ *   Rockwell R6522 VIA datasheet
+ *
+ * Apple's "ADB Analyzer" bus sniffer is invaluable:
+ *   ftp://ftp.apple.com/developer/Tool_Chest/Devices_-_Hardware/Apple_Desktop_Bus/
  */
  
 #include <stdarg.h>
@@ -26,7 +35,6 @@
 #include <asm/macints.h>
 #include <asm/machw.h>
 #include <asm/mac_via.h>
-#include <asm/io.h>
 #include <asm/system.h>
 
 static volatile unsigned char *via;
@@ -51,9 +59,7 @@ static volatile unsigned char *via;
 #define ANH             (15*RS)         /* A-side data, no handshake */
 
 /* Bits in B data register: all active low */
-#define TREQ            0x08            /* Transfer request (input) */
-#define TACK            0x10            /* Transfer acknowledge (output) */
-#define TIP             0x20            /* Transfer in progress (output) */
+#define CTLR_IRQ        0x08            /* Controller rcv status (input) */
 #define ST_MASK         0x30            /* mask for selecting ADB state bits */
 
 /* Bits in ACR */
@@ -65,8 +71,6 @@ static volatile unsigned char *via;
 #define IER_SET         0x80            /* set bits in IER */
 #define IER_CLR         0               /* clear bits in IER */
 #define SR_INT          0x04            /* Shift register full/empty */
-#define SR_DATA         0x08            /* Shift register data */
-#define SR_CLOCK        0x10            /* Shift register clock */
 
 /* ADB transaction states according to GMHW */
 #define ST_CMD          0x00            /* ADB state: command byte */
@@ -77,7 +81,6 @@ static volatile unsigned char *via;
 static int  macii_init_via(void);
 static void macii_start(void);
 static irqreturn_t macii_interrupt(int irq, void *arg);
-static void macii_retransmit(int);
 static void macii_queue_poll(void);
 
 static int macii_probe(void);
@@ -103,29 +106,37 @@ static enum macii_state {
         sending,
         reading,
         read_done,
-        awaiting_reply
 } macii_state;
 
-static int need_poll;
-static int command_byte;
-static int last_reply;
-static int last_active;
-
-static struct adb_request *current_req;
-static struct adb_request *last_req;
-static struct adb_request *retry_req;
-static unsigned char reply_buf[16];
-static unsigned char *reply_ptr;
-static int reply_len;
-static int reading_reply;
-static int data_index;
-static int first_byte;
-static int prefix_len;
-static int status = ST_IDLE|TREQ;
-static int last_status;
-static int driver_running;
-
-/* debug level 10 required for ADB logging (should be && debug_adb, ideally) */
+static struct adb_request *current_req; /* first request struct in the queue */
+static struct adb_request *last_req;     /* last request struct in the queue */
+static unsigned char reply_buf[16];        /* storage for autopolled replies */
+static unsigned char *reply_ptr;      /* next byte in req->data or reply_buf */
+static int reading_reply;        /* store reply in reply_buf else req->reply */
+static int data_index;      /* index of the next byte to send from req->data */
+static int reply_len; /* number of bytes received in reply_buf or req->reply */
+static int status;          /* VIA's ADB status bits captured upon interrupt */
+static int last_status;              /* status bits as at previous interrupt */
+static int srq_asserted;     /* have to poll for the device that asserted it */
+static int command_byte;         /* the most recent command byte transmitted */
+static int autopoll_devs;      /* bits set are device addresses to be polled */
+
+/* Sanity check for request queue. Doesn't check for cycles. */
+static int request_is_queued(struct adb_request *req) {
+        struct adb_request *cur;
+        unsigned long flags;
+        local_irq_save(flags);
+        cur = current_req;
+        while (cur) {
+                if (cur == req) {
+                        local_irq_restore(flags);
+                        return 1;
+                }
+                cur = cur->next;
+        }
+        local_irq_restore(flags);
+        return 0;
+}
 
 /* Check for MacII style ADB */
 static int macii_probe(void)
@@ -147,15 +158,16 @@ int macii_init(void)
         local_irq_save(flags);
         
         err = macii_init_via();
-        if (err) return err;
+        if (err) goto out;
 
         err = request_irq(IRQ_MAC_ADB, macii_interrupt, IRQ_FLG_LOCK, "ADB",
                           macii_interrupt);
-        if (err) return err;
+        if (err) goto out;
 
         macii_state = idle;
+out:
         local_irq_restore(flags);
-        return 0;
+        return err;
 }
 
 /* initialize the hardware */   
@@ -163,12 +175,12 @@ static int macii_init_via(void)
 {
         unsigned char x;
 
-        /* Set the lines up. We want TREQ as input TACK|TIP as output */
-        via[DIRB] = (via[DIRB] | TACK | TIP) & ~TREQ;
+        /* We want CTLR_IRQ as input and ST_EVEN | ST_ODD as output lines. */
+        via[DIRB] = (via[DIRB] | ST_EVEN | ST_ODD) & ~CTLR_IRQ;
 
         /* Set up state: idle */
         via[B] |= ST_IDLE;
-        last_status = via[B] & (ST_MASK|TREQ);
+        last_status = via[B] & (ST_MASK|CTLR_IRQ);
 
         /* Shift register on input */
         via[ACR] = (via[ACR] & ~SR_CTRL) | SR_EXT;
@@ -179,81 +191,72 @@ static int macii_init_via(void)
         return 0;
 }
 
-/* Send an ADB poll (Talk Register 0 command, tagged on the front of the request queue) */
+/* Send an ADB poll (Talk Register 0 command prepended to the request queue) */
 static void macii_queue_poll(void)
 {
-        static int device = 0;
-        static int in_poll=0;
+        /* No point polling the active device as it will never assert SRQ, so
+         * poll the next device in the autopoll list. This could leave us
+         * stuck in a polling loop if an unprobed device is asserting SRQ.
+         * In theory, that could only happen if a device was plugged in after
+         * probing started. Unplugging it again will break the cycle.
+         * (Simply polling the next higher device often ends up polling almost
+         * every device (after wrapping around), which takes too long.)
+         */
+        int device_mask;
+        int next_device;
         static struct adb_request req;
-        unsigned long flags;
-        
-        if (in_poll) printk("macii_queue_poll: double poll!\n");
-
-        in_poll++;
-        if (++device > 15) device = 1;
-
-        adb_request(&req, NULL, ADBREQ_REPLY|ADBREQ_NOSEND, 1,
-                    ADB_READREG(device, 0));
-
-        local_irq_save(flags);
-
-        req.next = current_req;
-        current_req = &req;
 
-        local_irq_restore(flags);
-        macii_start();
-        in_poll--;
-}
+        if (!autopoll_devs) return;
 
-/* Send an ADB retransmit (Talk, appended to the request queue) */
-static void macii_retransmit(int device)
-{
-        static int in_retransmit = 0;
-        static struct adb_request rt;
-        unsigned long flags;
-        
-        if (in_retransmit) printk("macii_retransmit: double retransmit!\n");
+        device_mask = (1 << (((command_byte & 0xF0) >> 4) + 1)) - 1;
+        if (autopoll_devs & ~device_mask)
+                next_device = ffs(autopoll_devs & ~device_mask) - 1;
+        else
+                next_device = ffs(autopoll_devs) - 1;
 
-        in_retransmit++;
+        BUG_ON(request_is_queued(&req));
 
-        adb_request(&rt, NULL, ADBREQ_REPLY|ADBREQ_NOSEND, 1,
-                    ADB_READREG(device, 0));
+        adb_request(&req, NULL, ADBREQ_NOSEND, 1,
+                    ADB_READREG(next_device, 0));
 
-        local_irq_save(flags);
+        req.sent = 0;
+        req.complete = 0;
+        req.reply_len = 0;
+        req.next = current_req;
 
         if (current_req != NULL) {
-                last_req->next = &rt;
-                last_req = &rt;
+                current_req = &req;
         } else {
-                current_req = &rt;
-                last_req = &rt;
+                current_req = &req;
+                last_req = &req;
         }
-
-        if (macii_state == idle) macii_start();
-
-        local_irq_restore(flags);
-        in_retransmit--;
 }
 
 /* Send an ADB request; if sync, poll out the reply 'till it's done */
 static int macii_send_request(struct adb_request *req, int sync)
 {
-        int i;
+        int err;
+        unsigned long flags;
 
-        i = macii_write(req);
-        if (i) return i;
+        BUG_ON(request_is_queued(req));
 
-        if (sync) {
-                while (!req->complete) macii_poll();
+        local_irq_save(flags);
+        err = macii_write(req);
+        local_irq_restore(flags);
+
+        if (!err && sync) {
+                while (!req->complete) {
+                        macii_poll();
+                }
+                BUG_ON(request_is_queued(req));
         }
-        return 0;
+
+        return err;
 }
 
-/* Send an ADB request */
+/* Send an ADB request (append to request queue) */
 static int macii_write(struct adb_request *req)
 {
-        unsigned long flags;
-
         if (req->nbytes < 2 || req->data[0] != ADB_PACKET || req->nbytes > 15) {
                 req->complete = 1;
                 return -EINVAL;
@@ -264,8 +267,6 @@ static int macii_write(struct adb_request *req)
         req->complete = 0;
         req->reply_len = 0;
 
-        local_irq_save(flags);
-
         if (current_req != NULL) {
                 last_req->next = req;
                 last_req = req;
@@ -274,28 +275,52 @@ static int macii_write(struct adb_request *req)
                 last_req = req;
                 if (macii_state == idle) macii_start();
         }
-
-        local_irq_restore(flags);
         return 0;
 }
 
 /* Start auto-polling */
 static int macii_autopoll(int devs)
 {
-        /* Just ping a random default address */
-        if (!(current_req || retry_req))
-                macii_retransmit( (last_active < 16 && last_active > 0) ? last_active : 3);
-        return 0;
+        static struct adb_request req;
+        unsigned long flags;
+        int err = 0;
+
+        /* bit 1 == device 1, and so on. */
+        autopoll_devs = devs & 0xFFFE;
+
+        if (!autopoll_devs) return 0;
+
+        local_irq_save(flags);
+
+        if (current_req == NULL) {
+                /* Send a Talk Reg 0. The controller will repeatedly transmit
+                 * this as long as it is idle.
+                 */
+                adb_request(&req, NULL, ADBREQ_NOSEND, 1,
+                            ADB_READREG(ffs(autopoll_devs) - 1, 0));
+                err = macii_write(&req);
+        }
+
+        local_irq_restore(flags);
+        return err;
+}
+
+static inline int need_autopoll(void) {
+        /* Was the last command Talk Reg 0
+         * and is the target on the autopoll list?
+         */
+        if ((command_byte & 0x0F) == 0x0C &&
+            ((1 << ((command_byte & 0xF0) >> 4)) & autopoll_devs))
+                return 0;
+        return 1;
 }
 
 /* Prod the chip without interrupts */
 static void macii_poll(void)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (via[IFR] & SR_INT) macii_interrupt(0, NULL);
-        local_irq_restore(flags);
+        disable_irq(IRQ_MAC_ADB);
+        macii_interrupt(0, NULL);
+        enable_irq(IRQ_MAC_ADB);
 }
 
 /* Reset the bus */
@@ -303,73 +328,34 @@ static int macii_reset_bus(void)
 {
         static struct adb_request req;
         
+        if (request_is_queued(&req))
+                return 0;
+
         /* Command = 0, Address = ignored */
         adb_request(&req, NULL, 0, 1, ADB_BUSRESET);
 
+        /* Don't want any more requests during the Global Reset low time. */
+        udelay(3000);
+
         return 0;
 }
 
 /* Start sending ADB packet */
 static void macii_start(void)
 {
-        unsigned long flags;
         struct adb_request *req;
 
         req = current_req;
-        if (!req) return;
-        
-        /* assert macii_state == idle */
-        if (macii_state != idle) {
-                printk("macii_start: called while driver busy (%p %x %x)!\n",
-                        req, macii_state, (uint) via1[B] & (ST_MASK|TREQ));
-                return;
-        }
 
-        local_irq_save(flags);
-        
-        /* 
-         * IRQ signaled ?? (means ADB controller wants to send, or might 
-         * be end of packet if we were reading)
-         */
-#if 0 /* FIXME: This is broke broke broke, for some reason */
-        if ((via[B] & TREQ) == 0) {
-                printk("macii_start: weird poll stuff. huh?\n");
-                /*
-                 *      FIXME - we need to restart this on a timer
-                 *      or a collision at boot hangs us.
-                 *      Never set macii_state to idle here, or macii_start 
-                 *      won't be called again from send_request!
-                 *      (need to re-check other cases ...)
-                 */
-                /*
-                 * if the interrupt handler set the need_poll
-                 * flag, it's hopefully a SRQ poll or re-Talk
-                 * so we try to send here anyway
-                 */
-                if (!need_poll) {
-                        if (console_loglevel == 10)
-                                printk("macii_start: device busy - retry %p state %d status %x!\n", 
-                                        req, macii_state,
-                                        (uint) via[B] & (ST_MASK|TREQ));
-                        retry_req = req;
-                        /* set ADB status here ? */
-                        local_irq_restore(flags);
-                        return;
-                } else {
-                        need_poll = 0;
-                }
-        }
-#endif
-        /*
-         * Another retry pending? (sanity check)
+        BUG_ON(req == NULL);
+
+        BUG_ON(macii_state != idle);
+
+        /* Now send it. Be careful though, that first byte of the request
+         * is actually ADB_PACKET; the real data begins at index 1!
+         * And req->nbytes is the number of bytes of real data plus one.
          */
-        if (retry_req) {
-                retry_req = NULL;
-        }
 
-        /* Now send it. Be careful though, that first byte of the request */
-        /* is actually ADB_PACKET; the real data begins at index 1!       */
-        
         /* store command byte */
         command_byte = req->data[1];
         /* Output mode */
@@ -381,115 +367,97 @@ static void macii_start(void)
 
         macii_state = sending;
         data_index = 2;
-
-        local_irq_restore(flags);
 }
 
 /*
- * The notorious ADB interrupt handler - does all of the protocol handling, 
- * except for starting new send operations. Relies heavily on the ADB 
- * controller sending and receiving data, thereby generating SR interrupts
- * for us. This means there has to be always activity on the ADB bus, otherwise
- * the whole process dies and has to be re-kicked by sending TALK requests ...
- * CUDA-based Macs seem to solve this with the autopoll option, for MacII-type
- * ADB the problem isn't solved yet (retransmit of the latest active TALK seems
- * a good choice; either on timeout or on a timer interrupt).
+ * The notorious ADB interrupt handler - does all of the protocol handling.
+ * Relies on the ADB controller sending and receiving data, thereby
+ * generating shift register interrupts (SR_INT) for us. This means there has
+ * to be activity on the ADB bus. The chip will poll to achieve this.
  *
  * The basic ADB state machine was left unchanged from the original MacII code
  * by Alan Cox, which was based on the CUDA driver for PowerMac. 
- * The syntax of the ADB status lines seems to be totally different on MacII, 
- * though. MacII uses the states Command -> Even -> Odd -> Even ->...-> Idle for
- * sending, and Idle -> Even -> Odd -> Even ->...-> Idle for receiving. Start 
- * and end of a receive packet are signaled by asserting /IRQ on the interrupt
- * line. Timeouts are signaled by a sequence of 4 0xFF, with /IRQ asserted on 
- * every other byte. SRQ is probably signaled by 3 or more 0xFF tacked on the 
- * end of a packet. (Thanks to Guido Koerber for eavesdropping on the ADB 
- * protocol with a logic analyzer!!)
- *
- * Note: As of 21/10/97, the MacII ADB part works including timeout detection
- * and retransmit (Talk to the last active device).
+ * The syntax of the ADB status lines is totally different on MacII,
+ * though. MacII uses the states Command -> Even -> Odd -> Even ->...-> Idle
+ * for sending and Idle -> Even -> Odd -> Even ->...-> Idle for receiving.
+ * Start and end of a receive packet are signalled by asserting /IRQ on the
+ * interrupt line (/IRQ means the CTLR_IRQ bit in port B; not to be confused
+ * with the VIA shift register interrupt. /IRQ never actually interrupts the
+ * processor, it's just an ordinary input.)
  */
 static irqreturn_t macii_interrupt(int irq, void *arg)
 {
-        int x, adbdir;
-        unsigned long flags;
+        int x;
+        static int entered;
         struct adb_request *req;
 
-        last_status = status;
-
-        /* prevent races due to SCSI enabling ints */
-        local_irq_save(flags);
-
-        if (driver_running) {
-                local_irq_restore(flags);
-                return IRQ_NONE;
+        if (!arg) {
+                /* Clear the SR IRQ flag when polling. */
+                if (via[IFR] & SR_INT)
+                        via[IFR] = SR_INT;
+                else
+                        return IRQ_NONE;
         }
 
-        driver_running = 1;
-        
-        status = via[B] & (ST_MASK|TREQ);
-        adbdir = via[ACR] & SR_OUT;
+        BUG_ON(entered++);
+
+        last_status = status;
+        status = via[B] & (ST_MASK|CTLR_IRQ);
 
         switch (macii_state) {
                 case idle:
+                        if (reading_reply) {
+                                reply_ptr = current_req->reply;
+                        } else {
+                                BUG_ON(current_req != NULL);
+                                reply_ptr = reply_buf;
+                        }
+
                         x = via[SR];
-                        first_byte = x;
-                        /* set ADB state = even for first data byte */
-                        via[B] = (via[B] & ~ST_MASK) | ST_EVEN;
 
-                        reply_buf[0] = first_byte; /* was command_byte?? */
-                        reply_ptr = reply_buf + 1;
-                        reply_len = 1;
-                        prefix_len = 1;
-                        reading_reply = 0;
-                        
-                        macii_state = reading;
-                        break;
+                        if ((status & CTLR_IRQ) && (x == 0xFF)) {
+                                /* Bus timeout without SRQ sequence:
+                                 *     data is "FF" while CTLR_IRQ is "H"
+                                 */
+                                reply_len = 0;
+                                srq_asserted = 0;
+                                macii_state = read_done;
+                        } else {
+                                macii_state = reading;
+                                *reply_ptr = x;
+                                reply_len = 1;
+                        }
 
-                case awaiting_reply:
-                        /* handshake etc. for II ?? */
-                        x = via[SR];
-                        first_byte = x;
                         /* set ADB state = even for first data byte */
                         via[B] = (via[B] & ~ST_MASK) | ST_EVEN;
-
-                        current_req->reply[0] = first_byte;
-                        reply_ptr = current_req->reply + 1;
-                        reply_len = 1;
-                        prefix_len = 1;
-                        reading_reply = 1;
-
-                        macii_state = reading;                  
                         break;
 
                 case sending:
                         req = current_req;
                         if (data_index >= req->nbytes) {
-                                /* print an error message if a listen command has no data */
-                                if (((command_byte & 0x0C) == 0x08)
-                                 /* && (console_loglevel == 10) */
-                                    && (data_index == 2))
-                                        printk("MacII ADB: listen command with no data: %x!\n", 
-                                                command_byte);
-                                /* reset to shift in */
-                                via[ACR] &= ~SR_OUT;
-                                x = via[SR];
-                                /* set ADB state idle - might get SRQ */
-                                via[B] = (via[B] & ~ST_MASK) | ST_IDLE;
-
                                 req->sent = 1;
+                                macii_state = idle;
 
                                 if (req->reply_expected) {
-                                        macii_state = awaiting_reply;
+                                        reading_reply = 1;
                                 } else {
                                         req->complete = 1;
                                         current_req = req->next;
                                         if (req->done) (*req->done)(req);
-                                        macii_state = idle;
-                                        if (current_req || retry_req)
+
+                                        if (current_req)
                                                 macii_start();
                                         else
-                                                macii_retransmit((command_byte & 0xF0) >> 4);
+                                                if (need_autopoll())
+                                                        macii_autopoll(autopoll_devs);
+                                }
+
+                                if (macii_state == idle) {
+                                        /* reset to shift in */
+                                        via[ACR] &= ~SR_OUT;
+                                        x = via[SR];
+                                        /* set ADB state idle - might get SRQ */
+                                        via[B] = (via[B] & ~ST_MASK) | ST_IDLE;
                                 }
                         } else {
                                 via[SR] = req->data[data_index++];
@@ -505,147 +473,79 @@ static irqreturn_t macii_interrupt(int irq, void *arg)
                         break;
 
                 case reading:
+                        x = via[SR];
+                        BUG_ON((status & ST_MASK) == ST_CMD ||
+                               (status & ST_MASK) == ST_IDLE);
+
+                        /* Bus timeout with SRQ sequence:
+                         *     data is "XX FF"      while CTLR_IRQ is "L L"
+                         * End of packet without SRQ sequence:
+                         *     data is "XX...YY 00" while CTLR_IRQ is "L...H L"
+                         * End of packet SRQ sequence:
+                         *     data is "XX...YY 00" while CTLR_IRQ is "L...L L"
+                         * (where XX is the first response byte and
+                         * YY is the last byte of valid response data.)
+                         */
 
-                        /* timeout / SRQ handling for II hw */
-                        if( (first_byte == 0xFF && (reply_len-prefix_len)==2 
-                             && memcmp(reply_ptr-2,"\xFF\xFF",2)==0) || 
-                            ((reply_len-prefix_len)==3 
-                             && memcmp(reply_ptr-3,"\xFF\xFF\xFF",3)==0))
-                        {
-                                /*
-                                 * possible timeout (in fact, most probably a 
-                                 * timeout, since SRQ can't be signaled without
-                                 * transfer on the bus).
-                                 * The last three bytes seen were FF, together 
-                                 * with the starting byte (in case we started
-                                 * on 'idle' or 'awaiting_reply') this probably
-                                 * makes four. So this is mostl likely #5!
-                                 * The timeout signal is a pattern 1 0 1 0 0..
-                                 * on /INT, meaning we missed it :-(
-                                 */
-                                x = via[SR];
-                                if (x != 0xFF) printk("MacII ADB: mistaken timeout/SRQ!\n");
-
-                                if ((status & TREQ) == (last_status & TREQ)) {
-                                        /* Not a timeout. Unsolicited SRQ? weird. */
-                                        /* Terminate the SRQ packet and poll */
-                                        need_poll = 1;
+                        srq_asserted = 0;
+                        if (!(status & CTLR_IRQ)) {
+                                if (x == 0xFF) {
+                                        if (!(last_status & CTLR_IRQ)) {
+                                                macii_state = read_done;
+                                                reply_len = 0;
+                                                srq_asserted = 1;
+                                        }
+                                } else if (x == 0x00) {
+                                        macii_state = read_done;
+                                        if (!(last_status & CTLR_IRQ))
+                                                srq_asserted = 1;
                                 }
-                                /* There's no packet to get, so reply is blank */
-                                via[B] ^= ST_MASK;
-                                reply_ptr -= (reply_len-prefix_len);
-                                reply_len = prefix_len;
-                                macii_state = read_done;
-                                break;
-                        } /* end timeout / SRQ handling for II hw. */
-
-                        if((reply_len-prefix_len)>3
-                                && memcmp(reply_ptr-3,"\xFF\xFF\xFF",3)==0)
-                        {
-                                /* SRQ tacked on data packet */
-                                /* Terminate the packet (SRQ never ends) */
-                                x = via[SR];
-                                macii_state = read_done;
-                                reply_len -= 3;
-                                reply_ptr -= 3;
-                                need_poll = 1;
-                                /* need to continue; next byte not seen else */
-                        } else {
-                                /* Sanity check */
-                                if (reply_len > 15) reply_len = 0;
-                                /* read byte */
-                                x = via[SR];
-                                *reply_ptr = x;
+                        }
+
+                        if (macii_state == reading) {
+                                BUG_ON(reply_len > 15);
                                 reply_ptr++;
+                                *reply_ptr = x;
                                 reply_len++;
                         }
-                        /* The usual handshake ... */
-
-                        /*
-                         * NetBSD hints that the next to last byte 
-                         * is sent with IRQ !! 
-                         * Guido found out it's the last one (0x0),
-                         * but IRQ should be asserted already.
-                         * Problem with timeout detection: First
-                         * transition to /IRQ might be second 
-                         * byte of timeout packet! 
-                         * Timeouts are signaled by 4x FF.
-                         */
-                        if (((status & TREQ) == 0) && (x == 0x00)) { /* != 0xFF */
-                                /* invert state bits, toggle ODD/EVEN */
-                                via[B] ^= ST_MASK;
 
-                                /* adjust packet length */
-                                reply_len--;
-                                reply_ptr--;
-                                macii_state = read_done;
-                        } else {
-                                /* not caught: ST_CMD */
-                                /* required for re-entry 'reading'! */
-                                if ((status & ST_MASK) == ST_IDLE) {
-                                        /* (in)sanity check - set even */
-                                        via[B] = (via[B] & ~ST_MASK) | ST_EVEN;
-                                } else {
-                                        /* invert state bits */
-                                        via[B] ^= ST_MASK;
-                                }
-                        }
+                        /* invert state bits, toggle ODD/EVEN */
+                        via[B] ^= ST_MASK;
                         break;
 
                 case read_done:
                         x = via[SR];
+
                         if (reading_reply) {
+                                reading_reply = 0;
                                 req = current_req;
-                                req->reply_len = reply_ptr - req->reply;
+                                req->reply_len = reply_len;
                                 req->complete = 1;
                                 current_req = req->next;
                                 if (req->done) (*req->done)(req);
-                        } else {
-                                adb_input(reply_buf, reply_ptr - reply_buf, 0);
-                        }
+                        } else if (reply_len && autopoll_devs)
+                                adb_input(reply_buf, reply_len, 0);
 
-                        /*
-                         * remember this device ID; it's the latest we got a 
-                         * reply from!
-                         */
-                        last_reply = command_byte;
-                        last_active = (command_byte & 0xF0) >> 4;
+                        macii_state = idle;
 
                         /* SRQ seen before, initiate poll now */
-                        if (need_poll) {
-                                macii_state = idle;
+                        if (srq_asserted)
                                 macii_queue_poll();
-                                need_poll = 0;
-                                break;
-                        }
-                        
-                        /* set ADB state to idle */
-                        via[B] = (via[B] & ~ST_MASK) | ST_IDLE;
-                        
-                        /* /IRQ seen, so the ADB controller has data for us */
-                        if ((via[B] & TREQ) != 0) {
-                                macii_state = reading;
 
-                                reply_buf[0] = command_byte;
-                                reply_ptr = reply_buf + 1;
-                                reply_len = 1;
-                                prefix_len = 1;
-                                reading_reply = 0;
-                        } else {
-                                /* no IRQ, send next packet or wait */
-                                macii_state = idle;
-                                if (current_req)
-                                        macii_start();
-                                else
-                                        macii_retransmit(last_active);
-                        }
+                        if (current_req)
+                                macii_start();
+                        else
+                                if (need_autopoll())
+                                        macii_autopoll(autopoll_devs);
+
+                        if (macii_state == idle)
+                                via[B] = (via[B] & ~ST_MASK) | ST_IDLE;
                         break;
 
                 default:
                 break;
         }
-        /* reset mutex and interrupts */
-        driver_running = 0;
-        local_irq_restore(flags);
+
+        entered--;
         return IRQ_HANDLED;
 }
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 356c7216a179..dfdf11c1eec4 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -111,7 +111,6 @@ static int pmu_send_request(struct adb_request *req, int sync);
 static int pmu_autopoll(int devs);
 void pmu_poll(void);
 static int pmu_reset_bus(void);
-static int pmu_queue_request(struct adb_request *req);
 
 static void pmu_start(void);
 static void send_byte(int x);
@@ -475,7 +474,7 @@ pmu_request(struct adb_request *req, void (*done)(struct adb_request *),
         return pmu_queue_request(req);
 }
 
-static int 
+int
 pmu_queue_request(struct adb_request *req)
 {
         unsigned long flags;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 509171ca7fa8..2b4315d7e5d6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3080,7 +3080,7 @@ static int do_md_run(mddev_t * mddev)
                 if (test_bit(Faulty, &rdev->flags))
                         continue;
                 sync_blockdev(rdev->bdev);
-                invalidate_bdev(rdev->bdev, 0);
+                invalidate_bdev(rdev->bdev);
         }
 
         md_probe(mddev->unit, NULL, NULL);
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 5347a406fff7..02a0ea6e1c17 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -183,7 +183,8 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         mutex_init(&fc->i2c_mutex);
 
         memset(&fc->i2c_adap, 0, sizeof(struct i2c_adapter));
-        strncpy(fc->i2c_adap.name, "B2C2 FlexCop device",I2C_NAME_SIZE);
+        strncpy(fc->i2c_adap.name, "B2C2 FlexCop device",
+                sizeof(fc->i2c_adap.name));
 
         i2c_set_adapdata(&fc->i2c_adap,fc);
 
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index a6cbbdd262d6..34d7abc900d7 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -26,11 +26,11 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
-#include <linux/pci.h>
 #include <linux/input.h>
 #include <linux/dvb/frontend.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <asm/io.h>
 
 #include "dmxdev.h"
 #include "dvb_demux.h"
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 70df31b0a8a9..088b6dee3a7f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -19,7 +19,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
                 return -EINVAL;
         }
 
-        strncpy(d->i2c_adap.name,d->desc->name,I2C_NAME_SIZE);
+        strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
 #ifdef I2C_ADAP_CLASS_TV_DIGITAL
         d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
 #else
diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c
index a18c8f45a2ee..315e09e95b0c 100644
--- a/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@ -105,9 +105,9 @@ struct i2c_adapter * dibx000_get_i2c_adapter(struct dibx000_i2c_master *mst, enu
 }
 EXPORT_SYMBOL(dibx000_get_i2c_adapter);
 
-static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *algo, const char name[I2C_NAME_SIZE], struct dibx000_i2c_master *mst)
+static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *algo, const char *name, struct dibx000_i2c_master *mst)
 {
-        strncpy(i2c_adap->name, name, I2C_NAME_SIZE);
+        strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
         i2c_adap->class     = I2C_CLASS_TV_DIGITAL,
         i2c_adap->algo      = algo;
         i2c_adap->algo_data = NULL;
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 2aa9ce920607..823cd6cc471e 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index a3246a283aa4..05c7820fe53e 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -33,7 +33,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 68673863d5c9..59a43603b5cb 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 42e2299dcb22..853b1a3d6a1d 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 772fd52d551a..2e4cf1efdd21 100644
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 88dbdddeec42..d73c86aeeaac 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/videodev2.h>
-#include <linux/i2c.h>
 
 #include <media/tuner.h>
 #include <media/cx2341x.h>
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 3956c257556c..2d666b56020c 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -27,6 +27,8 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+
 #include <asm/delay.h>
 #include <sound/driver.h>
 #include <sound/core.h>
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index b2eb32e01aee..2ebde2fdbcbe 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -26,6 +26,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <asm/delay.h>
 
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 97ef421dd093..e627062fde3a 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/poll.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <linux/ioport.h>
 #include <linux/types.h>
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index fbce1d50578b..b94ef8ab28c1 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1,4 +1,3 @@
-
 /*
  *
  * device driver for Conexant 2388x based TV cards
@@ -34,6 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <asm/div64.h>
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ed882ebc7b95..418ea8b7f85a 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -23,7 +23,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/usb.h>
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 1231335a9f4a..50c7763d44b3 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -15,6 +15,7 @@
 #ifndef __LINUX_OVCAMCHIP_PRIV_H
 #define __LINUX_OVCAMCHIP_PRIV_H
 
+#include <linux/i2c.h>
 #include <media/ovcamchip.h>
 
 #ifdef DEBUG
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 44dc7479119c..74839f98b7c4 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -36,7 +36,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ce3321ab995..87c3144ec7fc 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -39,7 +39,6 @@
 #include <linux/slab.h>
 
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 269d7114a93a..80bf91187856 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -30,7 +30,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index e0fdb1ab7580..339592e7722d 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -33,7 +33,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 13f69fe6360d..51ab265d566a 100644
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -24,7 +24,6 @@
 
 
 #include <linux/list.h>
-#include <linux/i2c.h>
 #include <media/v4l2-dev.h>
 #include <media/tuner.h>
 #include "usbvision.h"
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 083acfd91d8b..97471af4309c 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1531,6 +1531,7 @@ mpt_resume(struct pci_dev *pdev)
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         u32 device_state = pdev->current_state;
         int recovery_state;
+        int err;
 
         printk(MYIOC_s_INFO_FMT
         "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
@@ -1538,7 +1539,9 @@ mpt_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
-        pci_enable_device(pdev);
+        err = pci_enable_device(pdev);
+        if (err)
+                return err;
 
         /* enable interrupts */
         CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);
@@ -4739,12 +4742,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
 }
 
 /**
- * mpt_inactive_raid_list_free
- *
- * This clears this link list.
- *
- * @ioc - pointer to per adapter structure
- *
+ * mpt_inactive_raid_list_free - This clears this link list.
+ * @ioc : pointer to per adapter structure
  **/
 static void
 mpt_inactive_raid_list_free(MPT_ADAPTER *ioc)
@@ -4764,15 +4763,11 @@ mpt_inactive_raid_list_free(MPT_ADAPTER *ioc)
 }
 
 /**
- * mpt_inactive_raid_volumes
- *
- * This sets up link list of phy_disk_nums for devices belonging in an inactive volume
- *
- * @ioc - pointer to per adapter structure
- * @channel - volume channel
- * @id - volume target id
- *
+ * mpt_inactive_raid_volumes - sets up link list of phy_disk_nums for devices belonging in an inactive volume
  *
+ * @ioc : pointer to per adapter structure
+ * @channel : volume channel
+ * @id : volume target id
  **/
 static void
 mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id)
@@ -6663,7 +6658,7 @@ union loginfo_type {
 /**
  *      mpt_iocstatus_info_config - IOCSTATUS information for config pages
  *      @ioc: Pointer to MPT_ADAPTER structure
- *      ioc_status: U32 IOCStatus word from IOC
+ *      @ioc_status: U32 IOCStatus word from IOC
  *      @mf: Pointer to MPT request frame
  *
  *      Refer to lsi/mpi.h.
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index e3a39272aad6..d25d3be8fcd2 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -994,6 +994,7 @@ typedef struct _MPT_SCSI_HOST {
         int                       scandv_wait_done;
         long                      last_queue_full;
         u16                       tm_iocstatus;
+        u16                       spi_pending;
         struct list_head          target_reset_list;
 } MPT_SCSI_HOST;
 
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 2a3e9e66d4ef..fa0f7761652a 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -819,10 +819,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         sc->resid=0;
                 case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:        /* 0x0040 */
                 case MPI_IOCSTATUS_SUCCESS:                     /* 0x0000 */
-                        if (scsi_status == MPI_SCSI_STATUS_BUSY)
-                                sc->result = (DID_BUS_BUSY << 16) | scsi_status;
-                        else
-                                sc->result = (DID_OK << 16) | scsi_status;
+                        sc->result = (DID_OK << 16) | scsi_status;
                         if (scsi_state == 0) {
                                 ;
                         } else if (scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID) {
@@ -1188,20 +1185,7 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 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;
-
-        hd = (MPT_SCSI_HOST *)host->hostdata;
-        if(!hd)
-                return 0;
-
-        return 0;
+        return mpt_resume(pdev);
 }
 
 #endif
@@ -1537,21 +1521,23 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_TMHandler - Generic handler for SCSI Task Management.
- *      Fall through to mpt_HardResetHandler if: not operational, too many
- *      failed TM requests or handshake failure.
- *
- *      @ioc: Pointer to MPT_ADAPTER structure
+ *      @hd: Pointer to MPT SCSI HOST structure
  *      @type: Task Management type
+ *      @channel: channel number for task management
  *      @id: Logical Target ID for reset (if appropriate)
  *      @lun: Logical Unit for reset (if appropriate)
  *      @ctx2abort: Context for the task to be aborted (if appropriate)
+ *      @timeout: timeout for task management control
+ *
+ *      Fall through to mpt_HardResetHandler if: not operational, too many
+ *      failed TM requests or handshake failure.
  *
  *      Remark: Currently invoked from a non-interrupt thread (_bh).
  *
  *      Remark: With old EH code, at most 1 SCSI TaskMgmt function per IOC
  *      will be active.
  *
- *      Returns 0 for SUCCESS, or FAILED.
+ *      Returns 0 for SUCCESS, or %FAILED.
  **/
 int
 mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout)
@@ -1650,9 +1636,11 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int c
  *      mptscsih_IssueTaskMgmt - Generic send Task Management function.
  *      @hd: Pointer to MPT_SCSI_HOST structure
  *      @type: Task Management type
+ *      @channel: channel number for task management
  *      @id: Logical Target ID for reset (if appropriate)
  *      @lun: Logical Unit for reset (if appropriate)
  *      @ctx2abort: Context for the task to be aborted (if appropriate)
+ *      @timeout: timeout for task management control
  *
  *      Remark: _HardResetHandler can be invoked from an interrupt thread (timer)
  *      or a non-interrupt thread.  In the former, must not call schedule().
@@ -2022,6 +2010,7 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd)
 /**
  *      mptscsih_tm_wait_for_completion - wait for completion of TM task
  *      @hd: Pointer to MPT host structure.
+ *      @timeout: timeout value
  *
  *      Returns {SUCCESS,FAILED}.
  */
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 85f21b54cb7d..d75f7ffbb02e 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -96,14 +96,13 @@ static int	mptspiTaskCtx = -1;
 static int      mptspiInternalCtx = -1; /* Used only for internal commands */
 
 /**
- *      mptspi_setTargetNegoParms  - Update the target negotiation
- *      parameters based on the the Inquiry data, adapter capabilities,
- *      and NVRAM settings
- *
+ *      mptspi_setTargetNegoParms  - Update the target negotiation parameters
  *      @hd: Pointer to a SCSI Host Structure
- *      @vtarget: per target private data
+ *      @target: per target private data
  *      @sdev: SCSI device
  *
+ *      Update the target negotiation parameters based on the the Inquiry
+ *      data, adapter capabilities, and NVRAM settings.
  **/
 static void
 mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
@@ -234,7 +233,7 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
 /**
  *      mptspi_writeIOCPage4  - write IOC Page 4
  *      @hd: Pointer to a SCSI Host Structure
- *      @channel:
+ *      @channel: channel number
  *      @id: write IOC Page4 for this ID & Bus
  *
  *      Return: -EAGAIN if unable to obtain a Message Frame
@@ -446,7 +445,7 @@ static int mptspi_target_alloc(struct scsi_target *starget)
         return 0;
 }
 
-void
+static void
 mptspi_target_destroy(struct scsi_target *starget)
 {
         if (starget->hostdata)
@@ -677,7 +676,9 @@ static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
                 return;
         }
 
+        hd->spi_pending |= (1 << sdev->id);
         spi_dv_device(sdev);
+        hd->spi_pending &= ~(1 << sdev->id);
 
         if (sdev->channel == 1 &&
             mptscsih_quiesce_raid(hd, 0, vtarget->channel, vtarget->id) < 0)
@@ -1203,11 +1204,27 @@ mptspi_dv_renegotiate_work(struct work_struct *work)
                 container_of(work, struct work_queue_wrapper, work);
         struct _MPT_SCSI_HOST *hd = wqw->hd;
         struct scsi_device *sdev;
+        struct scsi_target *starget;
+        struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+        u32 nego;
 
         kfree(wqw);
 
-        shost_for_each_device(sdev, hd->ioc->sh)
-                mptspi_dv_device(hd, sdev);
+        if (hd->spi_pending) {
+                shost_for_each_device(sdev, hd->ioc->sh) {
+                        if  (hd->spi_pending & (1 << sdev->id))
+                                continue;
+                        starget = scsi_target(sdev);
+                        nego = mptspi_getRP(starget);
+                        pg1.RequestedParameters = cpu_to_le32(nego);
+                        pg1.Reserved = 0;
+                        pg1.Configuration = 0;
+                        mptspi_write_spi_device_pg1(starget, &pg1);
+                }
+        } else {
+                shost_for_each_device(sdev, hd->ioc->sh)
+                        mptspi_dv_device(hd, sdev);
+        }
 }
 
 static void
@@ -1453,6 +1470,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         init_waitqueue_head(&hd->scandv_waitq);
         hd->scandv_wait_done = 0;
         hd->last_queue_full = 0;
+        hd->spi_pending = 0;
 
         /* Some versions of the firmware don't support page 0; without
          * that we can't get the parameters */
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index ca86f113f36a..276ba3c5143f 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/platform_device.h>
 #include <asm/uaccess.h>
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 6a51e99a8079..60c8b26f0678 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/hdpu_features.h>
-#include <linux/pci.h>
 
 #include <linux/platform_device.h>
 
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index bc60e2fc3c2c..1ba6c085419a 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -11,10 +11,20 @@
 
 #include <linux/tifm.h>
 #include <linux/dma-mapping.h>
-#include <linux/freezer.h>
 
 #define DRIVER_NAME "tifm_7xx1"
-#define DRIVER_VERSION "0.7"
+#define DRIVER_VERSION "0.8"
+
+#define TIFM_IRQ_ENABLE           0x80000000
+#define TIFM_IRQ_SOCKMASK(x)      (x)
+#define TIFM_IRQ_CARDMASK(x)      ((x) << 8)
+#define TIFM_IRQ_FIFOMASK(x)      ((x) << 16)
+#define TIFM_IRQ_SETALL           0xffffffff
+
+static void tifm_7xx1_dummy_eject(struct tifm_adapter *fm,
+                                  struct tifm_dev *sock)
+{
+}
 
 static void tifm_7xx1_eject(struct tifm_adapter *fm, struct tifm_dev *sock)
 {
@@ -22,7 +32,7 @@ static void tifm_7xx1_eject(struct tifm_adapter *fm, struct tifm_dev *sock)
 
         spin_lock_irqsave(&fm->lock, flags);
         fm->socket_change_set |= 1 << sock->socket_id;
-        wake_up_all(&fm->change_set_notify);
+        tifm_queue_work(&fm->media_switcher);
         spin_unlock_irqrestore(&fm->lock, flags);
 }
 
@@ -30,8 +40,7 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
 {
         struct tifm_adapter *fm = dev_id;
         struct tifm_dev *sock;
-        unsigned int irq_status;
-        unsigned int sock_irq_status, cnt;
+        unsigned int irq_status, cnt;
 
         spin_lock(&fm->lock);
         irq_status = readl(fm->addr + FM_INTERRUPT_STATUS);
@@ -45,12 +54,12 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
 
                 for (cnt = 0; cnt < fm->num_sockets; cnt++) {
                         sock = fm->sockets[cnt];
-                        sock_irq_status = (irq_status >> cnt)
-                                          & (TIFM_IRQ_FIFOMASK(1)
-                                             | TIFM_IRQ_CARDMASK(1));
-
-                        if (sock && sock_irq_status)
-                                sock->signal_irq(sock, sock_irq_status);
+                        if (sock) {
+                                if ((irq_status >> cnt) & TIFM_IRQ_FIFOMASK(1))
+                                        sock->data_event(sock);
+                                if ((irq_status >> cnt) & TIFM_IRQ_CARDMASK(1))
+                                        sock->card_event(sock);
+                        }
                 }
 
                 fm->socket_change_set |= irq_status
@@ -58,57 +67,57 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
         }
         writel(irq_status, fm->addr + FM_INTERRUPT_STATUS);
 
-        if (!fm->socket_change_set)
+        if (fm->finish_me)
+                complete_all(fm->finish_me);
+        else if (!fm->socket_change_set)
                 writel(TIFM_IRQ_ENABLE, fm->addr + FM_SET_INTERRUPT_ENABLE);
         else
-                wake_up_all(&fm->change_set_notify);
+                tifm_queue_work(&fm->media_switcher);
 
         spin_unlock(&fm->lock);
         return IRQ_HANDLED;
 }
 
-static tifm_media_id tifm_7xx1_toggle_sock_power(char __iomem *sock_addr,
-                                                 int is_x2)
+static unsigned char tifm_7xx1_toggle_sock_power(char __iomem *sock_addr)
 {
         unsigned int s_state;
         int cnt;
 
         writel(0x0e00, sock_addr + SOCK_CONTROL);
 
-        for (cnt = 0; cnt < 100; cnt++) {
+        for (cnt = 16; cnt <= 256; cnt <<= 1) {
                 if (!(TIFM_SOCK_STATE_POWERED
                       & readl(sock_addr + SOCK_PRESENT_STATE)))
                         break;
-                msleep(10);
+
+                msleep(cnt);
         }
 
         s_state = readl(sock_addr + SOCK_PRESENT_STATE);
         if (!(TIFM_SOCK_STATE_OCCUPIED & s_state))
-                return FM_NULL;
-
-        if (is_x2) {
-                writel((s_state & 7) | 0x0c00, sock_addr + SOCK_CONTROL);
-        } else {
-                // SmartMedia cards need extra 40 msec
-                if (((readl(sock_addr + SOCK_PRESENT_STATE) >> 4) & 7) == 1)
-                        msleep(40);
-                writel(readl(sock_addr + SOCK_CONTROL) | TIFM_CTRL_LED,
-                       sock_addr + SOCK_CONTROL);
-                msleep(10);
-                writel((s_state & 0x7) | 0x0c00 | TIFM_CTRL_LED,
-                        sock_addr + SOCK_CONTROL);
-        }
+                return 0;
 
-        for (cnt = 0; cnt < 100; cnt++) {
+        writel(readl(sock_addr + SOCK_CONTROL) | TIFM_CTRL_LED,
+               sock_addr + SOCK_CONTROL);
+
+        /* xd needs some extra time before power on */
+        if (((readl(sock_addr + SOCK_PRESENT_STATE) >> 4) & 7)
+            == TIFM_TYPE_XD)
+                msleep(40);
+
+        writel((s_state & 7) | 0x0c00, sock_addr + SOCK_CONTROL);
+        /* wait for power to stabilize */
+        msleep(20);
+        for (cnt = 16; cnt <= 256; cnt <<= 1) {
                 if ((TIFM_SOCK_STATE_POWERED
                      & readl(sock_addr + SOCK_PRESENT_STATE)))
                         break;
-                msleep(10);
+
+                msleep(cnt);
         }
 
-        if (!is_x2)
-                writel(readl(sock_addr + SOCK_CONTROL) & (~TIFM_CTRL_LED),
-                       sock_addr + SOCK_CONTROL);
+        writel(readl(sock_addr + SOCK_CONTROL) & (~TIFM_CTRL_LED),
+               sock_addr + SOCK_CONTROL);
 
         return (readl(sock_addr + SOCK_PRESENT_STATE) >> 4) & 7;
 }
@@ -119,127 +128,77 @@ tifm_7xx1_sock_addr(char __iomem *base_addr, unsigned int sock_num)
         return base_addr + ((sock_num + 1) << 10);
 }
 
-static int tifm_7xx1_switch_media(void *data)
+static void tifm_7xx1_switch_media(struct work_struct *work)
 {
-        struct tifm_adapter *fm = data;
-        unsigned long flags;
-        tifm_media_id media_id;
-        char *card_name = "xx";
-        int cnt, rc;
+        struct tifm_adapter *fm = container_of(work, struct tifm_adapter,
+                                               media_switcher);
         struct tifm_dev *sock;
-        unsigned int socket_change_set;
-
-        while (1) {
-                rc = wait_event_interruptible(fm->change_set_notify,
-                                              fm->socket_change_set);
-                if (rc == -ERESTARTSYS)
-                        try_to_freeze();
+        unsigned long flags;
+        unsigned char media_id;
+        unsigned int socket_change_set, cnt;
 
-                spin_lock_irqsave(&fm->lock, flags);
-                socket_change_set = fm->socket_change_set;
-                fm->socket_change_set = 0;
+        spin_lock_irqsave(&fm->lock, flags);
+        socket_change_set = fm->socket_change_set;
+        fm->socket_change_set = 0;
 
-                dev_dbg(fm->dev, "checking media set %x\n",
-                        socket_change_set);
+        dev_dbg(fm->cdev.dev, "checking media set %x\n",
+                socket_change_set);
 
-                if (kthread_should_stop())
-                        socket_change_set = (1 << fm->num_sockets) - 1;
+        if (!socket_change_set) {
                 spin_unlock_irqrestore(&fm->lock, flags);
+                return;
+        }
 
-                if (!socket_change_set)
+        for (cnt = 0; cnt < fm->num_sockets; cnt++) {
+                if (!(socket_change_set & (1 << cnt)))
                         continue;
-
-                spin_lock_irqsave(&fm->lock, flags);
-                for (cnt = 0; cnt < fm->num_sockets; cnt++) {
-                        if (!(socket_change_set & (1 << cnt)))
-                                continue;
-                        sock = fm->sockets[cnt];
-                        if (sock) {
-                                printk(KERN_INFO DRIVER_NAME
-                                       ": demand removing card from socket %d\n",
-                                       cnt);
-                                fm->sockets[cnt] = NULL;
-                                spin_unlock_irqrestore(&fm->lock, flags);
-                                device_unregister(&sock->dev);
-                                spin_lock_irqsave(&fm->lock, flags);
-                                writel(0x0e00,
-                                       tifm_7xx1_sock_addr(fm->addr, cnt)
-                                       + SOCK_CONTROL);
-                        }
-                        if (kthread_should_stop())
-                                continue;
-
+                sock = fm->sockets[cnt];
+                if (sock) {
+                        printk(KERN_INFO
+                               "%s : demand removing card from socket %u:%u\n",
+                               fm->cdev.class_id, fm->id, cnt);
+                        fm->sockets[cnt] = NULL;
                         spin_unlock_irqrestore(&fm->lock, flags);
-                        media_id = tifm_7xx1_toggle_sock_power(
-                                        tifm_7xx1_sock_addr(fm->addr, cnt),
-                                        fm->num_sockets == 2);
-                        if (media_id) {
-                                sock = tifm_alloc_device(fm);
-                                if (sock) {
-                                        sock->addr = tifm_7xx1_sock_addr(fm->addr,
-                                                                         cnt);
-                                        sock->media_id = media_id;
-                                        sock->socket_id = cnt;
-                                        switch (media_id) {
-                                        case 1:
-                                                card_name = "xd";
-                                                break;
-                                        case 2:
-                                                card_name = "ms";
-                                                break;
-                                        case 3:
-                                                card_name = "sd";
-                                                break;
-                                        default:
-                                                tifm_free_device(&sock->dev);
-                                                spin_lock_irqsave(&fm->lock, flags);
-                                                continue;
-                                        }
-                                        snprintf(sock->dev.bus_id, BUS_ID_SIZE,
-                                                 "tifm_%s%u:%u", card_name,
-                                                 fm->id, cnt);
-                                        printk(KERN_INFO DRIVER_NAME
-                                               ": %s card detected in socket %d\n",
-                                               card_name, cnt);
-                                        if (!device_register(&sock->dev)) {
-                                                spin_lock_irqsave(&fm->lock, flags);
-                                                if (!fm->sockets[cnt]) {
-                                                        fm->sockets[cnt] = sock;
-                                                        sock = NULL;
-                                                }
-                                                spin_unlock_irqrestore(&fm->lock, flags);
-                                        }
-                                        if (sock)
-                                                tifm_free_device(&sock->dev);
-                                }
-                                spin_lock_irqsave(&fm->lock, flags);
-                        }
+                        device_unregister(&sock->dev);
+                        spin_lock_irqsave(&fm->lock, flags);
+                        writel(0x0e00, tifm_7xx1_sock_addr(fm->addr, cnt)
+                               + SOCK_CONTROL);
                 }
 
-                if (!kthread_should_stop()) {
-                        writel(TIFM_IRQ_FIFOMASK(socket_change_set)
-                               | TIFM_IRQ_CARDMASK(socket_change_set),
-                               fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
-                        writel(TIFM_IRQ_FIFOMASK(socket_change_set)
-                               | TIFM_IRQ_CARDMASK(socket_change_set),
-                               fm->addr + FM_SET_INTERRUPT_ENABLE);
-                        writel(TIFM_IRQ_ENABLE,
-                               fm->addr + FM_SET_INTERRUPT_ENABLE);
-                        spin_unlock_irqrestore(&fm->lock, flags);
-                } else {
-                        for (cnt = 0; cnt < fm->num_sockets; cnt++) {
-                                if (fm->sockets[cnt])
-                                        fm->socket_change_set |= 1 << cnt;
-                        }
-                        if (!fm->socket_change_set) {
-                                spin_unlock_irqrestore(&fm->lock, flags);
-                                return 0;
-                        } else {
+                spin_unlock_irqrestore(&fm->lock, flags);
+
+                media_id = tifm_7xx1_toggle_sock_power(
+                                tifm_7xx1_sock_addr(fm->addr, cnt));
+
+                // tifm_alloc_device will check if media_id is valid
+                sock = tifm_alloc_device(fm, cnt, media_id);
+                if (sock) {
+                        sock->addr = tifm_7xx1_sock_addr(fm->addr, cnt);
+
+                        if (!device_register(&sock->dev)) {
+                                spin_lock_irqsave(&fm->lock, flags);
+                                if (!fm->sockets[cnt]) {
+                                        fm->sockets[cnt] = sock;
+                                        sock = NULL;
+                                }
                                 spin_unlock_irqrestore(&fm->lock, flags);
                         }
+                        if (sock)
+                                tifm_free_device(&sock->dev);
                 }
+                spin_lock_irqsave(&fm->lock, flags);
         }
-        return 0;
+
+        writel(TIFM_IRQ_FIFOMASK(socket_change_set)
+               | TIFM_IRQ_CARDMASK(socket_change_set),
+               fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
+
+        writel(TIFM_IRQ_FIFOMASK(socket_change_set)
+               | TIFM_IRQ_CARDMASK(socket_change_set),
+               fm->addr + FM_SET_INTERRUPT_ENABLE);
+
+        writel(TIFM_IRQ_ENABLE, fm->addr + FM_SET_INTERRUPT_ENABLE);
+        spin_unlock_irqrestore(&fm->lock, flags);
 }
 
 #ifdef CONFIG_PM
@@ -258,9 +217,11 @@ static int tifm_7xx1_suspend(struct pci_dev *dev, pm_message_t state)
 static int tifm_7xx1_resume(struct pci_dev *dev)
 {
         struct tifm_adapter *fm = pci_get_drvdata(dev);
-        int cnt, rc;
+        int rc;
+        unsigned int good_sockets = 0, bad_sockets = 0;
         unsigned long flags;
-        tifm_media_id new_ids[fm->num_sockets];
+        unsigned char new_ids[fm->num_sockets];
+        DECLARE_COMPLETION_ONSTACK(finish_resume);
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -271,45 +232,49 @@ static int tifm_7xx1_resume(struct pci_dev *dev)
 
         dev_dbg(&dev->dev, "resuming host\n");
 
-        for (cnt = 0; cnt < fm->num_sockets; cnt++)
-                new_ids[cnt] = tifm_7xx1_toggle_sock_power(
-                                        tifm_7xx1_sock_addr(fm->addr, cnt),
-                                        fm->num_sockets == 2);
+        for (rc = 0; rc < fm->num_sockets; rc++)
+                new_ids[rc] = tifm_7xx1_toggle_sock_power(
+                                        tifm_7xx1_sock_addr(fm->addr, rc));
         spin_lock_irqsave(&fm->lock, flags);
-        fm->socket_change_set = 0;
-        for (cnt = 0; cnt < fm->num_sockets; cnt++) {
-                if (fm->sockets[cnt]) {
-                        if (fm->sockets[cnt]->media_id == new_ids[cnt])
-                                fm->socket_change_set |= 1 << cnt;
-
-                        fm->sockets[cnt]->media_id = new_ids[cnt];
+        for (rc = 0; rc < fm->num_sockets; rc++) {
+                if (fm->sockets[rc]) {
+                        if (fm->sockets[rc]->type == new_ids[rc])
+                                good_sockets |= 1 << rc;
+                        else
+                                bad_sockets |= 1 << rc;
                 }
         }
 
         writel(TIFM_IRQ_ENABLE | TIFM_IRQ_SOCKMASK((1 << fm->num_sockets) - 1),
                fm->addr + FM_SET_INTERRUPT_ENABLE);
-        if (!fm->socket_change_set) {
-                spin_unlock_irqrestore(&fm->lock, flags);
-                return 0;
-        } else {
-                fm->socket_change_set = 0;
+        dev_dbg(&dev->dev, "change sets on resume: good %x, bad %x\n",
+                good_sockets, bad_sockets);
+
+        fm->socket_change_set = 0;
+        if (good_sockets) {
+                fm->finish_me = &finish_resume;
                 spin_unlock_irqrestore(&fm->lock, flags);
+                rc = wait_for_completion_timeout(&finish_resume, HZ);
+                dev_dbg(&dev->dev, "wait returned %d\n", rc);
+                writel(TIFM_IRQ_FIFOMASK(good_sockets)
+                       | TIFM_IRQ_CARDMASK(good_sockets),
+                       fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
+                writel(TIFM_IRQ_FIFOMASK(good_sockets)
+                       | TIFM_IRQ_CARDMASK(good_sockets),
+                       fm->addr + FM_SET_INTERRUPT_ENABLE);
+                spin_lock_irqsave(&fm->lock, flags);
+                fm->finish_me = NULL;
+                fm->socket_change_set ^= good_sockets & fm->socket_change_set;
         }
 
-        wait_event_timeout(fm->change_set_notify, fm->socket_change_set, HZ);
+        fm->socket_change_set |= bad_sockets;
+        if (fm->socket_change_set)
+                tifm_queue_work(&fm->media_switcher);
 
-        spin_lock_irqsave(&fm->lock, flags);
-        writel(TIFM_IRQ_FIFOMASK(fm->socket_change_set)
-               | TIFM_IRQ_CARDMASK(fm->socket_change_set),
-               fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
-        writel(TIFM_IRQ_FIFOMASK(fm->socket_change_set)
-               | TIFM_IRQ_CARDMASK(fm->socket_change_set),
-               fm->addr + FM_SET_INTERRUPT_ENABLE);
+        spin_unlock_irqrestore(&fm->lock, flags);
         writel(TIFM_IRQ_ENABLE,
                fm->addr + FM_SET_INTERRUPT_ENABLE);
-        fm->socket_change_set = 0;
 
-        spin_unlock_irqrestore(&fm->lock, flags);
         return 0;
 }
 
@@ -345,20 +310,14 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
 
         pci_intx(dev, 1);
 
-        fm = tifm_alloc_adapter();
+        fm = tifm_alloc_adapter(dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM
+                                ? 4 : 2, &dev->dev);
         if (!fm) {
                 rc = -ENOMEM;
                 goto err_out_int;
         }
 
-        fm->dev = &dev->dev;
-        fm->num_sockets = (dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM)
-                          ? 4 : 2;
-        fm->sockets = kzalloc(sizeof(struct tifm_dev*) * fm->num_sockets,
-                              GFP_KERNEL);
-        if (!fm->sockets)
-                goto err_out_free;
-
+        INIT_WORK(&fm->media_switcher, tifm_7xx1_switch_media);
         fm->eject = tifm_7xx1_eject;
         pci_set_drvdata(dev, fm);
 
@@ -367,19 +326,16 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
         if (!fm->addr)
                 goto err_out_free;
 
-        rc = request_irq(dev->irq, tifm_7xx1_isr, IRQF_SHARED, DRIVER_NAME, fm);
+        rc = request_irq(dev->irq, tifm_7xx1_isr, SA_SHIRQ, DRIVER_NAME, fm);
         if (rc)
                 goto err_out_unmap;
 
-        init_waitqueue_head(&fm->change_set_notify);
-        rc = tifm_add_adapter(fm, tifm_7xx1_switch_media);
+        rc = tifm_add_adapter(fm);
         if (rc)
                 goto err_out_irq;
 
-        writel(TIFM_IRQ_SETALL, fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
         writel(TIFM_IRQ_ENABLE | TIFM_IRQ_SOCKMASK((1 << fm->num_sockets) - 1),
                fm->addr + FM_SET_INTERRUPT_ENABLE);
-        wake_up_process(fm->media_switcher);
         return 0;
 
 err_out_irq:
@@ -401,18 +357,12 @@ err_out:
 static void tifm_7xx1_remove(struct pci_dev *dev)
 {
         struct tifm_adapter *fm = pci_get_drvdata(dev);
-        unsigned long flags;
 
+        fm->eject = tifm_7xx1_dummy_eject;
         writel(TIFM_IRQ_SETALL, fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
         mmiowb();
         free_irq(dev->irq, fm);
 
-        spin_lock_irqsave(&fm->lock, flags);
-        fm->socket_change_set = (1 << fm->num_sockets) - 1;
-        spin_unlock_irqrestore(&fm->lock, flags);
-
-        kthread_stop(fm->media_switcher);
-
         tifm_remove_adapter(fm);
 
         pci_set_drvdata(dev, NULL);
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 6b10ebe9d936..d195fb088f4a 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -14,71 +14,124 @@
 #include <linux/idr.h>
 
 #define DRIVER_NAME "tifm_core"
-#define DRIVER_VERSION "0.7"
+#define DRIVER_VERSION "0.8"
 
+static struct workqueue_struct *workqueue;
 static DEFINE_IDR(tifm_adapter_idr);
 static DEFINE_SPINLOCK(tifm_adapter_lock);
 
-static tifm_media_id *tifm_device_match(tifm_media_id *ids,
-                        struct tifm_dev *dev)
+static const char *tifm_media_type_name(unsigned char type, unsigned char nt)
 {
-        while (*ids) {
-                if (dev->media_id == *ids)
-                        return ids;
-                ids++;
-        }
-        return NULL;
+        const char *card_type_name[3][3] = {
+                { "SmartMedia/xD", "MemoryStick", "MMC/SD" },
+                { "XD", "MS", "SD"},
+                { "xd", "ms", "sd"}
+        };
+
+        if (nt > 2 || type < 1 || type > 3)
+                return NULL;
+        return card_type_name[nt][type - 1];
 }
 
-static int tifm_match(struct device *dev, struct device_driver *drv)
+static int tifm_dev_match(struct tifm_dev *sock, struct tifm_device_id *id)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *fm_drv;
-
-        fm_drv = container_of(drv, struct tifm_driver, driver);
-        if (!fm_drv->id_table)
-                return -EINVAL;
-        if (tifm_device_match(fm_drv->id_table, fm_dev))
+        if (sock->type == id->type)
                 return 1;
-        return -ENODEV;
+        return 0;
+}
+
+static int tifm_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *fm_drv = container_of(drv, struct tifm_driver,
+                                                  driver);
+        struct tifm_device_id *ids = fm_drv->id_table;
+
+        if (ids) {
+                while (ids->type) {
+                        if (tifm_dev_match(sock, ids))
+                                return 1;
+                        ++ids;
+                }
+        }
+        return 0;
 }
 
 static int tifm_uevent(struct device *dev, char **envp, int num_envp,
                        char *buffer, int buffer_size)
 {
-        struct tifm_dev *fm_dev;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
         int i = 0;
         int length = 0;
-        const char *card_type_name[] = {"INV", "SM", "MS", "SD"};
 
-        if (!dev || !(fm_dev = container_of(dev, struct tifm_dev, dev)))
-                return -ENODEV;
         if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                        "TIFM_CARD_TYPE=%s", card_type_name[fm_dev->media_id]))
+                           "TIFM_CARD_TYPE=%s",
+                           tifm_media_type_name(sock->type, 1)))
                 return -ENOMEM;
 
         return 0;
 }
 
+static int tifm_device_probe(struct device *dev)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
+        int rc = -ENODEV;
+
+        get_device(dev);
+        if (dev->driver && drv->probe) {
+                rc = drv->probe(sock);
+                if (!rc)
+                        return 0;
+        }
+        put_device(dev);
+        return rc;
+}
+
+static void tifm_dummy_event(struct tifm_dev *sock)
+{
+        return;
+}
+
+static int tifm_device_remove(struct device *dev)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
+
+        if (dev->driver && drv->remove) {
+                sock->card_event = tifm_dummy_event;
+                sock->data_event = tifm_dummy_event;
+                drv->remove(sock);
+                sock->dev.driver = NULL;
+        }
+
+        put_device(dev);
+        return 0;
+}
+
 #ifdef CONFIG_PM
 
 static int tifm_device_suspend(struct device *dev, pm_message_t state)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
 
-        if (drv && drv->suspend)
-                return drv->suspend(fm_dev, state);
+        if (dev->driver && drv->suspend)
+                return drv->suspend(sock, state);
         return 0;
 }
 
 static int tifm_device_resume(struct device *dev)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
 
-        if (drv && drv->resume)
-                return drv->resume(fm_dev);
+        if (dev->driver && drv->resume)
+                return drv->resume(sock);
         return 0;
 }
 
@@ -89,19 +142,33 @@ static int tifm_device_resume(struct device *dev)
 
 #endif /* CONFIG_PM */
 
+static ssize_t type_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        return sprintf(buf, "%x", sock->type);
+}
+
+static struct device_attribute tifm_dev_attrs[] = {
+        __ATTR(type, S_IRUGO, type_show, NULL),
+        __ATTR_NULL
+};
+
 static struct bus_type tifm_bus_type = {
-        .name    = "tifm",
-        .match   = tifm_match,
-        .uevent  = tifm_uevent,
-        .suspend = tifm_device_suspend,
-        .resume  = tifm_device_resume
+        .name      = "tifm",
+        .dev_attrs = tifm_dev_attrs,
+        .match     = tifm_bus_match,
+        .uevent    = tifm_uevent,
+        .probe     = tifm_device_probe,
+        .remove    = tifm_device_remove,
+        .suspend   = tifm_device_suspend,
+        .resume    = tifm_device_resume
 };
 
 static void tifm_free(struct class_device *cdev)
 {
         struct tifm_adapter *fm = container_of(cdev, struct tifm_adapter, cdev);
 
-        kfree(fm->sockets);
         kfree(fm);
 }
 
@@ -110,28 +177,25 @@ static struct class tifm_adapter_class = {
         .release = tifm_free
 };
 
-struct tifm_adapter *tifm_alloc_adapter(void)
+struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
+                                        struct device *dev)
 {
         struct tifm_adapter *fm;
 
-        fm = kzalloc(sizeof(struct tifm_adapter), GFP_KERNEL);
+        fm = kzalloc(sizeof(struct tifm_adapter)
+                     + sizeof(struct tifm_dev*) * num_sockets, GFP_KERNEL);
         if (fm) {
                 fm->cdev.class = &tifm_adapter_class;
-                spin_lock_init(&fm->lock);
+                fm->cdev.dev = dev;
                 class_device_initialize(&fm->cdev);
+                spin_lock_init(&fm->lock);
+                fm->num_sockets = num_sockets;
         }
         return fm;
 }
 EXPORT_SYMBOL(tifm_alloc_adapter);
 
-void tifm_free_adapter(struct tifm_adapter *fm)
-{
-        class_device_put(&fm->cdev);
-}
-EXPORT_SYMBOL(tifm_free_adapter);
-
-int tifm_add_adapter(struct tifm_adapter *fm,
-                     int (*mediathreadfn)(void *data))
+int tifm_add_adapter(struct tifm_adapter *fm)
 {
         int rc;
 
@@ -141,59 +205,80 @@ int tifm_add_adapter(struct tifm_adapter *fm,
         spin_lock(&tifm_adapter_lock);
         rc = idr_get_new(&tifm_adapter_idr, fm, &fm->id);
         spin_unlock(&tifm_adapter_lock);
-        if (!rc) {
-                snprintf(fm->cdev.class_id, BUS_ID_SIZE, "tifm%u", fm->id);
-                fm->media_switcher = kthread_create(mediathreadfn,
-                                                    fm, "tifm/%u", fm->id);
-
-                if (!IS_ERR(fm->media_switcher))
-                        return class_device_add(&fm->cdev);
+        if (rc)
+                return rc;
 
+        snprintf(fm->cdev.class_id, BUS_ID_SIZE, "tifm%u", fm->id);
+        rc = class_device_add(&fm->cdev);
+        if (rc) {
                 spin_lock(&tifm_adapter_lock);
                 idr_remove(&tifm_adapter_idr, fm->id);
                 spin_unlock(&tifm_adapter_lock);
-                rc = -ENOMEM;
         }
+
         return rc;
 }
 EXPORT_SYMBOL(tifm_add_adapter);
 
 void tifm_remove_adapter(struct tifm_adapter *fm)
 {
-        class_device_del(&fm->cdev);
+        unsigned int cnt;
+
+        flush_workqueue(workqueue);
+        for (cnt = 0; cnt < fm->num_sockets; ++cnt) {
+                if (fm->sockets[cnt])
+                        device_unregister(&fm->sockets[cnt]->dev);
+        }
 
         spin_lock(&tifm_adapter_lock);
         idr_remove(&tifm_adapter_idr, fm->id);
         spin_unlock(&tifm_adapter_lock);
+        class_device_del(&fm->cdev);
 }
 EXPORT_SYMBOL(tifm_remove_adapter);
 
-void tifm_free_device(struct device *dev)
+void tifm_free_adapter(struct tifm_adapter *fm)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        kfree(fm_dev);
+        class_device_put(&fm->cdev);
 }
-EXPORT_SYMBOL(tifm_free_device);
+EXPORT_SYMBOL(tifm_free_adapter);
 
-static void tifm_dummy_signal_irq(struct tifm_dev *sock,
-                                  unsigned int sock_irq_status)
+void tifm_free_device(struct device *dev)
 {
-        return;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        kfree(sock);
 }
+EXPORT_SYMBOL(tifm_free_device);
 
-struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm)
+struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id,
+                                   unsigned char type)
 {
-        struct tifm_dev *dev = kzalloc(sizeof(struct tifm_dev), GFP_KERNEL);
-
-        if (dev) {
-                spin_lock_init(&dev->lock);
-
-                dev->dev.parent = fm->dev;
-                dev->dev.bus = &tifm_bus_type;
-                dev->dev.release = tifm_free_device;
-                dev->signal_irq = tifm_dummy_signal_irq;
+        struct tifm_dev *sock = NULL;
+
+        if (!tifm_media_type_name(type, 0))
+                return sock;
+
+        sock = kzalloc(sizeof(struct tifm_dev), GFP_KERNEL);
+        if (sock) {
+                spin_lock_init(&sock->lock);
+                sock->type = type;
+                sock->socket_id = id;
+                sock->card_event = tifm_dummy_event;
+                sock->data_event = tifm_dummy_event;
+
+                sock->dev.parent = fm->cdev.dev;
+                sock->dev.bus = &tifm_bus_type;
+                sock->dev.dma_mask = fm->cdev.dev->dma_mask;
+                sock->dev.release = tifm_free_device;
+
+                snprintf(sock->dev.bus_id, BUS_ID_SIZE,
+                         "tifm_%s%u:%u", tifm_media_type_name(type, 2),
+                         fm->id, id);
+                printk(KERN_INFO DRIVER_NAME
+                       ": %s card detected in socket %u:%u\n",
+                       tifm_media_type_name(type, 0), fm->id, id);
         }
-        return dev;
+        return sock;
 }
 EXPORT_SYMBOL(tifm_alloc_device);
 
@@ -218,54 +303,15 @@ void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
 }
 EXPORT_SYMBOL(tifm_unmap_sg);
 
-static int tifm_device_probe(struct device *dev)
-{
-        struct tifm_driver *drv;
-        struct tifm_dev *fm_dev;
-        int rc = 0;
-        const tifm_media_id *id;
-
-        drv = container_of(dev->driver, struct tifm_driver, driver);
-        fm_dev = container_of(dev, struct tifm_dev, dev);
-        get_device(dev);
-        if (!fm_dev->drv && drv->probe && drv->id_table) {
-                rc = -ENODEV;
-                id = tifm_device_match(drv->id_table, fm_dev);
-                if (id)
-                        rc = drv->probe(fm_dev);
-                if (rc >= 0) {
-                        rc = 0;
-                        fm_dev->drv = drv;
-                }
-        }
-        if (rc)
-                put_device(dev);
-        return rc;
-}
-
-static int tifm_device_remove(struct device *dev)
+void tifm_queue_work(struct work_struct *work)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
-
-        if (drv) {
-                fm_dev->signal_irq = tifm_dummy_signal_irq;
-                if (drv->remove)
-                        drv->remove(fm_dev);
-                fm_dev->drv = NULL;
-        }
-
-        put_device(dev);
-        return 0;
+        queue_work(workqueue, work);
 }
+EXPORT_SYMBOL(tifm_queue_work);
 
 int tifm_register_driver(struct tifm_driver *drv)
 {
         drv->driver.bus = &tifm_bus_type;
-        drv->driver.probe = tifm_device_probe;
-        drv->driver.remove = tifm_device_remove;
-        drv->driver.suspend = tifm_device_suspend;
-        drv->driver.resume = tifm_device_resume;
 
         return driver_register(&drv->driver);
 }
@@ -279,13 +325,25 @@ EXPORT_SYMBOL(tifm_unregister_driver);
 
 static int __init tifm_init(void)
 {
-        int rc = bus_register(&tifm_bus_type);
+        int rc;
 
-        if (!rc) {
-                rc = class_register(&tifm_adapter_class);
-                if (rc)
-                        bus_unregister(&tifm_bus_type);
-        }
+        workqueue = create_freezeable_workqueue("tifm");
+        if (!workqueue)
+                return -ENOMEM;
+
+        rc = bus_register(&tifm_bus_type);
+
+        if (rc)
+                goto err_out_wq;
+
+        rc = class_register(&tifm_adapter_class);
+        if (!rc)
+                return 0;
+
+        bus_unregister(&tifm_bus_type);
+
+err_out_wq:
+        destroy_workqueue(workqueue);
 
         return rc;
 }
@@ -294,6 +352,7 @@ static void __exit tifm_exit(void)
 {
         class_unregister(&tifm_adapter_class);
         bus_unregister(&tifm_bus_type);
+        destroy_workqueue(workqueue);
 }
 
 subsys_initcall(tifm_init);
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 12af9c718764..6c97491543db 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -19,110 +19,10 @@ config MMC_DEBUG
           This is an option for use by developers; most people should
           say N here.  This enables MMC core and driver debugging.
 
-config MMC_BLOCK
-        tristate "MMC block device driver"
-        depends on MMC && BLOCK
-        default y
-        help
-          Say Y here to enable the MMC block device driver support.
-          This provides a block device driver, which you can use to
-          mount the filesystem. Almost everyone wishing MMC support
-          should say Y or M here.
-
-config MMC_ARMMMCI
-        tristate "ARM AMBA Multimedia Card Interface support"
-        depends on ARM_AMBA && MMC
-        help
-          This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
-          Interface (PL180 and PL181) support.  If you have an ARM(R)
-          platform with a Multimedia Card slot, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_PXA
-        tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
-        depends on ARCH_PXA && MMC
-        help
-          This selects the Intel(R) PXA(R) Multimedia card Interface.
-          If you have a PXA(R) platform with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
-
-config MMC_SDHCI
-        tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"
-        depends on PCI && MMC && EXPERIMENTAL
-        help
-          This select the generic Secure Digital Host Controller Interface.
-          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
-          and Toshiba(R). Most controllers found in laptops are of this type.
-          If you have a controller with this interface, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_OMAP
-        tristate "TI OMAP Multimedia Card Interface support"
-        depends on ARCH_OMAP && MMC
-        select TPS65010 if MACH_OMAP_H2
-        help
-          This selects the TI OMAP Multimedia card Interface.
-          If you have an OMAP board with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
+source "drivers/mmc/core/Kconfig"
 
-config MMC_WBSD
-        tristate "Winbond W83L51xD SD/MMC Card Interface support"
-        depends on MMC && ISA_DMA_API
-        help
-          This selects the Winbond(R) W83L51xD Secure digital and
-          Multimedia card Interface.
-          If you have a machine with a integrated W83L518D or W83L519D
-          SD/MMC card reader, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_AU1X
-        tristate "Alchemy AU1XX0 MMC Card Interface support"
-        depends on MMC && SOC_AU1200
-        help
-          This selects the AMD Alchemy(R) Multimedia card interface.
-          If you have a Alchemy platform with a MMC slot, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_AT91
-        tristate "AT91 SD/MMC Card Interface support"
-        depends on ARCH_AT91 && MMC
-        help
-          This selects the AT91 MCI controller.
-
-          If unsure, say N.
-
-config MMC_IMX
-        tristate "Motorola i.MX Multimedia Card Interface support"
-        depends on ARCH_IMX && MMC
-        help
-          This selects the Motorola i.MX Multimedia card Interface.
-          If you have a i.MX platform with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
-
-config MMC_TIFM_SD
-        tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
-        depends on MMC && EXPERIMENTAL && PCI
-        select TIFM_CORE
-        help
-          Say Y here if you want to be able to access MMC/SD cards with
-          the Texas Instruments(R) Flash Media card reader, found in many
-          laptops.
-          This option 'selects' (turns on, enables) 'TIFM_CORE', but you
-          probably also need appropriate card reader host adapter, such as
-          'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support
-          (TIFM_7XX1)'.
+source "drivers/mmc/card/Kconfig"
 
-          To compile this driver as a module, choose M here: the
-          module will be called tifm_sd.
+source "drivers/mmc/host/Kconfig"
 
 endmenu
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 83ffb9326a54..9979f5e9765b 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -2,32 +2,11 @@
 # Makefile for the kernel mmc device drivers.
 #
 
-#
-# Core
-#
-obj-$(CONFIG_MMC)               += mmc_core.o
-
-#
-# Media drivers
-#
-obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
-
-#
-# Host drivers
-#
-obj-$(CONFIG_MMC_ARMMMCI)       += mmci.o
-obj-$(CONFIG_MMC_PXA)           += pxamci.o
-obj-$(CONFIG_MMC_IMX)           += imxmmc.o
-obj-$(CONFIG_MMC_SDHCI)         += sdhci.o
-obj-$(CONFIG_MMC_WBSD)          += wbsd.o
-obj-$(CONFIG_MMC_AU1X)          += au1xmmc.o
-obj-$(CONFIG_MMC_OMAP)          += omap.o
-obj-$(CONFIG_MMC_AT91)          += at91_mci.o
-obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
-
-mmc_core-y := mmc.o mmc_sysfs.o
-mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
-
 ifeq ($(CONFIG_MMC_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
+        EXTRA_CFLAGS            += -DDEBUG
 endif
+
+obj-$(CONFIG_MMC)               += core/
+obj-$(CONFIG_MMC)               += card/
+obj-$(CONFIG_MMC)               += host/
+
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
new file mode 100644
index 000000000000..01a9fd376a1f
--- /dev/null
+++ b/drivers/mmc/card/Kconfig
@@ -0,0 +1,17 @@
+#
+# MMC/SD card drivers
+#
+
+comment "MMC/SD Card Drivers"
+        depends MMC
+
+config MMC_BLOCK
+        tristate "MMC block device driver"
+        depends on MMC && BLOCK
+        default y
+        help
+          Say Y here to enable the MMC block device driver support.
+          This provides a block device driver, which you can use to
+          mount the filesystem. Almost everyone wishing MMC support
+          should say Y or M here.
+
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile
new file mode 100644
index 000000000000..cf8c939867f5
--- /dev/null
+++ b/drivers/mmc/card/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for MMC/SD card drivers
+#
+
+ifeq ($(CONFIG_MMC_DEBUG),y)
+        EXTRA_CFLAGS            += -DDEBUG
+endif
+
+obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
+mmc_block-objs                  := block.o queue.o
+
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/card/block.c
index 86439a0bb271..d24ab234394c 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/card/block.c
@@ -2,6 +2,7 @@
  * Block driver for media (i.e., flash cards)
  *
  * Copyright 2002 Hewlett-Packard Company
+ * Copyright 2005-2007 Pierre Ossman
  *
  * Use consistent with the GNU GPL is permitted,
  * provided that this copyright notice is
@@ -31,13 +32,13 @@
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
-#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
-#include "mmc_queue.h"
+#include "queue.h"
 
 /*
  * max 8 partitions per card
@@ -223,10 +224,9 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
         struct mmc_blk_data *md = mq->data;
         struct mmc_card *card = md->queue.card;
         struct mmc_blk_request brq;
-        int ret = 1;
+        int ret = 1, sg_pos, data_size;
 
-        if (mmc_card_claim_host(card))
-                goto flush_queue;
+        mmc_claim_host(card->host);
 
         do {
                 struct mmc_command cmd;
@@ -283,6 +283,20 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                 brq.data.sg = mq->sg;
                 brq.data.sg_len = blk_rq_map_sg(req->q, req, brq.data.sg);
 
+                if (brq.data.blocks !=
+                    (req->nr_sectors >> (md->block_bits - 9))) {
+                        data_size = brq.data.blocks * brq.data.blksz;
+                        for (sg_pos = 0; sg_pos < brq.data.sg_len; sg_pos++) {
+                                data_size -= mq->sg[sg_pos].length;
+                                if (data_size <= 0) {
+                                        mq->sg[sg_pos].length += data_size;
+                                        sg_pos++;
+                                        break;
+                                }
+                        }
+                        brq.data.sg_len = sg_pos;
+                }
+
                 mmc_wait_for_req(card->host, &brq.mrq);
                 if (brq.cmd.error) {
                         printk(KERN_ERR "%s: error %d sending read/write command\n",
@@ -342,7 +356,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                 spin_unlock_irq(&md->lock);
         } while (ret);
 
-        mmc_card_release_host(card);
+        mmc_release_host(card->host);
 
         return 1;
 
@@ -378,9 +392,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                 spin_unlock_irq(&md->lock);
         }
 
-flush_queue:
-
-        mmc_card_release_host(card);
+        mmc_release_host(card->host);
 
         spin_lock_irq(&md->lock);
         while (ret) {
@@ -477,11 +489,20 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
 
         blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
 
-        /*
-         * The CSD capacity field is in units of read_blkbits.
-         * set_capacity takes units of 512 bytes.
-         */
-        set_capacity(md->disk, card->csd.capacity << (card->csd.read_blkbits - 9));
+        if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) {
+                /*
+                 * The EXT_CSD sector count is in number or 512 byte
+                 * sectors.
+                 */
+                set_capacity(md->disk, card->ext_csd.sectors);
+        } else {
+                /*
+                 * The CSD capacity field is in units of read_blkbits.
+                 * set_capacity takes units of 512 bytes.
+                 */
+                set_capacity(md->disk,
+                        card->csd.capacity << (card->csd.read_blkbits - 9));
+        }
         return md;
 
  err_putdisk:
@@ -502,12 +523,12 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
         if (mmc_card_blockaddr(card))
                 return 0;
 
-        mmc_card_claim_host(card);
+        mmc_claim_host(card->host);
         cmd.opcode = MMC_SET_BLOCKLEN;
         cmd.arg = 1 << md->block_bits;
         cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
         err = mmc_wait_for_cmd(card->host, &cmd, 5);
-        mmc_card_release_host(card);
+        mmc_release_host(card->host);
 
         if (err) {
                 printk(KERN_ERR "%s: unable to set block size to %d: %d\n",
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/card/queue.c
index c27e42645cdb..2e77963db334 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/card/queue.c
@@ -1,7 +1,8 @@
 /*
- *  linux/drivers/mmc/mmc_queue.c
+ *  linux/drivers/mmc/queue.c
  *
  *  Copyright (C) 2003 Russell King, All Rights Reserved.
+ *  Copyright 2006-2007 Pierre Ossman
  *
  * 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
@@ -14,7 +15,7 @@
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include "mmc_queue.h"
+#include "queue.h"
 
 #define MMC_QUEUE_SUSPENDED     (1 << 0)
 
@@ -179,7 +180,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
         blk_cleanup_queue(mq->queue);
         return ret;
 }
-EXPORT_SYMBOL(mmc_init_queue);
 
 void mmc_cleanup_queue(struct mmc_queue *mq)
 {
@@ -191,6 +191,9 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
         q->queuedata = NULL;
         spin_unlock_irqrestore(q->queue_lock, flags);
 
+        /* Make sure the queue isn't suspended, as that will deadlock */
+        mmc_queue_resume(mq);
+
         /* Then terminate our worker thread */
         kthread_stop(mq->thread);
 
@@ -226,7 +229,6 @@ void mmc_queue_suspend(struct mmc_queue *mq)
                 down(&mq->thread_sem);
         }
 }
-EXPORT_SYMBOL(mmc_queue_suspend);
 
 /**
  * mmc_queue_resume - resume a previously suspended MMC request queue
@@ -247,4 +249,4 @@ void mmc_queue_resume(struct mmc_queue *mq)
                 spin_unlock_irqrestore(q->queue_lock, flags);
         }
 }
-EXPORT_SYMBOL(mmc_queue_resume);
+
diff --git a/drivers/mmc/mmc_queue.h b/drivers/mmc/card/queue.h
index c9f139e764f6..c9f139e764f6 100644
--- a/drivers/mmc/mmc_queue.h
+++ b/drivers/mmc/card/queue.h
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
new file mode 100644
index 000000000000..94222b9a15ea
--- /dev/null
+++ b/drivers/mmc/core/Kconfig
@@ -0,0 +1,17 @@
+#
+# MMC core configuration
+#
+
+config MMC_UNSAFE_RESUME
+        bool "Allow unsafe resume (DANGEROUS)"
+        depends on MMC != n
+        help
+          If you say Y here, the MMC layer will assume that all cards
+          stayed in their respective slots during the suspend. The
+          normal behaviour is to remove them at suspend and
+          redetecting them at resume. Breaking this assumption will
+          in most cases result in data corruption.
+
+          This option is usually just for embedded systems which use
+          a MMC/SD card for rootfs. Most people should say N here.
+
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
new file mode 100644
index 000000000000..1075b02ae754
--- /dev/null
+++ b/drivers/mmc/core/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the kernel mmc core.
+#
+
+ifeq ($(CONFIG_MMC_DEBUG),y)
+        EXTRA_CFLAGS            += -DDEBUG
+endif
+
+obj-$(CONFIG_MMC)               += mmc_core.o
+mmc_core-y                      := core.o sysfs.o mmc.o mmc_ops.o sd.o sd_ops.o
+
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
new file mode 100644
index 000000000000..72c7cf4a9f9d
--- /dev/null
+++ b/drivers/mmc/core/core.c
@@ -0,0 +1,727 @@
+/*
+ *  linux/drivers/mmc/core/core.c
+ *
+ *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
+ *  MMCv4 support Copyright (C) 2006 Philip Langdale, All Rights Reserved.
+ *
+ * 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/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/completion.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/pagemap.h>
+#include <linux/err.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
+
+#include "core.h"
+#include "sysfs.h"
+
+#include "mmc_ops.h"
+#include "sd_ops.h"
+
+extern int mmc_attach_mmc(struct mmc_host *host, u32 ocr);
+extern int mmc_attach_sd(struct mmc_host *host, u32 ocr);
+
+/**
+ *      mmc_request_done - finish processing an MMC request
+ *      @host: MMC host which completed request
+ *      @mrq: MMC request which request
+ *
+ *      MMC drivers should call this function when they have completed
+ *      their processing of a request.
+ */
+void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
+{
+        struct mmc_command *cmd = mrq->cmd;
+        int err = cmd->error;
+
+        pr_debug("%s: req done (CMD%u): %d/%d/%d: %08x %08x %08x %08x\n",
+                 mmc_hostname(host), cmd->opcode, err,
+                 mrq->data ? mrq->data->error : 0,
+                 mrq->stop ? mrq->stop->error : 0,
+                 cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
+
+        if (err && cmd->retries) {
+                cmd->retries--;
+                cmd->error = 0;
+                host->ops->request(host, mrq);
+        } else if (mrq->done) {
+                mrq->done(mrq);
+        }
+}
+
+EXPORT_SYMBOL(mmc_request_done);
+
+/**
+ *      mmc_start_request - start a command on a host
+ *      @host: MMC host to start command on
+ *      @mrq: MMC request to start
+ *
+ *      Queue a command on the specified host.  We expect the
+ *      caller to be holding the host lock with interrupts disabled.
+ */
+void
+mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
+{
+#ifdef CONFIG_MMC_DEBUG
+        unsigned int i, sz;
+#endif
+
+        pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
+                 mmc_hostname(host), mrq->cmd->opcode,
+                 mrq->cmd->arg, mrq->cmd->flags);
+
+        WARN_ON(!host->claimed);
+
+        mrq->cmd->error = 0;
+        mrq->cmd->mrq = mrq;
+        if (mrq->data) {
+                BUG_ON(mrq->data->blksz > host->max_blk_size);
+                BUG_ON(mrq->data->blocks > host->max_blk_count);
+                BUG_ON(mrq->data->blocks * mrq->data->blksz >
+                        host->max_req_size);
+
+#ifdef CONFIG_MMC_DEBUG
+                sz = 0;
+                for (i = 0;i < mrq->data->sg_len;i++)
+                        sz += mrq->data->sg[i].length;
+                BUG_ON(sz != mrq->data->blocks * mrq->data->blksz);
+#endif
+
+                mrq->cmd->data = mrq->data;
+                mrq->data->error = 0;
+                mrq->data->mrq = mrq;
+                if (mrq->stop) {
+                        mrq->data->stop = mrq->stop;
+                        mrq->stop->error = 0;
+                        mrq->stop->mrq = mrq;
+                }
+        }
+        host->ops->request(host, mrq);
+}
+
+EXPORT_SYMBOL(mmc_start_request);
+
+static void mmc_wait_done(struct mmc_request *mrq)
+{
+        complete(mrq->done_data);
+}
+
+int mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)
+{
+        DECLARE_COMPLETION_ONSTACK(complete);
+
+        mrq->done_data = &complete;
+        mrq->done = mmc_wait_done;
+
+        mmc_start_request(host, mrq);
+
+        wait_for_completion(&complete);
+
+        return 0;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_req);
+
+/**
+ *      mmc_wait_for_cmd - start a command and wait for completion
+ *      @host: MMC host to start command
+ *      @cmd: MMC command to start
+ *      @retries: maximum number of retries
+ *
+ *      Start a new MMC command for a host, and wait for the command
+ *      to complete.  Return any error that occurred while the command
+ *      was executing.  Do not attempt to parse the response.
+ */
+int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries)
+{
+        struct mmc_request mrq;
+
+        BUG_ON(!host->claimed);
+
+        memset(&mrq, 0, sizeof(struct mmc_request));
+
+        memset(cmd->resp, 0, sizeof(cmd->resp));
+        cmd->retries = retries;
+
+        mrq.cmd = cmd;
+        cmd->data = NULL;
+
+        mmc_wait_for_req(host, &mrq);
+
+        return cmd->error;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_cmd);
+
+/**
+ *      mmc_set_data_timeout - set the timeout for a data command
+ *      @data: data phase for command
+ *      @card: the MMC card associated with the data transfer
+ *      @write: flag to differentiate reads from writes
+ */
+void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card,
+                          int write)
+{
+        unsigned int mult;
+
+        /*
+         * SD cards use a 100 multiplier rather than 10
+         */
+        mult = mmc_card_sd(card) ? 100 : 10;
+
+        /*
+         * Scale up the multiplier (and therefore the timeout) by
+         * the r2w factor for writes.
+         */
+        if (write)
+                mult <<= card->csd.r2w_factor;
+
+        data->timeout_ns = card->csd.tacc_ns * mult;
+        data->timeout_clks = card->csd.tacc_clks * mult;
+
+        /*
+         * SD cards also have an upper limit on the timeout.
+         */
+        if (mmc_card_sd(card)) {
+                unsigned int timeout_us, limit_us;
+
+                timeout_us = data->timeout_ns / 1000;
+                timeout_us += data->timeout_clks * 1000 /
+                        (card->host->ios.clock / 1000);
+
+                if (write)
+                        limit_us = 250000;
+                else
+                        limit_us = 100000;
+
+                /*
+                 * SDHC cards always use these fixed values.
+                 */
+                if (timeout_us > limit_us || mmc_card_blockaddr(card)) {
+                        data->timeout_ns = limit_us * 1000;
+                        data->timeout_clks = 0;
+                }
+        }
+}
+EXPORT_SYMBOL(mmc_set_data_timeout);
+
+/**
+ *      __mmc_claim_host - exclusively claim a host
+ *      @host: mmc host to claim
+ *      @card: mmc card to claim host for
+ *
+ *      Claim a host for a set of operations.  If a valid card
+ *      is passed and this wasn't the last card selected, select
+ *      the card before returning.
+ *
+ *      Note: you should use mmc_card_claim_host or mmc_claim_host.
+ */
+void mmc_claim_host(struct mmc_host *host)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        unsigned long flags;
+
+        add_wait_queue(&host->wq, &wait);
+        spin_lock_irqsave(&host->lock, flags);
+        while (1) {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                if (!host->claimed)
+                        break;
+                spin_unlock_irqrestore(&host->lock, flags);
+                schedule();
+                spin_lock_irqsave(&host->lock, flags);
+        }
+        set_current_state(TASK_RUNNING);
+        host->claimed = 1;
+        spin_unlock_irqrestore(&host->lock, flags);
+        remove_wait_queue(&host->wq, &wait);
+}
+
+EXPORT_SYMBOL(mmc_claim_host);
+
+/**
+ *      mmc_release_host - release a host
+ *      @host: mmc host to release
+ *
+ *      Release a MMC host, allowing others to claim the host
+ *      for their operations.
+ */
+void mmc_release_host(struct mmc_host *host)
+{
+        unsigned long flags;
+
+        BUG_ON(!host->claimed);
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->claimed = 0;
+        spin_unlock_irqrestore(&host->lock, flags);
+
+        wake_up(&host->wq);
+}
+
+EXPORT_SYMBOL(mmc_release_host);
+
+/*
+ * Internal function that does the actual ios call to the host driver,
+ * optionally printing some debug output.
+ */
+static inline void mmc_set_ios(struct mmc_host *host)
+{
+        struct mmc_ios *ios = &host->ios;
+
+        pr_debug("%s: clock %uHz busmode %u powermode %u cs %u Vdd %u "
+                "width %u timing %u\n",
+                 mmc_hostname(host), ios->clock, ios->bus_mode,
+                 ios->power_mode, ios->chip_select, ios->vdd,
+                 ios->bus_width, ios->timing);
+
+        host->ops->set_ios(host, ios);
+}
+
+/*
+ * Control chip select pin on a host.
+ */
+void mmc_set_chip_select(struct mmc_host *host, int mode)
+{
+        host->ios.chip_select = mode;
+        mmc_set_ios(host);
+}
+
+/*
+ * Sets the host clock to the highest possible frequency that
+ * is below "hz".
+ */
+void mmc_set_clock(struct mmc_host *host, unsigned int hz)
+{
+        WARN_ON(hz < host->f_min);
+
+        if (hz > host->f_max)
+                hz = host->f_max;
+
+        host->ios.clock = hz;
+        mmc_set_ios(host);
+}
+
+/*
+ * Change the bus mode (open drain/push-pull) of a host.
+ */
+void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode)
+{
+        host->ios.bus_mode = mode;
+        mmc_set_ios(host);
+}
+
+/*
+ * Change data bus width of a host.
+ */
+void mmc_set_bus_width(struct mmc_host *host, unsigned int width)
+{
+        host->ios.bus_width = width;
+        mmc_set_ios(host);
+}
+
+/*
+ * Mask off any voltages we don't support and select
+ * the lowest voltage
+ */
+u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
+{
+        int bit;
+
+        ocr &= host->ocr_avail;
+
+        bit = ffs(ocr);
+        if (bit) {
+                bit -= 1;
+
+                ocr &= 3 << bit;
+
+                host->ios.vdd = bit;
+                mmc_set_ios(host);
+        } else {
+                ocr = 0;
+        }
+
+        return ocr;
+}
+
+/*
+ * Select timing parameters for host.
+ */
+void mmc_set_timing(struct mmc_host *host, unsigned int timing)
+{
+        host->ios.timing = timing;
+        mmc_set_ios(host);
+}
+
+/*
+ * Allocate a new MMC card
+ */
+struct mmc_card *mmc_alloc_card(struct mmc_host *host)
+{
+        struct mmc_card *card;
+
+        card = kmalloc(sizeof(struct mmc_card), GFP_KERNEL);
+        if (!card)
+                return ERR_PTR(-ENOMEM);
+
+        mmc_init_card(card, host);
+
+        return card;
+}
+
+/*
+ * Apply power to the MMC stack.  This is a two-stage process.
+ * First, we enable power to the card without the clock running.
+ * We then wait a bit for the power to stabilise.  Finally,
+ * enable the bus drivers and clock to the card.
+ *
+ * We must _NOT_ enable the clock prior to power stablising.
+ *
+ * If a host does all the power sequencing itself, ignore the
+ * initial MMC_POWER_UP stage.
+ */
+static void mmc_power_up(struct mmc_host *host)
+{
+        int bit = fls(host->ocr_avail) - 1;
+
+        host->ios.vdd = bit;
+        host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
+        host->ios.power_mode = MMC_POWER_UP;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
+        host->ios.timing = MMC_TIMING_LEGACY;
+        mmc_set_ios(host);
+
+        mmc_delay(1);
+
+        host->ios.clock = host->f_min;
+        host->ios.power_mode = MMC_POWER_ON;
+        mmc_set_ios(host);
+
+        mmc_delay(2);
+}
+
+static void mmc_power_off(struct mmc_host *host)
+{
+        host->ios.clock = 0;
+        host->ios.vdd = 0;
+        host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
+        host->ios.power_mode = MMC_POWER_OFF;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
+        host->ios.timing = MMC_TIMING_LEGACY;
+        mmc_set_ios(host);
+}
+
+/*
+ * Assign a mmc bus handler to a host. Only one bus handler may control a
+ * host at any given time.
+ */
+void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops)
+{
+        unsigned long flags;
+
+        BUG_ON(!host);
+        BUG_ON(!ops);
+
+        BUG_ON(!host->claimed);
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        BUG_ON(host->bus_ops);
+        BUG_ON(host->bus_refs);
+
+        host->bus_ops = ops;
+        host->bus_refs = 1;
+        host->bus_dead = 0;
+
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+/*
+ * Remove the current bus handler from a host. Assumes that there are
+ * no interesting cards left, so the bus is powered down.
+ */
+void mmc_detach_bus(struct mmc_host *host)
+{
+        unsigned long flags;
+
+        BUG_ON(!host);
+
+        BUG_ON(!host->claimed);
+        BUG_ON(!host->bus_ops);
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        host->bus_dead = 1;
+
+        spin_unlock_irqrestore(&host->lock, flags);
+
+        mmc_power_off(host);
+
+        mmc_bus_put(host);
+}
+
+/*
+ * Cleanup when the last reference to the bus operator is dropped.
+ */
+void __mmc_release_bus(struct mmc_host *host)
+{
+        BUG_ON(!host);
+        BUG_ON(host->bus_refs);
+        BUG_ON(!host->bus_dead);
+
+        host->bus_ops = NULL;
+}
+
+/**
+ *      mmc_detect_change - process change of state on a MMC socket
+ *      @host: host which changed state.
+ *      @delay: optional delay to wait before detection (jiffies)
+ *
+ *      All we know is that card(s) have been inserted or removed
+ *      from the socket(s).  We don't know which socket or cards.
+ */
+void mmc_detect_change(struct mmc_host *host, unsigned long delay)
+{
+#ifdef CONFIG_MMC_DEBUG
+        mmc_claim_host(host);
+        BUG_ON(host->removed);
+        mmc_release_host(host);
+#endif
+
+        mmc_schedule_delayed_work(&host->detect, delay);
+}
+
+EXPORT_SYMBOL(mmc_detect_change);
+
+
+static void mmc_rescan(struct work_struct *work)
+{
+        struct mmc_host *host =
+                container_of(work, struct mmc_host, detect.work);
+        u32 ocr;
+        int err;
+
+        mmc_bus_get(host);
+
+        if (host->bus_ops == NULL) {
+                /*
+                 * Only we can add a new handler, so it's safe to
+                 * release the lock here.
+                 */
+                mmc_bus_put(host);
+
+                mmc_claim_host(host);
+
+                mmc_power_up(host);
+                mmc_go_idle(host);
+
+                mmc_send_if_cond(host, host->ocr_avail);
+
+                err = mmc_send_app_op_cond(host, 0, &ocr);
+                if (err == MMC_ERR_NONE) {
+                        if (mmc_attach_sd(host, ocr))
+                                mmc_power_off(host);
+                } else {
+                        /*
+                         * If we fail to detect any SD cards then try
+                         * searching for MMC cards.
+                         */
+                        err = mmc_send_op_cond(host, 0, &ocr);
+                        if (err == MMC_ERR_NONE) {
+                                if (mmc_attach_mmc(host, ocr))
+                                        mmc_power_off(host);
+                        } else {
+                                mmc_power_off(host);
+                                mmc_release_host(host);
+                        }
+                }
+        } else {
+                if (host->bus_ops->detect && !host->bus_dead)
+                        host->bus_ops->detect(host);
+
+                mmc_bus_put(host);
+        }
+}
+
+
+/**
+ *      mmc_alloc_host - initialise the per-host structure.
+ *      @extra: sizeof private data structure
+ *      @dev: pointer to host device model structure
+ *
+ *      Initialise the per-host structure.
+ */
+struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+{
+        struct mmc_host *host;
+
+        host = mmc_alloc_host_sysfs(extra, dev);
+        if (host) {
+                spin_lock_init(&host->lock);
+                init_waitqueue_head(&host->wq);
+                INIT_DELAYED_WORK(&host->detect, mmc_rescan);
+
+                /*
+                 * By default, hosts do not support SGIO or large requests.
+                 * They have to set these according to their abilities.
+                 */
+                host->max_hw_segs = 1;
+                host->max_phys_segs = 1;
+                host->max_seg_size = PAGE_CACHE_SIZE;
+
+                host->max_req_size = PAGE_CACHE_SIZE;
+                host->max_blk_size = 512;
+                host->max_blk_count = PAGE_CACHE_SIZE / 512;
+        }
+
+        return host;
+}
+
+EXPORT_SYMBOL(mmc_alloc_host);
+
+/**
+ *      mmc_add_host - initialise host hardware
+ *      @host: mmc host
+ */
+int mmc_add_host(struct mmc_host *host)
+{
+        int ret;
+
+        ret = mmc_add_host_sysfs(host);
+        if (ret == 0) {
+                mmc_power_off(host);
+                mmc_detect_change(host, 0);
+        }
+
+        return ret;
+}
+
+EXPORT_SYMBOL(mmc_add_host);
+
+/**
+ *      mmc_remove_host - remove host hardware
+ *      @host: mmc host
+ *
+ *      Unregister and remove all cards associated with this host,
+ *      and power down the MMC bus.
+ */
+void mmc_remove_host(struct mmc_host *host)
+{
+#ifdef CONFIG_MMC_DEBUG
+        mmc_claim_host(host);
+        host->removed = 1;
+        mmc_release_host(host);
+#endif
+
+        mmc_flush_scheduled_work();
+
+        mmc_bus_get(host);
+        if (host->bus_ops && !host->bus_dead) {
+                if (host->bus_ops->remove)
+                        host->bus_ops->remove(host);
+
+                mmc_claim_host(host);
+                mmc_detach_bus(host);
+                mmc_release_host(host);
+        }
+        mmc_bus_put(host);
+
+        BUG_ON(host->card);
+
+        mmc_power_off(host);
+        mmc_remove_host_sysfs(host);
+}
+
+EXPORT_SYMBOL(mmc_remove_host);
+
+/**
+ *      mmc_free_host - free the host structure
+ *      @host: mmc host
+ *
+ *      Free the host once all references to it have been dropped.
+ */
+void mmc_free_host(struct mmc_host *host)
+{
+        mmc_free_host_sysfs(host);
+}
+
+EXPORT_SYMBOL(mmc_free_host);
+
+#ifdef CONFIG_PM
+
+/**
+ *      mmc_suspend_host - suspend a host
+ *      @host: mmc host
+ *      @state: suspend mode (PM_SUSPEND_xxx)
+ */
+int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
+{
+        mmc_flush_scheduled_work();
+
+        mmc_bus_get(host);
+        if (host->bus_ops && !host->bus_dead) {
+                if (host->bus_ops->suspend)
+                        host->bus_ops->suspend(host);
+                if (!host->bus_ops->resume) {
+                        if (host->bus_ops->remove)
+                                host->bus_ops->remove(host);
+
+                        mmc_claim_host(host);
+                        mmc_detach_bus(host);
+                        mmc_release_host(host);
+                }
+        }
+        mmc_bus_put(host);
+
+        mmc_power_off(host);
+
+        return 0;
+}
+
+EXPORT_SYMBOL(mmc_suspend_host);
+
+/**
+ *      mmc_resume_host - resume a previously suspended host
+ *      @host: mmc host
+ */
+int mmc_resume_host(struct mmc_host *host)
+{
+        mmc_bus_get(host);
+        if (host->bus_ops && !host->bus_dead) {
+                mmc_power_up(host);
+                BUG_ON(!host->bus_ops->resume);
+                host->bus_ops->resume(host);
+        }
+        mmc_bus_put(host);
+
+        /*
+         * We add a slight delay here so that resume can progress
+         * in parallel.
+         */
+        mmc_detect_change(host, 1);
+
+        return 0;
+}
+
+EXPORT_SYMBOL(mmc_resume_host);
+
+#endif
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
new file mode 100644
index 000000000000..177264d090ac
--- /dev/null
+++ b/drivers/mmc/core/core.h
@@ -0,0 +1,70 @@
+/*
+ *  linux/drivers/mmc/core/core.h
+ *
+ *  Copyright (C) 2003 Russell King, All Rights Reserved.
+ *  Copyright 2007 Pierre Ossman
+ *
+ * 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.
+ */
+#ifndef _MMC_CORE_CORE_H
+#define _MMC_CORE_CORE_H
+
+#include <linux/delay.h>
+
+#define MMC_CMD_RETRIES        3
+
+struct mmc_bus_ops {
+        void (*remove)(struct mmc_host *);
+        void (*detect)(struct mmc_host *);
+        void (*suspend)(struct mmc_host *);
+        void (*resume)(struct mmc_host *);
+};
+
+void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
+void mmc_detach_bus(struct mmc_host *host);
+
+void __mmc_release_bus(struct mmc_host *host);
+
+static inline void mmc_bus_get(struct mmc_host *host)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->bus_refs++;
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static inline void mmc_bus_put(struct mmc_host *host)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->bus_refs--;
+        if ((host->bus_refs == 0) && host->bus_ops)
+                __mmc_release_bus(host);
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+void mmc_set_chip_select(struct mmc_host *host, int mode);
+void mmc_set_clock(struct mmc_host *host, unsigned int hz);
+void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
+void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
+u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
+void mmc_set_timing(struct mmc_host *host, unsigned int timing);
+
+struct mmc_card *mmc_alloc_card(struct mmc_host *host);
+
+static inline void mmc_delay(unsigned int ms)
+{
+        if (ms < 1000 / HZ) {
+                cond_resched();
+                mdelay(ms);
+        } else {
+                msleep(ms);
+        }
+}
+
+#endif
+
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
new file mode 100644
index 000000000000..42cc2867ed7d
--- /dev/null
+++ b/drivers/mmc/core/mmc.c
@@ -0,0 +1,537 @@
+/*
+ *  linux/drivers/mmc/mmc.c
+ *
+ *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
+ *  MMCv4 support Copyright (C) 2006 Philip Langdale, All Rights Reserved.
+ *
+ * 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/err.h>
+
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
+
+#include "core.h"
+#include "sysfs.h"
+#include "mmc_ops.h"
+
+static const unsigned int tran_exp[] = {
+        10000,          100000,         1000000,        10000000,
+        0,              0,              0,              0
+};
+
+static const unsigned char tran_mant[] = {
+        0,      10,     12,     13,     15,     20,     25,     30,
+        35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+static const unsigned int tacc_exp[] = {
+        1,      10,     100,    1000,   10000,  100000, 1000000, 10000000,
+};
+
+static const unsigned int tacc_mant[] = {
+        0,      10,     12,     13,     15,     20,     25,     30,
+        35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+#define UNSTUFF_BITS(resp,start,size)                                   \
+        ({                                                              \
+                const int __size = size;                                \
+                const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
+                const int __off = 3 - ((start) / 32);                   \
+                const int __shft = (start) & 31;                        \
+                u32 __res;                                              \
+                                                                        \
+                __res = resp[__off] >> __shft;                          \
+                if (__size + __shft > 32)                               \
+                        __res |= resp[__off-1] << ((32 - __shft) % 32); \
+                __res & __mask;                                         \
+        })
+
+/*
+ * Given the decoded CSD structure, decode the raw CID to our CID structure.
+ */
+static int mmc_decode_cid(struct mmc_card *card)
+{
+        u32 *resp = card->raw_cid;
+
+        /*
+         * The selection of the format here is based upon published
+         * specs from sandisk and from what people have reported.
+         */
+        switch (card->csd.mmca_vsn) {
+        case 0: /* MMC v1.0 - v1.2 */
+        case 1: /* MMC v1.4 */
+                card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
+                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
+                card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
+                card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
+                card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
+                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                break;
+
+        case 2: /* MMC v2.0 - v2.2 */
+        case 3: /* MMC v3.1 - v3.3 */
+        case 4: /* MMC v4 */
+                card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+                card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
+                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                break;
+
+        default:
+                printk("%s: card has unknown MMCA version %d\n",
+                        mmc_hostname(card->host), card->csd.mmca_vsn);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * Given a 128-bit response, decode to our card CSD structure.
+ */
+static int mmc_decode_csd(struct mmc_card *card)
+{
+        struct mmc_csd *csd = &card->csd;
+        unsigned int e, m, csd_struct;
+        u32 *resp = card->raw_csd;
+
+        /*
+         * We only understand CSD structure v1.1 and v1.2.
+         * v1.2 has extra information in bits 15, 11 and 10.
+         */
+        csd_struct = UNSTUFF_BITS(resp, 126, 2);
+        if (csd_struct != 1 && csd_struct != 2) {
+                printk("%s: unrecognised CSD structure version %d\n",
+                        mmc_hostname(card->host), csd_struct);
+                return -EINVAL;
+        }
+
+        csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
+        m = UNSTUFF_BITS(resp, 115, 4);
+        e = UNSTUFF_BITS(resp, 112, 3);
+        csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+        csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+        m = UNSTUFF_BITS(resp, 99, 4);
+        e = UNSTUFF_BITS(resp, 96, 3);
+        csd->max_dtr      = tran_exp[e] * tran_mant[m];
+        csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+        e = UNSTUFF_BITS(resp, 47, 3);
+        m = UNSTUFF_BITS(resp, 62, 12);
+        csd->capacity     = (1 + m) << (e + 2);
+
+        csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+        csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+        csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+        csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+        csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
+        csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
+        csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+
+        return 0;
+}
+
+/*
+ * Read and decode extended CSD.
+ */
+static int mmc_read_ext_csd(struct mmc_card *card)
+{
+        int err;
+        u8 *ext_csd;
+
+        BUG_ON(!card);
+
+        err = MMC_ERR_FAILED;
+
+        if (card->csd.mmca_vsn < CSD_SPEC_VER_4)
+                return MMC_ERR_NONE;
+
+        /*
+         * As the ext_csd is so large and mostly unused, we don't store the
+         * raw block in mmc_card.
+         */
+        ext_csd = kmalloc(512, GFP_KERNEL);
+        if (!ext_csd) {
+                printk(KERN_ERR "%s: could not allocate a buffer to "
+                        "receive the ext_csd. mmc v4 cards will be "
+                        "treated as v3.\n", mmc_hostname(card->host));
+                return MMC_ERR_FAILED;
+        }
+
+        err = mmc_send_ext_csd(card, ext_csd);
+        if (err != MMC_ERR_NONE) {
+                /*
+                 * High capacity cards should have this "magic" size
+                 * stored in their CSD.
+                 */
+                if (card->csd.capacity == (4096 * 512)) {
+                        printk(KERN_ERR "%s: unable to read EXT_CSD "
+                                "on a possible high capacity card. "
+                                "Card will be ignored.\n",
+                                mmc_hostname(card->host));
+                } else {
+                        printk(KERN_WARNING "%s: unable to read "
+                                "EXT_CSD, performance might "
+                                "suffer.\n",
+                                mmc_hostname(card->host));
+                        err = MMC_ERR_NONE;
+                }
+                goto out;
+        }
+
+        card->ext_csd.sectors =
+                ext_csd[EXT_CSD_SEC_CNT + 0] << 0 |
+                ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
+                ext_csd[EXT_CSD_SEC_CNT + 2] << 16 |
+                ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
+        if (card->ext_csd.sectors)
+                mmc_card_set_blockaddr(card);
+
+        switch (ext_csd[EXT_CSD_CARD_TYPE]) {
+        case EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
+                card->ext_csd.hs_max_dtr = 52000000;
+                break;
+        case EXT_CSD_CARD_TYPE_26:
+                card->ext_csd.hs_max_dtr = 26000000;
+                break;
+        default:
+                /* MMC v4 spec says this cannot happen */
+                printk(KERN_WARNING "%s: card is mmc v4 but doesn't "
+                        "support any high-speed modes.\n",
+                        mmc_hostname(card->host));
+                goto out;
+        }
+
+out:
+        kfree(ext_csd);
+
+        return err;
+}
+
+/*
+ * Handle the detection and initialisation of a card.
+ *
+ * In the case of a resume, "curcard" will contain the card
+ * we're trying to reinitialise.
+ */
+static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
+        struct mmc_card *oldcard)
+{
+        struct mmc_card *card;
+        int err;
+        u32 cid[4];
+        unsigned int max_dtr;
+
+        BUG_ON(!host);
+        BUG_ON(!host->claimed);
+
+        /*
+         * Since we're changing the OCR value, we seem to
+         * need to tell some cards to go back to the idle
+         * state.  We wait 1ms to give cards time to
+         * respond.
+         */
+        mmc_go_idle(host);
+
+        /* The extra bit indicates that we support high capacity */
+        err = mmc_send_op_cond(host, ocr | (1 << 30), NULL);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        /*
+         * Fetch CID from card.
+         */
+        err = mmc_all_send_cid(host, cid);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        if (oldcard) {
+                if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0)
+                        goto err;
+
+                card = oldcard;
+        } else {
+                /*
+                 * Allocate card structure.
+                 */
+                card = mmc_alloc_card(host);
+                if (IS_ERR(card))
+                        goto err;
+
+                card->type = MMC_TYPE_MMC;
+                card->rca = 1;
+                memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
+        }
+
+        /*
+         * Set card RCA.
+         */
+        err = mmc_set_relative_addr(card);
+        if (err != MMC_ERR_NONE)
+                goto free_card;
+
+        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+
+        if (!oldcard) {
+                /*
+                 * Fetch CSD from card.
+                 */
+                err = mmc_send_csd(card, card->raw_csd);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                err = mmc_decode_csd(card);
+                if (err < 0)
+                        goto free_card;
+                err = mmc_decode_cid(card);
+                if (err < 0)
+                        goto free_card;
+        }
+
+        /*
+         * Select card, as all following commands rely on that.
+         */
+        err = mmc_select_card(card);
+        if (err != MMC_ERR_NONE)
+                goto free_card;
+
+        if (!oldcard) {
+                /*
+                 * Fetch and process extened CSD.
+                 */
+                err = mmc_read_ext_csd(card);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+        }
+
+        /*
+         * Activate high speed (if supported)
+         */
+        if ((card->ext_csd.hs_max_dtr != 0) &&
+                (host->caps & MMC_CAP_MMC_HIGHSPEED)) {
+                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                        EXT_CSD_HS_TIMING, 1);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                mmc_card_set_highspeed(card);
+
+                mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
+        }
+
+        /*
+         * Compute bus speed.
+         */
+        max_dtr = (unsigned int)-1;
+
+        if (mmc_card_highspeed(card)) {
+                if (max_dtr > card->ext_csd.hs_max_dtr)
+                        max_dtr = card->ext_csd.hs_max_dtr;
+        } else if (max_dtr > card->csd.max_dtr) {
+                max_dtr = card->csd.max_dtr;
+        }
+
+        mmc_set_clock(host, max_dtr);
+
+        /*
+         * Activate wide bus (if supported).
+         */
+        if ((card->csd.mmca_vsn >= CSD_SPEC_VER_4) &&
+                (host->caps & MMC_CAP_4_BIT_DATA)) {
+                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                        EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_4);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                mmc_set_bus_width(card->host, MMC_BUS_WIDTH_4);
+        }
+
+        if (!oldcard)
+                host->card = card;
+
+        return MMC_ERR_NONE;
+
+free_card:
+        if (!oldcard)
+                mmc_remove_card(card);
+err:
+
+        return MMC_ERR_FAILED;
+}
+
+/*
+ * Host is being removed. Free up the current card.
+ */
+static void mmc_remove(struct mmc_host *host)
+{
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_remove_card(host->card);
+        host->card = NULL;
+}
+
+/*
+ * Card detection callback from host.
+ */
+static void mmc_detect(struct mmc_host *host)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+
+        /*
+         * Just check if our card has been removed.
+         */
+        err = mmc_send_status(host->card, NULL);
+
+        mmc_release_host(host);
+
+        if (err != MMC_ERR_NONE) {
+                mmc_remove_card(host->card);
+                host->card = NULL;
+
+                mmc_claim_host(host);
+                mmc_detach_bus(host);
+                mmc_release_host(host);
+        }
+}
+
+#ifdef CONFIG_MMC_UNSAFE_RESUME
+
+/*
+ * Suspend callback from host.
+ */
+static void mmc_suspend(struct mmc_host *host)
+{
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+        mmc_deselect_cards(host);
+        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        mmc_release_host(host);
+}
+
+/*
+ * Resume callback from host.
+ *
+ * This function tries to determine if the same card is still present
+ * and, if so, restore all state to it.
+ */
+static void mmc_resume(struct mmc_host *host)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+
+        err = mmc_sd_init_card(host, host->ocr, host->card);
+        if (err != MMC_ERR_NONE) {
+                mmc_remove_card(host->card);
+                host->card = NULL;
+
+                mmc_detach_bus(host);
+        }
+
+        mmc_release_host(host);
+}
+
+#else
+
+#define mmc_suspend NULL
+#define mmc_resume NULL
+
+#endif
+
+static const struct mmc_bus_ops mmc_ops = {
+        .remove = mmc_remove,
+        .detect = mmc_detect,
+        .suspend = mmc_suspend,
+        .resume = mmc_resume,
+};
+
+/*
+ * Starting point for MMC card init.
+ */
+int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->claimed);
+
+        mmc_attach_bus(host, &mmc_ops);
+
+        /*
+         * Sanity check the voltages that the card claims to
+         * support.
+         */
+        if (ocr & 0x7F) {
+                printk(KERN_WARNING "%s: card claims to support voltages "
+                       "below the defined range. These will be ignored.\n",
+                       mmc_hostname(host));
+                ocr &= ~0x7F;
+        }
+
+        host->ocr = mmc_select_voltage(host, ocr);
+
+        /*
+         * Can we support the voltage of the card?
+         */
+        if (!host->ocr)
+                goto err;
+
+        /*
+         * Detect and init the card.
+         */
+        err = mmc_sd_init_card(host, host->ocr, NULL);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        mmc_release_host(host);
+
+        err = mmc_register_card(host->card);
+        if (err)
+                goto reclaim_host;
+
+        return 0;
+
+reclaim_host:
+        mmc_claim_host(host);
+        mmc_remove_card(host->card);
+        host->card = NULL;
+err:
+        mmc_detach_bus(host);
+        mmc_release_host(host);
+
+        return 0;
+}
+
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
new file mode 100644
index 000000000000..7dd720fa5895
--- /dev/null
+++ b/drivers/mmc/core/mmc_ops.c
@@ -0,0 +1,276 @@
+/*
+ *  linux/drivers/mmc/mmc_ops.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * 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.
+ */
+
+#include <linux/types.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
+
+#include "core.h"
+#include "mmc_ops.h"
+
+static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SELECT_CARD;
+
+        if (card) {
+                cmd.arg = card->rca << 16;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        } else {
+                cmd.arg = 0;
+                cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;
+        }
+
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_select_card(struct mmc_card *card)
+{
+        BUG_ON(!card);
+
+        return _mmc_select_card(card->host, card);
+}
+
+int mmc_deselect_cards(struct mmc_host *host)
+{
+        return _mmc_select_card(host, NULL);
+}
+
+int mmc_go_idle(struct mmc_host *host)
+{
+        int err;
+        struct mmc_command cmd;
+
+        mmc_set_chip_select(host, MMC_CS_HIGH);
+
+        mmc_delay(1);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_GO_IDLE_STATE;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
+
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+
+        mmc_delay(1);
+
+        mmc_set_chip_select(host, MMC_CS_DONTCARE);
+
+        mmc_delay(1);
+
+        return err;
+}
+
+int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+        struct mmc_command cmd;
+        int i, err = 0;
+
+        BUG_ON(!host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SEND_OP_COND;
+        cmd.arg = ocr;
+        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+
+        for (i = 100; i; i--) {
+                err = mmc_wait_for_cmd(host, &cmd, 0);
+                if (err != MMC_ERR_NONE)
+                        break;
+
+                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                        break;
+
+                err = MMC_ERR_TIMEOUT;
+
+                mmc_delay(10);
+        }
+
+        if (rocr)
+                *rocr = cmd.resp[0];
+
+        return err;
+}
+
+int mmc_all_send_cid(struct mmc_host *host, u32 *cid)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!host);
+        BUG_ON(!cid);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_ALL_SEND_CID;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
+
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        memcpy(cid, cmd.resp, sizeof(u32) * 4);
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_set_relative_addr(struct mmc_card *card)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SET_RELATIVE_ADDR;
+        cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_send_csd(struct mmc_card *card, u32 *csd)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+        BUG_ON(!csd);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SEND_CSD;
+        cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
+
+        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        memcpy(csd, cmd.resp, sizeof(u32) * 4);
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
+{
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_data data;
+        struct scatterlist sg;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+        BUG_ON(!ext_csd);
+
+        memset(&mrq, 0, sizeof(struct mmc_request));
+        memset(&cmd, 0, sizeof(struct mmc_command));
+        memset(&data, 0, sizeof(struct mmc_data));
+
+        mrq.cmd = &cmd;
+        mrq.data = &data;
+
+        cmd.opcode = MMC_SEND_EXT_CSD;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        data.blksz = 512;
+        data.blocks = 1;
+        data.flags = MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+
+        sg_init_one(&sg, ext_csd, 512);
+
+        mmc_set_data_timeout(&data, card, 0);
+
+        mmc_wait_for_req(card->host, &mrq);
+
+        if (cmd.error != MMC_ERR_NONE)
+                return cmd.error;
+        if (data.error != MMC_ERR_NONE)
+                return data.error;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SWITCH;
+        cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
+                  (index << 16) |
+                  (value << 8) |
+                  set;
+        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+
+        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_send_status(struct mmc_card *card, u32 *status)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SEND_STATUS;
+        cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        if (status)
+                *status = cmd.resp[0];
+
+        return MMC_ERR_NONE;
+}
+
diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
new file mode 100644
index 000000000000..7a481e8ca5ea
--- /dev/null
+++ b/drivers/mmc/core/mmc_ops.h
@@ -0,0 +1,27 @@
+/*
+ *  linux/drivers/mmc/mmc_ops.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * 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.
+ */
+
+#ifndef _MMC_MMC_OPS_H
+#define _MMC_MMC_OPS_H
+
+int mmc_select_card(struct mmc_card *card);
+int mmc_deselect_cards(struct mmc_host *host);
+int mmc_go_idle(struct mmc_host *host);
+int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
+int mmc_all_send_cid(struct mmc_host *host, u32 *cid);
+int mmc_set_relative_addr(struct mmc_card *card);
+int mmc_send_csd(struct mmc_card *card, u32 *csd);
+int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
+int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value);
+int mmc_send_status(struct mmc_card *card, u32 *status);
+
+#endif
+
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
new file mode 100644
index 000000000000..c1dfd03d559a
--- /dev/null
+++ b/drivers/mmc/core/sd.c
@@ -0,0 +1,587 @@
+/*
+ *  linux/drivers/mmc/sd.c
+ *
+ *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
+ *
+ * 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/err.h>
+
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
+
+#include "core.h"
+#include "sysfs.h"
+#include "mmc_ops.h"
+#include "sd_ops.h"
+
+#include "core.h"
+
+static const unsigned int tran_exp[] = {
+        10000,          100000,         1000000,        10000000,
+        0,              0,              0,              0
+};
+
+static const unsigned char tran_mant[] = {
+        0,      10,     12,     13,     15,     20,     25,     30,
+        35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+static const unsigned int tacc_exp[] = {
+        1,      10,     100,    1000,   10000,  100000, 1000000, 10000000,
+};
+
+static const unsigned int tacc_mant[] = {
+        0,      10,     12,     13,     15,     20,     25,     30,
+        35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+#define UNSTUFF_BITS(resp,start,size)                                   \
+        ({                                                              \
+                const int __size = size;                                \
+                const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
+                const int __off = 3 - ((start) / 32);                   \
+                const int __shft = (start) & 31;                        \
+                u32 __res;                                              \
+                                                                        \
+                __res = resp[__off] >> __shft;                          \
+                if (__size + __shft > 32)                               \
+                        __res |= resp[__off-1] << ((32 - __shft) % 32); \
+                __res & __mask;                                         \
+        })
+
+/*
+ * Given the decoded CSD structure, decode the raw CID to our CID structure.
+ */
+static void mmc_decode_cid(struct mmc_card *card)
+{
+        u32 *resp = card->raw_cid;
+
+        memset(&card->cid, 0, sizeof(struct mmc_cid));
+
+        /*
+         * SD doesn't currently have a version field so we will
+         * have to assume we can parse this.
+         */
+        card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
+        card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
+        card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
+        card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
+        card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
+        card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
+        card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
+        card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
+        card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
+        card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
+        card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
+        card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
+
+        card->cid.year += 2000; /* SD cards year offset */
+}
+
+/*
+ * Given a 128-bit response, decode to our card CSD structure.
+ */
+static int mmc_decode_csd(struct mmc_card *card)
+{
+        struct mmc_csd *csd = &card->csd;
+        unsigned int e, m, csd_struct;
+        u32 *resp = card->raw_csd;
+
+        csd_struct = UNSTUFF_BITS(resp, 126, 2);
+
+        switch (csd_struct) {
+        case 0:
+                m = UNSTUFF_BITS(resp, 115, 4);
+                e = UNSTUFF_BITS(resp, 112, 3);
+                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                e = UNSTUFF_BITS(resp, 47, 3);
+                m = UNSTUFF_BITS(resp, 62, 12);
+                csd->capacity     = (1 + m) << (e + 2);
+
+                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+                csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+                csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+                csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+                csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
+                csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
+                csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+                break;
+        case 1:
+                /*
+                 * This is a block-addressed SDHC card. Most
+                 * interesting fields are unused and have fixed
+                 * values. To avoid getting tripped by buggy cards,
+                 * we assume those fixed values ourselves.
+                 */
+                mmc_card_set_blockaddr(card);
+
+                csd->tacc_ns     = 0; /* Unused */
+                csd->tacc_clks   = 0; /* Unused */
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                m = UNSTUFF_BITS(resp, 48, 22);
+                csd->capacity     = (1 + m) << 10;
+
+                csd->read_blkbits = 9;
+                csd->read_partial = 0;
+                csd->write_misalign = 0;
+                csd->read_misalign = 0;
+                csd->r2w_factor = 4; /* Unused */
+                csd->write_blkbits = 9;
+                csd->write_partial = 0;
+                break;
+        default:
+                printk("%s: unrecognised CSD structure version %d\n",
+                        mmc_hostname(card->host), csd_struct);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * Given a 64-bit response, decode to our card SCR structure.
+ */
+static int mmc_decode_scr(struct mmc_card *card)
+{
+        struct sd_scr *scr = &card->scr;
+        unsigned int scr_struct;
+        u32 resp[4];
+
+        BUG_ON(!mmc_card_sd(card));
+
+        resp[3] = card->raw_scr[1];
+        resp[2] = card->raw_scr[0];
+
+        scr_struct = UNSTUFF_BITS(resp, 60, 4);
+        if (scr_struct != 0) {
+                printk("%s: unrecognised SCR structure version %d\n",
+                        mmc_hostname(card->host), scr_struct);
+                return -EINVAL;
+        }
+
+        scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+        scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
+
+        return 0;
+}
+
+/*
+ * Fetches and decodes switch information
+ */
+static int mmc_read_switch(struct mmc_card *card)
+{
+        int err;
+        u8 *status;
+
+        err = MMC_ERR_FAILED;
+
+        status = kmalloc(64, GFP_KERNEL);
+        if (!status) {
+                printk("%s: could not allocate a buffer for switch "
+                       "capabilities.\n",
+                        mmc_hostname(card->host));
+                return err;
+        }
+
+        err = mmc_sd_switch(card, 0, 0, 1, status);
+        if (err != MMC_ERR_NONE) {
+                /*
+                 * Card not supporting high-speed will ignore the
+                 * command.
+                 */
+                err = MMC_ERR_NONE;
+                goto out;
+        }
+
+        if (status[13] & 0x02)
+                card->sw_caps.hs_max_dtr = 50000000;
+
+out:
+        kfree(status);
+
+        return err;
+}
+
+/*
+ * Test if the card supports high-speed mode and, if so, switch to it.
+ */
+static int mmc_switch_hs(struct mmc_card *card)
+{
+        int err;
+        u8 *status;
+
+        if (!(card->host->caps & MMC_CAP_SD_HIGHSPEED))
+                return MMC_ERR_NONE;
+
+        if (card->sw_caps.hs_max_dtr == 0)
+                return MMC_ERR_NONE;
+
+        err = MMC_ERR_FAILED;
+
+        status = kmalloc(64, GFP_KERNEL);
+        if (!status) {
+                printk("%s: could not allocate a buffer for switch "
+                       "capabilities.\n",
+                        mmc_hostname(card->host));
+                return err;
+        }
+
+        err = mmc_sd_switch(card, 1, 0, 1, status);
+        if (err != MMC_ERR_NONE)
+                goto out;
+
+        if ((status[16] & 0xF) != 1) {
+                printk(KERN_WARNING "%s: Problem switching card "
+                        "into high-speed mode!\n",
+                        mmc_hostname(card->host));
+        } else {
+                mmc_card_set_highspeed(card);
+                mmc_set_timing(card->host, MMC_TIMING_SD_HS);
+        }
+
+out:
+        kfree(status);
+
+        return err;
+}
+
+/*
+ * Handle the detection and initialisation of a card.
+ *
+ * In the case of a resume, "curcard" will contain the card
+ * we're trying to reinitialise.
+ */
+static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
+        struct mmc_card *oldcard)
+{
+        struct mmc_card *card;
+        int err;
+        u32 cid[4];
+        unsigned int max_dtr;
+
+        BUG_ON(!host);
+        BUG_ON(!host->claimed);
+
+        /*
+         * Since we're changing the OCR value, we seem to
+         * need to tell some cards to go back to the idle
+         * state.  We wait 1ms to give cards time to
+         * respond.
+         */
+        mmc_go_idle(host);
+
+        /*
+         * If SD_SEND_IF_COND indicates an SD 2.0
+         * compliant card and we should set bit 30
+         * of the ocr to indicate that we can handle
+         * block-addressed SDHC cards.
+         */
+        err = mmc_send_if_cond(host, ocr);
+        if (err == MMC_ERR_NONE)
+                ocr |= 1 << 30;
+
+        err = mmc_send_app_op_cond(host, ocr, NULL);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        /*
+         * Fetch CID from card.
+         */
+        err = mmc_all_send_cid(host, cid);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        if (oldcard) {
+                if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0)
+                        goto err;
+
+                card = oldcard;
+        } else {
+                /*
+                 * Allocate card structure.
+                 */
+                card = mmc_alloc_card(host);
+                if (IS_ERR(card))
+                        goto err;
+
+                card->type = MMC_TYPE_SD;
+                memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
+        }
+
+        /*
+         * Set card RCA.
+         */
+        err = mmc_send_relative_addr(host, &card->rca);
+        if (err != MMC_ERR_NONE)
+                goto free_card;
+
+        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+
+        if (!oldcard) {
+                /*
+                 * Fetch CSD from card.
+                 */
+                err = mmc_send_csd(card, card->raw_csd);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                err = mmc_decode_csd(card);
+                if (err < 0)
+                        goto free_card;
+
+                mmc_decode_cid(card);
+        }
+
+        /*
+         * Select card, as all following commands rely on that.
+         */
+        err = mmc_select_card(card);
+        if (err != MMC_ERR_NONE)
+                goto free_card;
+
+        if (!oldcard) {
+                /*
+                 * Fetch SCR from card.
+                 */
+                err = mmc_app_send_scr(card, card->raw_scr);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                err = mmc_decode_scr(card);
+                if (err < 0)
+                        goto free_card;
+
+                /*
+                 * Fetch switch information from card.
+                 */
+                err = mmc_read_switch(card);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+        }
+
+        /*
+         * Attempt to change to high-speed (if supported)
+         */
+        err = mmc_switch_hs(card);
+        if (err != MMC_ERR_NONE)
+                goto free_card;
+
+        /*
+         * Compute bus speed.
+         */
+        max_dtr = (unsigned int)-1;
+
+        if (mmc_card_highspeed(card)) {
+                if (max_dtr > card->sw_caps.hs_max_dtr)
+                        max_dtr = card->sw_caps.hs_max_dtr;
+        } else if (max_dtr > card->csd.max_dtr) {
+                max_dtr = card->csd.max_dtr;
+        }
+
+        mmc_set_clock(host, max_dtr);
+
+        /*
+         * Switch to wider bus (if supported).
+         */
+        if ((host->caps && MMC_CAP_4_BIT_DATA) &&
+                (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) {
+                err = mmc_app_set_bus_width(card, MMC_BUS_WIDTH_4);
+                if (err != MMC_ERR_NONE)
+                        goto free_card;
+
+                mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
+        }
+
+        if (!oldcard)
+                host->card = card;
+
+        return MMC_ERR_NONE;
+
+free_card:
+        if (!oldcard)
+                mmc_remove_card(card);
+err:
+
+        return MMC_ERR_FAILED;
+}
+
+/*
+ * Host is being removed. Free up the current card.
+ */
+static void mmc_sd_remove(struct mmc_host *host)
+{
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_remove_card(host->card);
+        host->card = NULL;
+}
+
+/*
+ * Card detection callback from host.
+ */
+static void mmc_sd_detect(struct mmc_host *host)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+
+        /*
+         * Just check if our card has been removed.
+         */
+        err = mmc_send_status(host->card, NULL);
+
+        mmc_release_host(host);
+
+        if (err != MMC_ERR_NONE) {
+                mmc_remove_card(host->card);
+                host->card = NULL;
+
+                mmc_claim_host(host);
+                mmc_detach_bus(host);
+                mmc_release_host(host);
+        }
+}
+
+#ifdef CONFIG_MMC_UNSAFE_RESUME
+
+/*
+ * Suspend callback from host.
+ */
+static void mmc_sd_suspend(struct mmc_host *host)
+{
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+        mmc_deselect_cards(host);
+        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        mmc_release_host(host);
+}
+
+/*
+ * Resume callback from host.
+ *
+ * This function tries to determine if the same card is still present
+ * and, if so, restore all state to it.
+ */
+static void mmc_sd_resume(struct mmc_host *host)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->card);
+
+        mmc_claim_host(host);
+
+        err = mmc_sd_init_card(host, host->ocr, host->card);
+        if (err != MMC_ERR_NONE) {
+                mmc_remove_card(host->card);
+                host->card = NULL;
+
+                mmc_detach_bus(host);
+        }
+
+        mmc_release_host(host);
+}
+
+#else
+
+#define mmc_sd_suspend NULL
+#define mmc_sd_resume NULL
+
+#endif
+
+static const struct mmc_bus_ops mmc_sd_ops = {
+        .remove = mmc_sd_remove,
+        .detect = mmc_sd_detect,
+        .suspend = mmc_sd_suspend,
+        .resume = mmc_sd_resume,
+};
+
+/*
+ * Starting point for SD card init.
+ */
+int mmc_attach_sd(struct mmc_host *host, u32 ocr)
+{
+        int err;
+
+        BUG_ON(!host);
+        BUG_ON(!host->claimed);
+
+        mmc_attach_bus(host, &mmc_sd_ops);
+
+        /*
+         * Sanity check the voltages that the card claims to
+         * support.
+         */
+        if (ocr & 0x7F) {
+                printk(KERN_WARNING "%s: card claims to support voltages "
+                       "below the defined range. These will be ignored.\n",
+                       mmc_hostname(host));
+                ocr &= ~0x7F;
+        }
+
+        if (ocr & MMC_VDD_165_195) {
+                printk(KERN_WARNING "%s: SD card claims to support the "
+                       "incompletely defined 'low voltage range'. This "
+                       "will be ignored.\n", mmc_hostname(host));
+                ocr &= ~MMC_VDD_165_195;
+        }
+
+        host->ocr = mmc_select_voltage(host, ocr);
+
+        /*
+         * Can we support the voltage(s) of the card(s)?
+         */
+        if (!host->ocr)
+                goto err;
+
+        /*
+         * Detect and init the card.
+         */
+        err = mmc_sd_init_card(host, host->ocr, NULL);
+        if (err != MMC_ERR_NONE)
+                goto err;
+
+        mmc_release_host(host);
+
+        err = mmc_register_card(host->card);
+        if (err)
+                goto reclaim_host;
+
+        return 0;
+
+reclaim_host:
+        mmc_claim_host(host);
+        mmc_remove_card(host->card);
+        host->card = NULL;
+err:
+        mmc_detach_bus(host);
+        mmc_release_host(host);
+
+        return 0;
+}
+
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
new file mode 100644
index 000000000000..9697ce581101
--- /dev/null
+++ b/drivers/mmc/core/sd_ops.c
@@ -0,0 +1,316 @@
+/*
+ *  linux/drivers/mmc/sd_ops.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * 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.
+ */
+
+#include <linux/types.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
+
+#include "core.h"
+#include "sd_ops.h"
+
+/**
+ *      mmc_wait_for_app_cmd - start an application command and wait for
+                               completion
+ *      @host: MMC host to start command
+ *      @rca: RCA to send MMC_APP_CMD to
+ *      @cmd: MMC command to start
+ *      @retries: maximum number of retries
+ *
+ *      Sends a MMC_APP_CMD, checks the card response, sends the command
+ *      in the parameter and waits for it to complete. Return any error
+ *      that occurred while the command was executing.  Do not attempt to
+ *      parse the response.
+ */
+int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card,
+        struct mmc_command *cmd, int retries)
+{
+        struct mmc_request mrq;
+
+        int i, err;
+
+        BUG_ON(!cmd);
+        BUG_ON(retries < 0);
+
+        err = MMC_ERR_INVALID;
+
+        /*
+         * We have to resend MMC_APP_CMD for each attempt so
+         * we cannot use the retries field in mmc_command.
+         */
+        for (i = 0;i <= retries;i++) {
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                err = mmc_app_cmd(host, card);
+                if (err != MMC_ERR_NONE)
+                        continue;
+
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                memset(cmd->resp, 0, sizeof(cmd->resp));
+                cmd->retries = 0;
+
+                mrq.cmd = cmd;
+                cmd->data = NULL;
+
+                mmc_wait_for_req(host, &mrq);
+
+                err = cmd->error;
+                if (cmd->error == MMC_ERR_NONE)
+                        break;
+        }
+
+        return err;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_app_cmd);
+
+int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!host);
+        BUG_ON(card && (card->host != host));
+
+        cmd.opcode = MMC_APP_CMD;
+
+        if (card) {
+                cmd.arg = card->rca << 16;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        } else {
+                cmd.arg = 0;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_BCR;
+        }
+
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        /* Check that card supported application commands */
+        if (!(cmd.resp[0] & R1_APP_CMD))
+                return MMC_ERR_FAILED;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_app_set_bus_width(struct mmc_card *card, int width)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = SD_APP_SET_BUS_WIDTH;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+        switch (width) {
+        case MMC_BUS_WIDTH_1:
+                cmd.arg = SD_BUS_WIDTH_1;
+                break;
+        case MMC_BUS_WIDTH_4:
+                cmd.arg = SD_BUS_WIDTH_4;
+                break;
+        default:
+                return MMC_ERR_INVALID;
+        }
+
+        err = mmc_wait_for_app_cmd(card->host, card, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+        struct mmc_command cmd;
+        int i, err = 0;
+
+        BUG_ON(!host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = SD_APP_OP_COND;
+        cmd.arg = ocr;
+        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+
+        for (i = 100; i; i--) {
+                err = mmc_wait_for_app_cmd(host, NULL, &cmd, MMC_CMD_RETRIES);
+                if (err != MMC_ERR_NONE)
+                        break;
+
+                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                        break;
+
+                err = MMC_ERR_TIMEOUT;
+
+                mmc_delay(10);
+        }
+
+        if (rocr)
+                *rocr = cmd.resp[0];
+
+        return err;
+}
+
+int mmc_send_if_cond(struct mmc_host *host, u32 ocr)
+{
+        struct mmc_command cmd;
+        int err;
+        static const u8 test_pattern = 0xAA;
+
+        /*
+         * To support SD 2.0 cards, we must always invoke SD_SEND_IF_COND
+         * before SD_APP_OP_COND. This command will harmlessly fail for
+         * SD 1.0 cards.
+         */
+        cmd.opcode = SD_SEND_IF_COND;
+        cmd.arg = ((ocr & 0xFF8000) != 0) << 8 | test_pattern;
+        cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
+
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        if ((cmd.resp[0] & 0xFF) != test_pattern)
+                return MMC_ERR_FAILED;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(!host);
+        BUG_ON(!rca);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = SD_SEND_RELATIVE_ADDR;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
+
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        *rca = cmd.resp[0] >> 16;
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
+{
+        int err;
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_data data;
+        struct scatterlist sg;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+        BUG_ON(!scr);
+
+        err = mmc_app_cmd(card->host, card);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        memset(&mrq, 0, sizeof(struct mmc_request));
+        memset(&cmd, 0, sizeof(struct mmc_command));
+        memset(&data, 0, sizeof(struct mmc_data));
+
+        mrq.cmd = &cmd;
+        mrq.data = &data;
+
+        cmd.opcode = SD_APP_SEND_SCR;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        data.blksz = 8;
+        data.blocks = 1;
+        data.flags = MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+
+        sg_init_one(&sg, scr, 8);
+
+        mmc_set_data_timeout(&data, card, 0);
+
+        mmc_wait_for_req(card->host, &mrq);
+
+        if (cmd.error != MMC_ERR_NONE)
+                return cmd.error;
+        if (data.error != MMC_ERR_NONE)
+                return data.error;
+
+        scr[0] = ntohl(scr[0]);
+        scr[1] = ntohl(scr[1]);
+
+        return MMC_ERR_NONE;
+}
+
+int mmc_sd_switch(struct mmc_card *card, int mode, int group,
+        u8 value, u8 *resp)
+{
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_data data;
+        struct scatterlist sg;
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        mode = !!mode;
+        value &= 0xF;
+
+        memset(&mrq, 0, sizeof(struct mmc_request));
+        memset(&cmd, 0, sizeof(struct mmc_command));
+        memset(&data, 0, sizeof(struct mmc_data));
+
+        mrq.cmd = &cmd;
+        mrq.data = &data;
+
+        cmd.opcode = SD_SWITCH;
+        cmd.arg = mode << 31 | 0x00FFFFFF;
+        cmd.arg &= ~(0xF << (group * 4));
+        cmd.arg |= value << (group * 4);
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        data.blksz = 64;
+        data.blocks = 1;
+        data.flags = MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+
+        sg_init_one(&sg, resp, 64);
+
+        mmc_set_data_timeout(&data, card, 0);
+
+        mmc_wait_for_req(card->host, &mrq);
+
+        if (cmd.error != MMC_ERR_NONE)
+                return cmd.error;
+        if (data.error != MMC_ERR_NONE)
+                return data.error;
+
+        return MMC_ERR_NONE;
+}
+
diff --git a/drivers/mmc/core/sd_ops.h b/drivers/mmc/core/sd_ops.h
new file mode 100644
index 000000000000..1240fddba5e3
--- /dev/null
+++ b/drivers/mmc/core/sd_ops.h
@@ -0,0 +1,25 @@
+/*
+ *  linux/drivers/mmc/sd_ops.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * 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.
+ */
+
+#ifndef _MMC_SD_OPS_H
+#define _MMC_SD_OPS_H
+
+int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card);
+int mmc_app_set_bus_width(struct mmc_card *card, int width);
+int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
+int mmc_send_if_cond(struct mmc_host *host, u32 ocr);
+int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca);
+int mmc_app_send_scr(struct mmc_card *card, u32 *scr);
+int mmc_sd_switch(struct mmc_card *card, int mode, int group,
+        u8 value, u8 *resp);
+
+#endif
+
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/core/sysfs.c
index e0e82d849d5f..843b1fbba557 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/core/sysfs.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/mmc/mmc_sysfs.c
+ *  linux/drivers/mmc/core/sysfs.c
  *
  *  Copyright (C) 2003 Russell King, All Rights Reserved.
  *
@@ -18,7 +18,7 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 
-#include "mmc.h"
+#include "sysfs.h"
 
 #define dev_to_mmc_card(d)      container_of(d, struct mmc_card, dev)
 #define to_mmc_driver(d)        container_of(d, struct mmc_driver, drv)
@@ -72,12 +72,11 @@ static void mmc_release_card(struct device *dev)
 /*
  * This currently matches any MMC driver to any MMC card - drivers
  * themselves make the decision whether to drive this card in their
- * probe method.  However, we force "bad" cards to fail.
+ * probe method.
  */
 static int mmc_bus_match(struct device *dev, struct device_driver *drv)
 {
-        struct mmc_card *card = dev_to_mmc_card(dev);
-        return !mmc_card_bad(card);
+        return 1;
 }
 
 static int
@@ -217,6 +216,8 @@ int mmc_register_card(struct mmc_card *card)
                                 device_del(&card->dev);
                 }
         }
+        if (ret == 0)
+                mmc_card_set_present(card);
         return ret;
 }
 
diff --git a/drivers/mmc/mmc.h b/drivers/mmc/core/sysfs.h
index 149affe0b686..80e29b358282 100644
--- a/drivers/mmc/mmc.h
+++ b/drivers/mmc/core/sysfs.h
@@ -1,15 +1,16 @@
 /*
- *  linux/drivers/mmc/mmc.h
+ *  linux/drivers/mmc/core/sysfs.h
  *
  *  Copyright (C) 2003 Russell King, All Rights Reserved.
+ *  Copyright 2007 Pierre Ossman
  *
  * 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.
  */
-#ifndef _MMC_H
-#define _MMC_H
-/* core-internal functions */
+#ifndef _MMC_CORE_SYSFS_H
+#define _MMC_CORE_SYSFS_H
+
 void mmc_init_card(struct mmc_card *card, struct mmc_host *host);
 int mmc_register_card(struct mmc_card *card);
 void mmc_remove_card(struct mmc_card *card);
@@ -22,4 +23,5 @@ void mmc_free_host_sysfs(struct mmc_host *host);
 int mmc_schedule_work(struct work_struct *work);
 int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay);
 void mmc_flush_scheduled_work(void);
+
 #endif
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
new file mode 100644
index 000000000000..ed4deab2203d
--- /dev/null
+++ b/drivers/mmc/host/Kconfig
@@ -0,0 +1,103 @@
+#
+# MMC/SD host controller drivers
+#
+
+comment "MMC/SD Host Controller Drivers"
+        depends on MMC
+
+config MMC_ARMMMCI
+        tristate "ARM AMBA Multimedia Card Interface support"
+        depends on ARM_AMBA && MMC
+        help
+          This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
+          Interface (PL180 and PL181) support.  If you have an ARM(R)
+          platform with a Multimedia Card slot, say Y or M here.
+
+          If unsure, say N.
+
+config MMC_PXA
+        tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
+        depends on ARCH_PXA && MMC
+        help
+          This selects the Intel(R) PXA(R) Multimedia card Interface.
+          If you have a PXA(R) platform with a Multimedia Card slot,
+          say Y or M here.
+
+          If unsure, say N.
+
+config MMC_SDHCI
+        tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"
+        depends on PCI && MMC && EXPERIMENTAL
+        help
+          This select the generic Secure Digital Host Controller Interface.
+          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
+          and Toshiba(R). Most controllers found in laptops are of this type.
+          If you have a controller with this interface, say Y or M here.
+
+          If unsure, say N.
+
+config MMC_OMAP
+        tristate "TI OMAP Multimedia Card Interface support"
+        depends on ARCH_OMAP && MMC
+        select TPS65010 if MACH_OMAP_H2
+        help
+          This selects the TI OMAP Multimedia card Interface.
+          If you have an OMAP board with a Multimedia Card slot,
+          say Y or M here.
+
+          If unsure, say N.
+
+config MMC_WBSD
+        tristate "Winbond W83L51xD SD/MMC Card Interface support"
+        depends on MMC && ISA_DMA_API
+        help
+          This selects the Winbond(R) W83L51xD Secure digital and
+          Multimedia card Interface.
+          If you have a machine with a integrated W83L518D or W83L519D
+          SD/MMC card reader, say Y or M here.
+
+          If unsure, say N.
+
+config MMC_AU1X
+        tristate "Alchemy AU1XX0 MMC Card Interface support"
+        depends on MMC && SOC_AU1200
+        help
+          This selects the AMD Alchemy(R) Multimedia card interface.
+          If you have a Alchemy platform with a MMC slot, say Y or M here.
+
+          If unsure, say N.
+
+config MMC_AT91
+        tristate "AT91 SD/MMC Card Interface support"
+        depends on ARCH_AT91 && MMC
+        help
+          This selects the AT91 MCI controller.
+
+          If unsure, say N.
+
+config MMC_IMX
+        tristate "Motorola i.MX Multimedia Card Interface support"
+        depends on ARCH_IMX && MMC
+        help
+          This selects the Motorola i.MX Multimedia card Interface.
+          If you have a i.MX platform with a Multimedia Card slot,
+          say Y or M here.
+
+          If unsure, say N.
+
+config MMC_TIFM_SD
+        tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
+        depends on MMC && EXPERIMENTAL && PCI
+        select TIFM_CORE
+        help
+          Say Y here if you want to be able to access MMC/SD cards with
+          the Texas Instruments(R) Flash Media card reader, found in many
+          laptops.
+          This option 'selects' (turns on, enables) 'TIFM_CORE', but you
+          probably also need appropriate card reader host adapter, such as
+          'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support
+          (TIFM_7XX1)'.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tifm_sd.
+
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
new file mode 100644
index 000000000000..6685f64345b4
--- /dev/null
+++ b/drivers/mmc/host/Makefile
@@ -0,0 +1,18 @@
+#
+# Makefile for MMC/SD host controller drivers
+#
+
+ifeq ($(CONFIG_MMC_DEBUG),y)
+        EXTRA_CFLAGS            += -DDEBUG
+endif
+
+obj-$(CONFIG_MMC_ARMMMCI)       += mmci.o
+obj-$(CONFIG_MMC_PXA)           += pxamci.o
+obj-$(CONFIG_MMC_IMX)           += imxmmc.o
+obj-$(CONFIG_MMC_SDHCI)         += sdhci.o
+obj-$(CONFIG_MMC_WBSD)          += wbsd.o
+obj-$(CONFIG_MMC_AU1X)          += au1xmmc.o
+obj-$(CONFIG_MMC_OMAP)          += omap.o
+obj-$(CONFIG_MMC_AT91)          += at91_mci.o
+obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
+
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 459f4b4feded..e37943c314cb 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -67,7 +67,6 @@
 #include <linux/atmel_pdc.h>
 
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index b834be261ab7..b7156a4555b5 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -42,7 +42,6 @@
 #include <linux/dma-mapping.h>
 
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 #include <asm/io.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
diff --git a/drivers/mmc/au1xmmc.h b/drivers/mmc/host/au1xmmc.h
index 341cbdf0baca..341cbdf0baca 100644
--- a/drivers/mmc/au1xmmc.h
+++ b/drivers/mmc/host/au1xmmc.h
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 0de5c9e94e74..7ee2045acbef 100644
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -41,7 +41,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
-#include <linux/mmc/protocol.h>
 #include <linux/delay.h>
 
 #include <asm/dma.h>
diff --git a/drivers/mmc/imxmmc.h b/drivers/mmc/host/imxmmc.h
index e5339e334dbb..e5339e334dbb 100644
--- a/drivers/mmc/imxmmc.h
+++ b/drivers/mmc/host/imxmmc.h
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/host/mmci.c
index 5941dd951e82..d11c2d23ceea 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -17,7 +17,6 @@
 #include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 #include <linux/amba/bus.h>
 #include <linux/clk.h>
 
diff --git a/drivers/mmc/mmci.h b/drivers/mmc/host/mmci.h
index 6d7eadc9a678..6d7eadc9a678 100644
--- a/drivers/mmc/mmci.h
+++ b/drivers/mmc/host/mmci.h
diff --git a/drivers/mmc/omap.c b/drivers/mmc/host/omap.c
index 1e96a2f65022..1914e65d4db1 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -22,7 +22,6 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 #include <linux/mmc/card.h>
 #include <linux/clk.h>
 
@@ -605,7 +604,7 @@ static void mmc_omap_switch_handler(struct work_struct *work)
         }
         if (mmc_omap_cover_is_open(host)) {
                 if (!complained) {
-                        dev_info(mmc_dev(host->mmc), "cover is open");
+                        dev_info(mmc_dev(host->mmc), "cover is open\n");
                         complained = 1;
                 }
                 if (mmc_omap_enable_poll)
@@ -937,48 +936,55 @@ static void mmc_omap_power(struct mmc_omap_host *host, int on)
         }
 }
 
-static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+static int mmc_omap_calc_divisor(struct mmc_host *mmc, struct mmc_ios *ios)
 {
         struct mmc_omap_host *host = mmc_priv(mmc);
+        int func_clk_rate = clk_get_rate(host->fclk);
         int dsor;
-        int realclock, i;
-
-        realclock = ios->clock;
 
         if (ios->clock == 0)
-                dsor = 0;
-        else {
-                int func_clk_rate = clk_get_rate(host->fclk);
-
-                dsor = func_clk_rate / realclock;
-                if (dsor < 1)
-                        dsor = 1;
+                return 0;
 
-                if (func_clk_rate / dsor > realclock)
-                        dsor++;
+        dsor = func_clk_rate / ios->clock;
+        if (dsor < 1)
+                dsor = 1;
 
-                if (dsor > 250)
-                        dsor = 250;
+        if (func_clk_rate / dsor > ios->clock)
                 dsor++;
 
-                if (ios->bus_width == MMC_BUS_WIDTH_4)
-                        dsor |= 1 << 15;
-        }
+        if (dsor > 250)
+                dsor = 250;
+        dsor++;
+
+        if (ios->bus_width == MMC_BUS_WIDTH_4)
+                dsor |= 1 << 15;
+
+        return dsor;
+}
+
+static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        struct mmc_omap_host *host = mmc_priv(mmc);
+        int dsor;
+        int i;
+
+        dsor = mmc_omap_calc_divisor(mmc, ios);
+        host->bus_mode = ios->bus_mode;
+        host->hw_bus_mode = host->bus_mode;
 
         switch (ios->power_mode) {
         case MMC_POWER_OFF:
                 mmc_omap_power(host, 0);
                 break;
         case MMC_POWER_UP:
-        case MMC_POWER_ON:
+                /* Cannot touch dsor yet, just power up MMC */
                 mmc_omap_power(host, 1);
+                return;
+        case MMC_POWER_ON:
                 dsor |= 1 << 11;
                 break;
         }
 
-        host->bus_mode = ios->bus_mode;
-        host->hw_bus_mode = host->bus_mode;
-
         clk_enable(host->fclk);
 
         /* On insanely high arm_per frequencies something sometimes
@@ -987,7 +993,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
          * Writing to the CON register twice seems to do the trick. */
         for (i = 0; i < 2; i++)
                 OMAP_MMC_WRITE(host, CON, dsor);
-        if (ios->power_mode == MMC_POWER_UP) {
+        if (ios->power_mode == MMC_POWER_ON) {
                 /* Send clock cycles, poll completion */
                 OMAP_MMC_WRITE(host, IE, 0);
                 OMAP_MMC_WRITE(host, STAT, 0xffff);
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/host/pxamci.c
index 9774fc68b61a..d97d3864b57f 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -24,7 +24,6 @@
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 
 #include <asm/dma.h>
 #include <asm/io.h>
@@ -369,14 +368,14 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 if (CLOCKRATE / clk > ios->clock)
                         clk <<= 1;
                 host->clkrt = fls(clk) - 1;
-                pxa_set_cken(CKEN12_MMC, 1);
+                pxa_set_cken(CKEN_MMC, 1);
 
                 /*
                  * we write clkrt on the next command
                  */
         } else {
                 pxamci_stop_clock(host);
-                pxa_set_cken(CKEN12_MMC, 0);
+                pxa_set_cken(CKEN_MMC, 0);
         }
 
         if (host->power_mode != ios->power_mode) {
diff --git a/drivers/mmc/pxamci.h b/drivers/mmc/host/pxamci.h
index 1b163220df2b..1b163220df2b 100644
--- a/drivers/mmc/pxamci.h
+++ b/drivers/mmc/host/pxamci.h
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/host/sdhci.c
index d749f08601b8..ff5bf73cdd25 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/sdhci.c - Secure Digital Host Controller Interface driver
  *
- *  Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
  *
  * 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
@@ -15,7 +15,6 @@
 #include <linux/dma-mapping.h>
 
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 
 #include <asm/scatterlist.h>
 
@@ -247,14 +246,13 @@ static void sdhci_read_block_pio(struct sdhci_host *host)
                         chunk_remain = min(blksize, 4);
                 }
 
-                size = min(host->size, host->remain);
-                size = min(size, chunk_remain);
+                size = min(host->remain, chunk_remain);
 
                 chunk_remain -= size;
                 blksize -= size;
                 host->offset += size;
                 host->remain -= size;
-                host->size -= size;
+
                 while (size) {
                         *buffer = data & 0xFF;
                         buffer++;
@@ -289,14 +287,13 @@ static void sdhci_write_block_pio(struct sdhci_host *host)
         buffer = sdhci_sg_to_buffer(host) + host->offset;
 
         while (blksize) {
-                size = min(host->size, host->remain);
-                size = min(size, chunk_remain);
+                size = min(host->remain, chunk_remain);
 
                 chunk_remain -= size;
                 blksize -= size;
                 host->offset += size;
                 host->remain -= size;
-                host->size -= size;
+
                 while (size) {
                         data >>= 8;
                         data |= (u32)*buffer << 24;
@@ -325,7 +322,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
 
         BUG_ON(!host->data);
 
-        if (host->size == 0)
+        if (host->num_sg == 0)
                 return;
 
         if (host->data->flags & MMC_DATA_READ)
@@ -339,10 +336,8 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
                 else
                         sdhci_write_block_pio(host);
 
-                if (host->size == 0)
+                if (host->num_sg == 0)
                         break;
-
-                BUG_ON(host->num_sg == 0);
         }
 
         DBG("PIO transfer complete.\n");
@@ -408,8 +403,6 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
 
                 writel(sg_dma_address(data->sg), host->ioaddr + SDHCI_DMA_ADDRESS);
         } else {
-                host->size = data->blksz * data->blocks;
-
                 host->cur_sg = data->sg;
                 host->num_sg = data->sg_len;
 
@@ -473,10 +466,6 @@ static void sdhci_finish_data(struct sdhci_host *host)
                         "though there were blocks left.\n",
                         mmc_hostname(host->mmc));
                 data->error = MMC_ERR_FAILED;
-        } else if (host->size != 0) {
-                printk(KERN_ERR "%s: %d bytes were left untransferred.\n",
-                        mmc_hostname(host->mmc), host->size);
-                data->error = MMC_ERR_FAILED;
         }
 
         DBG("Ending data transfer (%d bytes)\n", data->bytes_xfered);
@@ -669,20 +658,16 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)
 
         pwr = SDHCI_POWER_ON;
 
-        switch (power) {
-        case MMC_VDD_170:
-        case MMC_VDD_180:
-        case MMC_VDD_190:
+        switch (1 << power) {
+        case MMC_VDD_165_195:
                 pwr |= SDHCI_POWER_180;
                 break;
-        case MMC_VDD_290:
-        case MMC_VDD_300:
-        case MMC_VDD_310:
+        case MMC_VDD_29_30:
+        case MMC_VDD_30_31:
                 pwr |= SDHCI_POWER_300;
                 break;
-        case MMC_VDD_320:
-        case MMC_VDD_330:
-        case MMC_VDD_340:
+        case MMC_VDD_32_33:
+        case MMC_VDD_33_34:
                 pwr |= SDHCI_POWER_330;
                 break;
         default:
@@ -1294,7 +1279,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
         if (caps & SDHCI_CAN_VDD_300)
                 mmc->ocr_avail |= MMC_VDD_29_30|MMC_VDD_30_31;
         if (caps & SDHCI_CAN_VDD_180)
-                mmc->ocr_avail |= MMC_VDD_17_18|MMC_VDD_18_19;
+                mmc->ocr_avail |= MMC_VDD_165_195;
 
         if (mmc->ocr_avail == 0) {
                 printk(KERN_ERR "%s: Hardware doesn't report any "
diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/host/sdhci.h
index e324f0a623dc..7400f4bc114f 100644
--- a/drivers/mmc/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/sdhci.h - Secure Digital Host Controller Interface driver
  *
- *  Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
  *
  * 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
@@ -187,8 +187,6 @@ struct sdhci_host {
         int                     offset;         /* Offset into current sg */
         int                     remain;         /* Bytes left in current */
 
-        int                     size;           /* Remaining bytes in transfer */
-
         char                    slot_descr[20]; /* Name for reservations */
 
         int                     irq;            /* Device IRQ */
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
new file mode 100644
index 000000000000..7511f961c67b
--- /dev/null
+++ b/drivers/mmc/host/tifm_sd.c
@@ -0,0 +1,1102 @@
+/*
+ *  tifm_sd.c - TI FlashMedia driver
+ *
+ *  Copyright (C) 2006 Alex Dubov <oakad@yahoo.com>
+ *
+ * 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.
+ *
+ * Special thanks to Brad Campbell for extensive testing of this driver.
+ *
+ */
+
+
+#include <linux/tifm.h>
+#include <linux/mmc/host.h>
+#include <linux/highmem.h>
+#include <linux/scatterlist.h>
+#include <asm/io.h>
+
+#define DRIVER_NAME "tifm_sd"
+#define DRIVER_VERSION "0.8"
+
+static int no_dma = 0;
+static int fixed_timeout = 0;
+module_param(no_dma, bool, 0644);
+module_param(fixed_timeout, bool, 0644);
+
+/* Constants here are mostly from OMAP5912 datasheet */
+#define TIFM_MMCSD_RESET      0x0002
+#define TIFM_MMCSD_CLKMASK    0x03ff
+#define TIFM_MMCSD_POWER      0x0800
+#define TIFM_MMCSD_4BBUS      0x8000
+#define TIFM_MMCSD_RXDE       0x8000   /* rx dma enable */
+#define TIFM_MMCSD_TXDE       0x0080   /* tx dma enable */
+#define TIFM_MMCSD_BUFINT     0x0c00   /* set bits: AE, AF */
+#define TIFM_MMCSD_DPE        0x0020   /* data timeout counted in kilocycles */
+#define TIFM_MMCSD_INAB       0x0080   /* abort / initialize command */
+#define TIFM_MMCSD_READ       0x8000
+
+#define TIFM_MMCSD_ERRMASK    0x01e0   /* set bits: CCRC, CTO, DCRC, DTO */
+#define TIFM_MMCSD_EOC        0x0001   /* end of command phase  */
+#define TIFM_MMCSD_CD         0x0002   /* card detect           */
+#define TIFM_MMCSD_CB         0x0004   /* card enter busy state */
+#define TIFM_MMCSD_BRS        0x0008   /* block received/sent   */
+#define TIFM_MMCSD_EOFB       0x0010   /* card exit busy state  */
+#define TIFM_MMCSD_DTO        0x0020   /* data time-out         */
+#define TIFM_MMCSD_DCRC       0x0040   /* data crc error        */
+#define TIFM_MMCSD_CTO        0x0080   /* command time-out      */
+#define TIFM_MMCSD_CCRC       0x0100   /* command crc error     */
+#define TIFM_MMCSD_AF         0x0400   /* fifo almost full      */
+#define TIFM_MMCSD_AE         0x0800   /* fifo almost empty     */
+#define TIFM_MMCSD_OCRB       0x1000   /* OCR busy              */
+#define TIFM_MMCSD_CIRQ       0x2000   /* card irq (cmd40/sdio) */
+#define TIFM_MMCSD_CERR       0x4000   /* card status error     */
+
+#define TIFM_MMCSD_ODTO       0x0040   /* open drain / extended timeout */
+#define TIFM_MMCSD_CARD_RO    0x0200   /* card is read-only     */
+
+#define TIFM_MMCSD_FIFO_SIZE  0x0020
+
+#define TIFM_MMCSD_RSP_R0     0x0000
+#define TIFM_MMCSD_RSP_R1     0x0100
+#define TIFM_MMCSD_RSP_R2     0x0200
+#define TIFM_MMCSD_RSP_R3     0x0300
+#define TIFM_MMCSD_RSP_R4     0x0400
+#define TIFM_MMCSD_RSP_R5     0x0500
+#define TIFM_MMCSD_RSP_R6     0x0600
+
+#define TIFM_MMCSD_RSP_BUSY   0x0800
+
+#define TIFM_MMCSD_CMD_BC     0x0000
+#define TIFM_MMCSD_CMD_BCR    0x1000
+#define TIFM_MMCSD_CMD_AC     0x2000
+#define TIFM_MMCSD_CMD_ADTC   0x3000
+
+#define TIFM_MMCSD_MAX_BLOCK_SIZE  0x0800UL
+
+enum {
+        CMD_READY    = 0x0001,
+        FIFO_READY   = 0x0002,
+        BRS_READY    = 0x0004,
+        SCMD_ACTIVE  = 0x0008,
+        SCMD_READY   = 0x0010,
+        CARD_BUSY    = 0x0020,
+        DATA_CARRY   = 0x0040
+};
+
+struct tifm_sd {
+        struct tifm_dev       *dev;
+
+        unsigned short        eject:1,
+                              open_drain:1,
+                              no_dma:1;
+        unsigned short        cmd_flags;
+
+        unsigned int          clk_freq;
+        unsigned int          clk_div;
+        unsigned long         timeout_jiffies;
+
+        struct tasklet_struct finish_tasklet;
+        struct timer_list     timer;
+        struct mmc_request    *req;
+
+        int                   sg_len;
+        int                   sg_pos;
+        unsigned int          block_pos;
+        struct scatterlist    bounce_buf;
+        unsigned char         bounce_buf_data[TIFM_MMCSD_MAX_BLOCK_SIZE];
+};
+
+/* for some reason, host won't respond correctly to readw/writew */
+static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,
+                              unsigned int off, unsigned int cnt)
+{
+        struct tifm_dev *sock = host->dev;
+        unsigned char *buf;
+        unsigned int pos = 0, val;
+
+        buf = kmap_atomic(pg, KM_BIO_DST_IRQ) + off;
+        if (host->cmd_flags & DATA_CARRY) {
+                buf[pos++] = host->bounce_buf_data[0];
+                host->cmd_flags &= ~DATA_CARRY;
+        }
+
+        while (pos < cnt) {
+                val = readl(sock->addr + SOCK_MMCSD_DATA);
+                buf[pos++] = val & 0xff;
+                if (pos == cnt) {
+                        host->bounce_buf_data[0] = (val >> 8) & 0xff;
+                        host->cmd_flags |= DATA_CARRY;
+                        break;
+                }
+                buf[pos++] = (val >> 8) & 0xff;
+        }
+        kunmap_atomic(buf - off, KM_BIO_DST_IRQ);
+}
+
+static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
+                               unsigned int off, unsigned int cnt)
+{
+        struct tifm_dev *sock = host->dev;
+        unsigned char *buf;
+        unsigned int pos = 0, val;
+
+        buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + off;
+        if (host->cmd_flags & DATA_CARRY) {
+                val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00);
+                writel(val, sock->addr + SOCK_MMCSD_DATA);
+                host->cmd_flags &= ~DATA_CARRY;
+        }
+
+        while (pos < cnt) {
+                val = buf[pos++];
+                if (pos == cnt) {
+                        host->bounce_buf_data[0] = val & 0xff;
+                        host->cmd_flags |= DATA_CARRY;
+                        break;
+                }
+                val |= (buf[pos++] << 8) & 0xff00;
+                writel(val, sock->addr + SOCK_MMCSD_DATA);
+        }
+        kunmap_atomic(buf - off, KM_BIO_SRC_IRQ);
+}
+
+static void tifm_sd_transfer_data(struct tifm_sd *host)
+{
+        struct mmc_data *r_data = host->req->cmd->data;
+        struct scatterlist *sg = r_data->sg;
+        unsigned int off, cnt, t_size = TIFM_MMCSD_FIFO_SIZE * 2;
+        unsigned int p_off, p_cnt;
+        struct page *pg;
+
+        if (host->sg_pos == host->sg_len)
+                return;
+        while (t_size) {
+                cnt = sg[host->sg_pos].length - host->block_pos;
+                if (!cnt) {
+                        host->block_pos = 0;
+                        host->sg_pos++;
+                        if (host->sg_pos == host->sg_len) {
+                                if ((r_data->flags & MMC_DATA_WRITE)
+                                    && DATA_CARRY)
+                                        writel(host->bounce_buf_data[0],
+                                               host->dev->addr
+                                               + SOCK_MMCSD_DATA);
+
+                                return;
+                        }
+                        cnt = sg[host->sg_pos].length;
+                }
+                off = sg[host->sg_pos].offset + host->block_pos;
+
+                pg = nth_page(sg[host->sg_pos].page, off >> PAGE_SHIFT);
+                p_off = offset_in_page(off);
+                p_cnt = PAGE_SIZE - p_off;
+                p_cnt = min(p_cnt, cnt);
+                p_cnt = min(p_cnt, t_size);
+
+                if (r_data->flags & MMC_DATA_READ)
+                        tifm_sd_read_fifo(host, pg, p_off, p_cnt);
+                else if (r_data->flags & MMC_DATA_WRITE)
+                        tifm_sd_write_fifo(host, pg, p_off, p_cnt);
+
+                t_size -= p_cnt;
+                host->block_pos += p_cnt;
+        }
+}
+
+static void tifm_sd_copy_page(struct page *dst, unsigned int dst_off,
+                              struct page *src, unsigned int src_off,
+                              unsigned int count)
+{
+        unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off;
+        unsigned char *dst_buf = kmap_atomic(dst, KM_BIO_DST_IRQ) + dst_off;
+
+        memcpy(dst_buf, src_buf, count);
+
+        kunmap_atomic(dst_buf - dst_off, KM_BIO_DST_IRQ);
+        kunmap_atomic(src_buf - src_off, KM_BIO_SRC_IRQ);
+}
+
+static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data)
+{
+        struct scatterlist *sg = r_data->sg;
+        unsigned int t_size = r_data->blksz;
+        unsigned int off, cnt;
+        unsigned int p_off, p_cnt;
+        struct page *pg;
+
+        dev_dbg(&host->dev->dev, "bouncing block\n");
+        while (t_size) {
+                cnt = sg[host->sg_pos].length - host->block_pos;
+                if (!cnt) {
+                        host->block_pos = 0;
+                        host->sg_pos++;
+                        if (host->sg_pos == host->sg_len)
+                                return;
+                        cnt = sg[host->sg_pos].length;
+                }
+                off = sg[host->sg_pos].offset + host->block_pos;
+
+                pg = nth_page(sg[host->sg_pos].page, off >> PAGE_SHIFT);
+                p_off = offset_in_page(off);
+                p_cnt = PAGE_SIZE - p_off;
+                p_cnt = min(p_cnt, cnt);
+                p_cnt = min(p_cnt, t_size);
+
+                if (r_data->flags & MMC_DATA_WRITE)
+                        tifm_sd_copy_page(host->bounce_buf.page,
+                                          r_data->blksz - t_size,
+                                          pg, p_off, p_cnt);
+                else if (r_data->flags & MMC_DATA_READ)
+                        tifm_sd_copy_page(pg, p_off, host->bounce_buf.page,
+                                          r_data->blksz - t_size, p_cnt);
+
+                t_size -= p_cnt;
+                host->block_pos += p_cnt;
+        }
+}
+
+static int tifm_sd_set_dma_data(struct tifm_sd *host, struct mmc_data *r_data)
+{
+        struct tifm_dev *sock = host->dev;
+        unsigned int t_size = TIFM_DMA_TSIZE * r_data->blksz;
+        unsigned int dma_len, dma_blk_cnt, dma_off;
+        struct scatterlist *sg = NULL;
+        unsigned long flags;
+
+        if (host->sg_pos == host->sg_len)
+                return 1;
+
+        if (host->cmd_flags & DATA_CARRY) {
+                host->cmd_flags &= ~DATA_CARRY;
+                local_irq_save(flags);
+                tifm_sd_bounce_block(host, r_data);
+                local_irq_restore(flags);
+                if (host->sg_pos == host->sg_len)
+                        return 1;
+        }
+
+        dma_len = sg_dma_len(&r_data->sg[host->sg_pos]) - host->block_pos;
+        if (!dma_len) {
+                host->block_pos = 0;
+                host->sg_pos++;
+                if (host->sg_pos == host->sg_len)
+                        return 1;
+                dma_len = sg_dma_len(&r_data->sg[host->sg_pos]);
+        }
+
+        if (dma_len < t_size) {
+                dma_blk_cnt = dma_len / r_data->blksz;
+                dma_off = host->block_pos;
+                host->block_pos += dma_blk_cnt * r_data->blksz;
+        } else {
+                dma_blk_cnt = TIFM_DMA_TSIZE;
+                dma_off = host->block_pos;
+                host->block_pos += t_size;
+        }
+
+        if (dma_blk_cnt)
+                sg = &r_data->sg[host->sg_pos];
+        else if (dma_len) {
+                if (r_data->flags & MMC_DATA_WRITE) {
+                        local_irq_save(flags);
+                        tifm_sd_bounce_block(host, r_data);
+                        local_irq_restore(flags);
+                } else
+                        host->cmd_flags |= DATA_CARRY;
+
+                sg = &host->bounce_buf;
+                dma_off = 0;
+                dma_blk_cnt = 1;
+        } else
+                return 1;
+
+        dev_dbg(&sock->dev, "setting dma for %d blocks\n", dma_blk_cnt);
+        writel(sg_dma_address(sg) + dma_off, sock->addr + SOCK_DMA_ADDRESS);
+        if (r_data->flags & MMC_DATA_WRITE)
+                writel((dma_blk_cnt << 8) | TIFM_DMA_TX | TIFM_DMA_EN,
+                       sock->addr + SOCK_DMA_CONTROL);
+        else
+                writel((dma_blk_cnt << 8) | TIFM_DMA_EN,
+                       sock->addr + SOCK_DMA_CONTROL);
+
+        return 0;
+}
+
+static unsigned int tifm_sd_op_flags(struct mmc_command *cmd)
+{
+        unsigned int rc = 0;
+
+        switch (mmc_resp_type(cmd)) {
+        case MMC_RSP_NONE:
+                rc |= TIFM_MMCSD_RSP_R0;
+                break;
+        case MMC_RSP_R1B:
+                rc |= TIFM_MMCSD_RSP_BUSY; // deliberate fall-through
+        case MMC_RSP_R1:
+                rc |= TIFM_MMCSD_RSP_R1;
+                break;
+        case MMC_RSP_R2:
+                rc |= TIFM_MMCSD_RSP_R2;
+                break;
+        case MMC_RSP_R3:
+                rc |= TIFM_MMCSD_RSP_R3;
+                break;
+        default:
+                BUG();
+        }
+
+        switch (mmc_cmd_type(cmd)) {
+        case MMC_CMD_BC:
+                rc |= TIFM_MMCSD_CMD_BC;
+                break;
+        case MMC_CMD_BCR:
+                rc |= TIFM_MMCSD_CMD_BCR;
+                break;
+        case MMC_CMD_AC:
+                rc |= TIFM_MMCSD_CMD_AC;
+                break;
+        case MMC_CMD_ADTC:
+                rc |= TIFM_MMCSD_CMD_ADTC;
+                break;
+        default:
+                BUG();
+        }
+        return rc;
+}
+
+static void tifm_sd_exec(struct tifm_sd *host, struct mmc_command *cmd)
+{
+        struct tifm_dev *sock = host->dev;
+        unsigned int cmd_mask = tifm_sd_op_flags(cmd);
+
+        if (host->open_drain)
+                cmd_mask |= TIFM_MMCSD_ODTO;
+
+        if (cmd->data && (cmd->data->flags & MMC_DATA_READ))
+                cmd_mask |= TIFM_MMCSD_READ;
+
+        dev_dbg(&sock->dev, "executing opcode 0x%x, arg: 0x%x, mask: 0x%x\n",
+                cmd->opcode, cmd->arg, cmd_mask);
+
+        writel((cmd->arg >> 16) & 0xffff, sock->addr + SOCK_MMCSD_ARG_HIGH);
+        writel(cmd->arg & 0xffff, sock->addr + SOCK_MMCSD_ARG_LOW);
+        writel(cmd->opcode | cmd_mask, sock->addr + SOCK_MMCSD_COMMAND);
+}
+
+static void tifm_sd_fetch_resp(struct mmc_command *cmd, struct tifm_dev *sock)
+{
+        cmd->resp[0] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x1c) << 16)
+                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x18);
+        cmd->resp[1] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x14) << 16)
+                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x10);
+        cmd->resp[2] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x0c) << 16)
+                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x08);
+        cmd->resp[3] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x04) << 16)
+                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x00);
+}
+
+static void tifm_sd_check_status(struct tifm_sd *host)
+{
+        struct tifm_dev *sock = host->dev;
+        struct mmc_command *cmd = host->req->cmd;
+
+        if (cmd->error != MMC_ERR_NONE)
+                goto finish_request;
+
+        if (!(host->cmd_flags & CMD_READY))
+                return;
+
+        if (cmd->data) {
+                if (cmd->data->error != MMC_ERR_NONE) {
+                        if ((host->cmd_flags & SCMD_ACTIVE)
+                            && !(host->cmd_flags & SCMD_READY))
+                                return;
+
+                        goto finish_request;
+                }
+
+                if (!(host->cmd_flags & BRS_READY))
+                        return;
+
+                if (!(host->no_dma || (host->cmd_flags & FIFO_READY)))
+                        return;
+
+                if (cmd->data->flags & MMC_DATA_WRITE) {
+                        if (host->req->stop) {
+                                if (!(host->cmd_flags & SCMD_ACTIVE)) {
+                                        host->cmd_flags |= SCMD_ACTIVE;
+                                        writel(TIFM_MMCSD_EOFB
+                                               | readl(sock->addr
+                                                       + SOCK_MMCSD_INT_ENABLE),
+                                               sock->addr
+                                               + SOCK_MMCSD_INT_ENABLE);
+                                        tifm_sd_exec(host, host->req->stop);
+                                        return;
+                                } else {
+                                        if (!(host->cmd_flags & SCMD_READY)
+                                            || (host->cmd_flags & CARD_BUSY))
+                                                return;
+                                        writel((~TIFM_MMCSD_EOFB)
+                                               & readl(sock->addr
+                                                       + SOCK_MMCSD_INT_ENABLE),
+                                               sock->addr
+                                               + SOCK_MMCSD_INT_ENABLE);
+                                }
+                        } else {
+                                if (host->cmd_flags & CARD_BUSY)
+                                        return;
+                                writel((~TIFM_MMCSD_EOFB)
+                                       & readl(sock->addr
+                                               + SOCK_MMCSD_INT_ENABLE),
+                                       sock->addr + SOCK_MMCSD_INT_ENABLE);
+                        }
+                } else {
+                        if (host->req->stop) {
+                                if (!(host->cmd_flags & SCMD_ACTIVE)) {
+                                        host->cmd_flags |= SCMD_ACTIVE;
+                                        tifm_sd_exec(host, host->req->stop);
+                                        return;
+                                } else {
+                                        if (!(host->cmd_flags & SCMD_READY))
+                                                return;
+                                }
+                        }
+                }
+        }
+finish_request:
+        tasklet_schedule(&host->finish_tasklet);
+}
+
+/* Called from interrupt handler */
+static void tifm_sd_data_event(struct tifm_dev *sock)
+{
+        struct tifm_sd *host;
+        unsigned int fifo_status = 0;
+        struct mmc_data *r_data = NULL;
+
+        spin_lock(&sock->lock);
+        host = mmc_priv((struct mmc_host*)tifm_get_drvdata(sock));
+        fifo_status = readl(sock->addr + SOCK_DMA_FIFO_STATUS);
+        dev_dbg(&sock->dev, "data event: fifo_status %x, flags %x\n",
+                fifo_status, host->cmd_flags);
+
+        if (host->req) {
+                r_data = host->req->cmd->data;
+
+                if (r_data && (fifo_status & TIFM_FIFO_READY)) {
+                        if (tifm_sd_set_dma_data(host, r_data)) {
+                                host->cmd_flags |= FIFO_READY;
+                                tifm_sd_check_status(host);
+                        }
+                }
+        }
+
+        writel(fifo_status, sock->addr + SOCK_DMA_FIFO_STATUS);
+        spin_unlock(&sock->lock);
+}
+
+/* Called from interrupt handler */
+static void tifm_sd_card_event(struct tifm_dev *sock)
+{
+        struct tifm_sd *host;
+        unsigned int host_status = 0;
+        int cmd_error = MMC_ERR_NONE;
+        struct mmc_command *cmd = NULL;
+        unsigned long flags;
+
+        spin_lock(&sock->lock);
+        host = mmc_priv((struct mmc_host*)tifm_get_drvdata(sock));
+        host_status = readl(sock->addr + SOCK_MMCSD_STATUS);
+        dev_dbg(&sock->dev, "host event: host_status %x, flags %x\n",
+                host_status, host->cmd_flags);
+
+        if (host->req) {
+                cmd = host->req->cmd;
+
+                if (host_status & TIFM_MMCSD_ERRMASK) {
+                        writel(host_status & TIFM_MMCSD_ERRMASK,
+                               sock->addr + SOCK_MMCSD_STATUS);
+                        if (host_status & TIFM_MMCSD_CTO)
+                                cmd_error = MMC_ERR_TIMEOUT;
+                        else if (host_status & TIFM_MMCSD_CCRC)
+                                cmd_error = MMC_ERR_BADCRC;
+
+                        if (cmd->data) {
+                                if (host_status & TIFM_MMCSD_DTO)
+                                        cmd->data->error = MMC_ERR_TIMEOUT;
+                                else if (host_status & TIFM_MMCSD_DCRC)
+                                        cmd->data->error = MMC_ERR_BADCRC;
+                        }
+
+                        writel(TIFM_FIFO_INT_SETALL,
+                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
+                        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
+
+                        if (host->req->stop) {
+                                if (host->cmd_flags & SCMD_ACTIVE) {
+                                        host->req->stop->error = cmd_error;
+                                        host->cmd_flags |= SCMD_READY;
+                                } else {
+                                        cmd->error = cmd_error;
+                                        host->cmd_flags |= SCMD_ACTIVE;
+                                        tifm_sd_exec(host, host->req->stop);
+                                        goto done;
+                                }
+                        } else
+                                cmd->error = cmd_error;
+                } else {
+                        if (host_status & (TIFM_MMCSD_EOC | TIFM_MMCSD_CERR)) {
+                                if (!(host->cmd_flags & CMD_READY)) {
+                                        host->cmd_flags |= CMD_READY;
+                                        tifm_sd_fetch_resp(cmd, sock);
+                                } else if (host->cmd_flags & SCMD_ACTIVE) {
+                                        host->cmd_flags |= SCMD_READY;
+                                        tifm_sd_fetch_resp(host->req->stop,
+                                                           sock);
+                                }
+                        }
+                        if (host_status & TIFM_MMCSD_BRS)
+                                host->cmd_flags |= BRS_READY;
+                }
+
+                if (host->no_dma && cmd->data) {
+                        if (host_status & TIFM_MMCSD_AE)
+                                writel(host_status & TIFM_MMCSD_AE,
+                                       sock->addr + SOCK_MMCSD_STATUS);
+
+                        if (host_status & (TIFM_MMCSD_AE | TIFM_MMCSD_AF
+                                           | TIFM_MMCSD_BRS)) {
+                                local_irq_save(flags);
+                                tifm_sd_transfer_data(host);
+                                local_irq_restore(flags);
+                                host_status &= ~TIFM_MMCSD_AE;
+                        }
+                }
+
+                if (host_status & TIFM_MMCSD_EOFB)
+                        host->cmd_flags &= ~CARD_BUSY;
+                else if (host_status & TIFM_MMCSD_CB)
+                        host->cmd_flags |= CARD_BUSY;
+
+                tifm_sd_check_status(host);
+        }
+done:
+        writel(host_status, sock->addr + SOCK_MMCSD_STATUS);
+        spin_unlock(&sock->lock);
+}
+
+static void tifm_sd_set_data_timeout(struct tifm_sd *host,
+                                     struct mmc_data *data)
+{
+        struct tifm_dev *sock = host->dev;
+        unsigned int data_timeout = data->timeout_clks;
+
+        if (fixed_timeout)
+                return;
+
+        data_timeout += data->timeout_ns /
+                        ((1000000000UL / host->clk_freq) * host->clk_div);
+
+        if (data_timeout < 0xffff) {
+                writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
+                writel((~TIFM_MMCSD_DPE)
+                       & readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
+                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
+        } else {
+                data_timeout = (data_timeout >> 10) + 1;
+                if (data_timeout > 0xffff)
+                        data_timeout = 0;       /* set to unlimited */
+                writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
+                writel(TIFM_MMCSD_DPE
+                       | readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
+                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
+        }
+}
+
+static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
+{
+        struct tifm_sd *host = mmc_priv(mmc);
+        struct tifm_dev *sock = host->dev;
+        unsigned long flags;
+        struct mmc_data *r_data = mrq->cmd->data;
+
+        spin_lock_irqsave(&sock->lock, flags);
+        if (host->eject) {
+                spin_unlock_irqrestore(&sock->lock, flags);
+                goto err_out;
+        }
+
+        if (host->req) {
+                printk(KERN_ERR "%s : unfinished request detected\n",
+                       sock->dev.bus_id);
+                spin_unlock_irqrestore(&sock->lock, flags);
+                goto err_out;
+        }
+
+        host->cmd_flags = 0;
+        host->block_pos = 0;
+        host->sg_pos = 0;
+
+        if (r_data) {
+                tifm_sd_set_data_timeout(host, r_data);
+
+                if ((r_data->flags & MMC_DATA_WRITE) && !mrq->stop)
+                         writel(TIFM_MMCSD_EOFB
+                                | readl(sock->addr + SOCK_MMCSD_INT_ENABLE),
+                                sock->addr + SOCK_MMCSD_INT_ENABLE);
+
+                if (host->no_dma) {
+                        writel(TIFM_MMCSD_BUFINT
+                               | readl(sock->addr + SOCK_MMCSD_INT_ENABLE),
+                               sock->addr + SOCK_MMCSD_INT_ENABLE);
+                        writel(((TIFM_MMCSD_FIFO_SIZE - 1) << 8)
+                               | (TIFM_MMCSD_FIFO_SIZE - 1),
+                               sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
+
+                        host->sg_len = r_data->sg_len;
+                } else {
+                        sg_init_one(&host->bounce_buf, host->bounce_buf_data,
+                                    r_data->blksz);
+
+                        if(1 != tifm_map_sg(sock, &host->bounce_buf, 1,
+                                            r_data->flags & MMC_DATA_WRITE
+                                            ? PCI_DMA_TODEVICE
+                                            : PCI_DMA_FROMDEVICE)) {
+                                printk(KERN_ERR "%s : scatterlist map failed\n",
+                                       sock->dev.bus_id);
+                                spin_unlock_irqrestore(&sock->lock, flags);
+                                goto err_out;
+                        }
+                        host->sg_len = tifm_map_sg(sock, r_data->sg,
+                                                   r_data->sg_len,
+                                                   r_data->flags
+                                                   & MMC_DATA_WRITE
+                                                   ? PCI_DMA_TODEVICE
+                                                   : PCI_DMA_FROMDEVICE);
+                        if (host->sg_len < 1) {
+                                printk(KERN_ERR "%s : scatterlist map failed\n",
+                                       sock->dev.bus_id);
+                                tifm_unmap_sg(sock, &host->bounce_buf, 1,
+                                              r_data->flags & MMC_DATA_WRITE
+                                              ? PCI_DMA_TODEVICE
+                                              : PCI_DMA_FROMDEVICE);
+                                spin_unlock_irqrestore(&sock->lock, flags);
+                                goto err_out;
+                        }
+
+                        writel(TIFM_FIFO_INT_SETALL,
+                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
+                        writel(ilog2(r_data->blksz) - 2,
+                               sock->addr + SOCK_FIFO_PAGE_SIZE);
+                        writel(TIFM_FIFO_ENABLE,
+                               sock->addr + SOCK_FIFO_CONTROL);
+                        writel(TIFM_FIFO_INTMASK,
+                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_SET);
+
+                        if (r_data->flags & MMC_DATA_WRITE)
+                                writel(TIFM_MMCSD_TXDE,
+                                       sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
+                        else
+                                writel(TIFM_MMCSD_RXDE,
+                                       sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
+
+                        tifm_sd_set_dma_data(host, r_data);
+                }
+
+                writel(r_data->blocks - 1,
+                       sock->addr + SOCK_MMCSD_NUM_BLOCKS);
+                writel(r_data->blksz - 1,
+                       sock->addr + SOCK_MMCSD_BLOCK_LEN);
+        }
+
+        host->req = mrq;
+        mod_timer(&host->timer, jiffies + host->timeout_jiffies);
+        writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
+               sock->addr + SOCK_CONTROL);
+        tifm_sd_exec(host, mrq->cmd);
+        spin_unlock_irqrestore(&sock->lock, flags);
+        return;
+
+err_out:
+        mrq->cmd->error = MMC_ERR_TIMEOUT;
+        mmc_request_done(mmc, mrq);
+}
+
+static void tifm_sd_end_cmd(unsigned long data)
+{
+        struct tifm_sd *host = (struct tifm_sd*)data;
+        struct tifm_dev *sock = host->dev;
+        struct mmc_host *mmc = tifm_get_drvdata(sock);
+        struct mmc_request *mrq;
+        struct mmc_data *r_data = NULL;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sock->lock, flags);
+
+        del_timer(&host->timer);
+        mrq = host->req;
+        host->req = NULL;
+
+        if (!mrq) {
+                printk(KERN_ERR " %s : no request to complete?\n",
+                       sock->dev.bus_id);
+                spin_unlock_irqrestore(&sock->lock, flags);
+                return;
+        }
+
+        r_data = mrq->cmd->data;
+        if (r_data) {
+                if (host->no_dma) {
+                        writel((~TIFM_MMCSD_BUFINT)
+                               & readl(sock->addr + SOCK_MMCSD_INT_ENABLE),
+                               sock->addr + SOCK_MMCSD_INT_ENABLE);
+                } else {
+                        tifm_unmap_sg(sock, &host->bounce_buf, 1,
+                                      (r_data->flags & MMC_DATA_WRITE)
+                                      ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
+                        tifm_unmap_sg(sock, r_data->sg, r_data->sg_len,
+                                      (r_data->flags & MMC_DATA_WRITE)
+                                      ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
+                }
+
+                r_data->bytes_xfered = r_data->blocks
+                        - readl(sock->addr + SOCK_MMCSD_NUM_BLOCKS) - 1;
+                r_data->bytes_xfered *= r_data->blksz;
+                r_data->bytes_xfered += r_data->blksz
+                        - readl(sock->addr + SOCK_MMCSD_BLOCK_LEN) + 1;
+        }
+
+        writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
+               sock->addr + SOCK_CONTROL);
+
+        spin_unlock_irqrestore(&sock->lock, flags);
+        mmc_request_done(mmc, mrq);
+}
+
+static void tifm_sd_abort(unsigned long data)
+{
+        struct tifm_sd *host = (struct tifm_sd*)data;
+
+        printk(KERN_ERR
+               "%s : card failed to respond for a long period of time "
+               "(%x, %x)\n",
+               host->dev->dev.bus_id, host->req->cmd->opcode, host->cmd_flags);
+
+        tifm_eject(host->dev);
+}
+
+static void tifm_sd_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        struct tifm_sd *host = mmc_priv(mmc);
+        struct tifm_dev *sock = host->dev;
+        unsigned int clk_div1, clk_div2;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sock->lock, flags);
+
+        dev_dbg(&sock->dev, "ios: clock = %u, vdd = %x, bus_mode = %x, "
+                "chip_select = %x, power_mode = %x, bus_width = %x\n",
+                ios->clock, ios->vdd, ios->bus_mode, ios->chip_select,
+                ios->power_mode, ios->bus_width);
+
+        if (ios->bus_width == MMC_BUS_WIDTH_4) {
+                writel(TIFM_MMCSD_4BBUS | readl(sock->addr + SOCK_MMCSD_CONFIG),
+                       sock->addr + SOCK_MMCSD_CONFIG);
+        } else {
+                writel((~TIFM_MMCSD_4BBUS)
+                       & readl(sock->addr + SOCK_MMCSD_CONFIG),
+                       sock->addr + SOCK_MMCSD_CONFIG);
+        }
+
+        if (ios->clock) {
+                clk_div1 = 20000000 / ios->clock;
+                if (!clk_div1)
+                        clk_div1 = 1;
+
+                clk_div2 = 24000000 / ios->clock;
+                if (!clk_div2)
+                        clk_div2 = 1;
+
+                if ((20000000 / clk_div1) > ios->clock)
+                        clk_div1++;
+                if ((24000000 / clk_div2) > ios->clock)
+                        clk_div2++;
+                if ((20000000 / clk_div1) > (24000000 / clk_div2)) {
+                        host->clk_freq = 20000000;
+                        host->clk_div = clk_div1;
+                        writel((~TIFM_CTRL_FAST_CLK)
+                               & readl(sock->addr + SOCK_CONTROL),
+                               sock->addr + SOCK_CONTROL);
+                } else {
+                        host->clk_freq = 24000000;
+                        host->clk_div = clk_div2;
+                        writel(TIFM_CTRL_FAST_CLK
+                               | readl(sock->addr + SOCK_CONTROL),
+                               sock->addr + SOCK_CONTROL);
+                }
+        } else {
+                host->clk_div = 0;
+        }
+        host->clk_div &= TIFM_MMCSD_CLKMASK;
+        writel(host->clk_div
+               | ((~TIFM_MMCSD_CLKMASK)
+                  & readl(sock->addr + SOCK_MMCSD_CONFIG)),
+               sock->addr + SOCK_MMCSD_CONFIG);
+
+        host->open_drain = (ios->bus_mode == MMC_BUSMODE_OPENDRAIN);
+
+        /* chip_select : maybe later */
+        //vdd
+        //power is set before probe / after remove
+
+        spin_unlock_irqrestore(&sock->lock, flags);
+}
+
+static int tifm_sd_ro(struct mmc_host *mmc)
+{
+        int rc = 0;
+        struct tifm_sd *host = mmc_priv(mmc);
+        struct tifm_dev *sock = host->dev;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sock->lock, flags);
+        if (TIFM_MMCSD_CARD_RO & readl(sock->addr + SOCK_PRESENT_STATE))
+                rc = 1;
+        spin_unlock_irqrestore(&sock->lock, flags);
+        return rc;
+}
+
+static const struct mmc_host_ops tifm_sd_ops = {
+        .request = tifm_sd_request,
+        .set_ios = tifm_sd_ios,
+        .get_ro  = tifm_sd_ro
+};
+
+static int tifm_sd_initialize_host(struct tifm_sd *host)
+{
+        int rc;
+        unsigned int host_status = 0;
+        struct tifm_dev *sock = host->dev;
+
+        writel(0, sock->addr + SOCK_MMCSD_INT_ENABLE);
+        mmiowb();
+        host->clk_div = 61;
+        host->clk_freq = 20000000;
+        writel(TIFM_MMCSD_RESET, sock->addr + SOCK_MMCSD_SYSTEM_CONTROL);
+        writel(host->clk_div | TIFM_MMCSD_POWER,
+               sock->addr + SOCK_MMCSD_CONFIG);
+
+        /* wait up to 0.51 sec for reset */
+        for (rc = 32; rc <= 256; rc <<= 1) {
+                if (1 & readl(sock->addr + SOCK_MMCSD_SYSTEM_STATUS)) {
+                        rc = 0;
+                        break;
+                }
+                msleep(rc);
+        }
+
+        if (rc) {
+                printk(KERN_ERR "%s : controller failed to reset\n",
+                       sock->dev.bus_id);
+                return -ENODEV;
+        }
+
+        writel(0, sock->addr + SOCK_MMCSD_NUM_BLOCKS);
+        writel(host->clk_div | TIFM_MMCSD_POWER,
+               sock->addr + SOCK_MMCSD_CONFIG);
+        writel(TIFM_MMCSD_RXDE, sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
+
+        // command timeout fixed to 64 clocks for now
+        writel(64, sock->addr + SOCK_MMCSD_COMMAND_TO);
+        writel(TIFM_MMCSD_INAB, sock->addr + SOCK_MMCSD_COMMAND);
+
+        for (rc = 16; rc <= 64; rc <<= 1) {
+                host_status = readl(sock->addr + SOCK_MMCSD_STATUS);
+                writel(host_status, sock->addr + SOCK_MMCSD_STATUS);
+                if (!(host_status & TIFM_MMCSD_ERRMASK)
+                    && (host_status & TIFM_MMCSD_EOC)) {
+                        rc = 0;
+                        break;
+                }
+                msleep(rc);
+        }
+
+        if (rc) {
+                printk(KERN_ERR
+                       "%s : card not ready - probe failed on initialization\n",
+                       sock->dev.bus_id);
+                return -ENODEV;
+        }
+
+        writel(TIFM_MMCSD_CERR | TIFM_MMCSD_BRS | TIFM_MMCSD_EOC
+               | TIFM_MMCSD_ERRMASK,
+               sock->addr + SOCK_MMCSD_INT_ENABLE);
+        mmiowb();
+
+        return 0;
+}
+
+static int tifm_sd_probe(struct tifm_dev *sock)
+{
+        struct mmc_host *mmc;
+        struct tifm_sd *host;
+        int rc = -EIO;
+
+        if (!(TIFM_SOCK_STATE_OCCUPIED
+              & readl(sock->addr + SOCK_PRESENT_STATE))) {
+                printk(KERN_WARNING "%s : card gone, unexpectedly\n",
+                       sock->dev.bus_id);
+                return rc;
+        }
+
+        mmc = mmc_alloc_host(sizeof(struct tifm_sd), &sock->dev);
+        if (!mmc)
+                return -ENOMEM;
+
+        host = mmc_priv(mmc);
+        host->no_dma = no_dma;
+        tifm_set_drvdata(sock, mmc);
+        host->dev = sock;
+        host->timeout_jiffies = msecs_to_jiffies(1000);
+
+        tasklet_init(&host->finish_tasklet, tifm_sd_end_cmd,
+                     (unsigned long)host);
+        setup_timer(&host->timer, tifm_sd_abort, (unsigned long)host);
+
+        mmc->ops = &tifm_sd_ops;
+        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+        mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;
+        mmc->f_min = 20000000 / 60;
+        mmc->f_max = 24000000;
+
+        mmc->max_blk_count = 2048;
+        mmc->max_hw_segs = mmc->max_blk_count;
+        mmc->max_blk_size = min(TIFM_MMCSD_MAX_BLOCK_SIZE, PAGE_SIZE);
+        mmc->max_seg_size = mmc->max_blk_count * mmc->max_blk_size;
+        mmc->max_req_size = mmc->max_seg_size;
+        mmc->max_phys_segs = mmc->max_hw_segs;
+
+        sock->card_event = tifm_sd_card_event;
+        sock->data_event = tifm_sd_data_event;
+        rc = tifm_sd_initialize_host(host);
+
+        if (!rc)
+                rc = mmc_add_host(mmc);
+        if (!rc)
+                return 0;
+
+        mmc_free_host(mmc);
+        return rc;
+}
+
+static void tifm_sd_remove(struct tifm_dev *sock)
+{
+        struct mmc_host *mmc = tifm_get_drvdata(sock);
+        struct tifm_sd *host = mmc_priv(mmc);
+        unsigned long flags;
+
+        spin_lock_irqsave(&sock->lock, flags);
+        host->eject = 1;
+        writel(0, sock->addr + SOCK_MMCSD_INT_ENABLE);
+        mmiowb();
+        spin_unlock_irqrestore(&sock->lock, flags);
+
+        tasklet_kill(&host->finish_tasklet);
+
+        spin_lock_irqsave(&sock->lock, flags);
+        if (host->req) {
+                writel(TIFM_FIFO_INT_SETALL,
+                       sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
+                writel(0, sock->addr + SOCK_DMA_FIFO_INT_ENABLE_SET);
+                host->req->cmd->error = MMC_ERR_TIMEOUT;
+                if (host->req->stop)
+                        host->req->stop->error = MMC_ERR_TIMEOUT;
+                tasklet_schedule(&host->finish_tasklet);
+        }
+        spin_unlock_irqrestore(&sock->lock, flags);
+        mmc_remove_host(mmc);
+        dev_dbg(&sock->dev, "after remove\n");
+
+        /* The meaning of the bit majority in this constant is unknown. */
+        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
+               sock->addr + SOCK_CONTROL);
+
+        mmc_free_host(mmc);
+}
+
+#ifdef CONFIG_PM
+
+static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state)
+{
+        struct mmc_host *mmc = tifm_get_drvdata(sock);
+        int rc;
+
+        rc = mmc_suspend_host(mmc, state);
+        /* The meaning of the bit majority in this constant is unknown. */
+        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
+               sock->addr + SOCK_CONTROL);
+        return rc;
+}
+
+static int tifm_sd_resume(struct tifm_dev *sock)
+{
+        struct mmc_host *mmc = tifm_get_drvdata(sock);
+        struct tifm_sd *host = mmc_priv(mmc);
+        int rc;
+
+        rc = tifm_sd_initialize_host(host);
+        dev_dbg(&sock->dev, "resume initialize %d\n", rc);
+
+        if (rc)
+                host->eject = 1;
+        else
+                rc = mmc_resume_host(mmc);
+
+        return rc;
+}
+
+#else
+
+#define tifm_sd_suspend NULL
+#define tifm_sd_resume NULL
+
+#endif /* CONFIG_PM */
+
+static struct tifm_device_id tifm_sd_id_tbl[] = {
+        { TIFM_TYPE_SD }, { }
+};
+
+static struct tifm_driver tifm_sd_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+                .owner = THIS_MODULE
+        },
+        .id_table = tifm_sd_id_tbl,
+        .probe    = tifm_sd_probe,
+        .remove   = tifm_sd_remove,
+        .suspend  = tifm_sd_suspend,
+        .resume   = tifm_sd_resume
+};
+
+static int __init tifm_sd_init(void)
+{
+        return tifm_register_driver(&tifm_sd_driver);
+}
+
+static void __exit tifm_sd_exit(void)
+{
+        tifm_unregister_driver(&tifm_sd_driver);
+}
+
+MODULE_AUTHOR("Alex Dubov");
+MODULE_DESCRIPTION("TI FlashMedia SD driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(tifm, tifm_sd_id_tbl);
+MODULE_VERSION(DRIVER_VERSION);
+
+module_init(tifm_sd_init);
+module_exit(tifm_sd_exit);
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/host/wbsd.c
index 05ccfc43168f..867ca6a69298 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/wbsd.c - Winbond W83L51xD SD/MMC driver
  *
- *  Copyright (C) 2004-2006 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2004-2007 Pierre Ossman, All Rights Reserved.
  *
  * 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
@@ -33,7 +33,6 @@
 #include <linux/pnp.h>
 #include <linux/highmem.h>
 #include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -178,9 +177,8 @@ static void wbsd_init_device(struct wbsd_host *host)
         ier = 0;
         ier |= WBSD_EINT_CARD;
         ier |= WBSD_EINT_FIFO_THRE;
-        ier |= WBSD_EINT_CCRC;
-        ier |= WBSD_EINT_TIMEOUT;
         ier |= WBSD_EINT_CRC;
+        ier |= WBSD_EINT_TIMEOUT;
         ier |= WBSD_EINT_TC;
 
         outb(ier, host->base + WBSD_EIR);
@@ -278,90 +276,36 @@ static inline char *wbsd_sg_to_buffer(struct wbsd_host *host)
 
 static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data)
 {
-        unsigned int len, i, size;
+        unsigned int len, i;
         struct scatterlist *sg;
         char *dmabuf = host->dma_buffer;
         char *sgbuf;
 
-        size = host->size;
-
         sg = data->sg;
         len = data->sg_len;
 
-        /*
-         * Just loop through all entries. Size might not
-         * be the entire list though so make sure that
-         * we do not transfer too much.
-         */
         for (i = 0; i < len; i++) {
                 sgbuf = page_address(sg[i].page) + sg[i].offset;
-                if (size < sg[i].length)
-                        memcpy(dmabuf, sgbuf, size);
-                else
-                        memcpy(dmabuf, sgbuf, sg[i].length);
+                memcpy(dmabuf, sgbuf, sg[i].length);
                 dmabuf += sg[i].length;
-
-                if (size < sg[i].length)
-                        size = 0;
-                else
-                        size -= sg[i].length;
-
-                if (size == 0)
-                        break;
         }
-
-        /*
-         * Check that we didn't get a request to transfer
-         * more data than can fit into the SG list.
-         */
-
-        BUG_ON(size != 0);
-
-        host->size -= size;
 }
 
 static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data)
 {
-        unsigned int len, i, size;
+        unsigned int len, i;
         struct scatterlist *sg;
         char *dmabuf = host->dma_buffer;
         char *sgbuf;
 
-        size = host->size;
-
         sg = data->sg;
         len = data->sg_len;
 
-        /*
-         * Just loop through all entries. Size might not
-         * be the entire list though so make sure that
-         * we do not transfer too much.
-         */
         for (i = 0; i < len; i++) {
                 sgbuf = page_address(sg[i].page) + sg[i].offset;
-                if (size < sg[i].length)
-                        memcpy(sgbuf, dmabuf, size);
-                else
-                        memcpy(sgbuf, dmabuf, sg[i].length);
+                memcpy(sgbuf, dmabuf, sg[i].length);
                 dmabuf += sg[i].length;
-
-                if (size < sg[i].length)
-                        size = 0;
-                else
-                        size -= sg[i].length;
-
-                if (size == 0)
-                        break;
         }
-
-        /*
-         * Check that we didn't get a request to transfer
-         * more data than can fit into the SG list.
-         */
-
-        BUG_ON(size != 0);
-
-        host->size -= size;
 }
 
 /*
@@ -484,7 +428,7 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
         /*
          * Handle excessive data.
          */
-        if (data->bytes_xfered == host->size)
+        if (host->num_sg == 0)
                 return;
 
         buffer = wbsd_sg_to_buffer(host) + host->offset;
@@ -514,31 +458,14 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
                         data->bytes_xfered++;
 
                         /*
-                         * Transfer done?
-                         */
-                        if (data->bytes_xfered == host->size)
-                                return;
-
-                        /*
                          * End of scatter list entry?
                          */
                         if (host->remain == 0) {
                                 /*
                                  * Get next entry. Check if last.
                                  */
-                                if (!wbsd_next_sg(host)) {
-                                        /*
-                                         * We should never reach this point.
-                                         * It means that we're trying to
-                                         * transfer more blocks than can fit
-                                         * into the scatter list.
-                                         */
-                                        BUG_ON(1);
-
-                                        host->size = data->bytes_xfered;
-
+                                if (!wbsd_next_sg(host))
                                         return;
-                                }
 
                                 buffer = wbsd_sg_to_buffer(host);
                         }
@@ -550,7 +477,7 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
          * hardware problem. The chip doesn't trigger
          * FIFO threshold interrupts properly.
          */
-        if ((host->size - data->bytes_xfered) < 16)
+        if ((data->blocks * data->blksz - data->bytes_xfered) < 16)
                 tasklet_schedule(&host->fifo_tasklet);
 }
 
@@ -564,7 +491,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
          * Check that we aren't being called after the
          * entire buffer has been transfered.
          */
-        if (data->bytes_xfered == host->size)
+        if (host->num_sg == 0)
                 return;
 
         buffer = wbsd_sg_to_buffer(host) + host->offset;
@@ -594,31 +521,14 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
                         data->bytes_xfered++;
 
                         /*
-                         * Transfer done?
-                         */
-                        if (data->bytes_xfered == host->size)
-                                return;
-
-                        /*
                          * End of scatter list entry?
                          */
                         if (host->remain == 0) {
                                 /*
                                  * Get next entry. Check if last.
                                  */
-                                if (!wbsd_next_sg(host)) {
-                                        /*
-                                         * We should never reach this point.
-                                         * It means that we're trying to
-                                         * transfer more blocks than can fit
-                                         * into the scatter list.
-                                         */
-                                        BUG_ON(1);
-
-                                        host->size = data->bytes_xfered;
-
+                                if (!wbsd_next_sg(host))
                                         return;
-                                }
 
                                 buffer = wbsd_sg_to_buffer(host);
                         }
@@ -638,6 +548,7 @@ static void wbsd_prepare_data(struct wbsd_host *host, struct mmc_data *data)
         u16 blksize;
         u8 setup;
         unsigned long dmaflags;
+        unsigned int size;
 
         DBGF("blksz %04x blks %04x flags %08x\n",
                 data->blksz, data->blocks, data->flags);
@@ -647,7 +558,7 @@ static void wbsd_prepare_data(struct wbsd_host *host, struct mmc_data *data)
         /*
          * Calculate size.
          */
-        host->size = data->blocks * data->blksz;
+        size = data->blocks * data->blksz;
 
         /*
          * Check timeout values for overflow.
@@ -705,8 +616,8 @@ static void wbsd_prepare_data(struct wbsd_host *host, struct mmc_data *data)
                 /*
                  * The buffer for DMA is only 64 kB.
                  */
-                BUG_ON(host->size > 0x10000);
-                if (host->size > 0x10000) {
+                BUG_ON(size > 0x10000);
+                if (size > 0x10000) {
                         data->error = MMC_ERR_INVALID;
                         return;
                 }
@@ -729,7 +640,7 @@ static void wbsd_prepare_data(struct wbsd_host *host, struct mmc_data *data)
                 else
                         set_dma_mode(host->dma, DMA_MODE_WRITE & ~0x40);
                 set_dma_addr(host->dma, host->dma_addr);
-                set_dma_count(host->dma, host->size);
+                set_dma_count(host->dma, size);
 
                 enable_dma(host->dma);
                 release_dma_lock(dmaflags);
@@ -812,6 +723,10 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
                 count = get_dma_residue(host->dma);
                 release_dma_lock(dmaflags);
 
+                data->bytes_xfered = host->mrq->data->blocks *
+                        host->mrq->data->blksz - count;
+                data->bytes_xfered -= data->bytes_xfered % data->blksz;
+
                 /*
                  * Any leftover data?
                  */
@@ -820,7 +735,8 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
                                 "%d bytes left.\n",
                                 mmc_hostname(host->mmc), count);
 
-                        data->error = MMC_ERR_FAILED;
+                        if (data->error == MMC_ERR_NONE)
+                                data->error = MMC_ERR_FAILED;
                 } else {
                         /*
                          * Transfer data from DMA buffer to
@@ -828,8 +744,11 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
                          */
                         if (data->flags & MMC_DATA_READ)
                                 wbsd_dma_to_sg(host, data);
+                }
 
-                        data->bytes_xfered = host->size;
+                if (data->error != MMC_ERR_NONE) {
+                        if (data->bytes_xfered)
+                                data->bytes_xfered -= data->blksz;
                 }
         }
 
@@ -869,24 +788,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 goto done;
         }
 
-        /*
-         * Does the request include data?
-         */
         if (cmd->data) {
-                wbsd_prepare_data(host, cmd->data);
-
-                if (cmd->data->error != MMC_ERR_NONE)
-                        goto done;
-        }
-
-        wbsd_send_command(host, cmd);
-
-        /*
-         * If this is a data transfer the request
-         * will be finished after the data has
-         * transfered.
-         */
-        if (cmd->data && (cmd->error == MMC_ERR_NONE)) {
                 /*
                  * The hardware is so delightfully stupid that it has a list
                  * of "data" commands. If a command isn't on this list, it'll
@@ -918,14 +820,30 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                 "supported by this controller.\n",
                                 mmc_hostname(host->mmc), cmd->opcode);
 #endif
-                        cmd->data->error = MMC_ERR_INVALID;
-
-                        if (cmd->data->stop)
-                                wbsd_send_command(host, cmd->data->stop);
+                        cmd->error = MMC_ERR_INVALID;
 
                         goto done;
                 };
+        }
+
+        /*
+         * Does the request include data?
+         */
+        if (cmd->data) {
+                wbsd_prepare_data(host, cmd->data);
+
+                if (cmd->data->error != MMC_ERR_NONE)
+                        goto done;
+        }
+
+        wbsd_send_command(host, cmd);
 
+        /*
+         * If this is a data transfer the request
+         * will be finished after the data has
+         * transfered.
+         */
+        if (cmd->data && (cmd->error == MMC_ERR_NONE)) {
                 /*
                  * Dirty fix for hardware bug.
                  */
@@ -1167,7 +1085,7 @@ static void wbsd_tasklet_fifo(unsigned long param)
         /*
          * Done?
          */
-        if (host->size == data->bytes_xfered) {
+        if (host->num_sg == 0) {
                 wbsd_write_index(host, WBSD_IDX_FIFOEN, 0);
                 tasklet_schedule(&host->finish_tasklet);
         }
@@ -1245,30 +1163,6 @@ end:
         spin_unlock(&host->lock);
 }
 
-static void wbsd_tasklet_block(unsigned long param)
-{
-        struct wbsd_host *host = (struct wbsd_host *)param;
-        struct mmc_data *data;
-
-        spin_lock(&host->lock);
-
-        if ((wbsd_read_index(host, WBSD_IDX_CRCSTATUS) & WBSD_CRC_MASK) !=
-                WBSD_CRC_OK) {
-                data = wbsd_get_data(host);
-                if (!data)
-                        goto end;
-
-                DBGF("CRC error\n");
-
-                data->error = MMC_ERR_BADCRC;
-
-                tasklet_schedule(&host->finish_tasklet);
-        }
-
-end:
-        spin_unlock(&host->lock);
-}
-
 /*
  * Interrupt handling
  */
@@ -1299,8 +1193,6 @@ static irqreturn_t wbsd_irq(int irq, void *dev_id)
                 tasklet_hi_schedule(&host->crc_tasklet);
         if (isr & WBSD_INT_TIMEOUT)
                 tasklet_hi_schedule(&host->timeout_tasklet);
-        if (isr & WBSD_INT_BUSYEND)
-                tasklet_hi_schedule(&host->block_tasklet);
         if (isr & WBSD_INT_TC)
                 tasklet_schedule(&host->finish_tasklet);
 
@@ -1601,8 +1493,6 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)
                         (unsigned long)host);
         tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,
                         (unsigned long)host);
-        tasklet_init(&host->block_tasklet, wbsd_tasklet_block,
-                        (unsigned long)host);
 
         return 0;
 }
@@ -1621,7 +1511,6 @@ static void __devexit wbsd_release_irq(struct wbsd_host *host)
         tasklet_kill(&host->crc_tasklet);
         tasklet_kill(&host->timeout_tasklet);
         tasklet_kill(&host->finish_tasklet);
-        tasklet_kill(&host->block_tasklet);
 }
 
 /*
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/host/wbsd.h
index d06718b0e2ab..873bda1e59b4 100644
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/host/wbsd.h
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/wbsd.h - Winbond W83L51xD SD/MMC driver
  *
- *  Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2004-2007 Pierre Ossman, All Rights Reserved.
  *
  * 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
@@ -46,10 +46,10 @@
 
 #define WBSD_EINT_CARD          0x40
 #define WBSD_EINT_FIFO_THRE     0x20
-#define WBSD_EINT_CCRC          0x10
+#define WBSD_EINT_CRC           0x10
 #define WBSD_EINT_TIMEOUT       0x08
 #define WBSD_EINT_PROGEND       0x04
-#define WBSD_EINT_CRC           0x02
+#define WBSD_EINT_BUSYEND       0x02
 #define WBSD_EINT_TC            0x01
 
 #define WBSD_INT_PENDING        0x80
@@ -158,8 +158,6 @@ struct wbsd_host
         unsigned int            offset;         /* Offset into current entry */
         unsigned int            remain;         /* Data left in curren entry */
 
-        int                     size;           /* Total size of transfer */
-
         char*                   dma_buffer;     /* ISA DMA buffer */
         dma_addr_t              dma_addr;       /* Physical address for same */
 
@@ -182,7 +180,6 @@ struct wbsd_host
         struct tasklet_struct   crc_tasklet;
         struct tasklet_struct   timeout_tasklet;
         struct tasklet_struct   finish_tasklet;
-        struct tasklet_struct   block_tasklet;
 
         struct timer_list       ignore_timer;   /* Ignore detection timer */
 };
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
deleted file mode 100644
index 4a73e8b2428d..000000000000
--- a/drivers/mmc/mmc.c
+++ /dev/null
@@ -1,1724 +0,0 @@
-/*
- *  linux/drivers/mmc/mmc.c
- *
- *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
- *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
- *  SD support Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
- *  MMCv4 support Copyright (C) 2006 Philip Langdale, All Rights Reserved.
- *
- * 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/module.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/completion.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/pagemap.h>
-#include <linux/err.h>
-#include <asm/scatterlist.h>
-#include <linux/scatterlist.h>
-
-#include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
-
-#include "mmc.h"
-
-#define CMD_RETRIES     3
-
-/*
- * OCR Bit positions to 10s of Vdd mV.
- */
-static const unsigned short mmc_ocr_bit_to_vdd[] = {
-        150,    155,    160,    165,    170,    180,    190,    200,
-        210,    220,    230,    240,    250,    260,    270,    280,
-        290,    300,    310,    320,    330,    340,    350,    360
-};
-
-static const unsigned int tran_exp[] = {
-        10000,          100000,         1000000,        10000000,
-        0,              0,              0,              0
-};
-
-static const unsigned char tran_mant[] = {
-        0,      10,     12,     13,     15,     20,     25,     30,
-        35,     40,     45,     50,     55,     60,     70,     80,
-};
-
-static const unsigned int tacc_exp[] = {
-        1,      10,     100,    1000,   10000,  100000, 1000000, 10000000,
-};
-
-static const unsigned int tacc_mant[] = {
-        0,      10,     12,     13,     15,     20,     25,     30,
-        35,     40,     45,     50,     55,     60,     70,     80,
-};
-
-
-/**
- *      mmc_request_done - finish processing an MMC request
- *      @host: MMC host which completed request
- *      @mrq: MMC request which request
- *
- *      MMC drivers should call this function when they have completed
- *      their processing of a request.
- */
-void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
-{
-        struct mmc_command *cmd = mrq->cmd;
-        int err = cmd->error;
-
-        pr_debug("%s: req done (CMD%u): %d/%d/%d: %08x %08x %08x %08x\n",
-                 mmc_hostname(host), cmd->opcode, err,
-                 mrq->data ? mrq->data->error : 0,
-                 mrq->stop ? mrq->stop->error : 0,
-                 cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
-
-        if (err && cmd->retries) {
-                cmd->retries--;
-                cmd->error = 0;
-                host->ops->request(host, mrq);
-        } else if (mrq->done) {
-                mrq->done(mrq);
-        }
-}
-
-EXPORT_SYMBOL(mmc_request_done);
-
-/**
- *      mmc_start_request - start a command on a host
- *      @host: MMC host to start command on
- *      @mrq: MMC request to start
- *
- *      Queue a command on the specified host.  We expect the
- *      caller to be holding the host lock with interrupts disabled.
- */
-void
-mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
-{
-        pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
-                 mmc_hostname(host), mrq->cmd->opcode,
-                 mrq->cmd->arg, mrq->cmd->flags);
-
-        WARN_ON(!host->claimed);
-
-        mrq->cmd->error = 0;
-        mrq->cmd->mrq = mrq;
-        if (mrq->data) {
-                BUG_ON(mrq->data->blksz > host->max_blk_size);
-                BUG_ON(mrq->data->blocks > host->max_blk_count);
-                BUG_ON(mrq->data->blocks * mrq->data->blksz >
-                        host->max_req_size);
-
-                mrq->cmd->data = mrq->data;
-                mrq->data->error = 0;
-                mrq->data->mrq = mrq;
-                if (mrq->stop) {
-                        mrq->data->stop = mrq->stop;
-                        mrq->stop->error = 0;
-                        mrq->stop->mrq = mrq;
-                }
-        }
-        host->ops->request(host, mrq);
-}
-
-EXPORT_SYMBOL(mmc_start_request);
-
-static void mmc_wait_done(struct mmc_request *mrq)
-{
-        complete(mrq->done_data);
-}
-
-int mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)
-{
-        DECLARE_COMPLETION_ONSTACK(complete);
-
-        mrq->done_data = &complete;
-        mrq->done = mmc_wait_done;
-
-        mmc_start_request(host, mrq);
-
-        wait_for_completion(&complete);
-
-        return 0;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_req);
-
-/**
- *      mmc_wait_for_cmd - start a command and wait for completion
- *      @host: MMC host to start command
- *      @cmd: MMC command to start
- *      @retries: maximum number of retries
- *
- *      Start a new MMC command for a host, and wait for the command
- *      to complete.  Return any error that occurred while the command
- *      was executing.  Do not attempt to parse the response.
- */
-int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries)
-{
-        struct mmc_request mrq;
-
-        BUG_ON(!host->claimed);
-
-        memset(&mrq, 0, sizeof(struct mmc_request));
-
-        memset(cmd->resp, 0, sizeof(cmd->resp));
-        cmd->retries = retries;
-
-        mrq.cmd = cmd;
-        cmd->data = NULL;
-
-        mmc_wait_for_req(host, &mrq);
-
-        return cmd->error;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_cmd);
-
-/**
- *      mmc_wait_for_app_cmd - start an application command and wait for
-                               completion
- *      @host: MMC host to start command
- *      @rca: RCA to send MMC_APP_CMD to
- *      @cmd: MMC command to start
- *      @retries: maximum number of retries
- *
- *      Sends a MMC_APP_CMD, checks the card response, sends the command
- *      in the parameter and waits for it to complete. Return any error
- *      that occurred while the command was executing.  Do not attempt to
- *      parse the response.
- */
-int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
-        struct mmc_command *cmd, int retries)
-{
-        struct mmc_request mrq;
-        struct mmc_command appcmd;
-
-        int i, err;
-
-        BUG_ON(!host->claimed);
-        BUG_ON(retries < 0);
-
-        err = MMC_ERR_INVALID;
-
-        /*
-         * We have to resend MMC_APP_CMD for each attempt so
-         * we cannot use the retries field in mmc_command.
-         */
-        for (i = 0;i <= retries;i++) {
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                appcmd.opcode = MMC_APP_CMD;
-                appcmd.arg = rca << 16;
-                appcmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-                appcmd.retries = 0;
-                memset(appcmd.resp, 0, sizeof(appcmd.resp));
-                appcmd.data = NULL;
-
-                mrq.cmd = &appcmd;
-                appcmd.data = NULL;
-
-                mmc_wait_for_req(host, &mrq);
-
-                if (appcmd.error) {
-                        err = appcmd.error;
-                        continue;
-                }
-
-                /* Check that card supported application commands */
-                if (!(appcmd.resp[0] & R1_APP_CMD))
-                        return MMC_ERR_FAILED;
-
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                memset(cmd->resp, 0, sizeof(cmd->resp));
-                cmd->retries = 0;
-
-                mrq.cmd = cmd;
-                cmd->data = NULL;
-
-                mmc_wait_for_req(host, &mrq);
-
-                err = cmd->error;
-                if (cmd->error == MMC_ERR_NONE)
-                        break;
-        }
-
-        return err;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_app_cmd);
-
-/**
- *      mmc_set_data_timeout - set the timeout for a data command
- *      @data: data phase for command
- *      @card: the MMC card associated with the data transfer
- *      @write: flag to differentiate reads from writes
- */
-void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card,
-                          int write)
-{
-        unsigned int mult;
-
-        /*
-         * SD cards use a 100 multiplier rather than 10
-         */
-        mult = mmc_card_sd(card) ? 100 : 10;
-
-        /*
-         * Scale up the multiplier (and therefore the timeout) by
-         * the r2w factor for writes.
-         */
-        if (write)
-                mult <<= card->csd.r2w_factor;
-
-        data->timeout_ns = card->csd.tacc_ns * mult;
-        data->timeout_clks = card->csd.tacc_clks * mult;
-
-        /*
-         * SD cards also have an upper limit on the timeout.
-         */
-        if (mmc_card_sd(card)) {
-                unsigned int timeout_us, limit_us;
-
-                timeout_us = data->timeout_ns / 1000;
-                timeout_us += data->timeout_clks * 1000 /
-                        (card->host->ios.clock / 1000);
-
-                if (write)
-                        limit_us = 250000;
-                else
-                        limit_us = 100000;
-
-                /*
-                 * SDHC cards always use these fixed values.
-                 */
-                if (timeout_us > limit_us || mmc_card_blockaddr(card)) {
-                        data->timeout_ns = limit_us * 1000;
-                        data->timeout_clks = 0;
-                }
-        }
-}
-EXPORT_SYMBOL(mmc_set_data_timeout);
-
-static int mmc_select_card(struct mmc_host *host, struct mmc_card *card);
-
-/**
- *      __mmc_claim_host - exclusively claim a host
- *      @host: mmc host to claim
- *      @card: mmc card to claim host for
- *
- *      Claim a host for a set of operations.  If a valid card
- *      is passed and this wasn't the last card selected, select
- *      the card before returning.
- *
- *      Note: you should use mmc_card_claim_host or mmc_claim_host.
- */
-int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        int err = 0;
-
-        add_wait_queue(&host->wq, &wait);
-        spin_lock_irqsave(&host->lock, flags);
-        while (1) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                if (!host->claimed)
-                        break;
-                spin_unlock_irqrestore(&host->lock, flags);
-                schedule();
-                spin_lock_irqsave(&host->lock, flags);
-        }
-        set_current_state(TASK_RUNNING);
-        host->claimed = 1;
-        spin_unlock_irqrestore(&host->lock, flags);
-        remove_wait_queue(&host->wq, &wait);
-
-        if (card != (void *)-1) {
-                err = mmc_select_card(host, card);
-                if (err != MMC_ERR_NONE)
-                        return err;
-        }
-
-        return err;
-}
-
-EXPORT_SYMBOL(__mmc_claim_host);
-
-/**
- *      mmc_release_host - release a host
- *      @host: mmc host to release
- *
- *      Release a MMC host, allowing others to claim the host
- *      for their operations.
- */
-void mmc_release_host(struct mmc_host *host)
-{
-        unsigned long flags;
-
-        BUG_ON(!host->claimed);
-
-        spin_lock_irqsave(&host->lock, flags);
-        host->claimed = 0;
-        spin_unlock_irqrestore(&host->lock, flags);
-
-        wake_up(&host->wq);
-}
-
-EXPORT_SYMBOL(mmc_release_host);
-
-static inline void mmc_set_ios(struct mmc_host *host)
-{
-        struct mmc_ios *ios = &host->ios;
-
-        pr_debug("%s: clock %uHz busmode %u powermode %u cs %u Vdd %u "
-                "width %u timing %u\n",
-                 mmc_hostname(host), ios->clock, ios->bus_mode,
-                 ios->power_mode, ios->chip_select, ios->vdd,
-                 ios->bus_width, ios->timing);
-
-        host->ops->set_ios(host, ios);
-}
-
-static int mmc_select_card(struct mmc_host *host, struct mmc_card *card)
-{
-        int err;
-        struct mmc_command cmd;
-
-        BUG_ON(!host->claimed);
-
-        if (host->card_selected == card)
-                return MMC_ERR_NONE;
-
-        host->card_selected = card;
-
-        cmd.opcode = MMC_SELECT_CARD;
-        cmd.arg = card->rca << 16;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-        if (err != MMC_ERR_NONE)
-                return err;
-
-        /*
-         * We can only change the bus width of SD cards when
-         * they are selected so we have to put the handling
-         * here.
-         *
-         * The card is in 1 bit mode by default so
-         * we only need to change if it supports the
-         * wider version.
-         */
-        if (mmc_card_sd(card) &&
-                (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) {
-
-                /*
-                * Default bus width is 1 bit.
-                */
-                host->ios.bus_width = MMC_BUS_WIDTH_1;
-
-                if (host->caps & MMC_CAP_4_BIT_DATA) {
-                        struct mmc_command cmd;
-                        cmd.opcode = SD_APP_SET_BUS_WIDTH;
-                        cmd.arg = SD_BUS_WIDTH_4;
-                        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-                        err = mmc_wait_for_app_cmd(host, card->rca, &cmd,
-                                CMD_RETRIES);
-                        if (err != MMC_ERR_NONE)
-                                return err;
-
-                        host->ios.bus_width = MMC_BUS_WIDTH_4;
-                }
-        }
-
-        mmc_set_ios(host);
-
-        return MMC_ERR_NONE;
-}
-
-/*
- * Ensure that no card is selected.
- */
-static void mmc_deselect_cards(struct mmc_host *host)
-{
-        struct mmc_command cmd;
-
-        if (host->card_selected) {
-                host->card_selected = NULL;
-
-                cmd.opcode = MMC_SELECT_CARD;
-                cmd.arg = 0;
-                cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;
-
-                mmc_wait_for_cmd(host, &cmd, 0);
-        }
-}
-
-
-static inline void mmc_delay(unsigned int ms)
-{
-        if (ms < 1000 / HZ) {
-                cond_resched();
-                mdelay(ms);
-        } else {
-                msleep(ms);
-        }
-}
-
-/*
- * Mask off any voltages we don't support and select
- * the lowest voltage
- */
-static u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
-{
-        int bit;
-
-        ocr &= host->ocr_avail;
-
-        bit = ffs(ocr);
-        if (bit) {
-                bit -= 1;
-
-                ocr &= 3 << bit;
-
-                host->ios.vdd = bit;
-                mmc_set_ios(host);
-        } else {
-                ocr = 0;
-        }
-
-        return ocr;
-}
-
-#define UNSTUFF_BITS(resp,start,size)                                   \
-        ({                                                              \
-                const int __size = size;                                \
-                const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
-                const int __off = 3 - ((start) / 32);                   \
-                const int __shft = (start) & 31;                        \
-                u32 __res;                                              \
-                                                                        \
-                __res = resp[__off] >> __shft;                          \
-                if (__size + __shft > 32)                               \
-                        __res |= resp[__off-1] << ((32 - __shft) % 32); \
-                __res & __mask;                                         \
-        })
-
-/*
- * Given the decoded CSD structure, decode the raw CID to our CID structure.
- */
-static void mmc_decode_cid(struct mmc_card *card)
-{
-        u32 *resp = card->raw_cid;
-
-        memset(&card->cid, 0, sizeof(struct mmc_cid));
-
-        if (mmc_card_sd(card)) {
-                /*
-                 * SD doesn't currently have a version field so we will
-                 * have to assume we can parse this.
-                 */
-                card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
-                card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
-                card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
-                card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
-                card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
-                card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
-                card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
-                card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
-                card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
-                card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
-                card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
-                card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
-
-                card->cid.year += 2000; /* SD cards year offset */
-        } else {
-                /*
-                 * The selection of the format here is based upon published
-                 * specs from sandisk and from what people have reported.
-                 */
-                switch (card->csd.mmca_vsn) {
-                case 0: /* MMC v1.0 - v1.2 */
-                case 1: /* MMC v1.4 */
-                        card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
-                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                        card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
-                        card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
-                        card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
-                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
-                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                        break;
-
-                case 2: /* MMC v2.0 - v2.2 */
-                case 3: /* MMC v3.1 - v3.3 */
-                case 4: /* MMC v4 */
-                        card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
-                        card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
-                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
-                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                        break;
-
-                default:
-                        printk("%s: card has unknown MMCA version %d\n",
-                                mmc_hostname(card->host), card->csd.mmca_vsn);
-                        mmc_card_set_bad(card);
-                        break;
-                }
-        }
-}
-
-/*
- * Given a 128-bit response, decode to our card CSD structure.
- */
-static void mmc_decode_csd(struct mmc_card *card)
-{
-        struct mmc_csd *csd = &card->csd;
-        unsigned int e, m, csd_struct;
-        u32 *resp = card->raw_csd;
-
-        if (mmc_card_sd(card)) {
-                csd_struct = UNSTUFF_BITS(resp, 126, 2);
-
-                switch (csd_struct) {
-                case 0:
-                        m = UNSTUFF_BITS(resp, 115, 4);
-                        e = UNSTUFF_BITS(resp, 112, 3);
-                        csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-                        csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
-
-                        m = UNSTUFF_BITS(resp, 99, 4);
-                        e = UNSTUFF_BITS(resp, 96, 3);
-                        csd->max_dtr      = tran_exp[e] * tran_mant[m];
-                        csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-                        e = UNSTUFF_BITS(resp, 47, 3);
-                        m = UNSTUFF_BITS(resp, 62, 12);
-                        csd->capacity     = (1 + m) << (e + 2);
-
-                        csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
-                        csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
-                        csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
-                        csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
-                        csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
-                        csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
-                        csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
-                        break;
-                case 1:
-                        /*
-                         * This is a block-addressed SDHC card. Most
-                         * interesting fields are unused and have fixed
-                         * values. To avoid getting tripped by buggy cards,
-                         * we assume those fixed values ourselves.
-                         */
-                        mmc_card_set_blockaddr(card);
-
-                        csd->tacc_ns     = 0; /* Unused */
-                        csd->tacc_clks   = 0; /* Unused */
-
-                        m = UNSTUFF_BITS(resp, 99, 4);
-                        e = UNSTUFF_BITS(resp, 96, 3);
-                        csd->max_dtr      = tran_exp[e] * tran_mant[m];
-                        csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-                        m = UNSTUFF_BITS(resp, 48, 22);
-                        csd->capacity     = (1 + m) << 10;
-
-                        csd->read_blkbits = 9;
-                        csd->read_partial = 0;
-                        csd->write_misalign = 0;
-                        csd->read_misalign = 0;
-                        csd->r2w_factor = 4; /* Unused */
-                        csd->write_blkbits = 9;
-                        csd->write_partial = 0;
-                        break;
-                default:
-                        printk("%s: unrecognised CSD structure version %d\n",
-                                mmc_hostname(card->host), csd_struct);
-                        mmc_card_set_bad(card);
-                        return;
-                }
-        } else {
-                /*
-                 * We only understand CSD structure v1.1 and v1.2.
-                 * v1.2 has extra information in bits 15, 11 and 10.
-                 */
-                csd_struct = UNSTUFF_BITS(resp, 126, 2);
-                if (csd_struct != 1 && csd_struct != 2) {
-                        printk("%s: unrecognised CSD structure version %d\n",
-                                mmc_hostname(card->host), csd_struct);
-                        mmc_card_set_bad(card);
-                        return;
-                }
-
-                csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
-                m = UNSTUFF_BITS(resp, 115, 4);
-                e = UNSTUFF_BITS(resp, 112, 3);
-                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
-
-                m = UNSTUFF_BITS(resp, 99, 4);
-                e = UNSTUFF_BITS(resp, 96, 3);
-                csd->max_dtr      = tran_exp[e] * tran_mant[m];
-                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-                e = UNSTUFF_BITS(resp, 47, 3);
-                m = UNSTUFF_BITS(resp, 62, 12);
-                csd->capacity     = (1 + m) << (e + 2);
-
-                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
-                csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
-                csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
-                csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
-                csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
-                csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
-                csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
-        }
-}
-
-/*
- * Given a 64-bit response, decode to our card SCR structure.
- */
-static void mmc_decode_scr(struct mmc_card *card)
-{
-        struct sd_scr *scr = &card->scr;
-        unsigned int scr_struct;
-        u32 resp[4];
-
-        BUG_ON(!mmc_card_sd(card));
-
-        resp[3] = card->raw_scr[1];
-        resp[2] = card->raw_scr[0];
-
-        scr_struct = UNSTUFF_BITS(resp, 60, 4);
-        if (scr_struct != 0) {
-                printk("%s: unrecognised SCR structure version %d\n",
-                        mmc_hostname(card->host), scr_struct);
-                mmc_card_set_bad(card);
-                return;
-        }
-
-        scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
-        scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
-}
-
-/*
- * Locate a MMC card on this MMC host given a raw CID.
- */
-static struct mmc_card *mmc_find_card(struct mmc_host *host, u32 *raw_cid)
-{
-        struct mmc_card *card;
-
-        list_for_each_entry(card, &host->cards, node) {
-                if (memcmp(card->raw_cid, raw_cid, sizeof(card->raw_cid)) == 0)
-                        return card;
-        }
-        return NULL;
-}
-
-/*
- * Allocate a new MMC card, and assign a unique RCA.
- */
-static struct mmc_card *
-mmc_alloc_card(struct mmc_host *host, u32 *raw_cid, unsigned int *frca)
-{
-        struct mmc_card *card, *c;
-        unsigned int rca = *frca;
-
-        card = kmalloc(sizeof(struct mmc_card), GFP_KERNEL);
-        if (!card)
-                return ERR_PTR(-ENOMEM);
-
-        mmc_init_card(card, host);
-        memcpy(card->raw_cid, raw_cid, sizeof(card->raw_cid));
-
- again:
-        list_for_each_entry(c, &host->cards, node)
-                if (c->rca == rca) {
-                        rca++;
-                        goto again;
-                }
-
-        card->rca = rca;
-
-        *frca = rca;
-
-        return card;
-}
-
-/*
- * Tell attached cards to go to IDLE state
- */
-static void mmc_idle_cards(struct mmc_host *host)
-{
-        struct mmc_command cmd;
-
-        host->ios.chip_select = MMC_CS_HIGH;
-        mmc_set_ios(host);
-
-        mmc_delay(1);
-
-        cmd.opcode = MMC_GO_IDLE_STATE;
-        cmd.arg = 0;
-        cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
-
-        mmc_wait_for_cmd(host, &cmd, 0);
-
-        mmc_delay(1);
-
-        host->ios.chip_select = MMC_CS_DONTCARE;
-        mmc_set_ios(host);
-
-        mmc_delay(1);
-}
-
-/*
- * Apply power to the MMC stack.  This is a two-stage process.
- * First, we enable power to the card without the clock running.
- * We then wait a bit for the power to stabilise.  Finally,
- * enable the bus drivers and clock to the card.
- *
- * We must _NOT_ enable the clock prior to power stablising.
- *
- * If a host does all the power sequencing itself, ignore the
- * initial MMC_POWER_UP stage.
- */
-static void mmc_power_up(struct mmc_host *host)
-{
-        int bit = fls(host->ocr_avail) - 1;
-
-        host->ios.vdd = bit;
-        host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
-        host->ios.chip_select = MMC_CS_DONTCARE;
-        host->ios.power_mode = MMC_POWER_UP;
-        host->ios.bus_width = MMC_BUS_WIDTH_1;
-        host->ios.timing = MMC_TIMING_LEGACY;
-        mmc_set_ios(host);
-
-        mmc_delay(1);
-
-        host->ios.clock = host->f_min;
-        host->ios.power_mode = MMC_POWER_ON;
-        mmc_set_ios(host);
-
-        mmc_delay(2);
-}
-
-static void mmc_power_off(struct mmc_host *host)
-{
-        host->ios.clock = 0;
-        host->ios.vdd = 0;
-        host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
-        host->ios.chip_select = MMC_CS_DONTCARE;
-        host->ios.power_mode = MMC_POWER_OFF;
-        host->ios.bus_width = MMC_BUS_WIDTH_1;
-        host->ios.timing = MMC_TIMING_LEGACY;
-        mmc_set_ios(host);
-}
-
-static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
-{
-        struct mmc_command cmd;
-        int i, err = 0;
-
-        cmd.opcode = MMC_SEND_OP_COND;
-        cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
-
-        for (i = 100; i; i--) {
-                err = mmc_wait_for_cmd(host, &cmd, 0);
-                if (err != MMC_ERR_NONE)
-                        break;
-
-                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
-                        break;
-
-                err = MMC_ERR_TIMEOUT;
-
-                mmc_delay(10);
-        }
-
-        if (rocr)
-                *rocr = cmd.resp[0];
-
-        return err;
-}
-
-static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
-{
-        struct mmc_command cmd;
-        int i, err = 0;
-
-        cmd.opcode = SD_APP_OP_COND;
-        cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
-
-        for (i = 100; i; i--) {
-                err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
-                if (err != MMC_ERR_NONE)
-                        break;
-
-                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
-                        break;
-
-                err = MMC_ERR_TIMEOUT;
-
-                mmc_delay(10);
-        }
-
-        if (rocr)
-                *rocr = cmd.resp[0];
-
-        return err;
-}
-
-static int mmc_send_if_cond(struct mmc_host *host, u32 ocr, int *rsd2)
-{
-        struct mmc_command cmd;
-        int err, sd2;
-        static const u8 test_pattern = 0xAA;
-
-        /*
-        * To support SD 2.0 cards, we must always invoke SD_SEND_IF_COND
-        * before SD_APP_OP_COND. This command will harmlessly fail for
-        * SD 1.0 cards.
-        */
-        cmd.opcode = SD_SEND_IF_COND;
-        cmd.arg = ((ocr & 0xFF8000) != 0) << 8 | test_pattern;
-        cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
-
-        err = mmc_wait_for_cmd(host, &cmd, 0);
-        if (err == MMC_ERR_NONE) {
-                if ((cmd.resp[0] & 0xFF) == test_pattern) {
-                        sd2 = 1;
-                } else {
-                        sd2 = 0;
-                        err = MMC_ERR_FAILED;
-                }
-        } else {
-                /*
-                 * Treat errors as SD 1.0 card.
-                 */
-                sd2 = 0;
-                err = MMC_ERR_NONE;
-        }
-        if (rsd2)
-                *rsd2 = sd2;
-        return err;
-}
-
-/*
- * Discover cards by requesting their CID.  If this command
- * times out, it is not an error; there are no further cards
- * to be discovered.  Add new cards to the list.
- *
- * Create a mmc_card entry for each discovered card, assigning
- * it an RCA, and save the raw CID for decoding later.
- */
-static void mmc_discover_cards(struct mmc_host *host)
-{
-        struct mmc_card *card;
-        unsigned int first_rca = 1, err;
-
-        while (1) {
-                struct mmc_command cmd;
-
-                cmd.opcode = MMC_ALL_SEND_CID;
-                cmd.arg = 0;
-                cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
-
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                if (err == MMC_ERR_TIMEOUT) {
-                        err = MMC_ERR_NONE;
-                        break;
-                }
-                if (err != MMC_ERR_NONE) {
-                        printk(KERN_ERR "%s: error requesting CID: %d\n",
-                                mmc_hostname(host), err);
-                        break;
-                }
-
-                card = mmc_find_card(host, cmd.resp);
-                if (!card) {
-                        card = mmc_alloc_card(host, cmd.resp, &first_rca);
-                        if (IS_ERR(card)) {
-                                err = PTR_ERR(card);
-                                break;
-                        }
-                        list_add(&card->node, &host->cards);
-                }
-
-                card->state &= ~MMC_STATE_DEAD;
-
-                if (host->mode == MMC_MODE_SD) {
-                        mmc_card_set_sd(card);
-
-                        cmd.opcode = SD_SEND_RELATIVE_ADDR;
-                        cmd.arg = 0;
-                        cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
-
-                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                        if (err != MMC_ERR_NONE)
-                                mmc_card_set_dead(card);
-                        else {
-                                card->rca = cmd.resp[0] >> 16;
-
-                                if (!host->ops->get_ro) {
-                                        printk(KERN_WARNING "%s: host does not "
-                                                "support reading read-only "
-                                                "switch. assuming write-enable.\n",
-                                                mmc_hostname(host));
-                                } else {
-                                        if (host->ops->get_ro(host))
-                                                mmc_card_set_readonly(card);
-                                }
-                        }
-                } else {
-                        cmd.opcode = MMC_SET_RELATIVE_ADDR;
-                        cmd.arg = card->rca << 16;
-                        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                        if (err != MMC_ERR_NONE)
-                                mmc_card_set_dead(card);
-                }
-        }
-}
-
-static void mmc_read_csds(struct mmc_host *host)
-{
-        struct mmc_card *card;
-
-        list_for_each_entry(card, &host->cards, node) {
-                struct mmc_command cmd;
-                int err;
-
-                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
-                        continue;
-
-                cmd.opcode = MMC_SEND_CSD;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
-
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                if (err != MMC_ERR_NONE) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                memcpy(card->raw_csd, cmd.resp, sizeof(card->raw_csd));
-
-                mmc_decode_csd(card);
-                mmc_decode_cid(card);
-        }
-}
-
-static void mmc_process_ext_csds(struct mmc_host *host)
-{
-        int err;
-        struct mmc_card *card;
-
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_data data;
-
-        struct scatterlist sg;
-
-        /*
-         * As the ext_csd is so large and mostly unused, we don't store the
-         * raw block in mmc_card.
-         */
-        u8 *ext_csd;
-        ext_csd = kmalloc(512, GFP_KERNEL);
-        if (!ext_csd) {
-                printk("%s: could not allocate a buffer to receive the ext_csd."
-                       "mmc v4 cards will be treated as v3.\n",
-                        mmc_hostname(host));
-                return;
-        }
-
-        list_for_each_entry(card, &host->cards, node) {
-                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
-                        continue;
-                if (mmc_card_sd(card))
-                        continue;
-                if (card->csd.mmca_vsn < CSD_SPEC_VER_4)
-                        continue;
-
-                err = mmc_select_card(host, card);
-                if (err != MMC_ERR_NONE) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                memset(&cmd, 0, sizeof(struct mmc_command));
-
-                cmd.opcode = MMC_SEND_EXT_CSD;
-                cmd.arg = 0;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-                memset(&data, 0, sizeof(struct mmc_data));
-
-                mmc_set_data_timeout(&data, card, 0);
-
-                data.blksz = 512;
-                data.blocks = 1;
-                data.flags = MMC_DATA_READ;
-                data.sg = &sg;
-                data.sg_len = 1;
-
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                mrq.cmd = &cmd;
-                mrq.data = &data;
-
-                sg_init_one(&sg, ext_csd, 512);
-
-                mmc_wait_for_req(host, &mrq);
-
-                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-                        printk("%s: unable to read EXT_CSD, performance "
-                                "might suffer.\n", mmc_hostname(card->host));
-                        continue;
-                }
-
-                switch (ext_csd[EXT_CSD_CARD_TYPE]) {
-                case EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
-                        card->ext_csd.hs_max_dtr = 52000000;
-                        break;
-                case EXT_CSD_CARD_TYPE_26:
-                        card->ext_csd.hs_max_dtr = 26000000;
-                        break;
-                default:
-                        /* MMC v4 spec says this cannot happen */
-                        printk("%s: card is mmc v4 but doesn't support "
-                               "any high-speed modes.\n",
-                                mmc_hostname(card->host));
-                        continue;
-                }
-
-                if (host->caps & MMC_CAP_MMC_HIGHSPEED) {
-                        /* Activate highspeed support. */
-                        cmd.opcode = MMC_SWITCH;
-                        cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
-                                  (EXT_CSD_HS_TIMING << 16) |
-                                  (1 << 8) |
-                                  EXT_CSD_CMD_SET_NORMAL;
-                        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
-
-                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                        if (err != MMC_ERR_NONE) {
-                                printk("%s: failed to switch card to mmc v4 "
-                                       "high-speed mode.\n",
-                                       mmc_hostname(card->host));
-                                continue;
-                        }
-
-                        mmc_card_set_highspeed(card);
-
-                        host->ios.timing = MMC_TIMING_SD_HS;
-                        mmc_set_ios(host);
-                }
-
-                /* Check for host support for wide-bus modes. */
-                if (host->caps & MMC_CAP_4_BIT_DATA) {
-                        /* Activate 4-bit support. */
-                        cmd.opcode = MMC_SWITCH;
-                        cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
-                                  (EXT_CSD_BUS_WIDTH << 16) |
-                                  (EXT_CSD_BUS_WIDTH_4 << 8) |
-                                  EXT_CSD_CMD_SET_NORMAL;
-                        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
-
-                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                        if (err != MMC_ERR_NONE) {
-                                printk("%s: failed to switch card to "
-                                       "mmc v4 4-bit bus mode.\n",
-                                       mmc_hostname(card->host));
-                                continue;
-                        }
-
-                        host->ios.bus_width = MMC_BUS_WIDTH_4;
-                        mmc_set_ios(host);
-                }
-        }
-
-        kfree(ext_csd);
-
-        mmc_deselect_cards(host);
-}
-
-static void mmc_read_scrs(struct mmc_host *host)
-{
-        int err;
-        struct mmc_card *card;
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_data data;
-        struct scatterlist sg;
-
-        list_for_each_entry(card, &host->cards, node) {
-                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
-                        continue;
-                if (!mmc_card_sd(card))
-                        continue;
-
-                err = mmc_select_card(host, card);
-                if (err != MMC_ERR_NONE) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                memset(&cmd, 0, sizeof(struct mmc_command));
-
-                cmd.opcode = MMC_APP_CMD;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-                err = mmc_wait_for_cmd(host, &cmd, 0);
-                if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                memset(&cmd, 0, sizeof(struct mmc_command));
-
-                cmd.opcode = SD_APP_SEND_SCR;
-                cmd.arg = 0;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-                memset(&data, 0, sizeof(struct mmc_data));
-
-                mmc_set_data_timeout(&data, card, 0);
-
-                data.blksz = 1 << 3;
-                data.blocks = 1;
-                data.flags = MMC_DATA_READ;
-                data.sg = &sg;
-                data.sg_len = 1;
-
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                mrq.cmd = &cmd;
-                mrq.data = &data;
-
-                sg_init_one(&sg, (u8*)card->raw_scr, 8);
-
-                mmc_wait_for_req(host, &mrq);
-
-                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                card->raw_scr[0] = ntohl(card->raw_scr[0]);
-                card->raw_scr[1] = ntohl(card->raw_scr[1]);
-
-                mmc_decode_scr(card);
-        }
-
-        mmc_deselect_cards(host);
-}
-
-static void mmc_read_switch_caps(struct mmc_host *host)
-{
-        int err;
-        struct mmc_card *card;
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_data data;
-        unsigned char *status;
-        struct scatterlist sg;
-
-        if (!(host->caps & MMC_CAP_SD_HIGHSPEED))
-                return;
-
-        status = kmalloc(64, GFP_KERNEL);
-        if (!status) {
-                printk(KERN_WARNING "%s: Unable to allocate buffer for "
-                        "reading switch capabilities.\n",
-                        mmc_hostname(host));
-                return;
-        }
-
-        list_for_each_entry(card, &host->cards, node) {
-                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
-                        continue;
-                if (!mmc_card_sd(card))
-                        continue;
-                if (card->scr.sda_vsn < SCR_SPEC_VER_1)
-                        continue;
-
-                err = mmc_select_card(host, card);
-                if (err != MMC_ERR_NONE) {
-                        mmc_card_set_dead(card);
-                        continue;
-                }
-
-                memset(&cmd, 0, sizeof(struct mmc_command));
-
-                cmd.opcode = SD_SWITCH;
-                cmd.arg = 0x00FFFFF1;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-                memset(&data, 0, sizeof(struct mmc_data));
-
-                mmc_set_data_timeout(&data, card, 0);
-
-                data.blksz = 64;
-                data.blocks = 1;
-                data.flags = MMC_DATA_READ;
-                data.sg = &sg;
-                data.sg_len = 1;
-
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                mrq.cmd = &cmd;
-                mrq.data = &data;
-
-                sg_init_one(&sg, status, 64);
-
-                mmc_wait_for_req(host, &mrq);
-
-                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-                        printk("%s: unable to read switch capabilities, "
-                                "performance might suffer.\n",
-                                mmc_hostname(card->host));
-                        continue;
-                }
-
-                if (status[13] & 0x02)
-                        card->sw_caps.hs_max_dtr = 50000000;
-
-                memset(&cmd, 0, sizeof(struct mmc_command));
-
-                cmd.opcode = SD_SWITCH;
-                cmd.arg = 0x80FFFFF1;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-                memset(&data, 0, sizeof(struct mmc_data));
-
-                mmc_set_data_timeout(&data, card, 0);
-
-                data.blksz = 64;
-                data.blocks = 1;
-                data.flags = MMC_DATA_READ;
-                data.sg = &sg;
-                data.sg_len = 1;
-
-                memset(&mrq, 0, sizeof(struct mmc_request));
-
-                mrq.cmd = &cmd;
-                mrq.data = &data;
-
-                sg_init_one(&sg, status, 64);
-
-                mmc_wait_for_req(host, &mrq);
-
-                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE ||
-                        (status[16] & 0xF) != 1) {
-                        printk(KERN_WARNING "%s: Problem switching card "
-                                "into high-speed mode!\n",
-                                mmc_hostname(host));
-                        continue;
-                }
-
-                mmc_card_set_highspeed(card);
-
-                host->ios.timing = MMC_TIMING_SD_HS;
-                mmc_set_ios(host);
-        }
-
-        kfree(status);
-
-        mmc_deselect_cards(host);
-}
-
-static unsigned int mmc_calculate_clock(struct mmc_host *host)
-{
-        struct mmc_card *card;
-        unsigned int max_dtr = host->f_max;
-
-        list_for_each_entry(card, &host->cards, node)
-                if (!mmc_card_dead(card)) {
-                        if (mmc_card_highspeed(card) && mmc_card_sd(card)) {
-                                if (max_dtr > card->sw_caps.hs_max_dtr)
-                                        max_dtr = card->sw_caps.hs_max_dtr;
-                        } else if (mmc_card_highspeed(card) && !mmc_card_sd(card)) {
-                                if (max_dtr > card->ext_csd.hs_max_dtr)
-                                        max_dtr = card->ext_csd.hs_max_dtr;
-                        } else if (max_dtr > card->csd.max_dtr) {
-                                max_dtr = card->csd.max_dtr;
-                        }
-                }
-
-        pr_debug("%s: selected %d.%03dMHz transfer rate\n",
-                 mmc_hostname(host),
-                 max_dtr / 1000000, (max_dtr / 1000) % 1000);
-
-        return max_dtr;
-}
-
-/*
- * Check whether cards we already know about are still present.
- * We do this by requesting status, and checking whether a card
- * responds.
- *
- * A request for status does not cause a state change in data
- * transfer mode.
- */
-static void mmc_check_cards(struct mmc_host *host)
-{
-        struct list_head *l, *n;
-
-        mmc_deselect_cards(host);
-
-        list_for_each_safe(l, n, &host->cards) {
-                struct mmc_card *card = mmc_list_to_card(l);
-                struct mmc_command cmd;
-                int err;
-
-                cmd.opcode = MMC_SEND_STATUS;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                if (err == MMC_ERR_NONE)
-                        continue;
-
-                mmc_card_set_dead(card);
-        }
-}
-
-static void mmc_setup(struct mmc_host *host)
-{
-        if (host->ios.power_mode != MMC_POWER_ON) {
-                int err;
-                u32 ocr;
-
-                host->mode = MMC_MODE_SD;
-
-                mmc_power_up(host);
-                mmc_idle_cards(host);
-
-                err = mmc_send_if_cond(host, host->ocr_avail, NULL);
-                if (err != MMC_ERR_NONE) {
-                        return;
-                }
-                err = mmc_send_app_op_cond(host, 0, &ocr);
-
-                /*
-                 * If we fail to detect any SD cards then try
-                 * searching for MMC cards.
-                 */
-                if (err != MMC_ERR_NONE) {
-                        host->mode = MMC_MODE_MMC;
-
-                        err = mmc_send_op_cond(host, 0, &ocr);
-                        if (err != MMC_ERR_NONE)
-                                return;
-                }
-
-                host->ocr = mmc_select_voltage(host, ocr);
-
-                /*
-                 * Since we're changing the OCR value, we seem to
-                 * need to tell some cards to go back to the idle
-                 * state.  We wait 1ms to give cards time to
-                 * respond.
-                 */
-                if (host->ocr)
-                        mmc_idle_cards(host);
-        } else {
-                host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
-                host->ios.clock = host->f_min;
-                mmc_set_ios(host);
-
-                /*
-                 * We should remember the OCR mask from the existing
-                 * cards, and detect the new cards OCR mask, combine
-                 * the two and re-select the VDD.  However, if we do
-                 * change VDD, we should do an idle, and then do a
-                 * full re-initialisation.  We would need to notify
-                 * drivers so that they can re-setup the cards as
-                 * well, while keeping their queues at bay.
-                 *
-                 * For the moment, we take the easy way out - if the
-                 * new cards don't like our currently selected VDD,
-                 * they drop off the bus.
-                 */
-        }
-
-        if (host->ocr == 0)
-                return;
-
-        /*
-         * Send the selected OCR multiple times... until the cards
-         * all get the idea that they should be ready for CMD2.
-         * (My SanDisk card seems to need this.)
-         */
-        if (host->mode == MMC_MODE_SD) {
-                int err, sd2;
-                err = mmc_send_if_cond(host, host->ocr, &sd2);
-                if (err == MMC_ERR_NONE) {
-                        /*
-                        * If SD_SEND_IF_COND indicates an SD 2.0
-                        * compliant card and we should set bit 30
-                        * of the ocr to indicate that we can handle
-                        * block-addressed SDHC cards.
-                        */
-                        mmc_send_app_op_cond(host, host->ocr | (sd2 << 30), NULL);
-                }
-        } else {
-                mmc_send_op_cond(host, host->ocr, NULL);
-        }
-
-        mmc_discover_cards(host);
-
-        /*
-         * Ok, now switch to push-pull mode.
-         */
-        host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;
-        mmc_set_ios(host);
-
-        mmc_read_csds(host);
-
-        if (host->mode == MMC_MODE_SD) {
-                mmc_read_scrs(host);
-                mmc_read_switch_caps(host);
-        } else
-                mmc_process_ext_csds(host);
-}
-
-
-/**
- *      mmc_detect_change - process change of state on a MMC socket
- *      @host: host which changed state.
- *      @delay: optional delay to wait before detection (jiffies)
- *
- *      All we know is that card(s) have been inserted or removed
- *      from the socket(s).  We don't know which socket or cards.
- */
-void mmc_detect_change(struct mmc_host *host, unsigned long delay)
-{
-        mmc_schedule_delayed_work(&host->detect, delay);
-}
-
-EXPORT_SYMBOL(mmc_detect_change);
-
-
-static void mmc_rescan(struct work_struct *work)
-{
-        struct mmc_host *host =
-                container_of(work, struct mmc_host, detect.work);
-        struct list_head *l, *n;
-        unsigned char power_mode;
-
-        mmc_claim_host(host);
-
-        /*
-         * Check for removed cards and newly inserted ones. We check for
-         * removed cards first so we can intelligently re-select the VDD.
-         */
-        power_mode = host->ios.power_mode;
-        if (power_mode == MMC_POWER_ON)
-                mmc_check_cards(host);
-
-        mmc_setup(host);
-
-        /*
-         * Some broken cards process CMD1 even in stand-by state. There is
-         * no reply, but an ILLEGAL_COMMAND error is cached and returned
-         * after next command. We poll for card status here to clear any
-         * possibly pending error.
-         */
-        if (power_mode == MMC_POWER_ON)
-                mmc_check_cards(host);
-
-        if (!list_empty(&host->cards)) {
-                /*
-                 * (Re-)calculate the fastest clock rate which the
-                 * attached cards and the host support.
-                 */
-                host->ios.clock = mmc_calculate_clock(host);
-                mmc_set_ios(host);
-        }
-
-        mmc_release_host(host);
-
-        list_for_each_safe(l, n, &host->cards) {
-                struct mmc_card *card = mmc_list_to_card(l);
-
-                /*
-                 * If this is a new and good card, register it.
-                 */
-                if (!mmc_card_present(card) && !mmc_card_dead(card)) {
-                        if (mmc_register_card(card))
-                                mmc_card_set_dead(card);
-                        else
-                                mmc_card_set_present(card);
-                }
-
-                /*
-                 * If this card is dead, destroy it.
-                 */
-                if (mmc_card_dead(card)) {
-                        list_del(&card->node);
-                        mmc_remove_card(card);
-                }
-        }
-
-        /*
-         * If we discover that there are no cards on the
-         * bus, turn off the clock and power down.
-         */
-        if (list_empty(&host->cards))
-                mmc_power_off(host);
-}
-
-
-/**
- *      mmc_alloc_host - initialise the per-host structure.
- *      @extra: sizeof private data structure
- *      @dev: pointer to host device model structure
- *
- *      Initialise the per-host structure.
- */
-struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
-{
-        struct mmc_host *host;
-
-        host = mmc_alloc_host_sysfs(extra, dev);
-        if (host) {
-                spin_lock_init(&host->lock);
-                init_waitqueue_head(&host->wq);
-                INIT_LIST_HEAD(&host->cards);
-                INIT_DELAYED_WORK(&host->detect, mmc_rescan);
-
-                /*
-                 * By default, hosts do not support SGIO or large requests.
-                 * They have to set these according to their abilities.
-                 */
-                host->max_hw_segs = 1;
-                host->max_phys_segs = 1;
-                host->max_seg_size = PAGE_CACHE_SIZE;
-
-                host->max_req_size = PAGE_CACHE_SIZE;
-                host->max_blk_size = 512;
-                host->max_blk_count = PAGE_CACHE_SIZE / 512;
-        }
-
-        return host;
-}
-
-EXPORT_SYMBOL(mmc_alloc_host);
-
-/**
- *      mmc_add_host - initialise host hardware
- *      @host: mmc host
- */
-int mmc_add_host(struct mmc_host *host)
-{
-        int ret;
-
-        ret = mmc_add_host_sysfs(host);
-        if (ret == 0) {
-                mmc_power_off(host);
-                mmc_detect_change(host, 0);
-        }
-
-        return ret;
-}
-
-EXPORT_SYMBOL(mmc_add_host);
-
-/**
- *      mmc_remove_host - remove host hardware
- *      @host: mmc host
- *
- *      Unregister and remove all cards associated with this host,
- *      and power down the MMC bus.
- */
-void mmc_remove_host(struct mmc_host *host)
-{
-        struct list_head *l, *n;
-
-        list_for_each_safe(l, n, &host->cards) {
-                struct mmc_card *card = mmc_list_to_card(l);
-
-                mmc_remove_card(card);
-        }
-
-        mmc_power_off(host);
-        mmc_remove_host_sysfs(host);
-}
-
-EXPORT_SYMBOL(mmc_remove_host);
-
-/**
- *      mmc_free_host - free the host structure
- *      @host: mmc host
- *
- *      Free the host once all references to it have been dropped.
- */
-void mmc_free_host(struct mmc_host *host)
-{
-        mmc_flush_scheduled_work();
-        mmc_free_host_sysfs(host);
-}
-
-EXPORT_SYMBOL(mmc_free_host);
-
-#ifdef CONFIG_PM
-
-/**
- *      mmc_suspend_host - suspend a host
- *      @host: mmc host
- *      @state: suspend mode (PM_SUSPEND_xxx)
- */
-int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
-{
-        mmc_claim_host(host);
-        mmc_deselect_cards(host);
-        mmc_power_off(host);
-        mmc_release_host(host);
-
-        return 0;
-}
-
-EXPORT_SYMBOL(mmc_suspend_host);
-
-/**
- *      mmc_resume_host - resume a previously suspended host
- *      @host: mmc host
- */
-int mmc_resume_host(struct mmc_host *host)
-{
-        mmc_rescan(&host->detect.work);
-
-        return 0;
-}
-
-EXPORT_SYMBOL(mmc_resume_host);
-
-#endif
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
deleted file mode 100644
index 0581d09c58fc..000000000000
--- a/drivers/mmc/tifm_sd.c
+++ /dev/null
@@ -1,987 +0,0 @@
-/*
- *  tifm_sd.c - TI FlashMedia driver
- *
- *  Copyright (C) 2006 Alex Dubov <oakad@yahoo.com>
- *
- * 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/tifm.h>
-#include <linux/mmc/protocol.h>
-#include <linux/mmc/host.h>
-#include <linux/highmem.h>
-#include <asm/io.h>
-
-#define DRIVER_NAME "tifm_sd"
-#define DRIVER_VERSION "0.7"
-
-static int no_dma = 0;
-static int fixed_timeout = 0;
-module_param(no_dma, bool, 0644);
-module_param(fixed_timeout, bool, 0644);
-
-/* Constants here are mostly from OMAP5912 datasheet */
-#define TIFM_MMCSD_RESET      0x0002
-#define TIFM_MMCSD_CLKMASK    0x03ff
-#define TIFM_MMCSD_POWER      0x0800
-#define TIFM_MMCSD_4BBUS      0x8000
-#define TIFM_MMCSD_RXDE       0x8000   /* rx dma enable */
-#define TIFM_MMCSD_TXDE       0x0080   /* tx dma enable */
-#define TIFM_MMCSD_BUFINT     0x0c00   /* set bits: AE, AF */
-#define TIFM_MMCSD_DPE        0x0020   /* data timeout counted in kilocycles */
-#define TIFM_MMCSD_INAB       0x0080   /* abort / initialize command */
-#define TIFM_MMCSD_READ       0x8000
-
-#define TIFM_MMCSD_DATAMASK   0x401d   /* set bits: CERR, EOFB, BRS, CB, EOC */
-#define TIFM_MMCSD_ERRMASK    0x01e0   /* set bits: CCRC, CTO, DCRC, DTO */
-#define TIFM_MMCSD_EOC        0x0001   /* end of command phase  */
-#define TIFM_MMCSD_CB         0x0004   /* card enter busy state */
-#define TIFM_MMCSD_BRS        0x0008   /* block received/sent   */
-#define TIFM_MMCSD_EOFB       0x0010   /* card exit busy state  */
-#define TIFM_MMCSD_DTO        0x0020   /* data time-out         */
-#define TIFM_MMCSD_DCRC       0x0040   /* data crc error        */
-#define TIFM_MMCSD_CTO        0x0080   /* command time-out      */
-#define TIFM_MMCSD_CCRC       0x0100   /* command crc error     */
-#define TIFM_MMCSD_AF         0x0400   /* fifo almost full      */
-#define TIFM_MMCSD_AE         0x0800   /* fifo almost empty     */
-#define TIFM_MMCSD_CERR       0x4000   /* card status error     */
-
-#define TIFM_MMCSD_FIFO_SIZE  0x0020
-
-#define TIFM_MMCSD_RSP_R0     0x0000
-#define TIFM_MMCSD_RSP_R1     0x0100
-#define TIFM_MMCSD_RSP_R2     0x0200
-#define TIFM_MMCSD_RSP_R3     0x0300
-#define TIFM_MMCSD_RSP_R4     0x0400
-#define TIFM_MMCSD_RSP_R5     0x0500
-#define TIFM_MMCSD_RSP_R6     0x0600
-
-#define TIFM_MMCSD_RSP_BUSY   0x0800
-
-#define TIFM_MMCSD_CMD_BC     0x0000
-#define TIFM_MMCSD_CMD_BCR    0x1000
-#define TIFM_MMCSD_CMD_AC     0x2000
-#define TIFM_MMCSD_CMD_ADTC   0x3000
-
-typedef enum {
-        IDLE = 0,
-        CMD,    /* main command ended                   */
-        BRS,    /* block transfer finished              */
-        SCMD,   /* stop command ended                   */
-        CARD,   /* card left busy state                 */
-        FIFO,   /* FIFO operation completed (uncertain) */
-        READY
-} card_state_t;
-
-enum {
-        FIFO_RDY   = 0x0001,     /* hardware dependent value */
-        EJECT      = 0x0004,
-        EJECT_DONE = 0x0008,
-        CARD_BUSY  = 0x0010,
-        OPENDRAIN  = 0x0040,     /* hardware dependent value */
-        CARD_EVENT = 0x0100,     /* hardware dependent value */
-        CARD_RO    = 0x0200,     /* hardware dependent value */
-        FIFO_EVENT = 0x10000 };  /* hardware dependent value */
-
-struct tifm_sd {
-        struct tifm_dev     *dev;
-
-        unsigned int        flags;
-        card_state_t        state;
-        unsigned int        clk_freq;
-        unsigned int        clk_div;
-        unsigned long       timeout_jiffies;
-
-        struct tasklet_struct finish_tasklet;
-        struct timer_list     timer;
-        struct mmc_request    *req;
-        wait_queue_head_t     notify;
-
-        size_t                written_blocks;
-        size_t                buffer_size;
-        size_t                buffer_pos;
-
-};
-
-static char* tifm_sd_data_buffer(struct mmc_data *data)
-{
-        return page_address(data->sg->page) + data->sg->offset;
-}
-
-static int tifm_sd_transfer_data(struct tifm_dev *sock, struct tifm_sd *host,
-                                 unsigned int host_status)
-{
-        struct mmc_command *cmd = host->req->cmd;
-        unsigned int t_val = 0, cnt = 0;
-        char *buffer;
-
-        if (host_status & TIFM_MMCSD_BRS) {
-                /* in non-dma rx mode BRS fires when fifo is still not empty */
-                if (no_dma && (cmd->data->flags & MMC_DATA_READ)) {
-                        buffer = tifm_sd_data_buffer(host->req->data);
-                        while (host->buffer_size > host->buffer_pos) {
-                                t_val = readl(sock->addr + SOCK_MMCSD_DATA);
-                                buffer[host->buffer_pos++] = t_val & 0xff;
-                                buffer[host->buffer_pos++] =
-                                                        (t_val >> 8) & 0xff;
-                        }
-                }
-                return 1;
-        } else if (no_dma) {
-                buffer = tifm_sd_data_buffer(host->req->data);
-                if ((cmd->data->flags & MMC_DATA_READ) &&
-                                (host_status & TIFM_MMCSD_AF)) {
-                        for (cnt = 0; cnt < TIFM_MMCSD_FIFO_SIZE; cnt++) {
-                                t_val = readl(sock->addr + SOCK_MMCSD_DATA);
-                                if (host->buffer_size > host->buffer_pos) {
-                                        buffer[host->buffer_pos++] =
-                                                        t_val & 0xff;
-                                        buffer[host->buffer_pos++] =
-                                                        (t_val >> 8) & 0xff;
-                                }
-                        }
-                } else if ((cmd->data->flags & MMC_DATA_WRITE)
-                           && (host_status & TIFM_MMCSD_AE)) {
-                        for (cnt = 0; cnt < TIFM_MMCSD_FIFO_SIZE; cnt++) {
-                                if (host->buffer_size > host->buffer_pos) {
-                                        t_val = buffer[host->buffer_pos++]
-                                                & 0x00ff;
-                                        t_val |= ((buffer[host->buffer_pos++])
-                                                  << 8) & 0xff00;
-                                        writel(t_val,
-                                               sock->addr + SOCK_MMCSD_DATA);
-                                }
-                        }
-                }
-        }
-        return 0;
-}
-
-static unsigned int tifm_sd_op_flags(struct mmc_command *cmd)
-{
-        unsigned int rc = 0;
-
-        switch (mmc_resp_type(cmd)) {
-        case MMC_RSP_NONE:
-                rc |= TIFM_MMCSD_RSP_R0;
-                break;
-        case MMC_RSP_R1B:
-                rc |= TIFM_MMCSD_RSP_BUSY; // deliberate fall-through
-        case MMC_RSP_R1:
-                rc |= TIFM_MMCSD_RSP_R1;
-                break;
-        case MMC_RSP_R2:
-                rc |= TIFM_MMCSD_RSP_R2;
-                break;
-        case MMC_RSP_R3:
-                rc |= TIFM_MMCSD_RSP_R3;
-                break;
-        default:
-                BUG();
-        }
-
-        switch (mmc_cmd_type(cmd)) {
-        case MMC_CMD_BC:
-                rc |= TIFM_MMCSD_CMD_BC;
-                break;
-        case MMC_CMD_BCR:
-                rc |= TIFM_MMCSD_CMD_BCR;
-                break;
-        case MMC_CMD_AC:
-                rc |= TIFM_MMCSD_CMD_AC;
-                break;
-        case MMC_CMD_ADTC:
-                rc |= TIFM_MMCSD_CMD_ADTC;
-                break;
-        default:
-                BUG();
-        }
-        return rc;
-}
-
-static void tifm_sd_exec(struct tifm_sd *host, struct mmc_command *cmd)
-{
-        struct tifm_dev *sock = host->dev;
-        unsigned int cmd_mask = tifm_sd_op_flags(cmd) |
-                                (host->flags & OPENDRAIN);
-
-        if (cmd->data && (cmd->data->flags & MMC_DATA_READ))
-                cmd_mask |= TIFM_MMCSD_READ;
-
-        dev_dbg(&sock->dev, "executing opcode 0x%x, arg: 0x%x, mask: 0x%x\n",
-                cmd->opcode, cmd->arg, cmd_mask);
-
-        writel((cmd->arg >> 16) & 0xffff, sock->addr + SOCK_MMCSD_ARG_HIGH);
-        writel(cmd->arg & 0xffff, sock->addr + SOCK_MMCSD_ARG_LOW);
-        writel(cmd->opcode | cmd_mask, sock->addr + SOCK_MMCSD_COMMAND);
-}
-
-static void tifm_sd_fetch_resp(struct mmc_command *cmd, struct tifm_dev *sock)
-{
-        cmd->resp[0] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x1c) << 16)
-                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x18);
-        cmd->resp[1] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x14) << 16)
-                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x10);
-        cmd->resp[2] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x0c) << 16)
-                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x08);
-        cmd->resp[3] = (readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x04) << 16)
-                       | readl(sock->addr + SOCK_MMCSD_RESPONSE + 0x00);
-}
-
-static void tifm_sd_process_cmd(struct tifm_dev *sock, struct tifm_sd *host,
-                                       unsigned int host_status)
-{
-        struct mmc_command *cmd = host->req->cmd;
-
-change_state:
-        switch (host->state) {
-        case IDLE:
-                return;
-        case CMD:
-                if (host_status & (TIFM_MMCSD_EOC | TIFM_MMCSD_CERR)) {
-                        tifm_sd_fetch_resp(cmd, sock);
-                        if (cmd->data) {
-                                host->state = BRS;
-                        } else {
-                                host->state = READY;
-                        }
-                        goto change_state;
-                }
-                break;
-        case BRS:
-                if (tifm_sd_transfer_data(sock, host, host_status)) {
-                        if (cmd->data->flags & MMC_DATA_WRITE) {
-                                host->state = CARD;
-                        } else {
-                                if (no_dma) {
-                                        if (host->req->stop) {
-                                                tifm_sd_exec(host, host->req->stop);
-                                                host->state = SCMD;
-                                        } else {
-                                                host->state = READY;
-                                        }
-                                } else {
-                                        host->state = FIFO;
-                                }
-                        }
-                        goto change_state;
-                }
-                break;
-        case SCMD:
-                if (host_status & TIFM_MMCSD_EOC) {
-                        tifm_sd_fetch_resp(host->req->stop, sock);
-                        host->state = READY;
-                        goto change_state;
-                }
-                break;
-        case CARD:
-                dev_dbg(&sock->dev, "waiting for CARD, have %zd blocks\n",
-                        host->written_blocks);
-                if (!(host->flags & CARD_BUSY)
-                    && (host->written_blocks == cmd->data->blocks)) {
-                        if (no_dma) {
-                                if (host->req->stop) {
-                                        tifm_sd_exec(host, host->req->stop);
-                                        host->state = SCMD;
-                                } else {
-                                        host->state = READY;
-                                }
-                        } else {
-                                host->state = FIFO;
-                        }
-                        goto change_state;
-                }
-                break;
-        case FIFO:
-                if (host->flags & FIFO_RDY) {
-                        host->flags &= ~FIFO_RDY;
-                        if (host->req->stop) {
-                                tifm_sd_exec(host, host->req->stop);
-                                host->state = SCMD;
-                        } else {
-                                host->state = READY;
-                        }
-                        goto change_state;
-                }
-                break;
-        case READY:
-                tasklet_schedule(&host->finish_tasklet);
-                return;
-        }
-
-}
-
-/* Called from interrupt handler */
-static void tifm_sd_signal_irq(struct tifm_dev *sock,
-                               unsigned int sock_irq_status)
-{
-        struct tifm_sd *host;
-        unsigned int host_status = 0, fifo_status = 0;
-        int error_code = 0;
-
-        spin_lock(&sock->lock);
-        host = mmc_priv((struct mmc_host*)tifm_get_drvdata(sock));
-
-        if (sock_irq_status & FIFO_EVENT) {
-                fifo_status = readl(sock->addr + SOCK_DMA_FIFO_STATUS);
-                writel(fifo_status, sock->addr + SOCK_DMA_FIFO_STATUS);
-
-                host->flags |= fifo_status & FIFO_RDY;
-        }
-
-        if (sock_irq_status & CARD_EVENT) {
-                host_status = readl(sock->addr + SOCK_MMCSD_STATUS);
-                writel(host_status, sock->addr + SOCK_MMCSD_STATUS);
-
-                if (!host->req)
-                        goto done;
-
-                if (host_status & TIFM_MMCSD_ERRMASK) {
-                        if (host_status & (TIFM_MMCSD_CTO | TIFM_MMCSD_DTO))
-                                error_code = MMC_ERR_TIMEOUT;
-                        else if (host_status
-                                 & (TIFM_MMCSD_CCRC | TIFM_MMCSD_DCRC))
-                                error_code = MMC_ERR_BADCRC;
-
-                        writel(TIFM_FIFO_INT_SETALL,
-                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
-                        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
-
-                        if (host->req->stop) {
-                                if (host->state == SCMD) {
-                                        host->req->stop->error = error_code;
-                                } else if (host->state == BRS
-                                           || host->state == CARD
-                                           || host->state == FIFO) {
-                                        host->req->cmd->error = error_code;
-                                        tifm_sd_exec(host, host->req->stop);
-                                        host->state = SCMD;
-                                        goto done;
-                                } else {
-                                        host->req->cmd->error = error_code;
-                                }
-                        } else {
-                                host->req->cmd->error = error_code;
-                        }
-                        host->state = READY;
-                }
-
-                if (host_status & TIFM_MMCSD_CB)
-                        host->flags |= CARD_BUSY;
-                if ((host_status & TIFM_MMCSD_EOFB)
-                    && (host->flags & CARD_BUSY)) {
-                        host->written_blocks++;
-                        host->flags &= ~CARD_BUSY;
-                }
-        }
-
-        if (host->req)
-                tifm_sd_process_cmd(sock, host, host_status);
-done:
-        dev_dbg(&sock->dev, "host_status %x, fifo_status %x\n",
-                host_status, fifo_status);
-        spin_unlock(&sock->lock);
-}
-
-static void tifm_sd_prepare_data(struct tifm_sd *host, struct mmc_command *cmd)
-{
-        struct tifm_dev *sock = host->dev;
-        unsigned int dest_cnt;
-
-        /* DMA style IO */
-        dev_dbg(&sock->dev, "setting dma for %d blocks\n",
-                cmd->data->blocks);
-        writel(TIFM_FIFO_INT_SETALL,
-               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
-        writel(ilog2(cmd->data->blksz) - 2,
-               sock->addr + SOCK_FIFO_PAGE_SIZE);
-        writel(TIFM_FIFO_ENABLE, sock->addr + SOCK_FIFO_CONTROL);
-        writel(TIFM_FIFO_INTMASK, sock->addr + SOCK_DMA_FIFO_INT_ENABLE_SET);
-
-        dest_cnt = (cmd->data->blocks) << 8;
-
-        writel(sg_dma_address(cmd->data->sg), sock->addr + SOCK_DMA_ADDRESS);
-
-        writel(cmd->data->blocks - 1, sock->addr + SOCK_MMCSD_NUM_BLOCKS);
-        writel(cmd->data->blksz - 1, sock->addr + SOCK_MMCSD_BLOCK_LEN);
-
-        if (cmd->data->flags & MMC_DATA_WRITE) {
-                writel(TIFM_MMCSD_TXDE, sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
-                writel(dest_cnt | TIFM_DMA_TX | TIFM_DMA_EN,
-                       sock->addr + SOCK_DMA_CONTROL);
-        } else {
-                writel(TIFM_MMCSD_RXDE, sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
-                writel(dest_cnt | TIFM_DMA_EN, sock->addr + SOCK_DMA_CONTROL);
-        }
-}
-
-static void tifm_sd_set_data_timeout(struct tifm_sd *host,
-                                     struct mmc_data *data)
-{
-        struct tifm_dev *sock = host->dev;
-        unsigned int data_timeout = data->timeout_clks;
-
-        if (fixed_timeout)
-                return;
-
-        data_timeout += data->timeout_ns /
-                        ((1000000000UL / host->clk_freq) * host->clk_div);
-
-        if (data_timeout < 0xffff) {
-                writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
-                writel((~TIFM_MMCSD_DPE)
-                       & readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
-                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
-        } else {
-                data_timeout = (data_timeout >> 10) + 1;
-                if (data_timeout > 0xffff)
-                        data_timeout = 0;       /* set to unlimited */
-                writel(data_timeout, sock->addr + SOCK_MMCSD_DATA_TO);
-                writel(TIFM_MMCSD_DPE
-                       | readl(sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG),
-                       sock->addr + SOCK_MMCSD_SDIO_MODE_CONFIG);
-        }
-}
-
-static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
-{
-        struct tifm_sd *host = mmc_priv(mmc);
-        struct tifm_dev *sock = host->dev;
-        unsigned long flags;
-        int sg_count = 0;
-        struct mmc_data *r_data = mrq->cmd->data;
-
-        spin_lock_irqsave(&sock->lock, flags);
-        if (host->flags & EJECT) {
-                spin_unlock_irqrestore(&sock->lock, flags);
-                goto err_out;
-        }
-
-        if (host->req) {
-                printk(KERN_ERR DRIVER_NAME ": unfinished request detected\n");
-                spin_unlock_irqrestore(&sock->lock, flags);
-                goto err_out;
-        }
-
-        if (r_data) {
-                tifm_sd_set_data_timeout(host, r_data);
-
-                sg_count = tifm_map_sg(sock, r_data->sg, r_data->sg_len,
-                                       mrq->cmd->flags & MMC_DATA_WRITE
-                                       ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
-                if (sg_count != 1) {
-                        printk(KERN_ERR DRIVER_NAME
-                                ": scatterlist map failed\n");
-                        spin_unlock_irqrestore(&sock->lock, flags);
-                        goto err_out;
-                }
-
-                host->written_blocks = 0;
-                host->flags &= ~CARD_BUSY;
-                tifm_sd_prepare_data(host, mrq->cmd);
-        }
-
-        host->req = mrq;
-        mod_timer(&host->timer, jiffies + host->timeout_jiffies);
-        host->state = CMD;
-        writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-        tifm_sd_exec(host, mrq->cmd);
-        spin_unlock_irqrestore(&sock->lock, flags);
-        return;
-
-err_out:
-        if (sg_count > 0)
-                tifm_unmap_sg(sock, r_data->sg, r_data->sg_len,
-                              (r_data->flags & MMC_DATA_WRITE)
-                              ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
-
-        mrq->cmd->error = MMC_ERR_TIMEOUT;
-        mmc_request_done(mmc, mrq);
-}
-
-static void tifm_sd_end_cmd(unsigned long data)
-{
-        struct tifm_sd *host = (struct tifm_sd*)data;
-        struct tifm_dev *sock = host->dev;
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        struct mmc_request *mrq;
-        struct mmc_data *r_data = NULL;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sock->lock, flags);
-
-        del_timer(&host->timer);
-        mrq = host->req;
-        host->req = NULL;
-        host->state = IDLE;
-
-        if (!mrq) {
-                printk(KERN_ERR DRIVER_NAME ": no request to complete?\n");
-                spin_unlock_irqrestore(&sock->lock, flags);
-                return;
-        }
-
-        r_data = mrq->cmd->data;
-        if (r_data) {
-                if (r_data->flags & MMC_DATA_WRITE) {
-                        r_data->bytes_xfered = host->written_blocks
-                                               * r_data->blksz;
-                } else {
-                        r_data->bytes_xfered = r_data->blocks -
-                                readl(sock->addr + SOCK_MMCSD_NUM_BLOCKS) - 1;
-                        r_data->bytes_xfered *= r_data->blksz;
-                        r_data->bytes_xfered += r_data->blksz -
-                                readl(sock->addr + SOCK_MMCSD_BLOCK_LEN) + 1;
-                }
-                tifm_unmap_sg(sock, r_data->sg, r_data->sg_len,
-                              (r_data->flags & MMC_DATA_WRITE)
-                              ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
-        }
-
-        writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-
-        spin_unlock_irqrestore(&sock->lock, flags);
-        mmc_request_done(mmc, mrq);
-}
-
-static void tifm_sd_request_nodma(struct mmc_host *mmc, struct mmc_request *mrq)
-{
-        struct tifm_sd *host = mmc_priv(mmc);
-        struct tifm_dev *sock = host->dev;
-        unsigned long flags;
-        struct mmc_data *r_data = mrq->cmd->data;
-
-        spin_lock_irqsave(&sock->lock, flags);
-        if (host->flags & EJECT) {
-                spin_unlock_irqrestore(&sock->lock, flags);
-                goto err_out;
-        }
-
-        if (host->req) {
-                printk(KERN_ERR DRIVER_NAME ": unfinished request detected\n");
-                spin_unlock_irqrestore(&sock->lock, flags);
-                goto err_out;
-        }
-
-        if (r_data) {
-                tifm_sd_set_data_timeout(host, r_data);
-
-                host->buffer_size = mrq->cmd->data->blocks
-                                    * mrq->cmd->data->blksz;
-
-                writel(TIFM_MMCSD_BUFINT
-                       | readl(sock->addr + SOCK_MMCSD_INT_ENABLE),
-                       sock->addr + SOCK_MMCSD_INT_ENABLE);
-                writel(((TIFM_MMCSD_FIFO_SIZE - 1) << 8)
-                       | (TIFM_MMCSD_FIFO_SIZE - 1),
-                       sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
-
-                host->written_blocks = 0;
-                host->flags &= ~CARD_BUSY;
-                host->buffer_pos = 0;
-                writel(r_data->blocks - 1, sock->addr + SOCK_MMCSD_NUM_BLOCKS);
-                writel(r_data->blksz - 1, sock->addr + SOCK_MMCSD_BLOCK_LEN);
-        }
-
-        host->req = mrq;
-        mod_timer(&host->timer, jiffies + host->timeout_jiffies);
-        host->state = CMD;
-        writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-        tifm_sd_exec(host, mrq->cmd);
-        spin_unlock_irqrestore(&sock->lock, flags);
-        return;
-
-err_out:
-        mrq->cmd->error = MMC_ERR_TIMEOUT;
-        mmc_request_done(mmc, mrq);
-}
-
-static void tifm_sd_end_cmd_nodma(unsigned long data)
-{
-        struct tifm_sd *host = (struct tifm_sd*)data;
-        struct tifm_dev *sock = host->dev;
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        struct mmc_request *mrq;
-        struct mmc_data *r_data = NULL;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sock->lock, flags);
-
-        del_timer(&host->timer);
-        mrq = host->req;
-        host->req = NULL;
-        host->state = IDLE;
-
-        if (!mrq) {
-                printk(KERN_ERR DRIVER_NAME ": no request to complete?\n");
-                spin_unlock_irqrestore(&sock->lock, flags);
-                return;
-        }
-
-        r_data = mrq->cmd->data;
-        if (r_data) {
-                writel((~TIFM_MMCSD_BUFINT) &
-                        readl(sock->addr + SOCK_MMCSD_INT_ENABLE),
-                        sock->addr + SOCK_MMCSD_INT_ENABLE);
-
-                if (r_data->flags & MMC_DATA_WRITE) {
-                        r_data->bytes_xfered = host->written_blocks
-                                               * r_data->blksz;
-                } else {
-                        r_data->bytes_xfered = r_data->blocks -
-                                readl(sock->addr + SOCK_MMCSD_NUM_BLOCKS) - 1;
-                        r_data->bytes_xfered *= r_data->blksz;
-                        r_data->bytes_xfered += r_data->blksz -
-                                readl(sock->addr + SOCK_MMCSD_BLOCK_LEN) + 1;
-                }
-                host->buffer_pos = 0;
-                host->buffer_size = 0;
-        }
-
-        writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-
-        spin_unlock_irqrestore(&sock->lock, flags);
-
-        mmc_request_done(mmc, mrq);
-}
-
-static void tifm_sd_terminate(struct tifm_sd *host)
-{
-        struct tifm_dev *sock = host->dev;
-        unsigned long flags;
-
-        writel(0, sock->addr + SOCK_MMCSD_INT_ENABLE);
-        mmiowb();
-        spin_lock_irqsave(&sock->lock, flags);
-        host->flags |= EJECT;
-        if (host->req) {
-                writel(TIFM_FIFO_INT_SETALL,
-                       sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
-                writel(0, sock->addr + SOCK_DMA_FIFO_INT_ENABLE_SET);
-                tasklet_schedule(&host->finish_tasklet);
-        }
-        spin_unlock_irqrestore(&sock->lock, flags);
-}
-
-static void tifm_sd_abort(unsigned long data)
-{
-        struct tifm_sd *host = (struct tifm_sd*)data;
-
-        printk(KERN_ERR DRIVER_NAME
-               ": card failed to respond for a long period of time");
-
-        tifm_sd_terminate(host);
-        tifm_eject(host->dev);
-}
-
-static void tifm_sd_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-{
-        struct tifm_sd *host = mmc_priv(mmc);
-        struct tifm_dev *sock = host->dev;
-        unsigned int clk_div1, clk_div2;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sock->lock, flags);
-
-        dev_dbg(&sock->dev, "Setting bus width %d, power %d\n", ios->bus_width,
-                ios->power_mode);
-        if (ios->bus_width == MMC_BUS_WIDTH_4) {
-                writel(TIFM_MMCSD_4BBUS | readl(sock->addr + SOCK_MMCSD_CONFIG),
-                       sock->addr + SOCK_MMCSD_CONFIG);
-        } else {
-                writel((~TIFM_MMCSD_4BBUS)
-                       & readl(sock->addr + SOCK_MMCSD_CONFIG),
-                       sock->addr + SOCK_MMCSD_CONFIG);
-        }
-
-        if (ios->clock) {
-                clk_div1 = 20000000 / ios->clock;
-                if (!clk_div1)
-                        clk_div1 = 1;
-
-                clk_div2 = 24000000 / ios->clock;
-                if (!clk_div2)
-                        clk_div2 = 1;
-
-                if ((20000000 / clk_div1) > ios->clock)
-                        clk_div1++;
-                if ((24000000 / clk_div2) > ios->clock)
-                        clk_div2++;
-                if ((20000000 / clk_div1) > (24000000 / clk_div2)) {
-                        host->clk_freq = 20000000;
-                        host->clk_div = clk_div1;
-                        writel((~TIFM_CTRL_FAST_CLK)
-                               & readl(sock->addr + SOCK_CONTROL),
-                               sock->addr + SOCK_CONTROL);
-                } else {
-                        host->clk_freq = 24000000;
-                        host->clk_div = clk_div2;
-                        writel(TIFM_CTRL_FAST_CLK
-                               | readl(sock->addr + SOCK_CONTROL),
-                               sock->addr + SOCK_CONTROL);
-                }
-        } else {
-                host->clk_div = 0;
-        }
-        host->clk_div &= TIFM_MMCSD_CLKMASK;
-        writel(host->clk_div
-               | ((~TIFM_MMCSD_CLKMASK)
-                  & readl(sock->addr + SOCK_MMCSD_CONFIG)),
-               sock->addr + SOCK_MMCSD_CONFIG);
-
-        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
-                host->flags |= OPENDRAIN;
-        else
-                host->flags &= ~OPENDRAIN;
-
-        /* chip_select : maybe later */
-        //vdd
-        //power is set before probe / after remove
-        //I believe, power_off when already marked for eject is sufficient to
-        // allow removal.
-        if ((host->flags & EJECT) && ios->power_mode == MMC_POWER_OFF) {
-                host->flags |= EJECT_DONE;
-                wake_up_all(&host->notify);
-        }
-
-        spin_unlock_irqrestore(&sock->lock, flags);
-}
-
-static int tifm_sd_ro(struct mmc_host *mmc)
-{
-        int rc;
-        struct tifm_sd *host = mmc_priv(mmc);
-        struct tifm_dev *sock = host->dev;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sock->lock, flags);
-
-        host->flags |= (CARD_RO & readl(sock->addr + SOCK_PRESENT_STATE));
-        rc = (host->flags & CARD_RO) ? 1 : 0;
-
-        spin_unlock_irqrestore(&sock->lock, flags);
-        return rc;
-}
-
-static struct mmc_host_ops tifm_sd_ops = {
-        .request = tifm_sd_request,
-        .set_ios = tifm_sd_ios,
-        .get_ro  = tifm_sd_ro
-};
-
-static int tifm_sd_initialize_host(struct tifm_sd *host)
-{
-        int rc;
-        unsigned int host_status = 0;
-        struct tifm_dev *sock = host->dev;
-
-        writel(0, sock->addr + SOCK_MMCSD_INT_ENABLE);
-        mmiowb();
-        host->clk_div = 61;
-        host->clk_freq = 20000000;
-        writel(TIFM_MMCSD_RESET, sock->addr + SOCK_MMCSD_SYSTEM_CONTROL);
-        writel(host->clk_div | TIFM_MMCSD_POWER,
-               sock->addr + SOCK_MMCSD_CONFIG);
-
-        /* wait up to 0.51 sec for reset */
-        for (rc = 2; rc <= 256; rc <<= 1) {
-                if (1 & readl(sock->addr + SOCK_MMCSD_SYSTEM_STATUS)) {
-                        rc = 0;
-                        break;
-                }
-                msleep(rc);
-        }
-
-        if (rc) {
-                printk(KERN_ERR DRIVER_NAME
-                       ": controller failed to reset\n");
-                return -ENODEV;
-        }
-
-        writel(0, sock->addr + SOCK_MMCSD_NUM_BLOCKS);
-        writel(host->clk_div | TIFM_MMCSD_POWER,
-               sock->addr + SOCK_MMCSD_CONFIG);
-        writel(TIFM_MMCSD_RXDE, sock->addr + SOCK_MMCSD_BUFFER_CONFIG);
-
-        // command timeout fixed to 64 clocks for now
-        writel(64, sock->addr + SOCK_MMCSD_COMMAND_TO);
-        writel(TIFM_MMCSD_INAB, sock->addr + SOCK_MMCSD_COMMAND);
-
-        /* INAB should take much less than reset */
-        for (rc = 1; rc <= 16; rc <<= 1) {
-                host_status = readl(sock->addr + SOCK_MMCSD_STATUS);
-                writel(host_status, sock->addr + SOCK_MMCSD_STATUS);
-                if (!(host_status & TIFM_MMCSD_ERRMASK)
-                    && (host_status & TIFM_MMCSD_EOC)) {
-                        rc = 0;
-                        break;
-                }
-                msleep(rc);
-        }
-
-        if (rc) {
-                printk(KERN_ERR DRIVER_NAME
-                       ": card not ready - probe failed on initialization\n");
-                return -ENODEV;
-        }
-
-        writel(TIFM_MMCSD_DATAMASK | TIFM_MMCSD_ERRMASK,
-               sock->addr + SOCK_MMCSD_INT_ENABLE);
-        mmiowb();
-
-        return 0;
-}
-
-static int tifm_sd_probe(struct tifm_dev *sock)
-{
-        struct mmc_host *mmc;
-        struct tifm_sd *host;
-        int rc = -EIO;
-
-        if (!(TIFM_SOCK_STATE_OCCUPIED
-              & readl(sock->addr + SOCK_PRESENT_STATE))) {
-                printk(KERN_WARNING DRIVER_NAME ": card gone, unexpectedly\n");
-                return rc;
-        }
-
-        mmc = mmc_alloc_host(sizeof(struct tifm_sd), &sock->dev);
-        if (!mmc)
-                return -ENOMEM;
-
-        host = mmc_priv(mmc);
-        tifm_set_drvdata(sock, mmc);
-        host->dev = sock;
-        host->timeout_jiffies = msecs_to_jiffies(1000);
-
-        init_waitqueue_head(&host->notify);
-        tasklet_init(&host->finish_tasklet,
-                     no_dma ? tifm_sd_end_cmd_nodma : tifm_sd_end_cmd,
-                     (unsigned long)host);
-        setup_timer(&host->timer, tifm_sd_abort, (unsigned long)host);
-
-        tifm_sd_ops.request = no_dma ? tifm_sd_request_nodma : tifm_sd_request;
-        mmc->ops = &tifm_sd_ops;
-        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-        mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;
-        mmc->f_min = 20000000 / 60;
-        mmc->f_max = 24000000;
-        mmc->max_hw_segs = 1;
-        mmc->max_phys_segs = 1;
-        // limited by DMA counter - it's safer to stick with
-        // block counter has 11 bits though
-        mmc->max_blk_count = 256;
-        // 2k maximum hw block length
-        mmc->max_blk_size = 2048;
-        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
-        mmc->max_seg_size = mmc->max_req_size;
-        sock->signal_irq = tifm_sd_signal_irq;
-        rc = tifm_sd_initialize_host(host);
-
-        if (!rc)
-                rc = mmc_add_host(mmc);
-        if (rc)
-                goto out_free_mmc;
-
-        return 0;
-out_free_mmc:
-        mmc_free_host(mmc);
-        return rc;
-}
-
-static void tifm_sd_remove(struct tifm_dev *sock)
-{
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        struct tifm_sd *host = mmc_priv(mmc);
-
-        del_timer_sync(&host->timer);
-        tifm_sd_terminate(host);
-        wait_event_timeout(host->notify, host->flags & EJECT_DONE,
-                           host->timeout_jiffies);
-        tasklet_kill(&host->finish_tasklet);
-        mmc_remove_host(mmc);
-
-        /* The meaning of the bit majority in this constant is unknown. */
-        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-
-        tifm_set_drvdata(sock, NULL);
-        mmc_free_host(mmc);
-}
-
-#ifdef CONFIG_PM
-
-static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state)
-{
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        int rc;
-
-        rc = mmc_suspend_host(mmc, state);
-        /* The meaning of the bit majority in this constant is unknown. */
-        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-        return rc;
-}
-
-static int tifm_sd_resume(struct tifm_dev *sock)
-{
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        struct tifm_sd *host = mmc_priv(mmc);
-
-        if (sock->media_id != FM_SD
-            || tifm_sd_initialize_host(host)) {
-                tifm_eject(sock);
-                return 0;
-        } else {
-                return mmc_resume_host(mmc);
-        }
-}
-
-#else
-
-#define tifm_sd_suspend NULL
-#define tifm_sd_resume NULL
-
-#endif /* CONFIG_PM */
-
-static tifm_media_id tifm_sd_id_tbl[] = {
-        FM_SD, 0
-};
-
-static struct tifm_driver tifm_sd_driver = {
-        .driver = {
-                .name  = DRIVER_NAME,
-                .owner = THIS_MODULE
-        },
-        .id_table = tifm_sd_id_tbl,
-        .probe    = tifm_sd_probe,
-        .remove   = tifm_sd_remove,
-        .suspend  = tifm_sd_suspend,
-        .resume   = tifm_sd_resume
-};
-
-static int __init tifm_sd_init(void)
-{
-        return tifm_register_driver(&tifm_sd_driver);
-}
-
-static void __exit tifm_sd_exit(void)
-{
-        tifm_unregister_driver(&tifm_sd_driver);
-}
-
-MODULE_AUTHOR("Alex Dubov");
-MODULE_DESCRIPTION("TI FlashMedia SD driver");
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(tifm, tifm_sd_id_tbl);
-MODULE_VERSION(DRIVER_VERSION);
-
-module_init(tifm_sd_init);
-module_exit(tifm_sd_exit);
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 690c94236d7f..ff642f8fbee7 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -49,8 +49,8 @@ config MTD_MS02NV
 
           If you want to compile this driver 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>.  The module will
-          be called ms02-nv.o.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ms02-nv.ko.
 
 config MTD_DATAFLASH
         tristate "Support for AT45xxx DataFlash"
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index ce47544dc120..fc4cc8ba9e29 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -40,13 +40,11 @@ struct block2mtd_dev {
 static LIST_HEAD(blkmtd_device_list);
 
 
-static struct page* page_read(struct address_space *mapping, int index)
+static struct page *page_read(struct address_space *mapping, int index)
 {
-        filler_t *filler = (filler_t*)mapping->a_ops->readpage;
-        return read_cache_page(mapping, index, filler, NULL);
+        return read_mapping_page(mapping, index, NULL);
 }
 
-
 /* erase a specified part of the device */
 static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len)
 {
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 8a0c4dec6351..c73e96bfafc6 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -13,7 +13,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 6f368aec5d5d..6413efc045e0 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -13,7 +13,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 88ba82df0fbb..2b30b587c6e8 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/devices/docecc.c b/drivers/mtd/devices/docecc.c
index 52b5d638077f..fd8a8daba3a8 100644
--- a/drivers/mtd/devices/docecc.c
+++ b/drivers/mtd/devices/docecc.c
@@ -29,7 +29,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index acf3ba223298..ecac0e438f49 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -31,7 +31,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 8296305c8297..89deff007116 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e6ef7d7f9f14..0c9ce19ea27a 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index d847ee1da3d9..3dba5733ed1f 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -940,8 +940,7 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache,
 {
         struct ltree_entry *le = obj;
 
-        if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) !=
-            SLAB_CTOR_CONSTRUCTOR)
+        if (flags & SLAB_CTOR_CONSTRUCTOR)
                 return;
 
         le->users = 0;
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index d396f996af57..0877fc372f4b 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -565,9 +565,9 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
         ib->btx_ring [entry].length = (-len) | 0xf000;
         ib->btx_ring [entry].misc = 0;
 
-        if (skb->len < ETH_ZLEN)
-                memset((char *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);
-        skb_copy_from_linear_data(skb, &ib->tx_buf[entry][0], skblen);
+        if (skb->len < ETH_ZLEN)
+                memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);
+        skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen);
 
         /* Now, give the packet to the lance */
         ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dcdad217df51..279ec625cec4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -311,7 +311,7 @@ config MAC8390
 
 config MAC89x0
         tristate "Macintosh CS89x0 based ethernet cards"
-        depends on NET_ETHERNET && MAC && BROKEN
+        depends on NET_ETHERNET && MAC
         ---help---
           Support for CS89x0 chipset based Ethernet cards.  If you have a
           Nubus or LC-PDS network (Ethernet) card of this type, say Y and
@@ -337,8 +337,8 @@ config MACSONIC
           be called macsonic.
 
 config MACMACE
-        bool "Macintosh (AV) onboard MACE ethernet (EXPERIMENTAL)"
-        depends on NET_ETHERNET && MAC && EXPERIMENTAL
+        bool "Macintosh (AV) onboard MACE ethernet"
+        depends on NET_ETHERNET && MAC
         select CRC32
         help
           Support for the onboard AMD 79C940 MACE Ethernet controller used in
@@ -822,7 +822,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00)
+        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN)
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -833,8 +833,8 @@ config SMC91X
           This driver is also available as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want).
           The module will be called smc91x.  If you want to compile it as a
-          module, say M here and read <file:Documentation/modules.txt> as well
-          as <file:Documentation/networking/net-modules.txt>.
+          module, say M here and read <file:Documentation/kbuild/modules.txt>
+          as well as <file:Documentation/networking/net-modules.txt>.
 
 config SMC9194
         tristate "SMC 9194 support"
@@ -889,7 +889,7 @@ config SMC911X
 
           This driver is also available as a module. The module will be 
           called smc911x.  If you want to compile it as a module, say M 
-          here and read <file:Documentation/modules.txt>
+          here and read <file:Documentation/kbuild/modules.txt>
 
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI cards"
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index dd8ed456c8b2..1c3e293fbaf7 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -83,7 +83,6 @@ extern struct net_device *bagetlance_probe(int unit);
 extern struct net_device *mvme147lance_probe(int unit);
 extern struct net_device *tc515_probe(int unit);
 extern struct net_device *lance_probe(int unit);
-extern struct net_device *mace_probe(int unit);
 extern struct net_device *mac8390_probe(int unit);
 extern struct net_device *mac89x0_probe(int unit);
 extern struct net_device *mc32_probe(int unit);
@@ -274,9 +273,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_MVME147_NET       /* MVME147 internal Ethernet */
         {mvme147lance_probe, 0},
 #endif
-#ifdef CONFIG_MACMACE           /* Mac 68k Quadra AV builtin Ethernet */
-        {mace_probe, 0},
-#endif
 #ifdef CONFIG_MAC8390           /* NuBus NS8390-based cards */
         {mac8390_probe, 0},
 #endif
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 1226cbba0450..81d5a374042a 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -562,7 +562,6 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
         volatile struct lance_init_block *ib = lp->init_block;
         int entry, skblen, len;
         int status = 0;
-        static int outs;
         unsigned long flags;
 
         skblen = skb->len;
@@ -598,17 +597,16 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
         ib->btx_ring [entry].length = (-len) | 0xf000;
         ib->btx_ring [entry].misc = 0;
 
-        skb_copy_from_linear_data(skb, &ib->tx_buf [entry][0], skblen);
+        skb_copy_from_linear_data(skb, (void *)&ib->tx_buf [entry][0], skblen);
 
         /* Clear the slack of the packet, do I need this? */
         if (len != skblen)
-                memset ((char *) &ib->tx_buf [entry][skblen], 0, len - skblen);
+                memset ((void *) &ib->tx_buf [entry][skblen], 0, len - skblen);
 
         /* Now, give the packet to the lance */
         ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
         lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask;
-
-        outs++;
+        lp->stats.tx_bytes += skblen;
 
         if (TX_BUFFS_AVAIL <= 0)
                 netif_stop_queue(dev);
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index a0e68e718531..a241ae7855a3 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -677,6 +677,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
         priv->cur_tx -= TX_RING_SIZE;
         priv->dirty_tx -= TX_RING_SIZE;
     }
+    priv->stats.tx_bytes += len;
 
     /* Trigger an immediate send poll. */
     lance->RAP = CSR0;          /* PCnet-ISA Controller Status */
diff --git a/drivers/net/atl1/atl1_param.c b/drivers/net/atl1/atl1_param.c
index c407214339f6..bcd0bd891722 100644
--- a/drivers/net/atl1/atl1_param.c
+++ b/drivers/net/atl1/atl1_param.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/moduleparam.h>
 #include "atl1.h"
 
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index d10fb80e9a63..c39ab803c5d8 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -45,7 +45,6 @@
 #include <linux/bitops.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>
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index f98a2205a090..88b33c6ddda8 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
 /* bnx2.c: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004, 2005, 2006 Broadcom Corporation
+ * Copyright (c) 2004-2007 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
@@ -54,8 +54,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.5.8"
-#define DRV_MODULE_RELDATE      "April 24, 2007"
+#define DRV_MODULE_VERSION      "1.5.10"
+#define DRV_MODULE_RELDATE      "May 1, 2007"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -84,6 +84,7 @@ typedef enum {
         BCM5708,
         BCM5708S,
         BCM5709,
+        BCM5709S,
 } board_t;
 
 /* indexed by board_t, above */
@@ -98,6 +99,7 @@ static const struct {
         { "Broadcom NetXtreme II BCM5708 1000Base-T" },
         { "Broadcom NetXtreme II BCM5708 1000Base-SX" },
         { "Broadcom NetXtreme II BCM5709 1000Base-T" },
+        { "Broadcom NetXtreme II BCM5709 1000Base-SX" },
         };
 
 static struct pci_device_id bnx2_pci_tbl[] = {
@@ -117,6 +119,8 @@ static struct pci_device_id bnx2_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5708S },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709 },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709S,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S },
         { 0, }
 };
 
@@ -230,21 +234,29 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp)
 static u32
 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset)
 {
+        u32 val;
+
+        spin_lock_bh(&bp->indirect_lock);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
-        return (REG_RD(bp, BNX2_PCICFG_REG_WINDOW));
+        val = REG_RD(bp, BNX2_PCICFG_REG_WINDOW);
+        spin_unlock_bh(&bp->indirect_lock);
+        return val;
 }
 
 static void
 bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val)
 {
+        spin_lock_bh(&bp->indirect_lock);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW, val);
+        spin_unlock_bh(&bp->indirect_lock);
 }
 
 static void
 bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
 {
         offset += cid_addr;
+        spin_lock_bh(&bp->indirect_lock);
         if (CHIP_NUM(bp) == CHIP_NUM_5709) {
                 int i;
 
@@ -262,6 +274,7 @@ bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
                 REG_WR(bp, BNX2_CTX_DATA_ADR, offset);
                 REG_WR(bp, BNX2_CTX_DATA, val);
         }
+        spin_unlock_bh(&bp->indirect_lock);
 }
 
 static int
@@ -572,8 +585,8 @@ bnx2_report_fw_link(struct bnx2 *bp)
                 if (bp->autoneg) {
                         fw_link_status |= BNX2_LINK_STATUS_AN_ENABLED;
 
-                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
-                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                        bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
+                        bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
 
                         if (!(bmsr & BMSR_ANEGCOMPLETE) ||
                             bp->phy_flags & PHY_PARALLEL_DETECT_FLAG)
@@ -654,8 +667,8 @@ bnx2_resolve_flow_ctrl(struct bnx2 *bp)
                 return;
         }
 
-        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
-        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+        bnx2_read_phy(bp, bp->mii_adv, &local_adv);
+        bnx2_read_phy(bp, bp->mii_lpa, &remote_adv);
 
         if (bp->phy_flags & PHY_SERDES_FLAG) {
                 u32 new_local_adv = 0;
@@ -700,6 +713,45 @@ bnx2_resolve_flow_ctrl(struct bnx2 *bp)
 }
 
 static int
+bnx2_5709s_linkup(struct bnx2 *bp)
+{
+        u32 val, speed;
+
+        bp->link_up = 1;
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_GP_STATUS);
+        bnx2_read_phy(bp, MII_BNX2_GP_TOP_AN_STATUS1, &val);
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+
+        if ((bp->autoneg & AUTONEG_SPEED) == 0) {
+                bp->line_speed = bp->req_line_speed;
+                bp->duplex = bp->req_duplex;
+                return 0;
+        }
+        speed = val & MII_BNX2_GP_TOP_AN_SPEED_MSK;
+        switch (speed) {
+                case MII_BNX2_GP_TOP_AN_SPEED_10:
+                        bp->line_speed = SPEED_10;
+                        break;
+                case MII_BNX2_GP_TOP_AN_SPEED_100:
+                        bp->line_speed = SPEED_100;
+                        break;
+                case MII_BNX2_GP_TOP_AN_SPEED_1G:
+                case MII_BNX2_GP_TOP_AN_SPEED_1GKV:
+                        bp->line_speed = SPEED_1000;
+                        break;
+                case MII_BNX2_GP_TOP_AN_SPEED_2_5G:
+                        bp->line_speed = SPEED_2500;
+                        break;
+        }
+        if (val & MII_BNX2_GP_TOP_AN_FD)
+                bp->duplex = DUPLEX_FULL;
+        else
+                bp->duplex = DUPLEX_HALF;
+        return 0;
+}
+
+static int
 bnx2_5708s_linkup(struct bnx2 *bp)
 {
         u32 val;
@@ -736,7 +788,7 @@ bnx2_5706s_linkup(struct bnx2 *bp)
         bp->link_up = 1;
         bp->line_speed = SPEED_1000;
 
-        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
         if (bmcr & BMCR_FULLDPLX) {
                 bp->duplex = DUPLEX_FULL;
         }
@@ -748,8 +800,8 @@ bnx2_5706s_linkup(struct bnx2 *bp)
                 return 0;
         }
 
-        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
-        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+        bnx2_read_phy(bp, bp->mii_adv, &local_adv);
+        bnx2_read_phy(bp, bp->mii_lpa, &remote_adv);
 
         common = local_adv & remote_adv;
         if (common & (ADVERTISE_1000XHALF | ADVERTISE_1000XFULL)) {
@@ -770,7 +822,7 @@ bnx2_copper_linkup(struct bnx2 *bp)
 {
         u32 bmcr;
 
-        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
         if (bmcr & BMCR_ANENABLE) {
                 u32 local_adv, remote_adv, common;
 
@@ -787,8 +839,8 @@ bnx2_copper_linkup(struct bnx2 *bp)
                         bp->duplex = DUPLEX_HALF;
                 }
                 else {
-                        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
-                        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+                        bnx2_read_phy(bp, bp->mii_adv, &local_adv);
+                        bnx2_read_phy(bp, bp->mii_lpa, &remote_adv);
 
                         common = local_adv & remote_adv;
                         if (common & ADVERTISE_100FULL) {
@@ -898,6 +950,145 @@ bnx2_set_mac_link(struct bnx2 *bp)
         return 0;
 }
 
+static void
+bnx2_enable_bmsr1(struct bnx2 *bp)
+{
+        if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+            (CHIP_NUM(bp) == CHIP_NUM_5709))
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_GP_STATUS);
+}
+
+static void
+bnx2_disable_bmsr1(struct bnx2 *bp)
+{
+        if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+            (CHIP_NUM(bp) == CHIP_NUM_5709))
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+}
+
+static int
+bnx2_test_and_enable_2g5(struct bnx2 *bp)
+{
+        u32 up1;
+        int ret = 1;
+
+        if (!(bp->phy_flags & PHY_2_5G_CAPABLE_FLAG))
+                return 0;
+
+        if (bp->autoneg & AUTONEG_SPEED)
+                bp->advertising |= ADVERTISED_2500baseX_Full;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_OVER1G);
+
+        bnx2_read_phy(bp, bp->mii_up1, &up1);
+        if (!(up1 & BCM5708S_UP1_2G5)) {
+                up1 |= BCM5708S_UP1_2G5;
+                bnx2_write_phy(bp, bp->mii_up1, up1);
+                ret = 0;
+        }
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+
+        return ret;
+}
+
+static int
+bnx2_test_and_disable_2g5(struct bnx2 *bp)
+{
+        u32 up1;
+        int ret = 0;
+
+        if (!(bp->phy_flags & PHY_2_5G_CAPABLE_FLAG))
+                return 0;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_OVER1G);
+
+        bnx2_read_phy(bp, bp->mii_up1, &up1);
+        if (up1 & BCM5708S_UP1_2G5) {
+                up1 &= ~BCM5708S_UP1_2G5;
+                bnx2_write_phy(bp, bp->mii_up1, up1);
+                ret = 1;
+        }
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+
+        return ret;
+}
+
+static void
+bnx2_enable_forced_2g5(struct bnx2 *bp)
+{
+        u32 bmcr;
+
+        if (!(bp->phy_flags & PHY_2_5G_CAPABLE_FLAG))
+                return;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709) {
+                u32 val;
+
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_SERDES_DIG);
+                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
+                val &= ~MII_BNX2_SD_MISC1_FORCE_MSK;
+                val |= MII_BNX2_SD_MISC1_FORCE | MII_BNX2_SD_MISC1_FORCE_2_5G;
+                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+
+        } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                bmcr |= BCM5708S_BMCR_FORCE_2500;
+        }
+
+        if (bp->autoneg & AUTONEG_SPEED) {
+                bmcr &= ~BMCR_ANENABLE;
+                if (bp->req_duplex == DUPLEX_FULL)
+                        bmcr |= BMCR_FULLDPLX;
+        }
+        bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
+}
+
+static void
+bnx2_disable_forced_2g5(struct bnx2 *bp)
+{
+        u32 bmcr;
+
+        if (!(bp->phy_flags & PHY_2_5G_CAPABLE_FLAG))
+                return;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709) {
+                u32 val;
+
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_SERDES_DIG);
+                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
+                val &= ~MII_BNX2_SD_MISC1_FORCE;
+                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+
+                bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
+                               MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+
+        } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                bmcr &= ~BCM5708S_BMCR_FORCE_2500;
+        }
+
+        if (bp->autoneg & AUTONEG_SPEED)
+                bmcr |= BMCR_SPEED1000 | BMCR_ANENABLE | BMCR_ANRESTART;
+        bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
+}
+
 static int
 bnx2_set_link(struct bnx2 *bp)
 {
@@ -911,8 +1102,10 @@ bnx2_set_link(struct bnx2 *bp)
 
         link_up = bp->link_up;
 
-        bnx2_read_phy(bp, MII_BMSR, &bmsr);
-        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+        bnx2_enable_bmsr1(bp);
+        bnx2_read_phy(bp, bp->mii_bmsr1, &bmsr);
+        bnx2_read_phy(bp, bp->mii_bmsr1, &bmsr);
+        bnx2_disable_bmsr1(bp);
 
         if ((bp->phy_flags & PHY_SERDES_FLAG) &&
             (CHIP_NUM(bp) == CHIP_NUM_5706)) {
@@ -933,6 +1126,8 @@ bnx2_set_link(struct bnx2 *bp)
                                 bnx2_5706s_linkup(bp);
                         else if (CHIP_NUM(bp) == CHIP_NUM_5708)
                                 bnx2_5708s_linkup(bp);
+                        else if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                                bnx2_5709s_linkup(bp);
                 }
                 else {
                         bnx2_copper_linkup(bp);
@@ -941,17 +1136,9 @@ bnx2_set_link(struct bnx2 *bp)
         }
         else {
                 if ((bp->phy_flags & PHY_SERDES_FLAG) &&
-                        (bp->autoneg & AUTONEG_SPEED)) {
+                    (bp->autoneg & AUTONEG_SPEED))
+                        bnx2_disable_forced_2g5(bp);
 
-                        u32 bmcr;
-
-                        bnx2_read_phy(bp, MII_BMCR, &bmcr);
-                        bmcr &= ~BCM5708S_BMCR_FORCE_2500;
-                        if (!(bmcr & BMCR_ANENABLE)) {
-                                bnx2_write_phy(bp, MII_BMCR, bmcr |
-                                        BMCR_ANENABLE);
-                        }
-                }
                 bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
                 bp->link_up = 0;
         }
@@ -971,13 +1158,13 @@ bnx2_reset_phy(struct bnx2 *bp)
         int i;
         u32 reg;
 
-        bnx2_write_phy(bp, MII_BMCR, BMCR_RESET);
+        bnx2_write_phy(bp, 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);
+                bnx2_read_phy(bp, bp->mii_bmcr, &reg);
                 if (!(reg & BMCR_RESET)) {
                         udelay(20);
                         break;
@@ -1026,34 +1213,40 @@ bnx2_phy_get_pause_adv(struct bnx2 *bp)
 static int
 bnx2_setup_serdes_phy(struct bnx2 *bp)
 {
-        u32 adv, bmcr, up1;
+        u32 adv, bmcr;
         u32 new_adv = 0;
 
         if (!(bp->autoneg & AUTONEG_SPEED)) {
                 u32 new_bmcr;
                 int force_link_down = 0;
 
-                bnx2_read_phy(bp, MII_ADVERTISE, &adv);
+                if (bp->req_line_speed == SPEED_2500) {
+                        if (!bnx2_test_and_enable_2g5(bp))
+                                force_link_down = 1;
+                } else if (bp->req_line_speed == SPEED_1000) {
+                        if (bnx2_test_and_disable_2g5(bp))
+                                force_link_down = 1;
+                }
+                bnx2_read_phy(bp, bp->mii_adv, &adv);
                 adv &= ~(ADVERTISE_1000XFULL | ADVERTISE_1000XHALF);
 
-                bnx2_read_phy(bp, MII_BMCR, &bmcr);
-                new_bmcr = bmcr & ~(BMCR_ANENABLE | BCM5708S_BMCR_FORCE_2500);
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                new_bmcr = bmcr & ~BMCR_ANENABLE;
                 new_bmcr |= BMCR_SPEED1000;
-                if (bp->req_line_speed == SPEED_2500) {
-                        new_bmcr |= BCM5708S_BMCR_FORCE_2500;
-                        bnx2_read_phy(bp, BCM5708S_UP1, &up1);
-                        if (!(up1 & BCM5708S_UP1_2G5)) {
-                                up1 |= BCM5708S_UP1_2G5;
-                                bnx2_write_phy(bp, BCM5708S_UP1, up1);
-                                force_link_down = 1;
+
+                if (CHIP_NUM(bp) == CHIP_NUM_5709) {
+                        if (bp->req_line_speed == SPEED_2500)
+                                bnx2_enable_forced_2g5(bp);
+                        else if (bp->req_line_speed == SPEED_1000) {
+                                bnx2_disable_forced_2g5(bp);
+                                new_bmcr &= ~0x2000;
                         }
+
                 } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
-                        bnx2_read_phy(bp, BCM5708S_UP1, &up1);
-                        if (up1 & BCM5708S_UP1_2G5) {
-                                up1 &= ~BCM5708S_UP1_2G5;
-                                bnx2_write_phy(bp, BCM5708S_UP1, up1);
-                                force_link_down = 1;
-                        }
+                        if (bp->req_line_speed == SPEED_2500)
+                                new_bmcr |= BCM5708S_BMCR_FORCE_2500;
+                        else
+                                new_bmcr = bmcr & ~BCM5708S_BMCR_FORCE_2500;
                 }
 
                 if (bp->req_duplex == DUPLEX_FULL) {
@@ -1067,49 +1260,48 @@ bnx2_setup_serdes_phy(struct bnx2 *bp)
                 if ((new_bmcr != bmcr) || (force_link_down)) {
                         /* Force a link down visible on the other side */
                         if (bp->link_up) {
-                                bnx2_write_phy(bp, MII_ADVERTISE, adv &
+                                bnx2_write_phy(bp, bp->mii_adv, adv &
                                                ~(ADVERTISE_1000XFULL |
                                                  ADVERTISE_1000XHALF));
-                                bnx2_write_phy(bp, MII_BMCR, bmcr |
+                                bnx2_write_phy(bp, 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);
+                                bnx2_write_phy(bp, bp->mii_bmcr, new_bmcr);
                                 bnx2_report_link(bp);
                         }
-                        bnx2_write_phy(bp, MII_ADVERTISE, adv);
-                        bnx2_write_phy(bp, MII_BMCR, new_bmcr);
+                        bnx2_write_phy(bp, bp->mii_adv, adv);
+                        bnx2_write_phy(bp, bp->mii_bmcr, new_bmcr);
+                } else {
+                        bnx2_resolve_flow_ctrl(bp);
+                        bnx2_set_mac_link(bp);
                 }
                 return 0;
         }
 
-        if (bp->phy_flags & PHY_2_5G_CAPABLE_FLAG) {
-                bnx2_read_phy(bp, BCM5708S_UP1, &up1);
-                up1 |= BCM5708S_UP1_2G5;
-                bnx2_write_phy(bp, BCM5708S_UP1, up1);
-        }
+        bnx2_test_and_enable_2g5(bp);
 
         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);
+        bnx2_read_phy(bp, bp->mii_adv, &adv);
+        bnx2_read_phy(bp, 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) {
-                        bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                        bnx2_write_phy(bp, bp->mii_bmcr, BMCR_LOOPBACK);
                         spin_unlock_bh(&bp->phy_lock);
                         msleep(20);
                         spin_lock_bh(&bp->phy_lock);
                 }
 
-                bnx2_write_phy(bp, MII_ADVERTISE, new_adv);
-                bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART |
+                bnx2_write_phy(bp, bp->mii_adv, new_adv);
+                bnx2_write_phy(bp, bp->mii_bmcr, bmcr | BMCR_ANRESTART |
                         BMCR_ANENABLE);
                 /* Speed up link-up time when the link partner
                  * does not autonegotiate which is very common
@@ -1122,6 +1314,9 @@ bnx2_setup_serdes_phy(struct bnx2 *bp)
                 bp->current_interval = SERDES_AN_TIMEOUT;
                 bp->serdes_an_pending = 1;
                 mod_timer(&bp->timer, jiffies + bp->current_interval);
+        } else {
+                bnx2_resolve_flow_ctrl(bp);
+                bnx2_set_mac_link(bp);
         }
 
         return 0;
@@ -1146,14 +1341,14 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
         u32 bmcr;
         u32 new_bmcr;
 
-        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        bnx2_read_phy(bp, 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);
+                bnx2_read_phy(bp, bp->mii_adv, &adv_reg);
                 adv_reg &= (PHY_ALL_10_100_SPEED | ADVERTISE_PAUSE_CAP |
                         ADVERTISE_PAUSE_ASYM);
 
@@ -1179,9 +1374,9 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
                         (adv_reg != new_adv_reg) ||
                         ((bmcr & BMCR_ANENABLE) == 0)) {
 
-                        bnx2_write_phy(bp, MII_ADVERTISE, new_adv_reg);
+                        bnx2_write_phy(bp, bp->mii_adv, new_adv_reg);
                         bnx2_write_phy(bp, MII_CTRL1000, new_adv1000_reg);
-                        bnx2_write_phy(bp, MII_BMCR, BMCR_ANRESTART |
+                        bnx2_write_phy(bp, bp->mii_bmcr, BMCR_ANRESTART |
                                 BMCR_ANENABLE);
                 }
                 else if (bp->link_up) {
@@ -1204,21 +1399,21 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
         if (new_bmcr != bmcr) {
                 u32 bmsr;
 
-                bnx2_read_phy(bp, MII_BMSR, &bmsr);
-                bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
+                bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
 
                 if (bmsr & BMSR_LSTATUS) {
                         /* Force link down */
-                        bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                        bnx2_write_phy(bp, bp->mii_bmcr, BMCR_LOOPBACK);
                         spin_unlock_bh(&bp->phy_lock);
                         msleep(50);
                         spin_lock_bh(&bp->phy_lock);
 
-                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
-                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                        bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
+                        bnx2_read_phy(bp, bp->mii_bmsr, &bmsr);
                 }
 
-                bnx2_write_phy(bp, MII_BMCR, new_bmcr);
+                bnx2_write_phy(bp, 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
@@ -1230,6 +1425,9 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
                         bnx2_resolve_flow_ctrl(bp);
                         bnx2_set_mac_link(bp);
                 }
+        } else {
+                bnx2_resolve_flow_ctrl(bp);
+                bnx2_set_mac_link(bp);
         }
         return 0;
 }
@@ -1249,10 +1447,63 @@ bnx2_setup_phy(struct bnx2 *bp)
 }
 
 static int
+bnx2_init_5709s_phy(struct bnx2 *bp)
+{
+        u32 val;
+
+        bp->mii_bmcr = MII_BMCR + 0x10;
+        bp->mii_bmsr = MII_BMSR + 0x10;
+        bp->mii_bmsr1 = MII_BNX2_GP_TOP_AN_STATUS1;
+        bp->mii_adv = MII_ADVERTISE + 0x10;
+        bp->mii_lpa = MII_LPA + 0x10;
+        bp->mii_up1 = MII_BNX2_OVER1G_UP1;
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_AER);
+        bnx2_write_phy(bp, MII_BNX2_AER_AER, MII_BNX2_AER_AER_AN_MMD);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+        bnx2_reset_phy(bp);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_SERDES_DIG);
+
+        bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_1000XCTL1, &val);
+        val &= ~MII_BNX2_SD_1000XCTL1_AUTODET;
+        val |= MII_BNX2_SD_1000XCTL1_FIBER;
+        bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_1000XCTL1, val);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_OVER1G);
+        bnx2_read_phy(bp, MII_BNX2_OVER1G_UP1, &val);
+        if (bp->phy_flags & PHY_2_5G_CAPABLE_FLAG)
+                val |= BCM5708S_UP1_2G5;
+        else
+                val &= ~BCM5708S_UP1_2G5;
+        bnx2_write_phy(bp, MII_BNX2_OVER1G_UP1, val);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_BAM_NXTPG);
+        bnx2_read_phy(bp, MII_BNX2_BAM_NXTPG_CTL, &val);
+        val |= MII_BNX2_NXTPG_CTL_T2 | MII_BNX2_NXTPG_CTL_BAM;
+        bnx2_write_phy(bp, MII_BNX2_BAM_NXTPG_CTL, val);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_CL73_USERB0);
+
+        val = MII_BNX2_CL73_BAM_EN | MII_BNX2_CL73_BAM_STA_MGR_EN |
+              MII_BNX2_CL73_BAM_NP_AFT_BP_EN;
+        bnx2_write_phy(bp, MII_BNX2_CL73_BAM_CTL1, val);
+
+        bnx2_write_phy(bp, MII_BNX2_BLK_ADDR, MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
+
+        return 0;
+}
+
+static int
 bnx2_init_5708s_phy(struct bnx2 *bp)
 {
         u32 val;
 
+        bnx2_reset_phy(bp);
+
+        bp->mii_up1 = BCM5708S_UP1;
+
         bnx2_write_phy(bp, BCM5708S_BLK_ADDR, BCM5708S_BLK_ADDR_DIG3);
         bnx2_write_phy(bp, BCM5708S_DIG_3_0, BCM5708S_DIG_3_0_USE_IEEE);
         bnx2_write_phy(bp, BCM5708S_BLK_ADDR, BCM5708S_BLK_ADDR_DIG);
@@ -1305,6 +1556,8 @@ bnx2_init_5708s_phy(struct bnx2 *bp)
 static int
 bnx2_init_5706s_phy(struct bnx2 *bp)
 {
+        bnx2_reset_phy(bp);
+
         bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
 
         if (CHIP_NUM(bp) == CHIP_NUM_5706)
@@ -1342,6 +1595,8 @@ bnx2_init_copper_phy(struct bnx2 *bp)
 {
         u32 val;
 
+        bnx2_reset_phy(bp);
+
         if (bp->phy_flags & PHY_CRC_FIX_FLAG) {
                 bnx2_write_phy(bp, 0x18, 0x0c00);
                 bnx2_write_phy(bp, 0x17, 0x000a);
@@ -1396,9 +1651,13 @@ bnx2_init_phy(struct bnx2 *bp)
         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);
+        bp->mii_bmcr = MII_BMCR;
+        bp->mii_bmsr = MII_BMSR;
+        bp->mii_bmsr1 = MII_BMSR;
+        bp->mii_adv = MII_ADVERTISE;
+        bp->mii_lpa = MII_LPA;
 
-        bnx2_reset_phy(bp);
+        REG_WR(bp, BNX2_EMAC_ATTENTION_ENA, BNX2_EMAC_ATTENTION_ENA_LINK);
 
         bnx2_read_phy(bp, MII_PHYSID1, &val);
         bp->phy_id = val << 16;
@@ -1410,6 +1669,8 @@ bnx2_init_phy(struct bnx2 *bp)
                         rc = bnx2_init_5706s_phy(bp);
                 else if (CHIP_NUM(bp) == CHIP_NUM_5708)
                         rc = bnx2_init_5708s_phy(bp);
+                else if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                        rc = bnx2_init_5709s_phy(bp);
         }
         else {
                 rc = bnx2_init_copper_phy(bp);
@@ -1442,7 +1703,7 @@ bnx2_set_phy_loopback(struct bnx2 *bp)
         int rc, i;
 
         spin_lock_bh(&bp->phy_lock);
-        rc = bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK | BMCR_FULLDPLX |
+        rc = bnx2_write_phy(bp, bp->mii_bmcr, BMCR_LOOPBACK | BMCR_FULLDPLX |
                             BMCR_SPEED1000);
         spin_unlock_bh(&bp->phy_lock);
         if (rc)
@@ -1681,25 +1942,33 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, u16 index)
         return 0;
 }
 
-static void
-bnx2_phy_int(struct bnx2 *bp)
+static int
+bnx2_phy_event_is_set(struct bnx2 *bp, u32 event)
 {
+        struct status_block *sblk = bp->status_blk;
         u32 new_link_state, old_link_state;
+        int is_set = 1;
 
-        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;
+        new_link_state = sblk->status_attn_bits & event;
+        old_link_state = sblk->status_attn_bits_ack & event;
         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);
-                }
+                if (new_link_state)
+                        REG_WR(bp, BNX2_PCICFG_STATUS_BIT_SET_CMD, event);
+                else
+                        REG_WR(bp, BNX2_PCICFG_STATUS_BIT_CLEAR_CMD, event);
+        } else
+                is_set = 0;
+
+        return is_set;
+}
+
+static void
+bnx2_phy_int(struct bnx2 *bp)
+{
+        if (bnx2_phy_event_is_set(bp, STATUS_ATTN_BITS_LINK_STATE)) {
+                spin_lock(&bp->phy_lock);
                 bnx2_set_link(bp);
+                spin_unlock(&bp->phy_lock);
         }
 }
 
@@ -1993,6 +2262,23 @@ bnx2_msi(int irq, void *dev_instance)
 }
 
 static irqreturn_t
+bnx2_msi_1shot(int irq, void *dev_instance)
+{
+        struct net_device *dev = dev_instance;
+        struct bnx2 *bp = netdev_priv(dev);
+
+        prefetch(bp->status_blk);
+
+        /* Return here if interrupt is disabled. */
+        if (unlikely(atomic_read(&bp->intr_sem) != 0))
+                return IRQ_HANDLED;
+
+        netif_rx_schedule(dev);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t
 bnx2_interrupt(int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
@@ -2022,6 +2308,8 @@ bnx2_interrupt(int irq, void *dev_instance)
         return IRQ_HANDLED;
 }
 
+#define STATUS_ATTN_EVENTS      STATUS_ATTN_BITS_LINK_STATE
+
 static inline int
 bnx2_has_work(struct bnx2 *bp)
 {
@@ -2031,8 +2319,8 @@ bnx2_has_work(struct bnx2 *bp)
             (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons))
                 return 1;
 
-        if ((sblk->status_attn_bits & STATUS_ATTN_BITS_LINK_STATE) !=
-            (sblk->status_attn_bits_ack & STATUS_ATTN_BITS_LINK_STATE))
+        if ((sblk->status_attn_bits & STATUS_ATTN_EVENTS) !=
+            (sblk->status_attn_bits_ack & STATUS_ATTN_EVENTS))
                 return 1;
 
         return 0;
@@ -2042,15 +2330,14 @@ static int
 bnx2_poll(struct net_device *dev, int *budget)
 {
         struct bnx2 *bp = netdev_priv(dev);
+        struct status_block *sblk = bp->status_blk;
+        u32 status_attn_bits = sblk->status_attn_bits;
+        u32 status_attn_bits_ack = sblk->status_attn_bits_ack;
 
-        if ((bp->status_blk->status_attn_bits &
-                STATUS_ATTN_BITS_LINK_STATE) !=
-                (bp->status_blk->status_attn_bits_ack &
-                STATUS_ATTN_BITS_LINK_STATE)) {
+        if ((status_attn_bits & STATUS_ATTN_EVENTS) !=
+            (status_attn_bits_ack & STATUS_ATTN_EVENTS)) {
 
-                spin_lock(&bp->phy_lock);
                 bnx2_phy_int(bp);
-                spin_unlock(&bp->phy_lock);
 
                 /* This is needed to take care of transient status
                  * during link changes.
@@ -3489,17 +3776,21 @@ bnx2_init_chip(struct bnx2 *bp)
         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);
+                val = 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);
+                val = BNX2_HC_CONFIG_RX_TMR_MODE | BNX2_HC_CONFIG_TX_TMR_MODE |
+                      BNX2_HC_CONFIG_COLLECT_STATS;
         }
 
+        if (bp->flags & ONE_SHOT_MSI_FLAG)
+                val |= BNX2_HC_CONFIG_ONE_SHOT;
+
+        REG_WR(bp, BNX2_HC_CONFIG, val);
+
         /* 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);
+        REG_WR(bp, BNX2_HC_ATTN_BITS_ENABLE, STATUS_ATTN_EVENTS);
 
         if (REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_FEATURE) &
             BNX2_PORT_FEATURE_ASF_ENABLED)
@@ -3763,10 +4054,11 @@ static int
 bnx2_test_registers(struct bnx2 *bp)
 {
         int ret;
-        int i;
+        int i, is_5709;
         static const struct {
                 u16   offset;
                 u16   flags;
+#define BNX2_FL_NOT_5709        1
                 u32   rw_mask;
                 u32   ro_mask;
         } reg_tbl[] = {
@@ -3774,26 +4066,26 @@ bnx2_test_registers(struct bnx2 *bp)
                 { 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 },
+                { 0x0404, BNX2_FL_NOT_5709, 0x00003f00, 0x00000000 },
+                { 0x0418, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+                { 0x041c, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+                { 0x0420, BNX2_FL_NOT_5709, 0x00000000, 0x80ffffff },
+                { 0x0424, BNX2_FL_NOT_5709, 0x00000000, 0x00000000 },
+                { 0x0428, BNX2_FL_NOT_5709, 0x00000000, 0x00000001 },
+                { 0x0450, BNX2_FL_NOT_5709, 0x00000000, 0x0000ffff },
+                { 0x0454, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+                { 0x0458, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+
+                { 0x0808, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+                { 0x0854, BNX2_FL_NOT_5709, 0x00000000, 0xffffffff },
+                { 0x0868, BNX2_FL_NOT_5709, 0x00000000, 0x77777777 },
+                { 0x086c, BNX2_FL_NOT_5709, 0x00000000, 0x77777777 },
+                { 0x0870, BNX2_FL_NOT_5709, 0x00000000, 0x77777777 },
+                { 0x0874, BNX2_FL_NOT_5709, 0x00000000, 0x77777777 },
+
+                { 0x0c00, BNX2_FL_NOT_5709, 0x00000000, 0x00000001 },
+                { 0x0c04, BNX2_FL_NOT_5709, 0x00000000, 0x03ff0001 },
+                { 0x0c08, BNX2_FL_NOT_5709,  0x0f0ff073, 0x00000000 },
 
                 { 0x1000, 0, 0x00000000, 0x00000001 },
                 { 0x1004, 0, 0x00000000, 0x000f0001 },
@@ -3840,7 +4132,6 @@ bnx2_test_registers(struct bnx2 *bp)
 
                 { 0x5004, 0, 0x00000000, 0x0000007f },
                 { 0x5008, 0, 0x0f0007ff, 0x00000000 },
-                { 0x500c, 0, 0xf800f800, 0x07ff07ff },
 
                 { 0x5c00, 0, 0x00000000, 0x00000001 },
                 { 0x5c04, 0, 0x00000000, 0x0003000f },
@@ -3880,8 +4171,16 @@ bnx2_test_registers(struct bnx2 *bp)
         };
 
         ret = 0;
+        is_5709 = 0;
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                is_5709 = 1;
+
         for (i = 0; reg_tbl[i].offset != 0xffff; i++) {
                 u32 offset, rw_mask, ro_mask, save_val, val;
+                u16 flags = reg_tbl[i].flags;
+
+                if (is_5709 && (flags & BNX2_FL_NOT_5709))
+                        continue;
 
                 offset = (u32) reg_tbl[i].offset;
                 rw_mask = reg_tbl[i].rw_mask;
@@ -3950,10 +4249,10 @@ bnx2_test_memory(struct bnx2 *bp)
 {
         int ret = 0;
         int i;
-        static const struct {
+        static struct mem_entry {
                 u32   offset;
                 u32   len;
-        } mem_tbl[] = {
+        } mem_tbl_5706[] = {
                 { 0x60000,  0x4000 },
                 { 0xa0000,  0x3000 },
                 { 0xe0000,  0x4000 },
@@ -3961,7 +4260,21 @@ bnx2_test_memory(struct bnx2 *bp)
                 { 0x1a0000, 0x4000 },
                 { 0x160000, 0x4000 },
                 { 0xffffffff, 0    },
+        },
+        mem_tbl_5709[] = {
+                { 0x60000,  0x4000 },
+                { 0xa0000,  0x3000 },
+                { 0xe0000,  0x4000 },
+                { 0x120000, 0x4000 },
+                { 0x1a0000, 0x4000 },
+                { 0xffffffff, 0    },
         };
+        struct mem_entry *mem_tbl;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                mem_tbl = mem_tbl_5709;
+        else
+                mem_tbl = mem_tbl_5706;
 
         for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) {
                 if ((ret = bnx2_do_mem_test(bp, mem_tbl[i].offset,
@@ -4163,8 +4476,10 @@ bnx2_test_link(struct bnx2 *bp)
         u32 bmsr;
 
         spin_lock_bh(&bp->phy_lock);
-        bnx2_read_phy(bp, MII_BMSR, &bmsr);
-        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+        bnx2_enable_bmsr1(bp);
+        bnx2_read_phy(bp, bp->mii_bmsr1, &bmsr);
+        bnx2_read_phy(bp, bp->mii_bmsr1, &bmsr);
+        bnx2_disable_bmsr1(bp);
         spin_unlock_bh(&bp->phy_lock);
 
         if (bmsr & BMSR_LSTATUS) {
@@ -4214,7 +4529,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)
 
                 bp->current_interval = bp->timer_interval;
 
-                bnx2_read_phy(bp, MII_BMCR, &bmcr);
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
 
                 if (bmcr & BMCR_ANENABLE) {
                         u32 phy1, phy2;
@@ -4232,7 +4547,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)
 
                                 bmcr &= ~BMCR_ANENABLE;
                                 bmcr |= BMCR_SPEED1000 | BMCR_FULLDPLX;
-                                bnx2_write_phy(bp, MII_BMCR, bmcr);
+                                bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
                                 bp->phy_flags |= PHY_PARALLEL_DETECT_FLAG;
                         }
                 }
@@ -4246,9 +4561,9 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)
                 if (phy2 & 0x20) {
                         u32 bmcr;
 
-                        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+                        bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
                         bmcr |= BMCR_ANENABLE;
-                        bnx2_write_phy(bp, MII_BMCR, bmcr);
+                        bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
 
                         bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
                 }
@@ -4272,17 +4587,12 @@ bnx2_5708_serdes_timer(struct bnx2 *bp)
         else if ((bp->link_up == 0) && (bp->autoneg & AUTONEG_SPEED)) {
                 u32 bmcr;
 
-                bnx2_read_phy(bp, MII_BMCR, &bmcr);
-
+                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
                 if (bmcr & BMCR_ANENABLE) {
-                        bmcr &= ~BMCR_ANENABLE;
-                        bmcr |= BMCR_FULLDPLX | BCM5708S_BMCR_FORCE_2500;
-                        bnx2_write_phy(bp, MII_BMCR, bmcr);
+                        bnx2_enable_forced_2g5(bp);
                         bp->current_interval = SERDES_FORCED_TIMEOUT;
                 } else {
-                        bmcr &= ~(BMCR_FULLDPLX | BCM5708S_BMCR_FORCE_2500);
-                        bmcr |= BMCR_ANENABLE;
-                        bnx2_write_phy(bp, MII_BMCR, bmcr);
+                        bnx2_disable_forced_2g5(bp);
                         bp->serdes_an_pending = 2;
                         bp->current_interval = bp->timer_interval;
                 }
@@ -4313,7 +4623,7 @@ bnx2_timer(unsigned long data)
         if (bp->phy_flags & PHY_SERDES_FLAG) {
                 if (CHIP_NUM(bp) == CHIP_NUM_5706)
                         bnx2_5706_serdes_timer(bp);
-                else if (CHIP_NUM(bp) == CHIP_NUM_5708)
+                else
                         bnx2_5708_serdes_timer(bp);
         }
 
@@ -4321,6 +4631,38 @@ bnx2_restart_timer:
         mod_timer(&bp->timer, jiffies + bp->current_interval);
 }
 
+static int
+bnx2_request_irq(struct bnx2 *bp)
+{
+        struct net_device *dev = bp->dev;
+        int rc = 0;
+
+        if (bp->flags & USING_MSI_FLAG) {
+                irq_handler_t   fn = bnx2_msi;
+
+                if (bp->flags & ONE_SHOT_MSI_FLAG)
+                        fn = bnx2_msi_1shot;
+
+                rc = request_irq(bp->pdev->irq, fn, 0, dev->name, dev);
+        } else
+                rc = request_irq(bp->pdev->irq, bnx2_interrupt,
+                                 IRQF_SHARED, dev->name, dev);
+        return rc;
+}
+
+static void
+bnx2_free_irq(struct bnx2 *bp)
+{
+        struct net_device *dev = bp->dev;
+
+        if (bp->flags & USING_MSI_FLAG) {
+                free_irq(bp->pdev->irq, dev);
+                pci_disable_msi(bp->pdev);
+                bp->flags &= ~(USING_MSI_FLAG | ONE_SHOT_MSI_FLAG);
+        } else
+                free_irq(bp->pdev->irq, dev);
+}
+
 /* Called with rtnl_lock */
 static int
 bnx2_open(struct net_device *dev)
@@ -4328,6 +4670,8 @@ bnx2_open(struct net_device *dev)
         struct bnx2 *bp = netdev_priv(dev);
         int rc;
 
+        netif_carrier_off(dev);
+
         bnx2_set_power_state(bp, PCI_D0);
         bnx2_disable_int(bp);
 
@@ -4335,24 +4679,15 @@ bnx2_open(struct net_device *dev)
         if (rc)
                 return rc;
 
-        if ((CHIP_ID(bp) != CHIP_ID_5706_A0) &&
-                (CHIP_ID(bp) != CHIP_ID_5706_A1) &&
-                !disable_msi) {
-
+        if ((bp->flags & MSI_CAP_FLAG) && !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,
-                                        IRQF_SHARED, dev->name, dev);
+                        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                                bp->flags |= ONE_SHOT_MSI_FLAG;
                 }
         }
-        else {
-                rc = request_irq(bp->pdev->irq, bnx2_interrupt, IRQF_SHARED,
-                                dev->name, dev);
-        }
+        rc = bnx2_request_irq(bp);
+
         if (rc) {
                 bnx2_free_mem(bp);
                 return rc;
@@ -4361,11 +4696,7 @@ bnx2_open(struct net_device *dev)
         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_irq(bp);
                 bnx2_free_skbs(bp);
                 bnx2_free_mem(bp);
                 return rc;
@@ -4389,16 +4720,13 @@ bnx2_open(struct net_device *dev)
                                bp->dev->name);
 
                         bnx2_disable_int(bp);
-                        free_irq(bp->pdev->irq, dev);
-                        pci_disable_msi(bp->pdev);
-                        bp->flags &= ~USING_MSI_FLAG;
+                        bnx2_free_irq(bp);
 
                         rc = bnx2_init_nic(bp);
 
-                        if (!rc) {
-                                rc = request_irq(bp->pdev->irq, bnx2_interrupt,
-                                        IRQF_SHARED, dev->name, dev);
-                        }
+                        if (!rc)
+                                rc = bnx2_request_irq(bp);
+
                         if (rc) {
                                 bnx2_free_skbs(bp);
                                 bnx2_free_mem(bp);
@@ -4508,40 +4836,53 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 vlan_tag_flags |=
                         (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
         }
-        if ((mss = skb_shinfo(skb)->gso_size) &&
-                (skb->len > (bp->dev->mtu + ETH_HLEN))) {
+        if ((mss = skb_shinfo(skb)->gso_size)) {
                 u32 tcp_opt_len, ip_tcp_len;
                 struct iphdr *iph;
 
-                if (skb_header_cloned(skb) &&
-                    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
-                        dev_kfree_skb(skb);
-                        return NETDEV_TX_OK;
-                }
-
                 vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;
 
-                tcp_opt_len = 0;
-                if (tcp_hdr(skb)->doff > 5)
-                        tcp_opt_len = tcp_optlen(skb);
+                tcp_opt_len = tcp_optlen(skb);
+
+                if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
+                        u32 tcp_off = skb_transport_offset(skb) -
+                                      sizeof(struct ipv6hdr) - ETH_HLEN;
 
-                ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
+                        vlan_tag_flags |= ((tcp_opt_len >> 2) << 8) |
+                                          TX_BD_FLAGS_SW_FLAGS;
+                        if (likely(tcp_off == 0))
+                                vlan_tag_flags &= ~TX_BD_FLAGS_TCP6_OFF0_MSK;
+                        else {
+                                tcp_off >>= 3;
+                                vlan_tag_flags |= ((tcp_off & 0x3) <<
+                                                   TX_BD_FLAGS_TCP6_OFF0_SHL) |
+                                                  ((tcp_off & 0x10) <<
+                                                   TX_BD_FLAGS_TCP6_OFF4_SHL);
+                                mss |= (tcp_off & 0xc) << TX_BD_TCP6_OFF2_SHL;
+                        }
+                } else {
+                        if (skb_header_cloned(skb) &&
+                            pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
+                                dev_kfree_skb(skb);
+                                return NETDEV_TX_OK;
+                        }
 
-                iph = ip_hdr(skb);
-                iph->check = 0;
-                iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
-                tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                         iph->daddr, 0,
-                                                         IPPROTO_TCP, 0);
-                if (tcp_opt_len || (iph->ihl > 5)) {
-                        vlan_tag_flags |= ((iph->ihl - 5) +
-                                           (tcp_opt_len >> 2)) << 8;
+                        ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
+
+                        iph = ip_hdr(skb);
+                        iph->check = 0;
+                        iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
+                        tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                                 iph->daddr, 0,
+                                                                 IPPROTO_TCP,
+                                                                 0);
+                        if (tcp_opt_len || (iph->ihl > 5)) {
+                                vlan_tag_flags |= ((iph->ihl - 5) +
+                                                   (tcp_opt_len >> 2)) << 8;
+                        }
                 }
-        }
-        else
-        {
+        } else
                 mss = 0;
-        }
 
         mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
 
@@ -4622,11 +4963,7 @@ bnx2_close(struct net_device *dev)
         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_irq(bp);
         bnx2_free_skbs(bp);
         bnx2_free_mem(bp);
         bp->link_up = 0;
@@ -4735,6 +5072,8 @@ bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         if (bp->phy_flags & PHY_SERDES_FLAG) {
                 cmd->supported |= SUPPORTED_1000baseT_Full |
                         SUPPORTED_FIBRE;
+                if (bp->phy_flags & PHY_2_5G_CAPABLE_FLAG)
+                        cmd->supported |= SUPPORTED_2500baseX_Full;
 
                 cmd->port = PORT_FIBRE;
         }
@@ -4798,8 +5137,10 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                         advertising = cmd->advertising;
 
-                }
-                else if (cmd->advertising == ADVERTISED_1000baseT_Full) {
+                } else if (cmd->advertising == ADVERTISED_2500baseX_Full) {
+                        if (!(bp->phy_flags & PHY_2_5G_CAPABLE_FLAG))
+                                return -EINVAL;
+                } else if (cmd->advertising == ADVERTISED_1000baseT_Full) {
                         advertising = cmd->advertising;
                 }
                 else if (cmd->advertising == ADVERTISED_1000baseT_Half) {
@@ -4975,7 +5316,7 @@ bnx2_nway_reset(struct net_device *dev)
 
         /* Force a link down visible on the other side */
         if (bp->phy_flags & PHY_SERDES_FLAG) {
-                bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                bnx2_write_phy(bp, bp->mii_bmcr, BMCR_LOOPBACK);
                 spin_unlock_bh(&bp->phy_lock);
 
                 msleep(20);
@@ -4987,9 +5328,9 @@ bnx2_nway_reset(struct net_device *dev)
                 mod_timer(&bp->timer, jiffies + bp->current_interval);
         }
 
-        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
         bmcr &= ~BMCR_LOOPBACK;
-        bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART | BMCR_ANENABLE);
+        bnx2_write_phy(bp, bp->mii_bmcr, bmcr | BMCR_ANRESTART | BMCR_ANENABLE);
 
         spin_unlock_bh(&bp->phy_lock);
 
@@ -5209,10 +5550,15 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data)
 static int
 bnx2_set_tso(struct net_device *dev, u32 data)
 {
-        if (data)
+        struct bnx2 *bp = netdev_priv(dev);
+
+        if (data) {
                 dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
-        else
-                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
+                if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                        dev->features |= NETIF_F_TSO6;
+        } else
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6 |
+                                   NETIF_F_TSO_ECN);
         return 0;
 }
 
@@ -5510,6 +5856,17 @@ bnx2_phys_id(struct net_device *dev, u32 data)
         return 0;
 }
 
+static int
+bnx2_set_tx_csum(struct net_device *dev, u32 data)
+{
+        struct bnx2 *bp = netdev_priv(dev);
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                return (ethtool_op_set_tx_hw_csum(dev, data));
+        else
+                return (ethtool_op_set_tx_csum(dev, data));
+}
+
 static const struct ethtool_ops bnx2_ethtool_ops = {
         .get_settings           = bnx2_get_settings,
         .set_settings           = bnx2_set_settings,
@@ -5532,7 +5889,7 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
         .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,
+        .set_tx_csum            = bnx2_set_tx_csum,
         .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
         .get_tso                = ethtool_op_get_tso,
@@ -5562,6 +5919,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         case SIOCGMIIREG: {
                 u32 mii_regval;
 
+                if (!netif_running(dev))
+                        return -EAGAIN;
+
                 spin_lock_bh(&bp->phy_lock);
                 err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);
                 spin_unlock_bh(&bp->phy_lock);
@@ -5575,6 +5935,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
+                if (!netif_running(dev))
+                        return -EAGAIN;
+
                 spin_lock_bh(&bp->phy_lock);
                 err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);
                 spin_unlock_bh(&bp->phy_lock);
@@ -5676,6 +6039,58 @@ bnx2_get_5709_media(struct bnx2 *bp)
         }
 }
 
+static void __devinit
+bnx2_get_pci_speed(struct bnx2 *bp)
+{
+        u32 reg;
+
+        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;
+
+}
+
 static int __devinit
 bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 {
@@ -5683,6 +6098,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         unsigned long mem_len;
         int rc;
         u32 reg;
+        u64 dma_mask, persist_dma_mask;
 
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
@@ -5721,25 +6137,11 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                 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) {
-                        dev_err(&pdev->dev,
-                                "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) {
-                dev_err(&pdev->dev, "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->indirect_lock);
         INIT_WORK(&bp->reset_task, bnx2_reset_task);
 
         dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0);
@@ -5767,7 +6169,15 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
 
-        if (CHIP_NUM(bp) != CHIP_NUM_5709) {
+        if (CHIP_NUM(bp) == CHIP_NUM_5709) {
+                if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot find PCIE capability, aborting.\n");
+                        rc = -EIO;
+                        goto err_out_unmap;
+                }
+                bp->flags |= PCIE_FLAG;
+        } else {
                 bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
                 if (bp->pcix_cap == 0) {
                         dev_err(&pdev->dev,
@@ -5777,51 +6187,33 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                 }
         }
 
-        /* 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;
+        if (CHIP_ID(bp) != CHIP_ID_5706_A0 && CHIP_ID(bp) != CHIP_ID_5706_A1) {
+                if (pci_find_capability(pdev, PCI_CAP_ID_MSI))
+                        bp->flags |= MSI_CAP_FLAG;
+        }
 
-                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;
+        /* 5708 cannot support DMA addresses > 40-bit.  */
+        if (CHIP_NUM(bp) == CHIP_NUM_5708)
+                persist_dma_mask = dma_mask = DMA_40BIT_MASK;
+        else
+                persist_dma_mask = dma_mask = DMA_64BIT_MASK;
 
-                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;
+        /* Configure DMA attributes. */
+        if (pci_set_dma_mask(pdev, dma_mask) == 0) {
+                dev->features |= NETIF_F_HIGHDMA;
+                rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask);
+                if (rc) {
+                        dev_err(&pdev->dev,
+                                "pci_set_consistent_dma_mask failed, aborting.\n");
+                        goto err_out_unmap;
                 }
-        }
-        else {
-                if (reg & BNX2_PCICFG_MISC_STATUS_M66EN)
-                        bp->bus_speed_mhz = 66;
-                else
-                        bp->bus_speed_mhz = 33;
+        } else if ((rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+                dev_err(&pdev->dev, "System does not support DMA, aborting.\n");
+                goto err_out_unmap;
         }
 
-        if (reg & BNX2_PCICFG_MISC_STATUS_32BIT_DET)
-                bp->flags |= PCI_32BIT_FLAG;
+        if (!(bp->flags & PCIE_FLAG))
+                bnx2_get_pci_speed(bp);
 
         /* 5706A0 may falsely detect SERR and PERR. */
         if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
@@ -6005,6 +6397,26 @@ err_out:
         return rc;
 }
 
+static char * __devinit
+bnx2_bus_string(struct bnx2 *bp, char *str)
+{
+        char *s = str;
+
+        if (bp->flags & PCIE_FLAG) {
+                s += sprintf(s, "PCI Express");
+        } else {
+                s += sprintf(s, "PCI");
+                if (bp->flags & PCIX_FLAG)
+                        s += sprintf(s, "-X");
+                if (bp->flags & PCI_32BIT_FLAG)
+                        s += sprintf(s, " 32-bit");
+                else
+                        s += sprintf(s, " 64-bit");
+                s += sprintf(s, " %dMHz", bp->bus_speed_mhz);
+        }
+        return str;
+}
+
 static int __devinit
 bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -6012,6 +6424,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *dev = NULL;
         struct bnx2 *bp;
         int rc, i;
+        char str[40];
 
         if (version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -6052,6 +6465,23 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->poll_controller = poll_bnx2;
 #endif
 
+        pci_set_drvdata(pdev, dev);
+
+        memcpy(dev->dev_addr, bp->mac_addr, 6);
+        memcpy(dev->perm_addr, bp->mac_addr, 6);
+        bp->name = board_info[ent->driver_data].name;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+        else
+                dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
+#ifdef BCM_VLAN
+        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+#endif
+        dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
+        if (CHIP_NUM(bp) == CHIP_NUM_5709)
+                dev->features |= NETIF_F_TSO6;
+
         if ((rc = register_netdev(dev))) {
                 dev_err(&pdev->dev, "Cannot register net device\n");
                 if (bp->regview)
@@ -6063,20 +6493,13 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return rc;
         }
 
-        pci_set_drvdata(pdev, dev);
-
-        memcpy(dev->dev_addr, bp->mac_addr, 6);
-        memcpy(dev->perm_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, "
+        printk(KERN_INFO "%s: %s (%c%d) %s 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,
+                bnx2_bus_string(bp, str),
                 dev->base_addr,
                 bp->pdev->irq);
 
@@ -6085,17 +6508,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 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
-        dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
-
-        netif_carrier_off(bp->dev);
-
         return 0;
 }
 
@@ -6140,6 +6552,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
         bnx2_reset_chip(bp, reset_code);
         bnx2_free_skbs(bp);
+        pci_save_state(pdev);
         bnx2_set_power_state(bp, pci_choose_state(pdev, state));
         return 0;
 }
@@ -6153,6 +6566,7 @@ bnx2_resume(struct pci_dev *pdev)
         if (!netif_running(dev))
                 return 0;
 
+        pci_restore_state(pdev);
         bnx2_set_power_state(bp, PCI_D0);
         netif_device_attach(dev);
         bnx2_init_nic(bp);
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 878eee58f12a..bd6288d6350f 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -1,6 +1,6 @@
 /* bnx2.h: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004, 2005, 2006 Broadcom Corporation
+ * Copyright (c) 2004-2007 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
@@ -24,8 +24,11 @@ struct tx_bd {
         u32 tx_bd_haddr_hi;
         u32 tx_bd_haddr_lo;
         u32 tx_bd_mss_nbytes;
+                #define TX_BD_TCP6_OFF2_SHL             (14)
         u32 tx_bd_vlan_tag_flags;
                 #define TX_BD_FLAGS_CONN_FAULT          (1<<0)
+                #define TX_BD_FLAGS_TCP6_OFF0_MSK       (3<<1)
+                #define TX_BD_FLAGS_TCP6_OFF0_SHL       (1)
                 #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)
@@ -34,6 +37,7 @@ struct tx_bd {
                 #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_TCP6_OFF4_SHL       (12)
                 #define TX_BD_FLAGS_SW_FLAGS            (1<<13)
                 #define TX_BD_FLAGS_SW_SNAP             (1<<14)
                 #define TX_BD_FLAGS_SW_LSO              (1<<15)
@@ -6292,6 +6296,41 @@ struct l2_fhdr {
 #define MII_BNX2_DSP_ADDRESS                    0x17
 #define MII_BNX2_DSP_EXPAND_REG                  0x0f00
 
+#define MII_BNX2_BLK_ADDR                       0x1f
+#define MII_BNX2_BLK_ADDR_IEEE0                  0x0000
+#define MII_BNX2_BLK_ADDR_GP_STATUS              0x8120
+#define MII_BNX2_GP_TOP_AN_STATUS1                0x1b
+#define MII_BNX2_GP_TOP_AN_SPEED_MSK               0x3f00
+#define MII_BNX2_GP_TOP_AN_SPEED_10                0x0000
+#define MII_BNX2_GP_TOP_AN_SPEED_100               0x0100
+#define MII_BNX2_GP_TOP_AN_SPEED_1G                0x0200
+#define MII_BNX2_GP_TOP_AN_SPEED_2_5G              0x0300
+#define MII_BNX2_GP_TOP_AN_SPEED_1GKV              0x0d00
+#define MII_BNX2_GP_TOP_AN_FD                      0x8
+#define MII_BNX2_BLK_ADDR_SERDES_DIG             0x8300
+#define MII_BNX2_SERDES_DIG_1000XCTL1             0x10
+#define MII_BNX2_SD_1000XCTL1_FIBER                0x01
+#define MII_BNX2_SD_1000XCTL1_AUTODET              0x10
+#define MII_BNX2_SERDES_DIG_MISC1                 0x18
+#define MII_BNX2_SD_MISC1_FORCE_MSK                0xf
+#define MII_BNX2_SD_MISC1_FORCE_2_5G               0x0
+#define MII_BNX2_SD_MISC1_FORCE                    0x10
+#define MII_BNX2_BLK_ADDR_OVER1G                 0x8320
+#define MII_BNX2_OVER1G_UP1                       0x19
+#define MII_BNX2_BLK_ADDR_BAM_NXTPG              0x8350
+#define MII_BNX2_BAM_NXTPG_CTL                    0x10
+#define MII_BNX2_NXTPG_CTL_BAM                     0x1
+#define MII_BNX2_NXTPG_CTL_T2                      0x2
+#define MII_BNX2_BLK_ADDR_CL73_USERB0            0x8370
+#define MII_BNX2_CL73_BAM_CTL1                    0x12
+#define MII_BNX2_CL73_BAM_EN                       0x8000
+#define MII_BNX2_CL73_BAM_STA_MGR_EN               0x4000
+#define MII_BNX2_CL73_BAM_NP_AFT_BP_EN             0x2000
+#define MII_BNX2_BLK_ADDR_AER                    0xffd0
+#define MII_BNX2_AER_AER                          0x1e
+#define MII_BNX2_AER_AER_AN_MMD                    0x3800
+#define MII_BNX2_BLK_ADDR_COMBO_IEEEB0           0xffe0
+
 #define MIN_ETHERNET_PACKET_SIZE        60
 #define MAX_ETHERNET_PACKET_SIZE        1514
 #define MAX_ETHERNET_JUMBO_PACKET_SIZE  9014
@@ -6429,13 +6468,15 @@ struct bnx2 {
         u32                     last_status_idx;
 
         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
-#define ASF_ENABLE_FLAG                 0x40
+#define PCIX_FLAG                       0x00000001
+#define PCI_32BIT_FLAG                  0x00000002
+#define ONE_TDMA_FLAG                   0x00000004      /* no longer used */
+#define NO_WOL_FLAG                     0x00000008
+#define USING_MSI_FLAG                  0x00000020
+#define ASF_ENABLE_FLAG                 0x00000040
+#define MSI_CAP_FLAG                    0x00000080
+#define ONE_SHOT_MSI_FLAG               0x00000100
+#define PCIE_FLAG                       0x00000200
 
         /* Put tx producer and consumer fields in separate cache lines. */
 
@@ -6484,6 +6525,7 @@ struct bnx2 {
 
         /* Used to synchronize phy accesses. */
         spinlock_t              phy_lock;
+        spinlock_t              indirect_lock;
 
         u32                     phy_flags;
 #define PHY_SERDES_FLAG                 1
@@ -6495,6 +6537,13 @@ struct bnx2 {
 #define PHY_INT_MODE_LINK_READY_FLAG    0x200
 #define PHY_DIS_EARLY_DAC_FLAG          0x400
 
+        u32                     mii_bmcr;
+        u32                     mii_bmsr;
+        u32                     mii_bmsr1;
+        u32                     mii_adv;
+        u32                     mii_lpa;
+        u32                     mii_up1;
+
         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)
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h
index 21d368ff424d..b49f439e0f67 100644
--- a/drivers/net/bnx2_fw.h
+++ b/drivers/net/bnx2_fw.h
@@ -15,680 +15,1071 @@
  */
 
 static u8 bnx2_COM_b06FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0x09, 0x83, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xec, 0x5b, 0x7d, 0x6c,
-        0x5b, 0xd7, 0x75, 0x3f, 0xef, 0xf1, 0x51, 0x7a, 0x96, 0x68, 0xf9, 0x99,
-        0x7e, 0x96, 0x59, 0x4f, 0xb1, 0x49, 0xf1, 0xc9, 0xd2, 0x62, 0x2d, 0x63,
-        0x34, 0x35, 0xd1, 0x3a, 0x26, 0x66, 0x48, 0xda, 0x71, 0x36, 0x67, 0xa0,
-        0x1d, 0x05, 0x51, 0x51, 0xaf, 0xd0, 0x48, 0xd9, 0xcd, 0xb2, 0x0c, 0x73,
-        0x96, 0xb4, 0x70, 0xbc, 0xb4, 0xa1, 0x25, 0x79, 0xf5, 0x06, 0x45, 0xcf,
-        0xb3, 0x34, 0x39, 0xc0, 0x82, 0x41, 0x10, 0x9d, 0x3a, 0x7f, 0x30, 0xa5,
-        0xed, 0x7c, 0x19, 0xe8, 0x12, 0x29, 0xb2, 0x93, 0xb5, 0x43, 0xd0, 0xa6,
-        0x68, 0xff, 0xe8, 0x8a, 0x6e, 0x30, 0x52, 0x0c, 0xf3, 0x3a, 0xa0, 0x30,
-        0xfa, 0xc7, 0xe6, 0x2d, 0x1f, 0xdc, 0xef, 0xdc, 0x77, 0x1f, 0xf9, 0x48,
-        0x51, 0x96, 0x1c, 0x34, 0x5d, 0xb7, 0x99, 0x80, 0xf0, 0xde, 0xbd, 0xf7,
-        0xbc, 0x7b, 0xcf, 0x3d, 0xdf, 0xe7, 0xdc, 0xab, 0x5f, 0x53, 0xa9, 0x85,
-        0xe4, 0x6f, 0x2d, 0xfe, 0xc2, 0x7f, 0xf4, 0xc7, 0xb9, 0xdb, 0x3e, 0x7d,
-        0x5b, 0x1f, 0x5e, 0x07, 0x54, 0xdd, 0xaf, 0x72, 0xbf, 0x0f, 0x7f, 0x26,
-        0xfe, 0xfa, 0xe4, 0x7b, 0xa3, 0x9f, 0x81, 0xbf, 0x2b, 0x18, 0x1c, 0xfe,
-        0x09, 0x91, 0xb2, 0x0c, 0x8c, 0xf7, 0x57, 0x2e, 0x5f, 0x7f, 0x9c, 0x17,
-        0x0e, 0xaf, 0x62, 0x9e, 0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf,
-        0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf, 0xff, 0x3f, 0x3f, 0x9f, 0x13, 0x72,
-        0x88, 0x98, 0x85, 0xff, 0x48, 0x57, 0xe3, 0x89, 0xa1, 0xa4, 0x45, 0xba,
-        0x2f, 0x7e, 0x65, 0x28, 0x67, 0x11, 0x25, 0x8a, 0xdb, 0xc3, 0x29, 0xfa,
-        0xb0, 0x9c, 0x37, 0x35, 0xe2, 0xfe, 0x5b, 0xe2, 0x1f, 0x3c, 0xfd, 0xfa,
-        0x9d, 0x91, 0xab, 0xb3, 0x3e, 0xd2, 0x8d, 0xf8, 0xcb, 0xba, 0xb1, 0x8d,
-        0xf4, 0x0e, 0x7c, 0xf3, 0x5c, 0xf7, 0x7f, 0xa8, 0xd4, 0xe6, 0xce, 0x75,
-        0xa5, 0xfc, 0x7a, 0x37, 0xe5, 0x37, 0xc7, 0x75, 0x52, 0xe3, 0x5d, 0x3f,
-        0x48, 0xfa, 0x8c, 0x61, 0x5f, 0xdc, 0xa0, 0xf9, 0x12, 0x65, 0x0e, 0x4c,
-        0xf0, 0x1a, 0xb1, 0x75, 0xf7, 0x62, 0x2e, 0x2d, 0x3e, 0x3c, 0xf4, 0x67,
-        0xd6, 0xd3, 0x65, 0xd5, 0xb2, 0x7a, 0xe6, 0x28, 0x30, 0xf0, 0x7c, 0x3f,
-        0xc6, 0x8b, 0x91, 0x1e, 0xa2, 0x3b, 0x49, 0xb5, 0xf2, 0x01, 0x9f, 0xa5,
-        0x53, 0xb2, 0x64, 0x51, 0xaa, 0x44, 0xf4, 0x77, 0x45, 0x85, 0x9e, 0xb7,
-        0xda, 0x69, 0xae, 0xf7, 0x83, 0x72, 0x02, 0xb8, 0xbc, 0x6d, 0x0d, 0x0f,
-        0x8d, 0x5b, 0x3c, 0x57, 0x7c, 0x9d, 0x83, 0x6f, 0x6f, 0x5b, 0xce, 0xd2,
-        0x68, 0xb4, 0xc8, 0x7d, 0xbd, 0x2d, 0xdc, 0xe7, 0x8f, 0x3f, 0x1c, 0x7c,
-        0xde, 0x0a, 0xc8, 0xbe, 0x1f, 0xa5, 0x92, 0x98, 0x6f, 0xac, 0xc8, 0xb0,
-        0xcf, 0xde, 0x91, 0xb3, 0x4c, 0xd9, 0x6f, 0xc5, 0x93, 0x56, 0x08, 0xfd,
-        0x1d, 0x72, 0x2c, 0xbd, 0x2e, 0x67, 0x59, 0x72, 0xac, 0x88, 0x6f, 0x7a,
-        0x65, 0xff, 0x3b, 0xa9, 0x9c, 0x15, 0x93, 0xfd, 0x57, 0x93, 0x49, 0xab,
-        0x5f, 0xf6, 0x1f, 0xbe, 0x2b, 0x67, 0xc5, 0x65, 0xff, 0xf7, 0x81, 0x8b,
-        0x41, 0xc7, 0x8a, 0x61, 0xfc, 0x25, 0x30, 0xfe, 0x9a, 0x41, 0x6d, 0x19,
-        0x8c, 0x61, 0xef, 0xb6, 0x4e, 0x97, 0x7d, 0x21, 0x7a, 0xbd, 0xfb, 0x32,
-        0x68, 0x63, 0xd0, 0xd9, 0x12, 0x29, 0x99, 0xee, 0x10, 0x68, 0x62, 0xd2,
-        0xb9, 0x52, 0x2b, 0xf9, 0x4e, 0xfa, 0xb0, 0xe7, 0xcf, 0x51, 0xd6, 0xd4,
-        0x69, 0xfd, 0x8c, 0x42, 0x9d, 0x7d, 0x6b, 0x28, 0x61, 0xe4, 0x29, 0xd5,
-        0x8d, 0x28, 0x6e, 0xd2, 0x24, 0x6d, 0x66, 0x71, 0xbd, 0x8a, 0x1e, 0x95,
-        0x22, 0xa1, 0x2c, 0x28, 0x3c, 0x72, 0xfa, 0x5d, 0x8e, 0x39, 0xb1, 0x26,
-        0xff, 0x85, 0x29, 0x35, 0x71, 0x2b, 0x0d, 0x1b, 0x8c, 0x0f, 0x80, 0x05,
-        0x1f, 0x74, 0x25, 0x79, 0x2a, 0x44, 0xc7, 0xec, 0x80, 0x92, 0x3a, 0x75,
-        0x37, 0x25, 0x63, 0x64, 0xaa, 0xd4, 0x25, 0xbe, 0x2d, 0x14, 0x43, 0x34,
-        0x6e, 0x93, 0x92, 0xb4, 0x99, 0x5e, 0xed, 0x18, 0x6f, 0x13, 0xb0, 0xe8,
-        0xeb, 0xf0, 0x51, 0x97, 0x91, 0x22, 0x9d, 0x71, 0x46, 0x7f, 0x50, 0x49,
-        0x8b, 0x39, 0x44, 0x7f, 0x78, 0x8c, 0x02, 0x74, 0xba, 0x68, 0x4a, 0xd8,
-        0x72, 0x39, 0x19, 0x33, 0x00, 0x07, 0xda, 0xd9, 0x26, 0x0d, 0xe3, 0x39,
-        0x6a, 0xf3, 0xfa, 0x21, 0xc8, 0xcc, 0xb7, 0x87, 0xb2, 0xd3, 0x62, 0xbe,
-        0xb0, 0x2f, 0xce, 0xf3, 0x75, 0x00, 0xee, 0x1d, 0xe0, 0xa5, 0x90, 0x26,
-        0x78, 0x95, 0xa0, 0xec, 0x84, 0x02, 0x79, 0xc2, 0x53, 0xd0, 0x2d, 0x0d,
-        0xfc, 0x35, 0xb2, 0xfa, 0x14, 0xca, 0x59, 0x9b, 0x28, 0x6f, 0xa0, 0x5d,
-        0xbc, 0xa0, 0x26, 0xed, 0x66, 0x4a, 0x69, 0x61, 0xec, 0x5f, 0xc8, 0x0a,
-        0x8d, 0xe1, 0x1b, 0xd5, 0x62, 0x98, 0x9f, 0x61, 0xef, 0xc3, 0x82, 0xfe,
-        0x4d, 0xf1, 0xfd, 0x74, 0x69, 0x22, 0xaf, 0x26, 0x4b, 0xed, 0xe4, 0x9b,
-        0x89, 0x40, 0x9a, 0xc7, 0xd5, 0xd4, 0x19, 0x8d, 0xfc, 0x93, 0x0a, 0x41,
-        0x3e, 0x0c, 0x5f, 0xfc, 0xb8, 0xba, 0xb3, 0x74, 0x41, 0x4d, 0x95, 0xf8,
-        0x1b, 0xc0, 0x16, 0x55, 0xd0, 0x96, 0xdf, 0xb7, 0x83, 0x96, 0x34, 0xac,
-        0xc6, 0x75, 0x3d, 0x51, 0x64, 0x99, 0xe5, 0x6f, 0xc1, 0x0f, 0xec, 0xe5,
-        0x9c, 0x0d, 0xfe, 0x08, 0x7e, 0x85, 0xc1, 0xaf, 0x6f, 0x82, 0x5f, 0xfd,
-        0xe0, 0x53, 0x8c, 0xde, 0x28, 0xf5, 0xd2, 0x6b, 0xa5, 0x1e, 0x7a, 0x15,
-        0x32, 0xf9, 0x4a, 0x29, 0x4c, 0x2f, 0x97, 0x3a, 0xe8, 0xa5, 0x52, 0x88,
-        0xce, 0x0b, 0x1e, 0xa6, 0x21, 0xff, 0x82, 0xaf, 0xfa, 0x26, 0xf0, 0xa4,
-        0x1d, 0x3c, 0x59, 0x0f, 0x79, 0xd9, 0x08, 0xf9, 0x9b, 0xee, 0xd6, 0x69,
-        0xaa, 0x9b, 0x12, 0x41, 0xf4, 0x6f, 0x89, 0x6b, 0x82, 0x4e, 0x1a, 0xc6,
-        0xc7, 0x26, 0xfc, 0x94, 0x32, 0x4e, 0xd3, 0x7b, 0x93, 0x1a, 0x8d, 0x95,
-        0xa6, 0x36, 0x3a, 0x7c, 0xe3, 0xf6, 0x2c, 0x5d, 0x44, 0x5f, 0xca, 0x98,
-        0xa5, 0x4b, 0xdb, 0x54, 0x1a, 0x9d, 0xfe, 0x1b, 0x4a, 0x9e, 0x39, 0x4d,
-        0x3f, 0xfe, 0x3a, 0x51, 0x06, 0x34, 0x51, 0xfb, 0x7e, 0x5a, 0x4e, 0x18,
-        0xa0, 0x45, 0x5f, 0xaf, 0x90, 0x08, 0xb5, 0x8f, 0x79, 0x19, 0x86, 0xae,
-        0x68, 0x4a, 0xca, 0x7e, 0x01, 0xfa, 0xd2, 0xaa, 0x24, 0xa7, 0x88, 0x72,
-        0x53, 0x65, 0xca, 0xc5, 0xfc, 0xf4, 0x98, 0x51, 0xa6, 0x74, 0xac, 0x89,
-        0xbe, 0x68, 0xb4, 0xd3, 0x68, 0xef, 0x6f, 0xf8, 0xdc, 0x5c, 0x65, 0xba,
-        0xd4, 0x8f, 0x77, 0xee, 0x23, 0x9a, 0x12, 0xef, 0x4e, 0x7f, 0xbe, 0xe4,
-        0xa7, 0x84, 0x99, 0x0f, 0x69, 0xf4, 0x8e, 0xcf, 0xc1, 0x29, 0xe1, 0x8e,
-        0x81, 0x57, 0xc3, 0xb0, 0x0f, 0x8e, 0x0c, 0x66, 0x27, 0xd6, 0x5c, 0x4b,
-        0x88, 0x6e, 0xc0, 0x0b, 0xd9, 0xd3, 0x18, 0x8f, 0x61, 0x25, 0x6e, 0x52,
-        0xa7, 0xd0, 0x8d, 0x7e, 0xc0, 0x0c, 0x28, 0xfb, 0x4a, 0xcc, 0x6b, 0xbc,
-        0x17, 0x19, 0xd7, 0xcd, 0x80, 0xd5, 0xf0, 0x4c, 0x48, 0x9c, 0xbd, 0x78,
-        0xf2, 0x5c, 0x8c, 0x27, 0x3f, 0x7f, 0xcf, 0x83, 0xe7, 0xe7, 0x2b, 0xef,
-        0x53, 0x9e, 0xf7, 0x7c, 0xe9, 0x4f, 0x03, 0x0e, 0x7e, 0x4c, 0xcf, 0x01,
-        0x1a, 0x9d, 0x38, 0x2c, 0xd7, 0xc2, 0x7b, 0x91, 0xd7, 0x38, 0x0d, 0x3a,
-        0x09, 0xc8, 0x15, 0xd6, 0x3a, 0xec, 0x59, 0xeb, 0x49, 0xcf, 0x5a, 0x4f,
-        0x7a, 0xd6, 0xca, 0x83, 0xb6, 0xb4, 0x4e, 0xb5, 0xfc, 0xd0, 0x51, 0xee,
-        0x39, 0x8e, 0x39, 0x9f, 0x03, 0x5f, 0xbe, 0x0a, 0x98, 0x38, 0x2d, 0xda,
-        0xa0, 0xc7, 0x94, 0x46, 0x7b, 0x4d, 0x7e, 0x7f, 0xb1, 0xd5, 0xc1, 0x8b,
-        0xdf, 0x2f, 0x48, 0x9c, 0x5a, 0x1d, 0xb8, 0xd2, 0x15, 0xa1, 0xff, 0xf3,
-        0x25, 0xd6, 0x4f, 0x8a, 0xf9, 0x2c, 0x3a, 0x94, 0x8e, 0xb5, 0xd3, 0x98,
-        0xa1, 0xc4, 0x46, 0x7b, 0x9a, 0x99, 0x8e, 0x09, 0xd5, 0x6a, 0x85, 0x0e,
-        0x50, 0x58, 0x65, 0xdb, 0x25, 0xf0, 0x7b, 0x49, 0xe2, 0x61, 0x70, 0x3b,
-        0xa3, 0x5a, 0xc1, 0xba, 0x7e, 0x96, 0xdf, 0x57, 0xf0, 0xce, 0x32, 0x9c,
-        0xd4, 0x9c, 0xb5, 0x5f, 0x45, 0x9b, 0xed, 0xce, 0x66, 0xd9, 0x76, 0xc7,
-        0xff, 0xa0, 0xa9, 0xb6, 0xfd, 0x05, 0xb3, 0xb6, 0xed, 0xea, 0x82, 0xd7,
-        0x66, 0xf1, 0xde, 0xc2, 0xe4, 0xb3, 0x58, 0x8e, 0xfc, 0xc0, 0x35, 0x06,
-        0x3d, 0x6c, 0x96, 0x38, 0x7c, 0x4b, 0xe2, 0x00, 0x5c, 0x01, 0x37, 0x5a,
-        0xe2, 0x6f, 0x04, 0x4b, 0xea, 0xda, 0x4c, 0x43, 0xf7, 0x7d, 0xad, 0x18,
-        0xbf, 0xec, 0xe3, 0x75, 0xdc, 0x27, 0x29, 0x69, 0xe8, 0xc9, 0xd8, 0xb4,
-        0x46, 0xd9, 0xd8, 0x26, 0x21, 0xd7, 0xd9, 0x58, 0xd5, 0x06, 0x8c, 0x4e,
-        0xd4, 0xdb, 0x00, 0xfe, 0x8e, 0x6d, 0x80, 0xa3, 0xfb, 0x63, 0xd3, 0x6c,
-        0x0b, 0x1c, 0xdd, 0x3f, 0x36, 0xc1, 0x36, 0x41, 0xcc, 0x09, 0xfd, 0x67,
-        0x3b, 0xe0, 0xda, 0x00, 0xfe, 0x86, 0x6d, 0x80, 0x0f, 0xf2, 0xcd, 0xf3,
-        0xb9, 0x6b, 0x8f, 0xd7, 0xcd, 0x3b, 0xce, 0xb6, 0x45, 0xd9, 0xd9, 0xcd,
-        0x30, 0xc7, 0xb1, 0x76, 0x80, 0x0a, 0xd3, 0xcc, 0xc3, 0x48, 0xe8, 0x08,
-        0x1d, 0x17, 0x36, 0xef, 0xf4, 0x04, 0x25, 0x0e, 0x9e, 0x18, 0xa0, 0x34,
-        0x6c, 0xc0, 0xdc, 0xc4, 0xb5, 0x32, 0xf8, 0x78, 0x47, 0x13, 0x59, 0xb0,
-        0x75, 0xf0, 0x93, 0xfd, 0x7e, 0xf2, 0xc5, 0xe3, 0x90, 0xb7, 0x98, 0xf0,
-        0x5d, 0xd5, 0x9f, 0xa6, 0xed, 0xaa, 0x69, 0x37, 0xc1, 0x3f, 0x62, 0xde,
-        0xfe, 0x98, 0x90, 0x4d, 0xef, 0x2f, 0x09, 0x1b, 0x94, 0x8c, 0x7d, 0x08,
-        0xf9, 0x75, 0x69, 0xe4, 0xea, 0x1f, 0xdb, 0xfa, 0x2b, 0x1e, 0x1f, 0xb2,
-        0x05, 0x76, 0xdf, 0x84, 0x3c, 0xb9, 0x76, 0x9f, 0xed, 0x71, 0x88, 0x6d,
-        0x26, 0xf4, 0x8d, 0x6d, 0x70, 0x80, 0xd4, 0x19, 0x4d, 0xda, 0x69, 0x5d,
-        0xda, 0xe9, 0x00, 0x6c, 0x34, 0xb7, 0x0d, 0xd9, 0x36, 0x45, 0x1b, 0xf6,
-        0x1a, 0xf6, 0x70, 0x77, 0x3a, 0x35, 0xc1, 0xfe, 0x10, 0xbe, 0x7b, 0x86,
-        0x75, 0xf8, 0xdb, 0x43, 0x23, 0xd3, 0xc2, 0x07, 0xb0, 0xff, 0x80, 0x65,
-        0x66, 0x1b, 0xce, 0xb6, 0x1c, 0xfb, 0x2e, 0x62, 0xdd, 0x8a, 0xad, 0x64,
-        0x39, 0xf1, 0xe2, 0xc5, 0x38, 0xad, 0x21, 0xf5, 0xa4, 0x43, 0x6b, 0x35,
-        0xfe, 0xa8, 0x46, 0x2d, 0x4c, 0x63, 0xc6, 0x7f, 0x2b, 0x70, 0xe6, 0x7d,
-        0xfd, 0x4f, 0xe0, 0xcc, 0xeb, 0xd6, 0xe3, 0x4d, 0x7a, 0x6b, 0xfc, 0xac,
-        0xfe, 0xf0, 0x33, 0xa4, 0x37, 0xc7, 0xcf, 0xd2, 0xbf, 0x58, 0x74, 0x9f,
-        0x0e, 0x3f, 0xdb, 0xad, 0xc0, 0xcf, 0x16, 0xa1, 0xef, 0x53, 0x3a, 0x1d,
-        0x3c, 0x15, 0xc9, 0xfc, 0x2b, 0x45, 0x61, 0x3f, 0x76, 0xd0, 0xc8, 0x94,
-        0x42, 0x7a, 0x17, 0xb5, 0xc3, 0x7f, 0xf4, 0x37, 0x61, 0xfe, 0x5d, 0x44,
-        0x9b, 0x1d, 0xbf, 0xd9, 0x15, 0x1e, 0x05, 0xff, 0xd3, 0x2f, 0x7e, 0x05,
-        0xdf, 0x3c, 0x4d, 0x07, 0xa7, 0x0e, 0x2b, 0x39, 0xfb, 0x08, 0xe0, 0x97,
-        0x83, 0xd5, 0x01, 0x9b, 0x07, 0xec, 0x97, 0x31, 0xef, 0xd3, 0xa4, 0xdf,
-        0x1e, 0x19, 0x48, 0x28, 0xc0, 0xe3, 0x45, 0x01, 0x2f, 0x7d, 0x71, 0x97,
-        0xb1, 0x53, 0xf0, 0x3f, 0x40, 0xef, 0x15, 0x2f, 0x80, 0xbe, 0xbd, 0xf0,
-        0x39, 0x91, 0x67, 0x61, 0x93, 0xe1, 0x8f, 0x22, 0x57, 0x31, 0x2d, 0x7c,
-        0x11, 0x29, 0x0f, 0x76, 0xa7, 0x41, 0xef, 0x38, 0xfc, 0xd3, 0x00, 0xfc,
-        0x53, 0x0c, 0xbe, 0xa9, 0x07, 0x7e, 0xc9, 0x82, 0x5f, 0x0a, 0x83, 0x1f,
-        0x06, 0xcd, 0xc2, 0x47, 0xcd, 0x42, 0xfe, 0xe7, 0x66, 0x48, 0x19, 0x04,
-        0xad, 0xcf, 0xc1, 0x3f, 0x26, 0x63, 0x77, 0x42, 0xcf, 0x22, 0x17, 0x66,
-        0xd5, 0x41, 0xca, 0xc1, 0x9f, 0x77, 0x6e, 0x8b, 0x62, 0xbd, 0x26, 0x4a,
-        0x84, 0x5c, 0x1d, 0xe5, 0xdf, 0x7e, 0x85, 0xac, 0x7f, 0x06, 0xef, 0x22,
-        0x61, 0xa2, 0x3d, 0x94, 0xb5, 0xa3, 0x46, 0xa7, 0xda, 0x03, 0x18, 0x6e,
-        0x87, 0x95, 0x03, 0x53, 0x11, 0x05, 0xfb, 0x03, 0xcd, 0x27, 0x60, 0xeb,
-        0xcb, 0x34, 0x1e, 0x63, 0x3d, 0x29, 0xd3, 0xf3, 0xb1, 0xc8, 0x40, 0x9e,
-        0x5a, 0xe9, 0x98, 0x39, 0x21, 0x7c, 0xbc, 0x16, 0x3f, 0x21, 0x74, 0x2c,
-        0x67, 0xe1, 0x59, 0xec, 0x54, 0xb2, 0x53, 0xbc, 0x7e, 0x14, 0x5a, 0xee,
-        0xc7, 0x93, 0xe7, 0x07, 0xdd, 0xfa, 0x49, 0x39, 0xd8, 0x9d, 0x87, 0x77,
-        0x88, 0x18, 0x8b, 0x58, 0x39, 0x35, 0x11, 0x0d, 0x45, 0x55, 0x8d, 0x86,
-        0x35, 0x85, 0x46, 0x61, 0x6f, 0xd2, 0xb1, 0xff, 0x2c, 0x1f, 0x33, 0x79,
-        0xbc, 0x99, 0xbe, 0x2a, 0xfc, 0x0d, 0xd6, 0x2e, 0x4c, 0x63, 0x5d, 0x3f,
-        0xf8, 0xcb, 0xeb, 0xf2, 0x3c, 0x68, 0xc3, 0xf6, 0x6b, 0x56, 0xe4, 0xd9,
-        0x3c, 0xed, 0x00, 0x6d, 0xd9, 0x66, 0xc1, 0x3e, 0x0c, 0x60, 0xed, 0x5e,
-        0xd8, 0x4f, 0x3c, 0x93, 0xbd, 0x1c, 0x07, 0x05, 0x68, 0xd8, 0x64, 0x79,
-        0xd4, 0xe5, 0x98, 0xe9, 0x19, 0xf3, 0xcb, 0xb1, 0x20, 0xfe, 0xe0, 0x7f,
-        0x4d, 0x96, 0x19, 0x6e, 0x73, 0x4c, 0xc6, 0x34, 0x09, 0xd3, 0xdc, 0x64,
-        0x02, 0x34, 0x8b, 0x9c, 0x4d, 0x10, 0xd3, 0x0c, 0x46, 0x7b, 0x7f, 0x82,
-        0xbe, 0x64, 0xaf, 0xf7, 0x3b, 0xb6, 0xb0, 0x55, 0x49, 0xc1, 0x17, 0xa8,
-        0x56, 0x0b, 0x7c, 0x45, 0x98, 0x5e, 0x15, 0xb0, 0x64, 0xa8, 0xf1, 0x68,
-        0xe8, 0x4b, 0x74, 0xab, 0xb0, 0x11, 0x09, 0xc3, 0x4b, 0xe3, 0xff, 0x52,
-        0xc9, 0x72, 0xbf, 0x69, 0xa5, 0xec, 0x20, 0xf3, 0x89, 0xd7, 0x33, 0x68,
-        0xae, 0xe4, 0xbc, 0xfb, 0x10, 0xa3, 0x16, 0x60, 0x6b, 0xce, 0x4f, 0xaa,
-        0xf4, 0xf8, 0x1d, 0xf0, 0x65, 0xb1, 0x6d, 0x58, 0xcb, 0xc4, 0x78, 0x1e,
-        0x6d, 0x15, 0x6d, 0xe8, 0x99, 0x11, 0x02, 0x8f, 0xb9, 0x9f, 0xe1, 0x4c,
-        0xfc, 0xbd, 0xcf, 0xb1, 0x75, 0x3e, 0xab, 0xde, 0x4a, 0x14, 0x64, 0x7a,
-        0xc5, 0x40, 0x2b, 0xcb, 0x50, 0xd5, 0x6d, 0xc2, 0x5f, 0x3b, 0xb6, 0xc4,
-        0x82, 0x2e, 0xc2, 0xe6, 0xf6, 0x79, 0x75, 0x91, 0xe3, 0x09, 0x57, 0x17,
-        0x23, 0xa1, 0x84, 0x0a, 0x5b, 0xdc, 0xa7, 0xd1, 0x09, 0xd1, 0x56, 0x28,
-        0x31, 0x18, 0x09, 0x2d, 0xa8, 0x1c, 0x4b, 0x33, 0x6c, 0x18, 0xf1, 0x4a,
-        0x40, 0xc2, 0x22, 0x9e, 0xb3, 0xdd, 0x98, 0x30, 0x84, 0x7e, 0x53, 0xf4,
-        0x1f, 0xab, 0xe8, 0xa8, 0x13, 0xff, 0xa9, 0x88, 0x11, 0x0b, 0x88, 0x11,
-        0x53, 0x42, 0x47, 0x8d, 0x04, 0x72, 0x04, 0xd0, 0xdc, 0xd1, 0xcf, 0x42,
-        0x91, 0x71, 0xc9, 0xb1, 0x5c, 0x0e, 0x00, 0x99, 0x13, 0x8e, 0x7d, 0xa4,
-        0x3c, 0xc7, 0x91, 0xa3, 0xea, 0x53, 0x34, 0x5c, 0x60, 0x3f, 0x8e, 0x3f,
-        0x9b, 0x6d, 0x2d, 0xec, 0xa3, 0xf0, 0xc5, 0x51, 0xf0, 0x39, 0x0f, 0x1a,
-        0xac, 0x97, 0x74, 0xdd, 0x4f, 0x07, 0xec, 0x3d, 0xa0, 0x79, 0x9c, 0x46,
-        0x4e, 0x8d, 0xb0, 0xcc, 0xf6, 0x14, 0x28, 0xd2, 0x73, 0x8c, 0xb6, 0x1b,
-        0x73, 0x2c, 0xdf, 0x83, 0xe5, 0x1d, 0xe0, 0x85, 0xd0, 0x51, 0xc8, 0x20,
-        0x65, 0x0b, 0x23, 0xf4, 0x58, 0x89, 0xfb, 0xf2, 0xa0, 0x1d, 0xe2, 0xda,
-        0xfe, 0xfd, 0x52, 0xce, 0x31, 0x9f, 0xe6, 0xce, 0x37, 0x22, 0xe7, 0x63,
-        0x38, 0x86, 0xe1, 0x6f, 0xaa, 0xf3, 0xee, 0x14, 0x3c, 0x8d, 0x18, 0x5d,
-        0x6a, 0x79, 0x87, 0x1f, 0xe3, 0xcf, 0xf7, 0xf3, 0x3b, 0xe6, 0x81, 0xef,
-        0x6f, 0xb6, 0xf6, 0x00, 0x76, 0x10, 0x73, 0xfa, 0xa9, 0xb3, 0xdd, 0xc5,
-        0x37, 0x81, 0xb5, 0xd9, 0xcf, 0x31, 0x9f, 0x1f, 0xa1, 0xec, 0xa9, 0x7c,
-        0x8f, 0x0a, 0x19, 0x9b, 0xcd, 0x28, 0xe4, 0xb7, 0x1e, 0xa6, 0xdc, 0xa9,
-        0xa3, 0x6c, 0x37, 0x40, 0xab, 0x3d, 0xb4, 0x6b, 0x22, 0xd2, 0x73, 0x80,
-        0x34, 0xb1, 0xce, 0x5b, 0x24, 0xe8, 0x1f, 0x9b, 0x15, 0xbe, 0x20, 0x43,
-        0xe9, 0x89, 0xed, 0xa1, 0x4b, 0xe8, 0x1b, 0x1e, 0x8c, 0x84, 0x17, 0xe8,
-        0x09, 0xd0, 0xe5, 0x23, 0xf8, 0x22, 0xab, 0x67, 0x0c, 0x3a, 0x84, 0x9c,
-        0x0a, 0xeb, 0x8f, 0x4a, 0xda, 0xe0, 0xbb, 0xcc, 0x51, 0xd0, 0x8f, 0xf2,
-        0x0e, 0x4d, 0x99, 0x9e, 0x4c, 0xcb, 0xaf, 0xc0, 0xf6, 0x1c, 0x11, 0xb1,
-        0x4b, 0x56, 0xd0, 0xee, 0xd2, 0x06, 0x47, 0x0e, 0x60, 0x8b, 0x30, 0xef,
-        0xe5, 0x41, 0x85, 0xb6, 0x20, 0x4e, 0x3f, 0x24, 0x78, 0xeb, 0xa3, 0x7d,
-        0x66, 0xd4, 0xd8, 0x47, 0xf3, 0x7e, 0x27, 0x56, 0xc0, 0x3c, 0x3d, 0xf7,
-        0x60, 0x0f, 0x90, 0x53, 0xfb, 0xeb, 0xeb, 0xa8, 0x2d, 0x12, 0x4e, 0xa8,
-        0x09, 0xfa, 0x93, 0xd2, 0xdd, 0xe4, 0xe8, 0x77, 0x2b, 0xdb, 0x7e, 0xf0,
-        0xb0, 0xd3, 0x69, 0x5b, 0x78, 0x16, 0x3a, 0xb1, 0x1e, 0xe3, 0xfe, 0xac,
-        0xc0, 0x7d, 0x84, 0xba, 0xa1, 0x6b, 0x22, 0x8f, 0x39, 0x51, 0x8b, 0x17,
-        0xf3, 0xbc, 0x9e, 0xcf, 0x5f, 0xc6, 0x3c, 0xdc, 0xcf, 0x70, 0x78, 0x2f,
-        0x3c, 0x41, 0x23, 0x90, 0xc7, 0x5c, 0x7f, 0x57, 0x68, 0x0c, 0xdf, 0xa4,
-        0x4a, 0x4d, 0x74, 0x54, 0xe3, 0xf1, 0x48, 0x38, 0xaf, 0x1e, 0x42, 0xdc,
-        0xf3, 0xb8, 0xea, 0xb7, 0x7e, 0xe6, 0x67, 0xbf, 0xe3, 0xb7, 0xae, 0x29,
-        0xd5, 0xb9, 0x10, 0x87, 0x8a, 0xdc, 0x60, 0x41, 0x19, 0x2c, 0x5d, 0x52,
-        0x92, 0x85, 0x6b, 0x4a, 0xaa, 0xc4, 0x30, 0x8e, 0xce, 0x67, 0xcf, 0x74,
-        0x82, 0x4e, 0x1f, 0x89, 0xef, 0xe6, 0x7a, 0x8f, 0x50, 0xea, 0xd4, 0xad,
-        0x94, 0x9e, 0xe6, 0xbc, 0x34, 0x02, 0x7c, 0x3f, 0x2a, 0xe7, 0x62, 0x41,
-        0xca, 0x9d, 0xe1, 0x31, 0xb6, 0x5f, 0xd6, 0xd5, 0x45, 0x1f, 0xef, 0x9f,
-        0xf9, 0x6f, 0x52, 0xc1, 0x7e, 0x53, 0xd2, 0x8f, 0xdf, 0x7d, 0x9c, 0x93,
-        0xe1, 0xf7, 0x6f, 0x86, 0xd3, 0xb7, 0x95, 0x16, 0x36, 0xdc, 0xc8, 0x3e,
-        0x57, 0xb3, 0xc7, 0x47, 0x7d, 0x7e, 0x6b, 0x7b, 0x13, 0xb5, 0x84, 0x80,
-        0xc3, 0x4a, 0x7b, 0x64, 0x98, 0x5f, 0x87, 0x1c, 0xb0, 0x4d, 0xd9, 0x0d,
-        0x7e, 0x5a, 0x6c, 0xc3, 0x60, 0x93, 0x76, 0x53, 0xae, 0xc4, 0xb2, 0x1d,
-        0x35, 0x32, 0x90, 0xb1, 0x34, 0x75, 0xb1, 0x1e, 0xb9, 0xba, 0x07, 0xdb,
-        0x9d, 0x87, 0xed, 0x46, 0x3c, 0x64, 0x53, 0xbe, 0x29, 0xce, 0x36, 0xbc,
-        0x0b, 0xb2, 0x85, 0xbe, 0x62, 0x55, 0x17, 0x77, 0x2d, 0xc1, 0x5d, 0x5b,
-        0xc2, 0xa3, 0x02, 0xd5, 0xe2, 0x3f, 0x4b, 0x8c, 0xff, 0x5f, 0x00, 0xff,
-        0xcf, 0x01, 0x7f, 0xc6, 0xa9, 0x31, 0xfe, 0x3b, 0x2b, 0xf8, 0x33, 0x0c,
-        0xfc, 0x1c, 0x64, 0xf1, 0x0d, 0xe8, 0xe2, 0x6b, 0x36, 0x7c, 0x9d, 0x0d,
-        0xff, 0x67, 0xc3, 0xdf, 0xd9, 0xf0, 0x8b, 0x36, 0x7c, 0x1e, 0xf6, 0x74,
-        0x0e, 0x36, 0xe9, 0xac, 0x9d, 0x34, 0x58, 0x9f, 0x92, 0x31, 0xf6, 0x9d,
-        0xbb, 0x65, 0xde, 0x1d, 0x92, 0x71, 0xf7, 0xa7, 0x64, 0x2c, 0x7b, 0x00,
-        0xb1, 0xec, 0x66, 0x1a, 0xed, 0xe1, 0x9c, 0xa4, 0x05, 0xcf, 0x75, 0x78,
-        0x22, 0x6e, 0xed, 0x49, 0x48, 0xbd, 0xfc, 0x0c, 0x62, 0x5c, 0xd8, 0xff,
-        0x1e, 0xe4, 0x37, 0x19, 0xc4, 0x6a, 0x56, 0x1f, 0xc7, 0xe5, 0xb0, 0x65,
-        0xef, 0x37, 0x39, 0x76, 0xfe, 0x2e, 0x19, 0x03, 0xbb, 0xed, 0x56, 0xc0,
-        0xa4, 0xd1, 0xd7, 0x8a, 0x6f, 0x7e, 0x07, 0xb2, 0xdf, 0x86, 0xf6, 0xce,
-        0x3a, 0x18, 0xe4, 0xb3, 0x56, 0x16, 0x7d, 0x11, 0xc0, 0xb4, 0x61, 0x9d,
-        0x0e, 0xb4, 0xf7, 0xa0, 0x7d, 0x8b, 0xb3, 0x8e, 0xf1, 0x2b, 0x68, 0xa7,
-        0xea, 0xbe, 0xd9, 0x8a, 0xbe, 0x4c, 0x5d, 0xdf, 0x9b, 0xe8, 0x4b, 0xa2,
-        0x6f, 0x51, 0x7e, 0x97, 0x47, 0x3b, 0x52, 0x07, 0xb3, 0x88, 0x3e, 0xc6,
-        0xf1, 0x5b, 0x78, 0xde, 0x47, 0xa3, 0x19, 0x8e, 0x03, 0xdc, 0xb1, 0xdc,
-        0x7a, 0x6a, 0xe3, 0xdc, 0xf7, 0x43, 0x21, 0x3b, 0xf3, 0xd2, 0x46, 0xa7,
-        0x27, 0xd8, 0x4f, 0x8c, 0x20, 0xee, 0xe1, 0x71, 0xe1, 0x9c, 0x3c, 0xfd,
-        0x1f, 0x00, 0xf6, 0x61, 0x8c, 0x21, 0x56, 0xb7, 0xcb, 0x4d, 0x8d, 0xc7,
-        0x1f, 0xc5, 0xf8, 0x5f, 0xca, 0x6f, 0x2b, 0x73, 0x03, 0xfe, 0x1b, 0x75,
-        0x7d, 0x6a, 0xb0, 0xb6, 0xbd, 0xd6, 0xf3, 0xbe, 0x4d, 0x5f, 0xfa, 0xfd,
-        0x48, 0x1d, 0xfc, 0xef, 0x6e, 0xa8, 0x6d, 0x3f, 0xc5, 0xdf, 0x20, 0x87,
-        0x70, 0xdb, 0x09, 0xc8, 0x1d, 0xdb, 0xa4, 0xfa, 0x79, 0x3e, 0x6b, 0xd4,
-        0xf6, 0x6d, 0x32, 0x6b, 0xdb, 0x1c, 0x27, 0x31, 0x5c, 0x08, 0xf2, 0xde,
-        0xa1, 0xec, 0xb2, 0x7f, 0x13, 0xe3, 0x61, 0xe5, 0x5e, 0xdb, 0x8b, 0x67,
-        0x48, 0xe6, 0x46, 0xe1, 0x4a, 0xcc, 0x3b, 0x5f, 0x0a, 0x40, 0xae, 0x3e,
-        0x0f, 0x9e, 0x73, 0xdc, 0x53, 0xd5, 0xf1, 0xf7, 0x68, 0x39, 0x1d, 0x67,
-        0x1f, 0xc0, 0x31, 0xfe, 0x36, 0x11, 0x1f, 0xfb, 0xe2, 0x4f, 0x70, 0x0c,
-        0xf6, 0xb4, 0xe3, 0x5b, 0x2c, 0xf8, 0x43, 0xb4, 0x4b, 0x7e, 0xc7, 0x6e,
-        0x22, 0x9f, 0xc8, 0x16, 0xd8, 0x9f, 0xb1, 0x0f, 0x89, 0xc0, 0x4e, 0xb3,
-        0x1f, 0xfd, 0x24, 0x7d, 0xc6, 0x5d, 0xcd, 0x6c, 0xfb, 0x34, 0xeb, 0x05,
-        0xc4, 0x0b, 0x1c, 0xe7, 0xb1, 0xed, 0xc6, 0x7b, 0xd1, 0x8d, 0x57, 0xee,
-        0xd7, 0xc8, 0xaa, 0xfa, 0x11, 0x67, 0x8f, 0x5b, 0x59, 0x37, 0x56, 0xb1,
-        0xef, 0xc6, 0xb6, 0xed, 0xc7, 0x75, 0xb6, 0xe1, 0xb2, 0xb0, 0x0d, 0x0f,
-        0x6a, 0x7e, 0xeb, 0xf7, 0x9b, 0x1d, 0x79, 0x6d, 0x6c, 0x1b, 0xee, 0xad,
-        0xd8, 0x06, 0x57, 0x5e, 0xbd, 0x79, 0xeb, 0x0f, 0xc0, 0x1b, 0x0b, 0xbc,
-        0xa9, 0xaf, 0xd5, 0x70, 0x8e, 0xe2, 0x87, 0x1f, 0xe2, 0x18, 0x91, 0x73,
-        0xd9, 0x18, 0xe5, 0x62, 0x45, 0xc4, 0x6a, 0x91, 0xd9, 0xd9, 0x4a, 0x8e,
-        0xf5, 0x35, 0x69, 0xbb, 0x6b, 0xe2, 0x22, 0x7a, 0xbc, 0x78, 0x09, 0xf8,
-        0x73, 0xbc, 0xa5, 0x49, 0x1b, 0xc1, 0xfd, 0xe3, 0x12, 0x47, 0x7e, 0xe7,
-        0x3a, 0x1e, 0x7c, 0x69, 0xf1, 0x47, 0xe0, 0x15, 0xc7, 0x7d, 0x51, 0x27,
-        0xde, 0xab, 0x89, 0xa9, 0xd7, 0xf8, 0xc9, 0xe2, 0x78, 0x89, 0x61, 0x74,
-        0x19, 0x2f, 0x05, 0x64, 0x5e, 0x63, 0xc8, 0x3c, 0x87, 0x63, 0x6d, 0xae,
-        0xb1, 0xd6, 0xc7, 0x50, 0x0b, 0x43, 0xc1, 0x6d, 0xcc, 0x13, 0x8e, 0xa1,
-        0xda, 0x28, 0x39, 0xe3, 0xc4, 0x50, 0x4e, 0x9d, 0xcd, 0xcd, 0x71, 0x5c,
-        0x5c, 0xd9, 0x0f, 0xef, 0xc0, 0x3e, 0x45, 0x9e, 0x14, 0x74, 0xea, 0x7f,
-        0x1a, 0xec, 0xf6, 0x51, 0xf4, 0x8f, 0xba, 0xfd, 0x9e, 0x5c, 0xc3, 0xc5,
-        0x85, 0x7d, 0xbd, 0x1b, 0xd3, 0xed, 0x96, 0x31, 0x1d, 0x62, 0x18, 0xdb,
-        0xc9, 0xbb, 0xf6, 0x16, 0x33, 0xe8, 0xe3, 0x75, 0x11, 0x1b, 0x12, 0xc7,
-        0x49, 0x90, 0xaf, 0xfd, 0x91, 0x50, 0x58, 0xad, 0xc7, 0xab, 0x75, 0xa1,
-        0x16, 0xaf, 0x41, 0xf1, 0xdd, 0xf8, 0x92, 0xef, 0x48, 0xc4, 0x92, 0xe3,
-        0xf6, 0x10, 0xe8, 0xc5, 0xf8, 0xb9, 0xba, 0xe1, 0xc6, 0xc9, 0x8c, 0xd3,
-        0x3f, 0x82, 0xc6, 0xbb, 0x15, 0xfe, 0x7e, 0xcc, 0xde, 0x2f, 0xe8, 0x96,
-        0x15, 0xb8, 0x0e, 0x7b, 0x70, 0x1d, 0x91, 0xb8, 0xb2, 0x2e, 0xb0, 0x7e,
-        0x78, 0x6b, 0x9a, 0xa6, 0xd8, 0x1b, 0x70, 0x0e, 0xf3, 0xb9, 0xb9, 0x6a,
-        0x2d, 0x0c, 0xf9, 0xb6, 0xc1, 0x1f, 0x02, 0xd7, 0xac, 0x88, 0x43, 0x03,
-        0x0b, 0xf5, 0x34, 0x1c, 0xc7, 0x5a, 0x88, 0xdb, 0x81, 0x8f, 0xcb, 0xf3,
-        0x26, 0x89, 0xcf, 0x37, 0xc5, 0xdc, 0x63, 0xa2, 0x06, 0xea, 0xd3, 0x39,
-        0x77, 0xc9, 0x0a, 0xde, 0x69, 0x92, 0x77, 0x8f, 0x56, 0xf0, 0x73, 0x78,
-        0x1c, 0x90, 0x74, 0xe5, 0xdc, 0x95, 0x75, 0x5a, 0xf0, 0xa7, 0x9d, 0x73,
-        0xd3, 0x41, 0x6a, 0x14, 0x23, 0x2f, 0x0c, 0xa9, 0xdb, 0x1c, 0x3a, 0x3a,
-        0x31, 0xf2, 0xda, 0xba, 0x18, 0xf9, 0xb6, 0x20, 0xc7, 0x5a, 0xc3, 0x50,
-        0x82, 0x79, 0xf8, 0xba, 0x97, 0x6d, 0xc8, 0x36, 0x70, 0x3d, 0x5f, 0x53,
-        0xbb, 0xec, 0x59, 0xa6, 0xd6, 0x1c, 0x20, 0xdf, 0x0c, 0xfb, 0x0e, 0x0b,
-        0x79, 0x06, 0x91, 0x36, 0xc9, 0x3a, 0xcb, 0xbe, 0xbd, 0x1a, 0x67, 0xcf,
-        0x51, 0xa3, 0x18, 0xfb, 0x46, 0xfd, 0xfa, 0x79, 0xbf, 0xdf, 0x3a, 0xac,
-        0x3b, 0x36, 0x73, 0x25, 0xbf, 0xee, 0xc2, 0xed, 0x41, 0x9c, 0xad, 0x50,
-        0x93, 0x55, 0xc0, 0xfe, 0xde, 0xf0, 0x37, 0x5b, 0xae, 0x2e, 0x06, 0x68,
-        0xfd, 0xcc, 0x2d, 0x42, 0x1f, 0x8d, 0xc9, 0xaa, 0x3e, 0x8e, 0x82, 0x37,
-        0x19, 0xa7, 0x06, 0x60, 0xae, 0xa7, 0xeb, 0xd7, 0x0b, 0xc6, 0xed, 0x37,
-        0xfd, 0xaa, 0xe5, 0xca, 0xc0, 0xf5, 0xf2, 0x91, 0x4f, 0xd5, 0xd1, 0xba,
-        0x51, 0x4d, 0xf8, 0x2c, 0xe8, 0x1a, 0x47, 0xde, 0x1d, 0x79, 0x81, 0x10,
-        0x3b, 0x39, 0x79, 0x78, 0x1a, 0xb9, 0x77, 0xe4, 0x02, 0xe7, 0xe3, 0x6e,
-        0x7e, 0xfe, 0x6a, 0x29, 0x72, 0x36, 0x8f, 0x9c, 0x79, 0x1e, 0x39, 0xf9,
-        0xcb, 0xc8, 0xc9, 0xcf, 0x97, 0x7a, 0x41, 0xff, 0x1e, 0x99, 0x8f, 0xb3,
-        0x8e, 0x99, 0x74, 0x11, 0xb9, 0xd3, 0x77, 0x67, 0xd8, 0x46, 0x74, 0xd1,
-        0x3d, 0xc8, 0x35, 0xbe, 0x3f, 0xa9, 0x68, 0x9d, 0x7d, 0x01, 0x5f, 0xc2,
-        0xb8, 0x91, 0x38, 0x71, 0x29, 0x4f, 0x1a, 0xc7, 0x8a, 0x23, 0x4d, 0x7e,
-        0x6b, 0xae, 0x95, 0x5a, 0xf6, 0x2c, 0xcb, 0x93, 0x6a, 0xac, 0xe8, 0xc2,
-        0x19, 0xd4, 0xd9, 0xf7, 0x87, 0x9c, 0xdb, 0xc4, 0x48, 0xe4, 0xd3, 0xeb,
-        0xe8, 0xed, 0x93, 0x65, 0xda, 0x19, 0xbb, 0x56, 0xbe, 0x68, 0xad, 0xa3,
-        0x6c, 0xef, 0x43, 0x32, 0x97, 0x5c, 0x78, 0x28, 0x69, 0xe5, 0x43, 0x3e,
-        0xf7, 0x7c, 0x62, 0x42, 0x47, 0x84, 0xc8, 0xbf, 0x20, 0xcd, 0x0d, 0x20,
-        0x71, 0x6e, 0xd9, 0xfe, 0x02, 0x1f, 0x10, 0xb1, 0x6d, 0x9c, 0x33, 0x03,
-        0xa2, 0xd6, 0xb6, 0xd1, 0xe2, 0x7e, 0x03, 0xfc, 0xbe, 0x8f, 0xe6, 0x90,
-        0x43, 0x14, 0x44, 0x1e, 0xde, 0x0e, 0x78, 0x37, 0x0f, 0xbf, 0x1f, 0xb9,
-        0x01, 0xd3, 0xd8, 0x04, 0xfc, 0x6f, 0x03, 0xc6, 0x6b, 0x43, 0x9f, 0x6b,
-        0x22, 0xf1, 0x3d, 0x8f, 0xb7, 0x13, 0xd7, 0x65, 0xab, 0xf3, 0xf2, 0x9c,
-        0x3c, 0xf6, 0x61, 0xf9, 0xf6, 0xbe, 0x3e, 0xcf, 0xdc, 0x6d, 0x9e, 0xb9,
-        0xef, 0xf0, 0xcc, 0xed, 0xc3, 0xb7, 0x2e, 0x3e, 0x41, 0x7c, 0xeb, 0xae,
-        0xf1, 0xb7, 0x9e, 0x35, 0x5c, 0xdc, 0xdb, 0x3d, 0xb8, 0xbf, 0x8f, 0xf9,
-        0xb9, 0xcf, 0xf4, 0xf4, 0xf1, 0x9a, 0x1b, 0x68, 0x6e, 0xb0, 0x8d, 0x16,
-        0x4f, 0x72, 0x5f, 0xd0, 0x83, 0x0b, 0xe3, 0x17, 0x90, 0x63, 0x6d, 0x74,
-        0xf1, 0x64, 0x8b, 0xc0, 0x9b, 0xfd, 0xf9, 0xc6, 0xca, 0x9a, 0x57, 0xb0,
-        0xa6, 0x3b, 0x97, 0x89, 0x6f, 0x19, 0x96, 0xf1, 0xe3, 0x31, 0xee, 0xe3,
-        0xb1, 0x37, 0xcb, 0x5f, 0x33, 0x82, 0xce, 0x9e, 0x0d, 0xc6, 0xcd, 0xfd,
-        0x56, 0x6b, 0x26, 0x8b, 0xdb, 0x9d, 0x34, 0x1b, 0xd4, 0xc0, 0x37, 0x55,
-        0xfa, 0x28, 0xae, 0x23, 0xa8, 0x4a, 0xb4, 0x8f, 0xf9, 0xbc, 0x4e, 0xd6,
-        0xaf, 0x5b, 0x30, 0x6f, 0xd8, 0xcd, 0xd1, 0x88, 0xe5, 0x38, 0x27, 0xec,
-        0xbe, 0x26, 0xc7, 0xd9, 0xee, 0xb3, 0xdf, 0xc7, 0x53, 0xc8, 0xaa, 0x3c,
-        0xaf, 0x29, 0xed, 0xa0, 0x83, 0x50, 0xcf, 0x8b, 0xb2, 0x9e, 0xb2, 0xe8,
-        0xad, 0x99, 0x18, 0x4e, 0x1c, 0xe3, 0x9c, 0xed, 0xac, 0x85, 0xfe, 0xe0,
-        0xbd, 0x98, 0x00, 0x1e, 0x61, 0x8a, 0xe2, 0xaf, 0x50, 0xca, 0xe3, 0x69,
-        0xe1, 0xa9, 0xe0, 0xc9, 0xf5, 0x0c, 0x1d, 0x4f, 0xe8, 0x18, 0xec, 0x53,
-        0xb4, 0xef, 0x92, 0x93, 0x3f, 0x41, 0x37, 0xde, 0x9e, 0x74, 0xea, 0x51,
-        0x8b, 0xd6, 0x72, 0xf5, 0xa8, 0x3f, 0x67, 0x9e, 0x9c, 0x70, 0xeb, 0x51,
-        0x8b, 0x24, 0xea, 0x51, 0x27, 0x56, 0xa8, 0x47, 0x25, 0x56, 0x5f, 0x8f,
-        0xe2, 0xf9, 0x35, 0xda, 0xd7, 0x4f, 0xca, 0x17, 0x64, 0x3d, 0xea, 0x3d,
-        0x72, 0xea, 0x51, 0x17, 0xa9, 0x71, 0x3d, 0xea, 0x78, 0x5d, 0x3d, 0x2a,
-        0x28, 0xea, 0x51, 0x3c, 0x8f, 0x53, 0x8f, 0x12, 0xed, 0xbe, 0x88, 0xa7,
-        0xee, 0x42, 0xf4, 0xee, 0x64, 0x07, 0x68, 0x66, 0xd0, 0xf7, 0x1a, 0xda,
-        0x34, 0x45, 0xc8, 0xdb, 0x4a, 0x35, 0xd0, 0x07, 0x6e, 0xb8, 0xbe, 0xa2,
-        0xd0, 0x06, 0xcc, 0x9b, 0xec, 0x7b, 0xd8, 0x53, 0x63, 0x61, 0x9a, 0xff,
-        0x62, 0xea, 0x2c, 0x07, 0x45, 0x9d, 0xe5, 0x87, 0x6b, 0xbc, 0x75, 0x96,
-        0x45, 0xba, 0x7e, 0x9d, 0xe5, 0x60, 0x83, 0x3a, 0xcb, 0x5b, 0x54, 0xad,
-        0xb3, 0xbc, 0x45, 0xd5, 0x3a, 0xcb, 0xc1, 0x12, 0xe7, 0xe2, 0x3e, 0x89,
-        0x5f, 0x06, 0xed, 0x41, 0xf1, 0xc7, 0xb5, 0x97, 0xc5, 0xca, 0x1e, 0x7e,
-        0xd9, 0x6a, 0x2f, 0x6c, 0x03, 0x22, 0x17, 0x2e, 0xd7, 0xd4, 0x5e, 0xb8,
-        0x0d, 0x9d, 0xb1, 0xd7, 0x08, 0x19, 0x99, 0x83, 0x7f, 0x5f, 0x9c, 0x0c,
-        0x61, 0xce, 0x0e, 0xf8, 0x8c, 0x0e, 0xe4, 0x06, 0x61, 0xb4, 0x15, 0xda,
-        0x64, 0x0d, 0xa1, 0x8f, 0xc7, 0xd9, 0x0e, 0x43, 0xb7, 0x6c, 0x77, 0x7f,
-        0x0f, 0x48, 0x1a, 0x44, 0x68, 0xb8, 0x9d, 0xf4, 0x20, 0xfb, 0x8e, 0xc9,
-        0x3d, 0x74, 0xc8, 0xde, 0x22, 0xf6, 0xbd, 0xc1, 0xaa, 0x95, 0xb9, 0xc1,
-        0x1b, 0x90, 0xb9, 0xcc, 0xaa, 0x65, 0x8e, 0xe5, 0xcd, 0x39, 0xf7, 0xdd,
-        0x60, 0xf1, 0xfa, 0x1d, 0x02, 0xa7, 0x77, 0x1b, 0xc8, 0xfb, 0x18, 0xec,
-        0x8e, 0x33, 0xbf, 0x2e, 0xd7, 0xab, 0x8f, 0x87, 0x9f, 0x6d, 0x66, 0xff,
-        0xbd, 0x72, 0x3d, 0xb1, 0xde, 0x7f, 0xaf, 0xe4, 0x47, 0x15, 0x61, 0x93,
-        0xb3, 0x25, 0xae, 0xed, 0x7b, 0xf9, 0x33, 0x8f, 0x9c, 0x00, 0x7d, 0x42,
-        0x0f, 0x98, 0xae, 0x41, 0xf0, 0x01, 0xeb, 0xd8, 0x4f, 0xc9, 0x5a, 0x16,
-        0x9e, 0x05, 0x97, 0x7f, 0xad, 0xb0, 0x99, 0xee, 0x18, 0xdb, 0x01, 0x0b,
-        0xfe, 0x8f, 0xeb, 0x28, 0x7c, 0x8e, 0xca, 0xfd, 0x2e, 0x5f, 0xbb, 0x2e,
-        0xbc, 0xa7, 0x72, 0xbb, 0x5c, 0xce, 0x8a, 0x7a, 0x2d, 0xa9, 0x9d, 0x7d,
-        0xd3, 0x2d, 0x6c, 0x6b, 0xb6, 0x58, 0xae, 0xcc, 0x26, 0xf0, 0xce, 0x7c,
-        0x7d, 0x17, 0x36, 0x9c, 0xcf, 0xaa, 0xbf, 0x23, 0x6a, 0x04, 0x73, 0x36,
-        0xdb, 0x6b, 0x8e, 0x41, 0x7f, 0x0b, 0xb2, 0xc4, 0xef, 0x51, 0x71, 0x2e,
-        0x21, 0x6a, 0xf8, 0x83, 0xdc, 0x76, 0xed, 0x4a, 0x94, 0xed, 0x30, 0xf6,
-        0x5c, 0xa5, 0x31, 0xe2, 0x23, 0xc8, 0x0c, 0xc7, 0xb1, 0x0c, 0xe7, 0xc6,
-        0x9e, 0x9a, 0xa7, 0x66, 0xab, 0xcb, 0xb8, 0x88, 0x75, 0x39, 0x00, 0x9a,
-        0xed, 0x10, 0x31, 0xea, 0xb8, 0x5d, 0xa6, 0xea, 0x19, 0x3f, 0xd3, 0xdc,
-        0x39, 0xe7, 0x3f, 0x66, 0x2f, 0x47, 0xfb, 0xcd, 0x37, 0x48, 0x7b, 0x47,
-        0x1f, 0x6b, 0xe9, 0xae, 0x23, 0x7e, 0x71, 0xe9, 0xee, 0xfa, 0xa8, 0x49,
-        0x49, 0x83, 0xa8, 0xac, 0x2b, 0x7e, 0x5a, 0x9e, 0x29, 0xfd, 0x5f, 0xd8,
-        0xaf, 0xe2, 0xd9, 0xaf, 0xab, 0xbb, 0xfb, 0xe4, 0x7e, 0xc3, 0x75, 0xba,
-        0x1b, 0x97, 0x75, 0xb9, 0x5f, 0x84, 0xee, 0xba, 0x7b, 0xe2, 0xb5, 0xb7,
-        0x5c, 0x67, 0xdd, 0x67, 0x48, 0x8d, 0xaf, 0x14, 0x7b, 0xff, 0xb4, 0xf9,
-        0xe3, 0xc5, 0xde, 0x1f, 0x87, 0x9e, 0x5e, 0xbd, 0x65, 0x1a, 0xb6, 0x89,
-        0xb8, 0xc2, 0xd1, 0x1f, 0xd8, 0xe3, 0x82, 0x9f, 0x16, 0x1e, 0xd2, 0xe9,
-        0x9f, 0xee, 0xe4, 0xfa, 0xac, 0x26, 0x73, 0x7c, 0x6e, 0x7f, 0xb1, 0x95,
-        0x63, 0xab, 0x4d, 0xd6, 0x77, 0x44, 0x6e, 0x95, 0x57, 0x4d, 0x8f, 0x1f,
-        0x31, 0x30, 0xce, 0x63, 0x61, 0xba, 0x1c, 0xbc, 0x91, 0xb8, 0xbc, 0xcb,
-        0x58, 0xf4, 0xad, 0x26, 0x2e, 0xbf, 0x55, 0xf7, 0x5b, 0x7f, 0xdd, 0x7a,
-        0xbd, 0x3a, 0x47, 0x35, 0x2e, 0xe7, 0x7c, 0x3e, 0xe8, 0xd4, 0x18, 0x4c,
-        0x8e, 0xcf, 0xd7, 0x4a, 0x9e, 0xf0, 0x3b, 0x72, 0x11, 0x1b, 0x79, 0x08,
-        0x64, 0xfc, 0x55, 0xc8, 0xca, 0x2b, 0x36, 0xf2, 0x0e, 0x1b, 0xf9, 0x88,
-        0x8d, 0xdc, 0xc3, 0x46, 0xee, 0x61, 0xf7, 0xc8, 0x1c, 0x26, 0x23, 0xeb,
-        0x56, 0x7c, 0x46, 0xcb, 0xf9, 0x61, 0x5e, 0xc9, 0xd8, 0xe3, 0x7c, 0x1f,
-        0x41, 0x4d, 0xc6, 0x36, 0xca, 0x78, 0xf0, 0x38, 0xdf, 0x77, 0x28, 0xab,
-        0x71, 0xae, 0x45, 0x91, 0xaa, 0xc6, 0x6f, 0x87, 0x8f, 0xda, 0x0e, 0xbc,
-        0x9a, 0x79, 0xdc, 0xa7, 0xc6, 0x5b, 0x99, 0x76, 0x8a, 0x1a, 0x5f, 0x2b,
-        0xcf, 0x0d, 0x7a, 0x03, 0x0e, 0xfe, 0xdd, 0xdc, 0xd6, 0xd4, 0xf8, 0xdd,
-        0xec, 0xd3, 0xc2, 0xa4, 0xba, 0xfd, 0xb7, 0x07, 0x98, 0xae, 0xa4, 0xde,
-        0x16, 0xe0, 0xb8, 0x76, 0xde, 0xf6, 0x8b, 0x3b, 0x05, 0xc9, 0x18, 0xd7,
-        0xcc, 0xb8, 0x5d, 0xa5, 0xab, 0xba, 0x2c, 0x5d, 0xfd, 0x95, 0xfa, 0x3f,
-        0xd3, 0xd2, 0xc7, 0x70, 0xa2, 0x36, 0xc6, 0x34, 0x75, 0xe7, 0xe3, 0xf3,
-        0x66, 0x5e, 0x47, 0xdc, 0x63, 0xc0, 0xf3, 0x60, 0x33, 0xb5, 0x0d, 0x0e,
-        0xf9, 0x2d, 0xef, 0xba, 0x6c, 0x43, 0x76, 0x90, 0x37, 0xc7, 0x5a, 0x7e,
-        0xcd, 0xa8, 0x38, 0x1b, 0x49, 0xf6, 0x47, 0x85, 0xec, 0xb0, 0xac, 0x69,
-        0xe2, 0xce, 0xd5, 0x47, 0xe2, 0x1e, 0x09, 0xcb, 0x19, 0xcb, 0xf2, 0x78,
-        0x7f, 0x57, 0x58, 0x53, 0x5b, 0xb0, 0x46, 0x98, 0xd2, 0x25, 0x71, 0x56,
-        0x80, 0x7c, 0xe9, 0xdc, 0x3a, 0x6a, 0xfb, 0x07, 0xbd, 0x9a, 0xc7, 0x46,
-        0x9d, 0xb3, 0x7a, 0xbb, 0xde, 0xff, 0x8d, 0x8a, 0x73, 0x65, 0xc7, 0x06,
-        0xb9, 0xe7, 0xc3, 0xab, 0x3b, 0xff, 0xbe, 0xbe, 0x3e, 0xb5, 0xd4, 0xd7,
-        0x0d, 0x24, 0x0d, 0x98, 0x36, 0x8d, 0xcf, 0xee, 0xe7, 0x4b, 0x7c, 0xaf,
-        0x25, 0x12, 0xe3, 0xdc, 0x6d, 0x44, 0xdc, 0xf9, 0x50, 0x21, 0x85, 0x3a,
-        0x8d, 0x19, 0x9c, 0xf3, 0x85, 0x86, 0x7d, 0x71, 0xca, 0x64, 0x27, 0x48,
-        0x43, 0xac, 0x98, 0xa9, 0xd6, 0x03, 0x1f, 0x5c, 0x43, 0x96, 0x2b, 0x97,
-        0x51, 0xce, 0x1f, 0x6a, 0xce, 0xed, 0x16, 0xe9, 0xb0, 0x72, 0xa0, 0x74,
-        0x84, 0x0e, 0x34, 0x8c, 0x29, 0x1b, 0xd7, 0x03, 0x2f, 0xd6, 0xd5, 0x14,
-        0x16, 0x44, 0x4d, 0x21, 0xb7, 0xc6, 0x6f, 0x3d, 0x19, 0x70, 0xee, 0xb5,
-        0x34, 0xd6, 0x93, 0x5d, 0x15, 0x3d, 0x71, 0xe1, 0xf8, 0x2c, 0xbe, 0x8d,
-        0x76, 0x8a, 0xb5, 0x0e, 0x2b, 0x59, 0xbb, 0x95, 0x76, 0x1a, 0x0e, 0xd6,
-        0xa3, 0x36, 0xe3, 0x75, 0x58, 0x39, 0x68, 0xe7, 0x95, 0xb4, 0xa8, 0x3d,
-        0x70, 0x8c, 0xbf, 0xe6, 0xda, 0x30, 0x95, 0xe9, 0xed, 0x98, 0xfb, 0x3d,
-        0xc3, 0x78, 0x6b, 0x8a, 0x2e, 0x9d, 0xf8, 0x2e, 0x51, 0x58, 0xe6, 0x6f,
-        0xce, 0x7c, 0xb9, 0x29, 0xae, 0x25, 0xde, 0x8f, 0xfd, 0x33, 0xfc, 0x6e,
-        0x25, 0x39, 0x55, 0x2e, 0xa7, 0x31, 0x3e, 0xd6, 0x7b, 0xaf, 0xc8, 0x8d,
-        0xd4, 0x38, 0x0d, 0x71, 0x8e, 0xac, 0x2d, 0xc9, 0x91, 0xd3, 0xd0, 0x35,
-        0xc4, 0x20, 0x76, 0x13, 0xbe, 0x75, 0xe3, 0x91, 0xcf, 0xae, 0x75, 0x64,
-        0xe4, 0xbb, 0x12, 0x0f, 0x1e, 0xff, 0xfb, 0x80, 0x7b, 0x0f, 0x28, 0x77,
-        0x2a, 0x8d, 0xfd, 0x37, 0x51, 0xca, 0x74, 0xf2, 0xbb, 0xec, 0x99, 0x23,
-        0x1b, 0x6a, 0xe1, 0xd1, 0x77, 0xca, 0x85, 0x0f, 0xd6, 0xc1, 0xf3, 0x19,
-        0xd7, 0x5f, 0xd5, 0xc1, 0x07, 0x3d, 0xf0, 0x66, 0x1d, 0x3c, 0xe2, 0xae,
-        0x33, 0xdf, 0xa8, 0x83, 0x37, 0x3d, 0xf0, 0xed, 0x75, 0xf0, 0xed, 0x80,
-        0x7f, 0xa3, 0x0e, 0x1e, 0x7d, 0xa7, 0x90, 0x13, 0x08, 0xda, 0x70, 0x8c,
-        0x74, 0x48, 0xe6, 0x89, 0x78, 0x2e, 0xb9, 0x1f, 0xc9, 0xf2, 0xd3, 0x01,
-        0x1a, 0x7b, 0xeb, 0xb5, 0x09, 0xd8, 0xa8, 0xaa, 0x4c, 0x39, 0xfa, 0xea,
-        0x95, 0x25, 0x96, 0xbd, 0x3c, 0xe4, 0x15, 0x7a, 0x54, 0x80, 0x3e, 0x15,
-        0x5c, 0x5f, 0xca, 0x77, 0xaa, 0x22, 0xc7, 0x1d, 0x3d, 0x56, 0x68, 0xbd,
-        0x35, 0x2f, 0x73, 0x91, 0xab, 0x8c, 0x3b, 0xfc, 0x86, 0xeb, 0x3b, 0xe8,
-        0x84, 0x63, 0x57, 0x58, 0xbf, 0x79, 0x7e, 0x69, 0x5f, 0x4a, 0x2c, 0x87,
-        0xce, 0x3a, 0xe9, 0x25, 0x32, 0x1b, 0x5e, 0x52, 0x77, 0xf1, 0xd5, 0xd9,
-        0x77, 0x12, 0xf6, 0x3d, 0xd7, 0xe2, 0xb7, 0x36, 0xac, 0xbd, 0x9e, 0x7d,
-        0xcf, 0x78, 0xec, 0x7b, 0x38, 0x58, 0xf5, 0xf9, 0x8f, 0x09, 0x9f, 0xdf,
-        0xd1, 0xc0, 0x66, 0xac, 0xde, 0xe7, 0xef, 0xfd, 0xd8, 0x3e, 0x7f, 0xb9,
-        0x75, 0x57, 0xe3, 0xf3, 0x1f, 0x69, 0xf9, 0x78, 0x3e, 0x9f, 0xd7, 0xac,
-        0xaf, 0x65, 0x7a, 0xcf, 0x59, 0x8e, 0xca, 0x18, 0x7b, 0xb7, 0x27, 0xc6,
-        0x66, 0xfc, 0xbe, 0x27, 0xef, 0x02, 0x9e, 0x5e, 0xeb, 0xc8, 0xdb, 0x51,
-        0x19, 0xa7, 0x73, 0xec, 0x8d, 0xf7, 0xc2, 0x23, 0x90, 0xd1, 0x7c, 0x8f,
-        0x8f, 0x54, 0x9a, 0x35, 0x9d, 0xb3, 0xed, 0x9f, 0x6f, 0xae, 0x17, 0xa1,
-        0xcb, 0xc2, 0x9f, 0x24, 0x3e, 0x81, 0x5a, 0xea, 0x49, 0xc8, 0x8f, 0xbb,
-        0xaf, 0x95, 0x6a, 0xa9, 0xf5, 0xe7, 0x1f, 0x7c, 0xee, 0x41, 0xca, 0x03,
-        0x95, 0x73, 0x10, 0xaf, 0x4e, 0xe9, 0x94, 0x9d, 0x21, 0xdd, 0x8c, 0x93,
-        0xb2, 0x8f, 0x71, 0x8e, 0xfd, 0xb0, 0x52, 0x6f, 0x3f, 0x24, 0x6b, 0x30,
-        0xea, 0xb2, 0x77, 0x82, 0x7e, 0x02, 0x7c, 0x58, 0xaf, 0x9c, 0x1a, 0x8c,
-        0xea, 0xdc, 0x09, 0x3a, 0xfe, 0xf3, 0xbb, 0x13, 0xc4, 0xf3, 0x6b, 0xb4,
-        0xb7, 0xc1, 0x9d, 0x20, 0xdf, 0x2a, 0xef, 0x04, 0xad, 0x17, 0x35, 0x18,
-        0x9e, 0xc7, 0xa9, 0xc1, 0x70, 0xbb, 0xb3, 0x8f, 0xe5, 0x3a, 0x4c, 0xa3,
-        0x93, 0xb7, 0x88, 0x7b, 0xa8, 0x9d, 0x7d, 0xb5, 0xf2, 0xbd, 0xef, 0x13,
-        0x8d, 0xa5, 0x79, 0xbd, 0xa3, 0x0d, 0xef, 0xb6, 0x24, 0x3f, 0xc1, 0x9a,
-        0xcb, 0x21, 0x51, 0x73, 0xb9, 0xb3, 0xcd, 0x5b, 0x73, 0x51, 0x57, 0xb8,
-        0xdb, 0x72, 0xa8, 0x41, 0xcd, 0xc5, 0xef, 0xb9, 0xdb, 0xe2, 0xf7, 0xdc,
-        0x6d, 0x39, 0x24, 0xeb, 0x2b, 0xea, 0x2f, 0xd1, 0xdd, 0x96, 0xe4, 0x8a,
-        0x77, 0x5b, 0xb6, 0x4a, 0x7d, 0xf5, 0xc2, 0xaf, 0xfe, 0xbc, 0x32, 0x55,
-        0x67, 0xe7, 0x13, 0xc2, 0xce, 0xdf, 0xd5, 0xea, 0xb7, 0x9e, 0x69, 0xbb,
-        0x9e, 0x9d, 0xdf, 0x57, 0xd1, 0x53, 0xbe, 0xa3, 0xcd, 0x77, 0xbe, 0x58,
-        0x16, 0xf9, 0x7c, 0xa6, 0x89, 0x72, 0x03, 0xbf, 0x2a, 0x68, 0xf6, 0x58,
-        0x6f, 0xed, 0x99, 0x63, 0xf5, 0x5e, 0xa4, 0xee, 0xb9, 0x17, 0x69, 0xa2,
-        0x5f, 0xaf, 0xab, 0x87, 0x04, 0xe4, 0xdd, 0x7e, 0xf8, 0xc2, 0x19, 0x43,
-        0xda, 0x5e, 0xc4, 0x70, 0x98, 0xae, 0x50, 0xe4, 0x3b, 0x95, 0x6d, 0xe4,
-        0x9b, 0x71, 0xce, 0x4b, 0x54, 0x11, 0x63, 0x42, 0x8e, 0x8b, 0x7e, 0xe1,
-        0x6f, 0xd4, 0xb8, 0x23, 0xb3, 0xe3, 0xf6, 0x05, 0xe0, 0xbf, 0x21, 0x51,
-        0x6d, 0x9b, 0x95, 0x5a, 0xce, 0x58, 0xe5, 0x0e, 0xbf, 0x09, 0xfb, 0xe0,
-        0xdc, 0x07, 0xca, 0x98, 0x7c, 0x67, 0xe4, 0x62, 0x5b, 0xf5, 0x3e, 0xd0,
-        0x67, 0xa4, 0x9c, 0x3a, 0xf7, 0x81, 0x48, 0x4d, 0x40, 0x3e, 0x6e, 0xe4,
-        0x3e, 0x50, 0xd7, 0x92, 0xfb, 0x40, 0x2b, 0xf3, 0x66, 0xe9, 0x7d, 0xa0,
-        0xc6, 0xfc, 0xe1, 0xfb, 0x40, 0xff, 0xde, 0xe6, 0xdc, 0x43, 0x5d, 0x89,
-        0x3f, 0x6e, 0x9c, 0xf4, 0x11, 0xe0, 0xf9, 0x3e, 0x50, 0xe5, 0x1e, 0x90,
-        0xe7, 0x0e, 0x10, 0xdf, 0x25, 0x59, 0xee, 0x0c, 0xce, 0x7b, 0xff, 0xa4,
-        0xa7, 0x72, 0xff, 0xe4, 0x7c, 0xc9, 0xf5, 0xed, 0xee, 0xb9, 0x1c, 0xc7,
-        0x39, 0xbb, 0x44, 0x8e, 0x7a, 0xae, 0x54, 0x5b, 0xc3, 0x60, 0xbe, 0x8f,
-        0x16, 0xcf, 0x81, 0x3e, 0x6f, 0x89, 0xdc, 0x00, 0x7c, 0xde, 0xe2, 0x23,
-        0xe6, 0x1d, 0x29, 0xa0, 0x8b, 0x38, 0xcb, 0x75, 0xf8, 0xdd, 0x21, 0x64,
-        0xc1, 0x91, 0x8b, 0xdd, 0x9e, 0xf3, 0xd0, 0xaa, 0x1c, 0x38, 0x67, 0xba,
-        0x0e, 0xef, 0x6a, 0x65, 0x46, 0x9c, 0xdd, 0x0c, 0xed, 0xb5, 0x9c, 0xf3,
-        0xc6, 0xa8, 0x38, 0xb7, 0x6d, 0xaf, 0xb3, 0x5b, 0x3a, 0xe4, 0x06, 0x31,
-        0x67, 0x8c, 0xeb, 0xd5, 0x8c, 0xfb, 0x66, 0xc1, 0xe3, 0x46, 0x67, 0x71,
-        0x2b, 0xd7, 0xf1, 0xdc, 0x9a, 0x0a, 0x21, 0x97, 0xd8, 0x9d, 0xce, 0x09,
-        0xbb, 0xe9, 0xac, 0xdd, 0x29, 0xd6, 0xde, 0x58, 0x77, 0x96, 0xcd, 0x72,
-        0xb5, 0x5c, 0x4c, 0x70, 0x3d, 0x9a, 0xde, 0xb3, 0x84, 0xa6, 0xb5, 0xba,
-        0x84, 0xdc, 0xb5, 0x62, 0xe3, 0x3b, 0x2a, 0xba, 0x34, 0x2e, 0xee, 0x21,
-        0xbb, 0xe7, 0xb5, 0x0e, 0xfd, 0xaa, 0xba, 0xb7, 0x5c, 0x3c, 0x53, 0x4f,
-        0xbf, 0x4d, 0xff, 0x4b, 0xe8, 0x77, 0x15, 0xf4, 0xe3, 0x77, 0x03, 0xef,
-        0xef, 0x8a, 0x7a, 0xc0, 0xb9, 0x52, 0xe4, 0x78, 0x9e, 0x38, 0x4e, 0x88,
-        0xcc, 0x2e, 0x50, 0x0f, 0xe8, 0xc8, 0xff, 0xeb, 0xe2, 0xde, 0x9d, 0x60,
-        0xfa, 0xb2, 0x7d, 0x8f, 0xbc, 0x70, 0x99, 0xd8, 0xc6, 0xdf, 0x8d, 0x7d,
-        0x94, 0xcb, 0x2f, 0xc5, 0x5c, 0xfa, 0xb3, 0xee, 0x73, 0x9d, 0xaa, 0x76,
-        0x5f, 0x7b, 0x57, 0xed, 0x53, 0x1d, 0xf9, 0xcc, 0x34, 0x90, 0xcf, 0x8c,
-        0xdc, 0xa3, 0x6f, 0xa6, 0x71, 0xbc, 0x9a, 0x9a, 0xfc, 0xef, 0x5e, 0xae,
-        0x26, 0xb6, 0x8d, 0x22, 0x0a, 0xbf, 0xac, 0xd7, 0x4e, 0xe3, 0xa4, 0x61,
-        0x93, 0x3a, 0xad, 0x69, 0xd2, 0x60, 0xc7, 0x4b, 0x12, 0x29, 0xa5, 0xa4,
-        0x52, 0x55, 0x45, 0x60, 0xa9, 0x21, 0x4e, 0xda, 0x0a, 0x71, 0x70, 0x0b,
-        0x48, 0x51, 0xc5, 0x21, 0x4d, 0xd3, 0x7b, 0x85, 0x84, 0x54, 0xa1, 0x8a,
-        0x46, 0x4e, 0x02, 0x15, 0x4a, 0xe5, 0x0a, 0x96, 0x72, 0x41, 0xa2, 0xd8,
-        0x8e, 0x02, 0x52, 0x2a, 0xf7, 0xca, 0x85, 0xba, 0xbf, 0x08, 0x89, 0x03,
-        0x70, 0x06, 0x29, 0x2a, 0x3f, 0xe2, 0xc0, 0x8d, 0x1b, 0x54, 0x5d, 0xde,
-        0x37, 0xb3, 0x63, 0xaf, 0x77, 0xd7, 0x8e, 0x03, 0x11, 0x07, 0x27, 0xbb,
-        0xf6, 0xcc, 0xce, 0xec, 0xcc, 0x37, 0x6f, 0xbe, 0xf7, 0x37, 0xfd, 0xbe,
-        0x78, 0x8d, 0x5a, 0xdb, 0x5b, 0xf3, 0x55, 0xec, 0xe7, 0xaf, 0x37, 0x18,
-        0x57, 0xed, 0xba, 0xe4, 0xa9, 0xf5, 0xe3, 0x9a, 0x72, 0xd9, 0x1b, 0xf0,
-        0xfe, 0xc7, 0x68, 0x51, 0xd8, 0x86, 0x94, 0xad, 0xee, 0xc5, 0x40, 0x9b,
-        0xd9, 0xff, 0x33, 0x16, 0x03, 0x3e, 0x9b, 0x68, 0xad, 0x6d, 0x8a, 0xed,
-        0x71, 0xd9, 0x16, 0xde, 0xda, 0xc2, 0xb6, 0x10, 0x3c, 0x16, 0xfd, 0x9e,
-        0xb1, 0xa8, 0xc9, 0xea, 0xa1, 0x16, 0xed, 0x74, 0x88, 0x21, 0xbf, 0x9d,
-        0x67, 0x6c, 0x05, 0xca, 0xce, 0x4f, 0x5d, 0x36, 0x3c, 0xe0, 0x73, 0xdc,
-        0x59, 0xeb, 0xc0, 0x27, 0xb5, 0x9d, 0x1a, 0x51, 0xed, 0x01, 0x8f, 0xc9,
-        0xc5, 0x45, 0x82, 0xbe, 0x86, 0x36, 0xe3, 0x82, 0xe3, 0xfa, 0x39, 0x14,
-        0x8f, 0xf1, 0xfa, 0x1b, 0x88, 0xe5, 0x70, 0xda, 0x3f, 0xd9, 0x76, 0xae,
-        0x9c, 0xe5, 0xbd, 0x42, 0xd4, 0x63, 0xbd, 0xef, 0x52, 0xdb, 0x82, 0xa8,
-        0x27, 0xe3, 0x20, 0x1c, 0x1d, 0xd0, 0xe1, 0xe2, 0x8d, 0x74, 0x3f, 0xff,
-        0x9e, 0x13, 0xcc, 0xdd, 0x7f, 0xdd, 0x1d, 0x36, 0x3f, 0x34, 0x64, 0xae,
-        0xde, 0x56, 0xdc, 0x5d, 0xd9, 0x89, 0x06, 0x85, 0xaf, 0xc1, 0xad, 0x7b,
-        0x41, 0x76, 0x5d, 0xe0, 0x3d, 0x7c, 0xa8, 0xba, 0x7f, 0xef, 0x84, 0x7d,
-        0xe8, 0x99, 0x16, 0x62, 0x1d, 0x44, 0x8e, 0xe5, 0x2b, 0x53, 0xc8, 0x45,
-        0xaa, 0xe6, 0xef, 0x78, 0xf3, 0x3c, 0x20, 0x3f, 0x55, 0x9e, 0x87, 0xca,
-        0x23, 0xc5, 0x7b, 0x24, 0x02, 0xf2, 0x3c, 0xdc, 0x32, 0x18, 0xf5, 0xea,
-        0xdf, 0xc3, 0x2d, 0x7f, 0x57, 0x1c, 0xf9, 0x5b, 0xf0, 0xd8, 0xe3, 0x97,
-        0xf3, 0x6a, 0x2d, 0x20, 0xe7, 0x43, 0xf1, 0x94, 0xde, 0x00, 0x9e, 0x12,
-        0x9c, 0xeb, 0xa1, 0xa5, 0x2f, 0xf2, 0x5e, 0x7e, 0x08, 0x7b, 0xb9, 0x51,
-        0x8b, 0xe9, 0x95, 0x72, 0xf0, 0xdc, 0x3a, 0x64, 0xa2, 0xca, 0xb9, 0x81,
-        0x5c, 0x44, 0x2c, 0x3c, 0xe6, 0xba, 0xe4, 0x60, 0x11, 0xbf, 0xa9, 0x58,
-        0x52, 0xa5, 0x47, 0xbd, 0x23, 0xf2, 0x0c, 0xbe, 0x1b, 0x3f, 0xcc, 0x1c,
-        0x18, 0xf2, 0x13, 0x76, 0xa6, 0x43, 0x0e, 0x1f, 0xbe, 0xcc, 0xbf, 0x8d,
-        0x39, 0xd7, 0x92, 0x8b, 0xca, 0x6b, 0xa5, 0x4b, 0xfd, 0xd0, 0x41, 0xe6,
-        0x6f, 0x0e, 0x2f, 0xad, 0xb3, 0x41, 0xc4, 0x53, 0xda, 0xdb, 0x74, 0xa1,
-        0xd8, 0x0c, 0x83, 0xf5, 0xf8, 0x4b, 0x79, 0x38, 0x4f, 0x42, 0x70, 0x9e,
-        0x9f, 0x3a, 0xc2, 0xe6, 0x44, 0x4f, 0xb3, 0x38, 0x9c, 0x53, 0x55, 0xfc,
-        0xa9, 0x72, 0xaa, 0x6f, 0x8f, 0x3a, 0x10, 0xa7, 0xe6, 0xc7, 0x04, 0xe6,
-        0x1f, 0xfa, 0x9c, 0x5a, 0x87, 0xd0, 0xeb, 0x10, 0xf3, 0x87, 0x76, 0x8d,
-        0x06, 0x6b, 0xb0, 0x66, 0x13, 0x2f, 0x50, 0x2b, 0xb1, 0x7f, 0xc9, 0xd1,
-        0x0a, 0x9d, 0xed, 0x69, 0xa6, 0xf3, 0x9e, 0x08, 0xd4, 0x79, 0x83, 0x72,
-        0xa4, 0xcc, 0x80, 0x1c, 0x29, 0x37, 0x0e, 0x75, 0x17, 0x0e, 0xe3, 0x2e,
-        0x2e, 0x30, 0xc0, 0xdc, 0xb9, 0x8b, 0xf1, 0x04, 0xee, 0x1c, 0xa5, 0xd0,
-        0x07, 0x6e, 0xee, 0xec, 0xf7, 0x13, 0x49, 0x5c, 0xfe, 0xdb, 0xdc, 0xa9,
-        0xa0, 0x7e, 0x27, 0x7c, 0xfd, 0x86, 0x1c, 0x9f, 0x6c, 0xc8, 0x13, 0x82,
-        0x38, 0xfe, 0x4e, 0xf7, 0xd3, 0xbb, 0xf6, 0xd1, 0xa6, 0x09, 0xfd, 0x70,
-        0x74, 0xb1, 0xba, 0xee, 0x5f, 0xf0, 0xd9, 0xb9, 0xc1, 0x67, 0x43, 0xc2,
-        0x27, 0xd7, 0x25, 0xf6, 0x90, 0x9d, 0x93, 0x61, 0x9d, 0x1e, 0x19, 0x66,
-        0xf7, 0xd4, 0xec, 0xfc, 0x88, 0x21, 0xec, 0x73, 0x74, 0x0e, 0xb9, 0xef,
-        0x14, 0x1a, 0xc6, 0xa5, 0xe2, 0x3b, 0xe9, 0x1b, 0x38, 0x77, 0x04, 0xb2,
-        0x1b, 0xf2, 0xfc, 0xf4, 0x6c, 0xd8, 0x34, 0x1c, 0x1f, 0x03, 0xfc, 0x08,
-        0xc0, 0xa9, 0x7a, 0x7e, 0x90, 0x0d, 0x3d, 0x68, 0x0e, 0x87, 0x7c, 0x73,
-        0x28, 0xf1, 0x06, 0x6e, 0x8f, 0x58, 0xbc, 0x83, 0x9e, 0x38, 0xc5, 0x9d,
-        0x18, 0x93, 0xee, 0x80, 0x78, 0x41, 0xc4, 0xfa, 0xf9, 0xfa, 0xcb, 0xef,
-        0x7c, 0x51, 0xf3, 0xaf, 0xad, 0x49, 0x6d, 0xba, 0x3c, 0xad, 0x4d, 0x15,
-        0x51, 0xee, 0xa2, 0x56, 0xdb, 0x97, 0x36, 0x5d, 0x1c, 0x11, 0x7c, 0x30,
-        0x79, 0xad, 0x42, 0x78, 0x4f, 0xdb, 0xbe, 0x25, 0xb8, 0xed, 0x80, 0x0f,
-        0xab, 0x8a, 0x73, 0x18, 0x2d, 0xbc, 0x97, 0xb4, 0xbd, 0xb8, 0xb9, 0x8e,
-        0x5b, 0xbe, 0x3f, 0x1d, 0x20, 0xdf, 0x9b, 0xd9, 0x0a, 0x91, 0xbf, 0x29,
-        0xe2, 0xb2, 0xa9, 0x68, 0x21, 0xde, 0xf1, 0x30, 0xe2, 0x7b, 0xe1, 0xd7,
-        0xa8, 0x62, 0xe1, 0x6e, 0x30, 0x16, 0xaa, 0xf6, 0x60, 0x1d, 0xb9, 0xa3,
-        0x2c, 0x8b, 0xc3, 0xe9, 0x5e, 0x0a, 0x99, 0x28, 0xff, 0x6c, 0xe2, 0x3e,
-        0x1d, 0x73, 0x78, 0x09, 0xfc, 0x3c, 0xb2, 0xde, 0x4c, 0x0b, 0x76, 0xe1,
-        0x60, 0x7f, 0x46, 0x84, 0x65, 0xf3, 0x67, 0xbd, 0xad, 0xf9, 0x33, 0x54,
-        0x39, 0xd4, 0xed, 0xa2, 0x35, 0x0b, 0x71, 0x92, 0xf0, 0x2f, 0x75, 0x77,
-        0xb4, 0x9b, 0x41, 0xf2, 0x4f, 0xc5, 0x7e, 0x82, 0x1f, 0xc9, 0xb9, 0xba,
-        0x41, 0x98, 0x3b, 0x9b, 0xbe, 0x6f, 0x30, 0x57, 0xdb, 0xb1, 0x29, 0x37,
-        0x9f, 0x2b, 0xc3, 0x33, 0x57, 0xd8, 0x8b, 0x9a, 0xcd, 0x95, 0xf2, 0x43,
-        0x2a, 0xdf, 0xdc, 0x51, 0xc8, 0x93, 0x45, 0xf7, 0x5c, 0xed, 0x8c, 0x7f,
-        0x4e, 0xce, 0xd9, 0x4e, 0xfb, 0xe0, 0x1a, 0x8f, 0x43, 0x34, 0xd0, 0x76,
-        0x12, 0x2c, 0x33, 0xfc, 0x6b, 0xeb, 0x86, 0x5c, 0x5b, 0xcc, 0x2b, 0x9e,
-        0x6f, 0xb8, 0xb6, 0xb0, 0x0f, 0x5c, 0x70, 0xf6, 0x81, 0xd3, 0x3e, 0x7d,
-        0x51, 0xd9, 0xbc, 0xff, 0xab, 0xed, 0x0d, 0xcf, 0x7d, 0x22, 0xce, 0xe9,
-        0xc8, 0x91, 0xdc, 0x47, 0xce, 0x37, 0xe4, 0x61, 0x3d, 0xdb, 0x5c, 0xa7,
-        0x6a, 0xee, 0x91, 0x73, 0x01, 0x79, 0x99, 0xa5, 0xf3, 0xf9, 0xc7, 0x06,
-        0x75, 0xf7, 0x53, 0xa4, 0x1a, 0xd3, 0x72, 0x40, 0xf0, 0x61, 0xb7, 0xbe,
-        0xbc, 0xec, 0xe4, 0x28, 0xe6, 0x5c, 0x63, 0xb0, 0x9c, 0xcf, 0x36, 0x89,
-        0xa7, 0x6f, 0x25, 0x9e, 0x63, 0xc0, 0x23, 0x37, 0xbd, 0x73, 0x35, 0xa1,
-        0x65, 0xf2, 0xa8, 0xb3, 0x87, 0xce, 0xea, 0x9f, 0xf0, 0x18, 0x3d, 0xb1,
-        0x23, 0xe2, 0x9c, 0x11, 0xe0, 0xd2, 0xb6, 0x97, 0xcd, 0x0e, 0x5a, 0x94,
-        0x7e, 0x46, 0x9a, 0xfa, 0xf8, 0x12, 0x15, 0x85, 0x7f, 0x0b, 0xb9, 0x51,
-        0xb0, 0x71, 0xc3, 0x47, 0x87, 0xe7, 0xf0, 0xf7, 0x1b, 0x13, 0x8e, 0xcc,
-        0xfd, 0x93, 0x31, 0x8c, 0x7a, 0x38, 0x0b, 0x01, 0xeb, 0x9d, 0x34, 0xc9,
-        0x31, 0xb9, 0x1d, 0x71, 0x4e, 0x80, 0x8c, 0xcd, 0xbb, 0x5d, 0xde, 0x8e,
-        0x4f, 0xa1, 0x55, 0xbd, 0xe4, 0xeb, 0x68, 0xd8, 0xfc, 0x72, 0xcf, 0xf6,
-        0x7d, 0x0a, 0x2a, 0x77, 0x5f, 0x71, 0x58, 0x75, 0x2d, 0x73, 0x69, 0xc1,
-        0x99, 0xe7, 0xd7, 0x55, 0xde, 0x6d, 0x77, 0x40, 0xde, 0x6d, 0x88, 0xe6,
-        0x84, 0xaf, 0x2e, 0x44, 0x39, 0x47, 0x37, 0x93, 0x9c, 0x5a, 0xd9, 0x6a,
-        0x23, 0x4e, 0xfc, 0x29, 0xee, 0xdd, 0x39, 0xf9, 0x7c, 0x5f, 0x04, 0xcf,
-        0x46, 0x4e, 0xb5, 0x2d, 0x62, 0xf1, 0x33, 0xa2, 0x5c, 0xa7, 0xa7, 0x1c,
-        0xdf, 0x17, 0xd5, 0x33, 0x3b, 0xb9, 0x7c, 0x8a, 0x64, 0x0e, 0x7d, 0x27,
-        0xcd, 0x15, 0x9b, 0xf5, 0x6b, 0x1f, 0xe2, 0x81, 0xe3, 0xf0, 0x95, 0x0a,
-        0xbf, 0x95, 0xa1, 0xfa, 0x80, 0x3e, 0xb5, 0x57, 0xfb, 0x04, 0xf9, 0x14,
-        0x12, 0x7e, 0x05, 0xbe, 0x76, 0xda, 0x99, 0x23, 0x77, 0xbf, 0xc2, 0xdc,
-        0x2f, 0x3c, 0xa7, 0xd3, 0x55, 0xb6, 0xd3, 0x55, 0xb6, 0x36, 0x5e, 0x3a,
-        0xeb, 0x54, 0x0b, 0xe5, 0x1f, 0x59, 0x2f, 0xfd, 0x56, 0xd8, 0xe6, 0xe6,
-        0xb3, 0x06, 0x2d, 0xac, 0xf7, 0xf2, 0x27, 0xc6, 0x1f, 0x94, 0xdb, 0xcb,
-        0xff, 0xdd, 0x9c, 0xa2, 0x5f, 0xc4, 0x02, 0xb6, 0xce, 0x07, 0x83, 0xf1,
-        0x1f, 0xbc, 0x6e, 0x13, 0x01, 0xeb, 0xb6, 0xf9, 0xbe, 0x22, 0xf7, 0x93,
-        0xe4, 0x95, 0x8a, 0x23, 0xaf, 0x36, 0x69, 0xd0, 0x27, 0xa7, 0x82, 0xd6,
-        0x29, 0xfa, 0x78, 0xca, 0xe9, 0xe3, 0x9b, 0xa2, 0x3f, 0xe3, 0x54, 0xa8,
-        0xe6, 0x0d, 0x1f, 0xe1, 0xeb, 0x98, 0xb2, 0xd1, 0x35, 0x90, 0xab, 0xdf,
-        0x6c, 0x43, 0xc6, 0x04, 0x71, 0xb2, 0x03, 0x01, 0xfa, 0x80, 0xee, 0xd2,
-        0x07, 0xe2, 0x55, 0x7d, 0x60, 0x45, 0xe8, 0x09, 0xbb, 0x1c, 0x1d, 0x34,
-        0xd8, 0x16, 0x97, 0xcb, 0xe3, 0xcc, 0x1b, 0xd8, 0xf8, 0xa4, 0x1d, 0x7d,
-        0xda, 0xaa, 0x9e, 0x99, 0xc3, 0xba, 0x65, 0x8d, 0x4b, 0xfb, 0xe5, 0x09,
-        0xce, 0xac, 0xa8, 0xcc, 0x3e, 0x30, 0xa3, 0xa4, 0xa5, 0x93, 0xf1, 0xa9,
-        0x50, 0x84, 0x16, 0xac, 0x28, 0x15, 0xac, 0x14, 0x73, 0x70, 0xf0, 0xe3,
-        0xd0, 0x80, 0x46, 0x11, 0x96, 0x35, 0x11, 0x2a, 0x95, 0x94, 0x4e, 0x76,
-        0x86, 0xc8, 0x2c, 0xc6, 0xa4, 0x0d, 0x9b, 0x71, 0x9a, 0x1f, 0x33, 0xe6,
-        0x49, 0x43, 0xcc, 0x8b, 0x93, 0xa3, 0x0e, 0x0c, 0x8a, 0x38, 0x4b, 0xfd,
-        0xe5, 0x91, 0x28, 0xb5, 0xa7, 0xa5, 0xcd, 0x68, 0x86, 0xdb, 0xf8, 0xc2,
-        0x8a, 0xd1, 0x95, 0x7c, 0xd2, 0x38, 0xc1, 0xed, 0x64, 0xac, 0x64, 0x62,
-        0x92, 0x9f, 0x5d, 0x2c, 0x45, 0x28, 0x67, 0x45, 0xa8, 0x50, 0x4a, 0x19,
-        0x43, 0x6d, 0xa2, 0xcd, 0x18, 0xda, 0x7c, 0x49, 0x1f, 0x33, 0x4e, 0x92,
-        0xbb, 0xcd, 0xaf, 0x9c, 0x36, 0xbd, 0x6d, 0xfd, 0x61, 0xe3, 0xfe, 0x44,
-        0xa8, 0x32, 0x7b, 0x9f, 0xf1, 0x92, 0x5b, 0x9d, 0x60, 0xd9, 0x14, 0x13,
-        0x67, 0xdb, 0x68, 0xe9, 0x34, 0xcb, 0x1d, 0x9c, 0x6d, 0x61, 0xd0, 0x62,
-        0x39, 0x4e, 0xef, 0x57, 0xed, 0x07, 0x12, 0x43, 0x39, 0x91, 0x43, 0x84,
-        0x33, 0x17, 0x2a, 0xb3, 0xbf, 0x9b, 0x5e, 0x7f, 0x3f, 0xeb, 0x5b, 0x1f,
-        0xc5, 0x28, 0x72, 0x15, 0x71, 0xdd, 0x36, 0x5d, 0x1b, 0x4f, 0x5e, 0xd9,
-        0x14, 0x79, 0x68, 0x09, 0x5a, 0x33, 0xa5, 0x3c, 0xcd, 0x71, 0xf9, 0x15,
-        0x94, 0x5b, 0x4b, 0xd0, 0x3d, 0x91, 0x8f, 0xd6, 0x4e, 0x77, 0xf4, 0x18,
-        0x85, 0x6e, 0x9a, 0xc6, 0xbc, 0xf0, 0x0b, 0x57, 0x66, 0x87, 0x86, 0x0d,
-        0xd2, 0xae, 0xa2, 0x1e, 0xff, 0xbf, 0x89, 0xfb, 0x28, 0x61, 0x7e, 0x66,
-        0xac, 0x31, 0x5e, 0x49, 0xc3, 0xf1, 0x12, 0x64, 0xf3, 0x41, 0x89, 0xa5,
-        0x39, 0x23, 0x42, 0xd0, 0x5f, 0x61, 0x7b, 0xeb, 0x35, 0x27, 0x7b, 0xa4,
-        0xfe, 0xe4, 0x3b, 0x9b, 0x43, 0x9f, 0x19, 0x71, 0x9f, 0xcf, 0x51, 0x7b,
-        0x66, 0xc6, 0x92, 0xef, 0xb9, 0x52, 0xee, 0xa5, 0x25, 0x6e, 0x7b, 0x64,
-        0xf8, 0x8c, 0x73, 0xa6, 0x0f, 0xff, 0xd9, 0x8b, 0x7b, 0x85, 0xb7, 0x7d,
-        0x7d, 0x14, 0xc5, 0x3d, 0x0d, 0xe8, 0x3c, 0xc7, 0xb0, 0xe9, 0x87, 0xc5,
-        0xb8, 0xa7, 0xe2, 0x98, 0xcb, 0xb9, 0xb8, 0x3a, 0x97, 0x08, 0x65, 0xba,
-        0xe9, 0x91, 0xd5, 0x45, 0x3f, 0x8b, 0xf3, 0x47, 0xf8, 0xba, 0x84, 0x9c,
-        0xa3, 0x36, 0xca, 0x64, 0xbb, 0x69, 0xb3, 0x14, 0x66, 0x71, 0x05, 0xec,
-        0x44, 0xb9, 0x4c, 0x81, 0xa6, 0xd6, 0x5f, 0xeb, 0x83, 0x1f, 0x66, 0x52,
-        0xab, 0x61, 0xe9, 0x51, 0x00, 0x96, 0x7e, 0xa9, 0xc3, 0xd2, 0xd1, 0xbe,
-        0xe6, 0x58, 0xea, 0x77, 0x62, 0xd6, 0xa3, 0x14, 0x71, 0x70, 0xf4, 0x39,
-        0xe3, 0xe8, 0x3d, 0xc6, 0xd1, 0xf1, 0x06, 0x38, 0xd2, 0x3c, 0x38, 0x3a,
-        0x51, 0x87, 0xa3, 0x6c, 0x5f, 0x33, 0x1c, 0x1d, 0x0f, 0xa1, 0xff, 0xcd,
-        0xd6, 0x32, 0xfa, 0xb0, 0x9f, 0x39, 0xbd, 0x49, 0xa5, 0xd5, 0xe4, 0xf8,
-        0x24, 0x55, 0x90, 0x73, 0x92, 0x58, 0xa2, 0xb4, 0xe0, 0x76, 0x05, 0x81,
-        0xbf, 0x2c, 0x8f, 0xc9, 0xae, 0x06, 0xe7, 0xaa, 0x24, 0x9c, 0x79, 0x93,
-        0x73, 0x99, 0xc9, 0x57, 0x66, 0x1f, 0x32, 0x36, 0xee, 0x6d, 0xe8, 0x3a,
-        0x7e, 0x0b, 0xb1, 0x8c, 0xbc, 0xbb, 0x81, 0x73, 0x5b, 0xe2, 0x74, 0xdf,
-        0x1a, 0xa0, 0x7b, 0xd6, 0x7e, 0xba, 0x6b, 0x0d, 0xd2, 0x03, 0x0b, 0x6d,
-        0x60, 0x0e, 0xf8, 0x5e, 0xcc, 0x81, 0x46, 0x33, 0x31, 0x2e, 0x53, 0xda,
-        0x4f, 0x95, 0x92, 0xc2, 0x35, 0xb0, 0x03, 0x0c, 0x35, 0xc6, 0x4e, 0xa6,
-        0x0e, 0x3b, 0xb2, 0x0e, 0x30, 0xb3, 0xe4, 0xb7, 0xad, 0xed, 0x32, 0xf8,
-        0x5d, 0x0d, 0xc6, 0x56, 0x58, 0xc4, 0x91, 0x24, 0x47, 0x67, 0x42, 0x90,
-        0x59, 0xb7, 0x18, 0x53, 0x3c, 0x17, 0x3c, 0x7e, 0xda, 0xf5, 0x41, 0x96,
-        0x39, 0x4f, 0x09, 0x1b, 0xf4, 0x94, 0xa9, 0xc7, 0x33, 0x64, 0x5f, 0xd6,
-        0xcc, 0x31, 0x91, 0xeb, 0xb6, 0x54, 0xf6, 0x9e, 0x31, 0x91, 0xe1, 0xb1,
-        0x57, 0x78, 0xf4, 0xca, 0xa1, 0x76, 0xaa, 0x38, 0x31, 0x4c, 0x85, 0x55,
-        0xdb, 0x7e, 0xc8, 0xfc, 0x7f, 0xcd, 0x84, 0xcc, 0xfe, 0xdb, 0xae, 0xc4,
-        0x74, 0x5a, 0x36, 0x55, 0xdf, 0xee, 0x08, 0x7c, 0x31, 0x47, 0xa4, 0x77,
-        0x37, 0xaa, 0xaf, 0xc4, 0xbf, 0xe3, 0xbb, 0xbf, 0x04, 0x97, 0x59, 0xab,
-        0x96, 0x85, 0xed, 0xf8, 0xd2, 0xd8, 0xc2, 0x2a, 0xce, 0x7e, 0x7b, 0xfc,
-        0xea, 0xf9, 0xd5, 0x5c, 0x1f, 0x4b, 0xd8, 0x94, 0x4e, 0x76, 0x68, 0x79,
-        0x3c, 0xf7, 0x5c, 0x98, 0x86, 0x19, 0x97, 0x38, 0x83, 0x6b, 0x6c, 0x34,
-        0x2c, 0xce, 0x38, 0xd9, 0xcd, 0x78, 0xc8, 0x0a, 0x3b, 0xfd, 0xd4, 0x91,
-        0x09, 0x9a, 0x2c, 0xa7, 0xf9, 0x53, 0x3f, 0x7e, 0xb5, 0xb9, 0xe3, 0xe1,
-        0x48, 0xe3, 0x37, 0x37, 0xff, 0xa8, 0xd5, 0x9d, 0xe6, 0xba, 0x33, 0x5b,
-        0xd6, 0x55, 0xe7, 0x12, 0xfd, 0x03, 0x69, 0xae, 0x1b, 0xa3, 0xbc, 0x57,
-        0x00, 0x00, 0x00 };
+        0x1f, 0x8b, 0x08, 0x00, 0x45, 0x30, 0xe7, 0x45, 0x00, 0x03, 0xdc, 0x5a,
+        0x6b, 0x6c, 0x1c, 0xd7, 0x75, 0x3e, 0x33, 0x3b, 0x4b, 0xae, 0xc8, 0x15,
+        0x35, 0xa2, 0xc6, 0xf4, 0x5a, 0xa2, 0xed, 0x5d, 0x72, 0x28, 0x12, 0x96,
+        0xec, 0x6e, 0x68, 0xda, 0x62, 0x8c, 0x8d, 0xb4, 0xd9, 0xa5, 0x0c, 0xa1,
+        0x65, 0x6b, 0x4a, 0xa2, 0x6d, 0x05, 0x11, 0x02, 0x62, 0x49, 0xa9, 0x46,
+        0x50, 0xb7, 0x92, 0xab, 0xb6, 0x81, 0x6b, 0x4b, 0x6b, 0x92, 0x6a, 0x09,
+        0x84, 0xe6, 0x08, 0x11, 0x43, 0x19, 0xa9, 0x11, 0x10, 0xa4, 0x1c, 0xbb,
+        0xc0, 0xb6, 0x2b, 0xbf, 0x05, 0x34, 0x2e, 0x15, 0x4a, 0x6e, 0xd4, 0x34,
+        0x30, 0xfc, 0xa7, 0xa8, 0x51, 0x38, 0xad, 0xe1, 0x04, 0xa8, 0x9b, 0x16,
+        0x45, 0xd0, 0xfc, 0x88, 0x0a, 0xdb, 0xd9, 0x7e, 0xdf, 0x9d, 0x3b, 0xcb,
+        0xe1, 0x92, 0xd4, 0xc3, 0x8f, 0xfe, 0x28, 0x81, 0xe5, 0xcc, 0xbd, 0x73,
+        0xe7, 0xde, 0x73, 0xcf, 0xe3, 0x3b, 0x8f, 0xb9, 0x77, 0x8a, 0x34, 0x88,
+        0xfe, 0x5b, 0x8f, 0x5f, 0xf2, 0xd1, 0x3f, 0x18, 0xbe, 0xab, 0xe7, 0xae,
+        0xbb, 0x71, 0x7b, 0xb7, 0x19, 0xb1, 0x22, 0xec, 0xe7, 0x3f, 0x07, 0xbf,
+        0x6e, 0x7d, 0xbf, 0xda, 0x9f, 0x8d, 0xdf, 0x65, 0xfc, 0x86, 0x7e, 0x2e,
+        0x62, 0xac, 0x31, 0x26, 0xfc, 0x57, 0xa9, 0x5c, 0xfd, 0xb9, 0x49, 0x5a,
+        0xae, 0xf2, 0x3c, 0xe2, 0x2f, 0xa9, 0x68, 0xe6, 0x4f, 0x62, 0x66, 0x46,
+        0x8e, 0xe7, 0x5c, 0x89, 0x45, 0x32, 0x1f, 0x1c, 0x1f, 0x76, 0x45, 0xb2,
+        0xa5, 0x6d, 0xc9, 0xbc, 0x7c, 0x5c, 0x29, 0x3a, 0x96, 0xb0, 0xff, 0xd6,
+        0xcc, 0x47, 0x27, 0xde, 0xd8, 0x91, 0xfa, 0xc5, 0x6c, 0x44, 0x62, 0x76,
+        0xe6, 0x15, 0xb1, 0xb7, 0x4a, 0xac, 0x15, 0xef, 0x3c, 0xdb, 0x99, 0x33,
+        0xa4, 0x29, 0x98, 0xeb, 0x83, 0xca, 0x1b, 0x9d, 0x52, 0xdc, 0x9c, 0x89,
+        0x89, 0x99, 0xe9, 0x78, 0x27, 0x17, 0xb1, 0x87, 0x22, 0x19, 0x5b, 0x16,
+        0xca, 0x32, 0x30, 0x32, 0x29, 0xb1, 0x58, 0x66, 0x22, 0x56, 0xdf, 0x21,
+        0xb1, 0x68, 0x66, 0xe8, 0xf8, 0xf7, 0xdc, 0x13, 0x15, 0xd3, 0x75, 0x93,
+        0xa3, 0x12, 0xef, 0x1d, 0xef, 0xc1, 0xf3, 0x52, 0x0a, 0x04, 0xef, 0x10,
+        0xd3, 0x2d, 0xc6, 0x23, 0x6e, 0x4c, 0x72, 0x65, 0x57, 0xf2, 0x65, 0x91,
+        0x1f, 0x96, 0x0c, 0x19, 0x77, 0x5b, 0x64, 0x74, 0xfb, 0x47, 0x95, 0x2c,
+        0x68, 0xf9, 0x3b, 0x77, 0xe8, 0xf8, 0x73, 0x2e, 0xe9, 0x9d, 0x8e, 0xf9,
+        0xf4, 0x8e, 0xd7, 0x0f, 0xbb, 0x96, 0xcc, 0x95, 0xd8, 0x77, 0xd0, 0x64,
+        0x9f, 0x95, 0xf9, 0x7e, 0xc3, 0xb8, 0x1b, 0xd7, 0x7d, 0x13, 0xd9, 0x1c,
+        0xe6, 0x9b, 0x2f, 0x71, 0xec, 0xbb, 0x5f, 0x18, 0x76, 0x1d, 0xdd, 0x9f,
+        0xdd, 0x91, 0x73, 0x13, 0xe8, 0x6f, 0xd5, 0xcf, 0x9e, 0x79, 0x74, 0xd8,
+        0x75, 0xf5, 0x33, 0xcb, 0xca, 0xb9, 0x5d, 0xba, 0xbf, 0xb4, 0x6b, 0xd8,
+        0xdd, 0xae, 0xfb, 0x7f, 0xbc, 0x2b, 0xe7, 0xa6, 0x75, 0x7f, 0xef, 0x57,
+        0x86, 0xdd, 0x1e, 0xdd, 0xff, 0xf6, 0xce, 0x9c, 0xdb, 0xab, 0xfb, 0x4f,
+        0xf5, 0x0e, 0xbb, 0xb6, 0x9c, 0x2d, 0x25, 0xf1, 0x9b, 0x88, 0x59, 0x1d,
+        0x19, 0x3d, 0xe6, 0x59, 0xd0, 0x9b, 0xc5, 0x98, 0x3e, 0xf4, 0xef, 0xc1,
+        0xaf, 0x1f, 0xbf, 0xf2, 0x06, 0x69, 0x1a, 0xc0, 0xf3, 0x0f, 0xb7, 0xf8,
+        0x3c, 0x04, 0xaf, 0xbc, 0x98, 0xbc, 0x17, 0x49, 0xc8, 0x1b, 0x9d, 0xef,
+        0x81, 0x97, 0xb6, 0x9c, 0x2b, 0x8b, 0x31, 0xd0, 0x99, 0x00, 0x0f, 0x1d,
+        0x79, 0xb1, 0xdc, 0x28, 0x91, 0x6f, 0x45, 0xc0, 0xa3, 0xaf, 0x4a, 0xc1,
+        0x89, 0xc9, 0xc6, 0x19, 0x43, 0xda, 0xba, 0xd7, 0x49, 0xd6, 0x2e, 0x4a,
+        0xbe, 0x13, 0x52, 0x9f, 0x72, 0xc4, 0x9a, 0x59, 0xdc, 0x68, 0xa2, 0xc7,
+        0x94, 0x54, 0xa2, 0x80, 0x19, 0x47, 0xce, 0xbe, 0x4b, 0x1d, 0xa5, 0x7c,
+        0xf1, 0x4b, 0x4a, 0x7e, 0xf2, 0x0e, 0x19, 0xb2, 0x49, 0xe7, 0x9f, 0xdd,
+        0xea, 0xaf, 0x19, 0x33, 0x72, 0x67, 0x06, 0xe5, 0xa4, 0x17, 0x37, 0xf2,
+        0x67, 0x76, 0x4a, 0x2e, 0x2d, 0x8e, 0x29, 0x1d, 0xea, 0xdd, 0xf9, 0xd2,
+        0xa0, 0x8c, 0x7b, 0x62, 0xe4, 0x3c, 0x4b, 0x46, 0x4b, 0x2d, 0x78, 0xde,
+        0xa4, 0xc6, 0xa2, 0xaf, 0x35, 0x22, 0x1d, 0x76, 0x5e, 0x62, 0xe8, 0xb7,
+        0xd1, 0xdf, 0x6c, 0xf4, 0xa9, 0x39, 0x54, 0x7f, 0x72, 0x4c, 0xe2, 0xd8,
+        0x9b, 0xa3, 0xc7, 0x56, 0x2a, 0xb9, 0xb4, 0x8d, 0x71, 0x83, 0x32, 0xe6,
+        0x39, 0x32, 0x84, 0xeb, 0xa8, 0xc7, 0xf5, 0x13, 0xd0, 0xb1, 0xb7, 0x8e,
+        0x17, 0xa6, 0xd5, 0x7c, 0xc9, 0x48, 0x86, 0xf3, 0xb5, 0x62, 0xdc, 0x05,
+        0xd0, 0x65, 0x88, 0xa5, 0x64, 0x9b, 0x95, 0xc2, 0xa4, 0x21, 0xe4, 0x5b,
+        0x41, 0xf1, 0xb0, 0x0f, 0xf4, 0x5b, 0xe2, 0x76, 0x1b, 0x32, 0xec, 0xde,
+        0x2c, 0x45, 0x1b, 0xed, 0xd2, 0x79, 0x33, 0xe7, 0xd5, 0x4b, 0xde, 0x4a,
+        0x62, 0xff, 0x94, 0xfd, 0x90, 0x8c, 0xe1, 0x1d, 0xd3, 0xe5, 0x98, 0x8f,
+        0xb0, 0x77, 0xb4, 0xf1, 0x6e, 0x5d, 0xe6, 0xa0, 0x5c, 0x9a, 0x2c, 0x9a,
+        0xb9, 0x72, 0x8b, 0x44, 0x66, 0x52, 0xd0, 0xfe, 0x71, 0x33, 0xff, 0xbc,
+        0x25, 0xd1, 0x29, 0xea, 0x97, 0xd8, 0x91, 0xcc, 0x84, 0xb9, 0xbb, 0x7c,
+        0xde, 0xcc, 0x97, 0xf9, 0x0e, 0xc6, 0x96, 0x4c, 0xf0, 0x96, 0xf7, 0xdb,
+        0xc0, 0x4b, 0xea, 0x36, 0xdf, 0x81, 0x1c, 0xb0, 0x87, 0x17, 0x3d, 0xc8,
+        0x45, 0xc9, 0x29, 0x09, 0x39, 0x89, 0xd1, 0xd7, 0x19, 0x93, 0xb1, 0x69,
+        0x4b, 0x0a, 0xe9, 0x9b, 0x15, 0xe7, 0x0b, 0xe9, 0x25, 0x9a, 0x46, 0x27,
+        0x6b, 0x69, 0xe2, 0x7b, 0xa4, 0xc9, 0xa7, 0x65, 0x6c, 0x9a, 0xb4, 0xf9,
+        0xb4, 0x9c, 0x9c, 0x24, 0x8d, 0x5c, 0x87, 0xf4, 0x90, 0xae, 0x80, 0x26,
+        0xbe, 0x43, 0x9a, 0x36, 0x61, 0x7e, 0x65, 0xc0, 0x46, 0x1f, 0x68, 0x18,
+        0xf3, 0x2c, 0xc8, 0x26, 0x2e, 0x05, 0xbb, 0x68, 0x8c, 0xf5, 0x6e, 0x4b,
+        0xc0, 0xaa, 0x8d, 0xd1, 0x5e, 0xd2, 0xeb, 0x42, 0x7e, 0x75, 0x4a, 0xce,
+        0x66, 0x66, 0x9c, 0x3c, 0xc3, 0x78, 0xae, 0x8d, 0xfb, 0x92, 0x2d, 0xe3,
+        0x6a, 0x3e, 0xd2, 0xf3, 0x59, 0xcc, 0x43, 0x7a, 0x2f, 0x43, 0x57, 0x7b,
+        0xa0, 0xa3, 0x69, 0xf9, 0xdb, 0xf2, 0x76, 0x79, 0xbd, 0xdc, 0x25, 0xaf,
+        0xc1, 0x7e, 0x5f, 0x2d, 0x27, 0xe5, 0x95, 0x72, 0xab, 0xbc, 0x5c, 0x4e,
+        0xc8, 0x4b, 0x4a, 0x7f, 0xfb, 0x44, 0x9a, 0x94, 0x4e, 0xc7, 0x6e, 0x86,
+        0x3e, 0xb6, 0x40, 0x1f, 0x9b, 0x61, 0x4f, 0x1b, 0x61, 0xab, 0xdf, 0x06,
+        0x0f, 0xa7, 0x3b, 0x25, 0xbb, 0x09, 0xfd, 0xb7, 0x65, 0x2c, 0xa5, 0x23,
+        0x16, 0x9e, 0x8f, 0x4d, 0x46, 0x25, 0x6f, 0x9f, 0x95, 0xf7, 0xa7, 0x2c,
+        0x19, 0x2b, 0x3f, 0x79, 0x9b, 0xaf, 0xb3, 0x6c, 0xcf, 0xca, 0x45, 0xf4,
+        0xe5, 0xed, 0x59, 0xb9, 0xb4, 0xd5, 0x94, 0xd1, 0xe9, 0xef, 0x4a, 0xee,
+        0xf9, 0xb3, 0xf2, 0xd3, 0xbf, 0x16, 0x19, 0x00, 0xef, 0xcd, 0xee, 0xff,
+        0xaa, 0x64, 0x6d, 0xec, 0xb1, 0x7b, 0xbb, 0x92, 0x89, 0xd9, 0x4d, 0x3d,
+        0x4e, 0x02, 0x57, 0x2c, 0x23, 0xef, 0xbd, 0x00, 0x6c, 0x69, 0x34, 0x72,
+        0xa7, 0x45, 0x86, 0x4f, 0x57, 0x64, 0x38, 0x1d, 0x95, 0xc7, 0xec, 0x8a,
+        0xf4, 0xa5, 0xeb, 0xe4, 0xa8, 0x4d, 0xac, 0x39, 0x6e, 0x04, 0xb8, 0xfe,
+        0xed, 0xf2, 0x09, 0xdc, 0xb3, 0x4f, 0x64, 0x5a, 0xdd, 0xfb, 0xfd, 0xc5,
+        0x72, 0x54, 0xb2, 0x4e, 0x31, 0x61, 0x49, 0x9b, 0xe9, 0xd3, 0xf4, 0xcd,
+        0xe0, 0x19, 0x78, 0x35, 0x04, 0x2c, 0xf5, 0xed, 0xaf, 0x30, 0xb9, 0xee,
+        0x4a, 0x56, 0x75, 0x47, 0x29, 0x3b, 0xe8, 0x34, 0x79, 0x9d, 0x1c, 0x32,
+        0x32, 0x8e, 0xb4, 0x29, 0xbc, 0xe8, 0xc1, 0x98, 0x5e, 0x63, 0x7f, 0x99,
+        0x7a, 0x8e, 0xfb, 0x12, 0x69, 0xdd, 0x8c, 0xb1, 0x16, 0xae, 0x59, 0x4d,
+        0x73, 0x98, 0x4e, 0xce, 0x45, 0x3a, 0x79, 0x7d, 0x21, 0x44, 0xe7, 0x5f,
+        0x56, 0xef, 0xa7, 0x43, 0xf7, 0xc5, 0xf2, 0x0f, 0x1a, 0x7c, 0xfa, 0xc8,
+        0xcf, 0x5e, 0xe8, 0xe3, 0x37, 0xf4, 0x5a, 0xb8, 0x2f, 0x71, 0x8d, 0xb3,
+        0x15, 0x5f, 0xa7, 0x8a, 0xd7, 0x58, 0xeb, 0x62, 0x68, 0xad, 0x4b, 0xa1,
+        0xb5, 0x2e, 0x85, 0xd6, 0x2a, 0x82, 0xb7, 0xb2, 0xc1, 0x74, 0xa3, 0xc0,
+        0x27, 0xf6, 0x4c, 0x60, 0xce, 0x67, 0x21, 0x97, 0x9f, 0x60, 0x4c, 0x46,
+        0x16, 0x3d, 0xf0, 0xe3, 0x74, 0x54, 0xf6, 0xa9, 0x67, 0xbd, 0x9a, 0xae,
+        0xf0, 0xb3, 0x98, 0xec, 0x75, 0x78, 0x1f, 0x3c, 0xb3, 0xc0, 0x63, 0xb6,
+        0xff, 0xe1, 0x16, 0xbf, 0xcd, 0xfb, 0xf3, 0x9a, 0xfe, 0x87, 0xfc, 0xf7,
+        0xca, 0x1f, 0x28, 0x9c, 0x5c, 0x28, 0x13, 0xc7, 0x24, 0x1d, 0x71, 0xe5,
+        0x48, 0x5f, 0x1a, 0x76, 0x65, 0x1b, 0xe9, 0xd1, 0xae, 0x7a, 0xf2, 0x3c,
+        0x6b, 0xba, 0x8d, 0xc0, 0x0a, 0x49, 0x9a, 0xd0, 0xb3, 0x51, 0xb5, 0x97,
+        0x75, 0xa6, 0x4f, 0xb3, 0xcd, 0xf6, 0x80, 0xe9, 0x36, 0xd7, 0xf4, 0xd3,
+        0xde, 0x1b, 0x71, 0x4f, 0xdd, 0x7e, 0x4c, 0xcb, 0x37, 0x8e, 0x36, 0xf1,
+        0xb9, 0x5f, 0xb7, 0x83, 0xe7, 0x39, 0x6b, 0x79, 0xfb, 0xed, 0x2d, 0xcb,
+        0xdb, 0x01, 0x76, 0x84, 0xb1, 0x9d, 0x7b, 0x4d, 0x4a, 0xc4, 0xa5, 0xce,
+        0x45, 0x41, 0x6b, 0x1a, 0xb6, 0x58, 0xaf, 0x69, 0xb8, 0x5d, 0xd3, 0x00,
+        0x5a, 0x31, 0x6e, 0x54, 0xd9, 0x98, 0x12, 0x5f, 0x4d, 0x9b, 0xfc, 0x0e,
+        0xee, 0xd7, 0xab, 0xe7, 0xbe, 0x2d, 0x06, 0x57, 0x31, 0x76, 0x77, 0x52,
+        0xe6, 0x13, 0x90, 0x79, 0x5c, 0xe6, 0xa7, 0xc9, 0xb3, 0x54, 0xe2, 0x71,
+        0x41, 0xbb, 0x94, 0x90, 0xb3, 0x93, 0x92, 0x3d, 0x7c, 0xaa, 0x57, 0xfa,
+        0x60, 0x9f, 0x73, 0x93, 0x57, 0x2a, 0xe0, 0xdb, 0xbd, 0x75, 0xe2, 0x02,
+        0x83, 0xe1, 0xef, 0x7b, 0xa2, 0x12, 0xc9, 0x64, 0xa0, 0x0b, 0x69, 0xe5,
+        0x83, 0x97, 0xfe, 0x2c, 0xeb, 0xfe, 0x65, 0xed, 0x3a, 0xf8, 0x79, 0xcc,
+        0xdb, 0x93, 0x56, 0x7a, 0x13, 0xfe, 0xcb, 0x01, 0x57, 0x72, 0xe9, 0x8f,
+        0xa1, 0x5b, 0x01, 0x4d, 0x81, 0x6d, 0xd0, 0x07, 0x7d, 0x10, 0xf2, 0x6d,
+        0xad, 0xc0, 0x17, 0x07, 0xf2, 0x0b, 0xfc, 0x11, 0xfd, 0x44, 0x82, 0x58,
+        0x0e, 0x5b, 0xa0, 0x6f, 0x88, 0x8b, 0x39, 0x63, 0x69, 0xff, 0x11, 0xd3,
+        0xfe, 0x23, 0x0e, 0xdf, 0xc1, 0xb6, 0xad, 0xdb, 0x8e, 0x6e, 0x27, 0xd0,
+        0x46, 0xec, 0x31, 0x43, 0xbb, 0x7a, 0xeb, 0xf8, 0xc8, 0xb4, 0xf2, 0x49,
+        0xf4, 0x67, 0xf0, 0x14, 0xf4, 0x29, 0xf4, 0x2d, 0xd8, 0x6f, 0x09, 0xeb,
+        0x55, 0x31, 0x9c, 0xf2, 0x08, 0xd3, 0x43, 0x5a, 0xd6, 0x89, 0x09, 0x3f,
+        0x9b, 0x75, 0x48, 0xef, 0x77, 0x20, 0x0f, 0x62, 0x25, 0xe9, 0xbe, 0x15,
+        0xb4, 0x72, 0x3f, 0xff, 0x97, 0xb4, 0x72, 0xbd, 0x5a, 0x7a, 0x3f, 0x2d,
+        0x66, 0x2b, 0xec, 0xc0, 0x9e, 0x33, 0xc0, 0x66, 0x31, 0xf6, 0x77, 0x0e,
+        0x62, 0xcf, 0x03, 0xc0, 0xee, 0x7e, 0x60, 0xf7, 0x1e, 0x60, 0x77, 0x1f,
+        0xb0, 0x3b, 0x0b, 0xec, 0xee, 0x05, 0x6e, 0xf7, 0x00, 0xb7, 0xd3, 0xe0,
+        0x8d, 0x23, 0xb3, 0xc0, 0xf1, 0x59, 0xe8, 0xcb, 0x2c, 0xe6, 0x28, 0xcc,
+        0x88, 0xf1, 0x35, 0xec, 0xe1, 0xe8, 0x54, 0x6a, 0x16, 0xfa, 0x9d, 0x18,
+        0x32, 0xa1, 0x07, 0xe9, 0xbb, 0x61, 0x6f, 0x88, 0x9b, 0xca, 0x83, 0x32,
+        0x0c, 0xbf, 0xdf, 0xb6, 0xb5, 0x1d, 0xfa, 0x84, 0x68, 0x24, 0x11, 0xe8,
+        0x68, 0xbf, 0x14, 0xbc, 0x76, 0xbb, 0xcd, 0xec, 0x42, 0x5f, 0x2a, 0x89,
+        0x18, 0xd5, 0x38, 0x74, 0x3a, 0x65, 0x8c, 0x9c, 0x26, 0x0f, 0x26, 0x81,
+        0x83, 0x15, 0x19, 0x4f, 0x53, 0x4f, 0x2b, 0xf2, 0x5c, 0x3a, 0xd5, 0x5b,
+        0x94, 0x46, 0x39, 0xe9, 0x4c, 0x2a, 0xdf, 0x6f, 0x65, 0x4e, 0x29, 0x1f,
+        0x3a, 0xec, 0xe2, 0x5a, 0x6a, 0x33, 0x0a, 0xa7, 0xb9, 0xd7, 0x76, 0xfc,
+        0xa2, 0x58, 0xf7, 0x57, 0x90, 0x91, 0x25, 0x7d, 0x3d, 0x62, 0x1c, 0xee,
+        0x2c, 0x02, 0x39, 0x53, 0xf6, 0x22, 0x56, 0xcb, 0x4f, 0xb6, 0x27, 0xda,
+        0x4d, 0x4b, 0x86, 0x2c, 0x43, 0x46, 0x61, 0x5f, 0x7d, 0xe9, 0xff, 0xa9,
+        0x9c, 0x74, 0xf8, 0xbc, 0x5e, 0xfe, 0x5c, 0x61, 0x31, 0xd6, 0x9e, 0x9f,
+        0xc6, 0xba, 0x51, 0xf0, 0x9b, 0xeb, 0x72, 0x1e, 0xb4, 0x81, 0x8b, 0x96,
+        0x9b, 0x9a, 0x2d, 0xca, 0x2e, 0xd8, 0xe9, 0x06, 0xc9, 0x6d, 0xaf, 0x93,
+        0xec, 0x40, 0x52, 0x0a, 0x53, 0xbb, 0x80, 0x8d, 0x31, 0x65, 0xab, 0x85,
+        0xc1, 0xa4, 0x3c, 0x36, 0xc5, 0xbe, 0x2c, 0xf6, 0x9a, 0x3a, 0x95, 0x15,
+        0xee, 0xd5, 0x90, 0xec, 0xc1, 0xac, 0x3c, 0xe6, 0x65, 0x65, 0x04, 0xf2,
+        0x3a, 0x0b, 0x5e, 0x1e, 0xf2, 0x5c, 0x79, 0x0e, 0xbe, 0x26, 0x7f, 0x1a,
+        0x58, 0xeb, 0xae, 0x07, 0x2e, 0xa6, 0xce, 0x31, 0xc6, 0x37, 0x19, 0x87,
+        0x82, 0x97, 0x7f, 0x34, 0x45, 0x5e, 0x9a, 0x32, 0x7d, 0xaf, 0x01, 0x3c,
+        0x48, 0x82, 0x77, 0xae, 0xfc, 0xb1, 0x97, 0x3a, 0x9f, 0x35, 0x81, 0xc5,
+        0xe9, 0xde, 0x88, 0x34, 0x24, 0x30, 0xce, 0x1f, 0x93, 0x4f, 0x47, 0x20,
+        0xd7, 0x22, 0xc6, 0xa6, 0xd0, 0xcf, 0x77, 0x1d, 0xfc, 0xb2, 0x18, 0x07,
+        0x5d, 0xb5, 0x53, 0xe7, 0x67, 0x4d, 0x8e, 0x4f, 0x42, 0x3e, 0x36, 0xc6,
+        0x03, 0xf8, 0x6c, 0xde, 0xa7, 0x8d, 0x02, 0x69, 0xf0, 0xa8, 0x53, 0x88,
+        0x49, 0xcb, 0xc4, 0xd4, 0xf6, 0x73, 0xaf, 0x0b, 0xd7, 0xf9, 0x22, 0xc6,
+        0x7f, 0x88, 0x38, 0xdc, 0x96, 0x79, 0xc8, 0xe5, 0xa7, 0xe0, 0x55, 0x36,
+        0xe1, 0xb7, 0x0b, 0x33, 0xa9, 0x73, 0x8b, 0x26, 0xef, 0xdd, 0xe2, 0xa8,
+        0xd9, 0x23, 0xd2, 0x4c, 0x7e, 0xa5, 0xc1, 0x2b, 0xd7, 0x36, 0xcd, 0xb4,
+        0xf2, 0x65, 0xbe, 0x2d, 0xdf, 0x05, 0x9a, 0xa0, 0xf3, 0xdd, 0x61, 0x9b,
+        0xa0, 0xaf, 0x0d, 0x6c, 0x22, 0x95, 0x98, 0x35, 0xe1, 0x9f, 0xbb, 0x2d,
+        0x39, 0xa5, 0xda, 0xe0, 0xd1, 0x60, 0x2a, 0x91, 0x35, 0x11, 0x33, 0x95,
+        0xba, 0xe4, 0xac, 0xc7, 0xf1, 0x49, 0x85, 0x51, 0xfe, 0x78, 0xc4, 0x7a,
+        0x1e, 0xe3, 0xc5, 0x2e, 0xd0, 0xec, 0xdb, 0xc9, 0xdc, 0xa4, 0xa3, 0x9e,
+        0x9d, 0xf4, 0xfc, 0xb8, 0xd0, 0x44, 0xec, 0x38, 0x8b, 0xd8, 0x31, 0xaf,
+        0x6c, 0xc6, 0xce, 0x22, 0xd7, 0x80, 0xce, 0xfb, 0xf6, 0x32, 0x5f, 0xba,
+        0x4f, 0x86, 0xcf, 0x7c, 0x3f, 0x6e, 0x22, 0xce, 0x2a, 0x38, 0xa4, 0x8b,
+        0xe3, 0xcf, 0x81, 0x4e, 0xf2, 0x4e, 0x86, 0x18, 0x57, 0x21, 0x16, 0x7e,
+        0x84, 0x32, 0x1e, 0xed, 0x7e, 0x88, 0x7c, 0x2b, 0x82, 0xe8, 0x53, 0x3e,
+        0x8e, 0x49, 0x91, 0x71, 0xe8, 0x62, 0xe4, 0x09, 0x19, 0x9a, 0xa7, 0x2f,
+        0xc4, 0xcf, 0x23, 0x26, 0x02, 0xc7, 0x94, 0xcf, 0x6a, 0x87, 0x3e, 0x14,
+        0xc1, 0xef, 0x8d, 0x3a, 0x0e, 0x3b, 0x08, 0xf9, 0xf6, 0x43, 0xfe, 0x19,
+        0x19, 0x39, 0x33, 0x42, 0xdd, 0xee, 0x9a, 0x97, 0x54, 0xd7, 0x49, 0xd9,
+        0x66, 0xcf, 0xc1, 0x06, 0xb3, 0x83, 0x95, 0x5d, 0x66, 0x86, 0xef, 0x9c,
+        0xc0, 0x3b, 0xb8, 0xce, 0x8f, 0xc8, 0xd1, 0x32, 0xfb, 0x9e, 0x05, 0xdf,
+        0x11, 0x17, 0xf7, 0x1c, 0xd4, 0xf6, 0x80, 0xf9, 0xac, 0x60, 0xbe, 0x11,
+        0x3d, 0x1f, 0xc7, 0x71, 0x0c, 0xdf, 0x59, 0x9a, 0x77, 0x37, 0x7d, 0x22,
+        0x30, 0xa8, 0xc3, 0xac, 0xec, 0x8a, 0xe2, 0xf9, 0x73, 0x3d, 0xbc, 0xc7,
+        0x3c, 0xf0, 0x89, 0xb6, 0xdb, 0x8f, 0xb1, 0x83, 0x98, 0x73, 0x9d, 0xb4,
+        0xb5, 0x04, 0xf4, 0x52, 0x3f, 0x18, 0xab, 0xb0, 0x3d, 0xb2, 0xc9, 0x97,
+        0xd1, 0xab, 0x11, 0xdf, 0xc7, 0xcc, 0xa2, 0x4d, 0x3b, 0x3c, 0x26, 0x79,
+        0x2f, 0x85, 0x7d, 0x42, 0x06, 0xe5, 0x51, 0xbd, 0x47, 0xc8, 0x69, 0xe0,
+        0x29, 0xf0, 0x41, 0x8a, 0x3e, 0x6f, 0xc8, 0x17, 0xf2, 0xe4, 0x38, 0x6c,
+        0xe0, 0x71, 0x8c, 0x41, 0xbc, 0xab, 0x78, 0x60, 0x6f, 0xf2, 0xe3, 0xf5,
+        0x54, 0x31, 0xcb, 0xbc, 0xb3, 0x99, 0xba, 0x0d, 0xdc, 0x2a, 0x0f, 0xd8,
+        0x9c, 0x7b, 0xd6, 0x64, 0x7e, 0x92, 0x4a, 0x5e, 0x88, 0xec, 0x67, 0xbb,
+        0x6b, 0xd6, 0x84, 0x8c, 0x20, 0xc7, 0xdc, 0xf6, 0x76, 0x8d, 0x55, 0xef,
+        0x28, 0x5d, 0xa6, 0xde, 0x17, 0xbc, 0x6d, 0xf6, 0x43, 0x42, 0x5d, 0x76,
+        0xa0, 0x17, 0xc4, 0x0b, 0x5e, 0x2d, 0xf8, 0xee, 0x04, 0x74, 0x61, 0xbd,
+        0xa6, 0x9d, 0xf7, 0x96, 0xcc, 0xda, 0x58, 0xc3, 0xfb, 0x8f, 0x0d, 0x7e,
+        0x1f, 0xef, 0x19, 0x33, 0x05, 0x72, 0x0c, 0x68, 0xa5, 0x3c, 0x6b, 0x65,
+        0xf8, 0x24, 0x68, 0x67, 0x3f, 0xae, 0xf3, 0xc7, 0x60, 0xa7, 0xc0, 0x94,
+        0x9e, 0x8e, 0xc4, 0x45, 0x8c, 0xcf, 0x03, 0xf7, 0x8b, 0x16, 0x9f, 0x5d,
+        0x31, 0x96, 0xde, 0x31, 0x19, 0x27, 0x23, 0x1e, 0xbf, 0x60, 0x7c, 0x0d,
+        0xb1, 0x4e, 0x6e, 0xfe, 0x8a, 0x91, 0x87, 0x5e, 0xcc, 0x7b, 0x77, 0x43,
+        0x9f, 0x68, 0x57, 0x36, 0xd6, 0x4e, 0x25, 0xfe, 0xc9, 0x6c, 0x4f, 0xce,
+        0x01, 0x03, 0x0e, 0x81, 0xb1, 0xbe, 0x2c, 0x5d, 0x25, 0xdb, 0x45, 0x33,
+        0xaa, 0xf1, 0x8f, 0xed, 0x94, 0xfd, 0xb0, 0xc0, 0x58, 0x1a, 0xf6, 0x80,
+        0xcf, 0x7b, 0x64, 0xb8, 0x9c, 0x91, 0xc2, 0x99, 0x6d, 0xf6, 0x28, 0x72,
+        0xf5, 0x25, 0xda, 0x89, 0x75, 0x45, 0x60, 0x1d, 0xfc, 0xb7, 0x27, 0xc5,
+        0xba, 0x0c, 0x31, 0xaf, 0x03, 0xfa, 0x84, 0xbe, 0xd2, 0x92, 0x4e, 0xde,
+        0xbf, 0x62, 0x3f, 0xf4, 0xdb, 0xcb, 0xf7, 0x34, 0x2f, 0xd7, 0xde, 0xd3,
+        0xee, 0xea, 0x9e, 0x88, 0x31, 0xf0, 0x03, 0x1e, 0xfc, 0x00, 0x74, 0xfa,
+        0x75, 0x0f, 0x7e, 0xc0, 0x83, 0x1f, 0x80, 0x3d, 0xbe, 0x02, 0x7d, 0x7c,
+        0xd9, 0x83, 0x2f, 0xf0, 0xe0, 0x0b, 0x3c, 0xf8, 0x02, 0x2f, 0x07, 0xd9,
+        0x11, 0xef, 0xe9, 0x4b, 0x0e, 0x54, 0xfd, 0xa7, 0x1f, 0x83, 0xdd, 0xa2,
+        0xe3, 0x1a, 0xd8, 0xae, 0xbd, 0x59, 0x46, 0xbb, 0x98, 0x13, 0x35, 0xe0,
+        0xda, 0x88, 0x2b, 0x62, 0x98, 0xae, 0x2f, 0x69, 0xdb, 0x79, 0x1c, 0x74,
+        0x01, 0x17, 0xba, 0xbe, 0x08, 0xdd, 0x44, 0x1c, 0xe1, 0xfe, 0x86, 0x8e,
+        0x7f, 0x7e, 0x64, 0xf9, 0xba, 0xd9, 0x88, 0xbe, 0xfb, 0xd0, 0xd7, 0x88,
+        0x31, 0x47, 0x31, 0x86, 0xf1, 0x53, 0x93, 0xee, 0x0b, 0x8f, 0x63, 0x1c,
+        0xf5, 0x00, 0xd6, 0x4a, 0x61, 0x5c, 0x13, 0xe6, 0x6e, 0xc5, 0x98, 0x9d,
+        0x18, 0x73, 0x2b, 0xda, 0x8c, 0xb9, 0xb7, 0xa0, 0x7d, 0x4f, 0xcd, 0x3b,
+        0xb7, 0xa3, 0xef, 0x4b, 0x35, 0x7d, 0x8b, 0xe8, 0xeb, 0x41, 0xdf, 0x45,
+        0xfd, 0x5e, 0x11, 0xed, 0x96, 0x9a, 0x31, 0x97, 0xd1, 0x87, 0xb8, 0xd9,
+        0xfe, 0x7b, 0x5c, 0xfb, 0x71, 0x25, 0x4d, 0xc1, 0x33, 0xc6, 0xcd, 0xc8,
+        0x41, 0xab, 0xb1, 0xef, 0x5b, 0x8c, 0x0b, 0xe1, 0x7b, 0x7f, 0x6c, 0xf9,
+        0x71, 0xe3, 0x77, 0x6d, 0x5f, 0x57, 0x83, 0xf6, 0x8f, 0x6a, 0xda, 0x1c,
+        0xfb, 0xdf, 0x35, 0x7d, 0x3b, 0x36, 0x2e, 0x6f, 0xdf, 0x59, 0xb7, 0xf2,
+        0x9d, 0x89, 0x9a, 0x31, 0x2f, 0x37, 0x2f, 0x6f, 0xff, 0xe9, 0x2a, 0xef,
+        0xec, 0xd9, 0xb0, 0xbc, 0xef, 0xd1, 0x4d, 0x35, 0x63, 0xa0, 0x53, 0x0e,
+        0x72, 0xab, 0x60, 0xfc, 0x03, 0x37, 0xf9, 0xcf, 0xc9, 0xdf, 0x5a, 0x5d,
+        0x52, 0x5b, 0x47, 0xdb, 0x84, 0x1c, 0x2e, 0x18, 0xb0, 0x39, 0xdb, 0xcc,
+        0x5c, 0x32, 0xf2, 0xd0, 0xa9, 0x5c, 0x39, 0x98, 0x8f, 0xb6, 0x5c, 0x5b,
+        0xdb, 0x08, 0x6a, 0x1a, 0x8c, 0xbb, 0xe2, 0xd0, 0x9b, 0xfd, 0x90, 0x71,
+        0x6a, 0xa2, 0x28, 0x4b, 0x36, 0xdc, 0x66, 0xae, 0x65, 0xc3, 0x4f, 0x6b,
+        0xdc, 0x7a, 0x0a, 0x74, 0x56, 0x64, 0x20, 0x5d, 0x4f, 0xff, 0xa4, 0xf1,
+        0x8c, 0x58, 0x54, 0xa9, 0x44, 0xb6, 0x56, 0xe4, 0x48, 0xfa, 0xc3, 0x8a,
+        0x28, 0x1c, 0x9c, 0x50, 0x58, 0x94, 0x34, 0xdb, 0x21, 0x23, 0x1b, 0xb9,
+        0x8d, 0x23, 0x43, 0x0e, 0xfd, 0xd9, 0x31, 0xc6, 0x29, 0x27, 0x7c, 0x9c,
+        0x25, 0x16, 0xa1, 0x8d, 0xbc, 0xae, 0x70, 0xda, 0x50, 0x31, 0x70, 0x61,
+        0x9e, 0xd8, 0x4e, 0x3c, 0x85, 0xdf, 0xb6, 0x39, 0xef, 0x6a, 0x78, 0x19,
+        0x8b, 0x32, 0x3e, 0xb4, 0xdc, 0x17, 0xe0, 0x1b, 0xf9, 0x8c, 0x71, 0x04,
+        0xee, 0x4b, 0xaa, 0xae, 0x56, 0x5c, 0xbe, 0x97, 0xcd, 0xcc, 0x43, 0xae,
+        0x63, 0x7f, 0xab, 0x63, 0x54, 0xbb, 0x79, 0x6d, 0x7b, 0xde, 0x5b, 0xb5,
+        0xe7, 0x40, 0xdf, 0x56, 0xab, 0x59, 0xbc, 0xa3, 0xf8, 0xff, 0x52, 0x39,
+        0x75, 0xaa, 0x08, 0xfb, 0x59, 0x50, 0x39, 0x7a, 0x20, 0x0b, 0xc6, 0x3c,
+        0xa9, 0x67, 0x66, 0xe9, 0x2d, 0x54, 0x8e, 0xc2, 0xfc, 0xa4, 0x22, 0xbb,
+        0xd3, 0xff, 0xa6, 0xf6, 0x9e, 0x35, 0x3b, 0xeb, 0x18, 0x63, 0x2c, 0x78,
+        0xe4, 0x53, 0x1a, 0xcf, 0x11, 0xfb, 0xa7, 0x7f, 0x26, 0x79, 0x87, 0x7d,
+        0xbf, 0xac, 0xcc, 0x21, 0x36, 0x52, 0xf1, 0x92, 0x8a, 0x0f, 0x18, 0xef,
+        0x1d, 0x01, 0x8f, 0xc8, 0xc7, 0x01, 0xf0, 0x36, 0x88, 0x19, 0xfe, 0x91,
+        0xbe, 0x58, 0x96, 0xc7, 0xd1, 0xc8, 0xb4, 0x4a, 0x97, 0x30, 0xa7, 0x89,
+        0xf9, 0xe8, 0xe3, 0xe8, 0x47, 0xd8, 0x5f, 0x88, 0x32, 0xb6, 0xf3, 0x63,
+        0x83, 0x08, 0xd6, 0xb3, 0x80, 0x83, 0xef, 0x0a, 0x63, 0x9a, 0x61, 0x25,
+        0x03, 0x62, 0x29, 0x9f, 0xb1, 0x2f, 0xa6, 0x63, 0xef, 0xb8, 0x8e, 0xb5,
+        0x6d, 0x1d, 0x6b, 0x93, 0x0e, 0xd6, 0x2d, 0x83, 0x38, 0x82, 0x72, 0xba,
+        0x70, 0xdc, 0xdc, 0xca, 0x38, 0xa2, 0x49, 0x56, 0x8f, 0x23, 0x02, 0x9a,
+        0x76, 0x82, 0x26, 0xc6, 0x7d, 0xaa, 0x4e, 0xd5, 0xec, 0xd7, 0xc6, 0x48,
+        0x43, 0xe0, 0x27, 0x95, 0x3f, 0x9e, 0x80, 0xeb, 0xc3, 0xde, 0x10, 0x48,
+        0x02, 0xdb, 0x73, 0x93, 0x3b, 0xb5, 0xdf, 0x65, 0x0e, 0xc1, 0xf8, 0xdd,
+        0xd7, 0xd3, 0x5c, 0x7a, 0x34, 0x98, 0xa7, 0x05, 0x9e, 0x32, 0x54, 0x43,
+        0xe3, 0x5a, 0x8c, 0x7b, 0x82, 0x18, 0x68, 0x8f, 0x8e, 0x81, 0xfa, 0xe5,
+        0x88, 0xe7, 0xe7, 0x0c, 0x03, 0xa5, 0x01, 0xf4, 0x29, 0xda, 0x13, 0x8c,
+        0x35, 0x4d, 0x93, 0xb1, 0x66, 0x0a, 0xc9, 0x87, 0xbf, 0x97, 0xb6, 0xad,
+        0xac, 0x65, 0x06, 0x7b, 0x69, 0xbc, 0xb0, 0x7c, 0x2f, 0xbb, 0x94, 0xde,
+        0x9b, 0xe0, 0x9d, 0x8f, 0x4d, 0x9c, 0xf3, 0x7c, 0x94, 0xb8, 0x35, 0x50,
+        0x1a, 0x54, 0xf3, 0x8e, 0xaf, 0x98, 0x57, 0xb0, 0xc7, 0x03, 0x6b, 0x3c,
+        0xe3, 0xfe, 0x19, 0x5b, 0xd8, 0x7a, 0xff, 0x81, 0x0c, 0x2f, 0x63, 0xce,
+        0x2e, 0xa3, 0xa0, 0xe2, 0xb6, 0x83, 0x4a, 0x1e, 0x85, 0xd2, 0x10, 0xae,
+        0xb4, 0x17, 0x35, 0x8f, 0xb2, 0x99, 0x51, 0x25, 0x83, 0x11, 0xb5, 0xc7,
+        0xb9, 0xd2, 0x23, 0x88, 0xd7, 0xbe, 0x0e, 0x3f, 0x18, 0xae, 0x2b, 0x3a,
+        0x18, 0x43, 0x5e, 0x15, 0x43, 0x78, 0x4a, 0x9a, 0x59, 0x33, 0xbc, 0x82,
+        0x35, 0xb8, 0xe7, 0x38, 0xe4, 0x6f, 0xf8, 0xcf, 0xd5, 0xfa, 0x01, 0xcf,
+        0xeb, 0x42, 0xf4, 0x54, 0x10, 0xbf, 0x26, 0x40, 0x43, 0xf8, 0x9d, 0x63,
+        0xd2, 0xe7, 0x51, 0x56, 0xed, 0x89, 0x11, 0xe4, 0xbb, 0x05, 0x09, 0x62,
+        0x11, 0xae, 0x4f, 0x0c, 0xc8, 0x23, 0x97, 0x4a, 0x60, 0x7f, 0x01, 0x5f,
+        0x03, 0x9e, 0xc6, 0x2f, 0xd4, 0xea, 0xc7, 0x38, 0xe8, 0x19, 0xf6, 0xc8,
+        0xa7, 0x40, 0x6f, 0x83, 0xb5, 0x2f, 0xab, 0xfd, 0x8c, 0xa9, 0xda, 0xe7,
+        0xfa, 0xba, 0x40, 0x7f, 0x47, 0x11, 0xb7, 0xf8, 0xfa, 0xf8, 0x7b, 0x9a,
+        0x37, 0x81, 0xde, 0xc6, 0xb5, 0x0e, 0x30, 0x47, 0xa4, 0x5d, 0x05, 0x3a,
+        0xd2, 0x61, 0xef, 0x57, 0xbc, 0xe0, 0x33, 0x95, 0x13, 0x2a, 0x39, 0x0f,
+        0x55, 0xe5, 0xbc, 0xbe, 0x46, 0x67, 0x3b, 0x6d, 0xdf, 0x46, 0x69, 0x8b,
+        0xb0, 0x69, 0xd0, 0xf7, 0xd2, 0x32, 0xdb, 0xef, 0x5a, 0xa3, 0xae, 0x1c,
+        0x97, 0xc8, 0xcc, 0x0f, 0xc0, 0xcb, 0xdb, 0x91, 0xd7, 0x20, 0xcb, 0x9f,
+        0x22, 0x46, 0x31, 0xfe, 0x58, 0x8a, 0x89, 0xe7, 0x64, 0xb5, 0x78, 0xf8,
+        0x5a, 0xb1, 0xc7, 0x9d, 0xd7, 0x19, 0x7b, 0xfc, 0x49, 0x1d, 0xf3, 0x9c,
+        0x05, 0xd8, 0xe9, 0x21, 0xbc, 0x5f, 0xe7, 0xfe, 0x10, 0x3e, 0xed, 0xaf,
+        0xac, 0x7a, 0x37, 0xc0, 0x8b, 0xb8, 0x6c, 0x9c, 0xd9, 0xac, 0x30, 0xc3,
+        0x9e, 0x5a, 0xc2, 0x8c, 0x51, 0xcf, 0xd7, 0x5f, 0xf0, 0xca, 0xd9, 0x28,
+        0xd7, 0x9b, 0x77, 0x2f, 0xe5, 0x10, 0x43, 0xd5, 0x1c, 0xe2, 0x96, 0x1a,
+        0x3e, 0xae, 0x86, 0x99, 0xe7, 0x54, 0xbe, 0xfc, 0x6a, 0x39, 0xf5, 0x82,
+        0x48, 0x1f, 0xf2, 0xe4, 0xd4, 0x79, 0x91, 0x2c, 0x72, 0x65, 0xe6, 0x73,
+        0x7b, 0x90, 0x3b, 0xa7, 0x7e, 0x21, 0xd2, 0x8b, 0x9c, 0x99, 0xf9, 0x70,
+        0x3f, 0xf8, 0xda, 0x03, 0x4c, 0x4d, 0x03, 0x63, 0xb7, 0x83, 0xbf, 0x5d,
+        0x0a, 0x57, 0x0f, 0x9d, 0x46, 0xae, 0xad, 0xea, 0xec, 0xb4, 0x75, 0x07,
+        0x7e, 0xb5, 0x52, 0x79, 0x2c, 0xdd, 0x8e, 0x7c, 0x3f, 0x29, 0x5f, 0xb6,
+        0x98, 0xf3, 0x1a, 0x56, 0xae, 0x7b, 0x26, 0x12, 0x8e, 0x63, 0x0b, 0xd7,
+        0xf4, 0x11, 0x2b, 0x79, 0x3f, 0xac, 0xfc, 0xc4, 0x78, 0xe4, 0x6a, 0xbc,
+        0xdf, 0x5f, 0xe5, 0xfd, 0x9d, 0x0d, 0xd2, 0xd0, 0xaf, 0xea, 0x0b, 0xb9,
+        0xee, 0xaf, 0x13, 0xcb, 0xd2, 0xf0, 0xf3, 0xf0, 0xc7, 0x15, 0xb9, 0x3f,
+        0x7d, 0xa5, 0x72, 0xd1, 0xdd, 0x20, 0x85, 0xed, 0x07, 0x34, 0x9e, 0x1f,
+        0x78, 0x32, 0xe7, 0x16, 0x61, 0x1f, 0xfa, 0xdb, 0xc2, 0x64, 0x0c, 0x51,
+        0x29, 0xff, 0x9a, 0x65, 0xae, 0xf7, 0xf6, 0x7a, 0x69, 0xd8, 0xf6, 0x02,
+        0x8b, 0x63, 0xc4, 0x99, 0x39, 0x27, 0xae, 0xea, 0xdd, 0x37, 0xb9, 0xec,
+        0xb7, 0x21, 0xd3, 0xdf, 0x92, 0x39, 0xc4, 0x13, 0xf3, 0xbd, 0xa0, 0x71,
+        0x7b, 0x0b, 0xc6, 0xd3, 0xee, 0xc8, 0xf3, 0xdf, 0x96, 0xa1, 0x41, 0xf2,
+        0xd4, 0xc1, 0xf8, 0xfb, 0x31, 0xa6, 0x19, 0xd7, 0x07, 0x23, 0x73, 0x76,
+        0xcc, 0x6f, 0x0f, 0x70, 0x0e, 0xfa, 0x52, 0xce, 0xc3, 0xb5, 0x5a, 0x94,
+        0xcd, 0x2f, 0xcd, 0xcf, 0xb9, 0xf9, 0xec, 0xe3, 0xca, 0xbe, 0xee, 0xee,
+        0xd0, 0x1a, 0x4d, 0xa1, 0x35, 0x7a, 0x42, 0x6b, 0x90, 0xb6, 0xe6, 0x10,
+        0x6d, 0xcd, 0x78, 0xff, 0x3e, 0xac, 0xd7, 0xaf, 0xe3, 0x94, 0x60, 0x9d,
+        0x60, 0x1f, 0x2d, 0xa1, 0xb1, 0x1f, 0x62, 0x0d, 0xf6, 0x39, 0xa1, 0x3e,
+        0xae, 0x0b, 0x1c, 0x73, 0xd8, 0x6e, 0x0e, 0xd1, 0x42, 0xfa, 0x1a, 0xd0,
+        0xaf, 0xe6, 0x02, 0x3f, 0x1b, 0xe0, 0xbb, 0x4c, 0xf8, 0x8f, 0x08, 0xe2,
+        0xaa, 0x60, 0x4f, 0xc1, 0x1c, 0x0e, 0xde, 0xe3, 0x18, 0xff, 0xb9, 0xff,
+        0x0e, 0xfb, 0xf9, 0x3c, 0x22, 0xdf, 0x53, 0xf4, 0xb2, 0xcd, 0x3d, 0x34,
+        0x81, 0x56, 0x5e, 0x53, 0x32, 0xdb, 0x0c, 0xd9, 0x77, 0x33, 0x9f, 0x36,
+        0xe4, 0x36, 0xd7, 0x34, 0xf2, 0xdd, 0x94, 0xef, 0x06, 0x8d, 0x97, 0x0d,
+        0x46, 0xee, 0x34, 0x6b, 0x08, 0x8d, 0x3a, 0xf7, 0x43, 0xbe, 0xa1, 0x7c,
+        0x4c, 0xe0, 0x03, 0xe8, 0x63, 0x18, 0xab, 0xd0, 0x7f, 0x66, 0xf5, 0x3d,
+        0xae, 0xd0, 0xd3, 0xc3, 0xf3, 0xcd, 0x72, 0x51, 0xf1, 0xd0, 0x96, 0xc5,
+        0x2a, 0x0f, 0xa3, 0xfa, 0xbb, 0xd1, 0x31, 0xfd, 0x4d, 0x66, 0x3f, 0xe2,
+        0x01, 0xdc, 0x97, 0x80, 0xb9, 0xdd, 0xd0, 0xb7, 0x6e, 0xe6, 0x70, 0x45,
+        0x5c, 0x59, 0xc3, 0x30, 0x70, 0x75, 0x70, 0x8d, 0xe1, 0x0a, 0xbf, 0x04,
+        0xac, 0xc9, 0x77, 0xbf, 0x0d, 0x1d, 0x82, 0x6c, 0xca, 0xb6, 0x71, 0xbf,
+        0xe7, 0xd7, 0x87, 0x16, 0xdd, 0xd5, 0xeb, 0x43, 0x8b, 0xa2, 0xea, 0x43,
+        0x13, 0xd7, 0xa8, 0x0f, 0x65, 0xaf, 0xbf, 0x3e, 0x74, 0xa2, 0x9e, 0x18,
+        0xbc, 0xb7, 0x47, 0x8c, 0xdf, 0xd5, 0xf5, 0xa1, 0xf7, 0xc5, 0xaf, 0x0f,
+        0x5d, 0x94, 0xd5, 0xeb, 0x43, 0x13, 0x35, 0xf5, 0xa1, 0x8d, 0xaa, 0x3e,
+        0xc4, 0x79, 0xfc, 0xfa, 0x10, 0xdb, 0x6d, 0xdd, 0xbd, 0xa1, 0x3a, 0x08,
+        0xf0, 0x54, 0xe5, 0x84, 0xb6, 0x31, 0xe8, 0x05, 0x18, 0x45, 0x2c, 0xbf,
+        0xb9, 0xea, 0x8f, 0x96, 0xf0, 0xca, 0x50, 0xba, 0x75, 0x2d, 0xbc, 0x1a,
+        0xf4, 0x63, 0x90, 0x65, 0x58, 0x35, 0x5e, 0x8d, 0x53, 0x5e, 0xab, 0x67,
+        0xde, 0x3c, 0x56, 0x5a, 0x9a, 0x77, 0x0c, 0xb2, 0x1d, 0xaa, 0xd6, 0x50,
+        0xd6, 0x8a, 0x85, 0x1c, 0x39, 0xb6, 0xea, 0x37, 0xb8, 0x44, 0x76, 0xe5,
+        0x37, 0x38, 0x43, 0x1c, 0xd0, 0xd9, 0xd6, 0x5d, 0x50, 0x79, 0xd5, 0x9c,
+        0xf7, 0x55, 0xb9, 0xf0, 0xb0, 0x0d, 0x3c, 0x09, 0x6a, 0x26, 0x94, 0xe5,
+        0x92, 0x8f, 0x28, 0x98, 0x9f, 0x5f, 0xdd, 0xe4, 0xb0, 0xaa, 0x9b, 0xfc,
+        0xbc, 0x3e, 0x5c, 0x37, 0x59, 0x94, 0xab, 0xd7, 0x4d, 0x0e, 0xaf, 0x52,
+        0x37, 0x79, 0x53, 0x96, 0xea, 0x26, 0x6f, 0x4a, 0x50, 0x37, 0x89, 0xc8,
+        0x85, 0x4d, 0x9c, 0xe7, 0x08, 0xde, 0x19, 0xc0, 0xaf, 0x1f, 0x3f, 0xbf,
+        0x8e, 0xb2, 0x58, 0xa5, 0x7f, 0xb5, 0x3a, 0x4a, 0x7d, 0xec, 0x93, 0xd4,
+        0x51, 0x7c, 0x4c, 0x0f, 0xea, 0x28, 0x0d, 0x88, 0x5f, 0xe0, 0x43, 0xcc,
+        0x70, 0x1d, 0xa5, 0x15, 0xf3, 0xb2, 0x8f, 0x6d, 0xf6, 0xc3, 0x2e, 0xe0,
+        0x67, 0xb2, 0xaa, 0xce, 0xf1, 0x9b, 0x9a, 0x87, 0x07, 0xb0, 0xe7, 0x24,
+        0x64, 0x41, 0x3e, 0xb6, 0xab, 0x38, 0x32, 0x6b, 0x25, 0x8c, 0x5c, 0x27,
+        0xbc, 0xd3, 0x24, 0xbf, 0xd9, 0x27, 0x64, 0xa4, 0x4c, 0x1d, 0x6f, 0x45,
+        0xdc, 0x6d, 0xa1, 0xef, 0x00, 0xda, 0x41, 0x8c, 0xd4, 0x5d, 0x9d, 0x83,
+        0x76, 0x38, 0xc7, 0x7a, 0x9f, 0x73, 0x3d, 0x3e, 0x67, 0x27, 0x68, 0x0e,
+        0xef, 0xa3, 0x08, 0x7f, 0x83, 0x3e, 0x25, 0x73, 0xc6, 0x8a, 0x01, 0x2d,
+        0x49, 0xda, 0xf4, 0x75, 0xcc, 0xc7, 0xbe, 0x9d, 0x2a, 0xdf, 0x1a, 0xee,
+        0xe1, 0x5e, 0xe9, 0xbb, 0x16, 0x40, 0x1f, 0xfa, 0xe6, 0x99, 0xe3, 0xd1,
+        0x8f, 0x05, 0x39, 0x58, 0x5c, 0xe5, 0x60, 0x2d, 0x8a, 0x1f, 0xe4, 0xf5,
+        0x23, 0x31, 0xe2, 0x63, 0x8b, 0xcb, 0x3d, 0xf4, 0x6b, 0x5c, 0x63, 0xdb,
+        0xcf, 0xf5, 0x58, 0x8f, 0x6e, 0x71, 0x9f, 0x80, 0x5c, 0x59, 0xab, 0x09,
+        0xe4, 0xf7, 0x0d, 0xbd, 0xef, 0x5e, 0x29, 0xb6, 0x48, 0x6c, 0x23, 0xe8,
+        0x69, 0x9b, 0x62, 0x8c, 0x7d, 0x8f, 0xca, 0x37, 0x1c, 0x77, 0x6d, 0xbb,
+        0xdd, 0x7f, 0x03, 0x76, 0x3b, 0x70, 0x55, 0xbb, 0x3d, 0x1b, 0x0b, 0xdb,
+        0xed, 0xfe, 0x1b, 0xb0, 0xdb, 0x23, 0x37, 0x64, 0xb7, 0xdc, 0x1b, 0x31,
+        0x29, 0xa8, 0x8b, 0xad, 0x8c, 0x9b, 0x82, 0x75, 0x47, 0xb1, 0x66, 0x76,
+        0x8d, 0x35, 0x87, 0xd6, 0xac, 0xbb, 0xd6, 0xc6, 0x4c, 0xd7, 0x23, 0x6f,
+        0xe6, 0x21, 0xf4, 0xab, 0x71, 0xed, 0x83, 0x9e, 0xd6, 0x3a, 0x1f, 0xe4,
+        0xed, 0x61, 0xfb, 0xa1, 0x5e, 0x50, 0x17, 0x7e, 0x02, 0x7e, 0x51, 0x1f,
+        0x02, 0x9b, 0x6b, 0xaf, 0xd1, 0xc1, 0x05, 0xe4, 0xf3, 0xed, 0x5a, 0x07,
+        0x29, 0xeb, 0x4e, 0xf5, 0x3d, 0x69, 0xde, 0x7b, 0xc2, 0xcf, 0xe3, 0xa1,
+        0x03, 0x85, 0xf9, 0xc0, 0xd6, 0x92, 0x58, 0x37, 0x78, 0x46, 0x3e, 0xba,
+        0x88, 0x61, 0xb6, 0x21, 0xfe, 0x02, 0x8f, 0x54, 0xff, 0xf2, 0x3a, 0xf0,
+        0xd5, 0xf1, 0x4c, 0x8a, 0x51, 0x8c, 0x7d, 0xae, 0x07, 0x36, 0xde, 0x43,
+        0x8c, 0xca, 0x20, 0x8f, 0xa1, 0x1e, 0x52, 0x37, 0x3b, 0xba, 0x0e, 0x99,
+        0x8c, 0x91, 0x0e, 0xc2, 0xf6, 0x6c, 0xa5, 0xc7, 0xbb, 0xcb, 0x1d, 0xe7,
+        0x16, 0x4d, 0xae, 0x51, 0xa9, 0x14, 0x54, 0xbd, 0x5e, 0xcc, 0x5c, 0xf7,
+        0x4d, 0xeb, 0xe8, 0x97, 0x6e, 0x76, 0x23, 0x5a, 0xd7, 0xb2, 0xb8, 0xa7,
+        0xde, 0xfe, 0x2b, 0x7c, 0x3b, 0xf2, 0x89, 0xee, 0x7f, 0x41, 0x7f, 0x02,
+        0x36, 0x4f, 0x5f, 0xce, 0xfc, 0x62, 0x87, 0x1e, 0xd7, 0xae, 0xbe, 0x95,
+        0xaa, 0xef, 0x2d, 0x4e, 0xe0, 0x7f, 0x52, 0xf4, 0xcf, 0xcb, 0xe4, 0xcc,
+        0xb3, 0x1b, 0x79, 0x95, 0x9f, 0xf0, 0x7d, 0xa5, 0x93, 0xc8, 0x29, 0xac,
+        0x50, 0x9d, 0x3d, 0xa6, 0x73, 0x31, 0xda, 0x58, 0x5c, 0xe5, 0x89, 0x7e,
+        0xee, 0xc1, 0x5c, 0x75, 0xf9, 0x99, 0x8d, 0xd5, 0x75, 0x60, 0xf3, 0x27,
+        0xd0, 0x81, 0x5a, 0xf9, 0xc5, 0x60, 0xfb, 0x81, 0xfc, 0x82, 0x98, 0x65,
+        0x56, 0xef, 0xbb, 0xdd, 0x97, 0xe1, 0xff, 0x8b, 0x7d, 0x1a, 0xa1, 0x7d,
+        0x06, 0x78, 0x74, 0x58, 0xef, 0x73, 0x47, 0x0d, 0x1e, 0x0d, 0xd4, 0xd8,
+        0xec, 0xe7, 0x89, 0x47, 0x97, 0xd7, 0x7d, 0xfe, 0x78, 0xc4, 0x7d, 0x6d,
+        0x59, 0x15, 0x87, 0xfc, 0x7d, 0x3c, 0x2d, 0x66, 0xe6, 0xb3, 0xcc, 0xdf,
+        0x3e, 0x89, 0x7c, 0xc2, 0x38, 0x42, 0x99, 0x34, 0xa9, 0x78, 0xd5, 0xb7,
+        0x3d, 0xf8, 0xf2, 0xf9, 0xa8, 0xbc, 0xf7, 0x50, 0x4c, 0x7e, 0x75, 0x2f,
+        0xbf, 0x95, 0x59, 0xba, 0x7e, 0xc5, 0x76, 0xb4, 0xc1, 0xf7, 0x43, 0x48,
+        0x24, 0x94, 0xdf, 0xe1, 0x3b, 0x81, 0x3d, 0xdb, 0x78, 0xce, 0x67, 0x5b,
+        0xe4, 0x42, 0xf3, 0x8d, 0xe4, 0x74, 0x1d, 0xf6, 0xfb, 0xe6, 0x6a, 0x39,
+        0xdd, 0xd5, 0x6b, 0x7f, 0x4b, 0x39, 0x1d, 0x71, 0xb6, 0x59, 0xd7, 0x7b,
+        0x98, 0xd7, 0xec, 0xd7, 0xd8, 0xc9, 0x7b, 0xe4, 0xaa, 0x1e, 0xf2, 0x57,
+        0xc8, 0xf6, 0x35, 0xc4, 0x4b, 0xaf, 0x7a, 0xc8, 0x59, 0x3d, 0xe4, 0xaa,
+        0x1e, 0x72, 0x55, 0x0f, 0xb9, 0xaa, 0xd7, 0xa5, 0x73, 0xde, 0x01, 0x5d,
+        0xd7, 0xe7, 0xf7, 0x70, 0xd6, 0x0b, 0x8a, 0xf0, 0x25, 0xe3, 0x3c, 0x63,
+        0x61, 0xe6, 0xd2, 0xeb, 0x82, 0x73, 0x48, 0xba, 0xe6, 0xdd, 0xaa, 0x6b,
+        0x30, 0x75, 0x37, 0x29, 0xdf, 0x6c, 0xbe, 0xd1, 0xe0, 0x7f, 0x33, 0xe7,
+        0xf9, 0x8f, 0x3f, 0x44, 0x5c, 0xc2, 0x1a, 0xd8, 0x04, 0x6d, 0xb4, 0x62,
+        0x66, 0x58, 0x63, 0x11, 0xd3, 0xcc, 0x7c, 0x01, 0xef, 0x6c, 0xc3, 0x1e,
+        0xea, 0x69, 0xdb, 0x11, 0x33, 0xd3, 0x48, 0x9e, 0x1a, 0x66, 0x66, 0xbd,
+        0x9e, 0xeb, 0x6f, 0x1a, 0xfc, 0xd8, 0xaa, 0x93, 0x6d, 0xcb, 0x64, 0x9c,
+        0xa0, 0x62, 0xed, 0xa0, 0x7f, 0x4f, 0xf3, 0xf2, 0xb5, 0xa2, 0x0a, 0xdf,
+        0x73, 0xe9, 0x87, 0x31, 0x9f, 0x3a, 0xdb, 0x54, 0xe5, 0xb7, 0xb9, 0x26,
+        0xbf, 0xa3, 0x9a, 0xdf, 0x3e, 0x8f, 0x23, 0x1c, 0xa7, 0xea, 0xbe, 0xe4,
+        0x75, 0x30, 0x9f, 0xaa, 0xe1, 0x61, 0x1d, 0x75, 0x8e, 0x03, 0xd7, 0xbb,
+        0xa2, 0xd2, 0x34, 0x78, 0x20, 0xea, 0x86, 0xd7, 0x25, 0x46, 0xf5, 0x2e,
+        0xfb, 0xfe, 0xb4, 0xf6, 0x9a, 0xed, 0xea, 0xdb, 0x99, 0xef, 0x33, 0xa2,
+        0x4a, 0x07, 0x2d, 0x75, 0x36, 0xef, 0xd7, 0xea, 0xcc, 0x0d, 0xf5, 0x2f,
+        0x8f, 0x3c, 0x66, 0xbc, 0xa7, 0x23, 0x69, 0x99, 0x7f, 0xd1, 0xc0, 0x5a,
+        0x6b, 0x5f, 0x39, 0xc0, 0x3d, 0xae, 0x57, 0xeb, 0xc7, 0x59, 0x27, 0x0b,
+        0xf0, 0x4c, 0x36, 0xfb, 0xf5, 0xb3, 0x4f, 0x63, 0x4b, 0x0d, 0x35, 0xb6,
+        0x14, 0xec, 0xd3, 0xcf, 0x57, 0xf9, 0xdd, 0x7a, 0xb5, 0xb3, 0x13, 0x0b,
+        0xe5, 0xd0, 0xf7, 0x8f, 0xaa, 0x6e, 0xf0, 0x5c, 0xcb, 0x83, 0xd0, 0x41,
+        0xd6, 0xfe, 0xf7, 0xc0, 0x8e, 0x2a, 0x95, 0x3e, 0xd6, 0x93, 0xb7, 0x3f,
+        0xa0, 0xcf, 0x27, 0x3c, 0xa3, 0xea, 0x09, 0xd6, 0x8a, 0x7a, 0x42, 0x1f,
+        0x74, 0x05, 0x31, 0x00, 0x6c, 0xb0, 0xa0, 0x64, 0xc9, 0x78, 0xa0, 0xf6,
+        0xfb, 0xca, 0xf9, 0x46, 0x9f, 0x0f, 0xb7, 0x37, 0xfa, 0xdf, 0x18, 0x7e,
+        0xe9, 0x2c, 0x6f, 0xf3, 0xfd, 0x44, 0x63, 0x70, 0xce, 0x67, 0xf8, 0x4c,
+        0x1f, 0x74, 0xb1, 0x4e, 0xf2, 0x6a, 0x3e, 0xc4, 0xbb, 0xcf, 0xff, 0xac,
+        0x79, 0xf9, 0x78, 0xf4, 0x9d, 0x09, 0xc6, 0x37, 0xd7, 0x8c, 0x6f, 0xc6,
+        0xf8, 0x7f, 0xaf, 0x19, 0xdf, 0x1c, 0x1a, 0xef, 0xd4, 0x8c, 0x77, 0x30,
+        0xbe, 0x7e, 0xd3, 0xf2, 0xf1, 0x4e, 0x68, 0x7c, 0x4b, 0xcd, 0xf8, 0x16,
+        0x8c, 0x6f, 0xa8, 0x19, 0x8f, 0xbe, 0x33, 0x75, 0xfa, 0xbb, 0x17, 0x31,
+        0xf6, 0x88, 0xce, 0xbb, 0x71, 0x2d, 0xd5, 0x7e, 0x4b, 0xa1, 0xde, 0xb5,
+        0x42, 0x06, 0xc1, 0x39, 0x3b, 0xda, 0x6b, 0x16, 0xf6, 0xba, 0x14, 0xcb,
+        0xf8, 0xfa, 0x18, 0xd6, 0x45, 0xe2, 0x43, 0x51, 0x22, 0x2e, 0x74, 0x67,
+        0x1e, 0x3a, 0x34, 0x1f, 0xf8, 0x24, 0x9e, 0x99, 0x4a, 0x75, 0xf9, 0x7a,
+        0x6a, 0x48, 0xd4, 0x5d, 0xd0, 0x39, 0xd8, 0x4e, 0xd2, 0x0e, 0xbc, 0x0c,
+        0x30, 0x53, 0x4e, 0xf9, 0x76, 0x43, 0xfd, 0xe5, 0xfc, 0xda, 0x7e, 0xa8,
+        0xab, 0x7a, 0x9d, 0xbe, 0x15, 0xb8, 0x96, 0x5c, 0x51, 0xab, 0x8a, 0x5c,
+        0x07, 0xae, 0x0d, 0x54, 0x71, 0xed, 0x41, 0x99, 0xad, 0xe6, 0xdb, 0xfd,
+        0x72, 0xd4, 0xdb, 0xcb, 0xf3, 0x38, 0xa7, 0xb2, 0xf2, 0xd9, 0xe4, 0xdb,
+        0x7b, 0xab, 0x7e, 0x32, 0x35, 0x91, 0x95, 0x0b, 0xc7, 0x99, 0x43, 0x05,
+        0xb5, 0xd6, 0x71, 0xef, 0x5b, 0x94, 0x0b, 0x6c, 0xe3, 0x46, 0xf3, 0x6d,
+        0xce, 0xe7, 0xc8, 0x51, 0xff, 0x2c, 0x44, 0x75, 0xde, 0x62, 0x75, 0xde,
+        0x84, 0xb6, 0x37, 0xfa, 0xe0, 0x25, 0x7f, 0x99, 0x87, 0xbf, 0x1c, 0x42,
+        0xce, 0xbd, 0xe0, 0xad, 0x56, 0xef, 0xbc, 0x51, 0x7f, 0x59, 0x5b, 0x37,
+        0xae, 0xf5, 0x97, 0x5c, 0xa7, 0xb6, 0x56, 0x9c, 0xac, 0xc1, 0x7f, 0xea,
+        0xd3, 0x53, 0x3a, 0xa6, 0xc6, 0x75, 0xfe, 0x29, 0xd8, 0xa3, 0x29, 0x43,
+        0x4a, 0x7f, 0xd9, 0x0e, 0x72, 0xcb, 0x03, 0xd5, 0xdc, 0x72, 0x29, 0x1f,
+        0x44, 0xec, 0xda, 0x75, 0x9f, 0xc6, 0x47, 0xc6, 0xc8, 0xe3, 0xe8, 0x3f,
+        0x05, 0x1d, 0xe0, 0x33, 0xd6, 0x3f, 0xef, 0x90, 0x2f, 0x5b, 0xbe, 0x7f,
+        0xf2, 0xeb, 0x50, 0x07, 0x54, 0xfc, 0xcf, 0xfa, 0xff, 0x70, 0x7a, 0xa3,
+        0x8e, 0xf7, 0xae, 0x85, 0xab, 0xcb, 0x73, 0x53, 0xd3, 0x3c, 0x81, 0x77,
+        0x99, 0x9b, 0x3e, 0x10, 0x27, 0x86, 0xe6, 0xca, 0x57, 0x7d, 0xbf, 0x48,
+        0xff, 0x32, 0xac, 0xbe, 0xfb, 0xa9, 0x3c, 0x14, 0xe3, 0x16, 0xf4, 0xfb,
+        0x7e, 0x1e, 0x9a, 0x2b, 0x6f, 0x89, 0xfb, 0x38, 0x78, 0xb5, 0x9c, 0xe5,
+        0x58, 0x9c, 0xb5, 0xbc, 0x05, 0xef, 0x5a, 0xb4, 0xae, 0xcc, 0x7b, 0x23,
+        0x2b, 0xf2, 0xde, 0x41, 0x9d, 0xd7, 0x7e, 0x45, 0xe5, 0xbd, 0x3e, 0x8f,
+        0xb9, 0x97, 0x70, 0x1e, 0xe5, 0x02, 0x0b, 0xf9, 0x8d, 0x84, 0xf8, 0x30,
+        0xaa, 0xfc, 0x56, 0x61, 0xf2, 0x77, 0xd4, 0xf9, 0x89, 0x95, 0x7a, 0xf3,
+        0x79, 0xfb, 0x89, 0x60, 0xef, 0x4f, 0x89, 0x5f, 0xaf, 0xdb, 0x03, 0x5a,
+        0x98, 0x5b, 0x45, 0xb5, 0x3e, 0xa4, 0x34, 0x5e, 0x07, 0xe3, 0x82, 0x3c,
+        0xbe, 0xfa, 0x5d, 0xb5, 0x98, 0x5d, 0x56, 0x3f, 0xd9, 0x42, 0x18, 0x86,
+        0xdc, 0xb3, 0x37, 0xf0, 0x1d, 0xe2, 0xd3, 0x9c, 0x7f, 0xa8, 0xf5, 0x6b,
+        0xfc, 0x46, 0xda, 0xaa, 0xcf, 0xc7, 0xb9, 0xb0, 0x01, 0x9e, 0x65, 0x0e,
+        0xe3, 0xab, 0x3a, 0x03, 0x17, 0x73, 0x32, 0x62, 0xec, 0x23, 0x7d, 0xe9,
+        0x7f, 0xd6, 0xfb, 0x4c, 0xc8, 0x91, 0x29, 0xbf, 0xbe, 0x69, 0xae, 0x71,
+        0xfe, 0xcd, 0x34, 0xaf, 0xab, 0xbe, 0x79, 0x03, 0xe7, 0xdf, 0x5e, 0x8f,
+        0x07, 0xf5, 0xcd, 0xda, 0xf3, 0x6f, 0x91, 0xeb, 0x3c, 0xff, 0xe6, 0xd7,
+        0x37, 0x39, 0x4f, 0xb8, 0xbe, 0x79, 0x8f, 0x3a, 0x43, 0x36, 0x3a, 0xd5,
+        0xa3, 0xce, 0x23, 0xb7, 0x75, 0xaf, 0x8d, 0xb3, 0xfb, 0x3e, 0xb3, 0x7c,
+        0xe4, 0x3f, 0xe3, 0xe1, 0x7c, 0x64, 0xdf, 0xe7, 0x92, 0x8f, 0x70, 0x2f,
+        0xbf, 0xef, 0x7f, 0xb7, 0xad, 0x39, 0xfb, 0x95, 0xfb, 0x1c, 0x6b, 0x98,
+        0x47, 0x54, 0x0d, 0x73, 0xcb, 0xfa, 0x70, 0x0d, 0xd3, 0xbc, 0xc6, 0xd9,
+        0xaf, 0x23, 0xab, 0xd4, 0x30, 0xa3, 0xa1, 0xb3, 0x5f, 0x51, 0x7d, 0xf6,
+        0x6b, 0xa3, 0x8b, 0xbc, 0x51, 0xd7, 0x2c, 0xcd, 0xab, 0x9e, 0xfd, 0xea,
+        0x59, 0xff, 0x49, 0x6a, 0x96, 0xb9, 0x65, 0x35, 0xcb, 0x15, 0x67, 0xbf,
+        0xe0, 0xd7, 0x36, 0x4b, 0x32, 0x94, 0xe3, 0xe4, 0x6e, 0xf0, 0x6c, 0x43,
+        0xfe, 0x3a, 0xe2, 0x80, 0x7d, 0x55, 0x5b, 0xe5, 0xd9, 0xfd, 0x3a, 0xec,
+        0x39, 0x2a, 0x7b, 0x1d, 0xea, 0x27, 0xcf, 0x38, 0x76, 0xc2, 0x16, 0x70,
+        0x2d, 0xb3, 0xdd, 0x45, 0x19, 0x19, 0x03, 0x9d, 0xcb, 0xcf, 0x17, 0x2c,
+        0x9d, 0xd3, 0x8d, 0x55, 0xcf, 0xe9, 0x9e, 0x84, 0xde, 0x98, 0x53, 0x31,
+        0x99, 0x0b, 0xe9, 0xd4, 0x38, 0x62, 0x3b, 0x73, 0xc6, 0xd6, 0xcf, 0x93,
+        0x12, 0x99, 0x72, 0x80, 0x6f, 0x3c, 0xdb, 0xdb, 0x24, 0x91, 0x19, 0xff,
+        0x7b, 0xa3, 0xa9, 0xf0, 0x33, 0x81, 0x31, 0x3c, 0xdb, 0x19, 0x95, 0xa3,
+        0xaa, 0x3e, 0x11, 0xe8, 0xf2, 0x37, 0xc1, 0xe3, 0x4d, 0xd9, 0xa5, 0xb6,
+        0xb3, 0x8a, 0x8f, 0x47, 0xcc, 0x38, 0x45, 0x7d, 0xbe, 0x5b, 0xf2, 0xba,
+        0xf6, 0x33, 0x5c, 0xde, 0xa9, 0x73, 0x09, 0xf5, 0xcd, 0x06, 0xbc, 0x6c,
+        0xd3, 0xfe, 0x16, 0xd7, 0xf9, 0x36, 0xfa, 0x37, 0xc6, 0xcc, 0xd2, 0x37,
+        0xb9, 0x2d, 0x31, 0x02, 0x6c, 0x1b, 0x52, 0x6b, 0xde, 0x08, 0xcf, 0x8d,
+        0x15, 0xf1, 0xd7, 0x8d, 0xf1, 0x3d, 0x88, 0x85, 0xdf, 0xc4, 0xfe, 0xda,
+        0xa0, 0x1f, 0x8f, 0x4b, 0xfe, 0xcc, 0x1d, 0xd2, 0x37, 0x9d, 0x02, 0x3d,
+        0xbf, 0xae, 0x0c, 0xa7, 0x11, 0x37, 0x3f, 0xcf, 0x33, 0x60, 0xc0, 0x4b,
+        0xf0, 0xed, 0x95, 0x15, 0xdf, 0xa0, 0xc3, 0xe7, 0xc6, 0xba, 0xaa, 0xe7,
+        0x80, 0x5e, 0x2a, 0x4b, 0xac, 0x99, 0x34, 0x4f, 0x2d, 0x9d, 0x09, 0x5f,
+        0x28, 0xef, 0x56, 0x7e, 0xec, 0xc5, 0xf2, 0xff, 0x52, 0x77, 0x6d, 0xb1,
+        0x6d, 0x9d, 0xf7, 0xfd, 0xcf, 0x43, 0xea, 0x12, 0xdd, 0x7c, 0x24, 0xd3,
+        0x32, 0x2d, 0xd1, 0xf2, 0x39, 0xd2, 0xb1, 0xc5, 0xd8, 0x5a, 0xc7, 0x6a,
+        0xca, 0x26, 0xac, 0x5a, 0xc2, 0x52, 0xf4, 0x65, 0x59, 0x36, 0xd0, 0x97,
+        0x76, 0x1e, 0x16, 0xa0, 0x0e, 0x65, 0x3b, 0x1d, 0xd0, 0x07, 0xb7, 0xd9,
+        0x80, 0xa4, 0x03, 0x6c, 0x96, 0xb2, 0x1c, 0xaf, 0x53, 0x4d, 0x36, 0x66,
+        0xd5, 0xac, 0x1b, 0x50, 0x4e, 0x92, 0x9d, 0xb4, 0x50, 0xc0, 0x64, 0xbd,
+        0x60, 0xd8, 0x43, 0xad, 0xc9, 0xf6, 0xf6, 0xb2, 0x87, 0x6c, 0xd8, 0x83,
+        0x81, 0x0d, 0x98, 0x63, 0x05, 0x68, 0x96, 0x02, 0x49, 0x87, 0x15, 0x43,
+        0x1e, 0x36, 0x70, 0xff, 0xdf, 0x77, 0x21, 0x0f, 0x0f, 0x0f, 0x75, 0x89,
+        0x9d, 0x01, 0x33, 0x60, 0x88, 0xe7, 0x9c, 0xef, 0x9c, 0xf3, 0x7d, 0xff,
+        0xef, 0x7f, 0xbf, 0x9d, 0x3a, 0x3f, 0x8f, 0xd8, 0xc3, 0xdc, 0xca, 0x5b,
+        0x0c, 0x8b, 0xbb, 0x42, 0x96, 0xcd, 0xe5, 0x69, 0x28, 0x48, 0xd8, 0x0f,
+        0x0a, 0x30, 0x0c, 0x44, 0x6e, 0x86, 0x8c, 0xcd, 0x47, 0xc5, 0xbe, 0x4a,
+        0x5e, 0x71, 0xcc, 0x95, 0x5b, 0x51, 0xdb, 0x5b, 0x99, 0x73, 0x21, 0xf7,
+        0x42, 0xe6, 0x85, 0x00, 0x9e, 0xab, 0x17, 0x8f, 0x3b, 0x32, 0x2f, 0x64,
+        0x64, 0x01, 0xe7, 0xfa, 0x3d, 0x72, 0xae, 0x9d, 0x71, 0x00, 0x39, 0x44,
+        0xc8, 0x05, 0xc7, 0x9c, 0x85, 0x5f, 0xc3, 0x37, 0x2e, 0xbd, 0x3d, 0xff,
+        0xaa, 0x7c, 0xe7, 0xb0, 0x78, 0xe7, 0x2e, 0xc5, 0xb3, 0x74, 0x0e, 0x78,
+        0x3c, 0x30, 0x93, 0x1f, 0x8d, 0x04, 0x19, 0xbf, 0x67, 0xca, 0xb0, 0xa5,
+        0x9b, 0xe9, 0x6b, 0x1b, 0xc1, 0x33, 0xd1, 0x00, 0xcf, 0x7a, 0x9a, 0x60,
+        0xdb, 0xbb, 0xca, 0xbb, 0x25, 0xec, 0xe4, 0x79, 0xe4, 0xb7, 0xeb, 0xfc,
+        0x04, 0x09, 0xbb, 0x2a, 0x0d, 0x5d, 0x73, 0xe7, 0x26, 0xd4, 0x60, 0x77,
+        0xa6, 0x0a, 0xbb, 0xdd, 0xff, 0x8f, 0x60, 0x77, 0x4f, 0xe8, 0xba, 0x6f,
+        0x95, 0x91, 0x83, 0xa6, 0xe5, 0xbd, 0xae, 0x5d, 0x02, 0x1c, 0xc1, 0x4f,
+        0xed, 0xd2, 0x2a, 0x81, 0xa7, 0x22, 0x6f, 0xb8, 0x52, 0xf9, 0x41, 0xbc,
+        0xea, 0x93, 0x64, 0x1b, 0x04, 0xb6, 0x08, 0x7c, 0x77, 0xcd, 0x65, 0xe4,
+        0xf1, 0x8f, 0x25, 0x23, 0xa1, 0x17, 0x79, 0x6d, 0x91, 0x1f, 0xf5, 0xb8,
+        0x6d, 0x91, 0xe3, 0xdb, 0xb4, 0x45, 0x2e, 0x48, 0x5b, 0x24, 0xbb, 0x75,
+        0x5b, 0x64, 0xa0, 0x21, 0x5f, 0xab, 0xb6, 0x9e, 0xed, 0xdb, 0x22, 0xc6,
+        0x86, 0xb6, 0xc8, 0x88, 0xcb, 0xef, 0x82, 0xf9, 0xfe, 0x2e, 0x65, 0x4f,
+        0x80, 0xc7, 0x69, 0x38, 0x03, 0xc6, 0x27, 0x3c, 0x3e, 0xe0, 0x4f, 0x12,
+        0xd6, 0xe6, 0x8e, 0xff, 0x5b, 0x58, 0x0f, 0x36, 0xf8, 0xb7, 0x6b, 0xeb,
+        0xa1, 0xf0, 0xce, 0x6d, 0xe9, 0xec, 0x5e, 0x58, 0x0f, 0x36, 0xf5, 0x93,
+        0x36, 0xcf, 0x45, 0xac, 0xf7, 0x93, 0x0e, 0x1b, 0xcd, 0x78, 0xfb, 0x77,
+        0x5d, 0xfe, 0x53, 0x37, 0x7f, 0x07, 0x4d, 0x51, 0xe0, 0xf8, 0xa8, 0x7e,
+        0x17, 0x68, 0xc9, 0xce, 0x66, 0x09, 0xf6, 0x11, 0xde, 0x17, 0x11, 0xb4,
+        0xe6, 0xd1, 0xb7, 0xf8, 0x7d, 0xbc, 0xbe, 0xd7, 0x9e, 0x15, 0x72, 0x4a,
+        0xfa, 0x1a, 0x30, 0x3e, 0x16, 0x38, 0x2b, 0xc6, 0xca, 0xdc, 0x24, 0xe5,
+        0x7b, 0x50, 0x7a, 0x7e, 0x33, 0x9f, 0x43, 0xa3, 0xcc, 0xdb, 0x9e, 0x5d,
+        0xa0, 0x69, 0x7c, 0x1f, 0xef, 0x4b, 0xa4, 0xce, 0xae, 0x02, 0xff, 0xbc,
+        0xc0, 0x7a, 0xc1, 0x70, 0x55, 0x27, 0xa8, 0xdf, 0x9b, 0xcb, 0xc2, 0x7e,
+        0xd3, 0xbc, 0x33, 0x2d, 0xf2, 0xdd, 0x24, 0xef, 0x84, 0x9e, 0xa6, 0x79,
+        0xa7, 0x57, 0x0f, 0xde, 0xe7, 0x83, 0x17, 0xbe, 0x75, 0xa7, 0x7a, 0xef,
+        0x2c, 0xe4, 0x8f, 0xa7, 0x7c, 0xf7, 0xae, 0x5a, 0x77, 0x95, 0xad, 0x8d,
+        0x95, 0xf7, 0xa7, 0xc4, 0xba, 0xa2, 0x4f, 0x27, 0x51, 0x13, 0x57, 0xad,
+        0x09, 0xf2, 0xd6, 0x41, 0x41, 0x0e, 0x68, 0x3a, 0xd4, 0x75, 0xe2, 0x80,
+        0x45, 0xcc, 0xa7, 0x0e, 0xca, 0x2d, 0x4b, 0x70, 0x9f, 0x17, 0x16, 0x35,
+        0x39, 0x32, 0xa7, 0xe4, 0xc8, 0xa2, 0x8b, 0x8f, 0x37, 0xea, 0xed, 0x7d,
+        0x3e, 0x7a, 0xbb, 0xbb, 0xb6, 0x43, 0xd4, 0xb8, 0x35, 0xa9, 0xed, 0xf0,
+        0xab, 0x99, 0xc2, 0xd8, 0x17, 0x59, 0x5f, 0xf9, 0x14, 0xf4, 0x15, 0x13,
+        0x35, 0x4b, 0x52, 0x67, 0xc1, 0x75, 0x96, 0x49, 0xaf, 0x45, 0x18, 0xa7,
+        0x8e, 0xd1, 0x79, 0xd6, 0xc9, 0x6f, 0xd2, 0xe3, 0xca, 0x66, 0x4b, 0xb8,
+        0xf2, 0x4c, 0x91, 0xdf, 0x1f, 0xa0, 0xec, 0xb3, 0x76, 0x2c, 0x41, 0xc7,
+        0xe8, 0x9c, 0xc8, 0x99, 0x41, 0xcc, 0x0f, 0x79, 0x08, 0x07, 0xc5, 0x3c,
+        0xa5, 0x7f, 0xe3, 0x51, 0xe4, 0xcd, 0x6d, 0x3d, 0x67, 0x5f, 0xd7, 0xfa,
+        0x25, 0xc5, 0x3b, 0x97, 0x15, 0xed, 0x89, 0x73, 0x7c, 0xff, 0x8b, 0x46,
+        0xe3, 0xfd, 0x09, 0x23, 0x55, 0x4e, 0x19, 0xc9, 0x25, 0x8c, 0x7b, 0xd1,
+        0x98, 0x2e, 0xc3, 0xd6, 0xd4, 0xb8, 0x64, 0xc7, 0x41, 0x97, 0x6b, 0xb4,
+        0x79, 0x7c, 0x62, 0x91, 0x3c, 0xf5, 0x13, 0x5b, 0x98, 0xf7, 0x91, 0xba,
+        0x79, 0x6b, 0xf8, 0xe2, 0x37, 0x7c, 0x40, 0x09, 0x86, 0xa9, 0xd6, 0x7f,
+        0x3b, 0xe0, 0x73, 0x8f, 0x65, 0x69, 0x23, 0xfd, 0xd7, 0x6e, 0xd0, 0x7f,
+        0x17, 0x37, 0x9d, 0xf7, 0xc3, 0xf2, 0x02, 0x59, 0xc3, 0x1d, 0x74, 0x84,
+        0x9e, 0xcb, 0xf3, 0xae, 0xd3, 0x81, 0x3d, 0x38, 0x85, 0x31, 0xda, 0x37,
+        0xae, 0x7d, 0x63, 0x3d, 0x2a, 0x1f, 0x58, 0xe7, 0x2c, 0x74, 0x28, 0x3c,
+        0xc6, 0x75, 0xd8, 0x62, 0xab, 0x3c, 0x3f, 0xd8, 0x65, 0x4f, 0x8a, 0x39,
+        0xb2, 0x5d, 0x66, 0x4d, 0x93, 0xf4, 0x7f, 0x9f, 0x2d, 0xd7, 0xd5, 0x8f,
+        0xfa, 0xd4, 0x51, 0x0e, 0xfb, 0xd4, 0x51, 0xba, 0x69, 0x32, 0xe4, 0xa2,
+        0xc9, 0x88, 0x4b, 0xbf, 0x8b, 0xb2, 0x7d, 0xd3, 0xc5, 0xbc, 0x06, 0xf6,
+        0x4d, 0x07, 0x05, 0x5f, 0x71, 0xdb, 0x37, 0xde, 0xba, 0x7d, 0xd0, 0x27,
+        0x74, 0x38, 0x69, 0xeb, 0xa4, 0x8a, 0xd5, 0x9a, 0x7f, 0x5e, 0x77, 0xad,
+        0x66, 0x71, 0xa9, 0xa1, 0xbe, 0xd2, 0x6f, 0xbe, 0x43, 0x0d, 0xf3, 0x85,
+        0x9c, 0x4b, 0x34, 0xd5, 0xfd, 0xfc, 0xec, 0xaf, 0x47, 0x35, 0x3f, 0x2f,
+        0xdf, 0xc3, 0xbb, 0x86, 0x85, 0x1f, 0x3c, 0x5b, 0xe5, 0x79, 0x93, 0x72,
+        0xbe, 0xf9, 0x7a, 0x7b, 0x24, 0x78, 0x8d, 0x14, 0xec, 0xfc, 0x65, 0xc0,
+        0xf6, 0x7c, 0x6a, 0x9d, 0x1e, 0xf9, 0x3c, 0xd1, 0x2b, 0x7d, 0x65, 0x2d,
+        0x2a, 0xd7, 0x7a, 0x97, 0xb2, 0x0b, 0x37, 0xc3, 0x77, 0x9c, 0x6b, 0x51,
+        0xfe, 0x45, 0xdb, 0x2a, 0x11, 0xf0, 0xfc, 0xc4, 0xe9, 0x16, 0xc7, 0x54,
+        0xf1, 0x2d, 0xc4, 0xb0, 0x80, 0xf7, 0xfa, 0xf9, 0xb2, 0xd6, 0x6a, 0xf3,
+        0x3d, 0xb3, 0x1a, 0xf6, 0x4c, 0xe2, 0x15, 0x6c, 0x32, 0xe4, 0x10, 0x8f,
+        0x79, 0xf2, 0xb8, 0x1f, 0x06, 0x16, 0x3d, 0x3e, 0xb9, 0xcd, 0xc8, 0x4d,
+        0x6e, 0x36, 0xcf, 0xfb, 0x2e, 0xfd, 0x1d, 0xf3, 0xad, 0x54, 0xde, 0x8c,
+        0x0f, 0x48, 0x99, 0x5d, 0xf6, 0xd7, 0xa5, 0xcc, 0x2d, 0xcf, 0xcf, 0x2b,
+        0xa3, 0xf7, 0x6c, 0x51, 0x46, 0x8b, 0x7e, 0x28, 0x81, 0xc3, 0x82, 0x07,
+        0xa0, 0x06, 0x1b, 0x39, 0xd6, 0x9f, 0x06, 0xcd, 0x33, 0x9f, 0x75, 0xd5,
+        0xaa, 0xf9, 0xef, 0x63, 0x35, 0xce, 0x12, 0x42, 0x2f, 0x88, 0x09, 0xe4,
+        0x9b, 0xf4, 0x31, 0xef, 0xc1, 0xf8, 0xfd, 0xd6, 0x1d, 0xf8, 0x80, 0x95,
+        0x9f, 0x2a, 0xa5, 0xe4, 0xcb, 0xe1, 0x2d, 0xc4, 0x5b, 0xb6, 0xc7, 0xa7,
+        0x6d, 0x6b, 0x95, 0x10, 0x0b, 0x42, 0x4e, 0xf0, 0x0b, 0x3d, 0xd4, 0x73,
+        0xaa, 0xad, 0xcd, 0xb9, 0xdb, 0x2b, 0xe3, 0x53, 0xb8, 0xd6, 0x45, 0x37,
+        0x8a, 0xc8, 0xd7, 0xc6, 0xb5, 0xdf, 0xe3, 0x6b, 0x7e, 0x3c, 0x4a, 0xe7,
+        0x9b, 0x43, 0xe7, 0x93, 0xfb, 0x53, 0x22, 0xd8, 0x54, 0x15, 0xfa, 0xa7,
+        0xf8, 0xaf, 0xc8, 0x18, 0x47, 0xf9, 0x51, 0xc7, 0x6f, 0xfc, 0xfc, 0x8a,
+        0x46, 0xdf, 0xc7, 0xcd, 0x97, 0xfc, 0xf2, 0x96, 0xfc, 0x8a, 0xc8, 0xbb,
+        0xdf, 0x4a, 0x1c, 0x45, 0xc7, 0x8b, 0x27, 0x44, 0xed, 0xa9, 0x1b, 0x0f,
+        0x1e, 0x4d, 0xcc, 0x18, 0xf8, 0x30, 0xd4, 0xc0, 0xab, 0x1e, 0x3e, 0x06,
+        0xe0, 0x85, 0x6b, 0x87, 0xaf, 0x4f, 0xcb, 0x3f, 0x36, 0x8c, 0x3c, 0x00,
+        0xf8, 0xb3, 0x9f, 0xa2, 0xb3, 0xd7, 0x81, 0xc3, 0x06, 0x63, 0xdb, 0x08,
+        0xcd, 0x86, 0x51, 0x57, 0x24, 0x6a, 0x73, 0x54, 0x2c, 0x51, 0xd6, 0x0a,
+        0x9d, 0x15, 0x75, 0x8f, 0xfb, 0x23, 0xeb, 0x94, 0x66, 0xb9, 0x97, 0xa5,
+        0x73, 0x2c, 0x63, 0xcf, 0x2d, 0xd5, 0x74, 0xfc, 0xc6, 0xda, 0xc7, 0x7a,
+        0x1c, 0x5f, 0x17, 0x38, 0x1e, 0xdd, 0x10, 0xc7, 0x8f, 0x56, 0x71, 0x7c,
+        0xae, 0x4f, 0xe2, 0xf3, 0x45, 0x7e, 0x56, 0x0f, 0x1d, 0x16, 0xcf, 0xcd,
+        0xf2, 0xef, 0x4e, 0x3a, 0x2c, 0xfb, 0x62, 0xf0, 0xbb, 0x99, 0xc7, 0xe7,
+        0xb3, 0x74, 0xfe, 0x7a, 0x36, 0x90, 0x12, 0x35, 0x0a, 0xee, 0xbe, 0x1e,
+        0xfa, 0x7e, 0x8c, 0x6b, 0x86, 0xff, 0x9a, 0x2f, 0xc9, 0x9a, 0xab, 0x92,
+        0xe4, 0x4f, 0xf4, 0x76, 0x7c, 0xd0, 0x83, 0xff, 0xf5, 0x36, 0xe6, 0x05,
+        0x25, 0x03, 0x4f, 0x6c, 0xe0, 0xff, 0x68, 0xc4, 0xcb, 0x5e, 0x1f, 0xbd,
+        0xf9, 0x8d, 0x3e, 0x19, 0xbb, 0xda, 0xc8, 0xff, 0xe1, 0xc6, 0xd1, 0xba,
+        0x58, 0x3e, 0xf3, 0xfd, 0x84, 0xaa, 0xff, 0x7b, 0xa7, 0x4f, 0xca, 0x0b,
+        0xd4, 0x04, 0xa6, 0x19, 0x0e, 0x6f, 0xb2, 0xae, 0x32, 0x48, 0xad, 0xaf,
+        0xe8, 0xb5, 0x0e, 0x0a, 0x7e, 0xeb, 0xf6, 0xe7, 0x5c, 0x56, 0xb5, 0xe0,
+        0x39, 0xd7, 0x9a, 0x2e, 0x0b, 0x5b, 0xa8, 0x39, 0xbd, 0x35, 0xcf, 0xc3,
+        0x8a, 0x7a, 0x64, 0x82, 0x17, 0xdf, 0xd0, 0x2f, 0x05, 0xfb, 0x4b, 0x86,
+        0xd4, 0x83, 0x27, 0x59, 0xbf, 0xdd, 0x6e, 0x0c, 0xe9, 0x61, 0x75, 0x44,
+        0x6f, 0x4f, 0x0e, 0xef, 0x6f, 0xec, 0x83, 0xb4, 0x39, 0x32, 0xaf, 0x3d,
+        0x25, 0x78, 0xc1, 0xe5, 0xb1, 0x0a, 0x4d, 0xc7, 0xbb, 0x29, 0x33, 0xc6,
+        0xef, 0x9e, 0x44, 0x4f, 0xac, 0x20, 0x65, 0x99, 0x7e, 0x33, 0x63, 0x8f,
+        0x29, 0x7d, 0x51, 0xfb, 0xdd, 0xdb, 0x54, 0xee, 0xc3, 0x45, 0x11, 0xab,
+        0x94, 0xfd, 0x84, 0xf8, 0xf7, 0x92, 0x7e, 0xf6, 0x45, 0x11, 0x33, 0xcd,
+        0x5c, 0x6f, 0x55, 0xe3, 0x3a, 0x5d, 0xe3, 0x30, 0xa6, 0x53, 0x8d, 0xc5,
+        0x33, 0xb5, 0x4e, 0xd1, 0xae, 0xf8, 0x2d, 0xe8, 0x30, 0xad, 0x6a, 0xf5,
+        0x70, 0xfd, 0x02, 0xcd, 0x54, 0xd7, 0xd2, 0xc9, 0x63, 0xff, 0x5b, 0xf5,
+        0xf2, 0xe8, 0x64, 0x9d, 0x17, 0xf3, 0x6e, 0x9c, 0x13, 0xd6, 0x12, 0x14,
+        0x71, 0x24, 0xfe, 0xad, 0xde, 0x73, 0xa6, 0x3a, 0x27, 0xe4, 0x6d, 0xd8,
+        0x11, 0xf9, 0x2c, 0x3d, 0xae, 0xd3, 0x35, 0x4e, 0xf3, 0x0a, 0x1d, 0xa7,
+        0xf8, 0x57, 0x9e, 0xc7, 0x3f, 0xa8, 0xbc, 0x5e, 0x53, 0xc4, 0x54, 0x65,
+        0xde, 0x86, 0xfe, 0x0d, 0x3f, 0x34, 0xf2, 0x2c, 0x90, 0x3b, 0xe1, 0xe6,
+        0x37, 0x72, 0xbd, 0x21, 0xc8, 0xa2, 0x32, 0x62, 0xa9, 0x88, 0x6b, 0x34,
+        0xd3, 0x9d, 0xf7, 0x20, 0x5f, 0x7f, 0x1b, 0x3a, 0xe8, 0x56, 0xe8, 0xcf,
+        0xf2, 0xa1, 0x3f, 0xf7, 0xfb, 0x51, 0xeb, 0x86, 0x9a, 0xb7, 0x6c, 0xcc,
+        0xa0, 0x0a, 0xdb, 0x0a, 0x06, 0x95, 0xcc, 0x00, 0x9d, 0x77, 0xec, 0xf8,
+        0x12, 0xc9, 0x9a, 0xc9, 0xe9, 0x79, 0x3b, 0xb6, 0x4a, 0x87, 0xcc, 0x73,
+        0x24, 0x7b, 0x25, 0x94, 0x58, 0x06, 0x9f, 0xa1, 0x18, 0xdb, 0x47, 0x6c,
+        0x7f, 0x9e, 0x42, 0x5c, 0x46, 0xef, 0x0b, 0x6a, 0xe3, 0xf1, 0x37, 0xc6,
+        0x70, 0xba, 0xb9, 0x93, 0x3a, 0x12, 0xfc, 0xcc, 0x18, 0xf8, 0x13, 0x3f,
+        0x27, 0x4d, 0x49, 0xb6, 0x93, 0x60, 0xb3, 0x9e, 0x39, 0x65, 0x9b, 0x25,
+        0x32, 0x78, 0x2c, 0x6c, 0x57, 0x3c, 0x07, 0xf7, 0x27, 0xcc, 0x16, 0xf2,
+        0xd6, 0xe1, 0x5e, 0x14, 0x75, 0x8a, 0x6f, 0xc7, 0x0f, 0x92, 0xd1, 0x0f,
+        0x7e, 0x85, 0x7d, 0x1b, 0x55, 0xf1, 0xa4, 0x4b, 0xfc, 0xdb, 0x51, 0xbf,
+        0xbf, 0x2a, 0xea, 0xdd, 0xe4, 0x6f, 0xe0, 0xf6, 0x2f, 0xab, 0x3d, 0xab,
+        0xcb, 0x09, 0x89, 0x8c, 0x18, 0x5f, 0xa5, 0x0b, 0x4b, 0x1b, 0xf9, 0x66,
+        0xfc, 0xea, 0x5b, 0xbb, 0xb6, 0x58, 0xdf, 0xba, 0xbe, 0x53, 0xd6, 0x8c,
+        0xe1, 0xfd, 0x7e, 0xba, 0x97, 0x77, 0x6d, 0xee, 0x7a, 0xd5, 0xef, 0xd0,
+        0xb4, 0xac, 0x35, 0x56, 0xb8, 0x70, 0xbd, 0x89, 0x7f, 0xf3, 0x49, 0x21,
+        0x2f, 0xcf, 0xca, 0x38, 0xc3, 0x80, 0xec, 0x6d, 0x16, 0xa2, 0xe5, 0x6a,
+        0xed, 0x67, 0x50, 0xd5, 0x7f, 0x30, 0x53, 0x7c, 0xa4, 0x75, 0x9f, 0x3a,
+        0x57, 0x15, 0x71, 0xa7, 0xb4, 0x2b, 0x8f, 0x22, 0xa4, 0xf2, 0x24, 0x70,
+        0xdf, 0x48, 0x18, 0x75, 0x5b, 0xb2, 0xd6, 0x12, 0x63, 0x50, 0xe7, 0x08,
+        0x1b, 0x12, 0x75, 0xae, 0xf0, 0xfb, 0x35, 0xab, 0x05, 0xc5, 0x78, 0xf8,
+        0x9f, 0xb4, 0x5d, 0x78, 0x5a, 0xd0, 0x98, 0x7c, 0xa7, 0xac, 0xd9, 0x5c,
+        0x5c, 0x39, 0x23, 0xea, 0x24, 0x93, 0xaa, 0xf6, 0x33, 0x43, 0x5d, 0x42,
+        0x6f, 0xfa, 0xf8, 0x35, 0x9b, 0xe7, 0xc2, 0xdb, 0xaf, 0xd9, 0x74, 0xdf,
+        0xb3, 0xbd, 0x9a, 0x4d, 0x93, 0xd7, 0x6e, 0x2c, 0xc8, 0x9a, 0xcd, 0xfa,
+        0x58, 0x80, 0xf4, 0x43, 0x65, 0x5c, 0xf2, 0x48, 0xea, 0x7f, 0x5f, 0x72,
+        0xe5, 0x08, 0xcb, 0x7a, 0xcc, 0xc5, 0xaa, 0x0e, 0x24, 0xeb, 0x31, 0x65,
+        0x4e, 0xb1, 0xbb, 0x0f, 0x89, 0x8c, 0x39, 0xc8, 0xf7, 0x74, 0x7b, 0x62,
+        0x0e, 0x2d, 0x4c, 0xa3, 0xa3, 0xaa, 0xe6, 0xbc, 0x19, 0x6e, 0xd6, 0xd9,
+        0x2a, 0x4c, 0x73, 0x15, 0xfa, 0x69, 0xfc, 0xd3, 0x74, 0x3f, 0x1c, 0x51,
+        0xb9, 0x74, 0xc8, 0x9d, 0x3b, 0xa8, 0xe0, 0xa8, 0xf5, 0x0f, 0xf2, 0xd1,
+        0x3f, 0x7e, 0x5b, 0xe4, 0x10, 0x4b, 0xfd, 0x65, 0x50, 0xd1, 0x24, 0xe8,
+        0x36, 0xe2, 0xa2, 0xdb, 0x5d, 0x4d, 0xe8, 0x16, 0xf4, 0xf9, 0xdd, 0x1d,
+        0xb2, 0x4f, 0x01, 0xe2, 0xde, 0xdf, 0x57, 0xbf, 0x37, 0xa3, 0xbf, 0xf7,
+        0x78, 0x6f, 0x40, 0x83, 0x78, 0xc6, 0x87, 0xe1, 0x1a, 0x1d, 0xea, 0xdf,
+        0x98, 0xcb, 0x7e, 0xd7, 0x5c, 0x86, 0x5d, 0x73, 0xd9, 0xd7, 0x64, 0x2e,
+        0xac, 0x4f, 0x94, 0x2f, 0xf0, 0xff, 0x8f, 0x3b, 0x27, 0xe1, 0xab, 0x65,
+        0x5a, 0x8d, 0x0b, 0xf9, 0x9a, 0x03, 0x1c, 0x85, 0x9e, 0x32, 0xaa, 0xea,
+        0xe0, 0xdd, 0xf3, 0x6c, 0x66, 0xab, 0x41, 0x16, 0xa0, 0xd7, 0x41, 0x82,
+        0xef, 0xeb, 0x6c, 0xd2, 0xeb, 0x00, 0x3a, 0x86, 0x5f, 0xaf, 0x03, 0x37,
+        0x8f, 0x77, 0xeb, 0x52, 0xd0, 0x7d, 0x21, 0x03, 0xa1, 0xf3, 0xa2, 0x57,
+        0xc1, 0x2f, 0xd1, 0x85, 0xaa, 0x8e, 0x79, 0x90, 0xd2, 0x4a, 0xc7, 0xbc,
+        0xb0, 0xa4, 0xf7, 0x7c, 0xd8, 0xb3, 0xe7, 0x7e, 0x3a, 0xe7, 0x90, 0xca,
+        0xf1, 0xd1, 0xb0, 0xca, 0xba, 0x60, 0x95, 0xf5, 0x81, 0x95, 0x78, 0x47,
+        0x93, 0x79, 0x03, 0x3e, 0xb8, 0x07, 0xff, 0xbf, 0x13, 0x41, 0x8f, 0x16,
+        0xa2, 0xdf, 0xd8, 0x55, 0xf3, 0x0b, 0xe8, 0xdf, 0x98, 0x63, 0xd3, 0xdc,
+        0x4f, 0xa5, 0x0f, 0x0e, 0x06, 0x8e, 0x5c, 0x67, 0x03, 0x9d, 0x65, 0x5e,
+        0xbd, 0x2d, 0xa8, 0x75, 0x85, 0x03, 0x82, 0xef, 0xdd, 0x0f, 0x22, 0x77,
+        0x45, 0x9f, 0xeb, 0xd6, 0xbe, 0x5c, 0xb5, 0xfe, 0xd6, 0x3a, 0x7d, 0xa2,
+        0xa6, 0x4b, 0xe8, 0x1c, 0x54, 0xfd, 0x5b, 0xcb, 0xc0, 0x7b, 0x75, 0xfe,
+        0x89, 0x5b, 0x75, 0xfd, 0x06, 0xe1, 0x0b, 0xea, 0x4e, 0x1b, 0x4e, 0x4a,
+        0xe4, 0x91, 0xf6, 0x3a, 0xf0, 0x7b, 0x25, 0x99, 0x37, 0xf7, 0xa6, 0x91,
+        0xb3, 0xdc, 0x7b, 0xcd, 0xa2, 0x93, 0xf9, 0x2f, 0xed, 0x95, 0x74, 0x7a,
+        0x89, 0x86, 0xc7, 0x79, 0xfc, 0x14, 0x7c, 0xbd, 0x76, 0x2c, 0xc9, 0x4a,
+        0xe4, 0x5c, 0xb9, 0x8d, 0x16, 0x59, 0x5b, 0x0f, 0x3a, 0x25, 0xe1, 0xbb,
+        0x63, 0x99, 0x51, 0x40, 0x6f, 0x55, 0x63, 0xa1, 0x95, 0x9f, 0xdb, 0x4f,
+        0xcb, 0x45, 0xd0, 0x7c, 0x8b, 0xea, 0x11, 0x82, 0xb1, 0x01, 0xea, 0x73,
+        0xfe, 0x84, 0xe1, 0xf5, 0x05, 0x91, 0x47, 0xb9, 0x58, 0xb8, 0x24, 0xff,
+        0x96, 0x5e, 0x52, 0xef, 0xe0, 0xf7, 0x95, 0xff, 0x86, 0x12, 0x7d, 0x96,
+        0xcb, 0x36, 0x73, 0xff, 0xf3, 0xd7, 0x3f, 0x8e, 0x6f, 0x4b, 0xff, 0xc8,
+        0xa6, 0x6b, 0xfa, 0x87, 0xfb, 0xd9, 0x5a, 0x17, 0x39, 0xd6, 0x2f, 0xfb,
+        0x37, 0x00, 0x06, 0x9d, 0xd0, 0xad, 0xd2, 0x80, 0xa5, 0x31, 0x65, 0x47,
+        0x92, 0xc1, 0x49, 0x9a, 0x2d, 0x47, 0x8d, 0x4c, 0x01, 0x3a, 0x30, 0xff,
+        0x2d, 0x5d, 0xd9, 0x2d, 0x7d, 0x2e, 0xfa, 0x1e, 0xf0, 0xf5, 0x9d, 0x3c,
+        0xfe, 0x3f, 0xfa, 0x65, 0xee, 0xb5, 0xfb, 0x7c, 0x0f, 0x9f, 0x7f, 0x2e,
+        0x52, 0x7f, 0xfe, 0x31, 0x3e, 0xdf, 0xc7, 0xe7, 0xe1, 0x87, 0x84, 0x9f,
+        0x31, 0x46, 0x39, 0xde, 0x9f, 0xd9, 0x32, 0xf3, 0xa9, 0x57, 0x58, 0x5e,
+        0x2c, 0xe9, 0x71, 0xbb, 0x50, 0x97, 0x23, 0xf6, 0xc4, 0xe0, 0x31, 0x97,
+        0xf3, 0x63, 0x3c, 0x6e, 0x90, 0x82, 0xaf, 0x58, 0x34, 0xbb, 0xa4, 0x71,
+        0x52, 0xe7, 0xd4, 0xbf, 0xc3, 0xf0, 0x45, 0xde, 0xce, 0x47, 0xbb, 0x25,
+        0xfc, 0x62, 0xc2, 0x87, 0x89, 0x3c, 0x8e, 0x2b, 0x02, 0xf7, 0xec, 0x49,
+        0xab, 0xfa, 0x7e, 0xe0, 0x96, 0x88, 0x73, 0xf0, 0x1a, 0x58, 0x2e, 0x4d,
+        0x39, 0x66, 0xae, 0x9a, 0x8f, 0xf6, 0xe7, 0x03, 0xf2, 0xfe, 0xff, 0xda,
+        0x25, 0xfb, 0xa3, 0xbe, 0x3f, 0xa0, 0xfb, 0x24, 0x4a, 0x9d, 0x00, 0x39,
+        0xca, 0x01, 0x01, 0x9b, 0xe0, 0x02, 0xe4, 0x95, 0xc1, 0xbf, 0x79, 0x3d,
+        0x69, 0xcc, 0xb1, 0xad, 0x5f, 0xf7, 0x7c, 0x91, 0xeb, 0x3a, 0xc6, 0xf3,
+        0x4d, 0xf1, 0xba, 0xf4, 0xf9, 0x04, 0x1f, 0xfb, 0xed, 0x2f, 0x9e, 0xd5,
+        0x91, 0x46, 0x5d, 0x70, 0xe6, 0x54, 0x47, 0x3a, 0x13, 0x93, 0xfb, 0x5c,
+        0xf3, 0xd1, 0x46, 0xaa, 0x3e, 0xda, 0xb9, 0xfc, 0x78, 0x3f, 0xfc, 0x15,
+        0xc6, 0x35, 0xde, 0xef, 0xf0, 0x15, 0x1e, 0x8b, 0x7a, 0x84, 0x1c, 0xff,
+        0xed, 0x52, 0xf9, 0x3c, 0x8d, 0xb8, 0x22, 0xf3, 0x23, 0xb4, 0x5e, 0x81,
+        0x7b, 0x9f, 0xe0, 0x67, 0x48, 0xdd, 0xa2, 0xf9, 0x7b, 0xa8, 0x21, 0xff,
+        0xa5, 0x11, 0xc7, 0x36, 0xf2, 0xab, 0x8a, 0x38, 0xa2, 0x0f, 0x9e, 0x6d,
+        0xd4, 0x83, 0xe0, 0x9e, 0xf0, 0x8b, 0x4d, 0x37, 0xd0, 0x2b, 0xe8, 0x38,
+        0x44, 0x2f, 0xcc, 0x67, 0xe9, 0x31, 0xde, 0xab, 0x3f, 0x30, 0x3e, 0x83,
+        0x38, 0x3b, 0xc9, 0x5c, 0x27, 0x86, 0x71, 0xde, 0x89, 0x9d, 0x33, 0x52,
+        0xe0, 0x8b, 0x95, 0x90, 0xd3, 0x45, 0xad, 0x4c, 0xab, 0xbf, 0x49, 0x23,
+        0x6c, 0xcf, 0x81, 0x66, 0x9d, 0x48, 0x8a, 0x40, 0x6f, 0xb6, 0x79, 0x84,
+        0x71, 0x62, 0xba, 0x0c, 0x7c, 0x36, 0xe8, 0x8b, 0x45, 0xa2, 0xe7, 0x8b,
+        0x23, 0xe6, 0xf7, 0xc8, 0xb1, 0x6a, 0xd7, 0x6d, 0x33, 0xc9, 0xf3, 0x48,
+        0x95, 0x5f, 0xa2, 0xf7, 0x44, 0xdf, 0x12, 0xc0, 0x51, 0xef, 0xfb, 0x1f,
+        0xd1, 0x99, 0x34, 0xe6, 0xbd, 0x75, 0xfa, 0x3c, 0xb9, 0x2d, 0xfa, 0xec,
+        0xf0, 0xa1, 0xcf, 0x7f, 0x54, 0x78, 0x53, 0x61, 0x1c, 0xed, 0xa0, 0x99,
+        0x02, 0x72, 0xbf, 0x3e, 0x8b, 0xfe, 0x52, 0x85, 0x0c, 0xf3, 0xa5, 0x4c,
+        0x8d, 0x2f, 0x5d, 0x4d, 0x06, 0x13, 0xa0, 0x71, 0xf4, 0x65, 0x53, 0xf9,
+        0x3e, 0x58, 0xc7, 0x00, 0x8d, 0x2c, 0x74, 0x22, 0xf6, 0xb5, 0x9a, 0x9c,
+        0x48, 0xa8, 0xfa, 0x7c, 0xdb, 0x9a, 0x66, 0xfe, 0x38, 0xc7, 0xb4, 0x9c,
+        0x2b, 0x1c, 0xa4, 0xc5, 0x70, 0x94, 0x86, 0x17, 0x74, 0xbf, 0x12, 0x11,
+        0x37, 0x89, 0x4a, 0x9e, 0xa4, 0xd7, 0xfd, 0x84, 0xf0, 0x45, 0x58, 0x37,
+        0x3f, 0xa9, 0x75, 0x77, 0x6e, 0xc2, 0x97, 0xde, 0x57, 0x34, 0x5b, 0xb9,
+        0x95, 0x8c, 0x53, 0x36, 0x39, 0xf1, 0xef, 0x02, 0xff, 0x87, 0x6f, 0xc2,
+        0xaf, 0x06, 0x1e, 0x6d, 0x51, 0x3a, 0xef, 0x85, 0x45, 0x94, 0xd7, 0x8d,
+        0xeb, 0x95, 0x0f, 0x67, 0xe2, 0x2f, 0x09, 0xdd, 0x6b, 0xe4, 0x26, 0x8f,
+        0x13, 0xf2, 0x48, 0xf3, 0x0d, 0x3f, 0x3c, 0xd4, 0x3d, 0x29, 0x35, 0x2e,
+        0xca, 0x7c, 0x4e, 0x93, 0x9f, 0x9b, 0x0e, 0x7a, 0x71, 0xf2, 0x5e, 0xe0,
+        0xf8, 0xbc, 0x45, 0x27, 0xf2, 0xf6, 0xab, 0x59, 0x9a, 0x64, 0xba, 0x76,
+        0xcb, 0x0b, 0x1e, 0x4f, 0xc0, 0xb3, 0x29, 0xd0, 0x3e, 0x65, 0x0a, 0x96,
+        0xcc, 0xb7, 0x13, 0x3d, 0xe5, 0x70, 0x8c, 0xda, 0xe2, 0xee, 0xdd, 0x5a,
+        0x1e, 0x64, 0x0a, 0xa8, 0x15, 0xe4, 0xbf, 0x25, 0x1e, 0x8f, 0xfc, 0xfe,
+        0x22, 0x9e, 0x03, 0x19, 0x87, 0xb9, 0xf3, 0xf1, 0xb2, 0xdc, 0xd7, 0x61,
+        0x7e, 0xf6, 0xc8, 0x38, 0xbf, 0xb3, 0x3c, 0xc6, 0xfb, 0xdb, 0x23, 0x78,
+        0xb3, 0xdc, 0xcf, 0x29, 0xba, 0xec, 0xcb, 0x57, 0xe4, 0xbe, 0x64, 0x5c,
+        0xf4, 0x9d, 0x11, 0xf4, 0x3d, 0x25, 0xf6, 0x23, 0x53, 0x34, 0x58, 0x5f,
+        0xd6, 0xbe, 0x04, 0xb6, 0x9b, 0x8b, 0x21, 0xc5, 0x43, 0x70, 0xed, 0x89,
+        0xdd, 0x22, 0x1f, 0x11, 0xf6, 0x74, 0x11, 0x7f, 0xa7, 0xe8, 0x0a, 0xeb,
+        0xfd, 0x2f, 0xe7, 0xdb, 0xe8, 0x4e, 0xa1, 0x8d, 0xee, 0x16, 0xa2, 0x74,
+        0x7b, 0x7e, 0x07, 0x5d, 0x66, 0x9b, 0xe6, 0xb2, 0x13, 0xb2, 0x72, 0xb4,
+        0x03, 0xf1, 0x42, 0xe4, 0x0a, 0x31, 0xdd, 0x61, 0x3c, 0xf4, 0xef, 0xe4,
+        0x1e, 0xc6, 0x39, 0xb6, 0x8d, 0xda, 0xe9, 0x5d, 0x7e, 0x67, 0x2e, 0xaf,
+        0x73, 0x1c, 0xe0, 0x63, 0xdf, 0x5f, 0xb5, 0x1f, 0x36, 0xc7, 0x11, 0x73,
+        0x13, 0x1c, 0x99, 0x12, 0xbc, 0x7e, 0x76, 0x3e, 0x8a, 0xbe, 0xca, 0xd9,
+        0x16, 0xf8, 0x49, 0x99, 0x3f, 0x3f, 0x17, 0xc2, 0x78, 0x9c, 0x73, 0x64,
+        0x8e, 0xa4, 0x58, 0x5b, 0x84, 0x8f, 0x03, 0xa2, 0x0e, 0x5a, 0xc2, 0xa1,
+        0x9d, 0xd7, 0x17, 0x10, 0xe3, 0x33, 0xcb, 0xed, 0x74, 0xb6, 0x68, 0xf2,
+        0x71, 0x90, 0xf5, 0x44, 0x8c, 0xed, 0xdd, 0xa7, 0xfb, 0xcb, 0x5e, 0xe6,
+        0xb9, 0xe7, 0xc4, 0x38, 0xfe, 0xbb, 0xdc, 0x43, 0xb3, 0xc5, 0x2e, 0x75,
+        0x7c, 0x50, 0xe6, 0xf2, 0x8a, 0x5c, 0x6c, 0x5c, 0xdb, 0x88, 0xbf, 0xbd,
+        0xcd, 0x38, 0x05, 0x99, 0x2a, 0x75, 0x7c, 0xf0, 0x9a, 0x5b, 0x0d, 0xfd,
+        0x90, 0x81, 0x73, 0x93, 0xf4, 0x4d, 0x96, 0xb7, 0xc3, 0xaf, 0xc0, 0x1f,
+        0xfc, 0xfb, 0xc0, 0x9b, 0x52, 0x96, 0x06, 0xf9, 0x18, 0x7d, 0x8e, 0x82,
+        0xa2, 0x96, 0x69, 0x3a, 0x1c, 0x13, 0xf5, 0x1f, 0x92, 0x46, 0x4f, 0x89,
+        0x9e, 0x73, 0x3f, 0x12, 0xbc, 0xc9, 0xce, 0x5a, 0x06, 0xf4, 0x11, 0xf8,
+        0x54, 0x64, 0xee, 0xd5, 0x49, 0xa7, 0xf7, 0xed, 0x5d, 0x53, 0xa3, 0x94,
+        0xe8, 0x07, 0xde, 0x4b, 0x9a, 0x55, 0x3d, 0x04, 0x04, 0xbf, 0x37, 0x0f,
+        0xe8, 0x9a, 0x48, 0x7d, 0xac, 0x65, 0x85, 0x3e, 0xee, 0xf2, 0x5c, 0x37,
+        0x3d, 0xd7, 0xab, 0x79, 0x72, 0x2c, 0xf3, 0x58, 0xce, 0x93, 0xec, 0x39,
+        0x84, 0xbe, 0x71, 0xc0, 0x3f, 0xf3, 0xc0, 0x7e, 0xf3, 0x73, 0xca, 0x06,
+        0xca, 0xac, 0x8c, 0x44, 0x7a, 0x8d, 0x98, 0x91, 0x19, 0xfb, 0x97, 0x4a,
+        0x22, 0x0d, 0xbd, 0xe8, 0xc6, 0x6e, 0xc9, 0xe3, 0x30, 0xaf, 0x6c, 0x1c,
+        0xaa, 0xdb, 0xa9, 0x95, 0x2e, 0x5a, 0x15, 0x7d, 0xb5, 0xa0, 0x63, 0xe0,
+        0x7e, 0x3c, 0x27, 0x6b, 0xb6, 0xb0, 0x7d, 0x77, 0xc3, 0x01, 0x8d, 0x1f,
+        0x8a, 0xdc, 0xe4, 0xfd, 0x4c, 0xad, 0x7c, 0x54, 0x39, 0x23, 0xfa, 0xd2,
+        0x60, 0x6c, 0x0f, 0xcd, 0x08, 0x9b, 0x8b, 0xf5, 0x97, 0x3a, 0xbb, 0x76,
+        0x12, 0xf3, 0xcc, 0x22, 0x56, 0x62, 0x38, 0xdf, 0x0e, 0x64, 0x4a, 0x32,
+        0xf6, 0x9d, 0xf2, 0xc4, 0xbe, 0x4f, 0x89, 0xd8, 0x37, 0xe2, 0xde, 0x80,
+        0x2b, 0x60, 0xe9, 0x97, 0xcb, 0x82, 0x7d, 0x8c, 0xf3, 0x3e, 0x5a, 0x34,
+        0x77, 0x5d, 0xf0, 0x9b, 0xc9, 0xe9, 0x60, 0xa2, 0xb7, 0x85, 0xac, 0x40,
+        0xd2, 0xb1, 0xe3, 0x0f, 0x58, 0x87, 0xb8, 0x5d, 0xc0, 0x3c, 0x5f, 0xa2,
+        0xf5, 0x52, 0x0b, 0xd3, 0x89, 0xcd, 0x78, 0xb7, 0xca, 0x3a, 0xed, 0x2c,
+        0xbd, 0x5b, 0x22, 0xba, 0x5d, 0xbc, 0x8a, 0x5e, 0xbb, 0xb1, 0x07, 0x4c,
+        0x2b, 0x88, 0x05, 0x67, 0x62, 0xf0, 0xb1, 0xb1, 0x5e, 0x1b, 0x6b, 0x55,
+        0xb8, 0xd9, 0xc5, 0xb6, 0xa3, 0xc9, 0xff, 0x1d, 0xfe, 0x1f, 0x89, 0x00,
+        0x2e, 0x6b, 0xc5, 0x31, 0xc1, 0x4b, 0x97, 0xf8, 0xfc, 0x12, 0x9f, 0x87,
+        0x4c, 0x5d, 0x2b, 0x56, 0xde, 0x49, 0xc6, 0x13, 0x56, 0x72, 0xe2, 0xa4,
+        0x1c, 0xc3, 0x38, 0x77, 0xf9, 0x7a, 0x62, 0x4f, 0x88, 0xe7, 0x31, 0xc3,
+        0xf3, 0x58, 0x27, 0x99, 0xeb, 0x9d, 0x12, 0xef, 0x26, 0xba, 0x23, 0xde,
+        0xcb, 0x3a, 0x53, 0xfc, 0x71, 0x3a, 0x13, 0x96, 0xef, 0xcf, 0xc5, 0x51,
+        0x73, 0xd5, 0x49, 0xb3, 0x63, 0xa3, 0xaa, 0xe6, 0xea, 0xcd, 0x26, 0x35,
+        0x57, 0xed, 0xb4, 0x36, 0x0f, 0xbb, 0xb7, 0x9d, 0xe9, 0xdd, 0x14, 0xb9,
+        0x7a, 0x6b, 0xf3, 0xa2, 0x1f, 0x3e, 0xaf, 0xa7, 0xb2, 0x3e, 0xc3, 0xaa,
+        0x79, 0x26, 0xde, 0x2d, 0x74, 0xa7, 0xdb, 0xcb, 0xbf, 0xc5, 0xf3, 0x49,
+        0x58, 0x99, 0x09, 0xf7, 0x3a, 0xc4, 0x7c, 0xd7, 0xa7, 0xc5, 0xb8, 0xa0,
+        0x67, 0x5c, 0x82, 0x32, 0x13, 0x98, 0xbf, 0x18, 0xf3, 0x3f, 0xc9, 0xb8,
+        0x5e, 0x8f, 0xfb, 0x7e, 0x8b, 0x72, 0x42, 0xdf, 0xe7, 0xbf, 0x4b, 0x3d,
+        0x81, 0xf5, 0x02, 0xfc, 0x26, 0x06, 0xe3, 0x3f, 0xe6, 0x66, 0x51, 0x76,
+        0x89, 0xd7, 0x75, 0xbd, 0x2b, 0xf0, 0xa0, 0xf0, 0x93, 0x4a, 0xa6, 0x2e,
+        0xb7, 0xa5, 0xde, 0xbf, 0x2e, 0x6d, 0xae, 0x28, 0x39, 0xd7, 0x20, 0x4b,
+        0x21, 0x47, 0xb3, 0x95, 0xa0, 0x03, 0xbd, 0x0f, 0xb6, 0xd0, 0x25, 0xe6,
+        0x63, 0x32, 0x3f, 0x89, 0x79, 0x2a, 0xf3, 0x32, 0x49, 0x47, 0xa9, 0xba,
+        0xcf, 0x32, 0x48, 0x5c, 0x1e, 0xae, 0xe5, 0x45, 0xba, 0xe2, 0xe6, 0x21,
+        0x57, 0xdc, 0xdc, 0x74, 0xe5, 0x45, 0x86, 0x85, 0x9e, 0x56, 0xd3, 0xad,
+        0xc2, 0x4a, 0xb7, 0x8a, 0x8a, 0x9e, 0xf4, 0xe0, 0x71, 0x8b, 0x55, 0x1e,
+        0xb7, 0x73, 0x13, 0x1e, 0xe7, 0x67, 0x9b, 0xae, 0x2a, 0x7e, 0x62, 0xc7,
+        0x21, 0x6b, 0x6e, 0x31, 0xdf, 0xf8, 0x71, 0x79, 0x82, 0xf9, 0x49, 0x9c,
+        0xf9, 0xc9, 0x18, 0xf3, 0x93, 0x18, 0xf3, 0x13, 0x87, 0x61, 0x60, 0xf1,
+        0xda, 0xef, 0x05, 0x6e, 0xcf, 0x43, 0x8e, 0x4c, 0xd2, 0x95, 0x32, 0x78,
+        0xf3, 0x18, 0xeb, 0x42, 0xf7, 0x02, 0x6b, 0xf3, 0x3d, 0x8c, 0xc7, 0x52,
+        0xff, 0xa9, 0xb7, 0x6f, 0xec, 0x57, 0x51, 0x1f, 0x97, 0x8c, 0xaf, 0x81,
+        0xff, 0xbc, 0x99, 0xa5, 0xee, 0xc0, 0xed, 0x42, 0x57, 0x60, 0xad, 0xf0,
+        0x13, 0xf4, 0xa5, 0x78, 0x1d, 0x34, 0x8e, 0xbe, 0xbf, 0x3f, 0x1c, 0x9d,
+        0xe4, 0xb9, 0x77, 0x07, 0x66, 0x79, 0x5f, 0xbe, 0x12, 0x4f, 0xf4, 0xf6,
+        0x49, 0x5a, 0xc8, 0xe6, 0xc0, 0x3d, 0x17, 0x76, 0xd0, 0xfe, 0xf1, 0xe4,
+        0x9e, 0x5e, 0xa6, 0x5b, 0xe0, 0x7b, 0xad, 0xef, 0x4e, 0x90, 0xf1, 0xb0,
+        0x43, 0xf5, 0xeb, 0xb1, 0x58, 0x5e, 0x7e, 0xc8, 0xf7, 0x7f, 0x10, 0xc8,
+        0x15, 0x5e, 0xe3, 0x67, 0xe3, 0xf8, 0x4f, 0xe1, 0xdf, 0x64, 0x7b, 0x01,
+        0xbd, 0x7e, 0x3a, 0x79, 0x0c, 0xc6, 0xe2, 0xd8, 0x8e, 0x31, 0x6f, 0x8b,
+        0xaf, 0x1a, 0xf6, 0x64, 0xc2, 0x78, 0x3e, 0x8a, 0x9e, 0xf1, 0x3f, 0x2c,
+        0x3f, 0x15, 0x95, 0x31, 0xb6, 0xe7, 0xf6, 0x48, 0x3e, 0xc2, 0xb8, 0x19,
+        0x4e, 0x08, 0x9b, 0xad, 0xe5, 0x9a, 0x94, 0x9b, 0x8b, 0xbc, 0xbf, 0x4b,
+        0xf1, 0x18, 0xef, 0x6f, 0x97, 0x92, 0x99, 0x59, 0xbe, 0x2e, 0xe4, 0x31,
+        0xcb, 0x4e, 0x86, 0x77, 0x91, 0x4c, 0xd1, 0x03, 0xe2, 0x14, 0xfa, 0xea,
+        0x3c, 0x83, 0xe7, 0x31, 0xb6, 0x82, 0x6f, 0x7c, 0x18, 0xc8, 0x14, 0xf0,
+        0x5e, 0xe0, 0x1f, 0xff, 0x2e, 0x4d, 0xd2, 0xd5, 0xbc, 0x9e, 0xc3, 0x80,
+        0x61, 0x7c, 0x13, 0xf3, 0x08, 0xd0, 0x4e, 0xe7, 0xdf, 0x18, 0x4e, 0x7c,
+        0xfc, 0x97, 0xde, 0x39, 0x9d, 0x57, 0x73, 0x42, 0x9f, 0xca, 0x36, 0x5e,
+        0xc3, 0x4e, 0x42, 0xff, 0xa2, 0x45, 0xd1, 0x47, 0xb2, 0x55, 0xd8, 0xaa,
+        0x8b, 0xc2, 0xe6, 0x38, 0xba, 0xa7, 0xd6, 0xdb, 0xf2, 0x71, 0xcf, 0xb9,
+        0x9f, 0x07, 0x72, 0xf3, 0x87, 0x85, 0x6e, 0x36, 0x3c, 0xbe, 0x47, 0xd5,
+        0x9c, 0x7e, 0x5e, 0x5c, 0x33, 0x16, 0x70, 0xed, 0x49, 0x75, 0xed, 0xd7,
+        0x84, 0x4e, 0x8c, 0xfc, 0xb8, 0xd0, 0x35, 0x81, 0xdf, 0xbc, 0xaf, 0x4e,
+        0x8c, 0xf1, 0x3b, 0xb2, 0x04, 0xdf, 0xbc, 0x80, 0xa7, 0x86, 0x07, 0x60,
+        0x01, 0x9c, 0xef, 0x52, 0xf8, 0x6e, 0x5b, 0xa9, 0xa0, 0x5e, 0x77, 0x33,
+        0x38, 0xb3, 0x8e, 0x93, 0xc7, 0x5a, 0xb1, 0xa6, 0xdd, 0x81, 0x44, 0xc9,
+        0x32, 0x72, 0xf3, 0xb0, 0x71, 0xe0, 0x7f, 0xdc, 0x8b, 0xbc, 0x28, 0x9e,
+        0xc3, 0x6e, 0x4a, 0xa4, 0x31, 0x2f, 0x8c, 0xd3, 0x30, 0x18, 0xf7, 0xc0,
+        0xc2, 0x7d, 0xdf, 0x0e, 0x75, 0x5f, 0xbb, 0xd8, 0x0b, 0x32, 0xf0, 0x1e,
+        0xfd, 0x6e, 0xbc, 0x17, 0xef, 0xc7, 0x7d, 0x78, 0x9e, 0x7c, 0xee, 0x2e,
+        0xe6, 0xd7, 0xc9, 0x09, 0xf9, 0x2c, 0xe3, 0xa6, 0xbc, 0xb6, 0xcb, 0xf1,
+        0x9f, 0xaf, 0xdc, 0x3f, 0xdc, 0xab, 0xf7, 0x6f, 0x07, 0x95, 0x84, 0x5f,
+        0x09, 0xd7, 0xba, 0xc5, 0xb5, 0xa4, 0xd3, 0x2d, 0xf6, 0x75, 0x8e, 0x8f,
+        0xcf, 0x16, 0x7a, 0x02, 0xb0, 0xd5, 0x73, 0xe9, 0xee, 0x40, 0xa9, 0x84,
+        0xf5, 0x76, 0x07, 0x52, 0x8c, 0xf3, 0xd3, 0x85, 0x23, 0x95, 0x59, 0xc1,
+        0x5b, 0x58, 0xc7, 0xed, 0xb3, 0xcd, 0x33, 0xc6, 0xcf, 0xc4, 0x9a, 0xf8,
+        0x7d, 0xfc, 0x9b, 0xe9, 0x2e, 0xcf, 0x74, 0x97, 0x67, 0xba, 0xcb, 0x33,
+        0xdd, 0xb1, 0x8d, 0xfa, 0x83, 0x3c, 0xd3, 0x1d, 0xcb, 0x90, 0xb7, 0x58,
+        0x86, 0x48, 0x5a, 0x4d, 0x28, 0xdf, 0x9e, 0xa6, 0x55, 0x6f, 0x4d, 0xa6,
+        0xa6, 0x4d, 0xc8, 0x6d, 0x0a, 0x1c, 0x1d, 0xad, 0xa7, 0xd1, 0x3b, 0x4c,
+        0xa3, 0x2d, 0x53, 0xfd, 0xf4, 0xa0, 0x88, 0x3d, 0xb3, 0xad, 0x39, 0xe6,
+        0xd1, 0xa9, 0x20, 0x74, 0xac, 0x10, 0xd3, 0x13, 0x74, 0x4c, 0x9b, 0xe1,
+        0xde, 0x4f, 0xeb, 0xc5, 0x76, 0x1e, 0x03, 0x9a, 0xdd, 0xab, 0x8e, 0xf3,
+        0x4c, 0xb3, 0x90, 0x7b, 0xd7, 0x02, 0x77, 0x0a, 0x06, 0xeb, 0x62, 0x21,
+        0x33, 0x43, 0xe0, 0x9f, 0x42, 0x3f, 0xe3, 0x7d, 0x5f, 0x65, 0x7e, 0x0f,
+        0xdf, 0x29, 0x7a, 0x77, 0x95, 0x20, 0x3b, 0x22, 0xb7, 0x99, 0x7f, 0x5e,
+        0x28, 0x5e, 0x63, 0x3a, 0xef, 0xa3, 0x2f, 0x17, 0x21, 0x9f, 0x01, 0x23,
+        0x3e, 0x2e, 0x91, 0xf0, 0x7d, 0x19, 0x53, 0x58, 0xfb, 0xfe, 0xac, 0x21,
+        0xf0, 0xe4, 0xaf, 0x01, 0x07, 0x86, 0xfd, 0xdd, 0x3d, 0xe8, 0x69, 0x9f,
+        0x30, 0x5a, 0x95, 0x8f, 0x17, 0xbf, 0x31, 0x1e, 0x63, 0x01, 0x37, 0x1c,
+        0x37, 0x8b, 0x2f, 0xe2, 0x1b, 0x11, 0x71, 0x86, 0x87, 0x97, 0x5f, 0x5d,
+        0xe5, 0xfb, 0x05, 0xbc, 0x26, 0x93, 0x41, 0xd4, 0x87, 0xd3, 0xd7, 0x82,
+        0x53, 0x93, 0xf4, 0x72, 0x19, 0xf3, 0xbe, 0x42, 0xb3, 0x61, 0xf0, 0x1f,
+        0x3b, 0x7e, 0x9f, 0x24, 0xec, 0xda, 0x59, 0xdf, 0xfc, 0xa2, 0x3f, 0x4f,
+        0xb3, 0x92, 0x42, 0x3f, 0x6e, 0x63, 0x7b, 0x07, 0xb0, 0x79, 0x83, 0x71,
+        0x2d, 0x0e, 0x1f, 0x80, 0xe2, 0x67, 0xdf, 0x67, 0x9e, 0x83, 0x3d, 0xc3,
+        0x71, 0x3d, 0x0f, 0x5b, 0x53, 0x3c, 0xcc, 0x71, 0xf1, 0xb0, 0x5c, 0x95,
+        0x87, 0x31, 0x2e, 0x08, 0xde, 0x05, 0xde, 0x74, 0x82, 0xf5, 0x45, 0xf9,
+        0x1b, 0x7a, 0xe0, 0x4e, 0xc1, 0xab, 0x98, 0xb7, 0xb3, 0xfd, 0xb0, 0x58,
+        0xce, 0x06, 0x8e, 0x08, 0x9e, 0xa1, 0xf1, 0xf9, 0xa9, 0x01, 0x49, 0x07,
+        0xed, 0xd2, 0x1f, 0x79, 0x0a, 0x7c, 0xca, 0x6f, 0xfc, 0x67, 0x78, 0x1c,
+        0xc6, 0x3b, 0x91, 0xd7, 0x99, 0x7f, 0x2d, 0xc6, 0x63, 0x22, 0x06, 0x22,
+        0x6d, 0x9c, 0x2c, 0xdb, 0x01, 0xbb, 0x90, 0x6b, 0x69, 0x25, 0xab, 0xfc,
+        0x4b, 0xd7, 0x1f, 0xc1, 0xaf, 0x88, 0x3d, 0x4e, 0xf4, 0x1a, 0x72, 0x1d,
+        0x16, 0xd6, 0x31, 0x5b, 0xa4, 0xd0, 0x4c, 0x1c, 0xb9, 0x71, 0xe0, 0xeb,
+        0x1f, 0xf0, 0xba, 0xb1, 0xaf, 0x1f, 0x60, 0x5f, 0xe5, 0xb5, 0x89, 0x63,
+        0x62, 0x5e, 0xb3, 0xcb, 0x35, 0xfe, 0x37, 0x97, 0x1f, 0x30, 0x16, 0x0b,
+        0x72, 0x6e, 0x4b, 0xa3, 0x92, 0xc7, 0x2d, 0x96, 0xd0, 0xab, 0x4b, 0xcc,
+        0x91, 0xe7, 0xa6, 0xd7, 0x85, 0xf7, 0x6a, 0x7a, 0xdf, 0x0a, 0x6d, 0x3d,
+        0xc3, 0x74, 0x84, 0x3d, 0xc8, 0xba, 0x70, 0xe4, 0x5b, 0xfc, 0x7e, 0x9c,
+        0x6b, 0x9c, 0xff, 0x83, 0xea, 0xfc, 0x9f, 0xe4, 0xf9, 0x63, 0xcc, 0x07,
+        0x2c, 0xef, 0xe5, 0xfc, 0x1f, 0x54, 0xe7, 0x5f, 0x54, 0xf3, 0xa7, 0x9c,
+        0x31, 0xd5, 0xab, 0xf4, 0xf7, 0xa6, 0xcf, 0x6a, 0x9f, 0x99, 0x10, 0x63,
+        0xcd, 0x19, 0xe8, 0x44, 0xa6, 0x9e, 0x8b, 0xb6, 0x0d, 0xdd, 0x73, 0xb1,
+        0x63, 0xf7, 0xe9, 0x8f, 0x49, 0xea, 0x1d, 0x43, 0xac, 0x77, 0xe0, 0x3c,
+        0xcd, 0x82, 0xcf, 0xe6, 0xc2, 0xe8, 0x11, 0x3b, 0xc8, 0x30, 0x62, 0x3b,
+        0x6a, 0x82, 0xff, 0x0a, 0xbf, 0x18, 0x9e, 0xa3, 0xef, 0xff, 0x43, 0x5a,
+        0x9f, 0x07, 0x2f, 0x86, 0xfe, 0x29, 0xfb, 0xc8, 0xae, 0xaf, 0x48, 0xff,
+        0x6b, 0xca, 0xd7, 0xff, 0x0a, 0xdf, 0xeb, 0x04, 0xf4, 0x73, 0x13, 0x7e,
+        0xda, 0x69, 0xf5, 0xed, 0x8f, 0x5c, 0x19, 0xcf, 0xf2, 0xe3, 0x2b, 0x93,
+        0xae, 0x1c, 0x35, 0xe4, 0x8c, 0x64, 0x99, 0x4f, 0x38, 0x66, 0x8b, 0x21,
+        0x6b, 0x64, 0x6e, 0x95, 0xb5, 0xae, 0x73, 0x8c, 0xf7, 0xc4, 0x89, 0x1b,
+        0x46, 0x4a, 0xf8, 0x08, 0xda, 0x9d, 0x2e, 0x6a, 0x63, 0x39, 0x78, 0x8e,
+        0xd0, 0xe7, 0xcc, 0xb6, 0x10, 0x3b, 0xb9, 0xca, 0x38, 0x36, 0x1b, 0xb7,
+        0x23, 0xcf, 0x0b, 0x7b, 0x12, 0xf2, 0x01, 0xdf, 0x4e, 0x01, 0xac, 0x30,
+        0x07, 0xfe, 0xbd, 0x8c, 0x9e, 0x95, 0x71, 0x5e, 0x3f, 0x7c, 0xbd, 0x23,
+        0xd6, 0x5d, 0x96, 0x2b, 0x57, 0x85, 0x3f, 0xe5, 0x12, 0xeb, 0x92, 0xb6,
+        0x79, 0x54, 0xd0, 0x99, 0x31, 0xc4, 0x54, 0xc1, 0x74, 0x82, 0x1c, 0x81,
+        0xfd, 0xa2, 0xa7, 0x8e, 0xb4, 0x51, 0x78, 0x95, 0x2b, 0xaa, 0x57, 0x41,
+        0x1a, 0xb4, 0xbf, 0x75, 0x5f, 0x42, 0xfa, 0xa1, 0x7d, 0x28, 0x6e, 0x1d,
+        0xca, 0xeb, 0xa7, 0x86, 0x3d, 0x66, 0x89, 0xde, 0x8c, 0x80, 0x9d, 0xf0,
+        0x03, 0x1a, 0x63, 0x0c, 0x37, 0xfd, 0x9d, 0x1a, 0xb7, 0xbd, 0x7f, 0x5e,
+        0xd4, 0xdc, 0xbf, 0x59, 0x96, 0x32, 0x34, 0xc7, 0xb6, 0xf8, 0xec, 0xb8,
+        0x5b, 0xa7, 0xb0, 0x0b, 0xd3, 0xc2, 0x07, 0x33, 0x40, 0xc9, 0x85, 0x31,
+        0xfa, 0x7c, 0x1e, 0x3c, 0x88, 0xee, 0x27, 0x1d, 0xf1, 0xcd, 0x25, 0x9e,
+        0xd3, 0x18, 0xa5, 0xca, 0x80, 0x51, 0x80, 0x66, 0x99, 0xcb, 0xe7, 0x0a,
+        0x88, 0xbd, 0xf3, 0xef, 0x12, 0xbe, 0xa9, 0xf2, 0x3b, 0xca, 0xb7, 0x1d,
+        0xa5, 0xe9, 0x05, 0xca, 0x66, 0xe2, 0x4f, 0x8b, 0x3e, 0xd3, 0x99, 0xf8,
+        0xa8, 0xf2, 0xc9, 0x44, 0xf8, 0x3c, 0xfc, 0x5c, 0x16, 0x7d, 0x2e, 0x6f,
+        0x67, 0x33, 0x24, 0x7d, 0x0d, 0xc4, 0x73, 0x30, 0x58, 0x76, 0xee, 0x64,
+        0x9e, 0x70, 0x52, 0xf8, 0x1b, 0x58, 0xd3, 0x98, 0xc7, 0x78, 0xf8, 0x0a,
+        0xfa, 0x08, 0xf6, 0x55, 0xa6, 0xf0, 0x92, 0x1a, 0x5b, 0x21, 0x93, 0x71,
+        0xc1, 0xfc, 0x55, 0x27, 0x1b, 0x37, 0x6a, 0xf7, 0xc3, 0x57, 0x71, 0x52,
+        0xe8, 0x7d, 0x43, 0xb4, 0x24, 0x68, 0xbd, 0x52, 0x99, 0x11, 0x7e, 0x07,
+        0x3e, 0x2e, 0x4d, 0x0e, 0x4a, 0x5e, 0x25, 0xcf, 0x4b, 0x7f, 0x04, 0x3f,
+        0xb3, 0xc4, 0xf3, 0xa8, 0xcb, 0x7f, 0x8f, 0x52, 0x62, 0x1b, 0xfe, 0xa1,
+        0x53, 0x8f, 0xd4, 0x3f, 0xc4, 0xb0, 0x66, 0xd9, 0x71, 0x8b, 0x69, 0xe3,
+        0xc7, 0x9b, 0xda, 0x6d, 0xef, 0x69, 0x19, 0xcc, 0xb0, 0x32, 0xc5, 0xb7,
+        0x2b, 0xa0, 0x33, 0xcf, 0x96, 0xe7, 0xf0, 0x1d, 0x99, 0x40, 0x5a, 0xe8,
+        0xb2, 0x11, 0xd6, 0x4d, 0xa0, 0xa3, 0x8c, 0x88, 0x78, 0x62, 0xe2, 0x59,
+        0xcb, 0x98, 0x5d, 0xc1, 0xb7, 0xa1, 0xa0, 0x9b, 0xe9, 0x9c, 0x86, 0x76,
+        0x91, 0xa7, 0x2e, 0xe3, 0xbc, 0x90, 0xaf, 0xe0, 0x79, 0x3f, 0x0f, 0x64,
+        0x56, 0x9e, 0xde, 0xa5, 0xf3, 0xd5, 0x12, 0x61, 0x9d, 0x0f, 0xa3, 0x79,
+        0x8a, 0xc6, 0x3d, 0x1d, 0xa3, 0x70, 0x7f, 0xcb, 0x0b, 0xb4, 0xeb, 0xd6,
+        0x09, 0xe0, 0x57, 0x12, 0x7b, 0x74, 0x15, 0xb1, 0x31, 0xa3, 0x2e, 0xfe,
+        0xd0, 0xc6, 0xfb, 0x64, 0x31, 0x6e, 0xc0, 0x5f, 0xf7, 0x05, 0xfe, 0x8b,
+        0x38, 0x42, 0x69, 0x10, 0x7a, 0x50, 0xaf, 0xc3, 0x38, 0x33, 0x81, 0xe3,
+        0x7e, 0x5a, 0x2c, 0x6a, 0xbd, 0x55, 0xfa, 0x90, 0x16, 0x97, 0xf5, 0x7e,
+        0xc1, 0x7f, 0x34, 0xac, 0x7a, 0x08, 0xd8, 0x64, 0xf5, 0x01, 0x4e, 0x9f,
+        0x14, 0x3d, 0x6e, 0x16, 0x73, 0xd8, 0x4a, 0xce, 0x11, 0xbe, 0x2f, 0x86,
+        0x9e, 0x99, 0xfb, 0x00, 0x7b, 0xde, 0x23, 0x77, 0x4c, 0x62, 0x4e, 0x7d,
+        0xff, 0xe7, 0x51, 0xed, 0xdb, 0x63, 0x3e, 0xfb, 0xf6, 0xd1, 0xa0, 0x8c,
+        0x73, 0x3d, 0xa7, 0xc6, 0xf8, 0xe5, 0x99, 0xfe, 0xf3, 0x0b, 0xf0, 0x1f,
+        0xd5, 0xea, 0x25, 0xee, 0x09, 0xbe, 0xd2, 0xe8, 0xc3, 0x8e, 0x30, 0x3f,
+        0x95, 0x74, 0x7c, 0xd2, 0x87, 0x8e, 0xfb, 0x78, 0x8f, 0x4f, 0x3c, 0x04,
+        0x1d, 0x9f, 0x68, 0x4a, 0xc7, 0x87, 0xa2, 0xd2, 0x87, 0xda, 0x48, 0xc7,
+        0xa8, 0xd9, 0x39, 0x59, 0x6e, 0xe6, 0xaf, 0xc2, 0x3e, 0xa0, 0xf6, 0x1c,
+        0xfe, 0x04, 0xc0, 0x4a, 0xfb, 0x14, 0x10, 0xdb, 0x03, 0x3e, 0x22, 0x56,
+        0xf2, 0x17, 0x94, 0x9a, 0xf7, 0xc6, 0x38, 0x37, 0xba, 0xe7, 0x7d, 0x9f,
+        0x7b, 0xa0, 0x6b, 0x83, 0x16, 0xec, 0x88, 0xb4, 0xd5, 0x35, 0xbc, 0xde,
+        0x0d, 0x1c, 0x29, 0xda, 0xd9, 0x12, 0x18, 0x63, 0x4f, 0x98, 0xce, 0x23,
+        0x8e, 0xaf, 0x7c, 0xbe, 0xc7, 0xf3, 0x72, 0xdd, 0xe6, 0xb8, 0xc0, 0x07,
+        0xe8, 0xa3, 0x91, 0x74, 0x30, 0xcd, 0x7b, 0x2a, 0xfd, 0xbd, 0x99, 0xe5,
+        0x88, 0xda, 0x27, 0x1e, 0x8b, 0xe7, 0xf9, 0xd6, 0xf3, 0x61, 0x7f, 0xec,
+        0x57, 0x57, 0xab, 0x79, 0xc1, 0x90, 0x05, 0x15, 0xfa, 0x05, 0xcb, 0xb9,
+        0xe0, 0xb8, 0x29, 0xfa, 0x28, 0xdc, 0x2a, 0x8f, 0xb3, 0x7e, 0x88, 0x3d,
+        0x84, 0xaf, 0x50, 0xfb, 0x72, 0x7f, 0x31, 0x44, 0x3d, 0x87, 0x58, 0xea,
+        0x1b, 0xe4, 0xb0, 0x7e, 0x68, 0x8c, 0x23, 0xbf, 0xdb, 0xe2, 0x7b, 0xd0,
+        0xff, 0x69, 0xbf, 0x95, 0xa2, 0x2e, 0xf8, 0x09, 0xd0, 0xa7, 0xd9, 0xca,
+        0xd5, 0xd1, 0xd4, 0x69, 0x41, 0x53, 0xa9, 0x95, 0xd3, 0x8a, 0xa6, 0x4e,
+        0x2b, 0x7f, 0xf9, 0x69, 0x45, 0x53, 0xa7, 0x15, 0x4d, 0x9d, 0x56, 0x34,
+        0x75, 0x9a, 0xf1, 0x7a, 0xc4, 0xec, 0x13, 0x3a, 0xbb, 0xf6, 0x57, 0xf6,
+        0x50, 0xa6, 0x88, 0xf3, 0x90, 0xc7, 0x5e, 0xba, 0x7a, 0x75, 0x48, 0xd2,
+        0xd5, 0x24, 0x2d, 0xca, 0x3c, 0x39, 0x7e, 0x17, 0xf6, 0xe0, 0xeb, 0x83,
+        0xd4, 0x73, 0x2f, 0x70, 0x76, 0x1e, 0x73, 0x0d, 0xd0, 0xb4, 0xe8, 0xe1,
+        0xda, 0x42, 0x49, 0xb7, 0x2e, 0x6b, 0xa2, 0x7e, 0x4b, 0xda, 0x6a, 0xd9,
+        0xa6, 0xb5, 0x5c, 0x1a, 0x2f, 0xa6, 0xd4, 0x7e, 0x79, 0xed, 0x98, 0x36,
+        0x4a, 0x17, 0x00, 0x57, 0xe4, 0x32, 0x5a, 0xbc, 0x37, 0x02, 0x4e, 0x59,
+        0xd3, 0x07, 0x06, 0xc7, 0x15, 0x0c, 0xbe, 0x22, 0xd6, 0x88, 0x5c, 0x40,
+        0xf8, 0x1c, 0x9b, 0xc3, 0x21, 0x97, 0x1f, 0xe1, 0xe7, 0x30, 0xee, 0x8f,
+        0x47, 0x98, 0x07, 0x6d, 0x1d, 0x0e, 0xb5, 0xb5, 0x37, 0xe3, 0x35, 0x5b,
+        0xad, 0x87, 0xb9, 0xef, 0x92, 0x1d, 0x11, 0x25, 0x37, 0xa4, 0x9e, 0xfb,
+        0x98, 0x63, 0xa7, 0xb3, 0x3c, 0xb7, 0xbf, 0x8f, 0xb7, 0xef, 0xa5, 0x8e,
+        0x0a, 0x1d, 0x8b, 0x03, 0x9f, 0x7b, 0xd8, 0x6e, 0xe4, 0x39, 0xec, 0xaf,
+        0xd0, 0xd5, 0xf8, 0x01, 0xb6, 0x4d, 0xf0, 0x2d, 0xa6, 0x11, 0xfe, 0xef,
+        0x24, 0x82, 0x01, 0xcc, 0xab, 0x8b, 0xef, 0x0d, 0x93, 0xd1, 0x9b, 0xe8,
+        0x6d, 0x57, 0xba, 0x29, 0xfc, 0x6e, 0xac, 0x9b, 0x1a, 0x33, 0xf1, 0x1d,
+        0xaa, 0xa6, 0x0c, 0xbe, 0x6a, 0xc4, 0xb1, 0x7e, 0x56, 0x91, 0xbd, 0x00,
+        0xa2, 0xea, 0xf8, 0xa7, 0x95, 0x44, 0x14, 0xc7, 0x26, 0xdd, 0x60, 0x7b,
+        0x39, 0x11, 0x18, 0xd9, 0x2b, 0x74, 0xf6, 0x80, 0x7d, 0x4c, 0xe6, 0x30,
+        0xd8, 0xa6, 0x15, 0xf0, 0xc3, 0x77, 0xa9, 0xeb, 0xd4, 0xf2, 0x4c, 0x81,
+        0xff, 0x15, 0xfa, 0x4f, 0xa6, 0x55, 0x93, 0x10, 0xb3, 0x98, 0x14, 0xb5,
+        0xce, 0xc8, 0x33, 0x3e, 0x3b, 0x0f, 0x9a, 0x85, 0xdf, 0xd0, 0x51, 0x7b,
+        0xfc, 0x29, 0xe4, 0x89, 0x15, 0x16, 0x69, 0x63, 0x59, 0x01, 0xbf, 0xd8,
+        0xc8, 0xc2, 0x5a, 0x6f, 0x58, 0xd4, 0x5e, 0xc3, 0xcf, 0xa9, 0xf3, 0x89,
+        0xf7, 0xf3, 0xf3, 0x43, 0xe2, 0xdb, 0x72, 0xd3, 0xd7, 0x30, 0xae, 0x95,
+        0x86, 0x17, 0x2a, 0x4f, 0xf1, 0x75, 0x11, 0x2f, 0xcc, 0x50, 0xbb, 0x8a,
+        0x05, 0x74, 0xa9, 0xf8, 0x51, 0x84, 0x69, 0xa8, 0x56, 0x53, 0x3c, 0x5c,
+        0xf5, 0x9d, 0x01, 0xb7, 0xbd, 0xbe, 0xb3, 0xaf, 0x6d, 0x22, 0x67, 0x36,
+        0xc3, 0x67, 0xe4, 0x82, 0xb6, 0x91, 0xf2, 0x09, 0x5a, 0xb3, 0xb4, 0xd5,
+        0xda, 0xb9, 0x6d, 0xdf, 0xd3, 0xde, 0x3a, 0xb5, 0x7a, 0xf1, 0xae, 0xd3,
+        0xa1, 0xf0, 0xa8, 0x95, 0xce, 0x16, 0x3b, 0x58, 0x56, 0xa3, 0xce, 0x09,
+        0xf0, 0x0a, 0x46, 0x51, 0x27, 0xf2, 0x5c, 0xa8, 0x95, 0x96, 0x97, 0x91,
+        0xd3, 0xf0, 0x67, 0x7b, 0x65, 0x7e, 0x6e, 0x9a, 0xe1, 0x72, 0x88, 0xe5,
+        0x9a, 0xa1, 0x62, 0x35, 0x38, 0x07, 0x9e, 0x20, 0x7a, 0x78, 0x86, 0x9e,
+        0x1e, 0xed, 0x60, 0x7d, 0x5e, 0xfa, 0xfa, 0x0f, 0xf3, 0xb3, 0xbf, 0x57,
+        0x4c, 0xc3, 0x4f, 0x65, 0x1e, 0xe5, 0xe7, 0x4f, 0xb3, 0x1e, 0x90, 0xa0,
+        0x56, 0x5a, 0x5a, 0x6e, 0x65, 0x7d, 0xbe, 0x95, 0xf5, 0x80, 0x11, 0x73,
+        0x38, 0x20, 0xde, 0x25, 0x6a, 0x52, 0x3e, 0x1b, 0x3a, 0x64, 0x1e, 0x13,
+        0x79, 0x36, 0x7f, 0xa5, 0xde, 0xe5, 0x7d, 0xc7, 0x07, 0x15, 0x1c, 0x1f,
+        0x0d, 0xae, 0x5e, 0xbc, 0xe3, 0x98, 0x8c, 0x7f, 0x93, 0xac, 0xf3, 0x86,
+        0xc5, 0xf7, 0x17, 0x8d, 0xa9, 0x29, 0xd6, 0xff, 0xf1, 0x8d, 0xb7, 0x67,
+        0x28, 0x5b, 0x3e, 0x45, 0x5f, 0x2f, 0xbb, 0x7d, 0xaf, 0xcf, 0xf0, 0x9c,
+        0x65, 0xed, 0x7c, 0x1b, 0xcf, 0xeb, 0x3d, 0xc7, 0xcb, 0x2b, 0x3a, 0x28,
+        0xf8, 0xad, 0x30, 0xb5, 0x7e, 0x03, 0x3e, 0x8f, 0x0a, 0x15, 0xe2, 0xf6,
+        0xd5, 0xfb, 0x24, 0xfd, 0xbc, 0x37, 0x44, 0x5e, 0x2a, 0xdf, 0xcf, 0xcf,
+        0x9c, 0xc3, 0xb8, 0x1b, 0x16, 0xdd, 0x76, 0x24, 0xbc, 0xff, 0x36, 0x14,
+        0xa6, 0xe0, 0x1b, 0xc8, 0xf5, 0x82, 0x8e, 0xb5, 0x7a, 0xd1, 0x39, 0xc0,
+        0x7c, 0xfa, 0x1b, 0xb8, 0x8f, 0xff, 0xbe, 0x81, 0xe3, 0x0e, 0x5e, 0x27,
+        0xe4, 0x2c, 0x72, 0x4a, 0xc0, 0xdf, 0x0e, 0x45, 0x4c, 0x81, 0x7f, 0xcf,
+        0x30, 0x4e, 0xb5, 0x08, 0x1f, 0x5f, 0x1f, 0xc6, 0x3a, 0x83, 0xac, 0x13,
+        0xac, 0x5e, 0x1c, 0x3d, 0x80, 0xe3, 0x44, 0x6f, 0x90, 0x61, 0x24, 0x71,
+        0xa8, 0xe1, 0x9b, 0x75, 0xa1, 0xc3, 0xa3, 0xe4, 0xfa, 0x6e, 0x1d, 0x7a,
+        0x26, 0x75, 0x50, 0x8a, 0xdf, 0x31, 0x5d, 0x94, 0xeb, 0x9e, 0x2b, 0x07,
+        0x49, 0xfa, 0x87, 0x52, 0x43, 0xfa, 0xfb, 0x84, 0xd4, 0x8f, 0x67, 0x6b,
+        0x5a, 0xc1, 0xef, 0x1e, 0x7a, 0x50, 0xec, 0xa2, 0x75, 0x15, 0x43, 0x7a,
+        0x20, 0xec, 0x29, 0xe6, 0xc5, 0xe9, 0x1e, 0xba, 0xbf, 0xdc, 0x42, 0xd4,
+        0xd7, 0x21, 0x62, 0xbc, 0x0f, 0x8a, 0x8b, 0x94, 0x7c, 0xed, 0xc9, 0x21,
+        0xe9, 0x4f, 0xa9, 0xe1, 0xc8, 0x03, 0x1f, 0x1c, 0x79, 0x57, 0xe0, 0xc8,
+        0xf0, 0xd0, 0xc6, 0x38, 0xb2, 0x47, 0xe7, 0x22, 0x52, 0xab, 0xc2, 0x8f,
+        0xd7, 0x19, 0x3f, 0x5e, 0x66, 0xfc, 0x38, 0xd2, 0x04, 0x3f, 0x0c, 0x0f,
+        0x7e, 0x1c, 0x15, 0xf8, 0xf1, 0xeb, 0x43, 0x1b, 0xe1, 0xc7, 0x91, 0xe0,
+        0x46, 0x3e, 0x1e, 0x8d, 0x9b, 0x03, 0xb4, 0x54, 0x74, 0x68, 0x79, 0xde,
+        0x8e, 0x27, 0x68, 0x35, 0x22, 0x63, 0x83, 0x53, 0xa2, 0x4e, 0x65, 0x51,
+        0xe0, 0x55, 0x5a, 0xf8, 0x2f, 0xfd, 0xbf, 0x1b, 0x68, 0x29, 0xf8, 0xcb,
+        0x3d, 0x99, 0xce, 0xaf, 0x5e, 0xfc, 0x3b, 0xde, 0xc7, 0xdb, 0x2b, 0xa1,
+        0x10, 0xae, 0x05, 0xa7, 0xc2, 0xb4, 0xb6, 0x82, 0xef, 0x12, 0x46, 0xe8,
+        0x4e, 0x31, 0x4a, 0xb7, 0x8b, 0x03, 0xb4, 0x56, 0x1c, 0xa2, 0xbb, 0x45,
+        0xbc, 0x03, 0x30, 0xe7, 0x63, 0x01, 0x73, 0x83, 0x0e, 0x87, 0x79, 0xcc,
+        0xf2, 0x00, 0xad, 0x2e, 0x6b, 0x7c, 0x05, 0xae, 0x62, 0xff, 0xe1, 0x27,
+        0xf0, 0xc7, 0x81, 0xe9, 0x3a, 0x1c, 0x90, 0xf7, 0x60, 0xef, 0x67, 0x1b,
+        0x6b, 0x64, 0x45, 0x9e, 0xa5, 0xc9, 0x38, 0xd2, 0x32, 0x65, 0x0b, 0x5f,
+        0xea, 0xe1, 0x20, 0x74, 0xd9, 0xc4, 0x3e, 0xea, 0xe1, 0x3d, 0x70, 0x90,
+        0x27, 0x34, 0xc4, 0x7a, 0xe9, 0x0e, 0xa1, 0x87, 0x26, 0x9d, 0x50, 0x64,
+        0x9a, 0x2a, 0x97, 0x0c, 0x07, 0x3d, 0x0f, 0xd3, 0xfc, 0x3c, 0x43, 0xf9,
+        0x71, 0xba, 0x5d, 0xf8, 0xe4, 0xd5, 0x39, 0x11, 0x8b, 0x7d, 0x96, 0xe7,
+        0x0c, 0xf9, 0x58, 0x8b, 0x73, 0x50, 0x35, 0xce, 0xd1, 0xce, 0xeb, 0x96,
+        0xb4, 0x34, 0xe3, 0xf0, 0xb8, 0x32, 0x8f, 0x2b, 0x23, 0x76, 0xc6, 0xe7,
+        0x97, 0x11, 0xb7, 0x8d, 0xd2, 0xda, 0x3c, 0x68, 0x0e, 0x7e, 0x89, 0x5a,
+        0xac, 0x74, 0x6d, 0x05, 0xe7, 0xe1, 0x9b, 0xa8, 0xc5, 0x4a, 0xd7, 0x54,
+        0xac, 0x74, 0x6d, 0x65, 0x4a, 0xf0, 0xe1, 0xd9, 0xff, 0xdd, 0x14, 0x60,
+        0x19, 0x30, 0x85, 0x19, 0xba, 0x4e, 0x53, 0x0d, 0x7a, 0xbf, 0x4e, 0x0c,
+        0x78, 0x6c, 0x58, 0x50, 0x05, 0x7f, 0x18, 0xba, 0x62, 0x84, 0xa1, 0x0d,
+        0xb8, 0xfd, 0xe3, 0x02, 0x34, 0xd3, 0x79, 0x4a, 0x0c, 0x30, 0x3c, 0x23,
+        0x80, 0x79, 0x49, 0x18, 0x9a, 0x97, 0x60, 0x73, 0xaf, 0xfc, 0x0c, 0x90,
+        0xbb, 0x7a, 0x6c, 0xc0, 0x6d, 0x7c, 0x48, 0xf9, 0x23, 0x83, 0x56, 0xfe,
+        0x30, 0xb0, 0x38, 0xa9, 0x43, 0xf4, 0x37, 0xad, 0x7f, 0x2c, 0x07, 0x1b,
+        0x5f, 0x6b, 0x02, 0x9a, 0xdb, 0x3c, 0x85, 0x94, 0xb9, 0x5b, 0x60, 0xbd,
+        0x89, 0x75, 0x5d, 0x26, 0xb1, 0x76, 0xc3, 0xd2, 0x42, 0x0c, 0x19, 0xe9,
+        0x09, 0x62, 0x06, 0x22, 0x3d, 0xd9, 0x00, 0xcb, 0x4e, 0x16, 0x60, 0x5e,
+        0x11, 0x02, 0xd6, 0x0f, 0x0c, 0xd0, 0x3a, 0xe6, 0x00, 0x78, 0x2c, 0xa1,
+        0x89, 0x01, 0x74, 0x07, 0x27, 0xd0, 0xfe, 0x7e, 0x65, 0xf0, 0xba, 0xe3,
+        0x06, 0x09, 0x88, 0xa1, 0x8b, 0x7a, 0x14, 0xe5, 0x41, 0x79, 0xd4, 0x49,
+        0x85, 0x81, 0xc4, 0xfc, 0x04, 0xf2, 0x1f, 0xd0, 0x1f, 0x20, 0x3f, 0x02,
+        0xf3, 0x93, 0x33, 0x50, 0x0e, 0xb4, 0x36, 0xaa, 0x79, 0x0d, 0x48, 0x1f,
+        0x28, 0x0c, 0x41, 0x65, 0x2a, 0x68, 0x8c, 0x03, 0xc8, 0x5e, 0x22, 0x04,
+        0x0d, 0x3b, 0x20, 0x0d, 0x64, 0x37, 0x4f, 0x11, 0x01, 0xf3, 0x93, 0x02,
+        0x84, 0x18, 0x1a, 0xe0, 0xf9, 0x89, 0x1d, 0xe8, 0x52, 0x98, 0x9b, 0xfe,
+        0xff, 0x3f, 0xa6, 0xc2, 0x02, 0x4c, 0x7b, 0xa0, 0xb5, 0xb5, 0xbf, 0xff,
+        0x1f, 0x10, 0x61, 0x61, 0x68, 0x81, 0xaf, 0xd1, 0x0b, 0x94, 0x07, 0x95,
+        0x73, 0x0b, 0x80, 0xac, 0x36, 0x78, 0xbd, 0x0d, 0x92, 0x07, 0x89, 0xfd,
+        0x02, 0x96, 0x2b, 0xff, 0xff, 0x2f, 0x85, 0xab, 0x05, 0x01, 0x00, 0xb3,
+        0x28, 0x79, 0xae, 0x58, 0x7d, 0x00, 0x00, 0x00 };
 
-static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_COM_b06FwRodata[(0x58/4) + 1] = {
-        0x08002428, 0x0800245c, 0x0800245c, 0x0800245c, 0x0800245c, 0x0800245c,
-        0x08002380, 0x0800245c, 0x080023e4, 0x0800245c, 0x0800231c, 0x0800245c,
-        0x0800245c, 0x0800245c, 0x08002328, 0x00000000, 0x08003240, 0x08003270,
-        0x080032a0, 0x080032d0, 0x08003300, 0x00000000, 0x00000000 };
-static u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x0 };
-static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x0 };
+static const u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_COM_b06FwRodata[(0x88/4) + 1] = {
+        0x08001c1c, 0x08001c4c, 0x08001c4c, 0x08001c4c, 0x08001c4c, 0x08001c4c,
+        0x08001b74, 0x08001c4c, 0x08001bdc, 0x08001c4c, 0x08001b08, 0x08001c4c,
+        0x08001c4c, 0x08001c4c, 0x08001b14, 0x00000000, 0x08002b58, 0x08002ba8,
+        0x08002bd8, 0x08002c08, 0x08002c38, 0x00000000, 0x080060cc, 0x080060cc,
+        0x080060cc, 0x080060cc, 0x080060cc, 0x08006100, 0x08006100, 0x08006140,
+        0x0800614c, 0x0800614c, 0x080060cc, 0x00000000, 0x00000000 };
+static const u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x0 };
+static const u32 bnx2_COM_b06FwSbss[(0x60/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_com_fw_06 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
-        .start_addr                     = 0x080008b4,
+        .start_addr                     = 0x080000b4,
 
         .text_addr                      = 0x08000000,
-        .text_len                       = 0x57bc,
+        .text_len                       = 0x7d54,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_COM_b06FwText,
         .gz_text_len                    = sizeof(bnx2_COM_b06FwText),
 
-        .data_addr                      = 0x08005840,
+        .data_addr                      = 0x08007e00,
         .data_len                       = 0x0,
         .data_index                     = 0x0,
         .data                           = bnx2_COM_b06FwData,
 
-        .sbss_addr                      = 0x08005840,
-        .sbss_len                       = 0x1c,
+        .sbss_addr                      = 0x08007e00,
+        .sbss_len                       = 0x60,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_COM_b06FwSbss,
 
-        .bss_addr                       = 0x08005860,
+        .bss_addr                       = 0x08007e60,
         .bss_len                        = 0x88,
         .bss_index                      = 0x0,
         .bss                            = bnx2_COM_b06FwBss,
 
-        .rodata_addr                    = 0x080057c0,
-        .rodata_len                     = 0x58,
+        .rodata_addr                    = 0x08007d58,
+        .rodata_len                     = 0x88,
         .rodata_index                   = 0x0,
         .rodata                         = bnx2_COM_b06FwRodata,
 };
diff --git a/drivers/net/bnx2_fw2.h b/drivers/net/bnx2_fw2.h
index 680c769a3fc0..2c067531f031 100644
--- a/drivers/net/bnx2_fw2.h
+++ b/drivers/net/bnx2_fw2.h
@@ -1,13 +1,13 @@
 /* bnx2_fw2.h: Broadcom NX2 network driver.
  *
- * Copyright (c) 2006 Broadcom Corporation
+ * Copyright (c) 2004, 2005, 2006, 2007 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) 2006 Broadcom Corporation.
+ * source code, Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation.
  *
  * Permission is hereby granted for the distribution of this firmware data
  * in hexadecimal or equivalent format, provided this copyright notice is
@@ -15,3289 +15,3260 @@
  */
 
 static u8 bnx2_COM_b09FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0xac, 0xfb, 0x2f, 0x45, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xdc, 0x5b, 0x6b, 0x70,
-        0x1b, 0xd7, 0x75, 0x3e, 0xfb, 0x00, 0x09, 0x91, 0x10, 0xb5, 0xa4, 0x60,
-        0x1a, 0x96, 0x68, 0x07, 0x20, 0x57, 0x22, 0x6a, 0xb1, 0x29, 0x4c, 0x33,
-        0x16, 0x9b, 0xc2, 0x12, 0x02, 0x50, 0xae, 0x26, 0xc3, 0x3a, 0x94, 0xcd,
-        0xd8, 0x4a, 0xaa, 0xc9, 0x30, 0x00, 0xa5, 0xf4, 0x61, 0xb7, 0x92, 0xab,
-        0xa9, 0x5d, 0xd7, 0xaa, 0x21, 0x92, 0x6a, 0xf5, 0x83, 0xe5, 0x2a, 0x16,
-        0x43, 0xa9, 0xd3, 0x74, 0xc2, 0x12, 0x56, 0xac, 0x4e, 0x31, 0x85, 0xfc,
-        0xd6, 0x38, 0xb1, 0xc9, 0x4a, 0x76, 0xeb, 0xf4, 0xe1, 0xa6, 0x33, 0xcd,
-        0xa3, 0x9d, 0x36, 0xf6, 0xa8, 0x3f, 0xea, 0xe9, 0xd3, 0x33, 0x6e, 0xa7,
-        0xea, 0xd8, 0x0e, 0xfa, 0x7d, 0x77, 0x77, 0x81, 0x25, 0x48, 0xbd, 0xfc,
-        0xc8, 0x8f, 0x70, 0x06, 0xb3, 0x7b, 0xef, 0xde, 0xbd, 0xf7, 0xdc, 0xf3,
-        0xf8, 0xce, 0x63, 0x2f, 0xfb, 0x44, 0x5a, 0xc4, 0xfb, 0x5b, 0x8b, 0x5f,
-        0xfc, 0xfe, 0x5f, 0x2d, 0x7c, 0x7c, 0xf0, 0xe3, 0xfd, 0x22, 0xb7, 0xdc,
-        0xa2, 0xb7, 0x86, 0x75, 0xf6, 0x1b, 0xf8, 0x45, 0xf1, 0xeb, 0xf7, 0xee,
-        0x57, 0xfb, 0xb3, 0xf0, 0x7b, 0x13, 0x0f, 0xc7, 0xfe, 0x55, 0x44, 0xbb,
-        0xc4, 0x98, 0xe0, 0x5f, 0xb5, 0x7a, 0xf9, 0xe7, 0x5c, 0x38, 0x7e, 0x89,
-        0x67, 0x86, 0xbb, 0x9c, 0xa2, 0x97, 0x3f, 0x09, 0xeb, 0x69, 0x39, 0x94,
-        0xb5, 0x25, 0x6c, 0xa4, 0xdf, 0x3c, 0x54, 0xb0, 0x45, 0x32, 0xe5, 0x2d,
-        0xf1, 0x9c, 0xbc, 0x57, 0x2d, 0x46, 0x4d, 0x61, 0xff, 0x8d, 0xe9, 0x77,
-        0xbf, 0xf6, 0xe2, 0xd6, 0xc4, 0x5b, 0xf3, 0x86, 0x84, 0xad, 0xf4, 0x19,
-        0xb1, 0x36, 0x4b, 0xb8, 0x0b, 0xef, 0x7c, 0xb5, 0xf7, 0x3d, 0x91, 0x36,
-        0x7f, 0xae, 0x37, 0xab, 0x2f, 0xf6, 0x4a, 0x71, 0x43, 0x3a, 0x2c, 0x7a,
-        0x7a, 0xd3, 0xf7, 0xb3, 0x86, 0x35, 0x66, 0xa4, 0x2d, 0x59, 0xac, 0xc8,
-        0xc8, 0xde, 0x69, 0x09, 0x87, 0xd3, 0x47, 0x9b, 0x9b, 0x37, 0x49, 0xd8,
-        0x4c, 0x8f, 0x1d, 0xfa, 0x6d, 0xfb, 0xd1, 0xaa, 0x6e, 0xdb, 0xc9, 0x05,
-        0x89, 0x0c, 0x9e, 0x1a, 0xc0, 0xf3, 0x72, 0x22, 0x29, 0xb2, 0x55, 0x74,
-        0xbb, 0x18, 0x31, 0xec, 0xb0, 0x64, 0x2b, 0xb6, 0xe4, 0x2a, 0x22, 0x7f,
-        0x5e, 0xd6, 0xe4, 0x94, 0xdd, 0x29, 0x0b, 0x7d, 0xef, 0x56, 0x33, 0xa0,
-        0xe5, 0xcf, 0xec, 0xb1, 0x43, 0x53, 0x36, 0xe9, 0x9d, 0x6d, 0x76, 0xe9,
-        0x9d, 0x6a, 0x2a, 0xd8, 0xa6, 0x4c, 0x94, 0xd9, 0x37, 0xa2, 0xb3, 0x2f,
-        0x94, 0x7e, 0x68, 0xcd, 0x29, 0x3b, 0xe2, 0xf5, 0xed, 0xdc, 0x9e, 0xc5,
-        0x7c, 0x93, 0x65, 0x8e, 0x3d, 0x93, 0x2a, 0xd8, 0x51, 0xaf, 0x3f, 0x79,
-        0x5b, 0xd6, 0x8e, 0xa1, 0xbf, 0xcb, 0x7b, 0x76, 0xf2, 0xbe, 0x82, 0x6d,
-        0x7b, 0xcf, 0xbe, 0x8a, 0xb9, 0x93, 0x5e, 0xff, 0x7d, 0xdb, 0x0a, 0x76,
-        0x9f, 0xd7, 0x3f, 0xbd, 0x2d, 0x6b, 0xa7, 0xbc, 0xfe, 0xe4, 0xee, 0x82,
-        0x3d, 0xe0, 0xf5, 0x9f, 0xbd, 0x3d, 0x6b, 0x0f, 0x7a, 0xfd, 0x0f, 0x6d,
-        0x2d, 0xd8, 0x69, 0xf4, 0x1f, 0x6d, 0xd6, 0x37, 0x59, 0x72, 0xa4, 0x1c,
-        0xc7, 0x2f, 0x83, 0x67, 0x43, 0xe8, 0xdb, 0x89, 0xdf, 0x30, 0x7e, 0xbf,
-        0xb8, 0x4e, 0xda, 0x46, 0x70, 0xfd, 0xc6, 0x46, 0x97, 0x77, 0xe0, 0x91,
-        0x13, 0x96, 0x37, 0x8c, 0x98, 0xbc, 0xd8, 0xfb, 0x06, 0x78, 0x68, 0xc9,
-        0x99, 0x8a, 0x68, 0x23, 0xbd, 0x31, 0xf0, 0x2e, 0x2a, 0x4f, 0x56, 0x5a,
-        0xc5, 0x78, 0xcc, 0x00, 0x6f, 0x3e, 0x2f, 0xf9, 0x68, 0x58, 0xda, 0xe7,
-        0x34, 0xe9, 0xee, 0x0f, 0x4b, 0xc6, 0x52, 0x72, 0x13, 0x7d, 0x26, 0x2a,
-        0xc6, 0x5c, 0x66, 0xbd, 0x2e, 0x9b, 0xac, 0x9c, 0x14, 0xc1, 0xbb, 0xef,
-        0x51, 0x27, 0xf1, 0x2c, 0x2e, 0xb9, 0xe9, 0x9b, 0x65, 0xcc, 0x22, 0x5d,
-        0x3b, 0x6f, 0x74, 0xd7, 0x0a, 0x6b, 0xd9, 0x13, 0x23, 0x72, 0xc4, 0x89,
-        0x68, 0xb9, 0x13, 0xdb, 0x24, 0x9b, 0x92, 0x28, 0xde, 0x8b, 0xe5, 0xf1,
-        0xa4, 0x54, 0x1e, 0x91, 0x29, 0x47, 0xb4, 0xac, 0x43, 0x7e, 0x76, 0xe2,
-        0x79, 0x9b, 0x1a, 0x8b, 0xbe, 0x2e, 0x43, 0xcd, 0x1d, 0x46, 0xbf, 0x85,
-        0xfe, 0x0e, 0x6d, 0x48, 0xcd, 0xa1, 0xfa, 0xe3, 0x93, 0x12, 0x91, 0xc7,
-        0xcb, 0x51, 0x6f, 0x6c, 0xb5, 0x9a, 0x4d, 0x59, 0x18, 0x37, 0x22, 0x93,
-        0x4e, 0x54, 0xc6, 0x70, 0x9d, 0x70, 0xb8, 0x7e, 0x0c, 0x3a, 0xf5, 0xda,
-        0xa1, 0xfc, 0xac, 0x9a, 0x2f, 0x6e, 0xa4, 0x39, 0x5f, 0x17, 0xc6, 0x4d,
-        0x80, 0x2e, 0x4d, 0x4c, 0x25, 0xcb, 0x8c, 0xe4, 0xa7, 0x35, 0xe8, 0x1b,
-        0xae, 0x8a, 0xaf, 0x43, 0xa0, 0xdf, 0x14, 0xbb, 0x5f, 0x93, 0x02, 0x64,
-        0x55, 0xb4, 0xd0, 0x2e, 0x9f, 0xd5, 0xb3, 0x4e, 0xb3, 0xe4, 0xcc, 0xb8,
-        0x18, 0x33, 0x4a, 0x97, 0x64, 0x12, 0xef, 0xe8, 0x36, 0xc7, 0x5c, 0xc4,
-        0xbe, 0xc7, 0x94, 0x1c, 0x9a, 0xd2, 0x45, 0x3d, 0x57, 0xe9, 0x14, 0x7d,
-        0x6e, 0x8f, 0xbc, 0x3c, 0x2d, 0x96, 0x91, 0x7e, 0xb7, 0x9a, 0xb5, 0xa7,
-        0xf4, 0xec, 0x13, 0xa6, 0x84, 0x66, 0x34, 0x99, 0xb2, 0x13, 0xb0, 0x80,
-        0xa3, 0xfa, 0x8e, 0xca, 0x59, 0x8c, 0xe3, 0x7b, 0x18, 0x57, 0xd6, 0xc1,
-        0x57, 0xde, 0x6f, 0xb1, 0x74, 0xa5, 0xcf, 0x1c, 0x03, 0x19, 0x60, 0x1f,
-        0x4f, 0x3a, 0x90, 0x89, 0x92, 0x51, 0x1c, 0x32, 0x7a, 0x15, 0x32, 0x1a,
-        0x80, 0x6c, 0x52, 0xf2, 0x52, 0xa5, 0x4f, 0x9e, 0xaf, 0x24, 0xe5, 0x39,
-        0xe8, 0xeb, 0xb3, 0x95, 0xb8, 0x3c, 0x53, 0xe9, 0x92, 0xa7, 0x2b, 0x31,
-        0x79, 0x4a, 0xc9, 0x2d, 0x07, 0xdb, 0x50, 0xb2, 0x0c, 0x5f, 0x9f, 0x96,
-        0x70, 0x27, 0xe4, 0xd1, 0x01, 0xfd, 0x69, 0x87, 0x6e, 0x7e, 0xa5, 0x37,
-        0x2c, 0xb3, 0xbd, 0x92, 0x59, 0x8f, 0xfe, 0x9b, 0xd2, 0xa6, 0xe2, 0x91,
-        0x89, 0xe7, 0x93, 0xd3, 0x21, 0xc9, 0x59, 0x8f, 0xcb, 0x85, 0x19, 0x53,
-        0x26, 0x2b, 0xdb, 0x6f, 0x72, 0x65, 0xc6, 0xf6, 0xbc, 0x9c, 0x9f, 0x69,
-        0xc2, 0xb3, 0x79, 0x79, 0x79, 0xb3, 0x2e, 0x13, 0xb3, 0x6f, 0x89, 0x09,
-        0x1e, 0x0e, 0x29, 0x79, 0x3f, 0x2e, 0xff, 0xfc, 0x27, 0x22, 0x23, 0xe0,
-        0x8b, 0xde, 0xff, 0xef, 0xd5, 0x8c, 0x05, 0x7e, 0xf4, 0xf7, 0x41, 0x3f,
-        0x74, 0x5c, 0x29, 0xcf, 0x38, 0xc6, 0x98, 0x5a, 0xce, 0x39, 0x0d, 0x9b,
-        0x6a, 0xd5, 0xb2, 0xc7, 0x45, 0x0a, 0xc7, 0xab, 0x52, 0x48, 0x85, 0xe4,
-        0x01, 0xab, 0x2a, 0x43, 0xa9, 0x26, 0x39, 0x60, 0x75, 0xca, 0x44, 0xdf,
-        0xcf, 0x68, 0x3e, 0x96, 0x7d, 0xa5, 0x92, 0xc6, 0x3d, 0xfb, 0x44, 0x66,
-        0xd5, 0xbd, 0xdb, 0x5f, 0xac, 0x84, 0x24, 0x13, 0x2d, 0xc6, 0x4c, 0xb9,
-        0xa0, 0xb9, 0xb4, 0xed, 0xf4, 0x9f, 0x41, 0x5e, 0x63, 0xc0, 0x90, 0x84,
-        0xd2, 0xa5, 0xfc, 0xf4, 0x9a, 0x8b, 0x19, 0xd5, 0x1d, 0x52, 0x7a, 0x6a,
-        0xa4, 0x4d, 0xd2, 0x31, 0xa6, 0xa5, 0xa3, 0xd2, 0xad, 0xec, 0x64, 0x00,
-        0x63, 0x06, 0xb5, 0xbb, 0x2b, 0x94, 0x37, 0xee, 0xcb, 0xa4, 0x75, 0x03,
-        0xc6, 0x9a, 0xb8, 0x66, 0x3c, 0x9a, 0x83, 0x74, 0x72, 0x2e, 0xd2, 0xc9,
-        0xeb, 0xde, 0x00, 0x9d, 0xfb, 0x6a, 0xf7, 0xb3, 0x81, 0xfb, 0x62, 0xe5,
-        0xd7, 0x5b, 0x5c, 0xfa, 0xc8, 0xd7, 0x41, 0x99, 0x98, 0x7e, 0xc8, 0x5b,
-        0x0b, 0xf7, 0x65, 0xae, 0xb1, 0x00, 0x3e, 0xa9, 0x91, 0x57, 0x58, 0xab,
-        0x18, 0x58, 0xeb, 0x70, 0x60, 0xad, 0xc3, 0x81, 0xb5, 0x8a, 0xe0, 0xad,
-        0xac, 0xd3, 0x81, 0x33, 0x79, 0xc2, 0xbc, 0x1c, 0xc5, 0x9c, 0x6f, 0x88,
-        0x91, 0xa6, 0x2d, 0xf8, 0x36, 0xf9, 0x07, 0x18, 0x9f, 0x96, 0x73, 0x0e,
-        0x78, 0x73, 0x3c, 0x24, 0x77, 0xa9, 0x71, 0xff, 0xb1, 0xc6, 0xa5, 0x31,
-        0xf8, 0x2c, 0x2c, 0xbb, 0xa2, 0xbc, 0xf7, 0x9f, 0x99, 0xe0, 0x37, 0xdb,
-        0x93, 0x37, 0xb8, 0x6d, 0xde, 0x9f, 0xf5, 0xf6, 0xd2, 0xee, 0xbe, 0x57,
-        0x79, 0x53, 0x61, 0xc6, 0x62, 0x85, 0xb6, 0x2d, 0x29, 0xc3, 0x96, 0xfd,
-        0x43, 0xa9, 0x4e, 0x99, 0xb4, 0xb4, 0xd4, 0x44, 0xb2, 0x99, 0xfc, 0xcf,
-        0xe8, 0x76, 0x2b, 0xec, 0x47, 0xe2, 0x3a, 0x71, 0x51, 0xed, 0xeb, 0x5b,
-        0x1e, 0xfd, 0x16, 0xdb, 0x23, 0xba, 0xdd, 0xd1, 0xd0, 0x4f, 0xfd, 0xff,
-        0x4b, 0xdc, 0xd3, 0x06, 0xfa, 0x75, 0x77, 0xed, 0xbf, 0x42, 0x9b, 0x58,
-        0x15, 0xf1, 0xda, 0xfe, 0xf3, 0xff, 0x32, 0x96, 0xb7, 0x8f, 0x6d, 0x5c,
-        0xde, 0xf6, 0x6d, 0x29, 0x88, 0x73, 0xdc, 0x2b, 0x6c, 0xd8, 0xa6, 0xfe,
-        0x85, 0x40, 0x6b, 0x0a, 0x36, 0xdc, 0xec, 0xd1, 0xf0, 0xba, 0x47, 0x03,
-        0x68, 0xc5, 0xb8, 0x89, 0x0a, 0xdf, 0x51, 0xa2, 0x6c, 0x68, 0x93, 0xf7,
-        0xfe, 0xfd, 0x5a, 0xf5, 0xfc, 0x0d, 0x83, 0xeb, 0xf8, 0x57, 0xd1, 0x86,
-        0x60, 0x67, 0x93, 0xb3, 0xa6, 0xe4, 0x53, 0x31, 0x65, 0x0f, 0xf9, 0x54,
-        0x1d, 0x3f, 0x26, 0xa7, 0x1b, 0xf1, 0x83, 0xef, 0x11, 0x3f, 0x5c, 0xec,
-        0x98, 0x98, 0x25, 0x8e, 0xd4, 0x71, 0xe3, 0xc8, 0xb4, 0x8f, 0x25, 0x9c,
-        0x9b, 0x18, 0xe2, 0xe3, 0x07, 0xdf, 0x23, 0x7e, 0x18, 0x90, 0x15, 0xe7,
-        0xf4, 0xd7, 0x9f, 0x6a, 0x98, 0x7b, 0x4a, 0x61, 0x93, 0x8b, 0xcb, 0x6f,
-        0x06, 0x70, 0xbe, 0x0b, 0x18, 0x1d, 0x85, 0xfc, 0x7c, 0x8c, 0x26, 0x76,
-        0xc6, 0x80, 0xeb, 0xe0, 0x91, 0xc2, 0xe4, 0x08, 0x70, 0xcc, 0xf4, 0x30,
-        0x35, 0xec, 0x61, 0x6a, 0x04, 0x78, 0xca, 0xb6, 0xe5, 0xb5, 0xa3, 0x5e,
-        0x3b, 0x86, 0x36, 0xfc, 0xef, 0x1c, 0x6d, 0xec, 0xb5, 0x43, 0xe3, 0xb3,
-        0x0a, 0xa7, 0x89, 0xf1, 0xc0, 0x0a, 0xe2, 0x2c, 0xf1, 0xb6, 0x4b, 0x16,
-        0xca, 0x58, 0xaf, 0x86, 0x69, 0x94, 0x47, 0x90, 0x1e, 0xd2, 0xb2, 0x46,
-        0xf4, 0xc7, 0xdc, 0xfd, 0xe8, 0xe9, 0xcf, 0xeb, 0xd2, 0xc2, 0x7d, 0x90,
-        0xee, 0x1b, 0x41, 0x2b, 0xf7, 0xf6, 0xa3, 0xa4, 0x95, 0xeb, 0x35, 0xd2,
-        0x7b, 0x1a, 0xf4, 0x66, 0x80, 0xb7, 0xa2, 0x8d, 0xf6, 0x8e, 0x82, 0xde,
-        0x11, 0x60, 0xf1, 0x30, 0xb0, 0x78, 0x27, 0xb0, 0x78, 0x08, 0x58, 0x9c,
-        0x06, 0x0e, 0x0f, 0x02, 0x87, 0x07, 0x80, 0xc3, 0x29, 0xec, 0x2b, 0x2a,
-        0xf3, 0xc0, 0xe5, 0x79, 0xe0, 0xf3, 0x3c, 0xe4, 0x35, 0x31, 0x27, 0xda,
-        0x17, 0xb0, 0xfe, 0x63, 0x33, 0x89, 0xd3, 0xd0, 0xcd, 0x58, 0x51, 0x87,
-        0x3d, 0xa5, 0x06, 0xa1, 0x23, 0x49, 0x29, 0x55, 0x46, 0xa5, 0x40, 0x3f,
-        0xb6, 0xb9, 0x07, 0xb6, 0x0b, 0xfb, 0x89, 0xf9, 0x71, 0xd3, 0x5a, 0xef,
-        0xfa, 0xf7, 0x22, 0xf6, 0x1f, 0x83, 0x27, 0x89, 0xb8, 0xc8, 0xb0, 0xe4,
-        0x9d, 0x1e, 0x2b, 0xab, 0x27, 0x31, 0x8e, 0xed, 0xb8, 0xb6, 0xf7, 0x78,
-        0x42, 0x1b, 0x3f, 0xce, 0x3d, 0x4d, 0x03, 0xe3, 0xaa, 0x32, 0x95, 0xa2,
-        0xad, 0x56, 0xe5, 0x54, 0x2a, 0x31, 0x58, 0x94, 0x56, 0x39, 0x12, 0x9d,
-        0x56, 0xfe, 0xcd, 0x4c, 0x1f, 0x53, 0xfa, 0x51, 0xb0, 0x71, 0x2d, 0x77,
-        0x6b, 0xf9, 0xe3, 0xf4, 0x3b, 0x3d, 0xf8, 0x85, 0x40, 0x0b, 0xe7, 0x37,
-        0x65, 0x68, 0x40, 0xb4, 0x7d, 0xbd, 0x45, 0xa0, 0x62, 0xc2, 0x3a, 0x87,
-        0x95, 0x73, 0xd3, 0x3d, 0xb1, 0x9c, 0x6e, 0xca, 0x98, 0xa9, 0xc9, 0x04,
-        0xec, 0x65, 0x28, 0xf5, 0x7f, 0xd5, 0x23, 0x51, 0x3e, 0x6f, 0x96, 0xdf,
-        0x51, 0x38, 0x8b, 0xb5, 0x4b, 0xb3, 0x58, 0x37, 0x04, 0xfe, 0x71, 0x5d,
-        0xce, 0x83, 0x36, 0x30, 0xcf, 0xb4, 0x13, 0xa7, 0x8b, 0xb2, 0x1d, 0x76,
-        0xb7, 0x4e, 0xb2, 0x7d, 0x4d, 0x92, 0x19, 0x89, 0xcb, 0xc4, 0xcc, 0x76,
-        0xe0, 0x1e, 0x64, 0x60, 0xb7, 0x48, 0x7e, 0x34, 0x2e, 0x5f, 0x9e, 0x61,
-        0x5f, 0x06, 0xfb, 0x4f, 0x1c, 0xcd, 0x08, 0xf7, 0x1f, 0x52, 0xfb, 0x8a,
-        0xeb, 0x19, 0x39, 0xe0, 0xbc, 0xa4, 0xbb, 0x76, 0xe9, 0xb6, 0xf7, 0x42,
-        0x1e, 0xa7, 0xc0, 0xef, 0xbc, 0x63, 0xcb, 0x02, 0xfc, 0x4a, 0xee, 0x38,
-        0x70, 0xd5, 0x6e, 0x03, 0x06, 0x26, 0xce, 0xd2, 0x3e, 0x0c, 0xc4, 0x5a,
-        0x25, 0xc5, 0xeb, 0x2e, 0x39, 0x3e, 0xa3, 0xcb, 0xb3, 0xb7, 0xc5, 0xd1,
-        0x06, 0xd6, 0xa6, 0x12, 0x67, 0xc6, 0xf4, 0x2e, 0xb9, 0xb5, 0x23, 0x86,
-        0xf7, 0x52, 0x5a, 0xde, 0xf9, 0x37, 0xf2, 0xf2, 0x64, 0x5c, 0xe7, 0x58,
-        0x5d, 0x72, 0x29, 0x03, 0x3a, 0x56, 0xc4, 0xf8, 0x7f, 0x40, 0x7f, 0x97,
-        0xcc, 0x21, 0xbe, 0x99, 0x03, 0x4d, 0xd9, 0x14, 0xb1, 0x30, 0x71, 0x72,
-        0x49, 0x07, 0x66, 0xcd, 0x41, 0x37, 0x47, 0x11, 0x3f, 0xcc, 0xfc, 0x37,
-        0xc6, 0xc4, 0x21, 0xd3, 0x1e, 0x6b, 0x02, 0xf8, 0x92, 0xe9, 0xe2, 0x3d,
-        0xe7, 0xb4, 0xe5, 0x94, 0x43, 0x1d, 0x8a, 0xcb, 0xe3, 0x15, 0xbe, 0xd7,
-        0x73, 0xf6, 0x69, 0xb1, 0xe5, 0x41, 0xe7, 0x7f, 0x30, 0xfe, 0x1d, 0xc4,
-        0x9e, 0x96, 0x94, 0x20, 0xb7, 0x02, 0x78, 0x99, 0x89, 0xb9, 0xed, 0x89,
-        0xb9, 0xc4, 0xd9, 0x0b, 0x3a, 0xef, 0xed, 0xe2, 0x82, 0x7e, 0xb3, 0x48,
-        0x07, 0xf9, 0x99, 0x02, 0x2f, 0x6d, 0x4b, 0xd7, 0x37, 0x7b, 0xf1, 0x16,
-        0x6d, 0xc0, 0x06, 0x7d, 0xa6, 0x2c, 0xf4, 0x07, 0x6d, 0x80, 0x7e, 0xd6,
-        0xb7, 0x81, 0x44, 0x6c, 0x49, 0xd7, 0xf1, 0xdc, 0x94, 0x63, 0xaa, 0xad,
-        0x81, 0xd6, 0x44, 0x8c, 0xfb, 0x9b, 0x2c, 0x27, 0xe5, 0x71, 0x87, 0xe3,
-        0xc1, 0xe7, 0xe9, 0x88, 0x37, 0x1e, 0xf1, 0x8e, 0xc3, 0x98, 0x29, 0x09,
-        0x9a, 0x5d, 0xbb, 0x58, 0x98, 0x8e, 0xaa, 0x67, 0x47, 0x1c, 0x37, 0x36,
-        0xd2, 0x11, 0x3f, 0xcd, 0x23, 0x7e, 0xca, 0x29, 0x1b, 0xb1, 0x32, 0x88,
-        0xaf, 0xe1, 0x67, 0x5d, 0xfb, 0x28, 0x95, 0x49, 0xcb, 0x3d, 0xa0, 0x2f,
-        0x51, 0x04, 0x31, 0xc7, 0x74, 0xb8, 0xeb, 0xec, 0x80, 0x14, 0x19, 0x63,
-        0x9d, 0x33, 0x1e, 0x91, 0xb1, 0x12, 0xfd, 0x1b, 0x7e, 0x8e, 0x6d, 0x31,
-        0xa6, 0xcf, 0x28, 0xdf, 0xd3, 0x03, 0x3d, 0x80, 0x5f, 0x4a, 0xb5, 0x8b,
-        0xeb, 0x07, 0xf7, 0x40, 0x9e, 0xc3, 0x90, 0x7b, 0x5a, 0xc6, 0x4f, 0x8c,
-        0x53, 0xa7, 0x93, 0x25, 0x49, 0x24, 0x8f, 0xc8, 0x16, 0x6b, 0x01, 0xbe,
-        0x30, 0x33, 0x5a, 0xdd, 0xae, 0xa7, 0xf9, 0xce, 0xa3, 0x78, 0x07, 0xd7,
-        0xd2, 0xb8, 0x3c, 0x50, 0x61, 0xdf, 0x9d, 0x86, 0xb4, 0xc0, 0x56, 0x06,
-        0xf6, 0x78, 0x76, 0x80, 0xf9, 0x4c, 0x7f, 0xbe, 0x71, 0x6f, 0x3e, 0x8e,
-        0xe3, 0x18, 0xbe, 0x53, 0x9f, 0x77, 0x07, 0x7d, 0x1b, 0xb0, 0x64, 0x87,
-        0x5e, 0xdd, 0x1e, 0xc2, 0xf3, 0x53, 0x03, 0xbc, 0xc7, 0x3c, 0xf0, 0x6d,
-        0x96, 0x3d, 0x8c, 0xb1, 0xa3, 0x98, 0x73, 0x8d, 0x64, 0x3b, 0x7d, 0x7a,
-        0xa9, 0x03, 0x8c, 0x3f, 0xd8, 0x8e, 0xae, 0x77, 0x79, 0xff, 0x25, 0xc3,
-        0xd5, 0xc9, 0x11, 0xb4, 0x69, 0x7f, 0x07, 0x25, 0xe7, 0x24, 0xb0, 0x4f,
-        0xf0, 0xb6, 0x32, 0xe1, 0xed, 0x11, 0xfc, 0x1f, 0x39, 0x0c, 0x3e, 0x48,
-        0xd1, 0xe5, 0x0d, 0xf9, 0x42, 0x9e, 0xfc, 0x16, 0x74, 0xff, 0x61, 0x8c,
-        0x81, 0x7f, 0x50, 0x3c, 0x58, 0xea, 0x70, 0x63, 0xd1, 0x44, 0x31, 0xc3,
-        0xfc, 0xa9, 0x83, 0x98, 0x07, 0xfc, 0xa9, 0x40, 0xb1, 0x30, 0xf7, 0x92,
-        0xbe, 0x86, 0xf4, 0xc6, 0x97, 0x0c, 0x83, 0xed, 0xe4, 0x12, 0x74, 0xb8,
-        0x04, 0xf9, 0x64, 0xfb, 0x68, 0xb3, 0x36, 0xe4, 0x31, 0x63, 0x50, 0x5f,
-        0x4b, 0x88, 0x05, 0xf3, 0xce, 0x16, 0xeb, 0x5e, 0xf2, 0xcd, 0xb2, 0xe4,
-        0x69, 0x27, 0x88, 0x1d, 0x3b, 0x30, 0x94, 0x7a, 0x18, 0x85, 0x1e, 0x98,
-        0xf0, 0xc9, 0x31, 0xc8, 0xfc, 0xc5, 0x0e, 0x77, 0x2f, 0xbc, 0x37, 0x65,
-        0xde, 0xc2, 0x9a, 0xce, 0xef, 0xaf, 0x73, 0xfb, 0x78, 0xcf, 0xb8, 0xc8,
-        0x97, 0xab, 0x4f, 0x3b, 0xe5, 0xdb, 0x28, 0xd3, 0x43, 0xd8, 0x0b, 0xfb,
-        0x71, 0x2d, 0x1d, 0x94, 0x71, 0xd0, 0x56, 0x18, 0xd8, 0x14, 0x3b, 0x8f,
-        0xf1, 0x39, 0xe0, 0x79, 0xd1, 0xe4, 0xb3, 0x8b, 0x5a, 0xfd, 0x1d, 0xc4,
-        0x5c, 0x36, 0xfd, 0xd9, 0x92, 0xf6, 0x85, 0xca, 0xcb, 0x5a, 0xb6, 0x74,
-        0x51, 0xcb, 0x41, 0x4f, 0x4a, 0x0e, 0x73, 0x06, 0xda, 0x8f, 0x85, 0xb5,
-        0x13, 0xb1, 0xb7, 0xf5, 0x9e, 0xf8, 0x02, 0xb0, 0x60, 0x2f, 0x6c, 0x3a,
-        0x67, 0xee, 0x94, 0x02, 0xb0, 0x35, 0x7f, 0x62, 0x0b, 0xec, 0x2d, 0x1e,
-        0xa0, 0x8b, 0x78, 0x56, 0xa4, 0x4f, 0xd5, 0x76, 0x38, 0x52, 0x6c, 0x4a,
-        0x13, 0xd7, 0x36, 0x41, 0x77, 0xd0, 0x57, 0xae, 0xeb, 0xdf, 0x1d, 0x2b,
-        0x68, 0x45, 0x7e, 0x39, 0xb0, 0x9c, 0xde, 0x92, 0x5c, 0x99, 0xde, 0x1d,
-        0x35, 0x7a, 0x89, 0x19, 0xc0, 0x7f, 0xd8, 0xcd, 0x4b, 0xd0, 0xdf, 0xe7,
-        0x1d, 0xe0, 0xbf, 0x03, 0xfc, 0x87, 0x4d, 0x3d, 0x03, 0xdd, 0x7b, 0xda,
-        0x81, 0x0f, 0x70, 0xe0, 0x03, 0x1c, 0xf8, 0x00, 0x27, 0x0b, 0x39, 0x11,
-        0xe7, 0xe9, 0x43, 0x76, 0xd7, 0x7c, 0x9e, 0x1b, 0x37, 0xdd, 0xe0, 0xc5,
-        0x22, 0xa3, 0x88, 0x45, 0x36, 0xc8, 0x44, 0xf2, 0x7a, 0xec, 0xad, 0x05,
-        0xd7, 0x56, 0x5c, 0xb1, 0x46, 0xf2, 0x76, 0xcf, 0x4e, 0x1e, 0x06, 0x5d,
-        0x88, 0xbf, 0x93, 0x3f, 0x0d, 0x3d, 0x6c, 0x02, 0x3d, 0x3f, 0xe5, 0xc5,
-        0x2c, 0x0f, 0x9a, 0xae, 0x1e, 0xb6, 0xa2, 0xef, 0x93, 0xe8, 0x6b, 0xc5,
-        0x98, 0x03, 0x18, 0xc3, 0x98, 0xa7, 0xcd, 0xeb, 0x0b, 0x8e, 0x63, 0xec,
-        0xf3, 0x19, 0xac, 0x95, 0xc0, 0xb8, 0x36, 0xcc, 0xdd, 0x85, 0x31, 0xdb,
-        0x30, 0xe6, 0x46, 0xb4, 0x19, 0x33, 0x6f, 0x44, 0xfb, 0x13, 0x0d, 0xef,
-        0x7c, 0x0c, 0x7d, 0xb7, 0x37, 0xf4, 0x9d, 0x43, 0x1f, 0xf2, 0x50, 0xeb,
-        0xbc, 0xf7, 0x5e, 0x11, 0xed, 0xce, 0x86, 0x31, 0xaf, 0xa2, 0x0f, 0x71,
-        0xaf, 0xf5, 0x2d, 0x5c, 0x91, 0x7f, 0x5a, 0xa4, 0xc9, 0x7f, 0xc6, 0xb8,
-        0x37, 0x8e, 0xfe, 0x90, 0x17, 0xbb, 0xfe, 0xa6, 0x09, 0xbd, 0xd3, 0x86,
-        0x9c, 0xdf, 0x30, 0xdd, 0x58, 0xef, 0x4e, 0xcb, 0xd5, 0x43, 0xbf, 0xfd,
-        0x70, 0x43, 0x9b, 0x63, 0x17, 0x1a, 0xfa, 0xfe, 0xa5, 0xa1, 0xfd, 0xdd,
-        0xd0, 0xca, 0x77, 0x06, 0xdb, 0x97, 0xf7, 0x15, 0x3a, 0x96, 0xb7, 0xed,
-        0xa6, 0x95, 0xef, 0xe8, 0xeb, 0x96, 0xf7, 0xdd, 0xb8, 0xbe, 0x61, 0x0c,
-        0x74, 0x2a, 0x8a, 0x1c, 0xc9, 0x1f, 0x1f, 0xbe, 0xce, 0x7d, 0x4e, 0xfe,
-        0x36, 0xea, 0x92, 0xda, 0x3a, 0xda, 0x3a, 0xe4, 0xb0, 0xa4, 0xc1, 0x9e,
-        0x2c, 0x3d, 0xfd, 0xb2, 0x96, 0x83, 0x4e, 0x65, 0x2b, 0xfe, 0x7c, 0xb4,
-        0xd9, 0xc6, 0xdc, 0xdc, 0xcf, 0xc9, 0x19, 0x2b, 0x45, 0xa0, 0x37, 0xf7,
-        0xd0, 0x27, 0x1d, 0x2d, 0x4a, 0xdd, 0x3e, 0xbb, 0xf5, 0x4b, 0xd9, 0xe7,
-        0xed, 0x1e, 0x46, 0x1d, 0x06, 0x9d, 0x55, 0x19, 0x49, 0x35, 0xd3, 0xc7,
-        0x78, 0xd8, 0x45, 0xdc, 0xa9, 0x56, 0x8d, 0xcd, 0x55, 0xd9, 0x9f, 0x7a,
-        0xa7, 0x2a, 0x0a, 0xf3, 0x06, 0x15, 0xee, 0xc4, 0xf5, 0x1e, 0xc8, 0xc8,
-        0x42, 0x6e, 0x82, 0x7c, 0x3a, 0x4a, 0x9f, 0x74, 0x90, 0xf1, 0xc9, 0xa3,
-        0x2e, 0xa6, 0x12, 0x77, 0xd0, 0x46, 0x5e, 0x96, 0x3f, 0xce, 0xf5, 0x71,
-        0x2d, 0x11, 0xc7, 0x47, 0x95, 0x4f, 0xc9, 0x5b, 0x9c, 0x77, 0x35, 0x6c,
-        0x3c, 0x6b, 0x32, 0xa6, 0x33, 0xed, 0xd3, 0xf0, 0x6f, 0x7c, 0xc6, 0x58,
-        0xe1, 0x34, 0xe3, 0x92, 0x00, 0x56, 0x6d, 0x35, 0xe0, 0x32, 0x8b, 0xcb,
-        0xf7, 0xb5, 0x81, 0x79, 0xc4, 0x55, 0xec, 0x75, 0x75, 0x2c, 0xea, 0xd1,
-        0xaf, 0x6c, 0xdb, 0xbb, 0x6a, 0xb6, 0xed, 0xeb, 0xde, 0x6a, 0x39, 0xf8,
-        0xf7, 0x95, 0x2c, 0x9e, 0xaa, 0x24, 0x8e, 0x15, 0x61, 0x4b, 0x8b, 0x2a,
-        0xef, 0xf6, 0xe5, 0xc2, 0x18, 0x27, 0x71, 0x72, 0x1e, 0x6f, 0x8e, 0xab,
-        0x1c, 0x83, 0xf9, 0x45, 0x55, 0x76, 0xa4, 0x5a, 0xa3, 0xe4, 0x43, 0x46,
-        0xff, 0x76, 0x88, 0x31, 0xc3, 0xa2, 0x43, 0x9e, 0xa5, 0xf0, 0x3c, 0x05,
-        0x4c, 0xf8, 0x27, 0xc9, 0x45, 0xd9, 0xf7, 0x76, 0x75, 0x01, 0x71, 0x95,
-        0x8a, 0x8f, 0x94, 0xbf, 0x67, 0x7c, 0xb7, 0x1f, 0xfc, 0x22, 0x4f, 0x47,
-        0xc0, 0x67, 0x3f, 0x06, 0x78, 0x8d, 0x75, 0x15, 0x59, 0x1e, 0x07, 0x8b,
-        0x3c, 0x50, 0x7e, 0x19, 0x73, 0xea, 0x6e, 0xac, 0xc2, 0x3c, 0xdc, 0x66,
-        0x7f, 0x47, 0x88, 0xb1, 0x9c, 0xeb, 0xeb, 0x0d, 0xac, 0x87, 0xdc, 0xbe,
-        0xfc, 0x8f, 0x2a, 0x6e, 0x2a, 0x28, 0x79, 0x20, 0x86, 0xaa, 0xf0, 0x19,
-        0xfb, 0xc2, 0x5e, 0xec, 0x1c, 0xf1, 0x62, 0x65, 0xcb, 0x8b, 0x95, 0x49,
-        0x07, 0x6b, 0x6f, 0x7e, 0x5c, 0x40, 0x99, 0x2d, 0x1d, 0xd2, 0x37, 0x33,
-        0x2e, 0x68, 0x93, 0xd5, 0xe3, 0x02, 0x9f, 0xa6, 0x6d, 0xa0, 0x89, 0x71,
-        0x9e, 0xaa, 0xbd, 0x74, 0xb8, 0xf5, 0x1e, 0xd2, 0xe0, 0xfb, 0x47, 0xe5,
-        0x87, 0x8f, 0xc2, 0xe5, 0x61, 0x6f, 0x69, 0xd0, 0xba, 0x53, 0xb2, 0xd3,
-        0xdb, 0x3c, 0x7f, 0xcb, 0x1c, 0x80, 0xf1, 0xb7, 0xab, 0xb3, 0xd9, 0xd4,
-        0x84, 0x3f, 0x4f, 0x27, 0x3c, 0x64, 0xa0, 0x2e, 0xc4, 0xb5, 0x18, 0xc7,
-        0xf8, 0x31, 0xcd, 0x4e, 0x2f, 0xa6, 0x19, 0x96, 0xfd, 0x8e, 0x1b, 0xf3,
-        0x8f, 0xa0, 0x3f, 0xef, 0x28, 0xda, 0x63, 0x8c, 0x2d, 0x75, 0xc4, 0xdc,
-        0x99, 0x3d, 0x09, 0x24, 0x0f, 0xee, 0x5e, 0xba, 0xb1, 0x97, 0x52, 0x6d,
-        0x2f, 0xad, 0x4b, 0xcb, 0xf7, 0x32, 0xaa, 0xde, 0x9d, 0x5a, 0xf1, 0xae,
-        0x60, 0x1f, 0xbb, 0x2f, 0xf1, 0x8c, 0x7b, 0x64, 0xdc, 0x60, 0x79, 0x7b,
-        0xf4, 0xe5, 0x74, 0x00, 0x7b, 0x4c, 0x6a, 0x79, 0x15, 0x6b, 0xed, 0x51,
-        0x3c, 0xcf, 0x97, 0xc7, 0x70, 0xa5, 0x7d, 0xa8, 0x79, 0x94, 0x8d, 0x4c,
-        0x28, 0x3e, 0x8f, 0xab, 0x7d, 0x2c, 0x94, 0x7f, 0x41, 0x0a, 0x27, 0x7e,
-        0x09, 0x7e, 0x2f, 0x58, 0x0f, 0x63, 0x2d, 0x91, 0xfc, 0x28, 0x06, 0xf0,
-        0x93, 0x7b, 0x65, 0xad, 0xeb, 0x0f, 0x43, 0x6e, 0x7e, 0x10, 0x81, 0x8c,
-        0x35, 0xf7, 0xb9, 0x5a, 0xdf, 0xe7, 0x6b, 0x53, 0x80, 0x9e, 0x2a, 0x62,
-        0xce, 0x18, 0x68, 0x08, 0xbe, 0x73, 0x50, 0x86, 0x1c, 0xca, 0xa3, 0x27,
-        0x36, 0x2e, 0xb6, 0x95, 0x17, 0x3f, 0xce, 0xe0, 0xfa, 0xb4, 0xf9, 0x5c,
-        0xcc, 0x10, 0xd6, 0x2f, 0x7d, 0xde, 0xf9, 0x7c, 0x8b, 0x2c, 0x35, 0xea,
-        0xc0, 0x14, 0xe8, 0x29, 0x38, 0xe4, 0x93, 0xaf, 0x9b, 0xfe, 0xda, 0xaf,
-        0xaa, 0xfd, 0x4c, 0xaa, 0x9a, 0xdd, 0x73, 0x35, 0x1d, 0x9d, 0x40, 0x0c,
-        0xe2, 0xea, 0xdc, 0x7d, 0x1e, 0x6f, 0x7c, 0xdd, 0x8c, 0x78, 0x72, 0x66,
-        0x1e, 0x47, 0xdb, 0xf1, 0xf5, 0x60, 0x93, 0x75, 0xb7, 0xe2, 0x05, 0x9f,
-        0x11, 0x53, 0x5c, 0x59, 0x8e, 0xd5, 0x64, 0xb9, 0xb6, 0x41, 0x2f, 0xbf,
-        0xb7, 0xce, 0xb5, 0x43, 0xda, 0x1b, 0xec, 0x16, 0xf4, 0x3d, 0xb5, 0xcc,
-        0xbe, 0x93, 0x97, 0xa8, 0x83, 0x46, 0xc4, 0x98, 0xfb, 0x53, 0xf0, 0xf2,
-        0x63, 0xc8, 0x55, 0x44, 0xcc, 0x19, 0xe2, 0x10, 0xe3, 0x8d, 0x7a, 0xbc,
-        0xbb, 0x20, 0xab, 0xc5, 0xba, 0x57, 0x8a, 0x35, 0x7e, 0xf2, 0x2a, 0x63,
-        0x8d, 0x78, 0x93, 0xb4, 0x10, 0x8b, 0x86, 0x11, 0xdb, 0x6a, 0xd2, 0x64,
-        0x3f, 0x08, 0x1f, 0x76, 0xc6, 0x6c, 0xb6, 0x7d, 0x4c, 0x88, 0x48, 0xfb,
-        0xdc, 0x06, 0x85, 0x0b, 0xd6, 0x4c, 0x1d, 0x17, 0x26, 0xc0, 0xfb, 0x11,
-        0xb7, 0xb6, 0x1a, 0x6d, 0x97, 0xab, 0xcd, 0x8d, 0xeb, 0x71, 0xff, 0x58,
-        0x2d, 0xee, 0xbf, 0xa1, 0x81, 0x8f, 0xab, 0xe1, 0xe2, 0x19, 0xf0, 0x2d,
-        0x8d, 0xfc, 0x97, 0x79, 0xed, 0x10, 0xf2, 0x61, 0xe6, 0x62, 0x19, 0xe4,
-        0xc4, 0x89, 0x33, 0xc0, 0x2a, 0xe4, 0xc8, 0x89, 0xb7, 0xe0, 0x57, 0x90,
-        0x37, 0x27, 0xe6, 0x99, 0xbb, 0x2e, 0x22, 0x3f, 0x7e, 0x1a, 0xf9, 0xf1,
-        0x53, 0x95, 0x3e, 0xf0, 0x37, 0xa9, 0xb0, 0x73, 0xef, 0x71, 0xd1, 0xee,
-        0x52, 0xf5, 0x61, 0xda, 0x73, 0x14, 0x7e, 0xb4, 0x5a, 0x3d, 0x90, 0xea,
-        0x41, 0x4e, 0x1e, 0x97, 0x4f, 0x99, 0xcc, 0x63, 0x35, 0xb3, 0xbb, 0x7f,
-        0xc1, 0x08, 0xc6, 0xa4, 0xd9, 0x2b, 0xfa, 0x81, 0x95, 0xbc, 0xcf, 0x29,
-        0x5f, 0x70, 0xcc, 0xb8, 0x1c, 0xef, 0xef, 0xaa, 0xf1, 0xfe, 0xc2, 0x1a,
-        0x69, 0x19, 0x56, 0x35, 0x80, 0xee, 0xfe, 0x03, 0xc4, 0xab, 0x14, 0xfc,
-        0x3a, 0xfc, 0x6f, 0x55, 0xee, 0x48, 0x5d, 0xac, 0x9e, 0xb7, 0xd7, 0x49,
-        0xbe, 0xef, 0x8b, 0x1e, 0x66, 0x8f, 0x3d, 0x92, 0xb5, 0x8b, 0xb0, 0x0f,
-        0xb7, 0x16, 0x39, 0x3e, 0x1d, 0x46, 0x14, 0xca, 0xbf, 0x0e, 0x59, 0x18,
-        0xfc, 0x1b, 0xc8, 0x70, 0xcb, 0x69, 0x16, 0xb0, 0x74, 0xe0, 0xf0, 0x42,
-        0x34, 0xa2, 0xea, 0x33, 0xd7, 0xd9, 0xec, 0xb7, 0x20, 0xd3, 0x51, 0x59,
-        0x40, 0xfc, 0x50, 0x1a, 0x04, 0x8d, 0x7d, 0x9d, 0x18, 0x4f, 0xbb, 0x23,
-        0xcf, 0x47, 0xe1, 0x7b, 0xc9, 0xd3, 0x28, 0xc6, 0xef, 0xc2, 0x98, 0x0e,
-        0x5c, 0xbf, 0x68, 0x2c, 0x58, 0xcc, 0x9d, 0x7f, 0x0e, 0x6d, 0xce, 0x11,
-        0xf4, 0x9d, 0x9f, 0x0e, 0x89, 0x9a, 0x93, 0xef, 0x74, 0x2a, 0xfb, 0xaf,
-        0xaf, 0xc5, 0x75, 0xf8, 0xec, 0xbd, 0xea, 0x2d, 0xfd, 0x83, 0x81, 0xf5,
-        0xda, 0x02, 0xeb, 0x0d, 0x06, 0xd6, 0x23, 0x9d, 0x1d, 0x01, 0x3a, 0x3b,
-        0xf0, 0x7e, 0x0e, 0x6b, 0x0f, 0xab, 0x98, 0xa7, 0xbe, 0xe6, 0xfd, 0x81,
-        0x35, 0xfd, 0xfd, 0x75, 0x06, 0xde, 0x7b, 0x07, 0xeb, 0xb1, 0x2f, 0x1a,
-        0xe8, 0x23, 0x0d, 0xeb, 0xd1, 0xc7, 0x76, 0x47, 0x80, 0x2e, 0xd2, 0xba,
-        0x16, 0xfd, 0x2a, 0x7e, 0x02, 0x9f, 0x5b, 0xe0, 0xb7, 0x74, 0xf8, 0x0e,
-        0xd6, 0xa0, 0x1b, 0xf7, 0xfa, 0x65, 0xac, 0xeb, 0xcf, 0x17, 0xc5, 0x1c,
-        0x1c, 0xcf, 0xb1, 0x86, 0xf7, 0x3e, 0xfb, 0xf9, 0xfc, 0x1b, 0xd5, 0xaf,
-        0x2b, 0xbe, 0xad, 0x07, 0xed, 0xaa, 0xee, 0x22, 0xf3, 0x1d, 0x26, 0xe4,
-        0xc9, 0xfc, 0x58, 0x93, 0x9b, 0x6c, 0x5d, 0xeb, 0xe9, 0xa7, 0xec, 0xd7,
-        0x79, 0x58, 0xda, 0xa2, 0x65, 0x8f, 0xb3, 0x5e, 0xd0, 0xea, 0xe5, 0x7c,
-        0xc8, 0x3d, 0x94, 0x8f, 0x31, 0xbd, 0xe7, 0xf4, 0x31, 0x8c, 0x5b, 0xe8,
-        0x3f, 0x33, 0xde, 0x3d, 0xae, 0xd0, 0xe1, 0x7d, 0xa5, 0x0e, 0x39, 0xaf,
-        0x78, 0x6a, 0xc9, 0xb9, 0x1a, 0x4f, 0x43, 0xde, 0xb7, 0x90, 0x83, 0xde,
-        0x77, 0x06, 0x03, 0x71, 0x11, 0xee, 0xcb, 0x19, 0xd0, 0x10, 0x97, 0x9e,
-        0x7e, 0xe6, 0x6e, 0x45, 0x5c, 0x59, 0xa7, 0xd0, 0x70, 0x75, 0xeb, 0x17,
-        0x3d, 0xfd, 0xf0, 0x4b, 0xc0, 0xa1, 0x9e, 0xfe, 0xef, 0xa8, 0x7c, 0xae,
-        0x54, 0xb1, 0xb4, 0x3b, 0x1c, 0xb7, 0x46, 0x74, 0xce, 0xbe, 0x5c, 0x8d,
-        0x68, 0xa0, 0x99, 0x75, 0x0d, 0xbf, 0x46, 0x74, 0x4e, 0x54, 0x8d, 0xe8,
-        0xe4, 0x15, 0x6a, 0x44, 0x99, 0xab, 0xaf, 0x11, 0x71, 0x7e, 0x53, 0xee,
-        0x1e, 0x10, 0xed, 0x4b, 0x5e, 0x8d, 0xe8, 0x82, 0xb8, 0x35, 0xa2, 0xf3,
-        0xb2, 0x7a, 0x8d, 0xe8, 0x68, 0x43, 0x8d, 0x68, 0xbd, 0xaa, 0x11, 0x71,
-        0x1e, 0xb7, 0x46, 0xc4, 0x76, 0xbe, 0x7f, 0x30, 0x50, 0xeb, 0x00, 0xfe,
-        0x3a, 0xb7, 0x82, 0x6f, 0x96, 0x36, 0xea, 0xf8, 0x98, 0x46, 0xec, 0xbf,
-        0xbe, 0xe6, 0xbf, 0xea, 0xf8, 0xa6, 0x29, 0x9d, 0xbb, 0x12, 0xbe, 0x8d,
-        0xba, 0x71, 0xc9, 0x32, 0x6c, 0x9b, 0xaa, 0xc5, 0x2e, 0xbf, 0xdc, 0xcc,
-        0x1c, 0x7a, 0xb2, 0x5c, 0x9f, 0x77, 0x12, 0xf2, 0x1e, 0xab, 0xd5, 0x49,
-        0x2e, 0x15, 0x1f, 0x45, 0xe5, 0xe0, 0xaa, 0xdf, 0x9a, 0x62, 0x99, 0x95,
-        0xdf, 0x9a, 0x34, 0x89, 0x82, 0xce, 0x7c, 0x7f, 0x5e, 0xe5, 0x5d, 0x0b,
-        0xce, 0xcf, 0xcb, 0xd2, 0xbd, 0x16, 0xf0, 0xc7, 0xaf, 0x9f, 0x50, 0xbe,
-        0x75, 0x9f, 0x92, 0xd5, 0x3f, 0xba, 0x1a, 0xca, 0x3e, 0x55, 0x43, 0xf9,
-        0x5a, 0x73, 0xb0, 0x86, 0x72, 0x4e, 0x2e, 0x5f, 0x43, 0xd9, 0xb7, 0x4a,
-        0x0d, 0xe5, 0x15, 0xa9, 0xd7, 0x50, 0x5e, 0x11, 0xbf, 0x86, 0x62, 0xc8,
-        0xd2, 0x7a, 0xce, 0xb3, 0x1f, 0xef, 0x8c, 0xe0, 0x37, 0x8c, 0x9f, 0x5b,
-        0x53, 0x39, 0x57, 0xa3, 0x7f, 0xb5, 0x9a, 0xca, 0x37, 0x9b, 0xdf, 0x4f,
-        0x4d, 0xc5, 0xf5, 0x01, 0x7e, 0x4d, 0xa5, 0x05, 0xf1, 0x0e, 0x7c, 0x8e,
-        0x1e, 0xac, 0xa9, 0xfc, 0x2d, 0xed, 0x01, 0x7d, 0x2a, 0x46, 0x40, 0x3f,
-        0xec, 0x02, 0x7e, 0x29, 0xa3, 0x6a, 0x1c, 0x9f, 0xf6, 0x78, 0xb8, 0x1b,
-        0x7b, 0x8e, 0x43, 0x16, 0xe4, 0x63, 0x8f, 0x8a, 0x2d, 0x33, 0x66, 0x4c,
-        0xcb, 0xf6, 0xc2, 0x9b, 0x4d, 0xf3, 0x5b, 0x74, 0x4c, 0xc6, 0x2b, 0xd4,
-        0xf1, 0x2e, 0xc4, 0xe2, 0x26, 0xfa, 0x76, 0xa3, 0xed, 0xc7, 0x54, 0xfd,
-        0xb5, 0x39, 0x68, 0x9b, 0x0b, 0xc0, 0x59, 0xe0, 0xc4, 0x55, 0xf8, 0xa8,
-        0x6d, 0xa0, 0x39, 0xb8, 0x8f, 0x22, 0xfc, 0x13, 0xfa, 0x94, 0xcc, 0x19,
-        0x5b, 0xfa, 0xb4, 0xc4, 0x69, 0xe7, 0x57, 0x31, 0x1f, 0xfb, 0xb6, 0xa9,
-        0x7c, 0xac, 0x30, 0xc0, 0xbd, 0xd2, 0xd7, 0x2d, 0x82, 0x3e, 0xf4, 0x95,
-        0x98, 0x03, 0xd2, 0xef, 0xf9, 0x39, 0x5a, 0x44, 0xe5, 0x68, 0x9d, 0x8a,
-        0x1f, 0xe4, 0xf5, 0x8d, 0x61, 0x62, 0x65, 0xa7, 0xcd, 0x3d, 0x0c, 0x7b,
-        0x58, 0xc7, 0xb6, 0x9b, 0x0b, 0x66, 0x74, 0xde, 0x3f, 0x02, 0xb9, 0xb2,
-        0x4e, 0xe3, 0xcb, 0xef, 0x21, 0x6f, 0xdf, 0x83, 0x52, 0xec, 0x94, 0xf0,
-        0x7a, 0xd0, 0x93, 0x9f, 0x61, 0xdc, 0xfd, 0x09, 0x95, 0x83, 0x44, 0xed,
-        0x4b, 0xdb, 0xed, 0x5d, 0xd7, 0x60, 0xb7, 0x23, 0x97, 0xb5, 0xdb, 0xcf,
-        0x85, 0x83, 0x76, 0x7b, 0xd7, 0x35, 0xd8, 0xed, 0xfe, 0x6b, 0xb2, 0x5b,
-        0xee, 0x8d, 0x98, 0xe4, 0xd7, 0xc4, 0x56, 0xc6, 0x59, 0xfe, 0xba, 0x13,
-        0x58, 0x33, 0x73, 0x89, 0x35, 0xc7, 0x2e, 0x59, 0x5b, 0x6d, 0x8c, 0xb1,
-        0xae, 0x46, 0xde, 0xcc, 0xad, 0xe8, 0x6f, 0x23, 0x9e, 0x5f, 0xba, 0xdd,
-        0xcb, 0xe7, 0xfd, 0xbc, 0x3e, 0x68, 0x3f, 0xd4, 0x0b, 0xea, 0xc2, 0x63,
-        0xe0, 0x17, 0xf5, 0xc1, 0xb7, 0xb9, 0x9e, 0x06, 0x1d, 0x5c, 0x44, 0xbe,
-        0xdf, 0xe3, 0xe9, 0x20, 0x65, 0xdd, 0xab, 0xbe, 0x11, 0x95, 0x9c, 0x47,
-        0xdc, 0x3c, 0x1f, 0x3a, 0x90, 0x2f, 0xf9, 0xb6, 0x06, 0x9e, 0x44, 0xfd,
-        0x67, 0xe4, 0xa3, 0x8d, 0x98, 0x67, 0x0b, 0xe2, 0x35, 0xf0, 0x48, 0xf5,
-        0x2f, 0xaf, 0x09, 0x5f, 0x1e, 0xcf, 0xa4, 0x18, 0xc2, 0xd8, 0x53, 0x03,
-        0xb0, 0xf1, 0x01, 0x62, 0x54, 0x1a, 0x79, 0x0f, 0xf5, 0x90, 0xba, 0xb9,
-        0x29, 0xb9, 0x43, 0x67, 0x4c, 0xb5, 0x07, 0xb6, 0x47, 0x7d, 0x8d, 0xcb,
-        0x8e, 0xca, 0xa6, 0x33, 0xe7, 0x74, 0xae, 0x51, 0xad, 0xe6, 0x99, 0x2b,
-        0x5a, 0xa2, 0x77, 0xf7, 0xff, 0x45, 0x98, 0x7e, 0xe9, 0x7a, 0xdb, 0xf0,
-        0x74, 0x2d, 0x83, 0x7b, 0xea, 0xed, 0xeb, 0xf0, 0xf7, 0xfc, 0xc6, 0xfe,
-        0x03, 0xf4, 0xc7, 0x60, 0xf3, 0xf4, 0xef, 0xcc, 0x47, 0xb6, 0x7a, 0xe3,
-        0x7a, 0xd4, 0xf7, 0xcf, 0x6c, 0xea, 0x56, 0xef, 0xbb, 0x13, 0xfd, 0x4f,
-        0x82, 0x3e, 0x7b, 0x99, 0x9c, 0x79, 0x46, 0x21, 0xa7, 0xf2, 0x19, 0xbe,
-        0xaf, 0x74, 0x12, 0x39, 0x88, 0x19, 0xa8, 0xa5, 0x87, 0xbd, 0xdc, 0x8d,
-        0x36, 0x16, 0x81, 0x0c, 0xb7, 0x7b, 0xb9, 0x0a, 0xf3, 0xd7, 0xe5, 0x67,
-        0x13, 0x56, 0xd7, 0x81, 0x0d, 0xef, 0x43, 0x07, 0x1a, 0xe5, 0x17, 0x86,
-        0xed, 0xfb, 0xf2, 0xf3, 0xe3, 0x98, 0x79, 0x6f, 0xdf, 0x3d, 0xae, 0x0c,
-        0x7f, 0x2c, 0xf6, 0xa9, 0x05, 0xf6, 0xe9, 0xe3, 0xd1, 0x3e, 0x6f, 0x9f,
-        0x5b, 0x1b, 0xf0, 0x68, 0xa4, 0xc1, 0x66, 0x3f, 0x4a, 0x3c, 0x3a, 0xb4,
-        0xe6, 0xa3, 0xc7, 0x23, 0xee, 0x6b, 0xe3, 0xaa, 0x38, 0xe4, 0xee, 0xe3,
-        0x77, 0x45, 0x4f, 0x7f, 0x98, 0xf9, 0xde, 0xfb, 0x91, 0x4f, 0x10, 0x47,
-        0x28, 0x93, 0x36, 0x15, 0xc3, 0xba, 0xb6, 0x07, 0x5f, 0x5e, 0x0a, 0xc9,
-        0x1b, 0xf7, 0x84, 0xe5, 0x7f, 0x6f, 0xe3, 0xf7, 0x30, 0xd3, 0xab, 0x69,
-        0xb1, 0xfd, 0xc2, 0x1a, 0xd7, 0x0f, 0xbd, 0xd0, 0xee, 0xfa, 0x1d, 0xbe,
-        0xe3, 0xdb, 0xb3, 0x85, 0xe7, 0x7c, 0xb6, 0x91, 0x5f, 0x4c, 0xae, 0x21,
-        0x07, 0xdc, 0x64, 0x5d, 0xd0, 0x57, 0xcb, 0x01, 0x2f, 0x5f, 0x0f, 0xac,
-        0xe7, 0x80, 0xc4, 0xd9, 0x0e, 0xa5, 0x1b, 0xf9, 0x28, 0x73, 0x1f, 0xc3,
-        0xc3, 0x4e, 0xde, 0x23, 0xb7, 0x75, 0x90, 0xef, 0x42, 0xb6, 0xcf, 0x21,
-        0x5e, 0x7a, 0xd6, 0x41, 0x8e, 0xeb, 0x20, 0xb7, 0x75, 0x90, 0xdb, 0x3a,
-        0xc8, 0x6d, 0x9d, 0xa4, 0x97, 0x23, 0x8f, 0x78, 0x75, 0x7f, 0x7e, 0xe3,
-        0x66, 0x7d, 0xa1, 0x08, 0x5f, 0x32, 0xc5, 0x73, 0x13, 0x7a, 0x36, 0xb5,
-        0xc6, 0xdb, 0x9f, 0x5f, 0x13, 0xef, 0xf2, 0x6a, 0x36, 0xdf, 0x54, 0x75,
-        0x43, 0xd1, 0x1f, 0x68, 0x71, 0xbf, 0x83, 0xf3, 0x7c, 0xc7, 0xaf, 0x21,
-        0x2e, 0x51, 0x67, 0x88, 0x68, 0xa3, 0x55, 0x3d, 0xcd, 0x9a, 0x8c, 0xe8,
-        0x7a, 0xfa, 0x16, 0xbc, 0xb3, 0xc5, 0xcd, 0x09, 0xa2, 0x62, 0xe8, 0xe9,
-        0x56, 0xf2, 0x54, 0xd3, 0xd3, 0x6b, 0xbd, 0xb9, 0xf6, 0xb7, 0xb8, 0xb1,
-        0x55, 0x2f, 0xdb, 0xa6, 0xce, 0x38, 0x41, 0xc5, 0xda, 0x7e, 0xff, 0xc5,
-        0xf6, 0xe5, 0x6b, 0x85, 0x14, 0xbe, 0x67, 0x53, 0xf7, 0x62, 0x3e, 0xb6,
-        0xeb, 0xfc, 0xd6, 0x2f, 0xc9, 0xef, 0x90, 0xc7, 0x6f, 0x97, 0xc7, 0x06,
-        0xc7, 0xa9, 0xba, 0x30, 0x79, 0xed, 0xcf, 0xa7, 0xea, 0x7a, 0x58, 0x47,
-        0x9d, 0xcd, 0xc0, 0xf5, 0x07, 0xa6, 0xb4, 0x8d, 0xee, 0x0e, 0xd9, 0xc1,
-        0x75, 0xfd, 0x6f, 0xe2, 0x57, 0xb3, 0x66, 0x8f, 0xfa, 0x8e, 0xe6, 0xfa,
-        0x8c, 0x90, 0xd2, 0x41, 0x33, 0xcd, 0x7d, 0xfd, 0x50, 0x9d, 0xa9, 0xa1,
-        0xfe, 0xe5, 0x90, 0xc7, 0x4c, 0x0d, 0x6c, 0x8a, 0x9b, 0xfa, 0x48, 0x0b,
-        0xeb, 0xaf, 0x43, 0x15, 0x1f, 0xf7, 0xb8, 0x5e, 0xa3, 0x1f, 0x67, 0x5d,
-        0xcd, 0xc7, 0x33, 0xd9, 0xe0, 0xd6, 0xdb, 0x3e, 0x88, 0x2d, 0xb5, 0x34,
-        0xd8, 0x92, 0xbf, 0x4f, 0xee, 0x9f, 0xd7, 0xd5, 0xcf, 0x43, 0x2c, 0x56,
-        0x02, 0xdf, 0x47, 0x6a, 0xba, 0xc1, 0xb3, 0x2a, 0x9f, 0x85, 0x0e, 0xf2,
-        0xdb, 0xc0, 0x4e, 0xd8, 0x51, 0xb5, 0x3a, 0xc4, 0x1a, 0x73, 0xdf, 0x67,
-        0x54, 0x7e, 0xa9, 0xa7, 0xe7, 0x55, 0xfd, 0xc1, 0x5c, 0x51, 0x7f, 0x18,
-        0x82, 0xae, 0x20, 0x06, 0x70, 0xda, 0x54, 0x4c, 0xa7, 0xe2, 0x85, 0x4a,
-        0xe3, 0xf7, 0x97, 0xfb, 0x5b, 0x5d, 0x3e, 0xfc, 0x5d, 0x8b, 0xfb, 0x0d,
-        0xe2, 0x8f, 0xa2, 0xcb, 0xdb, 0x7c, 0xff, 0xaf, 0x5b, 0xfc, 0xb3, 0x3b,
-        0x85, 0x13, 0x43, 0xd0, 0x45, 0xe4, 0xe4, 0x6a, 0x3e, 0xc4, 0xbb, 0x4f,
-        0xcc, 0x76, 0x2c, 0x1f, 0x8f, 0xbe, 0x13, 0xfe, 0xf8, 0x8e, 0x86, 0xf1,
-        0x1d, 0x18, 0xff, 0x7b, 0x0d, 0xe3, 0x3b, 0x02, 0xe3, 0xa3, 0x0d, 0xe3,
-        0xa3, 0x18, 0xff, 0x7c, 0xc3, 0xf8, 0x68, 0x60, 0x7c, 0x67, 0xc3, 0xf8,
-        0x4e, 0x8c, 0x7f, 0xa1, 0x61, 0x3c, 0xfa, 0x4e, 0x34, 0x79, 0xdf, 0xc5,
-        0x88, 0xb1, 0xfb, 0xbd, 0x5c, 0x1c, 0xd7, 0x72, 0xe3, 0xb7, 0x16, 0xea,
-        0x5d, 0x17, 0x64, 0xe0, 0x9f, 0xa7, 0xa3, 0xbd, 0x66, 0x60, 0xaf, 0xf5,
-        0x58, 0xc6, 0xd5, 0xc7, 0xa0, 0x2e, 0x12, 0x1f, 0x8a, 0x62, 0xd8, 0xd0,
-        0x9d, 0x12, 0x74, 0xa8, 0xe4, 0xfb, 0x24, 0x9e, 0x83, 0xe2, 0x19, 0x53,
-        0xd7, 0xf7, 0x86, 0xec, 0x45, 0x2f, 0x07, 0x7b, 0x9b, 0xb4, 0x03, 0x2f,
-        0x7d, 0xcc, 0x94, 0x63, 0xae, 0xdd, 0x50, 0x7f, 0x39, 0xbf, 0x67, 0x3f,
-        0xd4, 0x55, 0x6f, 0x9d, 0xa1, 0x15, 0xb8, 0x16, 0x5f, 0x51, 0xdb, 0x32,
-        0xae, 0x02, 0xd7, 0x46, 0x6a, 0xb8, 0xf6, 0x59, 0x99, 0xaf, 0xe5, 0xdb,
-        0xc3, 0x72, 0xc0, 0xd9, 0xc5, 0x33, 0x36, 0xc7, 0x32, 0xf2, 0xe1, 0xe4,
-        0xdb, 0xbb, 0x6a, 0x7e, 0x92, 0x67, 0x3a, 0x96, 0x0e, 0x31, 0x87, 0xf2,
-        0x6b, 0xb3, 0x53, 0xce, 0xcf, 0xb6, 0x42, 0x2e, 0xb0, 0x8d, 0x6b, 0xcd,
-        0xb7, 0x39, 0x5f, 0x54, 0x0e, 0xb8, 0xe7, 0x1d, 0x6a, 0xf3, 0x16, 0x6b,
-        0xf3, 0xc6, 0x3c, 0x7b, 0xa3, 0x0f, 0xae, 0xfb, 0xcb, 0x1c, 0xfc, 0xe5,
-        0x18, 0x72, 0xee, 0x45, 0x67, 0xb5, 0xfa, 0xe8, 0xb5, 0xfa, 0xcb, 0xc6,
-        0x3a, 0x73, 0xa3, 0xbf, 0xe4, 0x3a, 0x8d, 0xb5, 0xe5, 0x78, 0x03, 0xfe,
-        0x53, 0x9f, 0x0e, 0x7b, 0x31, 0x35, 0xae, 0xa5, 0xc3, 0xb0, 0x47, 0x5d,
-        0xc6, 0x94, 0xfe, 0xb2, 0xed, 0xe7, 0x96, 0xbb, 0x6b, 0xb9, 0x65, 0x3d,
-        0x1f, 0x44, 0xec, 0x9a, 0xfc, 0xa4, 0x87, 0x8f, 0x8c, 0x91, 0xa7, 0xd0,
-        0x7f, 0x0c, 0x3a, 0xc0, 0x67, 0xac, 0x97, 0xde, 0x2c, 0x9f, 0x32, 0x5d,
-        0xff, 0xe4, 0xd6, 0xa6, 0x76, 0xab, 0xf8, 0x9f, 0xdf, 0x0b, 0x0a, 0xa9,
-        0x76, 0x2f, 0xde, 0xbb, 0x12, 0xae, 0x2e, 0xcf, 0x4d, 0x75, 0xfd, 0x51,
-        0xbc, 0xcb, 0xdc, 0xd4, 0x8c, 0x10, 0x43, 0xb3, 0x95, 0xcb, 0xbe, 0x5f,
-        0xa4, 0x7f, 0x29, 0xa8, 0xef, 0x82, 0x2a, 0x0f, 0xc5, 0xb8, 0x45, 0xef,
-        0x7d, 0x37, 0x0f, 0xcd, 0x56, 0xbe, 0xdd, 0xea, 0xe2, 0xe0, 0xe5, 0x72,
-        0x96, 0x9f, 0x88, 0xb0, 0xae, 0xb7, 0xe8, 0x5c, 0x89, 0xd6, 0x95, 0x79,
-        0xaf, 0xb1, 0x22, 0xef, 0x1d, 0xf5, 0xf2, 0xda, 0xcf, 0xa9, 0xbc, 0xd7,
-        0xe5, 0x31, 0xf7, 0x12, 0xcc, 0xa3, 0x6c, 0x60, 0x21, 0xbf, 0xa9, 0x10,
-        0x1f, 0x26, 0x94, 0xdf, 0xca, 0x4f, 0xdf, 0x09, 0x3e, 0x47, 0x57, 0xd1,
-        0x9b, 0x8f, 0xda, 0x4f, 0xf8, 0x7b, 0x3f, 0x2c, 0x6e, 0xbd, 0x6e, 0x27,
-        0x68, 0x61, 0x6e, 0x15, 0xf2, 0xf4, 0xe1, 0xbb, 0xde, 0x39, 0x53, 0x7f,
-        0x9c, 0x9f, 0xc7, 0xd7, 0xbe, 0xbb, 0x16, 0x33, 0xcb, 0xea, 0x27, 0x1b,
-        0x09, 0xc3, 0x90, 0x7b, 0xe6, 0x1a, 0xbe, 0x5b, 0x7c, 0x90, 0xf3, 0x11,
-        0x8d, 0x7e, 0x8d, 0xdf, 0x4d, 0xf9, 0xad, 0x54, 0xb4, 0xbb, 0x7b, 0x6d,
-        0xd8, 0x00, 0xcf, 0x2c, 0x07, 0xf1, 0x35, 0x2c, 0xf9, 0x39, 0x09, 0x47,
-        0xd3, 0xfc, 0x06, 0x40, 0xff, 0xff, 0xba, 0xb7, 0xcf, 0x98, 0xec, 0x9f,
-        0x71, 0x6b, 0x9e, 0xfa, 0x65, 0xcf, 0xc5, 0x1d, 0x00, 0x1f, 0x12, 0x47,
-        0xfd, 0x9a, 0xa7, 0xee, 0x9e, 0x8b, 0x3b, 0xfa, 0xe1, 0x9d, 0x8b, 0xe3,
-        0xfc, 0xa6, 0xec, 0x5a, 0xe5, 0x5c, 0x9c, 0x71, 0x95, 0xe7, 0xe2, 0xda,
-        0x55, 0xcd, 0x93, 0xf3, 0xb8, 0x35, 0x4f, 0xb6, 0xbb, 0xfb, 0x59, 0x2b,
-        0xe1, 0xd9, 0xb7, 0x01, 0x75, 0x06, 0xb9, 0xbb, 0xff, 0x47, 0x91, 0xa3,
-        0x7c, 0x3d, 0xf2, 0xd1, 0xe7, 0x28, 0xdc, 0xcb, 0xaf, 0xb8, 0xdf, 0x77,
-        0xe5, 0x5a, 0xea, 0x00, 0x1f, 0xac, 0xae, 0xb9, 0x5f, 0xd5, 0x35, 0xbf,
-        0x13, 0x09, 0xd6, 0x35, 0xf5, 0x2b, 0x9c, 0x0d, 0xdb, 0xbf, 0x4a, 0x5d,
-        0x33, 0x14, 0x38, 0x1b, 0x16, 0xf2, 0xce, 0x86, 0xb5, 0xdb, 0xc8, 0x25,
-        0xbd, 0x3a, 0xa6, 0x7e, 0xd9, 0xb3, 0x61, 0xff, 0x19, 0xf9, 0xe0, 0x75,
-        0xcc, 0x15, 0x67, 0xc3, 0xe0, 0xeb, 0x36, 0x48, 0xfc, 0x9a, 0xf2, 0x9e,
-        0x0f, 0x92, 0xf3, 0xf0, 0xbc, 0x7e, 0x13, 0xf6, 0x1c, 0x92, 0x5d, 0x51,
-        0xea, 0x27, 0xcf, 0x36, 0xf6, 0xc2, 0x16, 0x70, 0xad, 0xb0, 0x9d, 0xa4,
-        0x8c, 0xb4, 0x91, 0xde, 0xe5, 0xe7, 0x10, 0xea, 0xe7, 0x71, 0xc3, 0xb5,
-        0xf3, 0xb8, 0x47, 0xa0, 0x37, 0xfa, 0x4c, 0x58, 0x16, 0x02, 0x3a, 0x35,
-        0x85, 0x78, 0x4f, 0x9f, 0xb3, 0xbc, 0xe7, 0xfc, 0x9f, 0x8a, 0x28, 0x30,
-        0x8f, 0x67, 0x78, 0xdb, 0xc4, 0x98, 0x73, 0xbf, 0x59, 0xba, 0xff, 0x57,
-        0x12, 0xc3, 0x18, 0x9e, 0xf1, 0x0c, 0xc9, 0x01, 0x55, 0xb3, 0xf0, 0x75,
-        0x79, 0xc7, 0x5a, 0x69, 0x59, 0x9f, 0xa9, 0xb7, 0xa3, 0xab, 0xf8, 0x7d,
-        0xc4, 0x91, 0x33, 0xd4, 0xe7, 0x5b, 0x25, 0xe7, 0xd5, 0x83, 0x0a, 0x95,
-        0x6d, 0x5e, 0x7e, 0xa1, 0xbe, 0xed, 0x80, 0x97, 0xdd, 0x9e, 0x0f, 0xc6,
-        0xb5, 0xd4, 0x4d, 0x9f, 0x87, 0x35, 0x4e, 0xca, 0xd0, 0xf4, 0x96, 0xd8,
-        0x38, 0xf0, 0x6e, 0x4c, 0xad, 0x79, 0x2d, 0x3c, 0xd7, 0x2e, 0xf1, 0xbd,
-        0xf1, 0x6a, 0xf9, 0xee, 0xc7, 0xc7, 0x8f, 0x62, 0x7f, 0xdd, 0xd0, 0x8f,
-        0x87, 0x25, 0x77, 0xe2, 0x66, 0x19, 0x9a, 0x4d, 0x80, 0x9e, 0x1f, 0x56,
-        0x0b, 0x29, 0xc4, 0xd2, 0x4f, 0xf0, 0xdc, 0x18, 0x30, 0x14, 0x7c, 0x7b,
-        0x66, 0xc5, 0x77, 0xec, 0xe0, 0x59, 0xb3, 0x64, 0xed, 0xec, 0xd0, 0x53,
-        0x15, 0x09, 0x77, 0x90, 0xe6, 0x99, 0xfa, 0xd9, 0xef, 0xc5, 0xca, 0x0e,
-        0xe5, 0xdb, 0x9e, 0xac, 0x2c, 0xab, 0xfd, 0x28, 0x19, 0x4e, 0x94, 0x9f,
-        0x04, 0x2f, 0x5e, 0x51, 0xfe, 0xed, 0x88, 0x23, 0x37, 0x19, 0x42, 0x79,
-        0x88, 0x06, 0x1e, 0xa8, 0x33, 0x1c, 0xee, 0xf7, 0xfd, 0x2e, 0x25, 0x57,
-        0x17, 0x2b, 0x76, 0x06, 0xce, 0x60, 0xd4, 0x65, 0xeb, 0x9e, 0xcd, 0x70,
-        0x65, 0xe1, 0x9e, 0x1f, 0x21, 0x3f, 0x97, 0x0e, 0xed, 0xb2, 0xdd, 0xf3,
-        0x23, 0x3d, 0x73, 0xec, 0xeb, 0x6c, 0xf0, 0x7d, 0x61, 0xe8, 0x00, 0xcf,
-        0x1d, 0xf1, 0xcc, 0x37, 0x69, 0x56, 0xb5, 0x8e, 0x55, 0xbf, 0x6d, 0x5f,
-        0x5b, 0xcd, 0xd5, 0x5d, 0xb3, 0x5b, 0xad, 0x79, 0x9d, 0x87, 0x59, 0xfe,
-        0x59, 0xef, 0x94, 0xf6, 0xff, 0xd4, 0x5d, 0x7b, 0x6c, 0x1b, 0xf7, 0x7d,
-        0xff, 0xf2, 0x48, 0x3d, 0xac, 0xe7, 0x49, 0xa6, 0x64, 0x5a, 0x52, 0x94,
-        0x3b, 0xe9, 0x64, 0x29, 0xb1, 0x12, 0x70, 0x9e, 0xba, 0x0a, 0x88, 0x9a,
-        0xb0, 0x24, 0xfd, 0x58, 0x10, 0x0c, 0xb4, 0xad, 0x64, 0xee, 0x92, 0xad,
-        0x0e, 0x25, 0xa7, 0x1d, 0x30, 0x60, 0x6e, 0xd6, 0x02, 0x69, 0x07, 0xc7,
-        0x0c, 0x65, 0x27, 0xc6, 0xaa, 0x88, 0x4c, 0xcc, 0x6a, 0x1d, 0xb0, 0x62,
-        0x1c, 0xa5, 0x38, 0x69, 0xa7, 0x80, 0x69, 0xda, 0x04, 0xc5, 0xfe, 0xb1,
-        0x26, 0x3b, 0x7b, 0x61, 0x7f, 0x04, 0xdb, 0x80, 0x1a, 0x5b, 0x81, 0xba,
-        0x76, 0x8a, 0x65, 0x1b, 0xe0, 0x34, 0xdb, 0xb0, 0x75, 0x58, 0x0b, 0xee,
-        0xfb, 0xf9, 0x3d, 0xc8, 0x23, 0x79, 0xd4, 0xc3, 0x71, 0x06, 0x4c, 0x80,
-        0x40, 0xde, 0xf1, 0x77, 0x77, 0xbf, 0xdf, 0xf7, 0xf7, 0x7d, 0xbf, 0x6e,
-        0x2e, 0x33, 0x1e, 0xf2, 0x33, 0x7e, 0xcf, 0x15, 0x61, 0x5f, 0x37, 0xd2,
-        0xe1, 0x36, 0x83, 0x67, 0xa4, 0x0e, 0x9e, 0xd5, 0x34, 0xc1, 0xf6, 0x78,
-        0x99, 0x77, 0x4b, 0xd8, 0xc9, 0xf3, 0xc8, 0x63, 0xd7, 0x39, 0x0e, 0x12,
-        0x76, 0x65, 0x1a, 0x5a, 0x72, 0xe7, 0x37, 0x54, 0x60, 0x77, 0xb2, 0x0c,
-        0xbb, 0x3d, 0xff, 0x8f, 0x60, 0x77, 0x4d, 0xe8, 0xbf, 0xdf, 0x2e, 0x22,
-        0x6f, 0x4d, 0xeb, 0x00, 0xba, 0x6e, 0x09, 0x70, 0x04, 0x3f, 0xb5, 0xf3,
-        0xeb, 0x04, 0x9e, 0x8a, 0xbc, 0xe2, 0x52, 0xe9, 0x3b, 0xe1, 0xb2, 0x9f,
-        0x92, 0xed, 0x12, 0xd8, 0x27, 0xf0, 0xe7, 0x35, 0x96, 0x91, 0x47, 0x6f,
-        0x4b, 0x46, 0x42, 0x57, 0xaa, 0xb5, 0x4f, 0x7e, 0xbb, 0xcb, 0x6d, 0x9f,
-        0x1c, 0xdd, 0xa1, 0x7d, 0x72, 0x5a, 0xda, 0x27, 0xa9, 0xed, 0xdb, 0x27,
-        0x03, 0x75, 0x79, 0x5d, 0x95, 0xf5, 0xec, 0xdc, 0x3e, 0x31, 0x36, 0xb5,
-        0x4f, 0x46, 0x5d, 0xbe, 0x18, 0xcc, 0xf7, 0x57, 0x29, 0x75, 0x0c, 0x3c,
-        0x4e, 0xc3, 0x19, 0x30, 0x3e, 0x56, 0xe3, 0x17, 0xfe, 0x38, 0x61, 0xfd,
-        0xd7, 0xff, 0xc7, 0xb0, 0x1e, 0xac, 0xf3, 0x79, 0x57, 0xd6, 0x03, 0x21,
-        0xfe, 0x51, 0x60, 0x3d, 0xd8, 0xd0, 0x77, 0xda, 0x38, 0x67, 0xb1, 0xda,
-        0x77, 0x3a, 0x62, 0x34, 0xe2, 0xed, 0x7f, 0xe4, 0xf2, 0xa9, 0xba, 0xf9,
-        0x3b, 0x68, 0x8a, 0x7c, 0x47, 0xc7, 0xf5, 0xb3, 0x40, 0x4b, 0x76, 0x2a,
-        0x45, 0xb0, 0x99, 0xf0, 0xbc, 0x90, 0xa0, 0xb5, 0x1a, 0x7d, 0x8b, 0x9f,
-        0xc7, 0xeb, 0x7b, 0xf5, 0x09, 0x21, 0xa7, 0xa4, 0xff, 0x01, 0xe3, 0x27,
-        0x7c, 0xf3, 0x62, 0xac, 0xcc, 0x6f, 0x52, 0xfe, 0x08, 0xa5, 0xfb, 0x37,
-        0xf2, 0x43, 0xd4, 0xcb, 0xbc, 0x9d, 0xd9, 0x0a, 0x9a, 0xc6, 0xef, 0xe6,
-        0x7d, 0x09, 0x55, 0xd9, 0x5a, 0xe0, 0x9f, 0xa7, 0x59, 0x2f, 0x18, 0x29,
-        0xeb, 0x04, 0xd5, 0x7b, 0x73, 0x4e, 0xd8, 0x74, 0x9a, 0x77, 0x26, 0x64,
-        0xee, 0xa9, 0x38, 0x0f, 0x3d, 0x4d, 0xf3, 0xce, 0x5a, 0x3d, 0xf8, 0x6e,
-        0x0f, 0xbc, 0xf0, 0xca, 0x69, 0x2a, 0xef, 0x9d, 0x85, 0x9c, 0xf3, 0xb8,
-        0xe7, 0xde, 0x95, 0x6b, 0xc2, 0x52, 0x95, 0xb1, 0xf2, 0xfa, 0xb8, 0x58,
-        0xd7, 0x0f, 0x8e, 0x44, 0x51, 0xfb, 0x56, 0xae, 0x17, 0xab, 0xad, 0x77,
-        0x82, 0x1c, 0xd0, 0x74, 0xa8, 0x6b, 0xa2, 0x01, 0x8b, 0x61, 0x8f, 0x7a,
-        0x27, 0xb7, 0x2c, 0xc1, 0x75, 0xb5, 0xb0, 0xa8, 0xc8, 0x91, 0xf3, 0x4a,
-        0x8e, 0x14, 0x5c, 0x7c, 0xbc, 0x5e, 0x6f, 0xef, 0xf5, 0xd0, 0xdb, 0xbd,
-        0x6a, 0x9e, 0x30, 0xa7, 0x67, 0x58, 0x0f, 0xb9, 0x1f, 0x7a, 0x88, 0x89,
-        0xba, 0x25, 0xa9, 0x8b, 0xe0, 0x77, 0x96, 0x35, 0xaf, 0x86, 0x18, 0x57,
-        0x8e, 0xd0, 0x53, 0xac, 0x6b, 0x5f, 0xa2, 0x7b, 0x94, 0x7d, 0x16, 0x71,
-        0xe5, 0x99, 0x22, 0x8f, 0xdf, 0x47, 0xa9, 0x27, 0xec, 0x89, 0x08, 0x1d,
-        0xa1, 0x53, 0x22, 0x67, 0x06, 0xf1, 0x3d, 0xe4, 0x1c, 0xdc, 0x2b, 0x9e,
-        0x2f, 0x7d, 0x19, 0x77, 0x22, 0xa7, 0x6e, 0xfb, 0xf9, 0xfb, 0xba, 0x56,
-        0x2f, 0x2a, 0x9e, 0xb9, 0xaa, 0x68, 0x4a, 0x9c, 0xe3, 0xeb, 0x9f, 0x31,
-        0xea, 0xaf, 0x8f, 0x18, 0xf1, 0x62, 0xdc, 0x88, 0xae, 0x60, 0xdc, 0x33,
-        0x46, 0xac, 0x08, 0x1b, 0x52, 0xe3, 0x88, 0x1d, 0x06, 0xbd, 0x6d, 0xd0,
-        0xd6, 0xb1, 0x88, 0x02, 0xd5, 0xd4, 0x49, 0x6c, 0x63, 0xde, 0x87, 0xaa,
-        0xe6, 0xad, 0xe1, 0x8b, 0xef, 0xf0, 0xf7, 0x44, 0x18, 0xa6, 0x5a, 0xaf,
-        0x6d, 0x83, 0x7f, 0x7d, 0x22, 0x45, 0x9b, 0xe9, 0xb5, 0x76, 0x9d, 0x5e,
-        0x5b, 0xd8, 0x72, 0xde, 0x1f, 0x95, 0xc6, 0x65, 0x3d, 0xa2, 0xdf, 0x11,
-        0xfa, 0x2b, 0xcf, 0xbb, 0x4a, 0xb7, 0xad, 0xc1, 0x29, 0x8c, 0xd1, 0x7e,
-        0x70, 0xed, 0x07, 0xeb, 0x52, 0xf9, 0xc0, 0x3a, 0x3f, 0xa1, 0x0d, 0xf5,
-        0x5e, 0xa6, 0xcc, 0x6b, 0x85, 0x8d, 0xb5, 0xce, 0xf3, 0x83, 0xbd, 0xf5,
-        0xa0, 0x98, 0x23, 0xdb, 0x5b, 0x56, 0x8c, 0xa4, 0xaf, 0x7b, 0xbe, 0x58,
-        0x55, 0xff, 0xe9, 0x51, 0x07, 0x39, 0xe2, 0x51, 0x07, 0xe9, 0xa6, 0xb5,
-        0x80, 0x8b, 0xd6, 0x42, 0x2e, 0xbd, 0x6d, 0x88, 0xed, 0x96, 0x0e, 0xe6,
-        0x21, 0xb0, 0x5b, 0xda, 0xc8, 0xff, 0xb2, 0xdb, 0x6e, 0xa9, 0xad, 0x45,
-        0x07, 0xdd, 0x41, 0x37, 0x93, 0x36, 0x4c, 0x3c, 0x57, 0xae, 0x63, 0xe7,
-        0x75, 0x57, 0x6a, 0x0e, 0x57, 0xea, 0xea, 0x23, 0xbd, 0xe6, 0x3b, 0x5c,
-        0x37, 0x5f, 0xc8, 0xaf, 0x48, 0x43, 0x9d, 0xce, 0xcb, 0xae, 0xba, 0x53,
-        0xf3, 0xab, 0xe5, 0x67, 0x78, 0xd6, 0x88, 0xf0, 0x79, 0xa7, 0xca, 0xbc,
-        0x6c, 0x5a, 0xce, 0x37, 0x53, 0x6d, 0x67, 0xf8, 0x97, 0x48, 0xc1, 0xce,
-        0x9b, 0xb7, 0xef, 0xcc, 0x7f, 0xd6, 0x5e, 0x23, 0x77, 0xdf, 0x33, 0xa5,
-        0x5f, 0xac, 0x49, 0xe5, 0x61, 0xf7, 0x29, 0x7b, 0x6f, 0x2b, 0x7c, 0xc7,
-        0xb9, 0x26, 0xe5, 0x4b, 0xb4, 0xad, 0x3c, 0x01, 0xcf, 0x8f, 0x9d, 0x68,
-        0x72, 0x4c, 0x15, 0xcb, 0x42, 0xbc, 0x0a, 0x78, 0xaf, 0xef, 0x0f, 0x9e,
-        0xbd, 0x9d, 0x3d, 0xb3, 0xea, 0xf6, 0x4c, 0xe2, 0x15, 0x6c, 0x2d, 0xe4,
-        0x17, 0x4f, 0xd6, 0xe4, 0x78, 0x7f, 0x14, 0x58, 0x74, 0x79, 0xe4, 0x3d,
-        0x23, 0x6f, 0xb9, 0xd1, 0x3c, 0xaf, 0xbb, 0xf4, 0x72, 0xcc, 0xb7, 0x54,
-        0x7a, 0x23, 0x3c, 0x20, 0x65, 0x71, 0xd1, 0x5b, 0x47, 0x32, 0xb7, 0x3d,
-        0xbf, 0x5a, 0xd9, 0xbb, 0x77, 0x9b, 0xb2, 0x57, 0xf4, 0xf4, 0xf0, 0x1d,
-        0x14, 0x3c, 0xa0, 0x83, 0x56, 0x72, 0xc8, 0xbf, 0xfe, 0x05, 0xd0, 0x3c,
-        0xf3, 0x59, 0x57, 0x4d, 0x9a, 0xf7, 0x3e, 0x96, 0x63, 0x2a, 0x81, 0x19,
-        0xc4, 0xfe, 0x90, 0x5b, 0xd2, 0xcb, 0xbc, 0x07, 0xe3, 0xc7, 0xac, 0xab,
-        0xf0, 0xf7, 0x2a, 0xff, 0x53, 0x5c, 0xc9, 0x97, 0x83, 0xdb, 0x88, 0xad,
-        0xec, 0x8c, 0x4f, 0xdb, 0xd6, 0x3a, 0x21, 0xee, 0x83, 0x7c, 0xe1, 0xfb,
-        0xba, 0xa8, 0xeb, 0x33, 0x2d, 0x2d, 0xce, 0x97, 0x7a, 0x64, 0x2c, 0x0a,
-        0xbf, 0x75, 0xd0, 0x2b, 0x39, 0xe4, 0x72, 0xe3, 0xb7, 0xdf, 0xe0, 0xdf,
-        0xbc, 0x78, 0x94, 0xce, 0x45, 0x87, 0x2e, 0x27, 0xf7, 0x27, 0x4f, 0xb0,
-        0x95, 0x4a, 0xf4, 0xb7, 0xe1, 0x5f, 0x94, 0xf1, 0x8c, 0xe2, 0x9d, 0x8e,
-        0xd5, 0x78, 0xf9, 0x0b, 0xdf, 0xec, 0xb9, 0xdd, 0xdc, 0xc8, 0x2f, 0x6c,
-        0xcb, 0x5f, 0x88, 0x38, 0xff, 0x76, 0x62, 0x26, 0x3a, 0x36, 0x3c, 0x25,
-        0x6a, 0x4e, 0xdd, 0x78, 0x70, 0x67, 0xe2, 0xc3, 0xc0, 0x87, 0xe1, 0x3a,
-        0x5e, 0xf5, 0xd1, 0xfd, 0xfd, 0xb5, 0x70, 0x6d, 0xf3, 0xf4, 0x55, 0x79,
-        0xc7, 0x81, 0x11, 0xf3, 0x87, 0x9f, 0xfa, 0x21, 0x9a, 0xbf, 0x08, 0x1c,
-        0x36, 0x18, 0xdb, 0x46, 0x69, 0x21, 0x88, 0xba, 0x22, 0x51, 0x9b, 0xa3,
-        0xe2, 0x86, 0xb2, 0x56, 0x68, 0x5e, 0xd4, 0x40, 0x8e, 0x85, 0x6e, 0xf2,
-        0xbc, 0xe7, 0x8b, 0x29, 0x3a, 0xc5, 0x32, 0xf6, 0xd4, 0x4a, 0x45, 0x77,
-        0xaf, 0xaf, 0x83, 0xac, 0xc6, 0xf1, 0x9b, 0x02, 0xc7, 0x87, 0x36, 0xc5,
-        0xf1, 0xc3, 0x65, 0x1c, 0xff, 0x44, 0xaf, 0xc4, 0xe7, 0x67, 0xf9, 0x5e,
-        0x5d, 0x74, 0x50, 0xdc, 0x37, 0xc5, 0xdf, 0xdb, 0xe9, 0xa0, 0xec, 0x61,
-        0xc1, 0xcf, 0x66, 0x1e, 0x9f, 0x49, 0xd1, 0x53, 0x17, 0x53, 0xbe, 0xb8,
-        0xa8, 0x5f, 0x70, 0xf7, 0xe8, 0xd0, 0xd7, 0x63, 0x5c, 0x23, 0xfc, 0xd7,
-        0x7c, 0x49, 0xd6, 0x5c, 0xe5, 0x25, 0x7f, 0xa2, 0x77, 0xc3, 0x83, 0x35,
-        0xf8, 0x5f, 0x6d, 0x3b, 0x9e, 0x56, 0x32, 0xf0, 0xd8, 0x26, 0x7e, 0x8d,
-        0x7a, 0xbc, 0xec, 0xf1, 0xd0, 0x87, 0x7f, 0xbd, 0x57, 0xc6, 0xa9, 0x36,
-        0xf3, 0x6b, 0xb8, 0x71, 0xb4, 0x2a, 0x6e, 0xcf, 0x7c, 0xff, 0xbf, 0x55,
-        0x1c, 0xfd, 0xa5, 0x5e, 0x29, 0x2f, 0x50, 0x1f, 0x98, 0x60, 0x38, 0x9c,
-        0x64, 0x5d, 0x65, 0x90, 0x9a, 0x5f, 0xd6, 0x6b, 0x1d, 0x14, 0xfc, 0xd6,
-        0xed, 0xa7, 0x39, 0xa7, 0x6a, 0xbb, 0xd3, 0xae, 0x35, 0x9d, 0x13, 0x36,
-        0x4e, 0x63, 0x7a, 0x6b, 0x9c, 0x73, 0x35, 0x54, 0x23, 0x13, 0x6a, 0xf1,
-        0x0d, 0xbd, 0x4f, 0xb0, 0xbf, 0x64, 0x48, 0x3d, 0x78, 0x9a, 0xf5, 0xdb,
-        0x9d, 0xc6, 0x8b, 0x3e, 0xaa, 0x8e, 0x58, 0xdb, 0x53, 0xa3, 0xf6, 0x3b,
-        0xf6, 0x41, 0xda, 0x1c, 0xc9, 0x57, 0x1f, 0x12, 0xbc, 0xe0, 0xdc, 0x64,
-        0x89, 0x62, 0xe1, 0x4e, 0x4a, 0x4e, 0xf2, 0xb3, 0xa7, 0x1d, 0xb6, 0xbd,
-        0xfc, 0x94, 0x62, 0xfa, 0x4d, 0x4e, 0xee, 0x52, 0xfa, 0xa2, 0xf6, 0xa7,
-        0xb7, 0xa8, 0x3c, 0x87, 0x67, 0x45, 0x5c, 0x52, 0xf6, 0xc6, 0xe0, 0xef,
-        0x2b, 0xfa, 0xde, 0xcf, 0x8a, 0xf8, 0x68, 0xf2, 0x62, 0xb3, 0x1a, 0xd7,
-        0xee, 0x1a, 0x87, 0x31, 0xed, 0x6a, 0x2c, 0xee, 0xa9, 0x75, 0x8a, 0x56,
-        0xc5, 0x6f, 0x1f, 0x11, 0x75, 0x60, 0xb2, 0x56, 0x0f, 0xbf, 0x9f, 0xa6,
-        0xb9, 0xf2, 0x5a, 0xda, 0x79, 0xec, 0xcf, 0x4a, 0x11, 0x61, 0xcb, 0xb5,
-        0xb3, 0xce, 0x8b, 0x79, 0xd7, 0xcf, 0x09, 0x6b, 0xf1, 0x8b, 0xf8, 0x10,
-        0x7f, 0x57, 0xcf, 0x39, 0x59, 0x9e, 0x13, 0x72, 0x34, 0xec, 0x90, 0xbc,
-        0x97, 0x1e, 0xd7, 0xee, 0x1a, 0xa7, 0x79, 0x85, 0x8e, 0x3f, 0xfc, 0x80,
-        0xe7, 0xf1, 0x37, 0x2a, 0x87, 0xd7, 0x14, 0xf1, 0x53, 0x99, 0xa3, 0xa1,
-        0xbf, 0xc3, 0xbf, 0x8c, 0x9c, 0x0a, 0xe4, 0x49, 0xb8, 0xf9, 0x8d, 0x5c,
-        0x6f, 0x00, 0xb2, 0xa8, 0x88, 0xb8, 0x29, 0xe2, 0x15, 0x8d, 0x74, 0xe7,
-        0xbd, 0xc8, 0xcd, 0xdf, 0x81, 0x0e, 0xba, 0x1d, 0xfa, 0xb3, 0x3c, 0xe8,
-        0xcf, 0xfd, 0x7c, 0xd4, 0xc1, 0xa1, 0x1e, 0x2e, 0x35, 0x61, 0x50, 0x89,
-        0x6d, 0x05, 0x83, 0xf2, 0xa6, 0x8f, 0x9e, 0x72, 0xec, 0xf0, 0x0a, 0xc9,
-        0x9a, 0xc9, 0xd8, 0xa2, 0x3d, 0xb1, 0x4e, 0xfb, 0x45, 0xcd, 0x38, 0x7a,
-        0x1f, 0xe4, 0x59, 0x06, 0x9f, 0xa4, 0x09, 0xb6, 0x8f, 0xd8, 0xfe, 0x9c,
-        0x45, 0xbc, 0x45, 0xef, 0x0b, 0x6a, 0xe0, 0xf1, 0x39, 0xc1, 0x70, 0x7a,
-        0x6c, 0x37, 0xb5, 0x45, 0xf8, 0x9e, 0x13, 0xe0, 0x4f, 0xe8, 0xe7, 0x45,
-        0x51, 0xb6, 0x93, 0x60, 0xb3, 0x9e, 0x9c, 0xb5, 0xcd, 0x3c, 0x19, 0x3c,
-        0x16, 0xb6, 0x2b, 0xee, 0x83, 0xeb, 0x23, 0x66, 0x13, 0xd5, 0xd6, 0xe4,
-        0x3e, 0x2b, 0xea, 0x14, 0xdf, 0x0d, 0xdf, 0x47, 0x46, 0x3f, 0xf8, 0x15,
-        0xf6, 0xed, 0x5e, 0x15, 0x27, 0x3a, 0xcb, 0xdf, 0xc7, 0xd5, 0xf7, 0xaf,
-        0x88, 0xfd, 0x94, 0xdf, 0x35, 0x7e, 0xe3, 0xef, 0x5f, 0x5a, 0xc8, 0xf9,
-        0xa1, 0xca, 0x59, 0xa9, 0xca, 0x05, 0x09, 0x8d, 0x1a, 0x5f, 0xa1, 0xd3,
-        0x2b, 0x9b, 0xf9, 0x5f, 0xbc, 0x6a, 0x5d, 0xbb, 0xb7, 0x59, 0xeb, 0xfa,
-        0x07, 0xbb, 0x65, 0x6d, 0x99, 0x7b, 0x2e, 0xff, 0xc9, 0x73, 0xf1, 0xd2,
-        0xc9, 0xea, 0xf4, 0x44, 0x5e, 0x6f, 0x89, 0xfe, 0x29, 0xfc, 0x49, 0xba,
-        0x1e, 0x0c, 0xa9, 0x9c, 0x25, 0xe4, 0x28, 0xdd, 0xa7, 0xf0, 0x5a, 0xf3,
-        0x7e, 0xf2, 0xe0, 0xfd, 0x8f, 0x89, 0x5c, 0x4d, 0x29, 0x3b, 0x06, 0x15,
-        0x3c, 0x00, 0xb3, 0x90, 0x0b, 0x66, 0x7d, 0x2e, 0x98, 0x19, 0xea, 0x7b,
-        0xa7, 0x38, 0x3e, 0xbd, 0xf2, 0x99, 0x6e, 0x59, 0x2f, 0x8e, 0x58, 0xe2,
-        0xbc, 0xfa, 0xbe, 0xd5, 0x7a, 0x7f, 0xce, 0x6b, 0x15, 0xfe, 0x26, 0xd7,
-        0x5a, 0x5f, 0x27, 0x72, 0x5a, 0x82, 0xf5, 0x30, 0xf8, 0x8e, 0xeb, 0x3c,
-        0xe6, 0x38, 0xe6, 0x9a, 0xe3, 0x88, 0x6b, 0x8e, 0x77, 0x37, 0x98, 0x23,
-        0xf3, 0xf8, 0xe2, 0x69, 0xfe, 0xbf, 0xdd, 0xb9, 0xca, 0x79, 0xce, 0x0b,
-        0x78, 0xb6, 0x53, 0x3a, 0x18, 0x52, 0xb2, 0xe3, 0xfb, 0xaa, 0x16, 0xdd,
-        0x6b, 0xce, 0xff, 0x40, 0x8d, 0xf7, 0xcd, 0x8d, 0xab, 0xee, 0xfa, 0xe3,
-        0x97, 0x28, 0x26, 0xeb, 0xc8, 0x15, 0x6d, 0x7f, 0xb5, 0x81, 0x1f, 0xfa,
-        0x41, 0xa1, 0xff, 0xcc, 0xcb, 0x78, 0xd0, 0x80, 0xec, 0xbf, 0x16, 0xa0,
-        0xd5, 0x72, 0x2d, 0xaf, 0x5f, 0xd5, 0xee, 0xdc, 0x1f, 0xbc, 0xb3, 0x75,
-        0xbc, 0x38, 0xff, 0x88, 0xf0, 0xe5, 0xc9, 0xf8, 0x51, 0x42, 0xd5, 0x23,
-        0xdb, 0x16, 0x72, 0x03, 0x0a, 0x6b, 0xf0, 0xbf, 0x36, 0xaa, 0xdd, 0xc5,
-        0xb5, 0xf0, 0x03, 0x6a, 0x3b, 0xfe, 0x84, 0xe0, 0x89, 0xd2, 0x3f, 0x26,
-        0xeb, 0x6f, 0x0b, 0x6b, 0x27, 0x45, 0xcd, 0x6b, 0x54, 0xd5, 0xf1, 0x26,
-        0xa9, 0x43, 0xe8, 0xb9, 0xb7, 0x5f, 0x7f, 0xfb, 0x5c, 0x70, 0xe7, 0xf5,
-        0xb7, 0xee, 0x6b, 0x76, 0x56, 0x7f, 0x6b, 0xf2, 0xda, 0x8d, 0x65, 0x59,
-        0x7f, 0x5b, 0x1d, 0x93, 0x91, 0xfe, 0xc0, 0xa4, 0x4b, 0x7f, 0x90, 0xfa,
-        0xfa, 0x6f, 0xb9, 0xf2, 0xb7, 0x65, 0x6d, 0x6d, 0xa1, 0xac, 0xb3, 0xca,
-        0xda, 0x5a, 0x99, 0xef, 0xed, 0xee, 0x03, 0x23, 0x63, 0x3f, 0xf2, 0x39,
-        0x9d, 0x35, 0xb1, 0x1f, 0x59, 0x53, 0x6b, 0x19, 0x8d, 0x6c, 0x38, 0xd1,
-        0xe7, 0xa2, 0x8f, 0xba, 0x22, 0x8c, 0xbb, 0xed, 0x0d, 0xfa, 0x21, 0x44,
-        0x1a, 0xf4, 0x43, 0x70, 0xf3, 0x7e, 0xb7, 0x8e, 0x05, 0x9d, 0x18, 0xb2,
-        0x11, 0xba, 0x30, 0xfa, 0x19, 0x84, 0xe9, 0x74, 0x59, 0xf7, 0xbc, 0x8f,
-        0x12, 0x4a, 0xf7, 0x3c, 0xbd, 0xa2, 0xf9, 0xd1, 0x48, 0x0d, 0x3f, 0xf2,
-        0xd2, 0x45, 0x6d, 0x95, 0xe7, 0xa3, 0xe9, 0x35, 0xe5, 0xa2, 0xd7, 0x94,
-        0x07, 0xbd, 0x8a, 0x67, 0x34, 0x98, 0xf7, 0xf7, 0xd5, 0x35, 0xf8, 0x4f,
-        0x84, 0xd0, 0xb3, 0x85, 0x79, 0x6a, 0x50, 0xe9, 0x7f, 0x2e, 0x7a, 0x3d,
-        0xc5, 0xf4, 0xaa, 0xcf, 0x63, 0xbe, 0x0d, 0x73, 0x41, 0x95, 0xce, 0x38,
-        0xe8, 0x3b, 0x74, 0xf1, 0x1b, 0x22, 0x4f, 0xaa, 0xda, 0x5e, 0xd4, 0xfa,
-        0xc4, 0x3e, 0x41, 0x4b, 0xd7, 0xfd, 0xc8, 0x5b, 0xd1, 0xe7, 0x4c, 0xe5,
-        0x27, 0xd3, 0xb0, 0x68, 0xae, 0xd2, 0x39, 0x2a, 0xfa, 0x86, 0xc8, 0xf1,
-        0x75, 0xcd, 0xed, 0x43, 0x9e, 0x9b, 0x3e, 0xaf, 0x65, 0xe6, 0xb5, 0x2a,
-        0x7f, 0xc6, 0xe5, 0xaa, 0x9e, 0x83, 0xf0, 0x1d, 0x75, 0x26, 0x0c, 0x27,
-        0x2e, 0x72, 0x4c, 0x7b, 0x1c, 0xf8, 0xc9, 0xa2, 0x4c, 0xfb, 0x3d, 0x09,
-        0xe4, 0x33, 0xf7, 0x2c, 0x59, 0x74, 0x3c, 0x73, 0xff, 0x5d, 0x12, 0x57,
-        0xce, 0x8a, 0x3e, 0x92, 0xe8, 0x67, 0x16, 0x63, 0xf9, 0x1c, 0xf5, 0x4f,
-        0xd3, 0xf9, 0x62, 0x0b, 0x15, 0x58, 0xbb, 0xf7, 0x3b, 0x79, 0xe1, 0xeb,
-        0x63, 0x9e, 0x94, 0x45, 0x2f, 0x51, 0x63, 0xb9, 0x99, 0xef, 0xdb, 0x4f,
-        0xab, 0xb9, 0x31, 0xd1, 0x13, 0x4a, 0xf6, 0x17, 0xc1, 0x58, 0x1f, 0xf5,
-        0x3a, 0x07, 0xfb, 0xa8, 0xed, 0xb3, 0x22, 0xc7, 0xb2, 0x90, 0x3d, 0x2b,
-        0x3f, 0xf3, 0x0f, 0xa8, 0x67, 0xf0, 0xf3, 0x8a, 0x7f, 0x4a, 0x91, 0x5e,
-        0xcb, 0x65, 0xcb, 0xb9, 0xff, 0xbc, 0xf5, 0x95, 0xa3, 0x3b, 0xd2, 0x57,
-        0x52, 0x89, 0x8a, 0xbe, 0xe2, 0xbe, 0x77, 0x39, 0x07, 0xa6, 0x5f, 0xf6,
-        0x7b, 0x00, 0x0c, 0xda, 0xa1, 0x8b, 0x25, 0x00, 0x4b, 0x63, 0xc6, 0x0e,
-        0x45, 0xfd, 0x53, 0xb4, 0x50, 0x1c, 0x32, 0x92, 0x59, 0xe8, 0xcc, 0xfc,
-        0x99, 0x8f, 0xee, 0x91, 0x3e, 0x1a, 0x7d, 0x0d, 0xf8, 0xca, 0x6e, 0x1e,
-        0xff, 0x7a, 0xbf, 0xcc, 0xcb, 0x76, 0x9f, 0xef, 0xe2, 0xf3, 0x7b, 0x42,
-        0xd5, 0xe7, 0x77, 0xf1, 0xf9, 0xde, 0x04, 0xf6, 0xd0, 0x58, 0x82, 0x5f,
-        0xd2, 0xa1, 0x34, 0xef, 0xcd, 0x42, 0x91, 0x65, 0xeb, 0xcb, 0xcc, 0x47,
-        0x57, 0xf4, 0xb8, 0x3e, 0xd4, 0xec, 0x88, 0x3d, 0x31, 0x78, 0xcc, 0xb9,
-        0xcc, 0x04, 0x8f, 0x1b, 0x24, 0xff, 0xcb, 0x6c, 0x8b, 0xae, 0x68, 0x5c,
-        0xd5, 0xf9, 0xf6, 0xdf, 0xe8, 0x93, 0x39, 0x55, 0xdf, 0xdd, 0x23, 0xe1,
-        0xe7, 0x08, 0x9e, 0x72, 0x9e, 0xe1, 0xf2, 0xbc, 0xc0, 0x43, 0x7b, 0xda,
-        0x2a, 0x3f, 0xbf, 0x13, 0x78, 0xd5, 0x8a, 0xbc, 0xd9, 0xc0, 0x12, 0xf3,
-        0xc5, 0x19, 0xc7, 0x4c, 0x97, 0x73, 0xd5, 0x1e, 0x1f, 0x90, 0xd7, 0xbf,
-        0xd9, 0x27, 0xfb, 0x83, 0x7e, 0x6b, 0x40, 0xf7, 0x48, 0x94, 0x32, 0x07,
-        0xf9, 0xcb, 0x3e, 0x01, 0x1b, 0xff, 0x32, 0xf8, 0xa5, 0xc1, 0xdf, 0x79,
-        0x3d, 0x09, 0xcc, 0xf1, 0x4a, 0x9f, 0xee, 0x17, 0x23, 0xd7, 0x15, 0xe7,
-        0xf9, 0x46, 0x78, 0x5d, 0xfa, 0xfc, 0x0c, 0x1f, 0x7b, 0xed, 0x2f, 0xee,
-        0xd5, 0x96, 0x90, 0xfd, 0xc5, 0xda, 0x12, 0xc9, 0x09, 0xb9, 0xcf, 0x15,
-        0x9f, 0x6e, 0xa8, 0xec, 0xd3, 0x3d, 0x9f, 0xb9, 0xd5, 0x07, 0xff, 0x86,
-        0xb1, 0xc4, 0xfb, 0x1d, 0x7c, 0x9e, 0xc7, 0xa2, 0x56, 0x21, 0xcd, 0x9f,
-        0x1d, 0x2a, 0xaf, 0xa7, 0x1e, 0x57, 0x64, 0x9e, 0x84, 0x96, 0x5b, 0xb8,
-        0xf6, 0x43, 0xbe, 0x87, 0x94, 0x5d, 0x8d, 0x9f, 0x43, 0x75, 0x79, 0x30,
-        0xf5, 0x38, 0xb6, 0x99, 0x1f, 0x56, 0xc4, 0x13, 0x3d, 0xf0, 0x6c, 0xb3,
-        0x7e, 0x06, 0xd7, 0x84, 0x1f, 0x2d, 0x56, 0x47, 0xaf, 0xa0, 0xe3, 0x00,
-        0xfd, 0xce, 0x62, 0x8a, 0x76, 0xf1, 0x5e, 0xfd, 0xa6, 0xf1, 0x00, 0xe2,
-        0xed, 0x24, 0x73, 0x9e, 0x18, 0xc6, 0x19, 0x67, 0xe2, 0x94, 0x11, 0x01,
-        0xbf, 0x2c, 0x05, 0x9c, 0x0e, 0x6a, 0x66, 0x5a, 0xfd, 0x65, 0x1a, 0x65,
-        0xfb, 0x0f, 0x34, 0xeb, 0x84, 0xe2, 0x04, 0x7a, 0xb3, 0xcd, 0x43, 0xac,
-        0x13, 0xc7, 0x8a, 0xc0, 0x67, 0x83, 0x3e, 0x9f, 0x23, 0xfa, 0x5c, 0x6e,
-        0xd4, 0xfc, 0x26, 0x39, 0x56, 0xe5, 0x77, 0xdb, 0x8c, 0xf2, 0x3c, 0xe2,
-        0xc5, 0x2f, 0xd3, 0xfb, 0xa2, 0xcf, 0x09, 0xe0, 0xa8, 0xf7, 0xfd, 0x4b,
-        0x74, 0x32, 0x81, 0x79, 0x6f, 0x9f, 0x3e, 0x8f, 0xef, 0x88, 0x3e, 0xdb,
-        0x3c, 0xe8, 0xf3, 0xc5, 0x7e, 0x89, 0x37, 0x25, 0xc6, 0xd1, 0x36, 0x9a,
-        0xcb, 0x22, 0x07, 0xec, 0xd3, 0xe8, 0x3b, 0x95, 0x4d, 0x32, 0x5f, 0x4a,
-        0x56, 0xf8, 0xd2, 0x85, 0x28, 0x1b, 0xc3, 0x4c, 0xe3, 0xe8, 0xcb, 0xa6,
-        0xf2, 0x7e, 0xb0, 0x8e, 0x01, 0x1a, 0x5d, 0x6e, 0xe7, 0x6b, 0x69, 0x3d,
-        0x3a, 0x15, 0x51, 0xb5, 0xfe, 0xb6, 0x15, 0x63, 0xfe, 0x78, 0x9e, 0x69,
-        0x39, 0x9d, 0xbd, 0x97, 0x0a, 0xc1, 0x21, 0x1a, 0x59, 0xd6, 0xfd, 0x4d,
-        0x44, 0xce, 0xc6, 0xa0, 0xe4, 0x49, 0x7a, 0xdd, 0x9f, 0x10, 0xbe, 0x0b,
-        0xeb, 0xd2, 0xc7, 0xb5, 0xee, 0xf6, 0x2d, 0xf8, 0xd2, 0x25, 0x45, 0xb3,
-        0xa5, 0xcb, 0xd1, 0x30, 0xa5, 0xa2, 0x53, 0xaf, 0xf4, 0x03, 0xff, 0x47,
-        0x2e, 0xc1, 0x0f, 0x07, 0x1e, 0x6d, 0x51, 0x22, 0x53, 0x0b, 0x8b, 0x21,
-        0x5e, 0x37, 0x7e, 0x2f, 0x7d, 0x30, 0x17, 0x7e, 0x40, 0xc8, 0xfe, 0xd1,
-        0x4b, 0x3c, 0x4e, 0xca, 0x26, 0xc5, 0x37, 0xbc, 0xf0, 0x50, 0xf7, 0xc5,
-        0xd4, 0xb8, 0x28, 0x73, 0x3d, 0x59, 0x7f, 0x33, 0x13, 0xfe, 0x5a, 0x9c,
-        0xbc, 0xe6, 0x3b, 0xba, 0x68, 0xd1, 0xb1, 0x8c, 0xfd, 0xf5, 0x14, 0x4d,
-        0x31, 0x5d, 0xbb, 0xe5, 0x05, 0x8f, 0x27, 0xe0, 0xd9, 0x34, 0xd3, 0x3e,
-        0xdb, 0xcd, 0x59, 0x4b, 0xe6, 0xdd, 0x89, 0xde, 0x73, 0x38, 0x46, 0xdd,
-        0xf1, 0x5f, 0xf5, 0x6b, 0x79, 0x90, 0xcc, 0xa2, 0x8e, 0x90, 0x3f, 0xf3,
-        0x3c, 0x1e, 0xb9, 0xff, 0x39, 0xdc, 0x07, 0xf2, 0x0e, 0x73, 0xe7, 0xe3,
-        0x55, 0xb9, 0xaf, 0x23, 0x7c, 0x6f, 0xd4, 0xdd, 0x1f, 0x2b, 0x4e, 0xf2,
-        0xfe, 0x76, 0x09, 0xde, 0x2c, 0xf7, 0x73, 0x9a, 0xce, 0x79, 0xf2, 0x15,
-        0xb9, 0x2f, 0x49, 0x17, 0x7d, 0x27, 0x05, 0x7d, 0x4f, 0x8b, 0xfd, 0x48,
-        0xe6, 0x0c, 0xd6, 0xd7, 0xb4, 0xef, 0x81, 0xed, 0xec, 0x5c, 0x40, 0xe7,
-        0x06, 0xf2, 0xf7, 0x0f, 0xfb, 0x45, 0x5e, 0x22, 0xec, 0xef, 0x1c, 0x3e,
-        0xa7, 0xe9, 0x79, 0x96, 0xeb, 0x2f, 0x64, 0x5a, 0xe8, 0x6a, 0xb6, 0x85,
-        0xde, 0xc9, 0x0e, 0xd1, 0x95, 0xc5, 0x6e, 0x3a, 0xc7, 0x3a, 0xf3, 0x39,
-        0x27, 0x60, 0xa5, 0xa9, 0x1b, 0xf1, 0x45, 0xe4, 0x0c, 0x31, 0xdd, 0x61,
-        0x3c, 0xf4, 0xbf, 0xe8, 0x5e, 0xc6, 0x39, 0xd6, 0xbd, 0x5b, 0xe9, 0x3d,
-        0x7e, 0x66, 0x3a, 0xa3, 0x73, 0x1d, 0xe0, 0x93, 0x1f, 0x2b, 0xeb, 0xaf,
-        0x5b, 0xe3, 0x88, 0xb9, 0x05, 0x8e, 0x4c, 0x8b, 0xf8, 0xd6, 0xc2, 0x22,
-        0xff, 0xbe, 0x08, 0xff, 0x39, 0xc3, 0x9b, 0xf9, 0xf3, 0x93, 0x01, 0x8c,
-        0xc7, 0x39, 0x47, 0xe6, 0x4a, 0x8a, 0xb5, 0x85, 0xf8, 0xd8, 0x27, 0x6a,
-        0xa4, 0x25, 0x1c, 0x5a, 0x79, 0x7d, 0x3e, 0x31, 0x3e, 0xb9, 0xda, 0x4a,
-        0xf3, 0x39, 0xd6, 0x41, 0x72, 0x7e, 0xb6, 0x61, 0x30, 0xf6, 0xef, 0x54,
-        0x6f, 0x61, 0xdc, 0xbf, 0x8b, 0xd2, 0x62, 0x1c, 0x7f, 0xae, 0x76, 0xd1,
-        0x42, 0xae, 0x43, 0x1d, 0xdf, 0x2b, 0x72, 0xdc, 0x65, 0x1f, 0x23, 0xfc,
-        0xb6, 0x19, 0x7f, 0x7b, 0x97, 0x71, 0x0a, 0x32, 0x55, 0xda, 0xa5, 0xe0,
-        0x35, 0x97, 0xeb, 0x7a, 0x22, 0x03, 0xe7, 0xa6, 0xe8, 0x25, 0x96, 0xb7,
-        0x23, 0x2f, 0xc3, 0x7f, 0xfc, 0x38, 0xf0, 0x26, 0x9f, 0xa2, 0x41, 0x3e,
-        0x46, 0x5f, 0x24, 0xbf, 0xa8, 0x73, 0x8a, 0x05, 0x27, 0x44, 0x6d, 0x88,
-        0xa4, 0xd1, 0x59, 0xd1, 0x8b, 0xee, 0x2d, 0xc1, 0x9b, 0xec, 0x94, 0x65,
-        0x40, 0x1f, 0x81, 0x0f, 0x46, 0xe6, 0x60, 0x1d, 0x77, 0x7a, 0xde, 0xed,
-        0x9b, 0x19, 0xa7, 0x48, 0x3f, 0xf0, 0x5e, 0xd2, 0xac, 0xea, 0x2f, 0x20,
-        0xf8, 0xbd, 0xb9, 0x4f, 0xd7, 0x4b, 0xea, 0x63, 0x2d, 0x2b, 0xf4, 0x71,
-        0x47, 0xcd, 0xef, 0x66, 0xcd, 0xef, 0xe5, 0x7c, 0x39, 0x96, 0x79, 0x2c,
-        0xe7, 0x49, 0xf6, 0x28, 0x4a, 0x2e, 0x4b, 0xfc, 0x33, 0xf7, 0x8d, 0x99,
-        0x8f, 0x2a, 0x1d, 0x3c, 0xb9, 0x36, 0x1a, 0xea, 0x31, 0x26, 0x8c, 0xe4,
-        0xe4, 0x3f, 0x96, 0x22, 0x09, 0xe8, 0x45, 0x4f, 0xee, 0x51, 0xf9, 0xa7,
-        0x3c, 0xaf, 0x54, 0x18, 0xaa, 0xdb, 0xec, 0x5a, 0x07, 0xad, 0x8b, 0x9e,
-        0x5c, 0x42, 0xc7, 0xe0, 0xeb, 0x71, 0x9f, 0x94, 0xd9, 0x44, 0xe8, 0x73,
-        0x0e, 0x1a, 0xdf, 0x1f, 0xba, 0xc4, 0xfb, 0x19, 0x5f, 0xfb, 0x69, 0xe9,
-        0xa4, 0xe8, 0x71, 0x83, 0xb1, 0x5d, 0x34, 0x27, 0x74, 0x7e, 0xd6, 0x5f,
-        0xaa, 0xec, 0xaa, 0x29, 0xcc, 0x33, 0x85, 0xd8, 0x8a, 0xe1, 0xfc, 0xbe,
-        0x2f, 0x99, 0x97, 0xb1, 0xf2, 0x78, 0x4d, 0xac, 0x7c, 0x56, 0xc4, 0xca,
-        0x11, 0x27, 0x07, 0x5c, 0x01, 0x4b, 0xaf, 0x9c, 0x16, 0xec, 0x63, 0x98,
-        0x90, 0x1b, 0x7e, 0xee, 0xa2, 0xe0, 0x37, 0xe1, 0x98, 0x5f, 0xe6, 0x57,
-        0xc7, 0x79, 0xc6, 0x06, 0x5d, 0x60, 0x7c, 0xb0, 0x27, 0x36, 0x58, 0x97,
-        0x58, 0xc9, 0x7e, 0x99, 0xae, 0xe4, 0x9b, 0x58, 0xd7, 0x5b, 0xa0, 0x8d,
-        0x3c, 0xb1, 0x4e, 0xd8, 0x4d, 0x0b, 0x61, 0xc6, 0xb1, 0x89, 0x36, 0xde,
-        0x4f, 0xd6, 0x6b, 0x27, 0x98, 0xee, 0x78, 0xee, 0x2b, 0xb9, 0xd2, 0x8f,
-        0xd2, 0xe1, 0x88, 0x15, 0x9d, 0xea, 0x60, 0xbb, 0xc5, 0xe4, 0x7f, 0x87,
-        0xff, 0x77, 0x85, 0x00, 0x93, 0xc2, 0x2a, 0x7e, 0x67, 0x9d, 0x27, 0x53,
-        0xfa, 0xd1, 0x1c, 0x8f, 0x99, 0x9b, 0x82, 0xfd, 0x03, 0x3b, 0xcf, 0xe1,
-        0x7f, 0x39, 0x66, 0x65, 0x95, 0xf1, 0xfb, 0x62, 0x2a, 0x64, 0x08, 0xde,
-        0xbe, 0xce, 0x3c, 0xfe, 0x02, 0xcd, 0xf1, 0x1c, 0xae, 0x10, 0xae, 0xb5,
-        0x28, 0x19, 0xde, 0xc7, 0x78, 0xdf, 0xcd, 0x9f, 0xa8, 0xbf, 0x6a, 0xa7,
-        0x85, 0xc9, 0x31, 0x55, 0x7f, 0xf5, 0xbd, 0x06, 0xf5, 0x57, 0xb8, 0x8e,
-        0xe5, 0xfe, 0x62, 0xe9, 0xe6, 0x5c, 0xd8, 0xfd, 0x3c, 0x32, 0x92, 0xe1,
-        0x4e, 0xa1, 0x23, 0xad, 0xac, 0xfa, 0xf8, 0xd9, 0x11, 0x2b, 0x39, 0xc5,
-        0x73, 0xcc, 0xb9, 0xe7, 0x5d, 0xba, 0x19, 0x0b, 0x63, 0x9c, 0xbf, 0x66,
-        0x1c, 0xdb, 0xca, 0x53, 0x72, 0x3d, 0x85, 0x5c, 0xe9, 0xe7, 0xd1, 0xb0,
-        0x5e, 0x9f, 0xfb, 0x5a, 0xac, 0x03, 0xf4, 0xc4, 0x9f, 0x2b, 0x5d, 0xbe,
-        0x2b, 0x59, 0xd8, 0xdf, 0x06, 0xe3, 0x39, 0x66, 0x34, 0x44, 0xa9, 0x15,
-        0xa6, 0xef, 0x8b, 0x1d, 0xbe, 0x8d, 0xec, 0x95, 0x52, 0xb2, 0x2a, 0x97,
-        0xa5, 0xda, 0xef, 0x2e, 0x6d, 0xae, 0x21, 0x72, 0x96, 0x20, 0x33, 0x21,
-        0x2f, 0x53, 0x25, 0xbf, 0x03, 0xfd, 0x0e, 0xb6, 0xd0, 0x59, 0xe6, 0x57,
-        0x32, 0x1f, 0x89, 0x79, 0x27, 0xf3, 0x2c, 0x49, 0x2f, 0xf1, 0xaa, 0xd7,
-        0x0d, 0x48, 0x9c, 0x1d, 0xa9, 0xe4, 0x41, 0xba, 0xe2, 0xe9, 0x01, 0x57,
-        0x3c, 0xdd, 0x74, 0xe5, 0x41, 0x06, 0x85, 0x3e, 0x56, 0xd1, 0xa1, 0x82,
-        0x4a, 0x87, 0x82, 0xae, 0x25, 0x79, 0x59, 0xa1, 0xcc, 0xcb, 0x76, 0x6f,
-        0xc1, 0xcb, 0xbc, 0x6c, 0xd3, 0x75, 0xc5, 0x37, 0xec, 0x30, 0xe4, 0xfc,
-        0xe5, 0xe2, 0x34, 0xbd, 0xcd, 0x3c, 0xe2, 0xad, 0x62, 0x98, 0xf9, 0xc6,
-        0x24, 0xf3, 0x8d, 0x09, 0xe6, 0x1b, 0x0e, 0xc3, 0xc0, 0xe2, 0xb5, 0x5f,
-        0xf3, 0x5d, 0x59, 0x84, 0xbc, 0x98, 0xa2, 0xe7, 0x8b, 0xe0, 0xc1, 0x93,
-        0xac, 0xf3, 0x5c, 0xf3, 0x6d, 0x2c, 0x76, 0x31, 0xbe, 0x4a, 0x3d, 0xa7,
-        0xda, 0x8e, 0x41, 0xaf, 0x15, 0xf8, 0x87, 0xaf, 0x82, 0xcf, 0xbc, 0x91,
-        0xa2, 0x4e, 0x86, 0x3d, 0xe0, 0xbc, 0x8e, 0xde, 0x14, 0xaf, 0x81, 0x96,
-        0xd1, 0x13, 0xf8, 0xbb, 0xe3, 0x53, 0x3c, 0xf7, 0x4e, 0xdf, 0x02, 0xef,
-        0xcb, 0xd3, 0xe1, 0x94, 0xd9, 0xcb, 0x38, 0x7f, 0xac, 0x82, 0xf3, 0xa9,
-        0x34, 0xaf, 0xa0, 0x67, 0xb9, 0x9b, 0xc6, 0x0e, 0x44, 0xf7, 0xf6, 0x30,
-        0x9d, 0x22, 0x37, 0xa2, 0xd2, 0xa7, 0xc7, 0x4f, 0x27, 0x83, 0x6d, 0xaa,
-        0xbf, 0x8f, 0xc5, 0xf2, 0xf1, 0x03, 0xbe, 0xcf, 0x2d, 0x5f, 0x3a, 0xfb,
-        0x2a, 0x3f, 0x03, 0xc7, 0x5f, 0x85, 0xff, 0x93, 0xed, 0x83, 0x56, 0xe1,
-        0x3f, 0x2a, 0x88, 0xb1, 0x38, 0xb6, 0x27, 0x98, 0x97, 0x85, 0xd7, 0x0d,
-        0x7b, 0x3a, 0x62, 0x30, 0xd1, 0x75, 0x99, 0xbc, 0xde, 0xd2, 0xa0, 0x8c,
-        0xc1, 0xed, 0xdd, 0x2b, 0xf9, 0x06, 0xe3, 0x66, 0x30, 0x22, 0x6c, 0xb4,
-        0xa6, 0x25, 0x29, 0x27, 0x0b, 0xbc, 0xcf, 0x2b, 0xe1, 0x09, 0xde, 0xe7,
-        0x0e, 0x25, 0x23, 0x53, 0xfc, 0xbb, 0x90, 0xbf, 0x2c, 0x2b, 0x87, 0xd0,
-        0xb3, 0xda, 0x14, 0xfd, 0x20, 0x66, 0xd1, 0x6f, 0xa7, 0x83, 0xef, 0x6b,
-        0x33, 0xd6, 0x82, 0x4f, 0x7c, 0xe0, 0x4b, 0x66, 0xf1, 0x5c, 0xe0, 0x21,
-        0x7f, 0xcf, 0x4f, 0xd1, 0x85, 0x8c, 0x9e, 0xc3, 0x80, 0x61, 0xbc, 0x84,
-        0x79, 0xf8, 0x68, 0xb7, 0xf3, 0x43, 0x86, 0x17, 0x1f, 0xff, 0x71, 0xed,
-        0x9c, 0x86, 0xd5, 0x9c, 0xd0, 0xd3, 0xb2, 0x05, 0x3d, 0x7c, 0x08, 0xbd,
-        0x8f, 0x0a, 0xa2, 0xe7, 0x64, 0xb3, 0xb0, 0x4d, 0x0b, 0xc2, 0xc6, 0x28,
-        0x85, 0x2a, 0x7d, 0x30, 0xef, 0xa9, 0x39, 0xf7, 0x13, 0x5f, 0x7a, 0xf1,
-        0xa0, 0xd0, 0xc5, 0x46, 0x0e, 0xec, 0x55, 0xf5, 0xa7, 0x5d, 0xe2, 0xbe,
-        0xc6, 0x32, 0x7e, 0x7b, 0x50, 0xfd, 0xf6, 0x49, 0xa1, 0x03, 0x23, 0x2f,
-        0x2e, 0xb0, 0x24, 0xf0, 0x9c, 0xf7, 0xd7, 0x99, 0x60, 0x3c, 0x0f, 0xad,
-        0xc0, 0x77, 0x2f, 0xe0, 0xa9, 0xe1, 0x01, 0x58, 0x00, 0xf7, 0x3b, 0x14,
-        0xde, 0xdb, 0x56, 0xdc, 0xaf, 0xd7, 0xdd, 0x08, 0xce, 0xac, 0xd3, 0x64,
-        0xb0, 0x56, 0xac, 0x69, 0x8f, 0x2f, 0x92, 0xb7, 0x8c, 0xf4, 0x22, 0x6c,
-        0x1a, 0xd4, 0xb5, 0xdc, 0x85, 0xbc, 0x29, 0x9e, 0xc3, 0x1e, 0x8a, 0x24,
-        0x30, 0x2f, 0x8c, 0xd3, 0x30, 0xf8, 0xb7, 0x1a, 0x58, 0xb8, 0xaf, 0xeb,
-        0x56, 0xd7, 0xb5, 0x8a, 0xbd, 0x20, 0x03, 0xcf, 0xd1, 0xcf, 0xc6, 0x73,
-        0xf1, 0x7c, 0x5c, 0x87, 0xfb, 0xc9, 0xfb, 0xf6, 0x31, 0x7f, 0x8e, 0x4e,
-        0xc9, 0x7b, 0x19, 0x97, 0xe4, 0x6f, 0x7d, 0x8e, 0xf7, 0x7c, 0xe5, 0xfe,
-        0xf9, 0x54, 0xbf, 0x1e, 0xec, 0x5f, 0x37, 0xe5, 0x85, 0x8f, 0x13, 0xbf,
-        0x75, 0x8a, 0xdf, 0xa2, 0x4e, 0xa7, 0xd8, 0xd7, 0xf3, 0x7c, 0x3c, 0x9f,
-        0xed, 0xf2, 0xc1, 0x36, 0x4f, 0x27, 0x3a, 0x7d, 0xf9, 0x3c, 0xd6, 0xdb,
-        0xe9, 0x8b, 0x33, 0xee, 0xc7, 0xb2, 0xf1, 0xd2, 0x82, 0xe0, 0x31, 0xac,
-        0xd3, 0xf6, 0xda, 0xe6, 0x49, 0xe3, 0x4f, 0x86, 0x64, 0x6f, 0x5b, 0x7c,
-        0x67, 0xfa, 0xcb, 0x30, 0xfd, 0x65, 0x98, 0xfe, 0x32, 0x4c, 0x7f, 0x19,
-        0xa6, 0x3f, 0xb6, 0x4b, 0xdf, 0x64, 0x99, 0xf1, 0x6d, 0x96, 0x19, 0x92,
-        0x66, 0x23, 0xca, 0x8f, 0xa9, 0x69, 0xb6, 0xb6, 0x3e, 0x53, 0xd3, 0x28,
-        0xe4, 0x34, 0xf9, 0x0e, 0x8f, 0x57, 0xd3, 0xea, 0x55, 0xa6, 0xd5, 0xa6,
-        0x99, 0x7e, 0xba, 0x91, 0xc3, 0x9e, 0xd9, 0xd6, 0x79, 0xe6, 0xd1, 0x71,
-        0x3f, 0x74, 0xaa, 0x00, 0xd3, 0x13, 0x74, 0x4a, 0x9b, 0xe1, 0xde, 0x4f,
-        0x37, 0x99, 0x4f, 0xdf, 0xc8, 0x81, 0x76, 0xef, 0x52, 0xc7, 0x19, 0xa6,
-        0x5d, 0xc8, 0xb9, 0x25, 0xdf, 0xd5, 0xac, 0xc1, 0xba, 0x57, 0xc0, 0x4c,
-        0x12, 0xf8, 0xa8, 0xd0, 0xc7, 0x78, 0xdf, 0xd7, 0x99, 0xdf, 0xc3, 0x57,
-        0x87, 0xbe, 0x5f, 0x79, 0x1f, 0xcb, 0x89, 0xd0, 0x15, 0xe6, 0xa3, 0xa7,
-        0x73, 0x4b, 0x4c, 0xef, 0xbd, 0xf4, 0x85, 0x1c, 0xe4, 0x31, 0x60, 0xc4,
-        0xc7, 0x79, 0x12, 0x3e, 0x30, 0x63, 0x06, 0x6b, 0x1f, 0x4b, 0x19, 0x02,
-        0x4f, 0x9e, 0x01, 0x1c, 0x18, 0xf6, 0x67, 0xf6, 0xa2, 0x67, 0x7d, 0xc4,
-        0x68, 0x56, 0x3e, 0x45, 0x7c, 0xc7, 0x78, 0x8c, 0x05, 0xdc, 0x70, 0xdc,
-        0x28, 0xfe, 0x88, 0xf7, 0x42, 0x84, 0x19, 0x1e, 0xb5, 0x7c, 0xeb, 0x02,
-        0x7a, 0x91, 0x02, 0x5e, 0xd3, 0x51, 0x3f, 0x6a, 0xc5, 0xe9, 0x39, 0xbc,
-        0xff, 0xe0, 0x85, 0x22, 0xe6, 0xbd, 0x48, 0x0b, 0x41, 0xf0, 0x21, 0x3b,
-        0x7c, 0x9d, 0x24, 0xec, 0x5a, 0x59, 0xbf, 0xfc, 0xbc, 0x37, 0x6f, 0xb3,
-        0xa2, 0x42, 0x1f, 0x6e, 0x61, 0xfb, 0x06, 0xb0, 0x79, 0x8b, 0x71, 0x2d,
-        0x0c, 0x9b, 0x5f, 0xf1, 0xb5, 0x37, 0x99, 0xe7, 0x60, 0xcf, 0x3a, 0x85,
-        0x8c, 0xf1, 0xe2, 0x65, 0x1b, 0x8a, 0x97, 0x39, 0x2e, 0x5e, 0x96, 0x2e,
-        0xf3, 0x32, 0xc6, 0x09, 0xc1, 0xc3, 0xc0, 0xa3, 0x66, 0x59, 0x4f, 0x94,
-        0xdf, 0xa1, 0xff, 0xed, 0x16, 0x3c, 0x8b, 0x79, 0x3d, 0xdb, 0x0d, 0x85,
-        0x62, 0xca, 0x77, 0x48, 0xf0, 0x0e, 0x8d, 0xd7, 0xff, 0xa3, 0xe8, 0xa1,
-        0x55, 0xf0, 0x81, 0xf4, 0x2c, 0xf8, 0x95, 0xd7, 0xf8, 0xff, 0x02, 0x6c,
-        0x79, 0xbc, 0x13, 0x7a, 0x8d, 0xf9, 0x58, 0x21, 0x0c, 0x9b, 0xb5, 0x43,
-        0xd9, 0x36, 0xe8, 0xbb, 0xb5, 0x07, 0xb9, 0x96, 0x56, 0xb4, 0xcc, 0xc7,
-        0x76, 0x2b, 0xbf, 0x05, 0xfc, 0x8c, 0xd8, 0xeb, 0x3a, 0x5d, 0xc0, 0x82,
-        0x2e, 0xc0, 0x63, 0x03, 0x0c, 0x1f, 0xd1, 0x1b, 0x9c, 0xe8, 0x16, 0xc3,
-        0x01, 0xfb, 0x7c, 0x0b, 0xfb, 0xcc, 0xba, 0x2c, 0x05, 0xe6, 0xa6, 0x02,
-        0x03, 0x98, 0xdf, 0xc2, 0x6a, 0x85, 0x1f, 0x9e, 0xcf, 0x0c, 0x18, 0x85,
-        0xac, 0x9c, 0xe3, 0xca, 0xb8, 0xe4, 0x79, 0x85, 0x3c, 0x7a, 0x7b, 0x89,
-        0xb9, 0xf2, 0x1c, 0xf5, 0xfa, 0x04, 0xff, 0x52, 0x74, 0xbf, 0x1d, 0x5a,
-        0x4b, 0x30, 0x5d, 0x61, 0x4f, 0x52, 0x2e, 0x9c, 0x79, 0x94, 0x9f, 0x8f,
-        0x73, 0x8d, 0xd7, 0x71, 0xb3, 0xbc, 0x8e, 0x08, 0xaf, 0x03, 0x63, 0x6f,
-        0xf9, 0x6e, 0xa8, 0x75, 0xdc, 0x28, 0xaf, 0x63, 0x56, 0xad, 0x83, 0xd2,
-        0xc6, 0xcc, 0x6e, 0xa5, 0xc7, 0x6f, 0x79, 0xcf, 0xd6, 0x28, 0xeb, 0x27,
-        0xe9, 0x55, 0xc0, 0xf3, 0x1e, 0x85, 0x2f, 0x6e, 0x7f, 0xa8, 0x7b, 0x6e,
-        0xf6, 0xc4, 0x75, 0xfa, 0x5d, 0xba, 0x29, 0xf4, 0x93, 0x61, 0xd6, 0x4f,
-        0x70, 0x9e, 0x16, 0xc0, 0x87, 0xd3, 0x41, 0xf4, 0x9b, 0x1d, 0x64, 0x98,
-        0xb1, 0x5d, 0x35, 0xc5, 0x9f, 0xc2, 0x4f, 0x86, 0xfb, 0xe8, 0xeb, 0xbf,
-        0x48, 0x37, 0x17, 0xc1, 0xab, 0xa1, 0x8f, 0xca, 0x9e, 0xb4, 0x37, 0xd7,
-        0xa4, 0x9f, 0x36, 0xee, 0xe9, 0xa7, 0x85, 0x8f, 0x36, 0x0c, 0x7d, 0xdd,
-        0x84, 0x3f, 0x37, 0x26, 0xde, 0x67, 0xc1, 0xc7, 0x45, 0xdc, 0xcb, 0x8b,
-        0xef, 0x4c, 0xbb, 0x72, 0xdc, 0x90, 0x73, 0x92, 0x62, 0x3e, 0xe2, 0x98,
-        0x4d, 0x86, 0xac, 0x9d, 0xb9, 0x5c, 0xd4, 0x3a, 0x51, 0x9c, 0xf7, 0xc8,
-        0x09, 0x1b, 0x46, 0x44, 0xf8, 0x0c, 0x5a, 0x9d, 0x0e, 0x6a, 0x61, 0x39,
-        0x79, 0x8a, 0xd0, 0x13, 0xcd, 0xb6, 0xe0, 0xcb, 0xbf, 0xc0, 0xb8, 0xb7,
-        0x10, 0xb6, 0x43, 0x9f, 0x13, 0xf6, 0x25, 0xe4, 0x07, 0xde, 0xa7, 0x02,
-        0x18, 0x63, 0x0e, 0xfc, 0x7d, 0x15, 0xfd, 0x30, 0xc3, 0xbc, 0x7e, 0xf8,
-        0x81, 0x47, 0xad, 0x77, 0x58, 0xee, 0x5c, 0x10, 0xfe, 0x95, 0xb3, 0x94,
-        0x66, 0x3a, 0x3c, 0x2c, 0xe8, 0xd0, 0x18, 0x66, 0x6a, 0x61, 0xfa, 0x41,
-        0x8e, 0xc1, 0x98, 0xe8, 0xbf, 0x23, 0x6d, 0x16, 0x5e, 0xe5, 0x9a, 0xea,
-        0x6b, 0x90, 0x00, 0x6f, 0xd8, 0xbe, 0x6f, 0x21, 0xf1, 0x91, 0x7d, 0x2a,
-        0x6e, 0x5d, 0xab, 0xd6, 0x87, 0x0d, 0xfb, 0xcc, 0x12, 0x7d, 0x1f, 0x01,
-        0x3b, 0xe1, 0x17, 0x34, 0x26, 0x19, 0x6e, 0xfa, 0xdd, 0x35, 0x6e, 0xfb,
-        0xff, 0x29, 0x51, 0x9f, 0xff, 0x46, 0x51, 0xca, 0xd8, 0x34, 0xdb, 0xe6,
-        0x0b, 0x07, 0xdc, 0x3a, 0x87, 0x9d, 0x8d, 0x09, 0x9f, 0xcc, 0x00, 0x45,
-        0x97, 0x27, 0xe9, 0xb1, 0x0c, 0x78, 0x14, 0x5d, 0x8f, 0x3a, 0x78, 0xc3,
-        0x06, 0x68, 0x79, 0x92, 0xe2, 0x45, 0xc0, 0xc8, 0x47, 0x0b, 0x2c, 0x05,
-        0xd2, 0x59, 0xc4, 0xee, 0xf9, 0x7b, 0x1e, 0xef, 0x57, 0xf9, 0x15, 0xe5,
-        0xf7, 0x1e, 0xa2, 0xd8, 0x32, 0xa5, 0x92, 0xe1, 0x87, 0x45, 0xcf, 0xea,
-        0x64, 0x78, 0x5c, 0xf9, 0x68, 0x42, 0x7c, 0x1e, 0x7e, 0x2f, 0x8b, 0x1e,
-        0xcd, 0xd8, 0xa9, 0x24, 0x49, 0xdf, 0x03, 0xf1, 0x1c, 0x0c, 0x96, 0xad,
-        0xbb, 0x99, 0x57, 0x1c, 0x17, 0xfe, 0x07, 0xd6, 0x44, 0x16, 0x31, 0x1e,
-        0xbe, 0x83, 0x5e, 0x82, 0xbd, 0x95, 0xcc, 0x3e, 0xa0, 0xc6, 0x96, 0xc8,
-        0x64, 0x5c, 0x30, 0x7f, 0xc9, 0x49, 0x85, 0x8d, 0xca, 0xf5, 0xf0, 0x5d,
-        0x1c, 0x17, 0xfa, 0xe1, 0x30, 0xdb, 0x30, 0x62, 0x5c, 0x69, 0x4e, 0xf8,
-        0x21, 0xf8, 0x38, 0xff, 0xd3, 0x01, 0xfd, 0x6e, 0x03, 0x9c, 0x97, 0xfe,
-        0x09, 0xbe, 0x67, 0x9e, 0xe7, 0x51, 0x95, 0x17, 0x3f, 0x44, 0x91, 0x1d,
-        0xf8, 0x8b, 0x66, 0xef, 0xa8, 0xbf, 0x88, 0x61, 0xcd, 0xb2, 0xe5, 0x32,
-        0xd3, 0xc6, 0xdb, 0x5b, 0xda, 0x71, 0xef, 0x6b, 0x19, 0xcd, 0xb0, 0x32,
-        0xc5, 0xfb, 0x2f, 0xd0, 0xeb, 0x73, 0xa1, 0xf8, 0x29, 0xbc, 0x47, 0xc6,
-        0x97, 0x10, 0x3a, 0x6f, 0x88, 0x75, 0x17, 0xe8, 0x30, 0xa3, 0x22, 0xbe,
-        0x15, 0x79, 0xc2, 0x32, 0x16, 0xd6, 0xfa, 0xc9, 0x0f, 0xbf, 0x9a, 0xa3,
-        0x73, 0x22, 0x5a, 0x45, 0xfe, 0xba, 0x8c, 0x2b, 0x42, 0xfe, 0x82, 0x07,
-        0xfe, 0xc4, 0x97, 0x5c, 0xf3, 0xf7, 0xe9, 0x7c, 0xb7, 0x48, 0xb0, 0x9c,
-        0x4f, 0xa3, 0x78, 0x8a, 0xc6, 0x3d, 0x1d, 0xb3, 0x70, 0xbf, 0xd7, 0x0a,
-        0xb4, 0xeb, 0xd6, 0x19, 0xe0, 0x67, 0x12, 0x7b, 0x74, 0x01, 0x71, 0x5c,
-        0xa3, 0x2a, 0x1e, 0xd1, 0xc2, 0xfb, 0x04, 0x3b, 0x0f, 0xfe, 0xbb, 0xcf,
-        0xf2, 0x27, 0xe2, 0x0a, 0x27, 0x07, 0xa1, 0x27, 0xf5, 0x38, 0x8c, 0x33,
-        0x53, 0x38, 0xee, 0x67, 0xbb, 0x4b, 0xeb, 0xb5, 0xd2, 0xa7, 0xc4, 0xb6,
-        0x98, 0xda, 0x2f, 0xf8, 0x93, 0x46, 0x54, 0xbf, 0x01, 0x9b, 0xac, 0x5e,
-        0xc0, 0xe9, 0xe3, 0xa2, 0xc7, 0xad, 0x62, 0x10, 0xdb, 0xc9, 0x59, 0xc2,
-        0x3b, 0xb7, 0xd0, 0x77, 0xf3, 0x6e, 0xc0, 0x9e, 0xf7, 0xc8, 0x1d, 0xa3,
-        0xf8, 0x94, 0x7a, 0xff, 0xcf, 0x9d, 0xda, 0xb7, 0x5d, 0x1e, 0xfb, 0xf6,
-        0xbd, 0x41, 0x19, 0x03, 0xbb, 0x4b, 0x8d, 0xf1, 0xca, 0x53, 0xfd, 0xfb,
-        0xa7, 0xe1, 0x4f, 0xaa, 0xd4, 0x51, 0x5c, 0x13, 0x7c, 0xa5, 0xde, 0xa7,
-        0x1d, 0x62, 0x7e, 0x2a, 0xe9, 0xf8, 0xb8, 0x07, 0x1d, 0xf7, 0xce, 0x40,
-        0x2f, 0xb9, 0x7d, 0x3a, 0x3e, 0xd6, 0x90, 0x8e, 0xff, 0x75, 0x50, 0xfa,
-        0x54, 0xeb, 0xe9, 0x18, 0xb5, 0x3c, 0xc7, 0x8b, 0x8d, 0xfc, 0x57, 0xd8,
-        0x07, 0xd4, 0xa4, 0xc3, 0xe7, 0x01, 0x58, 0x69, 0xbf, 0x07, 0xe2, 0x7e,
-        0xc0, 0x47, 0xc4, 0x4e, 0xfe, 0x90, 0xe2, 0x8b, 0xb5, 0xb1, 0xd0, 0xcd,
-        0xae, 0xf9, 0x96, 0xc7, 0x35, 0xd0, 0xc5, 0x41, 0x0b, 0x76, 0x48, 0xda,
-        0xf4, 0x1a, 0x5e, 0xef, 0xf9, 0x0e, 0xe5, 0xec, 0x54, 0x9e, 0xe0, 0xa3,
-        0x0e, 0xd2, 0x53, 0x88, 0x2b, 0x2b, 0x1f, 0xf0, 0xd1, 0x8c, 0x5c, 0xb7,
-        0x79, 0x40, 0xe0, 0x03, 0xf4, 0xd5, 0x50, 0xc2, 0x9f, 0xe0, 0x3d, 0x95,
-        0xfe, 0xdf, 0xe4, 0x6a, 0x48, 0xed, 0x13, 0x8f, 0xc5, 0xfd, 0x3c, 0xeb,
-        0xfc, 0xb0, 0x3f, 0xf6, 0xd7, 0xd7, 0xcb, 0x79, 0xc5, 0x90, 0x05, 0x25,
-        0xfa, 0x0f, 0x96, 0x73, 0xfe, 0x03, 0xa6, 0xe8, 0xb9, 0x70, 0xb9, 0x78,
-        0x80, 0xf5, 0x47, 0xec, 0x21, 0x7c, 0x87, 0xda, 0xb7, 0xfb, 0xf6, 0x30,
-        0x75, 0xed, 0x67, 0xa9, 0x6f, 0x90, 0xc3, 0x7a, 0xa3, 0x71, 0x00, 0xf9,
-        0xe1, 0x16, 0x5f, 0x83, 0x5e, 0x51, 0x63, 0x56, 0x9c, 0x3a, 0xe0, 0x4f,
-        0x40, 0x0f, 0x68, 0x2b, 0x5d, 0x45, 0x53, 0xb3, 0x82, 0xa6, 0xe2, 0x6b,
-        0xb3, 0x8a, 0xa6, 0x66, 0x95, 0xff, 0x7c, 0x56, 0xd1, 0xd4, 0xac, 0xa2,
-        0xa9, 0x59, 0x45, 0x53, 0xb3, 0x8c, 0xd7, 0xa3, 0xac, 0xaf, 0x42, 0xf7,
-        0xd0, 0xfe, 0xcb, 0x2e, 0x4a, 0xe6, 0x70, 0x1e, 0xf2, 0xb8, 0x96, 0xae,
-        0x7e, 0x6d, 0x58, 0xfb, 0x47, 0x0b, 0x32, 0xcf, 0x8e, 0x9f, 0x85, 0x3d,
-        0x78, 0x98, 0xe1, 0x77, 0xcd, 0x37, 0xbf, 0x88, 0xb9, 0xfa, 0x28, 0x26,
-        0x7a, 0xc0, 0x36, 0x51, 0xd4, 0xad, 0xe3, 0x9a, 0xa8, 0xeb, 0x92, 0xb6,
-        0x5c, 0xaa, 0x61, 0x8d, 0x97, 0xc6, 0x8b, 0x69, 0xb5, 0x5f, 0xb5, 0x76,
-        0x4e, 0x0b, 0x25, 0xb2, 0x80, 0x2b, 0x72, 0x21, 0x2d, 0xde, 0x1b, 0x01,
-        0xa7, 0x94, 0xe9, 0x01, 0x83, 0xa3, 0x0a, 0x06, 0x4f, 0x8b, 0x35, 0x22,
-        0x97, 0x10, 0x3e, 0xc8, 0xc6, 0x70, 0x48, 0x67, 0x46, 0xf9, 0x3e, 0x8c,
-        0xfb, 0x07, 0x42, 0xcc, 0x83, 0xb6, 0x0b, 0x07, 0xf7, 0xda, 0x1b, 0xf1,
-        0x9a, 0xed, 0xd6, 0xd3, 0x5c, 0x77, 0xc9, 0x8e, 0x90, 0x92, 0x1b, 0x52,
-        0xef, 0xdd, 0xe5, 0xd8, 0x89, 0x14, 0xcf, 0xed, 0x2f, 0xc2, 0x7f, 0x39,
-        0x44, 0x6d, 0x25, 0x3a, 0x12, 0x06, 0x3e, 0x77, 0xb1, 0x5d, 0xc9, 0x73,
-        0x18, 0x2b, 0xd1, 0x85, 0xf0, 0x3e, 0xb6, 0x5d, 0xf6, 0xb3, 0x0e, 0x3a,
-        0xca, 0xff, 0x4e, 0xc4, 0xef, 0xc3, 0xbc, 0x3a, 0xf8, 0xda, 0x7e, 0x32,
-        0x7a, 0x52, 0x66, 0x2b, 0xeb, 0x07, 0x47, 0x2a, 0xf6, 0x88, 0x05, 0xff,
-        0x1c, 0xeb, 0xb6, 0xc6, 0x5c, 0xb8, 0x5b, 0xd5, 0x9c, 0xc1, 0x87, 0x8d,
-        0xf8, 0xd6, 0x3f, 0x97, 0x64, 0xaf, 0x80, 0x21, 0x75, 0xfc, 0xe3, 0x52,
-        0x64, 0x08, 0xc7, 0x78, 0xe7, 0x90, 0x3d, 0x11, 0xf1, 0xfd, 0x58, 0xea,
-        0xf2, 0x3e, 0xfb, 0x88, 0x7c, 0x3f, 0x80, 0x6d, 0x5a, 0x3e, 0x2f, 0xbc,
-        0x97, 0x3a, 0x4f, 0x25, 0x5f, 0x15, 0x74, 0x50, 0xa2, 0x7f, 0x67, 0x9a,
-        0x35, 0x09, 0xb1, 0x8c, 0x29, 0x51, 0x0b, 0x8d, 0x7c, 0xe5, 0xf9, 0x45,
-        0x3d, 0x2f, 0x47, 0xed, 0xf5, 0xfd, 0xc8, 0x37, 0xcb, 0x16, 0x68, 0x73,
-        0x99, 0x01, 0x3f, 0xda, 0xe8, 0xf2, 0x46, 0x4f, 0x50, 0xd4, 0x66, 0x77,
-        0xb3, 0x8e, 0xa3, 0xf3, 0x92, 0xc7, 0xf8, 0xfe, 0x01, 0xf1, 0xbe, 0xb9,
-        0xd8, 0x12, 0xc6, 0x35, 0xd3, 0xc8, 0x72, 0xe9, 0x21, 0xfe, 0x5d, 0xc4,
-        0x11, 0x93, 0xd4, 0xaa, 0x62, 0x04, 0x1d, 0x2a, 0xae, 0x14, 0x62, 0x5a,
-        0xaa, 0xd4, 0x1c, 0x8f, 0x94, 0x7d, 0x6d, 0xc0, 0xf1, 0x5a, 0x5f, 0xdb,
-        0x73, 0x5b, 0xc8, 0x9b, 0xad, 0xf0, 0x1a, 0x39, 0xa5, 0x2d, 0xa4, 0x7c,
-        0x88, 0xd6, 0x02, 0x6d, 0xb7, 0xb6, 0x6e, 0xc7, 0xd7, 0xb4, 0x36, 0xcf,
-        0xac, 0x9f, 0x79, 0xc7, 0x69, 0x53, 0xf8, 0xd4, 0x4c, 0xf3, 0xb9, 0x36,
-        0x96, 0xd9, 0xa8, 0x97, 0x02, 0xbc, 0xfc, 0x43, 0xa8, 0x37, 0x79, 0x32,
-        0xd0, 0x4c, 0xab, 0xab, 0xc8, 0x79, 0x78, 0xfc, 0x2e, 0x99, 0xe7, 0xfb,
-        0x08, 0xc3, 0x65, 0x3f, 0xcb, 0x37, 0x43, 0xc5, 0x70, 0x70, 0x0e, 0xbc,
-        0x41, 0xf4, 0xfd, 0x0c, 0x3c, 0x3c, 0xde, 0xc6, 0x7a, 0xbd, 0x8c, 0x01,
-        0x1c, 0xe4, 0x7b, 0x7f, 0x33, 0xf7, 0x08, 0xfc, 0x59, 0xe6, 0x61, 0xbe,
-        0x7f, 0x8c, 0xf5, 0x81, 0x08, 0x35, 0xd3, 0xca, 0x6a, 0x33, 0xeb, 0xf5,
-        0xcd, 0xac, 0x0f, 0x8c, 0x9a, 0x23, 0x3e, 0xf1, 0x2c, 0x51, 0xdb, 0xf2,
-        0xe9, 0xc0, 0x7e, 0xc6, 0x41, 0x3c, 0xeb, 0x8b, 0xea, 0x59, 0xb5, 0xcf,
-        0xb8, 0x55, 0xc2, 0xf1, 0x61, 0xff, 0xfa, 0x99, 0xab, 0x78, 0x2f, 0xd4,
-        0xe2, 0x34, 0xeb, 0xbe, 0x41, 0xf1, 0x6e, 0x46, 0x63, 0x66, 0x86, 0xed,
-        0x80, 0x30, 0x1f, 0x1f, 0xa1, 0x54, 0x31, 0x41, 0xbf, 0x57, 0x74, 0xfb,
-        0x6a, 0x8f, 0xf0, 0x9c, 0x65, 0x6d, 0x7d, 0x0b, 0xcf, 0xeb, 0x7d, 0xa7,
-        0x96, 0x67, 0xb4, 0x91, 0xff, 0x6b, 0x41, 0x6a, 0x7e, 0x11, 0xbe, 0x91,
-        0x12, 0x65, 0xc3, 0xf6, 0x85, 0xeb, 0xe2, 0xbd, 0x1b, 0x16, 0xbd, 0x22,
-        0xf2, 0x5b, 0xf9, 0x7a, 0xbe, 0xe7, 0x79, 0x8c, 0x7b, 0xc5, 0xa2, 0x2b,
-        0x8e, 0x84, 0xf7, 0x9f, 0x05, 0x82, 0xe4, 0x7f, 0x1d, 0x39, 0x48, 0xd0,
-        0xb5, 0xd6, 0xcf, 0x38, 0xfb, 0x98, 0x5f, 0xbf, 0x88, 0xeb, 0xf8, 0xf3,
-        0x75, 0x1c, 0xb7, 0xf1, 0x3a, 0x21, 0x6f, 0x91, 0x77, 0x02, 0x3e, 0xb7,
-        0x3f, 0x64, 0x0a, 0xfc, 0x3b, 0xc2, 0x38, 0xd5, 0x24, 0x7c, 0x81, 0xbd,
-        0x18, 0xeb, 0x0c, 0xb2, 0x6e, 0xb0, 0x7e, 0x66, 0x7c, 0x1f, 0x8e, 0x23,
-        0x3d, 0x7e, 0x86, 0x91, 0xc4, 0xa1, 0xb0, 0x78, 0xff, 0xa1, 0xeb, 0x2f,
-        0x70, 0x70, 0x9c, 0x78, 0x3f, 0xa1, 0x3f, 0xf0, 0x7e, 0x9a, 0xe8, 0xb3,
-        0xd4, 0x46, 0x71, 0x7e, 0x46, 0x2c, 0x27, 0xd7, 0x7d, 0xbe, 0xe8, 0x27,
-        0xe9, 0x47, 0x6a, 0x1e, 0xd6, 0xef, 0x29, 0xa4, 0x7e, 0xdc, 0x5b, 0xd3,
-        0x0a, 0xbe, 0x77, 0xd1, 0x8d, 0x5c, 0x07, 0xdd, 0x54, 0xb1, 0xa5, 0x1b,
-        0xc2, 0xae, 0x62, 0x9e, 0x9c, 0xe8, 0xa2, 0xeb, 0xab, 0x4d, 0x44, 0xbd,
-        0x6d, 0x22, 0xf6, 0x7b, 0x23, 0x97, 0xc7, 0xf3, 0x87, 0xa5, 0xdf, 0xa5,
-        0x82, 0x23, 0x37, 0x3c, 0x70, 0xe4, 0x3d, 0x81, 0x23, 0xef, 0x6d, 0x81,
-        0x23, 0x7b, 0x95, 0x2d, 0xd1, 0x46, 0xcd, 0x0a, 0x3f, 0x5e, 0x63, 0xfc,
-        0x78, 0x81, 0xf1, 0xe3, 0x50, 0x03, 0xfc, 0x30, 0x6a, 0xf0, 0xe3, 0xb0,
-        0xc0, 0x8f, 0x9f, 0x6d, 0x8a, 0x1f, 0x87, 0xfc, 0x9b, 0xf9, 0x82, 0x34,
-        0x6e, 0x0e, 0xd0, 0x4a, 0xce, 0xa1, 0xd5, 0x45, 0x9b, 0x2d, 0x7b, 0xd8,
-        0xe6, 0x88, 0x19, 0xce, 0x88, 0x7a, 0x97, 0x82, 0xc0, 0x2b, 0x96, 0xe3,
-        0x33, 0xa8, 0x69, 0xaa, 0xdb, 0x03, 0x12, 0xef, 0xa5, 0x14, 0xf0, 0x97,
-        0x7b, 0x12, 0xcb, 0xac, 0x9f, 0xf9, 0x73, 0xde, 0xc7, 0x2b, 0x6b, 0x81,
-        0x00, 0x7e, 0xf3, 0xcf, 0x04, 0x69, 0x63, 0x8d, 0xed, 0x54, 0xc6, 0xb1,
-        0xab, 0xb9, 0x21, 0xba, 0x92, 0x1b, 0xa0, 0x8d, 0xdc, 0x30, 0xbd, 0x93,
-        0xc3, 0x33, 0x00, 0x73, 0x3e, 0x16, 0x30, 0x37, 0xe8, 0x60, 0x90, 0xc7,
-        0xac, 0x0e, 0xd0, 0xfa, 0xaa, 0xc6, 0x57, 0xe0, 0x2a, 0xf6, 0x3f, 0xd2,
-        0x23, 0xeb, 0xd0, 0xea, 0x71, 0x20, 0x56, 0x85, 0x03, 0xf2, 0x1a, 0xec,
-        0xfd, 0x42, 0x7d, 0x0d, 0x6d, 0xab, 0x39, 0x83, 0x1c, 0xb8, 0x36, 0xb6,
-        0xc9, 0x6d, 0xe1, 0x73, 0x3d, 0xe8, 0x87, 0x4e, 0x6b, 0xdc, 0x4d, 0x5d,
-        0xbc, 0x07, 0x0e, 0xf2, 0x87, 0x86, 0x59, 0x3f, 0xed, 0x16, 0xfa, 0x68,
-        0xd4, 0x09, 0x84, 0x62, 0x54, 0x3a, 0x6b, 0x38, 0xe8, 0x93, 0xf8, 0x08,
-        0xdf, 0xcf, 0x50, 0x7e, 0x9e, 0x4e, 0x17, 0x3e, 0xd5, 0xea, 0x9e, 0x88,
-        0xd1, 0x9e, 0xe0, 0x39, 0x43, 0x4e, 0x56, 0xe2, 0x22, 0x54, 0x8e, 0x8b,
-        0xb4, 0xf2, 0xba, 0x25, 0x2d, 0xcd, 0x39, 0x3c, 0xae, 0xc8, 0xe3, 0x8a,
-        0x88, 0xa9, 0xf1, 0xf9, 0x55, 0xc4, 0x73, 0x87, 0x68, 0x63, 0x11, 0x34,
-        0x07, 0xff, 0x44, 0x25, 0x86, 0xba, 0xb1, 0x86, 0xf3, 0xf0, 0x51, 0x54,
-        0x62, 0xa8, 0x1b, 0x2a, 0x86, 0xba, 0xb1, 0x36, 0x2d, 0xf8, 0xf0, 0x42,
-        0x8e, 0x79, 0x40, 0xce, 0xaf, 0xf2, 0x07, 0xf7, 0xa9, 0x77, 0xf6, 0x9c,
-        0x10, 0x3e, 0xe4, 0x1e, 0x67, 0x73, 0x18, 0x1e, 0xac, 0x83, 0xe1, 0xb4,
-        0xd0, 0x83, 0xe2, 0x7c, 0xcf, 0x58, 0xee, 0x04, 0xc3, 0x73, 0x96, 0x69,
-        0x69, 0xb7, 0xa2, 0x25, 0x1d, 0x93, 0xed, 0x26, 0xf5, 0xfe, 0x1f, 0xa1,
-        0xeb, 0x4b, 0xfe, 0x33, 0x54, 0xc3, 0x7f, 0x28, 0x10, 0x1d, 0x97, 0xd7,
-        0xa7, 0x8b, 0xaf, 0x0c, 0x6b, 0xff, 0x5b, 0x9a, 0xef, 0xbb, 0x90, 0xdb,
-        0x49, 0x4c, 0x97, 0xe5, 0xa6, 0x67, 0xce, 0xe0, 0x76, 0x9f, 0xad, 0x71,
-        0xe1, 0xc4, 0x6d, 0xe0, 0x93, 0xbc, 0x47, 0x05, 0x9f, 0xfe, 0x77, 0x16,
-        0xc0, 0xb2, 0x93, 0x05, 0x98, 0x57, 0x84, 0x80, 0xf5, 0x03, 0x03, 0xb4,
-        0x8e, 0x39, 0x00, 0x1e, 0x53, 0x68, 0x02, 0xe6, 0x19, 0xa7, 0xf5, 0x40,
-        0xfb, 0xfb, 0x95, 0xc1, 0xeb, 0x5d, 0x1b, 0xa0, 0x67, 0x4f, 0x2d, 0xea,
-        0x79, 0x2c, 0x07, 0xca, 0xa3, 0x4e, 0x2a, 0x0c, 0x24, 0xe6, 0x27, 0x90,
-        0xff, 0x80, 0xfe, 0x00, 0xf9, 0x11, 0x98, 0x9f, 0x9c, 0x81, 0x72, 0xa0,
-        0x35, 0x53, 0xcd, 0x6b, 0x40, 0xfa, 0x40, 0x61, 0x08, 0x2a, 0x53, 0x41,
-        0x63, 0x1d, 0x40, 0xf6, 0x12, 0x21, 0x68, 0xd8, 0x01, 0x69, 0x20, 0xbb,
-        0x79, 0x8a, 0x08, 0x98, 0x9f, 0x14, 0x20, 0xc4, 0xd0, 0x00, 0xcf, 0x4f,
-        0xec, 0x40, 0x97, 0xc2, 0xdc, 0xf4, 0xff, 0xff, 0x31, 0x15, 0x16, 0x60,
-        0xda, 0x03, 0xad, 0xf9, 0xfc, 0xfd, 0xff, 0x80, 0x08, 0x0b, 0x43, 0x0b,
-        0x7c, 0xed, 0x9e, 0xb0, 0x3c, 0xa8, 0x9c, 0x5b, 0x00, 0x64, 0xb5, 0xc1,
-        0xeb, 0x6d, 0x16, 0xf0, 0x7d, 0xc4, 0x0b, 0x18, 0x7e, 0x01, 0xcb, 0x95,
-        0xff, 0xff, 0x97, 0xc2, 0xd5, 0x82, 0x00, 0x00, 0xd4, 0xc2, 0xcb, 0x42,
-        0x60, 0x7c, 0x00, 0x00, 0x00 };
-static u32 bnx2_COM_b09FwData[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_COM_b09FwRodata[(0x88/4) + 1] = {
-        0x08001ad8, 0x08001b14, 0x08001b14, 0x08001b14, 0x08001b14, 0x08001b14,
-        0x08001a24, 0x08001b14, 0x08001a98, 0x08001b14, 0x080019ac, 0x08001b14,
-        0x08001b14, 0x08001b14, 0x080019b8, 0x0, 0x08002a2c, 0x08002a7c,
-        0x08002aac, 0x08002adc, 0x08002b0c, 0x0, 0x08005fac, 0x08005fac,
-        0x08005fac, 0x08005fac, 0x08005fac, 0x08005fd8, 0x08005fd8, 0x08006018,
-        0x08006024, 0x08006024, 0x08005fac, 0x0, 0x0 };
-static u32 bnx2_COM_b09FwBss[(0x88/4) + 1] = { 0x0 };
-static u32 bnx2_COM_b09FwSbss[(0x5c/4) + 1] = { 0x0 };
+        0x1f, 0x8b, 0x08, 0x00, 0x0e, 0x34, 0xe7, 0x45, 0x00, 0x03, 0xdc, 0x5b,
+        0x6d, 0x70, 0x5c, 0xd5, 0x79, 0x7e, 0xef, 0xd9, 0xbb, 0xf2, 0x5a, 0x92,
+        0xe5, 0x6b, 0x79, 0x23, 0x16, 0x4b, 0xc0, 0xae, 0x75, 0x6d, 0x69, 0xb0,
+        0x43, 0x16, 0xa1, 0x80, 0x9a, 0xd9, 0xc0, 0xb2, 0x2b, 0x33, 0x9e, 0x0c,
+        0x69, 0x64, 0x50, 0x80, 0xb6, 0x4c, 0x46, 0xec, 0x1a, 0x9a, 0x4e, 0x87,
+        0xd6, 0xa6, 0x6e, 0x9b, 0xc9, 0x34, 0x78, 0x47, 0x1f, 0x8d, 0xa7, 0x15,
+        0xba, 0x06, 0x1b, 0xd9, 0xd3, 0xd0, 0xa0, 0x6a, 0x71, 0xf1, 0x8f, 0x8d,
+        0xaf, 0xf9, 0x48, 0xaa, 0x4c, 0x4d, 0xa5, 0x18, 0x48, 0x69, 0xa7, 0x4d,
+        0xfb, 0xa3, 0x9e, 0xa1, 0x5f, 0x84, 0x32, 0xfd, 0xc1, 0x74, 0xda, 0x4e,
+        0x3a, 0x24, 0x53, 0x08, 0x84, 0xed, 0xf3, 0x9c, 0x7b, 0xee, 0xea, 0x6a,
+        0x25, 0x7f, 0xf1, 0x91, 0x1f, 0xd5, 0xcc, 0xfa, 0xde, 0xf3, 0xfd, 0x9e,
+        0xf7, 0xbc, 0xef, 0xf3, 0x7e, 0xdc, 0xe3, 0x4f, 0x8a, 0xb4, 0x8a, 0xf9,
+        0xdb, 0x80, 0x5f, 0xfa, 0xc1, 0xdf, 0x2c, 0x5f, 0x37, 0x78, 0xdd, 0x0d,
+        0x78, 0xbd, 0x41, 0xc5, 0xec, 0x18, 0xeb, 0xf9, 0x4f, 0x12, 0xbf, 0x01,
+        0xf3, 0xbe, 0xd6, 0x9f, 0x83, 0xdf, 0x9b, 0x68, 0x1c, 0xfb, 0x0f, 0x11,
+        0xeb, 0x3c, 0x7d, 0xa2, 0x7f, 0xf5, 0xfa, 0x85, 0xdb, 0x15, 0x69, 0xb9,
+        0x40, 0x7b, 0x2c, 0x58, 0x52, 0xd3, 0xcc, 0x9f, 0x24, 0x54, 0x6e, 0xec,
+        0xe1, 0x82, 0x2b, 0x89, 0x58, 0x6e, 0xf7, 0xc1, 0xb2, 0x2b, 0x92, 0xaf,
+        0xed, 0x48, 0x17, 0xe5, 0x67, 0xf5, 0x4a, 0xd2, 0x16, 0xd6, 0x5f, 0x95,
+        0x7b, 0xef, 0xc9, 0x17, 0x6e, 0xca, 0xfc, 0x68, 0x2e, 0x26, 0x09, 0x27,
+        0xf7, 0xbc, 0x38, 0xdb, 0x25, 0xd1, 0x83, 0x31, 0x4f, 0xf4, 0xe5, 0x2d,
+        0xe9, 0x08, 0xe7, 0x7a, 0xb3, 0xfe, 0x42, 0x9f, 0x54, 0xb6, 0xe4, 0x12,
+        0xa2, 0x72, 0xdb, 0x5e, 0x2d, 0xc4, 0x9c, 0xb1, 0x58, 0xce, 0x91, 0x45,
+        0x5f, 0x46, 0xee, 0x9f, 0x96, 0x44, 0x22, 0xf7, 0xe5, 0xc4, 0xba, 0x6d,
+        0x92, 0xb0, 0x73, 0x4b, 0x0f, 0xff, 0xbe, 0x7b, 0xb0, 0xae, 0x5c, 0xb7,
+        0x7f, 0x5e, 0xda, 0x87, 0x4e, 0x0c, 0xa2, 0xbd, 0x96, 0xe9, 0x17, 0xb9,
+        0x49, 0x94, 0x5b, 0x69, 0x8f, 0xb9, 0x09, 0x29, 0xf8, 0xae, 0x14, 0x7d,
+        0x91, 0xbf, 0xac, 0x59, 0x72, 0xc2, 0xed, 0x92, 0xf9, 0x9d, 0xef, 0xd5,
+        0xf3, 0xa0, 0xe5, 0xfb, 0xee, 0xd2, 0xc3, 0x93, 0x2e, 0xe9, 0x3d, 0x90,
+        0x08, 0xe8, 0xdd, 0xbb, 0xae, 0xec, 0xda, 0x32, 0x5e, 0x63, 0xdd, 0xa8,
+        0x62, 0x5d, 0x3c, 0x97, 0x68, 0x3d, 0xe1, 0xb6, 0x9b, 0xba, 0x57, 0x6f,
+        0x29, 0x60, 0xbe, 0x89, 0x1a, 0xfb, 0xe6, 0xaf, 0x2f, 0xbb, 0x49, 0x53,
+        0xbf, 0x70, 0x63, 0xc1, 0x4d, 0xa1, 0xbe, 0xc7, 0xb4, 0x8d, 0x3d, 0x58,
+        0x76, 0x5d, 0xd3, 0xf6, 0x76, 0xac, 0xe0, 0xf6, 0x9b, 0xfa, 0xf7, 0x6e,
+        0x2e, 0xbb, 0x3b, 0x4d, 0x7d, 0x0f, 0xe6, 0xca, 0x9a, 0xfa, 0x85, 0x7b,
+        0xca, 0xee, 0xa0, 0xa9, 0xdf, 0x7d, 0x73, 0xc1, 0x1d, 0x32, 0xf5, 0x89,
+        0xa1, 0xb2, 0x9b, 0x43, 0xfd, 0x97, 0x13, 0x6a, 0x9b, 0x23, 0x53, 0xb5,
+        0x34, 0x7e, 0x79, 0xb4, 0x0d, 0xa3, 0x6e, 0x37, 0x7e, 0xb7, 0xe3, 0xf7,
+        0xc8, 0x46, 0xe9, 0x18, 0xc1, 0xf3, 0xbf, 0xba, 0x03, 0xde, 0x81, 0x47,
+        0x5e, 0x42, 0x5e, 0x8f, 0xa5, 0xe4, 0x85, 0xbe, 0xd7, 0xc1, 0x43, 0x47,
+        0x4e, 0xfb, 0x62, 0x8d, 0xf4, 0xa5, 0xc0, 0xbb, 0xa4, 0x3c, 0xe3, 0xb7,
+        0x49, 0xec, 0xb1, 0x18, 0x78, 0xf3, 0xcb, 0x52, 0x4a, 0x26, 0x64, 0xd3,
+        0xac, 0x25, 0x5b, 0x07, 0x12, 0x92, 0x77, 0xb8, 0x36, 0x4e, 0x7b, 0x26,
+        0x29, 0xb1, 0xd9, 0xfc, 0x66, 0x25, 0xdb, 0x9c, 0xa2, 0x54, 0xc0, 0xbb,
+        0x57, 0x29, 0x97, 0x68, 0x4b, 0x4b, 0x71, 0xfa, 0x5a, 0x19, 0x73, 0x48,
+        0xd7, 0x1f, 0x5c, 0x15, 0xac, 0x95, 0xb0, 0x0a, 0xc7, 0x46, 0x65, 0xca,
+        0x6b, 0xb7, 0x8a, 0xc7, 0x6e, 0x96, 0x42, 0x56, 0x92, 0x18, 0x97, 0x2a,
+        0xa1, 0xa5, 0x5a, 0x1b, 0x95, 0x49, 0x4f, 0xac, 0x82, 0x47, 0x7e, 0x76,
+        0xa1, 0xbd, 0x43, 0xf7, 0x45, 0x5d, 0x4f, 0x4c, 0xcf, 0x9d, 0x40, 0xbd,
+        0x83, 0xfa, 0x4e, 0x6b, 0x58, 0xcf, 0xa1, 0xeb, 0xd3, 0x13, 0xd2, 0x2e,
+        0x4f, 0xd5, 0x92, 0xa6, 0x6f, 0xbd, 0x5e, 0xc8, 0x3a, 0xe8, 0x37, 0x2a,
+        0x13, 0x5e, 0x52, 0xc6, 0xf0, 0x1c, 0xf7, 0xb8, 0x7e, 0x0a, 0x32, 0x75,
+        0xdd, 0xc1, 0xd2, 0x51, 0x3d, 0x5f, 0x3a, 0x96, 0xe3, 0x7c, 0x3d, 0xe8,
+        0xf7, 0x12, 0xe8, 0xb2, 0xc4, 0xd6, 0x67, 0x99, 0x97, 0xd2, 0xb4, 0x05,
+        0x79, 0xc3, 0x53, 0xf3, 0x75, 0x18, 0xf4, 0xdb, 0xe2, 0x0e, 0x58, 0x52,
+        0xc6, 0x59, 0x55, 0x1c, 0x94, 0x6b, 0x0b, 0xaa, 0xe0, 0xad, 0x93, 0xa2,
+        0x9d, 0x96, 0xd8, 0x0c, 0x65, 0x69, 0x4c, 0x26, 0x30, 0x46, 0xb9, 0xec,
+        0xf3, 0x0e, 0xf6, 0x3d, 0xa6, 0xcf, 0xa1, 0x25, 0x57, 0x51, 0x45, 0xbf,
+        0x4b, 0xd4, 0xec, 0xbd, 0xf2, 0xd2, 0xb4, 0x38, 0x38, 0xc7, 0x7a, 0xc1,
+        0x9d, 0x54, 0x85, 0xa7, 0x6d, 0x89, 0xcf, 0x58, 0x32, 0xe9, 0x66, 0xa0,
+        0x01, 0x87, 0xd4, 0x2e, 0x7f, 0x01, 0xfd, 0x38, 0x0e, 0xfd, 0x6a, 0x0a,
+        0x7c, 0xe5, 0xfb, 0x0e, 0x47, 0x69, 0x79, 0x66, 0x1f, 0x9c, 0x01, 0xf6,
+        0xf1, 0x8c, 0x87, 0x33, 0xd1, 0x67, 0x94, 0xc6, 0x19, 0x89, 0x35, 0xdc,
+        0x07, 0x99, 0x3a, 0x6a, 0x4b, 0x29, 0x8b, 0x7d, 0xa1, 0x77, 0x29, 0xbb,
+        0x4c, 0xd7, 0xc4, 0x74, 0x33, 0x5d, 0x1c, 0x47, 0xba, 0x02, 0x9a, 0xc6,
+        0x8f, 0x92, 0xbe, 0x65, 0x7a, 0xa6, 0xa6, 0x43, 0x1a, 0xb9, 0x1e, 0x69,
+        0x0b, 0xe9, 0xe2, 0x38, 0xd2, 0xb5, 0x99, 0x67, 0xcd, 0x3f, 0x6b, 0x18,
+        0x74, 0x4c, 0x78, 0x36, 0xce, 0xa8, 0x5d, 0x4a, 0x4e, 0xc5, 0x9a, 0x18,
+        0xda, 0x91, 0x82, 0x36, 0x5b, 0xe3, 0x43, 0xa4, 0xd9, 0xc5, 0x39, 0xb6,
+        0xe8, 0xf3, 0x56, 0xb9, 0x49, 0xf2, 0x0e, 0xfd, 0xb9, 0x3e, 0xde, 0x6b,
+        0x8e, 0x4c, 0xea, 0xf9, 0x48, 0xd3, 0x47, 0x31, 0x0f, 0x69, 0x7d, 0x05,
+        0xb2, 0x3a, 0x08, 0x19, 0xcd, 0xca, 0x5f, 0xf8, 0x3b, 0xe5, 0xcf, 0xfc,
+        0x7e, 0xf9, 0x0e, 0xf4, 0xf6, 0xdb, 0x7e, 0x5a, 0x9e, 0xf7, 0x7b, 0xe4,
+        0x39, 0x3f, 0x25, 0xcf, 0x6a, 0xf9, 0x1d, 0x16, 0xe9, 0xa0, 0x4c, 0xa7,
+        0xa5, 0x13, 0xfa, 0xb3, 0x09, 0xba, 0xf9, 0x38, 0xf8, 0x77, 0xb4, 0x4f,
+        0xf2, 0x9b, 0x73, 0x92, 0xb8, 0x1a, 0xbf, 0x2b, 0xf0, 0xeb, 0xca, 0xd9,
+        0x5a, 0x56, 0xec, 0x1c, 0x79, 0x68, 0x4b, 0x51, 0xef, 0xd9, 0x96, 0x09,
+        0xff, 0x91, 0xab, 0x03, 0xd9, 0x15, 0x19, 0x01, 0x8f, 0xd5, 0xc0, 0x4f,
+        0xea, 0x79, 0x07, 0xfb, 0x18, 0xd8, 0xa1, 0x79, 0xaf, 0x06, 0x28, 0xb3,
+        0x69, 0xc8, 0xbd, 0x6d, 0x15, 0xbd, 0x93, 0xc0, 0x8d, 0x36, 0xab, 0x70,
+        0xa4, 0x22, 0xe5, 0x23, 0x75, 0x29, 0x67, 0xe3, 0xf2, 0x90, 0x53, 0x97,
+        0xe1, 0x6c, 0x8b, 0xec, 0x77, 0xc0, 0xfb, 0x9d, 0xbf, 0x6d, 0x85, 0x98,
+        0xfd, 0xb8, 0xff, 0x3b, 0x78, 0x67, 0x9d, 0xc8, 0x51, 0xfd, 0x1e, 0xd4,
+        0x57, 0xfc, 0xb8, 0xe4, 0x93, 0x95, 0x94, 0x2d, 0x5b, 0x54, 0xb0, 0xee,
+        0x78, 0xd8, 0x06, 0x7e, 0x2c, 0x01, 0x27, 0x33, 0x5a, 0x5f, 0x4a, 0xd3,
+        0xeb, 0xdf, 0xce, 0xeb, 0x6a, 0xf4, 0x77, 0x06, 0xe5, 0xac, 0xe6, 0x67,
+        0x7a, 0xcc, 0xca, 0x25, 0x65, 0x6b, 0x8d, 0xe5, 0x21, 0xeb, 0x4e, 0x9f,
+        0xf2, 0x8c, 0x77, 0x9f, 0x74, 0x5e, 0x89, 0x7e, 0x36, 0x9e, 0x79, 0x43,
+        0x6f, 0x94, 0x46, 0xce, 0x43, 0x1a, 0xf9, 0xfc, 0x66, 0x84, 0xc6, 0x27,
+        0x1b, 0xef, 0x47, 0x23, 0xef, 0x15, 0xff, 0x8f, 0x5a, 0x03, 0xda, 0x86,
+        0xe4, 0x8d, 0x99, 0xaf, 0x98, 0x75, 0xf0, 0x7e, 0x8a, 0xf3, 0x7f, 0xab,
+        0x1e, 0xc8, 0x4b, 0xe5, 0x22, 0xeb, 0x2c, 0x44, 0xd6, 0xf9, 0x6e, 0x64,
+        0x9d, 0xef, 0x46, 0xd6, 0xa9, 0x80, 0xa7, 0xb2, 0x51, 0x41, 0x86, 0x4b,
+        0x34, 0x63, 0x72, 0x08, 0x73, 0xbe, 0x2e, 0xb1, 0x1c, 0xf5, 0x3c, 0xc4,
+        0x9b, 0x73, 0xe8, 0x9f, 0x93, 0xb3, 0x33, 0x15, 0x29, 0x1d, 0x89, 0xcb,
+        0x1d, 0xba, 0xdf, 0x26, 0x43, 0x5f, 0xb4, 0x2d, 0x21, 0x7b, 0x92, 0x7c,
+        0x0f, 0xdb, 0x6c, 0xf0, 0x99, 0xe5, 0x6f, 0x5d, 0x19, 0x94, 0xf9, 0xbe,
+        0x60, 0xf6, 0x32, 0x1a, 0x8c, 0x3b, 0xf5, 0xa6, 0xc6, 0xc3, 0x45, 0x9f,
+        0xb8, 0x25, 0xd9, 0x98, 0x2b, 0xfb, 0x86, 0xb3, 0x5d, 0x32, 0xe1, 0x58,
+        0xd9, 0xf1, 0xfe, 0x75, 0xd4, 0x8b, 0xbc, 0x72, 0xdb, 0x80, 0x0d, 0x92,
+        0x56, 0xc4, 0x7c, 0xbd, 0x2f, 0x4b, 0x05, 0xf4, 0x3b, 0x2c, 0x8f, 0x28,
+        0xb7, 0xb3, 0xa9, 0x9e, 0xba, 0x1d, 0xc3, 0x3b, 0x65, 0x78, 0x97, 0x39,
+        0x63, 0x1b, 0x65, 0xe2, 0xf0, 0x35, 0xa6, 0x1c, 0xb6, 0x6f, 0xb6, 0x57,
+        0x96, 0xcf, 0x76, 0xaf, 0x2c, 0x87, 0x38, 0x11, 0xc5, 0x70, 0xee, 0x15,
+        0xf8, 0xe4, 0x52, 0xee, 0xe2, 0xa0, 0x35, 0x0b, 0x9d, 0x5b, 0x67, 0x68,
+        0xb8, 0xc2, 0xd0, 0x00, 0x5a, 0xfb, 0x20, 0x59, 0x5a, 0x97, 0xb4, 0x68,
+        0x35, 0x95, 0xc9, 0xfb, 0xf0, 0x7d, 0x83, 0x6e, 0x0f, 0x74, 0x2e, 0x7c,
+        0x86, 0xf8, 0xfe, 0x66, 0xc4, 0x5e, 0xf4, 0x40, 0x67, 0x93, 0xe0, 0x55,
+        0x88, 0xf5, 0xc4, 0xe0, 0x14, 0xec, 0x03, 0x64, 0x55, 0x63, 0x7b, 0x3b,
+        0xf0, 0xd0, 0x36, 0xd8, 0x9c, 0x30, 0xd8, 0xdc, 0x0e, 0x5c, 0x66, 0xd9,
+        0x31, 0xe5, 0xa4, 0x29, 0xa7, 0x50, 0x86, 0x1d, 0x9f, 0x25, 0x2e, 0x5f,
+        0x77, 0x70, 0xef, 0x51, 0x8d, 0xf7, 0xb4, 0x15, 0x40, 0x61, 0xe2, 0x35,
+        0x71, 0xbb, 0x47, 0xe6, 0x6b, 0x58, 0xaf, 0x81, 0x8d, 0xdc, 0x7b, 0x94,
+        0x1e, 0xd2, 0xb2, 0x5e, 0x14, 0x6c, 0x57, 0x3e, 0x49, 0x7a, 0x1f, 0xc4,
+        0xde, 0x89, 0x3f, 0xa4, 0xfb, 0x2a, 0xd0, 0xca, 0x7d, 0xfc, 0x3c, 0x69,
+        0xe5, 0x7a, 0xcd, 0xf4, 0x7e, 0x58, 0x1c, 0x24, 0xed, 0x27, 0xb1, 0xe7,
+        0x3c, 0x30, 0x4f, 0xac, 0xd1, 0xbe, 0x51, 0xec, 0x79, 0x04, 0x78, 0x78,
+        0x3b, 0xf0, 0x70, 0x37, 0xf0, 0x70, 0x18, 0x78, 0x98, 0x03, 0x16, 0x0e,
+        0x01, 0x0b, 0x07, 0x81, 0x85, 0x59, 0xf0, 0x26, 0x29, 0x73, 0xc0, 0xc6,
+        0x39, 0x60, 0xe4, 0x1c, 0xe6, 0x18, 0x9f, 0x15, 0xeb, 0x4b, 0xd8, 0xc3,
+        0x63, 0x33, 0x99, 0x93, 0x90, 0xa5, 0x54, 0x45, 0x41, 0xfe, 0xb3, 0x43,
+        0x90, 0xed, 0x7e, 0xa9, 0xfa, 0xb6, 0x94, 0x69, 0x53, 0xb7, 0xf7, 0x42,
+        0xd7, 0x20, 0xef, 0x29, 0x31, 0x7f, 0x1b, 0xcc, 0xf3, 0x1f, 0x45, 0xdc,
+        0xbf, 0xa3, 0x2c, 0xa6, 0x45, 0xce, 0x48, 0xc9, 0xeb, 0x75, 0x0a, 0xaa,
+        0x1f, 0xfd, 0x58, 0xce, 0xaa, 0xfb, 0x8f, 0x5c, 0xaf, 0xf6, 0x1e, 0x21,
+        0x5f, 0xa6, 0x81, 0x57, 0x75, 0x99, 0xcc, 0x52, 0xb7, 0xea, 0x72, 0x22,
+        0x9b, 0x19, 0xaa, 0x48, 0x9b, 0x4c, 0x25, 0xa7, 0xb5, 0xad, 0xb5, 0x73,
+        0x87, 0xb5, 0xbd, 0x2a, 0xbb, 0x78, 0xd6, 0x06, 0x54, 0xe9, 0x08, 0xf7,
+        0xdf, 0x8b, 0x5f, 0x1c, 0xb4, 0x70, 0x7e, 0x5b, 0x86, 0x07, 0x1d, 0xf5,
+        0x40, 0x5f, 0x05, 0x08, 0x96, 0x71, 0xce, 0x62, 0xe5, 0xe2, 0x74, 0x6f,
+        0xaa, 0xa8, 0x6c, 0x19, 0xb3, 0x2d, 0x19, 0x87, 0x7c, 0x0f, 0x67, 0xdf,
+        0xa9, 0x4f, 0x25, 0xd9, 0xbe, 0x4e, 0xbe, 0xae, 0x7d, 0x0e, 0xac, 0x5d,
+        0x3d, 0x8a, 0x75, 0xe3, 0x38, 0x03, 0xae, 0xcb, 0x79, 0x50, 0xae, 0xd9,
+        0x28, 0x67, 0x4e, 0x56, 0xc4, 0x87, 0x9e, 0x6c, 0x94, 0xc2, 0xce, 0x16,
+        0xc9, 0x8f, 0xa4, 0x65, 0x7c, 0xc6, 0x07, 0x4e, 0xe1, 0x1c, 0xdd, 0x56,
+        0x29, 0x8d, 0xa6, 0xe5, 0xd1, 0x19, 0xd6, 0x9d, 0xc6, 0xfe, 0x33, 0x87,
+        0xf2, 0xc2, 0xfd, 0xc7, 0xf5, 0xbe, 0xd2, 0xea, 0xb4, 0xec, 0xf7, 0xde,
+        0x30, 0x7a, 0x14, 0x94, 0xef, 0xc7, 0x99, 0x9e, 0xf0, 0x17, 0xb0, 0x7f,
+        0x57, 0xe6, 0x81, 0xff, 0xc5, 0x23, 0xc0, 0x41, 0xb7, 0x03, 0x98, 0x95,
+        0x59, 0xa0, 0x4d, 0x8d, 0xc1, 0xef, 0xab, 0x6a, 0x5e, 0xf7, 0xc8, 0x91,
+        0x19, 0x25, 0xdf, 0xbe, 0x31, 0x8d, 0x32, 0xb0, 0x31, 0x9b, 0x39, 0x3d,
+        0xa6, 0x7a, 0xe4, 0x86, 0xce, 0x14, 0xc6, 0xe5, 0x54, 0xc9, 0xdb, 0x18,
+        0x03, 0x2f, 0x8f, 0xa7, 0x15, 0xfb, 0x2a, 0x29, 0x66, 0x63, 0x38, 0xff,
+        0x0a, 0xfa, 0xbf, 0x8f, 0xf5, 0x7a, 0x64, 0x16, 0xbe, 0xd6, 0xec, 0x4c,
+        0x1e, 0xe3, 0x88, 0x5d, 0x99, 0xe3, 0x4b, 0x0a, 0x18, 0x33, 0x0b, 0xf9,
+        0x1e, 0x85, 0x2f, 0x33, 0x03, 0xd1, 0x69, 0x4d, 0xe3, 0x4c, 0x7b, 0x9d,
+        0x71, 0xe0, 0x41, 0xbe, 0x87, 0xef, 0x9c, 0xd3, 0x95, 0x13, 0x1e, 0xe5,
+        0x30, 0x2d, 0x4f, 0xf9, 0x1c, 0xd7, 0xbb, 0xf0, 0x1c, 0x7c, 0x9f, 0xdf,
+        0xf5, 0xae, 0x44, 0xff, 0x77, 0xe1, 0x07, 0x3b, 0x52, 0xc5, 0xb9, 0x95,
+        0xc1, 0xcb, 0x7c, 0x2a, 0x28, 0x8f, 0xcf, 0x66, 0x16, 0xde, 0x50, 0x7c,
+        0x77, 0x2b, 0xf3, 0xea, 0x5a, 0x91, 0x4e, 0xf2, 0x33, 0x0b, 0x5e, 0xba,
+        0x8e, 0x52, 0xdb, 0x8d, 0xef, 0x47, 0x3d, 0x72, 0x41, 0x9f, 0x2d, 0xf3,
+        0x03, 0x51, 0x3d, 0xa2, 0x3d, 0x0c, 0xf5, 0x28, 0x93, 0x5a, 0x52, 0x0a,
+        0xed, 0xb6, 0x1c, 0xd6, 0x65, 0x0b, 0xb4, 0x66, 0x52, 0xdc, 0xdf, 0x44,
+        0xad, 0x5f, 0x9e, 0xf2, 0xd8, 0x1f, 0x7c, 0x9e, 0x6e, 0x37, 0xfd, 0x4f,
+        0x83, 0x87, 0xf4, 0xdf, 0xfa, 0x41, 0x73, 0xa0, 0x5b, 0xf3, 0xd3, 0x49,
+        0xdd, 0x36, 0xe5, 0x05, 0x7e, 0x9a, 0x82, 0x2f, 0x37, 0x07, 0x5f, 0xae,
+        0xa8, 0xf5, 0xcc, 0xc9, 0xc3, 0xd7, 0x87, 0x9e, 0x04, 0x3a, 0x56, 0xad,
+        0x91, 0x96, 0xbb, 0x40, 0x5f, 0xa6, 0x02, 0x62, 0x0e, 0xab, 0x1c, 0xce,
+        0x7d, 0x50, 0x2a, 0xf4, 0xf7, 0xce, 0xc6, 0x9e, 0x92, 0xb1, 0x2a, 0xed,
+        0x11, 0x7e, 0x9e, 0xeb, 0x30, 0xbe, 0xc8, 0x6b, 0x5b, 0xd1, 0x0d, 0x39,
+        0x80, 0x1d, 0xc9, 0x6e, 0x32, 0x7e, 0xce, 0x13, 0x38, 0xcf, 0x33, 0x38,
+        0xf7, 0x9a, 0xec, 0x3d, 0xf6, 0x0a, 0x65, 0xba, 0xbf, 0x2a, 0x99, 0xfe,
+        0x29, 0xd9, 0xe1, 0xcc, 0x43, 0x1f, 0xf3, 0xa3, 0xf5, 0x5b, 0x54, 0x8e,
+        0x63, 0x0e, 0x62, 0x0c, 0x9e, 0xd5, 0x57, 0xe4, 0x21, 0x9f, 0x75, 0x0f,
+        0x81, 0x9f, 0xd0, 0x95, 0xc1, 0x27, 0x8c, 0x1e, 0x60, 0x3e, 0x3b, 0x9c,
+        0xef, 0x15, 0x33, 0x1f, 0xfb, 0xb1, 0x0f, 0xc7, 0x2c, 0xcf, 0xbb, 0x8b,
+        0xb6, 0x08, 0x78, 0xb4, 0x4b, 0xd5, 0x6f, 0x89, 0xa3, 0xfd, 0xc4, 0x20,
+        0xdf, 0x31, 0x0f, 0x6c, 0x91, 0xe3, 0x9e, 0x41, 0x5f, 0xf8, 0x7a, 0xde,
+        0x7a, 0x29, 0x74, 0x85, 0xf4, 0x52, 0x06, 0xe8, 0x27, 0x68, 0x1b, 0xbc,
+        0x39, 0xe0, 0xfd, 0x1f, 0xc6, 0x02, 0x99, 0x3c, 0x80, 0x32, 0xf5, 0xef,
+        0x80, 0x14, 0xbd, 0x0c, 0xf6, 0x09, 0x1d, 0xf3, 0x3b, 0xac, 0x60, 0x8f,
+        0xe0, 0xff, 0xc8, 0x39, 0xf0, 0x41, 0x2a, 0x01, 0x6f, 0xc8, 0x17, 0xf2,
+        0xa4, 0x03, 0xb2, 0x0f, 0xb9, 0x87, 0xdc, 0x96, 0x34, 0x0f, 0xfe, 0xbd,
+        0x33, 0xf0, 0x8b, 0x33, 0x95, 0x3c, 0xe3, 0xb9, 0x4e, 0xe2, 0x26, 0x30,
+        0xcc, 0x87, 0x70, 0x60, 0xee, 0x25, 0xb5, 0x9e, 0xf4, 0xa6, 0x97, 0x62,
+        0x7d, 0x2c, 0xf7, 0x2f, 0x41, 0x86, 0xab, 0x38, 0x9f, 0xc2, 0xce, 0x5e,
+        0x83, 0x5b, 0xcf, 0xc6, 0x28, 0xaf, 0x55, 0x60, 0x4c, 0xc9, 0xdb, 0xe1,
+        0xdc, 0x4d, 0xbe, 0x39, 0x8e, 0x3c, 0xe7, 0x45, 0xb1, 0x03, 0xb6, 0xcf,
+        0xa5, 0x1c, 0x26, 0x21, 0x07, 0x36, 0x6c, 0x68, 0x0a, 0x67, 0xfe, 0x6f,
+        0x9d, 0xc1, 0x5e, 0xf8, 0x6e, 0xcb, 0x9c, 0x83, 0x35, 0xbd, 0xc5, 0x8d,
+        0x41, 0x1d, 0xdf, 0xb7, 0xf0, 0x8c, 0x0e, 0xaf, 0xa4, 0x9d, 0xe7, 0xdb,
+        0x7c, 0xa6, 0x27, 0xb0, 0x17, 0xd6, 0xe3, 0x59, 0x3d, 0x2e, 0x7b, 0x89,
+        0x9b, 0x83, 0xdb, 0x52, 0x2f, 0xa2, 0x7f, 0x11, 0x36, 0xa1, 0x62, 0xb3,
+        0xed, 0x6d, 0x6b, 0x79, 0x8c, 0xa2, 0x5f, 0x0a, 0x1f, 0x78, 0xc9, 0xfa,
+        0x92, 0xff, 0x92, 0x55, 0xa8, 0xbe, 0x6d, 0x15, 0x21, 0x27, 0x55, 0x8f,
+        0xf1, 0x0b, 0xf5, 0xc7, 0xc1, 0xda, 0x99, 0xd4, 0x5b, 0xaa, 0x37, 0x3d,
+        0x0f, 0x2c, 0xb8, 0x1f, 0x3a, 0x5d, 0xb4, 0x17, 0xa4, 0xec, 0xd7, 0xa4,
+        0x74, 0x6c, 0x07, 0xf4, 0x2d, 0x1d, 0xa1, 0x8b, 0x78, 0x56, 0xa1, 0x1f,
+        0x6e, 0xed, 0xf2, 0xa4, 0xd2, 0x92, 0x23, 0xae, 0x6d, 0x83, 0xec, 0xa0,
+        0xae, 0xb6, 0x2c, 0x7f, 0xb7, 0xad, 0xa2, 0x15, 0xb1, 0xee, 0xe0, 0x4a,
+        0x7a, 0xab, 0x72, 0x71, 0x7a, 0x77, 0x35, 0xe8, 0x25, 0x66, 0x00, 0xff,
+        0x3d, 0xe0, 0xbf, 0x07, 0xfc, 0xf7, 0x80, 0xff, 0x1e, 0xf0, 0xdf, 0x83,
+        0x6d, 0xf0, 0x60, 0x03, 0x3c, 0xd8, 0x00, 0x0f, 0x36, 0xc0, 0x83, 0x0d,
+        0xf0, 0x0a, 0x38, 0x27, 0xe2, 0x3c, 0x6d, 0xc8, 0x3d, 0x0d, 0xbb, 0x19,
+        0xf8, 0x39, 0x57, 0x1a, 0xdf, 0x01, 0xfa, 0xe7, 0x6c, 0x91, 0xf1, 0xfe,
+        0x2b, 0xb0, 0xb7, 0x56, 0x3c, 0xdb, 0xf0, 0xc4, 0x1a, 0xfd, 0x9f, 0x35,
+        0x7a, 0xf2, 0x55, 0xd0, 0xa5, 0x50, 0xfe, 0x05, 0xc8, 0x61, 0x0b, 0xe8,
+        0xf9, 0x94, 0xf1, 0x31, 0xbe, 0x61, 0x07, 0x72, 0xd8, 0x86, 0xba, 0xcf,
+        0xa0, 0xae, 0x0d, 0x7d, 0xf6, 0xa3, 0x0f, 0x7d, 0x94, 0x0e, 0x53, 0x17,
+        0xed, 0x47, 0x5f, 0xe5, 0x0b, 0x58, 0x2b, 0x83, 0x7e, 0x1d, 0x98, 0xbb,
+        0x07, 0x7d, 0x6e, 0x46, 0x9f, 0xab, 0x50, 0xa6, 0x6f, 0xdb, 0x8d, 0xf2,
+        0xa7, 0x9b, 0xc6, 0x5c, 0x83, 0xba, 0xcf, 0x36, 0xd5, 0x9d, 0x45, 0x1d,
+        0x62, 0x62, 0xe7, 0x45, 0x33, 0xae, 0x82, 0x72, 0x57, 0x53, 0x9f, 0x57,
+        0x50, 0x37, 0x84, 0xba, 0xbf, 0xc2, 0x13, 0xb1, 0xb0, 0x43, 0x9a, 0xc2,
+        0x36, 0xfa, 0xa9, 0x69, 0xd4, 0xc7, 0x8d, 0xaf, 0xf9, 0x24, 0x7d, 0x2f,
+        0xd8, 0xdc, 0x3f, 0xb6, 0x03, 0xdf, 0x0c, 0xde, 0xab, 0x96, 0xc3, 0xb0,
+        0xfc, 0xcd, 0xa6, 0x32, 0xfb, 0x7e, 0xbf, 0xa9, 0xae, 0x6d, 0xd3, 0xca,
+        0xf2, 0x4f, 0xe3, 0xab, 0xc7, 0xdc, 0xdb, 0xd4, 0xe7, 0xeb, 0x9d, 0x2b,
+        0xcb, 0xbb, 0x5b, 0x56, 0x8f, 0xd9, 0xbe, 0x71, 0x65, 0xdd, 0xad, 0x9b,
+        0x57, 0x96, 0xe9, 0x03, 0x26, 0x11, 0xc3, 0x84, 0xfd, 0x77, 0x7e, 0x22,
+        0x68, 0x27, 0x7f, 0x9b, 0x65, 0x49, 0x2b, 0x23, 0xca, 0x0a, 0xe7, 0xb0,
+        0x64, 0x41, 0x9f, 0x1c, 0x95, 0x7b, 0xc9, 0x2a, 0x42, 0xa6, 0x0a, 0x7e,
+        0x38, 0x1f, 0x75, 0xb6, 0x39, 0x4f, 0x10, 0xe6, 0x07, 0xe8, 0x6f, 0xb5,
+        0x43, 0x6e, 0xee, 0xa2, 0x4d, 0x3a, 0x54, 0x91, 0x65, 0xfd, 0xdc, 0xaa,
+        0xce, 0xa7, 0x9f, 0xf7, 0x19, 0x8c, 0x3a, 0x07, 0x3a, 0xeb, 0x32, 0x92,
+        0x5d, 0x47, 0x1b, 0x63, 0xb0, 0x8b, 0xb8, 0x53, 0xaf, 0xc7, 0xb6, 0xd7,
+        0x65, 0x5f, 0xf6, 0xdd, 0xba, 0x68, 0xcc, 0xbb, 0x57, 0xe3, 0x4e, 0x5a,
+        0x75, 0xe3, 0x8c, 0x1c, 0xc4, 0x12, 0x88, 0xed, 0x93, 0xb4, 0x49, 0xc7,
+        0xe9, 0x9f, 0x1c, 0x0c, 0x30, 0x95, 0xb8, 0x83, 0xb2, 0x3f, 0x85, 0x39,
+        0xb9, 0x3e, 0x9e, 0x55, 0xe2, 0xb8, 0xad, 0x6d, 0x4a, 0xc9, 0xe1, 0xbc,
+        0x6b, 0x61, 0xe3, 0xbf, 0xd8, 0xf4, 0x0b, 0x6d, 0xf7, 0x24, 0xec, 0x1b,
+        0xdb, 0xe8, 0x2b, 0x9c, 0xa4, 0x5f, 0x12, 0xc1, 0xaa, 0x9b, 0x62, 0xe2,
+        0x2e, 0x63, 0x66, 0xb0, 0xaf, 0x2d, 0xf4, 0xfb, 0x2f, 0x61, 0xaf, 0x6b,
+        0x63, 0x51, 0xaf, 0xba, 0xb8, 0x6e, 0xef, 0x69, 0xe8, 0x76, 0x28, 0x7b,
+        0x6b, 0xe5, 0x03, 0x5e, 0xd5, 0x67, 0xf1, 0xac, 0x9f, 0x39, 0x5c, 0x81,
+        0x2e, 0x2d, 0xea, 0xd8, 0x37, 0x3c, 0x17, 0xfa, 0x38, 0x99, 0xe3, 0x73,
+        0x90, 0xed, 0xbd, 0x3a, 0x26, 0x60, 0x3c, 0x50, 0x97, 0x5d, 0xd9, 0x4f,
+        0x25, 0xc9, 0x87, 0xbc, 0xfa, 0x71, 0x9c, 0x3e, 0xc3, 0xa2, 0x47, 0x9e,
+        0x65, 0xd1, 0x9e, 0x05, 0x26, 0xfc, 0xab, 0x14, 0x93, 0xac, 0x7b, 0xab,
+        0x3e, 0x0f, 0xbf, 0x4a, 0xfb, 0x47, 0xda, 0xde, 0xd3, 0xbf, 0x83, 0x5d,
+        0xf7, 0xc9, 0xd3, 0x25, 0xf0, 0x39, 0xf4, 0x01, 0x7e, 0x40, 0x1f, 0x55,
+        0x56, 0xfa, 0xd2, 0x22, 0x0f, 0xd5, 0xfe, 0x01, 0x36, 0x47, 0x05, 0xbe,
+        0x0a, 0xe3, 0x65, 0x97, 0xf5, 0x37, 0xc6, 0xe9, 0xcb, 0x05, 0xb6, 0x3e,
+        0x86, 0xf5, 0x10, 0x5f, 0xd7, 0xfe, 0xd3, 0x2a, 0x79, 0x3d, 0xf4, 0xb3,
+        0xb0, 0x7f, 0xf8, 0x50, 0x3e, 0xdb, 0x58, 0x97, 0x30, 0xfe, 0x77, 0xbb,
+        0xf1, 0xb7, 0x1d, 0xe3, 0x6f, 0x6b, 0x3a, 0x12, 0x4e, 0x2e, 0xf4, 0x0b,
+        0x78, 0x66, 0xe9, 0x83, 0x6a, 0x3b, 0xfd, 0x82, 0x0e, 0x59, 0xdb, 0x2f,
+        0x08, 0x69, 0x3a, 0x85, 0x7d, 0xd2, 0xcf, 0xd3, 0x79, 0xa0, 0xce, 0x20,
+        0xf7, 0x44, 0x1a, 0x42, 0xfb, 0xa8, 0xed, 0xf0, 0x21, 0x98, 0x3c, 0xe6,
+        0x24, 0x41, 0xeb, 0x6e, 0x29, 0x4c, 0x9f, 0x32, 0xf6, 0x96, 0x71, 0x04,
+        0x7d, 0xf8, 0x40, 0x66, 0x0b, 0xd9, 0x0e, 0xcb, 0xcc, 0xd3, 0x05, 0x0b,
+        0x19, 0xc9, 0x51, 0x71, 0x2d, 0xfa, 0x31, 0xa1, 0x4f, 0xb3, 0x60, 0x7c,
+        0x9a, 0x33, 0xb2, 0xcf, 0x0b, 0xe2, 0x86, 0x91, 0xda, 0x12, 0xea, 0x34,
+        0xed, 0x29, 0xfa, 0x96, 0x0a, 0x3e, 0x77, 0xfe, 0xde, 0x0c, 0x02, 0x90,
+        0x60, 0x2f, 0x5b, 0xb1, 0x97, 0x6a, 0x63, 0x2f, 0x6d, 0x4b, 0xcd, 0x3e,
+        0x0e, 0xc7, 0x4e, 0xae, 0x1a, 0x2b, 0xd8, 0xc7, 0xdc, 0x79, 0xda, 0xb8,
+        0x47, 0xfa, 0x0d, 0x8e, 0xd9, 0x63, 0x78, 0x4e, 0x8f, 0x63, 0x8f, 0x49,
+        0xab, 0xa4, 0x7d, 0x2d, 0xfa, 0x2d, 0x88, 0xb3, 0x6b, 0x2f, 0xe1, 0x49,
+        0xfd, 0xd0, 0xf3, 0x60, 0x4f, 0xed, 0x7a, 0x4f, 0x53, 0xde, 0x2b, 0x7a,
+        0x1f, 0xf3, 0xb5, 0xbf, 0x91, 0xf2, 0xb1, 0x1f, 0xc0, 0xee, 0x45, 0x73,
+        0x73, 0xcc, 0x6b, 0x92, 0x1f, 0x95, 0x08, 0x7e, 0x72, 0xaf, 0xcc, 0xbb,
+        0xbd, 0x1c, 0x0f, 0xe2, 0x83, 0x69, 0x9c, 0xb1, 0x15, 0xb4, 0xeb, 0xf5,
+        0x43, 0xbe, 0xb6, 0x44, 0xe8, 0xa9, 0xc3, 0xe7, 0x4c, 0x81, 0x86, 0xe8,
+        0x98, 0x03, 0x32, 0xec, 0xf1, 0x3c, 0x7a, 0x53, 0x7b, 0xc5, 0x75, 0x4a,
+        0x12, 0xfa, 0x19, 0x5c, 0x9f, 0x3a, 0x5f, 0x84, 0xe3, 0xcb, 0x5c, 0x6a,
+        0xc8, 0xbb, 0x90, 0x6f, 0xed, 0x4b, 0xcd, 0x32, 0x30, 0x89, 0x58, 0xab,
+        0xec, 0x91, 0x4f, 0xa1, 0x6c, 0x86, 0x6b, 0xbf, 0x6a, 0x71, 0x3f, 0x13,
+        0x3a, 0x7f, 0xf8, 0x4f, 0x0d, 0x19, 0x1d, 0x07, 0x76, 0x04, 0x32, 0xf7,
+        0xf7, 0x86, 0x37, 0xa1, 0x6c, 0xb6, 0x9b, 0x73, 0x66, 0x2c, 0x48, 0xdd,
+        0x09, 0xe5, 0x60, 0x9b, 0x73, 0xa7, 0xe6, 0x05, 0xdb, 0xb4, 0xcf, 0xad,
+        0xcf, 0x72, 0xac, 0x71, 0x96, 0x1b, 0x9a, 0xe4, 0xf2, 0xdd, 0x8d, 0x81,
+        0x1e, 0x52, 0xdf, 0xa0, 0xb7, 0xe0, 0xd7, 0xb3, 0x2b, 0xf4, 0xbb, 0xff,
+        0x3c, 0x39, 0xd9, 0x76, 0x89, 0xcd, 0x7e, 0x0f, 0xbc, 0xbc, 0x06, 0xb1,
+        0x8a, 0x88, 0x3d, 0x43, 0x1c, 0xa2, 0xbf, 0xb1, 0xec, 0xef, 0xce, 0xcb,
+        0x5a, 0xbe, 0xee, 0xc5, 0x7c, 0x8d, 0x4f, 0x5e, 0xa2, 0xaf, 0x31, 0xdc,
+        0x22, 0xad, 0xc4, 0xa2, 0x33, 0xf0, 0x6d, 0x2d, 0x69, 0x71, 0xbf, 0x01,
+        0x1b, 0x76, 0xda, 0x5e, 0xe7, 0x86, 0x98, 0xd0, 0x2e, 0x9b, 0x66, 0xb7,
+        0x68, 0x5c, 0x70, 0x66, 0x96, 0x71, 0x61, 0x1c, 0xbc, 0x1f, 0x09, 0xf2,
+        0xbc, 0xc9, 0x4d, 0x72, 0xa9, 0xf1, 0xf5, 0xb2, 0xdf, 0x3f, 0xd6, 0xf0,
+        0xfb, 0xaf, 0x6c, 0xe2, 0xe3, 0x5a, 0xb8, 0x78, 0x1a, 0x7c, 0xcb, 0x21,
+        0xfe, 0x65, 0x5c, 0x3b, 0x8c, 0x78, 0x98, 0xb1, 0x58, 0x1e, 0x31, 0x71,
+        0xe6, 0xb4, 0xc8, 0x6e, 0xc4, 0xc8, 0x99, 0x1f, 0x31, 0x7f, 0xf5, 0xbc,
+        0x9f, 0x99, 0x13, 0xb9, 0x1d, 0x7c, 0x1d, 0x04, 0x6e, 0x66, 0x81, 0xa3,
+        0x3b, 0xc1, 0xdf, 0x7e, 0x8d, 0x9d, 0xf7, 0x1f, 0x11, 0xeb, 0x0e, 0x9d,
+        0xab, 0xa6, 0x3e, 0x27, 0x61, 0x47, 0xeb, 0xf5, 0xfd, 0xd9, 0x5e, 0xc4,
+        0xf5, 0x69, 0xb9, 0xd5, 0x66, 0x1c, 0x6b, 0xd9, 0x5b, 0x07, 0xe6, 0x63,
+        0x51, 0x9f, 0xb4, 0x70, 0x51, 0x3b, 0xb0, 0x9a, 0xf7, 0x45, 0x6d, 0x0b,
+        0x0e, 0xc7, 0x2e, 0xc4, 0xfb, 0x3b, 0x1a, 0xbc, 0x6f, 0x69, 0x95, 0xd6,
+        0xdb, 0x75, 0x1e, 0x61, 0xeb, 0xc0, 0x7e, 0xe2, 0x55, 0x16, 0x76, 0x1d,
+        0xf6, 0xb7, 0x2e, 0xb7, 0x65, 0xdf, 0xae, 0xbf, 0xe8, 0x6e, 0x94, 0xd2,
+        0xce, 0xfb, 0x0c, 0x66, 0x2f, 0x7d, 0xad, 0xe0, 0x56, 0xa0, 0x1f, 0x41,
+        0xce, 0x70, 0xef, 0x74, 0x02, 0x96, 0x80, 0x7f, 0x9d, 0x32, 0x3f, 0xf4,
+        0x16, 0xce, 0x70, 0xc7, 0x49, 0x26, 0x9c, 0x14, 0x70, 0x78, 0x3e, 0xd9,
+        0xae, 0xf3, 0xc5, 0x9f, 0x70, 0x59, 0xef, 0xe0, 0x4c, 0x47, 0x65, 0x1e,
+        0xfe, 0x43, 0x75, 0x08, 0x34, 0xee, 0xec, 0x42, 0x7f, 0xea, 0x1d, 0x79,
+        0x3e, 0x0a, 0xdb, 0x4b, 0x9e, 0x26, 0xd1, 0x7f, 0x0f, 0xfa, 0x74, 0xe2,
+        0x79, 0x5f, 0x6c, 0xde, 0x61, 0xec, 0xfc, 0x79, 0x94, 0x39, 0x47, 0xd4,
+        0x76, 0x7e, 0x2e, 0x2e, 0x7a, 0x4e, 0x8e, 0xe9, 0xd2, 0xfa, 0xbf, 0xbc,
+        0x16, 0xd7, 0x61, 0xdb, 0xcf, 0xea, 0xd7, 0x0f, 0x0c, 0x45, 0xd6, 0xeb,
+        0x88, 0xac, 0x37, 0x14, 0x59, 0x8f, 0x74, 0x76, 0x46, 0xe8, 0xec, 0xc4,
+        0xf8, 0x22, 0xd6, 0x26, 0x3f, 0xa2, 0x6b, 0x3e, 0x18, 0x59, 0x33, 0xdc,
+        0x5f, 0x57, 0x64, 0xdc, 0xbb, 0x58, 0x8f, 0x75, 0xc9, 0x48, 0x1d, 0x69,
+        0xd8, 0x8c, 0x3a, 0x96, 0x3b, 0x23, 0x74, 0x91, 0xd6, 0x0d, 0xa8, 0xd7,
+        0xfe, 0x13, 0xf8, 0xdc, 0x0a, 0xbb, 0xa5, 0x60, 0x3b, 0x5a, 0xe0, 0x5f,
+        0x35, 0xef, 0xf5, 0x51, 0xac, 0x1b, 0xce, 0x97, 0xc4, 0x1c, 0xec, 0xcf,
+        0xbe, 0x31, 0x33, 0x9e, 0xf5, 0x6c, 0xff, 0xf3, 0xfa, 0x9f, 0x6a, 0xbe,
+        0x6d, 0x06, 0xed, 0x3a, 0xef, 0x22, 0x73, 0x9d, 0x36, 0xce, 0x93, 0xf1,
+        0xb1, 0x25, 0x57, 0xbb, 0xca, 0xea, 0x1d, 0xe0, 0xd9, 0x6f, 0x34, 0x58,
+        0xda, 0x6a, 0x15, 0x8e, 0x30, 0x5f, 0xd0, 0x66, 0x62, 0x3e, 0xc4, 0x1e,
+        0xda, 0xc6, 0xd8, 0xa6, 0x9d, 0x36, 0x86, 0x7e, 0x0b, 0xed, 0xe7, 0x69,
+        0xf3, 0x8e, 0x27, 0x64, 0xf8, 0x81, 0x6a, 0xa7, 0xbc, 0xa8, 0x79, 0xea,
+        0xc8, 0xd9, 0x06, 0x4f, 0xe3, 0xe6, 0xbb, 0xcc, 0x01, 0xf3, 0xcd, 0xa3,
+        0x0f, 0x7e, 0x11, 0xde, 0x6b, 0x79, 0xd0, 0x90, 0x96, 0xde, 0x01, 0xc6,
+        0x6e, 0x15, 0x3c, 0x99, 0xa7, 0xb0, 0xf0, 0x0c, 0xf2, 0x17, 0xbd, 0x03,
+        0xb0, 0x4b, 0xc0, 0xa1, 0xde, 0x81, 0x73, 0x3a, 0x9e, 0xab, 0xfa, 0x8e,
+        0x75, 0x9b, 0x17, 0xe4, 0x88, 0xce, 0xba, 0x17, 0xca, 0x11, 0xdd, 0xb3,
+        0x8e, 0x79, 0x8d, 0x30, 0x47, 0x74, 0x56, 0x74, 0x8e, 0xe8, 0xf8, 0x45,
+        0x72, 0x44, 0xf9, 0x4b, 0xcf, 0x11, 0x71, 0x7e, 0x5b, 0xee, 0x1c, 0x74,
+        0xd4, 0xaf, 0x9a, 0x1c, 0xd1, 0x1b, 0x12, 0xe4, 0x88, 0x5e, 0x94, 0xb5,
+        0x73, 0x44, 0x87, 0x9a, 0x72, 0x44, 0x9b, 0x75, 0x8e, 0x88, 0xf3, 0x04,
+        0x39, 0x22, 0x96, 0x4b, 0x03, 0x43, 0x91, 0x5c, 0x07, 0xf0, 0xd7, 0xbb,
+        0x01, 0x7c, 0x73, 0xac, 0x51, 0x2f, 0xc4, 0x34, 0x62, 0xff, 0x15, 0x0d,
+        0xfb, 0xb5, 0x8c, 0x6f, 0x96, 0x96, 0xb9, 0x8b, 0xe1, 0xdb, 0x68, 0xe0,
+        0x97, 0xac, 0xc0, 0xb6, 0xc9, 0x86, 0xef, 0xe2, 0xad, 0x63, 0x0c, 0x3d,
+        0x51, 0x5b, 0x9e, 0x77, 0x02, 0xbc, 0x1e, 0x6b, 0xe4, 0x49, 0xce, 0xe7,
+        0x1f, 0x25, 0xe5, 0xc0, 0x9a, 0xdf, 0xbd, 0x52, 0xf9, 0xd5, 0xdf, 0xbd,
+        0x2c, 0x49, 0x82, 0xce, 0xd2, 0x40, 0x49, 0xc7, 0x5d, 0xf3, 0xde, 0xaf,
+        0xc8, 0xd2, 0xdd, 0x0e, 0xf0, 0x27, 0xcc, 0x9f, 0xf0, 0x7c, 0x97, 0x6d,
+        0x4a, 0x41, 0x7d, 0x7c, 0x39, 0x94, 0x07, 0x74, 0x0e, 0xe5, 0xc5, 0x75,
+        0xd1, 0x1c, 0xca, 0x59, 0xb9, 0x70, 0x0e, 0xe5, 0x81, 0x35, 0x72, 0x28,
+        0x2f, 0xcb, 0x72, 0x0e, 0xe5, 0x65, 0x09, 0x73, 0x28, 0x31, 0x59, 0xda,
+        0x1c, 0x48, 0xe3, 0x03, 0xfe, 0x12, 0x7e, 0x67, 0xf0, 0x0b, 0x72, 0x2a,
+        0x67, 0x1b, 0xf4, 0xaf, 0x95, 0x53, 0x79, 0x7d, 0xdd, 0x07, 0xc9, 0xa9,
+        0x04, 0x36, 0x20, 0xcc, 0xa9, 0xe0, 0xe7, 0xc0, 0xe6, 0xa8, 0x68, 0x4e,
+        0xe5, 0x27, 0xd4, 0x07, 0xd4, 0xb1, 0xcc, 0x7a, 0xe8, 0x05, 0xec, 0x52,
+        0x5e, 0xe7, 0x38, 0x3e, 0x67, 0x78, 0x38, 0x87, 0x3d, 0xa7, 0x71, 0x16,
+        0xe4, 0x63, 0xaf, 0xf6, 0x2d, 0xf3, 0x76, 0xca, 0x2a, 0xf4, 0xc1, 0x9a,
+        0x4d, 0xf3, 0xbb, 0xb8, 0x6d, 0xed, 0xf5, 0x29, 0xe3, 0x09, 0xab, 0x8c,
+        0xbd, 0x0c, 0x4f, 0xcf, 0xc9, 0x5e, 0x3f, 0xf4, 0xa9, 0x06, 0x1a, 0x73,
+        0x50, 0x37, 0xe7, 0x81, 0xb3, 0xc0, 0x89, 0x4b, 0xb0, 0x51, 0xa7, 0x40,
+        0x73, 0x74, 0x1f, 0x88, 0x89, 0x07, 0x51, 0xa7, 0xcf, 0x9c, 0xbe, 0x65,
+        0x48, 0x4b, 0x9a, 0x7a, 0x7e, 0x09, 0xf3, 0xb1, 0xee, 0x94, 0x8e, 0xc7,
+        0xca, 0x83, 0xdc, 0x2b, 0x6d, 0xdd, 0x22, 0xe8, 0x43, 0x5d, 0x95, 0x31,
+        0x20, 0xed, 0x5e, 0x18, 0xa3, 0xb5, 0xeb, 0x18, 0xad, 0x4b, 0xf3, 0x83,
+        0xbc, 0xbe, 0x35, 0x41, 0xac, 0xec, 0x72, 0xb9, 0x87, 0x33, 0x06, 0xeb,
+        0x58, 0x0e, 0x62, 0xc1, 0xbc, 0xe2, 0xfb, 0xef, 0xe1, 0x5c, 0x99, 0xa7,
+        0x09, 0xcf, 0xef, 0x2b, 0x66, 0xdf, 0x43, 0x52, 0xe9, 0x92, 0xc4, 0x66,
+        0xd0, 0x53, 0x9a, 0xa1, 0xdf, 0xfd, 0x69, 0x1d, 0x83, 0x24, 0xdd, 0xf3,
+        0xeb, 0xed, 0x1d, 0x97, 0xa1, 0xb7, 0x23, 0x17, 0xd4, 0xdb, 0xaf, 0x25,
+        0xa2, 0x7a, 0x7b, 0xc7, 0x65, 0xe8, 0xed, 0xbe, 0xcb, 0xd2, 0x5b, 0xee,
+        0x8d, 0x98, 0x14, 0xe6, 0xc4, 0x56, 0xfb, 0x59, 0xe1, 0xba, 0xe3, 0x58,
+        0x33, 0x7f, 0x9e, 0x35, 0xc7, 0xce, 0x9b, 0x5b, 0x6d, 0xf6, 0xb1, 0x2e,
+        0xe5, 0xbc, 0x19, 0x5b, 0xd1, 0xde, 0xb6, 0x1b, 0xbb, 0x74, 0x9f, 0x89,
+        0xe7, 0xc3, 0xb8, 0x3e, 0xaa, 0x3f, 0x94, 0x0b, 0xca, 0xc2, 0x77, 0xc0,
+        0x2f, 0xca, 0x43, 0xa8, 0x73, 0xdd, 0x4d, 0x32, 0xb8, 0x88, 0x78, 0xbf,
+        0xdb, 0xc8, 0x20, 0xcf, 0xba, 0x4f, 0x7f, 0x67, 0xaa, 0x7a, 0x4f, 0x05,
+        0x71, 0xbe, 0x8b, 0x67, 0x35, 0xd4, 0x35, 0xf0, 0x24, 0x19, 0xb6, 0x91,
+        0x8f, 0x2e, 0x7c, 0x9e, 0x1d, 0xf0, 0xd7, 0xc0, 0x23, 0x5d, 0xbf, 0x32,
+        0x27, 0x7c, 0x61, 0x3c, 0x93, 0x4a, 0x1c, 0x7d, 0x4f, 0x0c, 0x42, 0xc7,
+        0x07, 0x89, 0x51, 0x35, 0xc4, 0x3d, 0x94, 0x43, 0xca, 0xe6, 0xb6, 0xfe,
+        0x5d, 0x8a, 0x3e, 0xd5, 0x13, 0x88, 0x83, 0x29, 0xaf, 0x69, 0xd9, 0xe5,
+        0x6f, 0x3b, 0x7d, 0x56, 0x71, 0x8d, 0x7a, 0xbd, 0xc4, 0x58, 0xd1, 0x11,
+        0xb5, 0x75, 0xe0, 0xbf, 0x13, 0xb4, 0x4b, 0x57, 0xb8, 0x31, 0x23, 0x6b,
+        0x79, 0xbc, 0x53, 0x6e, 0x7f, 0x08, 0x7b, 0xcf, 0xef, 0xfd, 0xaf, 0xa1,
+        0x3e, 0x05, 0x9d, 0xa7, 0x7d, 0x67, 0x3c, 0x72, 0x93, 0xe9, 0xd7, 0xad,
+        0xbf, 0x57, 0x16, 0xb2, 0x37, 0x98, 0x6f, 0x57, 0xb4, 0x3f, 0x19, 0xda,
+        0xec, 0x15, 0xe7, 0xcc, 0xfb, 0x12, 0x45, 0x1d, 0xcf, 0x70, 0xbc, 0x96,
+        0x49, 0xc4, 0x20, 0x76, 0x24, 0x97, 0x9e, 0x30, 0xb1, 0x1b, 0x75, 0xac,
+        0x1d, 0x67, 0xe8, 0x9b, 0x58, 0x85, 0xf1, 0xeb, 0xca, 0x7b, 0x12, 0x6b,
+        0xcb, 0xc0, 0x96, 0x0f, 0x20, 0x03, 0xcd, 0xe7, 0x97, 0x80, 0xee, 0x87,
+        0xe7, 0x17, 0xfa, 0x31, 0x73, 0x66, 0xdf, 0xdd, 0xc1, 0x19, 0xfe, 0xbf,
+        0xd8, 0xa7, 0x15, 0xd9, 0x67, 0x88, 0x47, 0x0f, 0x98, 0x7d, 0xde, 0xd4,
+        0x84, 0x47, 0x23, 0x4d, 0x3a, 0xfb, 0x71, 0xe2, 0xd1, 0x9f, 0xac, 0xff,
+        0xf8, 0xf1, 0x88, 0xfb, 0xea, 0x5e, 0x13, 0x87, 0x82, 0x7d, 0x3c, 0x22,
+        0x2a, 0xf7, 0x51, 0xc6, 0x7b, 0x1f, 0xe4, 0x7c, 0xa2, 0x38, 0xc2, 0x33,
+        0xe9, 0xd0, 0x3e, 0x6c, 0xa0, 0x7b, 0xb0, 0xe5, 0xd5, 0xb8, 0xbc, 0x7e,
+        0x57, 0x42, 0xfe, 0xf7, 0x46, 0x7e, 0x0f, 0xb3, 0x4d, 0x4e, 0x8b, 0xe5,
+        0xd7, 0xd6, 0x07, 0x76, 0xe8, 0xb5, 0x4d, 0x81, 0xdd, 0xe1, 0x98, 0x50,
+        0x9f, 0x1d, 0xb4, 0xb3, 0xad, 0x5b, 0x96, 0x3a, 0x2f, 0x27, 0x06, 0xdc,
+        0xe6, 0xbc, 0xa1, 0xd6, 0x8a, 0x01, 0x2f, 0x9c, 0x0f, 0x5c, 0x8e, 0x01,
+        0x89, 0xb3, 0x9d, 0x5a, 0x36, 0x4a, 0x49, 0xc6, 0x3e, 0x7d, 0x06, 0x3b,
+        0xf9, 0x8e, 0xd8, 0xd6, 0x43, 0xbc, 0xeb, 0x21, 0xd6, 0xf5, 0x10, 0xff,
+        0x7a, 0x88, 0x71, 0x3d, 0xc4, 0xb6, 0x1e, 0x62, 0x5b, 0x0f, 0xb1, 0xad,
+        0xd7, 0x6f, 0x62, 0xe4, 0x11, 0x93, 0xf7, 0xe7, 0x77, 0x72, 0xe6, 0x17,
+        0x2a, 0xb0, 0x25, 0x93, 0xbc, 0xe7, 0xa0, 0x0a, 0xd9, 0xf5, 0x66, 0x7f,
+        0x61, 0x4e, 0xbc, 0xc7, 0xe4, 0x6c, 0x5e, 0xd7, 0x79, 0x43, 0x51, 0xb3,
+        0xad, 0xc1, 0xb7, 0x74, 0xde, 0xc7, 0xf8, 0x2d, 0xf8, 0x25, 0xfa, 0x3e,
+        0x13, 0x75, 0xb4, 0xae, 0x72, 0xcc, 0xc9, 0x88, 0x52, 0xb9, 0xeb, 0x31,
+        0x66, 0x47, 0x10, 0x13, 0x24, 0x25, 0xa6, 0x72, 0x6d, 0xe4, 0xa9, 0xa5,
+        0x72, 0x1b, 0xcc, 0x5c, 0x47, 0x5b, 0x03, 0xdf, 0xaa, 0x8f, 0x65, 0x5b,
+        0xe5, 0x6e, 0xe6, 0x13, 0xe7, 0x1e, 0xd6, 0xf7, 0x74, 0xae, 0x5c, 0x6b,
+        0x4a, 0xe3, 0x7b, 0x21, 0x7b, 0x37, 0xe6, 0xd3, 0xf7, 0x88, 0x1a, 0xfc,
+        0x56, 0xe7, 0xe5, 0xf7, 0x94, 0xe1, 0x77, 0xc0, 0xe3, 0x18, 0xfb, 0xe9,
+        0xbc, 0x30, 0x79, 0x1d, 0xce, 0xa7, 0xf3, 0x7a, 0x58, 0x47, 0xdf, 0xa5,
+        0xc0, 0x53, 0xc5, 0xa5, 0x63, 0xf4, 0x9e, 0xb8, 0x1b, 0x5d, 0x37, 0xfc,
+        0x26, 0x7e, 0x29, 0x6b, 0x76, 0xeb, 0xef, 0x68, 0x81, 0xcd, 0x98, 0xd2,
+        0x32, 0x68, 0xe7, 0xb8, 0xaf, 0xf7, 0x21, 0x7f, 0x53, 0x5a, 0xfe, 0x8a,
+        0x88, 0x63, 0x26, 0x07, 0xb7, 0xa5, 0x6d, 0x75, 0xa0, 0x95, 0xf9, 0xd7,
+        0x61, 0x3f, 0xc4, 0x3d, 0xae, 0xd7, 0x6c, 0xc7, 0x99, 0x57, 0x0b, 0xf1,
+        0x4c, 0xb6, 0x04, 0xf9, 0xb6, 0x0f, 0xa3, 0x4b, 0xad, 0x4d, 0xba, 0x14,
+        0xee, 0x93, 0xfb, 0xe7, 0x73, 0xed, 0x3b, 0x15, 0x8b, 0x7e, 0xe4, 0xfb,
+        0x48, 0x43, 0x36, 0x78, 0xb7, 0xe4, 0x8b, 0x90, 0x41, 0xfd, 0x9d, 0x02,
+        0x7a, 0x54, 0xaf, 0x0f, 0x33, 0xc7, 0xbc, 0xf3, 0x0b, 0xe6, 0xde, 0x82,
+        0x3c, 0xcc, 0xfc, 0x83, 0xbd, 0x2a, 0xff, 0x30, 0x0c, 0x59, 0x81, 0x0f,
+        0xe0, 0x75, 0x68, 0x9f, 0x4e, 0xb9, 0xf4, 0x07, 0x9a, 0xbf, 0xbf, 0x3c,
+        0xda, 0x16, 0xf0, 0xe1, 0xed, 0xd6, 0xe0, 0x1b, 0xc4, 0xdf, 0x26, 0x57,
+        0x96, 0x39, 0xfe, 0x7f, 0x8c, 0xac, 0x1c, 0x86, 0x6d, 0x1e, 0x86, 0x2c,
+        0x22, 0x26, 0xd7, 0xf3, 0x1d, 0x96, 0xd2, 0xd3, 0x0b, 0x9d, 0x2b, 0xfb,
+        0xa3, 0xee, 0x58, 0xd8, 0xff, 0xb1, 0xa6, 0xfe, 0x8f, 0xa1, 0xff, 0x0b,
+        0x4d, 0xfd, 0x1f, 0x8b, 0xf4, 0x3f, 0xda, 0xd4, 0x1f, 0x31, 0xe2, 0xd3,
+        0xff, 0xdc, 0xd4, 0xff, 0x68, 0xa4, 0xff, 0x6c, 0x53, 0xff, 0x59, 0xf4,
+        0x7f, 0xad, 0xa9, 0x3f, 0xea, 0x8e, 0xb5, 0x98, 0xef, 0x62, 0xc4, 0xd8,
+        0x7d, 0x26, 0x16, 0xc7, 0xb3, 0xd6, 0xfc, 0xad, 0x85, 0x72, 0xd7, 0x83,
+        0x33, 0x08, 0xef, 0xb4, 0x51, 0x5f, 0xf3, 0xd0, 0xd7, 0x65, 0x5f, 0x26,
+        0x90, 0xc7, 0xa8, 0x2c, 0x12, 0x1f, 0x2a, 0x12, 0x73, 0x7d, 0xfa, 0x47,
+        0x56, 0xb9, 0x1a, 0xda, 0x24, 0xde, 0x5b, 0xe2, 0x7d, 0xd7, 0xc0, 0xf6,
+        0xc6, 0xdd, 0x45, 0x13, 0x83, 0x5d, 0xd1, 0x06, 0xda, 0x81, 0x97, 0x21,
+        0x66, 0xca, 0xe1, 0x40, 0x6f, 0x28, 0xbf, 0x9c, 0xdf, 0xe8, 0x0f, 0x65,
+        0xd5, 0xac, 0x33, 0xbc, 0x0a, 0xd7, 0xd2, 0xab, 0x72, 0x5b, 0xb1, 0x4b,
+        0xc0, 0xb5, 0x91, 0x06, 0xae, 0x7d, 0x51, 0xe6, 0x1a, 0xf1, 0xf6, 0x19,
+        0xd9, 0xef, 0xed, 0xe1, 0x3d, 0x9d, 0xc3, 0x79, 0xf9, 0x68, 0xe2, 0xed,
+        0x3d, 0x0d, 0x3b, 0xc9, 0x3b, 0x1d, 0xe9, 0x83, 0xbc, 0x83, 0x1b, 0xe6,
+        0x66, 0x27, 0xbd, 0x5f, 0xc7, 0xfe, 0x69, 0x33, 0x2f, 0x37, 0xde, 0xe6,
+        0x7c, 0x49, 0xd9, 0x1f, 0xdc, 0x77, 0x68, 0xcc, 0x5b, 0x69, 0xcc, 0x9b,
+        0x32, 0xfa, 0x46, 0x1b, 0xbc, 0x6c, 0x2f, 0x8b, 0xb0, 0x97, 0x63, 0x88,
+        0xb9, 0x17, 0xbd, 0xb5, 0xf2, 0xa3, 0x97, 0x6b, 0x2f, 0x9b, 0xf3, 0xcc,
+        0xcd, 0xf6, 0x92, 0xeb, 0x34, 0xe7, 0x96, 0xd3, 0x4d, 0xf8, 0x4f, 0x79,
+        0x3a, 0x67, 0x7c, 0x6a, 0x3c, 0xab, 0xe7, 0xa0, 0x8f, 0x4a, 0xc6, 0xb4,
+        0xfc, 0xb2, 0x1c, 0xc6, 0x96, 0xf7, 0x34, 0x62, 0xcb, 0xe5, 0x78, 0x10,
+        0xbe, 0x6b, 0xff, 0x67, 0x0c, 0x3e, 0xd2, 0x47, 0x76, 0xac, 0xb2, 0xb7,
+        0x5b, 0xed, 0xd5, 0x6d, 0xcc, 0x97, 0x5e, 0x2b, 0xb7, 0xea, 0x38, 0xfe,
+        0x8c, 0xc9, 0x4d, 0xcd, 0x69, 0xff, 0x9f, 0xdf, 0x0b, 0xca, 0xd9, 0x4d,
+        0xc6, 0xdf, 0xbb, 0x18, 0xae, 0xae, 0x8c, 0x4d, 0x95, 0x3a, 0x88, 0xb1,
+        0x8c, 0x4d, 0xfb, 0xdb, 0x89, 0xa1, 0x05, 0xff, 0x82, 0xe3, 0x31, 0x8e,
+        0xe3, 0xd9, 0x47, 0xc7, 0xa1, 0xe8, 0xb7, 0x68, 0xc6, 0x07, 0x71, 0x68,
+        0xc1, 0xff, 0x71, 0x5b, 0x80, 0x83, 0x17, 0x8a, 0x59, 0x3e, 0xdf, 0xce,
+        0xbc, 0xde, 0xa2, 0x77, 0x31, 0x5a, 0x57, 0xc7, 0xbd, 0xb1, 0x55, 0x71,
+        0xaf, 0x6d, 0xe2, 0xda, 0x5f, 0xd2, 0x71, 0x6f, 0xc0, 0x63, 0xee, 0x25,
+        0x1a, 0x47, 0xb9, 0xc0, 0x42, 0x7e, 0x53, 0x21, 0x3e, 0xd0, 0x47, 0x81,
+        0x9f, 0x35, 0xfd, 0x8b, 0xe0, 0x73, 0x72, 0x0d, 0xb9, 0xf9, 0xb8, 0xed,
+        0x44, 0xb8, 0xf7, 0x73, 0x12, 0xe4, 0xeb, 0x76, 0x83, 0x16, 0xc6, 0x56,
+        0x71, 0x23, 0x0f, 0x3f, 0x35, 0xf7, 0x2a, 0xc3, 0x7e, 0x61, 0x1c, 0xdf,
+        0xf8, 0xee, 0x5a, 0xc9, 0xaf, 0xc8, 0x9f, 0x74, 0x33, 0x0d, 0x8d, 0x73,
+        0xcf, 0x5f, 0xc6, 0x77, 0x8b, 0x0f, 0x73, 0x3f, 0xa2, 0xd9, 0xae, 0xf1,
+        0xbb, 0x29, 0xbf, 0x95, 0x8a, 0x75, 0x67, 0x9f, 0x0b, 0x1d, 0xe0, 0xbd,
+        0xe1, 0x28, 0xbe, 0x26, 0xa4, 0x34, 0x2b, 0x89, 0x64, 0x8e, 0xdf, 0x00,
+        0x68, 0xff, 0x7f, 0x68, 0xf6, 0x99, 0x92, 0x7d, 0x33, 0x41, 0xce, 0x53,
+        0x5d, 0xf0, 0x5e, 0xdc, 0xe3, 0xe0, 0x43, 0xe6, 0x50, 0x98, 0xf3, 0x54,
+        0xc1, 0xbd, 0xb8, 0x43, 0x1f, 0xdd, 0xbd, 0x38, 0xce, 0x6f, 0xcb, 0x9e,
+        0x35, 0xee, 0xc5, 0xc5, 0x2e, 0xf1, 0x5e, 0xdc, 0x26, 0x9d, 0xf3, 0xe4,
+        0x3c, 0x41, 0xce, 0x93, 0xe5, 0xad, 0x03, 0xcc, 0x95, 0xf0, 0xee, 0xdb,
+        0xa0, 0xbe, 0x2f, 0xbc, 0x75, 0xe0, 0xe7, 0x11, 0xa3, 0xfc, 0x75, 0xfb,
+        0xc7, 0x1f, 0xa3, 0x70, 0x2f, 0xbf, 0x11, 0x7c, 0xdf, 0x95, 0xcb, 0xc9,
+        0x03, 0x7c, 0xb8, 0xbc, 0xe6, 0x3e, 0x9d, 0xd7, 0x7c, 0xa7, 0x3d, 0x9a,
+        0xd7, 0x54, 0x17, 0xb9, 0x1b, 0xb6, 0x6f, 0x8d, 0xbc, 0x66, 0x3c, 0x72,
+        0x37, 0x2c, 0x6e, 0xee, 0x86, 0x6d, 0x72, 0x11, 0x4b, 0x9a, 0x3c, 0xa6,
+        0xba, 0xe0, 0xdd, 0xb0, 0xce, 0x0d, 0x1f, 0x3e, 0x8f, 0xb9, 0xea, 0x6e,
+        0x18, 0x6c, 0xdd, 0x16, 0x49, 0x5f, 0x56, 0xdc, 0xf3, 0x61, 0x62, 0x1e,
+        0xde, 0xab, 0x6f, 0xc1, 0x9e, 0xe3, 0xb2, 0x27, 0x49, 0xf9, 0xe4, 0xdd,
+        0xc6, 0x3e, 0xe8, 0x02, 0x9e, 0x3e, 0xcb, 0xfd, 0x3c, 0x23, 0x6b, 0xa4,
+        0x6f, 0xe5, 0x3d, 0x84, 0xe5, 0x3b, 0xbd, 0x89, 0xc6, 0x9d, 0xde, 0x29,
+        0xc8, 0x8d, 0x9a, 0x49, 0xc8, 0x7c, 0x44, 0xa6, 0x26, 0x3d, 0xf8, 0x4b,
+        0xb3, 0x8e, 0x69, 0xe7, 0xff, 0xef, 0x48, 0x02, 0xf3, 0x78, 0x0f, 0xb8,
+        0x43, 0x62, 0xb3, 0xc1, 0x37, 0xcb, 0xe0, 0xff, 0xb8, 0xa4, 0xd0, 0x87,
+        0x77, 0x3c, 0xe3, 0xb2, 0x5f, 0xe7, 0x2c, 0x42, 0x59, 0xfe, 0x35, 0xf0,
+        0x78, 0x73, 0x7e, 0xb9, 0x9c, 0x5c, 0xc3, 0xee, 0x27, 0xa5, 0x3c, 0x43,
+        0x79, 0xbe, 0xc1, 0xfc, 0xff, 0x82, 0xd3, 0x52, 0xf6, 0x4f, 0x99, 0xf8,
+        0x42, 0x7f, 0xdb, 0x01, 0x2f, 0xb7, 0x18, 0x1b, 0x8c, 0x67, 0x75, 0x0b,
+        0x6d, 0x1e, 0xd6, 0x38, 0x2e, 0xc3, 0xd3, 0x3b, 0x52, 0x7b, 0x81, 0x77,
+        0x63, 0x7a, 0xcd, 0xcb, 0xe1, 0xb9, 0x75, 0x9e, 0xef, 0x8d, 0x97, 0xca,
+        0xf7, 0xd0, 0x3f, 0xae, 0x62, 0x7f, 0x5b, 0x20, 0x1f, 0x5f, 0x95, 0xe2,
+        0xb1, 0x6b, 0x65, 0xf8, 0x68, 0x06, 0xf4, 0xbc, 0x5f, 0x2f, 0x67, 0xe1,
+        0x4b, 0x3f, 0xcd, 0x7b, 0x63, 0xc0, 0x50, 0xf0, 0xed, 0xf9, 0x55, 0xdf,
+        0xb1, 0xa3, 0x77, 0xcd, 0xfa, 0x1b, 0x77, 0x87, 0x9e, 0xf5, 0x25, 0xd1,
+        0x49, 0x9a, 0x67, 0x96, 0xef, 0x8f, 0x2f, 0xfa, 0xbb, 0xb4, 0x6d, 0x7b,
+        0xc6, 0x5f, 0x91, 0xfb, 0xd1, 0x67, 0x38, 0x5e, 0xfb, 0x1e, 0xec, 0xdb,
+        0x39, 0x8b, 0xf6, 0x6d, 0xca, 0x93, 0xab, 0x63, 0xc2, 0xf3, 0x10, 0x0b,
+        0x3c, 0xd0, 0x77, 0x38, 0x82, 0xef, 0xfb, 0x3d, 0xfa, 0x5c, 0x03, 0xac,
+        0x58, 0x88, 0xdc, 0xc1, 0x58, 0x3e, 0xdb, 0xe0, 0x6e, 0x46, 0x70, 0x16,
+        0xc1, 0xfd, 0x11, 0xed, 0x6f, 0x1e, 0xdc, 0xe3, 0x06, 0xf7, 0x47, 0x7a,
+        0x67, 0x59, 0xd7, 0xd5, 0x64, 0xfb, 0x12, 0x90, 0x01, 0xde, 0x3b, 0xe2,
+        0xbd, 0x71, 0xd2, 0xac, 0x73, 0x1d, 0xff, 0x47, 0xdd, 0xd5, 0xc7, 0xb6,
+        0x75, 0x5d, 0xf7, 0xc3, 0x47, 0xea, 0xc3, 0xb4, 0x2c, 0x53, 0x32, 0x25,
+        0xd3, 0x96, 0x2c, 0xbf, 0x27, 0x3d, 0x59, 0x72, 0xac, 0x14, 0xac, 0xab,
+        0xad, 0x02, 0x46, 0xa4, 0x0c, 0x49, 0x7f, 0xb4, 0x08, 0x06, 0xfa, 0xa3,
+        0x99, 0x8b, 0x66, 0xab, 0x4b, 0xd9, 0x4e, 0x0a, 0xf4, 0x0f, 0xb7, 0xc5,
+        0x80, 0x6c, 0x58, 0x60, 0x86, 0xb4, 0x12, 0x63, 0x56, 0x4c, 0xd6, 0x66,
+        0x85, 0x0c, 0xd8, 0x30, 0x4e, 0x54, 0x9c, 0x14, 0x50, 0xc6, 0x04, 0x69,
+        0x83, 0xa2, 0x58, 0x61, 0x45, 0x76, 0x36, 0x6c, 0x7f, 0x65, 0x43, 0xd0,
+        0x05, 0x9b, 0xb3, 0x38, 0x76, 0xb0, 0x06, 0x45, 0xd6, 0x7d, 0x62, 0x18,
+        0xd0, 0x0d, 0xdc, 0xf9, 0xdd, 0x0f, 0xf2, 0xf1, 0xf1, 0x51, 0x1f, 0x89,
+        0x33, 0x60, 0x02, 0x04, 0xbe, 0xf7, 0x78, 0xdf, 0x7b, 0xf7, 0x9e, 0x7b,
+        0xce, 0xb9, 0xbf, 0x73, 0xee, 0x39, 0x87, 0x9e, 0x7b, 0xdb, 0x9b, 0xf3,
+        0xb9, 0xca, 0x77, 0x8e, 0x8a, 0x77, 0x0e, 0x28, 0x9d, 0xa5, 0xe3, 0xc5,
+        0x63, 0xc6, 0x6c, 0x61, 0x22, 0xe2, 0x67, 0xfe, 0x9e, 0xad, 0xc2, 0xbe,
+        0x6e, 0x87, 0xe1, 0xd6, 0xa2, 0x67, 0xbc, 0x85, 0x9e, 0xcd, 0x32, 0xc1,
+        0xf6, 0x78, 0x5d, 0x77, 0x4b, 0xda, 0xc9, 0xeb, 0x88, 0x85, 0xd7, 0x31,
+        0x0e, 0x92, 0x76, 0x75, 0x19, 0xba, 0xe2, 0x8c, 0x6f, 0x68, 0xd0, 0xee,
+        0x74, 0x9d, 0x76, 0x3b, 0xff, 0x1f, 0xd1, 0xee, 0x1d, 0x81, 0x7f, 0x5f,
+        0xad, 0x22, 0x6e, 0x4d, 0x63, 0x00, 0x9d, 0x3b, 0x04, 0x3a, 0x42, 0x9f,
+        0x5a, 0xe5, 0x15, 0x82, 0x4e, 0x45, 0x5c, 0x71, 0xad, 0xf6, 0x5a, 0xb4,
+        0xee, 0xa7, 0x64, 0xbb, 0x04, 0xf6, 0x09, 0xfc, 0x79, 0xed, 0xd7, 0xc8,
+        0x63, 0x1f, 0x6b, 0x8d, 0x04, 0x56, 0x72, 0xdb, 0x27, 0x0c, 0x08, 0x1d,
+        0xf6, 0xc9, 0xb1, 0x4d, 0xda, 0x27, 0xe7, 0xa5, 0x7d, 0x92, 0xdd, 0xb8,
+        0x7d, 0xb2, 0xbb, 0x25, 0xae, 0xab, 0x31, 0x9e, 0xcd, 0xdb, 0x27, 0xc6,
+        0x9a, 0xf6, 0xc9, 0x90, 0xc3, 0x17, 0x83, 0xfe, 0xfe, 0x06, 0x65, 0x8f,
+        0x43, 0xc7, 0x69, 0x3a, 0x83, 0xc6, 0xc7, 0x5d, 0x7e, 0xe1, 0x4f, 0x93,
+        0xd6, 0xbf, 0xf8, 0x3f, 0xa6, 0xf5, 0x50, 0x8b, 0xcf, 0xbb, 0x31, 0x1e,
+        0x0a, 0xef, 0xd8, 0x14, 0x8e, 0x77, 0xd3, 0x7a, 0xa8, 0xad, 0xef, 0xb4,
+        0x7d, 0xcc, 0x62, 0xb3, 0xef, 0x74, 0xd4, 0x68, 0xa7, 0xdb, 0xff, 0xd8,
+        0xe1, 0x53, 0x75, 0xea, 0x77, 0xc8, 0x14, 0xf9, 0x8e, 0x4d, 0xe8, 0x77,
+        0x41, 0x96, 0xac, 0x6c, 0x96, 0x60, 0x33, 0xe1, 0x7d, 0x11, 0x21, 0x6b,
+        0x2e, 0xbc, 0xc5, 0xef, 0x63, 0x7a, 0xbe, 0xf8, 0x87, 0x62, 0x9d, 0x92,
+        0xfe, 0x07, 0xb4, 0x0f, 0xfb, 0xce, 0x88, 0xb6, 0x32, 0xbe, 0x49, 0xf9,
+        0x23, 0x14, 0xf6, 0x6f, 0xe7, 0x87, 0x68, 0x5d, 0xf3, 0x36, 0x67, 0x2b,
+        0x68, 0x19, 0xdf, 0xcb, 0xf3, 0x12, 0x69, 0xb2, 0xb5, 0xa0, 0x3f, 0xcf,
+        0x33, 0x2e, 0x18, 0xad, 0x63, 0x82, 0xe6, 0xb9, 0xb9, 0x28, 0x6c, 0x3a,
+        0xad, 0x3b, 0x57, 0x64, 0xec, 0xa9, 0xb8, 0x0e, 0x9c, 0xa6, 0x75, 0xa7,
+        0x1b, 0x07, 0xef, 0xf5, 0xe0, 0x0b, 0xcf, 0xdc, 0x4f, 0x3d, 0x77, 0x26,
+        0x62, 0xce, 0x53, 0x9e, 0x73, 0x57, 0xcf, 0xe1, 0xca, 0x36, 0xda, 0xca,
+        0xfb, 0x53, 0x62, 0x5c, 0xdf, 0xfc, 0x62, 0x02, 0xb9, 0x6a, 0xf5, 0xfc,
+        0x21, 0x77, 0xce, 0x14, 0xd6, 0x01, 0x2d, 0x87, 0x3a, 0x3f, 0x1b, 0xb4,
+        0x18, 0xf1, 0xc8, 0x99, 0x72, 0xae, 0x25, 0xb8, 0xcf, 0x4d, 0x8b, 0xc6,
+        0x3a, 0x32, 0xa7, 0xd6, 0x91, 0x45, 0x87, 0x1e, 0x6f, 0xc5, 0xed, 0xfd,
+        0x1e, 0xb8, 0xdd, 0x2b, 0x6f, 0x0a, 0x7d, 0x7a, 0x92, 0x71, 0xc8, 0x67,
+        0x80, 0x43, 0x42, 0xc8, 0x5b, 0x92, 0x58, 0x04, 0xdf, 0x17, 0x19, 0x8f,
+        0x44, 0x98, 0x57, 0x7e, 0x44, 0xe7, 0x18, 0x6b, 0x5f, 0xa7, 0xfd, 0xca,
+        0x3e, 0x83, 0xdc, 0xea, 0x38, 0x53, 0xc4, 0xf1, 0xfb, 0x28, 0xfb, 0x98,
+        0x35, 0x19, 0xa7, 0x1f, 0xd1, 0x59, 0x11, 0x33, 0x83, 0xfd, 0x3d, 0xc4,
+        0x1c, 0x3c, 0x20, 0xde, 0x2f, 0x7d, 0x19, 0xf7, 0x23, 0xa6, 0x6e, 0xe3,
+        0xf1, 0xfb, 0x2a, 0xb7, 0x8e, 0xdb, 0xe1, 0x9d, 0x4b, 0x4a, 0xa6, 0xc4,
+        0x35, 0xbe, 0xff, 0x49, 0xa3, 0xf5, 0xfe, 0xb8, 0x91, 0xaa, 0xa6, 0x8c,
+        0x44, 0x05, 0xed, 0x9e, 0x34, 0x92, 0x55, 0xd8, 0x90, 0x9a, 0x47, 0xac,
+        0x28, 0xe4, 0x6d, 0x95, 0xd6, 0xdf, 0x8b, 0x58, 0x24, 0x57, 0x9e, 0xc4,
+        0x06, 0xfa, 0x7d, 0xb8, 0xa9, 0xdf, 0x9a, 0xbe, 0x38, 0x86, 0xbf, 0xe7,
+        0x15, 0xa6, 0xa9, 0xc6, 0xb5, 0x41, 0xf8, 0xd7, 0x27, 0xb3, 0xb4, 0x16,
+        0xae, 0xb5, 0x5a, 0x70, 0xed, 0xe2, 0xba, 0xfd, 0xfe, 0xa4, 0x32, 0x2e,
+        0xf3, 0xa3, 0xfd, 0xb6, 0xc0, 0xaf, 0xdc, 0xef, 0x26, 0x6c, 0xeb, 0xe2,
+        0x29, 0xb4, 0xd1, 0x7e, 0x70, 0xed, 0x07, 0xeb, 0x55, 0xf1, 0xc0, 0x3a,
+        0x3e, 0x21, 0x88, 0x7c, 0xaf, 0x90, 0x8c, 0x6b, 0x85, 0x8d, 0xb5, 0xc2,
+        0xfd, 0x83, 0xbd, 0x05, 0x9f, 0x8f, 0xb0, 0xb7, 0xcc, 0x24, 0x49, 0x5f,
+        0xf7, 0x99, 0xaa, 0xd3, 0xbf, 0xeb, 0x95, 0x4b, 0x39, 0xea, 0x91, 0x4b,
+        0xe9, 0x94, 0xb5, 0x80, 0x43, 0xd6, 0x22, 0x0e, 0xdc, 0x36, 0xcc, 0x76,
+        0x4b, 0x0f, 0xeb, 0x90, 0x1e, 0xb1, 0x6d, 0xe2, 0xbf, 0xea, 0xb4, 0x5b,
+        0xdc, 0x79, 0xf1, 0x90, 0x3b, 0x60, 0x33, 0x69, 0xc3, 0xa4, 0x4a, 0xf5,
+        0x9c, 0x7a, 0x1e, 0x77, 0x23, 0x6f, 0xb1, 0xd2, 0x92, 0x63, 0xe9, 0xd5,
+        0xdf, 0x91, 0x96, 0xfe, 0x62, 0xfd, 0x8a, 0xb7, 0xc5, 0x74, 0x5e, 0x76,
+        0xd5, 0xfd, 0xea, 0x9f, 0x5b, 0x9f, 0xe1, 0x5d, 0xa3, 0xc2, 0xe7, 0x9d,
+        0xad, 0xeb, 0xb2, 0x19, 0xd9, 0xdf, 0x42, 0xb3, 0x9d, 0xe1, 0xbf, 0x42,
+        0x8a, 0x76, 0xde, 0xba, 0x7d, 0x73, 0xfe, 0xb3, 0xad, 0x6e, 0x1c, 0xdc,
+        0x27, 0xfd, 0x62, 0x73, 0x2a, 0x0e, 0x7b, 0x40, 0xd9, 0x7b, 0xeb, 0xf1,
+        0x3b, 0xae, 0xcd, 0x29, 0x5f, 0xa2, 0x65, 0x96, 0x09, 0x7c, 0x7e, 0xfc,
+        0x54, 0x87, 0x1d, 0x52, 0x7b, 0x59, 0xd8, 0xaf, 0x02, 0xdf, 0xeb, 0xe7,
+        0x43, 0x67, 0x6f, 0x64, 0xce, 0xcc, 0x96, 0x39, 0x93, 0x7c, 0x05, 0x5b,
+        0x0b, 0xf1, 0xc5, 0x53, 0xae, 0x18, 0xef, 0x4f, 0x42, 0x8b, 0x5e, 0x8f,
+        0xb8, 0x67, 0xc4, 0x2d, 0xb7, 0xeb, 0xe7, 0x1d, 0x07, 0x2e, 0x47, 0x7f,
+        0x6b, 0xb5, 0x57, 0xa2, 0xbb, 0xe5, 0x5a, 0x5c, 0xf5, 0xc6, 0x48, 0xa1,
+        0x0d, 0xf7, 0xcf, 0xbd, 0xf6, 0xee, 0xda, 0xe0, 0xda, 0x2b, 0xea, 0x8b,
+        0xf8, 0x0e, 0x09, 0x1d, 0xd0, 0x43, 0x95, 0x12, 0xe2, 0xaf, 0x3f, 0x0b,
+        0x99, 0x67, 0x3d, 0xeb, 0xc8, 0x49, 0xf3, 0x9e, 0xc7, 0xfa, 0x9e, 0x4a,
+        0x20, 0x86, 0xbd, 0x3f, 0xc4, 0x96, 0xf4, 0xb3, 0xee, 0x41, 0xfb, 0x71,
+        0xf3, 0x16, 0xfc, 0xbd, 0xca, 0xff, 0x94, 0x52, 0xeb, 0xcb, 0xa1, 0x0d,
+        0xec, 0xad, 0x6c, 0x4e, 0x4f, 0x5b, 0xe6, 0x0a, 0x61, 0xdf, 0x07, 0xf1,
+        0xc2, 0xc7, 0x7a, 0xa9, 0xf7, 0x2b, 0x5d, 0x5d, 0xf6, 0x1f, 0xf4, 0xc9,
+        0xbd, 0x28, 0x7c, 0xd7, 0x43, 0x2f, 0x94, 0x10, 0xcb, 0x8d, 0xef, 0x7e,
+        0x8b, 0xbf, 0xf3, 0xd2, 0x51, 0x3a, 0x16, 0x1d, 0x58, 0x4e, 0xce, 0x4f,
+        0x99, 0x60, 0x2b, 0xd5, 0xe8, 0x6f, 0xa2, 0x9f, 0x93, 0xfb, 0x19, 0xd5,
+        0xfb, 0xbd, 0x57, 0xe3, 0xe5, 0x2f, 0xfc, 0x69, 0xdf, 0xc7, 0x8d, 0x8d,
+        0xfc, 0xd6, 0x86, 0xfc, 0x85, 0xd8, 0xe7, 0xdf, 0xc8, 0x9e, 0x89, 0xde,
+        0x1b, 0x9e, 0x16, 0x39, 0xa7, 0x4e, 0x3e, 0xb8, 0x3f, 0xfb, 0xc3, 0xe0,
+        0x87, 0x91, 0x16, 0x5d, 0xf5, 0xc9, 0xfd, 0xfd, 0x6e, 0xba, 0x06, 0x3d,
+        0x7d, 0x55, 0xde, 0xfb, 0xc0, 0xd8, 0xf3, 0x87, 0x9f, 0xba, 0x4a, 0x67,
+        0xae, 0x81, 0x87, 0x0d, 0xe6, 0xb6, 0x31, 0xca, 0x87, 0x91, 0x57, 0x24,
+        0x72, 0x73, 0xf4, 0xbe, 0xa1, 0xc8, 0x15, 0x3a, 0x23, 0x72, 0x20, 0xc7,
+        0x23, 0xf7, 0x78, 0x3d, 0x3c, 0x53, 0x7d, 0x9b, 0xce, 0x56, 0x82, 0xfc,
+        0xdf, 0xc0, 0xee, 0xad, 0x79, 0x90, 0xcd, 0x3c, 0x7e, 0x4f, 0xf0, 0xf8,
+        0xf0, 0x9a, 0x3c, 0x7e, 0xa4, 0xce, 0xe3, 0x5f, 0xe9, 0x97, 0xfc, 0xdc,
+        0xcb, 0xcf, 0xea, 0xa5, 0x43, 0xe2, 0xb9, 0x6f, 0xf3, 0xf1, 0x56, 0x3a,
+        0x14, 0x92, 0xc7, 0x67, 0x2b, 0xac, 0xe3, 0x0b, 0x6f, 0xd3, 0xb9, 0x6b,
+        0x59, 0x5f, 0x4a, 0xe4, 0x2f, 0x38, 0x6b, 0x69, 0xe8, 0xfb, 0xd1, 0xae,
+        0x1d, 0xff, 0x6b, 0xbd, 0x24, 0x73, 0xae, 0xca, 0x52, 0x3f, 0xd1, 0x5b,
+        0xd1, 0x21, 0x17, 0xff, 0x37, 0xdb, 0x8e, 0xe7, 0xd5, 0x1a, 0x78, 0x7c,
+        0x0d, 0xbf, 0x46, 0x2b, 0x5f, 0xf6, 0x79, 0xe0, 0xe1, 0xa7, 0xfb, 0xe5,
+        0x3e, 0xd5, 0x5a, 0x7e, 0x8d, 0xa6, 0xb8, 0x0e, 0xe7, 0xbe, 0x3d, 0xeb,
+        0xfd, 0x3d, 0x2a, 0x17, 0xf0, 0x87, 0xfd, 0x72, 0xbd, 0x40, 0x7e, 0xe0,
+        0x0a, 0xd3, 0xe1, 0x22, 0x63, 0x95, 0x21, 0xea, 0xbc, 0xaa, 0xc7, 0x3a,
+        0x24, 0xf4, 0xad, 0xd3, 0x4f, 0x73, 0x51, 0xe5, 0x76, 0xe7, 0x1c, 0x63,
+        0xba, 0x28, 0x6c, 0x9c, 0xf6, 0xf2, 0xd6, 0x3e, 0xe6, 0x6a, 0xd8, 0xb5,
+        0x26, 0xb8, 0xf9, 0x0d, 0x75, 0x4a, 0x30, 0xbf, 0x64, 0x48, 0x1c, 0x3c,
+        0xc3, 0xf8, 0x76, 0xb3, 0xfb, 0x45, 0x9f, 0x14, 0x23, 0xba, 0x6b, 0x60,
+        0xb8, 0x8f, 0x31, 0x0f, 0xd2, 0xe6, 0xc8, 0xbc, 0x58, 0x15, 0xba, 0xe0,
+        0xe2, 0x54, 0x8d, 0x92, 0xd1, 0x6d, 0x94, 0x99, 0xe2, 0x77, 0xcf, 0xd8,
+        0x6c, 0x7b, 0xf9, 0x29, 0xcb, 0xf2, 0x9b, 0x99, 0xda, 0xa2, 0xf0, 0xa2,
+        0xf6, 0xa7, 0x77, 0xa9, 0x38, 0x87, 0x5e, 0xb1, 0x2f, 0x29, 0x6b, 0xf5,
+        0xf0, 0x71, 0x45, 0x3f, 0x1b, 0xd7, 0xc1, 0xbb, 0x9d, 0xaa, 0xdd, 0x65,
+        0x47, 0x3b, 0xb4, 0xb9, 0xac, 0xda, 0xe2, 0x99, 0x1a, 0x53, 0x74, 0x2b,
+        0x7d, 0x0b, 0x39, 0x5c, 0x51, 0xb9, 0x7a, 0xc2, 0x7e, 0xa0, 0xd9, 0xfa,
+        0x58, 0x2e, 0x73, 0xdb, 0xff, 0xae, 0xc5, 0x85, 0x2d, 0x77, 0x99, 0x31,
+        0x6f, 0x55, 0xc8, 0x8a, 0xbb, 0x4f, 0x18, 0x8b, 0x5f, 0xec, 0x0f, 0xf1,
+        0xb1, 0x7a, 0xcf, 0xe9, 0x7a, 0x9f, 0x10, 0xa3, 0x61, 0x45, 0xe4, 0xb3,
+        0x74, 0xbb, 0xcb, 0x8e, 0x76, 0x5a, 0x57, 0xe8, 0xfd, 0x87, 0x8f, 0x7c,
+        0xb3, 0x85, 0xdb, 0x3e, 0x19, 0xc3, 0x1b, 0x12, 0xfb, 0xa7, 0x32, 0x46,
+        0x43, 0x1f, 0xc3, 0xbf, 0x8c, 0x98, 0x0a, 0xc4, 0x49, 0x38, 0xf5, 0x8d,
+        0x1c, 0x6f, 0x00, 0x6b, 0x51, 0x15, 0xfb, 0xa6, 0xd8, 0xaf, 0x68, 0x87,
+        0x9d, 0x77, 0x21, 0x36, 0x7f, 0x13, 0x18, 0x74, 0x23, 0xf2, 0x67, 0x7a,
+        0xc8, 0x9f, 0xf3, 0xfd, 0xc8, 0x83, 0x43, 0x3e, 0x5c, 0x76, 0xd2, 0xa0,
+        0x1a, 0xdb, 0x0a, 0x06, 0x95, 0x43, 0x3e, 0x3a, 0x67, 0x5b, 0xd1, 0x8a,
+        0xc0, 0x9a, 0x8f, 0xc0, 0x7f, 0x35, 0xb9, 0x42, 0x07, 0x44, 0xce, 0x38,
+        0x6a, 0x1f, 0x94, 0x79, 0x0d, 0x3e, 0xcd, 0x3c, 0x78, 0x96, 0xed, 0x8f,
+        0xec, 0x49, 0xec, 0xb7, 0xe8, 0x79, 0x41, 0x0e, 0x3c, 0x3e, 0x4d, 0x9e,
+        0xbb, 0xdf, 0xdd, 0x41, 0xc1, 0x38, 0x3f, 0xd3, 0x84, 0x7e, 0xe2, 0xe7,
+        0xa4, 0x29, 0xc1, 0x76, 0x12, 0x6c, 0xd6, 0xd3, 0x27, 0xad, 0x50, 0x99,
+        0x0c, 0x6e, 0x0b, 0xdb, 0x15, 0xcf, 0xc1, 0xfd, 0xf1, 0x50, 0x07, 0xb9,
+        0x73, 0x72, 0x7b, 0x45, 0x9e, 0xe2, 0x5b, 0xd1, 0x07, 0xc9, 0x18, 0x84,
+        0xbe, 0xc2, 0xbc, 0x3d, 0xa0, 0xf6, 0x89, 0xb6, 0xf3, 0xf1, 0x84, 0x3a,
+        0x0e, 0x8a, 0xf9, 0x94, 0xc7, 0x9a, 0xbf, 0xf1, 0xf7, 0xf3, 0x2e, 0xb2,
+        0xfd, 0x6a, 0xfe, 0x9a, 0x62, 0x41, 0x22, 0x63, 0x46, 0x90, 0xce, 0x57,
+        0xd6, 0xf2, 0xbf, 0x78, 0xe5, 0xba, 0x6e, 0xdf, 0x60, 0xae, 0xeb, 0x4f,
+        0x76, 0xc8, 0xdc, 0x32, 0x67, 0x5f, 0xfe, 0x93, 0xfb, 0xe2, 0x85, 0xc9,
+        0x5a, 0x70, 0x22, 0x8f, 0xb7, 0x46, 0x3f, 0x8b, 0x7e, 0x9e, 0xee, 0x84,
+        0x23, 0x2a, 0x66, 0x09, 0x31, 0x4a, 0x0f, 0x2a, 0xbe, 0xd6, 0xba, 0x9f,
+        0x3c, 0x74, 0xff, 0xa3, 0x22, 0x56, 0x53, 0xae, 0x1d, 0x43, 0x8a, 0x1e,
+        0xa0, 0x59, 0xc4, 0x41, 0xb3, 0x01, 0x07, 0xcd, 0x0c, 0x75, 0xbc, 0x4d,
+        0x9c, 0x9f, 0xaf, 0x3c, 0xb5, 0x5d, 0xe6, 0x8b, 0x63, 0x2f, 0xf1, 0x92,
+        0x3a, 0x5e, 0x6f, 0xbc, 0x56, 0x98, 0x82, 0xc2, 0xdf, 0xe4, 0x18, 0xeb,
+        0xcb, 0x44, 0xf6, 0x81, 0x70, 0x2b, 0x0d, 0x5e, 0x73, 0x5c, 0x47, 0x1f,
+        0xc7, 0x1d, 0x7d, 0x1c, 0x75, 0xf4, 0x71, 0x6f, 0x9b, 0x3e, 0xb2, 0x8e,
+        0xe7, 0xf7, 0x9c, 0xad, 0x7e, 0xdc, 0xbe, 0xa2, 0x9f, 0xc8, 0x23, 0x06,
+        0x3d, 0xb7, 0x52, 0x2e, 0x1c, 0x51, 0x6b, 0xc7, 0x2f, 0x55, 0x2e, 0xba,
+        0x57, 0x9f, 0xff, 0x8e, 0xda, 0xcf, 0x9b, 0x93, 0x57, 0x9d, 0xf9, 0xc7,
+        0xdf, 0xa5, 0xa4, 0xcc, 0x23, 0x57, 0xb2, 0x7d, 0xb9, 0x8d, 0x1f, 0x1a,
+        0xf1, 0x1c, 0xc0, 0x20, 0xc2, 0x2e, 0xdc, 0x2d, 0x6b, 0xc1, 0x05, 0x68,
+        0xa9, 0x9e, 0xcb, 0xeb, 0x57, 0xb9, 0x3b, 0xc7, 0xc3, 0xf7, 0x37, 0x8f,
+        0x17, 0xd7, 0xff, 0x4c, 0xf8, 0xf2, 0xe4, 0xfe, 0xd1, 0x8a, 0xca, 0x47,
+        0xb6, 0x4c, 0xc4, 0x06, 0x2c, 0x2e, 0xc3, 0xff, 0xda, 0x2e, 0x77, 0x57,
+        0xea, 0xa2, 0x4c, 0xbd, 0x3e, 0x4a, 0x59, 0xe4, 0x35, 0x48, 0xff, 0x98,
+        0xcc, 0xbf, 0x5d, 0x5c, 0xbe, 0x25, 0x72, 0x5e, 0x13, 0x2a, 0x8f, 0x37,
+        0x43, 0x3d, 0x02, 0xe7, 0x7e, 0xfc, 0xfc, 0xdb, 0x17, 0xc2, 0x9b, 0xcf,
+        0xbf, 0x75, 0xde, 0xb3, 0xb9, 0xfc, 0xdb, 0x10, 0x8f, 0xdd, 0x58, 0x90,
+        0xf9, 0xb7, 0xcd, 0x7b, 0x32, 0x32, 0xff, 0x36, 0xe3, 0xc0, 0x0f, 0x12,
+        0xaf, 0xbf, 0xe5, 0x88, 0xdf, 0x96, 0xb9, 0xb5, 0x8b, 0x75, 0xcc, 0x2a,
+        0x73, 0x6b, 0x65, 0xbc, 0xb7, 0xb3, 0x0e, 0x8c, 0xdc, 0xfb, 0x91, 0xef,
+        0xd9, 0xe6, 0xda, 0xfb, 0x91, 0x39, 0xb5, 0xa6, 0xd1, 0xce, 0x86, 0xc3,
+        0x1a, 0x81, 0x7a, 0x08, 0x71, 0xe6, 0xdd, 0xad, 0x6d, 0xea, 0x21, 0xc4,
+        0xdb, 0xd4, 0x43, 0x70, 0xea, 0x7e, 0x27, 0xc6, 0x02, 0x26, 0xc6, 0xda,
+        0x08, 0x2c, 0x8c, 0x7a, 0x06, 0x51, 0x3a, 0x5f, 0xc7, 0x9e, 0x0f, 0x52,
+        0x5a, 0x61, 0xcf, 0xf3, 0x15, 0xad, 0x8f, 0x46, 0x5d, 0xfa, 0xc8, 0x0b,
+        0x8b, 0x5a, 0x2a, 0xce, 0x47, 0xcb, 0x6b, 0xd6, 0x21, 0xaf, 0x59, 0x0f,
+        0x79, 0xc5, 0x3d, 0xd9, 0x36, 0xfd, 0xfe, 0xa5, 0xba, 0x07, 0xff, 0x4f,
+        0x46, 0x50, 0xb3, 0x85, 0x68, 0xf7, 0x80, 0xc2, 0x7f, 0x0e, 0x79, 0x3d,
+        0xcb, 0xf2, 0xaa, 0xaf, 0xa3, 0xbf, 0xed, 0x6c, 0x00, 0x8d, 0x19, 0x87,
+        0x7c, 0x87, 0xaf, 0xbd, 0x21, 0xe2, 0xa4, 0x9a, 0xed, 0x45, 0x8d, 0x27,
+        0xf6, 0x09, 0x59, 0xba, 0xe3, 0x47, 0xdc, 0x8a, 0xbe, 0x16, 0x52, 0x7e,
+        0x32, 0x4d, 0x8b, 0xce, 0x26, 0xcc, 0xd1, 0xc0, 0x1b, 0x22, 0xc6, 0xd7,
+        0xd1, 0xb7, 0x7f, 0xe5, 0xbe, 0xe9, 0xeb, 0x7a, 0xcd, 0x7c, 0xa7, 0xc9,
+        0x9f, 0x71, 0xa3, 0xa9, 0xee, 0x1f, 0x7c, 0x47, 0xdb, 0xd2, 0x86, 0x9d,
+        0x12, 0x31, 0xa6, 0x7d, 0x36, 0xfc, 0x64, 0x09, 0x96, 0xfd, 0xbe, 0x34,
+        0xe2, 0x99, 0xfb, 0xae, 0x98, 0x74, 0xa2, 0x70, 0x7e, 0x8f, 0xe4, 0x95,
+        0x0b, 0xa2, 0xa6, 0x25, 0x6a, 0x20, 0x26, 0x79, 0x7d, 0x4e, 0x30, 0xe8,
+        0x9c, 0xab, 0x76, 0xd1, 0x22, 0xa3, 0x7b, 0xbf, 0x5d, 0x16, 0xbe, 0x3e,
+        0xd6, 0x49, 0x45, 0xd4, 0x36, 0x35, 0x16, 0x3a, 0xf9, 0xb9, 0x83, 0xb4,
+        0x54, 0x1a, 0x17, 0x35, 0xa1, 0x64, 0x7d, 0x11, 0xb4, 0xf5, 0x51, 0xbf,
+        0xfd, 0x0d, 0xa6, 0xdd, 0xd7, 0x44, 0x8c, 0xe5, 0x62, 0xf1, 0x82, 0xfc,
+        0x2c, 0x3f, 0xa5, 0xde, 0xc1, 0xef, 0xab, 0xfe, 0x98, 0xe2, 0xfd, 0xa6,
+        0xc3, 0x96, 0x73, 0xfe, 0x79, 0xe3, 0x95, 0x63, 0x9b, 0xc2, 0x2b, 0xd9,
+        0x74, 0x03, 0xaf, 0x38, 0x9f, 0xad, 0xb1, 0xcb, 0xe4, 0xa0, 0xac, 0xf7,
+        0x00, 0x1a, 0x6c, 0x05, 0x16, 0x4b, 0x83, 0x96, 0x46, 0xcc, 0x8a, 0x24,
+        0xfc, 0x33, 0x94, 0xaf, 0x5e, 0xa7, 0x4c, 0x11, 0x98, 0x99, 0x3f, 0xcb,
+        0xe7, 0x76, 0x4a, 0x1f, 0x8d, 0xbe, 0x07, 0x7a, 0x65, 0x07, 0xb7, 0xff,
+        0xeb, 0x41, 0x19, 0x97, 0xed, 0xbc, 0xde, 0xcb, 0xd7, 0xbf, 0x10, 0x69,
+        0xbe, 0xbe, 0x85, 0xaf, 0xf7, 0xa7, 0x31, 0x87, 0xc6, 0x15, 0xf8, 0x25,
+        0x27, 0x29, 0xc7, 0xf3, 0x93, 0xaf, 0xf2, 0xda, 0x7a, 0x95, 0xf5, 0x55,
+        0x45, 0xb7, 0x1b, 0x40, 0xce, 0x8e, 0x98, 0x13, 0x83, 0xdb, 0x5c, 0x2c,
+        0x4c, 0x71, 0xbb, 0x21, 0xf2, 0x5f, 0x35, 0x29, 0x5f, 0xd1, 0xbc, 0xaa,
+        0xe3, 0xed, 0xdf, 0x18, 0x90, 0x31, 0x55, 0xef, 0xec, 0x94, 0xf4, 0x9b,
+        0x14, 0x3e, 0x4f, 0xc4, 0x73, 0x3c, 0x23, 0xf8, 0xd0, 0x9a, 0x31, 0xeb,
+        0xef, 0xdf, 0x06, 0xbe, 0x42, 0xdd, 0x54, 0x1e, 0x03, 0xeb, 0xc5, 0x98,
+        0x1d, 0xca, 0xd5, 0x63, 0xd5, 0x9e, 0xdb, 0x2d, 0xef, 0xff, 0xe9, 0x80,
+        0xac, 0x55, 0x7a, 0x5b, 0x9d, 0xeb, 0x35, 0x07, 0xf1, 0xcb, 0x3e, 0x41,
+        0x1b, 0xff, 0x02, 0xf4, 0xa5, 0xc1, 0xc7, 0x3c, 0x9e, 0x34, 0xfa, 0xf8,
+        0xb3, 0x01, 0x5d, 0x9f, 0x50, 0x8e, 0xeb, 0x28, 0xf7, 0x37, 0xc5, 0xe3,
+        0xd2, 0xd7, 0xe3, 0x7c, 0xee, 0x35, 0xbf, 0x78, 0x56, 0x30, 0x2d, 0xeb,
+        0x8b, 0x05, 0xd3, 0x99, 0x49, 0x39, 0xcf, 0x0d, 0x9f, 0x6e, 0xa4, 0xee,
+        0xd3, 0x9d, 0x2b, 0xf4, 0x0f, 0xc2, 0xbf, 0x61, 0x5c, 0xe1, 0xf9, 0x0e,
+        0x3f, 0xc3, 0x6d, 0x91, 0xab, 0x90, 0xe3, 0xcf, 0x1e, 0x15, 0xd7, 0xd3,
+        0xca, 0x2b, 0x32, 0x4e, 0x42, 0xaf, 0x5b, 0xb8, 0x77, 0x80, 0x9f, 0x21,
+        0xd7, 0xae, 0xf6, 0xef, 0xa1, 0x96, 0x38, 0x98, 0x56, 0x1e, 0x5b, 0xcb,
+        0x0f, 0x2b, 0xf6, 0x13, 0x3d, 0xf8, 0x6c, 0xad, 0x7a, 0x06, 0xef, 0x08,
+        0x3f, 0x5a, 0xb2, 0x45, 0x5e, 0x21, 0xc7, 0x01, 0xfa, 0xce, 0x7c, 0x96,
+        0xb6, 0xf0, 0x5c, 0x7d, 0xc3, 0xf8, 0x35, 0xec, 0xb7, 0x93, 0x8c, 0x79,
+        0x62, 0x1a, 0x17, 0xec, 0xc9, 0xb3, 0x06, 0xd3, 0xb9, 0x90, 0xad, 0x05,
+        0xec, 0x1e, 0xea, 0x64, 0x59, 0xfd, 0x22, 0x8d, 0xb1, 0xfd, 0x07, 0x99,
+        0xb5, 0x23, 0x29, 0x82, 0xbc, 0x59, 0xa1, 0xc3, 0xcc, 0x13, 0xc9, 0x2a,
+        0xf8, 0xd9, 0xa0, 0x27, 0x4a, 0x44, 0x8f, 0x97, 0xc6, 0x42, 0xdf, 0x27,
+        0xdb, 0x6c, 0x7c, 0x6f, 0x85, 0x12, 0xdc, 0x8f, 0x54, 0xf5, 0x77, 0xe8,
+        0x43, 0x51, 0xe7, 0x04, 0x74, 0xd4, 0xf3, 0xfe, 0xdb, 0x74, 0x3a, 0x8d,
+        0x7e, 0x6f, 0x5c, 0x3e, 0x4f, 0x6c, 0x4a, 0x3e, 0x83, 0x1e, 0xf2, 0xf9,
+        0xea, 0xa0, 0xe4, 0x9b, 0x1a, 0xf3, 0x68, 0x90, 0x66, 0x8b, 0x88, 0x01,
+        0x7b, 0x18, 0x75, 0xa7, 0x8a, 0x19, 0xd6, 0x4b, 0x99, 0x86, 0x5e, 0xba,
+        0x94, 0xf0, 0xc7, 0x21, 0xe3, 0xa8, 0xcb, 0xa6, 0xe2, 0x7e, 0x30, 0x8e,
+        0xdd, 0x34, 0xb6, 0xb0, 0x95, 0xef, 0xa5, 0x95, 0xc4, 0x74, 0x5c, 0xe5,
+        0xfa, 0x5b, 0x66, 0x92, 0xf5, 0xe3, 0x1c, 0xcb, 0x72, 0xae, 0xf8, 0x00,
+        0x2d, 0x86, 0x87, 0x69, 0x74, 0x41, 0xd7, 0x37, 0xc1, 0x58, 0xff, 0x6d,
+        0x48, 0xea, 0x24, 0x3d, 0xee, 0x5f, 0x11, 0xbe, 0x0b, 0xf3, 0xfa, 0xa7,
+        0x35, 0xee, 0xad, 0xeb, 0xe8, 0xa5, 0xbf, 0x52, 0x32, 0x5b, 0xbb, 0x91,
+        0x88, 0x52, 0x36, 0x31, 0xfd, 0x97, 0x82, 0xff, 0x47, 0xaf, 0xc3, 0x0f,
+        0x07, 0x1d, 0x6d, 0x52, 0xba, 0xe0, 0xa6, 0xc5, 0x30, 0x8f, 0x1b, 0xdf,
+        0xd7, 0xfe, 0x79, 0x36, 0xfa, 0x94, 0x58, 0xfb, 0xc7, 0xae, 0x73, 0x3b,
+        0xb1, 0x36, 0x69, 0xbd, 0xe1, 0xc5, 0x87, 0xba, 0x8e, 0xa5, 0xe6, 0x45,
+        0x19, 0xeb, 0xc9, 0xf8, 0x2d, 0x94, 0xf6, 0xbb, 0x79, 0xf2, 0x23, 0x3a,
+        0x36, 0x6f, 0xd2, 0xf1, 0x82, 0xf5, 0x7c, 0x96, 0x66, 0x58, 0xae, 0x9d,
+        0xeb, 0x05, 0xb7, 0x27, 0xf0, 0x59, 0x8c, 0x65, 0x9f, 0xed, 0xe6, 0xa2,
+        0x29, 0xe3, 0xee, 0x44, 0xed, 0xb9, 0x2e, 0xa1, 0x47, 0x43, 0xf6, 0x3f,
+        0x0d, 0xea, 0xf5, 0x20, 0x53, 0x44, 0x1e, 0x21, 0x7f, 0x96, 0xb9, 0x7d,
+        0x61, 0x90, 0x32, 0x25, 0x3c, 0x07, 0xeb, 0x1d, 0xfa, 0xce, 0xe7, 0x4b,
+        0x72, 0x5e, 0x47, 0xf9, 0xd9, 0xc8, 0xbb, 0x3f, 0x5e, 0x9d, 0x12, 0xb1,
+        0x77, 0xd0, 0xcd, 0x72, 0x3e, 0x63, 0x74, 0xd1, 0x53, 0xaf, 0x28, 0x4c,
+        0xe9, 0x90, 0xef, 0x8c, 0x90, 0xef, 0x98, 0x98, 0x8f, 0x4c, 0xc9, 0x60,
+        0xbc, 0xa6, 0x7d, 0x0f, 0xfd, 0x7c, 0x1e, 0x50, 0x3a, 0x04, 0xdf, 0x0d,
+        0xec, 0x14, 0x71, 0x89, 0x36, 0xae, 0xe3, 0x33, 0x46, 0xcf, 0x30, 0xee,
+        0x7c, 0xb6, 0xd0, 0x45, 0xb7, 0x8a, 0x5d, 0xf4, 0x66, 0x71, 0x98, 0x6e,
+        0xce, 0x6f, 0xa7, 0x8b, 0x8c, 0x99, 0x2f, 0xda, 0x01, 0x33, 0xc7, 0xf6,
+        0xc5, 0x0b, 0x51, 0x11, 0x33, 0xc4, 0x72, 0x87, 0xf6, 0xc0, 0x7f, 0x89,
+        0x5d, 0xcc, 0x73, 0x8c, 0xbd, 0xbb, 0xe9, 0x03, 0x7e, 0x67, 0xae, 0xa0,
+        0x63, 0x1d, 0xe0, 0x93, 0x1f, 0xaf, 0xe3, 0xd7, 0xf5, 0x79, 0x24, 0xb4,
+        0x0e, 0x8f, 0xc4, 0x84, 0xae, 0xcf, 0xcf, 0xf3, 0xf7, 0xf3, 0xf0, 0x9f,
+        0x33, 0xbd, 0x59, 0x3f, 0x7f, 0x3d, 0x80, 0xf6, 0xb8, 0x66, 0xcb, 0x58,
+        0x49, 0x31, 0xb6, 0x08, 0x9f, 0x83, 0xb6, 0x11, 0x45, 0x87, 0x6e, 0x1e,
+        0x9f, 0x4f, 0xb4, 0xcf, 0x2c, 0x75, 0xd3, 0x99, 0x12, 0x63, 0x90, 0x92,
+        0x9f, 0x6d, 0x18, 0xb4, 0x0d, 0xec, 0xd5, 0xf5, 0x5f, 0x2f, 0x72, 0xdf,
+        0x73, 0x25, 0x89, 0x41, 0x72, 0x4b, 0xbd, 0x94, 0x2f, 0xf5, 0xa8, 0xf3,
+        0x07, 0x44, 0x8c, 0xbb, 0xac, 0x63, 0x84, 0xef, 0xd6, 0xd2, 0x6f, 0x6f,
+        0x31, 0x4f, 0x61, 0x4d, 0x95, 0x76, 0x29, 0x74, 0xcd, 0x8d, 0x96, 0xba,
+        0xc4, 0xe0, 0xb9, 0x19, 0xfa, 0x2e, 0xaf, 0xb7, 0xa3, 0x57, 0xe1, 0x3f,
+        0xfe, 0x2a, 0xf8, 0xa6, 0x0c, 0x1e, 0x1b, 0xbd, 0x8a, 0xba, 0x48, 0x7e,
+        0x91, 0xe7, 0x94, 0x0c, 0x4f, 0x8a, 0xdc, 0x10, 0x29, 0xa3, 0x27, 0x45,
+        0x2d, 0xba, 0x1f, 0x0a, 0xdd, 0x64, 0x65, 0x4d, 0x03, 0x78, 0x04, 0x3e,
+        0x18, 0x19, 0x83, 0x75, 0xc2, 0xee, 0x7b, 0x6b, 0x20, 0x36, 0x41, 0xf1,
+        0x41, 0xf0, 0xbd, 0x94, 0x59, 0x55, 0x5f, 0x40, 0xe8, 0xfb, 0xd0, 0x3e,
+        0x9d, 0x2f, 0xa9, 0xcf, 0xf5, 0x5a, 0xa1, 0xcf, 0x7b, 0x5c, 0xdf, 0x87,
+        0x5c, 0xdf, 0xd7, 0xe3, 0xe5, 0x78, 0xcd, 0xe3, 0x75, 0x9e, 0x64, 0x8d,
+        0xa2, 0xcc, 0x82, 0xe4, 0xbf, 0xd0, 0xbe, 0xf1, 0xd0, 0x97, 0x15, 0x06,
+        0xcf, 0x2c, 0x8f, 0x45, 0xfa, 0x8c, 0x1e, 0x7f, 0x66, 0xea, 0xef, 0x6b,
+        0xf1, 0x34, 0x70, 0xd1, 0xdc, 0x4e, 0xa9, 0xe3, 0xd0, 0xaf, 0x6c, 0x14,
+        0xd0, 0xed, 0xe4, 0x72, 0x0f, 0xad, 0x88, 0x9a, 0x5c, 0xc0, 0x18, 0xb8,
+        0x1f, 0xcf, 0xc9, 0x86, 0x3a, 0x08, 0x35, 0xd7, 0x21, 0xe3, 0x07, 0x22,
+        0xd7, 0x79, 0x3e, 0x53, 0xcb, 0xff, 0x55, 0x3b, 0x2d, 0x6a, 0xdc, 0xa0,
+        0x2d, 0x63, 0x48, 0x81, 0xf9, 0x19, 0xbf, 0x34, 0xd9, 0x55, 0x33, 0xe8,
+        0x67, 0x16, 0x7b, 0x2b, 0x86, 0xfd, 0x22, 0xcb, 0x98, 0xdc, 0x2b, 0x4f,
+        0xb9, 0xf6, 0xca, 0x4f, 0x8a, 0xbd, 0x72, 0xec, 0x93, 0x83, 0xae, 0xa0,
+        0xa5, 0x57, 0x4c, 0x0b, 0xe6, 0x31, 0xca, 0xf3, 0x68, 0xd2, 0xc5, 0x6b,
+        0x42, 0xdf, 0x44, 0x93, 0x7e, 0x19, 0x5f, 0x9d, 0xa2, 0xac, 0x88, 0xbf,
+        0x96, 0x9f, 0x71, 0x23, 0x61, 0x5b, 0x93, 0xab, 0x8c, 0x29, 0x2a, 0xc5,
+        0x2d, 0x74, 0xb3, 0xdc, 0xc1, 0x98, 0xef, 0x6f, 0x69, 0xb5, 0x4c, 0x8c,
+        0x0d, 0xb7, 0x53, 0x3e, 0xca, 0xbc, 0x36, 0x19, 0xe4, 0x79, 0x65, 0x7c,
+        0x3b, 0xc9, 0xf2, 0xc7, 0x63, 0xa8, 0x94, 0x6a, 0xef, 0xe7, 0xa2, 0x71,
+        0x33, 0x31, 0xdd, 0xc3, 0xf6, 0x4b, 0x88, 0xff, 0x6d, 0xfe, 0xff, 0x6c,
+        0x04, 0xb4, 0x59, 0x5c, 0xc2, 0xf7, 0x8c, 0x7d, 0x0a, 0xb5, 0xf7, 0x67,
+        0xb9, 0xcd, 0xec, 0x34, 0xec, 0x20, 0xd8, 0x7b, 0x36, 0xff, 0xcb, 0x36,
+        0x15, 0xe6, 0xbb, 0xdc, 0xb5, 0x6c, 0xc4, 0x10, 0x3a, 0x1e, 0x75, 0x5d,
+        0xc6, 0xd4, 0x67, 0xdc, 0x98, 0xe5, 0xbe, 0xdc, 0x24, 0x3c, 0xc3, 0xa4,
+        0x4c, 0x74, 0x1f, 0xcb, 0xc1, 0x76, 0xfe, 0x44, 0x3e, 0xd6, 0x56, 0xca,
+        0x4f, 0x8d, 0xab, 0x7c, 0xac, 0x48, 0x9b, 0x7c, 0x2c, 0xdc, 0xc7, 0x38,
+        0x60, 0xbe, 0x76, 0x6f, 0x36, 0xea, 0x7c, 0x2f, 0x19, 0x99, 0xe8, 0x36,
+        0x81, 0x99, 0x2a, 0x4b, 0xfb, 0xb9, 0x0f, 0x71, 0x33, 0x33, 0xcd, 0x7d,
+        0x2d, 0x39, 0xfb, 0x5f, 0xbb, 0x97, 0x8c, 0xa2, 0x9d, 0xdf, 0xd5, 0x2e,
+        0x4e, 0xa2, 0xed, 0x12, 0xda, 0xd7, 0xfe, 0x27, 0x11, 0xd5, 0xe3, 0x74,
+        0xde, 0x8b, 0xf1, 0x40, 0xbe, 0xf8, 0xb3, 0x72, 0x9b, 0x6e, 0x16, 0x61,
+        0x8f, 0x1b, 0xcc, 0xf7, 0xe8, 0x91, 0x49, 0xd9, 0x0a, 0x63, 0xc0, 0x6b,
+        0x7b, 0x7d, 0xab, 0xc5, 0x37, 0x6a, 0x99, 0xa6, 0xd8, 0x96, 0x66, 0x3f,
+        0xbc, 0xb4, 0xc1, 0x86, 0xc9, 0xbe, 0x82, 0x35, 0x14, 0xeb, 0x67, 0xb6,
+        0xe6, 0xb7, 0x81, 0xf7, 0x60, 0x1b, 0x5d, 0x60, 0xfd, 0x25, 0xe3, 0x93,
+        0x58, 0x97, 0xb2, 0x0e, 0x93, 0xf2, 0x93, 0x6a, 0xfa, 0x39, 0x04, 0xc9,
+        0xc3, 0xa3, 0x8d, 0xb8, 0x48, 0xc7, 0xfe, 0x7a, 0xc0, 0xb1, 0xbf, 0x1e,
+        0x72, 0xc4, 0x45, 0x86, 0x05, 0x3e, 0x6b, 0x60, 0xaa, 0xb0, 0xc2, 0x54,
+        0xc0, 0x5e, 0x52, 0xb7, 0x2d, 0xd6, 0x75, 0xdb, 0x8e, 0x75, 0x74, 0x9b,
+        0x97, 0xad, 0xba, 0xa2, 0xf4, 0x88, 0x15, 0xc5, 0x1a, 0x73, 0x83, 0xf5,
+        0xc5, 0xeb, 0xd5, 0x69, 0xd6, 0x23, 0x51, 0xd6, 0x23, 0x53, 0xac, 0x47,
+        0x26, 0x59, 0x8f, 0xd8, 0x4c, 0x03, 0x93, 0xc7, 0xfe, 0x11, 0xeb, 0x69,
+        0xac, 0x1f, 0x33, 0xf4, 0x4c, 0x15, 0x3a, 0x79, 0x8a, 0x31, 0xd0, 0x47,
+        0xb4, 0x3a, 0xdf, 0xcb, 0xfc, 0x2b, 0x71, 0x4f, 0xb3, 0x5d, 0x83, 0xda,
+        0x2b, 0xf0, 0x17, 0xff, 0x39, 0xf4, 0xce, 0x2b, 0x59, 0x1a, 0xf1, 0xdd,
+        0x2c, 0x82, 0xce, 0xab, 0xa8, 0x55, 0xf1, 0x12, 0x64, 0x1b, 0x35, 0x82,
+        0x7f, 0x30, 0x31, 0xc3, 0x7d, 0x1f, 0xf1, 0xe5, 0x79, 0x5e, 0xbe, 0x1d,
+        0xcd, 0x86, 0xfa, 0x59, 0x06, 0x8e, 0x2b, 0x19, 0x38, 0xde, 0x90, 0x81,
+        0x6c, 0x8e, 0x47, 0xd2, 0xb7, 0xb0, 0x9d, 0xc6, 0x0f, 0x26, 0x76, 0xf5,
+        0xb1, 0xfc, 0x22, 0x66, 0xa2, 0x51, 0xbf, 0xc7, 0x4f, 0xa7, 0xc3, 0x41,
+        0x55, 0xf7, 0xc7, 0x14, 0x39, 0xef, 0xf9, 0xe2, 0xbb, 0x8c, 0x4b, 0x58,
+        0x4e, 0x43, 0x38, 0xbf, 0x0c, 0xbf, 0x28, 0xdb, 0x0d, 0xdd, 0xc2, 0xaf,
+        0xb4, 0x28, 0xda, 0xe2, 0xdc, 0x9a, 0x64, 0x1d, 0x17, 0x5d, 0x31, 0xac,
+        0x99, 0xb8, 0xf1, 0x9b, 0xc3, 0xa8, 0xe1, 0xfe, 0x83, 0xea, 0xe7, 0x86,
+        0xe5, 0xde, 0x5c, 0x72, 0x97, 0xd4, 0x27, 0xcc, 0xa3, 0xe1, 0xb8, 0xb0,
+        0xdd, 0x3a, 0xae, 0xc8, 0xf5, 0x73, 0x91, 0xe7, 0xbb, 0x12, 0x9d, 0xe4,
+        0xf9, 0xee, 0x51, 0x6b, 0x67, 0x96, 0xbf, 0x17, 0xeb, 0x32, 0xaf, 0xa1,
+        0xc3, 0xa8, 0x7f, 0x1f, 0x12, 0x75, 0x22, 0x4e, 0xa2, 0x0e, 0x4f, 0x02,
+        0xcf, 0x63, 0xee, 0x85, 0xfe, 0xf8, 0x07, 0x5e, 0xa3, 0xf1, 0x5e, 0xf0,
+        0x23, 0x1f, 0x97, 0x67, 0xe8, 0x52, 0x41, 0xf7, 0xe1, 0x3d, 0x32, 0xbe,
+        0x8b, 0x7e, 0xf8, 0x68, 0x87, 0xfd, 0x9e, 0xc8, 0x05, 0x31, 0xfe, 0xc4,
+        0xdd, 0xa7, 0xa3, 0xaa, 0x4f, 0xa8, 0x75, 0xd9, 0x85, 0xda, 0x3e, 0x84,
+        0x9a, 0x48, 0x8b, 0xa2, 0x16, 0x65, 0xa7, 0xb0, 0x59, 0x17, 0x85, 0xed,
+        0xb1, 0x7f, 0x57, 0xa3, 0x3e, 0xe6, 0x7e, 0xd7, 0xb5, 0x3b, 0xbc, 0x6e,
+        0x1d, 0x12, 0x18, 0x6d, 0x14, 0xf5, 0xda, 0x45, 0x5e, 0xea, 0x8c, 0xf8,
+        0xce, 0x58, 0xc0, 0x77, 0x0f, 0xa9, 0xef, 0x3e, 0x2f, 0xb0, 0xb1, 0x11,
+        0xeb, 0x66, 0xbd, 0x28, 0xf8, 0x9d, 0xe7, 0xd9, 0x9e, 0x64, 0x7e, 0x8f,
+        0x54, 0xf8, 0xb9, 0xa7, 0x05, 0x3d, 0x35, 0x3d, 0x40, 0x0b, 0xc8, 0x40,
+        0x8f, 0xe2, 0x7f, 0xcb, 0x4c, 0xf9, 0xf5, 0xb8, 0xdb, 0xd1, 0x99, 0xb1,
+        0x4e, 0x01, 0x63, 0xc5, 0x98, 0x4c, 0x5f, 0xbc, 0x1c, 0xf1, 0xe5, 0xe6,
+        0x61, 0xeb, 0x20, 0xdf, 0x65, 0x0f, 0xe2, 0xa9, 0xb8, 0x0f, 0x3b, 0x29,
+        0x9e, 0x46, 0xbf, 0xd0, 0x4e, 0xd3, 0xc0, 0x76, 0xd1, 0xc2, 0x79, 0xdf,
+        0x76, 0x75, 0x5f, 0xb7, 0x98, 0x0b, 0x32, 0xf0, 0x1e, 0xfd, 0x6e, 0xbc,
+        0x17, 0xef, 0xc7, 0x7d, 0x78, 0x9e, 0x7c, 0xee, 0x00, 0xeb, 0xed, 0xc4,
+        0xb4, 0x7c, 0x96, 0x71, 0x5d, 0x7e, 0x37, 0x60, 0x7b, 0xf7, 0x57, 0xce,
+        0x9f, 0x4f, 0xd5, 0xf1, 0xc1, 0xfc, 0x6d, 0xa7, 0xb2, 0xf0, 0x7d, 0xe2,
+        0xbb, 0x11, 0x9f, 0xb0, 0x6b, 0x6d, 0xfe, 0xe4, 0x79, 0x9d, 0xe3, 0xf3,
+        0x33, 0xc5, 0xdb, 0xc2, 0x66, 0xcf, 0xa5, 0x47, 0x7c, 0xe5, 0x32, 0xc6,
+        0x3b, 0xe2, 0x4b, 0xb1, 0x0c, 0x24, 0x8b, 0x89, 0x5a, 0x5e, 0xe2, 0x02,
+        0x3a, 0xdd, 0x6f, 0x85, 0x4e, 0x1b, 0xef, 0x0f, 0xcb, 0x9a, 0xb7, 0x38,
+        0x66, 0x39, 0x2c, 0xb0, 0x1c, 0x16, 0x58, 0x0e, 0x0b, 0x2c, 0x87, 0x6c,
+        0xab, 0xbe, 0x56, 0x60, 0x39, 0xe4, 0xb5, 0xe4, 0x55, 0x5e, 0x4b, 0xa4,
+        0xec, 0xc6, 0x95, 0x7f, 0x53, 0xcb, 0xae, 0x3b, 0x6f, 0x53, 0xcb, 0x2a,
+        0xd6, 0x6f, 0xf2, 0x1d, 0x99, 0x68, 0x96, 0xd9, 0x5b, 0x2c, 0xb3, 0x1d,
+        0xb1, 0x41, 0xba, 0x5b, 0xc2, 0x9c, 0x59, 0xe6, 0x1c, 0xeb, 0xea, 0x94,
+        0x1f, 0x58, 0x2b, 0xc0, 0xf2, 0x04, 0xac, 0x69, 0x31, 0xdd, 0x07, 0xe9,
+        0x1e, 0xeb, 0xeb, 0xbb, 0x25, 0xc8, 0xf0, 0x1e, 0x75, 0x6e, 0xb1, 0x0c,
+        0x63, 0xfd, 0xb3, 0x7d, 0xb7, 0x8a, 0x06, 0x63, 0xb2, 0x40, 0x28, 0x43,
+        0xd0, 0xa7, 0x02, 0xa7, 0xf1, 0xbc, 0xaf, 0xb0, 0xde, 0x87, 0x0f, 0x0f,
+        0xeb, 0xc5, 0x19, 0x1f, 0xaf, 0x17, 0x91, 0x9b, 0xac, 0x4f, 0xcf, 0x97,
+        0x6c, 0x96, 0xfb, 0x7e, 0xfa, 0x56, 0x09, 0xeb, 0x34, 0x68, 0xc4, 0xe7,
+        0x65, 0x12, 0xbe, 0x31, 0x23, 0x86, 0xb1, 0x8f, 0x67, 0x0d, 0xc1, 0x27,
+        0x7f, 0x0a, 0x3a, 0x30, 0xed, 0x5f, 0xdc, 0x85, 0xda, 0xf3, 0x71, 0xa3,
+        0x53, 0xf9, 0x1a, 0x71, 0x8c, 0xf6, 0x68, 0x0b, 0xba, 0xe1, 0xbc, 0xdd,
+        0xbe, 0x24, 0x7e, 0xb3, 0x21, 0x0a, 0xff, 0x9b, 0x4b, 0x7f, 0x5d, 0xe2,
+        0xfb, 0x05, 0xbd, 0x66, 0x12, 0x7e, 0xe4, 0x90, 0xd3, 0xd3, 0xfe, 0xd8,
+        0x0c, 0x3d, 0x5b, 0x45, 0xbf, 0xaf, 0x52, 0x3e, 0x0c, 0x7d, 0x64, 0x45,
+        0xef, 0x90, 0xa4, 0x5d, 0x37, 0xe3, 0xce, 0x27, 0xbc, 0x75, 0x9c, 0x99,
+        0x10, 0x38, 0xb9, 0x8b, 0xf5, 0x0b, 0x68, 0xf3, 0x13, 0xe6, 0x35, 0x7e,
+        0x5f, 0x41, 0xeb, 0xb7, 0x1f, 0xb3, 0xce, 0xc1, 0x9c, 0xe1, 0x7c, 0x6d,
+        0x9d, 0xb6, 0xaa, 0x74, 0x9a, 0xed, 0xd0, 0x69, 0xb9, 0xba, 0x4e, 0x63,
+        0xde, 0x10, 0xba, 0x0c, 0xba, 0xea, 0x51, 0xc6, 0x91, 0xf2, 0x18, 0xf8,
+        0x70, 0x87, 0xd0, 0x5d, 0xac, 0xfb, 0xd9, 0xae, 0x58, 0xac, 0x66, 0x7d,
+        0x87, 0x85, 0x0e, 0xd1, 0xfc, 0xbd, 0x7f, 0xb7, 0x94, 0x8b, 0x6e, 0xa1,
+        0x0f, 0x72, 0x27, 0xa1, 0xb7, 0xbc, 0xda, 0x8f, 0x73, 0x3b, 0xb4, 0xb7,
+        0x23, 0x2f, 0xb1, 0x3e, 0x5b, 0x8c, 0xc2, 0xa6, 0xed, 0x51, 0xb6, 0x0f,
+        0xea, 0x72, 0x61, 0xaf, 0x0b, 0x63, 0xd5, 0xfa, 0x6c, 0x40, 0xf9, 0x35,
+        0xe0, 0x87, 0xc4, 0x9c, 0xb7, 0xc5, 0x08, 0x26, 0x30, 0x02, 0xdf, 0x13,
+        0x60, 0x7a, 0x89, 0x1a, 0xe2, 0x44, 0xef, 0xd2, 0xaa, 0x90, 0x8d, 0x77,
+        0x05, 0x76, 0xc9, 0xf3, 0x77, 0xb3, 0xd3, 0x07, 0x45, 0x3f, 0xf3, 0x4b,
+        0x0d, 0xfd, 0x38, 0x57, 0x78, 0x0f, 0xeb, 0x86, 0xe8, 0x6b, 0x65, 0x42,
+        0xea, 0xc0, 0xc5, 0x32, 0x6a, 0x80, 0x89, 0x3e, 0x73, 0x5f, 0xf5, 0x38,
+        0xd1, 0x0f, 0xad, 0x0f, 0x36, 0x22, 0x7b, 0x8c, 0x6b, 0xfb, 0x31, 0x47,
+        0x59, 0x07, 0x0f, 0x3d, 0xcb, 0xef, 0xc7, 0xb5, 0xf5, 0xc7, 0x73, 0xaf,
+        0x3e, 0x1e, 0xf8, 0xf6, 0x70, 0xcf, 0xbb, 0x74, 0x57, 0x8d, 0xe7, 0x6e,
+        0x7d, 0x3c, 0xcf, 0xa8, 0xf1, 0x50, 0xce, 0x88, 0x0d, 0x28, 0xdc, 0xbf,
+        0xe1, 0x67, 0x77, 0x27, 0x18, 0xc7, 0xe4, 0x96, 0x40, 0xe7, 0xfd, 0x8a,
+        0x9f, 0x9c, 0x7e, 0x54, 0x67, 0x5f, 0xad, 0xc9, 0x3b, 0xac, 0x7f, 0xef,
+        0x09, 0x1c, 0x33, 0xc2, 0x38, 0x06, 0xd7, 0x29, 0x0f, 0x3d, 0x9d, 0x0b,
+        0xa3, 0x4e, 0xed, 0x0c, 0x8f, 0x9b, 0xed, 0xb1, 0x69, 0xfe, 0x14, 0xfe,
+        0x35, 0x3c, 0x47, 0xdf, 0xff, 0x3c, 0xdd, 0x9b, 0x87, 0x2e, 0x07, 0x8e,
+        0x95, 0xb5, 0x6c, 0xef, 0x2d, 0x4b, 0xff, 0x6e, 0xca, 0xd3, 0xbf, 0x0b,
+        0xdf, 0xee, 0x34, 0x70, 0x7e, 0x08, 0x7e, 0xe0, 0xa4, 0xfa, 0xad, 0x8f,
+        0x5c, 0x15, 0xcf, 0xf2, 0xd2, 0x4b, 0x33, 0x8e, 0xd8, 0x38, 0xc4, 0xaa,
+        0x64, 0x59, 0xcf, 0xd8, 0xa1, 0x0e, 0x43, 0xe6, 0xdc, 0xdc, 0xa8, 0x6a,
+        0xec, 0x74, 0x94, 0xe7, 0xcc, 0x8e, 0x1a, 0x46, 0x4a, 0xf8, 0x1a, 0xba,
+        0xed, 0x1e, 0xea, 0xe2, 0x75, 0xf4, 0x2c, 0xa1, 0x96, 0x9a, 0x65, 0x62,
+        0x0f, 0xe0, 0x12, 0xf3, 0x64, 0x3e, 0x6a, 0x45, 0x1e, 0x17, 0x76, 0x29,
+        0xd6, 0x17, 0x03, 0x74, 0x62, 0x5a, 0xa3, 0x0f, 0x7c, 0xbc, 0x84, 0x3a,
+        0x9a, 0x51, 0x1e, 0x3f, 0xfc, 0xc7, 0x63, 0xe6, 0x9b, 0xbc, 0x2e, 0x5d,
+        0x12, 0x7e, 0x99, 0x0b, 0x94, 0x63, 0x39, 0x3d, 0x22, 0xe4, 0xd4, 0x18,
+        0x61, 0x29, 0x62, 0xb9, 0x42, 0x6c, 0xc2, 0xb8, 0xa8, 0xdb, 0x23, 0x6d,
+        0x1d, 0x1e, 0xe5, 0xb2, 0xaa, 0x87, 0x90, 0x86, 0xee, 0xd8, 0xb8, 0x4f,
+        0x22, 0xfd, 0x89, 0x7d, 0x31, 0x4e, 0x4c, 0xe6, 0xf6, 0x7d, 0xc3, 0xae,
+        0x33, 0x45, 0xbd, 0x48, 0xd0, 0x4e, 0xf8, 0x13, 0x8d, 0x29, 0xa6, 0x9b,
+        0xfe, 0xdd, 0x19, 0xa7, 0xdf, 0xe0, 0x9c, 0xc8, 0xeb, 0x7f, 0xa5, 0x2a,
+        0xd7, 0xe0, 0x1c, 0xdb, 0xf4, 0xf9, 0x83, 0x4e, 0x4c, 0x62, 0x15, 0x93,
+        0xc2, 0x97, 0xb3, 0x9b, 0x12, 0x0b, 0x53, 0xf4, 0x68, 0x01, 0x3a, 0x8c,
+        0xee, 0x24, 0x6c, 0xfc, 0xa2, 0x0c, 0x64, 0x7c, 0x8a, 0x52, 0x55, 0xd0,
+        0xc8, 0xc7, 0x58, 0x89, 0x79, 0xaf, 0x88, 0x3d, 0x7f, 0x3e, 0x2e, 0xe3,
+        0x77, 0x54, 0x7e, 0x5d, 0xf9, 0xcb, 0x87, 0x29, 0xb9, 0x40, 0xd9, 0x4c,
+        0xf4, 0x4b, 0xa2, 0xd6, 0x75, 0x26, 0x3a, 0xa1, 0x7c, 0x3b, 0x11, 0xbe,
+        0x0e, 0x7f, 0x99, 0x49, 0x5f, 0x2e, 0x58, 0xd9, 0x0c, 0x49, 0x9f, 0x05,
+        0x71, 0x1f, 0x0c, 0x5e, 0x7b, 0x77, 0xb0, 0x0e, 0x39, 0x21, 0xfc, 0x16,
+        0x8c, 0x54, 0xe6, 0xd1, 0x1e, 0x3e, 0x87, 0x7e, 0x82, 0x9d, 0x96, 0x29,
+        0x3e, 0xa5, 0xda, 0xd6, 0x28, 0xc4, 0xbc, 0x10, 0xfa, 0x55, 0x3b, 0x1b,
+        0x35, 0x1a, 0xf7, 0xc3, 0xe7, 0x71, 0x42, 0xe0, 0xc8, 0x11, 0xb6, 0x79,
+        0x44, 0xbb, 0xda, 0xac, 0xf0, 0x5f, 0xf0, 0x79, 0xf9, 0x81, 0x21, 0xfd,
+        0x9b, 0x08, 0xb8, 0x2e, 0xfd, 0x1a, 0xfc, 0xcc, 0x32, 0xf7, 0xa3, 0x29,
+        0x9e, 0x7e, 0x98, 0xe2, 0x9b, 0xf0, 0x33, 0x9d, 0xbc, 0xaf, 0x7e, 0x26,
+        0xa6, 0x35, 0xaf, 0x3d, 0x37, 0x58, 0x36, 0x5e, 0x5f, 0xd7, 0xfe, 0xfb,
+        0x50, 0xaf, 0xe1, 0x4c, 0xab, 0x90, 0xf8, 0xdd, 0x0c, 0x60, 0xf0, 0x7c,
+        0xf5, 0x71, 0xfc, 0x5e, 0x8c, 0x2f, 0x2d, 0xb0, 0x71, 0x84, 0xb1, 0x0d,
+        0x30, 0xce, 0x98, 0xd8, 0x17, 0x8b, 0x3f, 0x16, 0xf1, 0xe5, 0x97, 0x07,
+        0xc9, 0x0f, 0x7f, 0x9c, 0xad, 0x63, 0x29, 0xba, 0x45, 0xdc, 0xbb, 0xdc,
+        0x8f, 0xc4, 0xfa, 0x0c, 0x9d, 0x78, 0x87, 0xed, 0x86, 0x09, 0x15, 0x87,
+        0xd3, 0x21, 0x6a, 0x53, 0xc9, 0xbd, 0x54, 0xad, 0x53, 0x34, 0xef, 0xe9,
+        0xbd, 0x0e, 0xe7, 0x6f, 0x73, 0x41, 0x76, 0x9d, 0x98, 0x02, 0xfe, 0x29,
+        0x31, 0x47, 0x97, 0x88, 0xe4, 0x1c, 0x37, 0xf6, 0x31, 0xba, 0x78, 0x9e,
+        0x60, 0x0f, 0xc2, 0xef, 0xf7, 0x35, 0xfe, 0xc4, 0x7e, 0xc4, 0xd5, 0x21,
+        0xe0, 0xa8, 0x3e, 0x9b, 0x79, 0x66, 0x1a, 0xe7, 0x83, 0x6c, 0x9f, 0x69,
+        0xdc, 0x2b, 0x7d, 0x51, 0x6c, 0xb3, 0xa9, 0xf9, 0x82, 0x1f, 0x6a, 0x54,
+        0xd5, 0x29, 0xb0, 0xc8, 0xec, 0x07, 0x9d, 0x3e, 0x2d, 0x79, 0x5c, 0x6f,
+        0xef, 0x62, 0x23, 0xb1, 0x4e, 0xf8, 0xdd, 0x30, 0xd4, 0xeb, 0xdc, 0x0b,
+        0xda, 0xf3, 0x1c, 0x39, 0xf7, 0x36, 0x1e, 0xdf, 0xa5, 0x7f, 0xb3, 0xe8,
+        0xfe, 0xcc, 0xdb, 0x16, 0x8f, 0x79, 0xfb, 0xf9, 0x90, 0xdc, 0x3b, 0x7b,
+        0x58, 0xb5, 0xf1, 0x8a, 0x6f, 0x5d, 0xfe, 0x0e, 0xfc, 0x50, 0x8d, 0xfc,
+        0x8b, 0x77, 0x84, 0x5e, 0x69, 0xf5, 0x85, 0x47, 0x58, 0x9f, 0x4a, 0x39,
+        0x3e, 0xe1, 0x21, 0xc7, 0xfd, 0x31, 0xe0, 0x96, 0x8f, 0x2f, 0xc7, 0xc7,
+        0xdb, 0xca, 0xf1, 0x9e, 0x61, 0xe9, 0x8b, 0x6d, 0x95, 0x63, 0xe4, 0x00,
+        0x9d, 0xa8, 0xb6, 0xf3, 0x7b, 0x61, 0x1e, 0x90, 0xcb, 0xee, 0xf4, 0x95,
+        0x80, 0x66, 0xda, 0x5f, 0x82, 0x7d, 0x43, 0xf0, 0x25, 0xf6, 0x5e, 0x4e,
+        0x1a, 0xa9, 0x79, 0xf7, 0x5e, 0xea, 0x46, 0xee, 0xbd, 0xed, 0x71, 0x2f,
+        0xb0, 0x3b, 0x64, 0xc3, 0x8a, 0x48, 0x5f, 0x80, 0xa6, 0xdf, 0xb0, 0xef,
+        0x70, 0xc9, 0xca, 0x96, 0x09, 0xbe, 0xee, 0x30, 0x9d, 0xc3, 0xfe, 0xb4,
+        0xf2, 0x25, 0x1f, 0x2b, 0x48, 0x3a, 0x84, 0x0e, 0x0a, 0xfe, 0x00, 0xbe,
+        0x8d, 0xa4, 0xfd, 0x69, 0x9e, 0x63, 0xe9, 0x47, 0xce, 0x2c, 0x45, 0xd4,
+        0xbc, 0x71, 0x5b, 0x3c, 0xcf, 0x33, 0x5f, 0x10, 0xf3, 0x65, 0x3d, 0xbf,
+        0x52, 0x8f, 0x4f, 0xc6, 0xda, 0x50, 0xa3, 0xff, 0xe0, 0x75, 0xcf, 0x7f,
+        0x30, 0x24, 0x6a, 0x37, 0xdc, 0xa8, 0x1e, 0x64, 0xbc, 0x89, 0x39, 0x85,
+        0x0f, 0x52, 0xfb, 0x88, 0x1f, 0xda, 0x4b, 0xbd, 0x07, 0x18, 0x05, 0x18,
+        0x64, 0x33, 0xbe, 0x34, 0x0e, 0x22, 0xce, 0xdc, 0xe4, 0x7b, 0x50, 0x73,
+        0x6a, 0xdc, 0x4c, 0x51, 0x0f, 0xfc, 0x10, 0xa8, 0x25, 0x6d, 0xe6, 0x9a,
+        0x64, 0xec, 0x94, 0x90, 0xb1, 0xd4, 0xf2, 0x29, 0x25, 0x63, 0xa7, 0x94,
+        0x1f, 0xfe, 0x94, 0x92, 0xb1, 0x53, 0x4a, 0xc6, 0x4e, 0x29, 0x19, 0x3b,
+        0xc5, 0x7c, 0x3e, 0xc6, 0xf8, 0x16, 0x58, 0x44, 0xfb, 0x41, 0x7b, 0x29,
+        0x53, 0xc2, 0x75, 0xac, 0xcf, 0x6e, 0x39, 0x7b, 0x69, 0x44, 0xca, 0x19,
+        0x63, 0x13, 0x19, 0xaf, 0xc7, 0xef, 0xc2, 0x1c, 0xfc, 0x1e, 0xd3, 0xef,
+        0x23, 0x3a, 0x33, 0x8f, 0xbe, 0xfa, 0x28, 0x29, 0x6a, 0xc9, 0x76, 0x50,
+        0xc2, 0x89, 0x85, 0x43, 0xc8, 0x0f, 0x93, 0xb6, 0x5f, 0xb6, 0x6d, 0xae,
+        0x98, 0xe6, 0x93, 0x98, 0x9a, 0x2f, 0xb7, 0x5d, 0xd4, 0x45, 0xe9, 0x22,
+        0xe8, 0x8a, 0x98, 0x4a, 0x93, 0xe7, 0x46, 0xd0, 0x49, 0x86, 0x44, 0xb9,
+        0x68, 0x70, 0x4c, 0xd1, 0xe0, 0xdb, 0x62, 0x8c, 0x88, 0x49, 0x84, 0x2f,
+        0xb3, 0x3d, 0x1d, 0x72, 0x85, 0x31, 0x7e, 0x0e, 0xcb, 0xc2, 0xc1, 0x08,
+        0xeb, 0xa4, 0x8d, 0xd3, 0xa1, 0x31, 0xf6, 0x76, 0xba, 0x67, 0xa3, 0x79,
+        0x39, 0x77, 0x1c, 0x6b, 0x49, 0x44, 0xad, 0x23, 0x12, 0x17, 0x6f, 0xb1,
+        0x6b, 0x74, 0x34, 0xba, 0x97, 0x8f, 0xad, 0x74, 0x96, 0x0e, 0x90, 0xd1,
+        0x57, 0xa3, 0xbf, 0x60, 0x39, 0xe8, 0x66, 0x39, 0x38, 0xaa, 0xec, 0x92,
+        0xa3, 0x75, 0xbb, 0x64, 0xcf, 0x1e, 0xc4, 0x65, 0x64, 0xc4, 0xbe, 0xd7,
+        0x56, 0x55, 0x43, 0x00, 0xbe, 0x6f, 0x9c, 0x77, 0x51, 0x7c, 0x18, 0xe7,
+        0xf8, 0x2d, 0x22, 0x6b, 0x32, 0xee, 0x1b, 0xdf, 0x23, 0xb0, 0xbb, 0xcf,
+        0xc2, 0x3d, 0x47, 0xa5, 0xde, 0xf3, 0x91, 0x7f, 0xfc, 0x36, 0xe3, 0x89,
+        0x1a, 0x3d, 0xc1, 0xef, 0xcc, 0x17, 0xf7, 0xf1, 0xb3, 0x75, 0x4d, 0x09,
+        0x3b, 0x6e, 0xf8, 0xb6, 0x92, 0xbf, 0xaf, 0xdd, 0xbb, 0x2d, 0xc1, 0x8f,
+        0x8c, 0xa7, 0x8d, 0xd9, 0xe8, 0x7b, 0xb5, 0xd3, 0x27, 0xe1, 0x63, 0x87,
+        0x9c, 0x58, 0x21, 0xd3, 0xe7, 0x25, 0x1f, 0x12, 0x2b, 0x35, 0xe2, 0x63,
+        0x21, 0x2f, 0x35, 0xfa, 0x77, 0x1e, 0x5b, 0x88, 0xb0, 0x77, 0x22, 0x9f,
+        0x9f, 0xa6, 0x19, 0x91, 0x83, 0x8d, 0x38, 0xe9, 0x33, 0xf3, 0xfa, 0x5d,
+        0xb6, 0xe2, 0x8d, 0xcf, 0x20, 0xce, 0xad, 0xb8, 0x48, 0x6b, 0xaf, 0x39,
+        0xf0, 0xd7, 0x8d, 0x2d, 0xac, 0xf6, 0x85, 0x45, 0x4e, 0xf8, 0x76, 0xc6,
+        0x48, 0x3a, 0x1e, 0x7a, 0x9c, 0x9f, 0x0f, 0x3f, 0x5e, 0x80, 0x92, 0x57,
+        0xd0, 0xae, 0x93, 0x46, 0x17, 0x6a, 0x5f, 0xe0, 0xef, 0xc5, 0xfe, 0x65,
+        0x86, 0xba, 0xd5, 0xde, 0x44, 0x8f, 0xda, 0xcf, 0x8a, 0xb0, 0xec, 0x35,
+        0x72, 0x9d, 0x47, 0xeb, 0x3e, 0x3d, 0xc8, 0x84, 0xdb, 0xa7, 0xf7, 0xf4,
+        0x3a, 0xeb, 0xd5, 0x7a, 0x72, 0x80, 0x58, 0xd6, 0x2e, 0x52, 0xbe, 0x4a,
+        0x33, 0x4f, 0x1b, 0xcd, 0xe9, 0xdb, 0xf4, 0x3d, 0xdd, 0x9d, 0x31, 0xf3,
+        0xc2, 0x9b, 0x76, 0x50, 0xf1, 0x5f, 0x27, 0x9d, 0x29, 0x05, 0x79, 0xcd,
+        0x87, 0x6e, 0x05, 0xbd, 0xfc, 0xc3, 0xc8, 0x73, 0xf9, 0x7a, 0xa0, 0x93,
+        0x96, 0x96, 0x10, 0x6b, 0xf1, 0x47, 0x7b, 0x64, 0x7c, 0x71, 0x9a, 0xe9,
+        0x72, 0x80, 0xd7, 0x47, 0x43, 0xed, 0x1d, 0xe1, 0x1a, 0x74, 0x89, 0xa8,
+        0x37, 0x1a, 0xf8, 0xd2, 0x44, 0x90, 0xed, 0x02, 0xb9, 0xf7, 0x70, 0x88,
+        0x9f, 0xfd, 0xfd, 0x52, 0x1a, 0xfe, 0xb2, 0xd0, 0x11, 0x7e, 0x7e, 0x92,
+        0xf1, 0x44, 0x9c, 0x3a, 0xa9, 0xb2, 0xd4, 0xc9, 0x76, 0x41, 0x27, 0xe3,
+        0x89, 0xb1, 0xd0, 0xa8, 0x4f, 0xbc, 0x4b, 0xe4, 0xd4, 0x3c, 0x1c, 0x38,
+        0xc0, 0x7c, 0x85, 0x77, 0xbd, 0xae, 0xde, 0xe5, 0x7e, 0xc7, 0x2f, 0x6a,
+        0x38, 0x3f, 0xe2, 0x37, 0x2f, 0xdc, 0xc2, 0xef, 0x51, 0xcd, 0xcf, 0x30,
+        0x76, 0x0e, 0x53, 0x7e, 0xbe, 0x83, 0xc7, 0x10, 0x63, 0x3b, 0x22, 0xca,
+        0xe7, 0x8f, 0x50, 0xb6, 0x7a, 0x92, 0x7e, 0xbf, 0xea, 0xf4, 0x09, 0x3f,
+        0xc2, 0x7d, 0x96, 0x39, 0xfd, 0x5d, 0xdc, 0xaf, 0x0f, 0x6d, 0xb7, 0x8e,
+        0x09, 0x92, 0xff, 0x7b, 0x61, 0xea, 0x7c, 0x0e, 0xbe, 0x97, 0x1a, 0x15,
+        0xa3, 0xd6, 0xa5, 0x3b, 0x24, 0xfd, 0xcf, 0x2f, 0x88, 0xb8, 0x5a, 0xbe,
+        0x9f, 0x9f, 0x39, 0x87, 0x76, 0x2f, 0x98, 0x74, 0xd3, 0x96, 0xf4, 0x7e,
+        0x23, 0x10, 0x26, 0xff, 0xcb, 0x88, 0x7d, 0x02, 0x56, 0x33, 0x2f, 0xd8,
+        0xfb, 0x58, 0xbf, 0x3f, 0x87, 0xfb, 0xf8, 0xf3, 0x65, 0x9c, 0x07, 0x79,
+        0x9c, 0x58, 0xaf, 0x11, 0xef, 0x02, 0xbd, 0x78, 0x20, 0x12, 0x12, 0xfc,
+        0xf7, 0x08, 0xf3, 0x54, 0x87, 0xf0, 0x35, 0xf6, 0xa3, 0xad, 0x3d, 0xc4,
+        0xd8, 0xc2, 0xbc, 0x30, 0xb1, 0x0f, 0xe7, 0xf1, 0x3e, 0x3f, 0xd3, 0x48,
+        0xf2, 0x10, 0xc6, 0xd3, 0xc4, 0xdc, 0x81, 0x43, 0x13, 0xc4, 0xf3, 0x09,
+        0xfc, 0xc1, 0xf3, 0x19, 0x42, 0x7d, 0xa7, 0x20, 0xa5, 0xf8, 0x1d, 0xc9,
+        0x92, 0x1c, 0xf7, 0x5c, 0xd5, 0x4f, 0xd2, 0x4f, 0x75, 0x74, 0x44, 0xff,
+        0x9e, 0x21, 0x0d, 0xe2, 0xd9, 0x5a, 0x56, 0x70, 0xdc, 0x4b, 0x77, 0x4b,
+        0x3d, 0x74, 0x4f, 0xed, 0x69, 0xdd, 0x15, 0x76, 0x19, 0xeb, 0xf0, 0x74,
+        0x2f, 0xdd, 0x59, 0xea, 0x20, 0xea, 0x0f, 0x8a, 0x3d, 0xe7, 0xbb, 0xa5,
+        0x32, 0xbf, 0x3f, 0x31, 0x22, 0xfd, 0x3a, 0x0d, 0x1e, 0xb9, 0xeb, 0xc1,
+        0x23, 0x1f, 0x08, 0x1e, 0xd9, 0x37, 0xb2, 0x36, 0x8f, 0xec, 0x52, 0xb6,
+        0x48, 0x90, 0x3a, 0x15, 0x7f, 0xbc, 0xc4, 0xfc, 0xf1, 0x2c, 0xf3, 0xc7,
+        0xe1, 0x36, 0xfc, 0x61, 0xb8, 0xf8, 0xe3, 0x88, 0xe0, 0x8f, 0x87, 0x46,
+        0xd6, 0xe2, 0x8f, 0xc3, 0xfe, 0xb5, 0x7c, 0x4d, 0xe2, 0xb7, 0x3c, 0x2f,
+        0xcc, 0xd9, 0xbb, 0x99, 0xd7, 0x6d, 0xaa, 0xcc, 0x23, 0x67, 0x61, 0x25,
+        0x6a, 0xd0, 0xbf, 0x08, 0x9b, 0x6c, 0x55, 0xd8, 0xfc, 0x31, 0x11, 0xc3,
+        0xba, 0x28, 0xf8, 0x8b, 0xd7, 0xff, 0x18, 0x72, 0xaa, 0xdc, 0x73, 0xd1,
+        0x4d, 0x37, 0xa3, 0x98, 0x0b, 0x53, 0xcd, 0x05, 0xae, 0x75, 0xe9, 0xfa,
+        0x90, 0x01, 0xbe, 0x7e, 0xe1, 0x03, 0xf0, 0xe8, 0x72, 0x4f, 0x20, 0x59,
+        0xf8, 0xe6, 0x08, 0xf0, 0x5f, 0x7e, 0x99, 0x1c, 0xd7, 0x03, 0x7c, 0x3d,
+        0x2c, 0x7e, 0xfb, 0x09, 0xb2, 0xf2, 0x8f, 0x88, 0x71, 0x64, 0x9e, 0xbc,
+        0x59, 0x1a, 0xa6, 0x5b, 0xa5, 0xdd, 0xb4, 0x5a, 0x1a, 0xa1, 0x37, 0x45,
+        0x2d, 0x0d, 0x99, 0x1b, 0xb9, 0x2a, 0xe6, 0xc8, 0xa0, 0x43, 0x61, 0x6e,
+        0xb3, 0xb4, 0x9b, 0x56, 0x96, 0x34, 0x7f, 0x83, 0xb7, 0xc1, 0x2f, 0xf1,
+        0x3e, 0x99, 0x2f, 0xd7, 0xca, 0x33, 0xc9, 0x26, 0x9e, 0x91, 0xf7, 0x80,
+        0x57, 0xf2, 0xad, 0xb9, 0xbe, 0xdd, 0xa1, 0x18, 0x62, 0xf5, 0x82, 0xd4,
+        0x81, 0xb8, 0x45, 0xc3, 0x9a, 0x3c, 0xe4, 0x07, 0x86, 0xfe, 0x2a, 0xaf,
+        0xb9, 0x3c, 0x67, 0x36, 0xe2, 0x9c, 0x46, 0x18, 0x0f, 0x6f, 0x17, 0xf8,
+        0x37, 0x61, 0x07, 0x22, 0x49, 0xaa, 0x5d, 0x30, 0x6c, 0xd4, 0x73, 0x4c,
+        0xf3, 0xf3, 0x0c, 0xe5, 0x6f, 0xda, 0xe6, 0xe0, 0x3f, 0x37, 0xd6, 0xc5,
+        0x5e, 0xf2, 0x63, 0xdc, 0x67, 0xac, 0xc3, 0x8d, 0xfd, 0x1a, 0xaa, 0xef,
+        0xd7, 0x74, 0xf3, 0xb8, 0xa5, 0xec, 0xcd, 0xda, 0xdc, 0xae, 0xca, 0xed,
+        0xaa, 0xd8, 0xfb, 0xe3, 0xeb, 0x4b, 0xd8, 0x77, 0x1e, 0xa6, 0xd5, 0x79,
+        0xc8, 0x28, 0xfc, 0x21, 0x8d, 0xbd, 0xde, 0xd5, 0x65, 0x5c, 0x87, 0x4f,
+        0xa4, 0xb1, 0xd7, 0xbb, 0xaa, 0xf6, 0x7a, 0x57, 0x97, 0x63, 0x42, 0x6f,
+        0xe7, 0x4b, 0x4c, 0xf7, 0x92, 0x5f, 0xc5, 0x39, 0xee, 0x53, 0xbf, 0x2d,
+        0xf4, 0x98, 0xf0, 0x69, 0xf7, 0xd9, 0x6b, 0xd3, 0xf0, 0x50, 0x0b, 0x0d,
+        0x63, 0x02, 0x67, 0xa5, 0xf8, 0x99, 0xc9, 0xd2, 0x63, 0xff, 0x3b, 0x60,
+        0x78, 0x46, 0x00, 0xf3, 0x9e, 0x30, 0x34, 0xef, 0xc1, 0xe6, 0x8e, 0xf9,
+        0x19, 0x20, 0xf7, 0x14, 0xd9, 0x80, 0xfb, 0x16, 0x90, 0xf2, 0x4a, 0x06,
+        0xad, 0xbc, 0x02, 0xa6, 0x09, 0x75, 0x88, 0xfe, 0xa6, 0xf5, 0x9f, 0xe5,
+        0x60, 0xe3, 0x80, 0x4d, 0x40, 0x73, 0x9b, 0xa7, 0x90, 0x32, 0xf7, 0x0c,
+        0xac, 0x6f, 0xb1, 0xae, 0x6d, 0xb4, 0x01, 0xef, 0xb1, 0x5e, 0x34, 0x85,
+        0x85, 0x61, 0x49, 0x0f, 0x03, 0xb0, 0x7e, 0x00, 0xa5, 0x75, 0x50, 0x1d,
+        0x01, 0x4f, 0xef, 0x02, 0x4d, 0x40, 0xf7, 0x39, 0x01, 0xdb, 0xa2, 0xce,
+        0xfd, 0xca, 0xe0, 0xb5, 0xb2, 0x0d, 0xd0, 0x73, 0xab, 0x16, 0xf5, 0x88,
+        0xc9, 0x83, 0xf2, 0x99, 0x93, 0x0a, 0x03, 0x19, 0x79, 0x81, 0x0d, 0x9a,
+        0x17, 0xc0, 0xe1, 0x04, 0x4c, 0xeb, 0xc0, 0x32, 0x6a, 0x8d, 0x2e, 0xd0,
+        0x3c, 0x1e, 0x16, 0x97, 0x7e, 0x90, 0x18, 0x03, 0x54, 0x8c, 0x05, 0xc8,
+        0x97, 0x01, 0xb6, 0x29, 0x41, 0x7e, 0x05, 0xe5, 0x05, 0x90, 0xd9, 0x20,
+        0xbf, 0x83, 0xca, 0x4e, 0x50, 0x5e, 0x04, 0xb2, 0x97, 0x08, 0x41, 0xfd,
+        0x0c, 0xa4, 0x81, 0xec, 0xe6, 0x29, 0x22, 0x60, 0x7e, 0x52, 0x80, 0x10,
+        0x43, 0x03, 0x3c, 0x1f, 0x10, 0x1b, 0xc6, 0x30, 0xf5, 0x31, 0x64, 0xe4,
+        0x1b, 0x88, 0x19, 0x88, 0x7c, 0xc3, 0xce, 0x70, 0x40, 0x00, 0x16, 0x56,
+        0xff, 0xff, 0x1f, 0x53, 0x61, 0x01, 0xa6, 0x53, 0xd0, 0x3a, 0xd6, 0xdf,
+        0xff, 0x0f, 0x88, 0xb0, 0x30, 0xb4, 0xc0, 0xd7, 0x23, 0xe6, 0xc8, 0x83,
+        0xca, 0xd0, 0x05, 0x40, 0x56, 0x1b, 0xbc, 0x4d, 0xc0, 0x02, 0xbe, 0xef,
+        0x79, 0x01, 0xc3, 0x2f, 0x60, 0x99, 0xf5, 0xff, 0xff, 0x52, 0xb8, 0x5a,
+        0x10, 0x00, 0x00, 0x19, 0x3f, 0x16, 0x21, 0xc4, 0x7d, 0x00, 0x00, 0x00 };
+
+static const u32 bnx2_COM_b09FwData[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_COM_b09FwRodata[(0x88/4) + 1] = {
+        0x08001b68, 0x08001ba4, 0x08001ba4, 0x08001ba4, 0x08001ba4, 0x08001ba4,
+        0x08001ab4, 0x08001ba4, 0x08001b28, 0x08001ba4, 0x08001a3c, 0x08001ba4,
+        0x08001ba4, 0x08001ba4, 0x08001a48, 0x00000000, 0x08002abc, 0x08002b0c,
+        0x08002b3c, 0x08002b6c, 0x08002b9c, 0x00000000, 0x0800604c, 0x0800604c,
+        0x0800604c, 0x0800604c, 0x0800604c, 0x08006078, 0x08006078, 0x080060b8,
+        0x080060c4, 0x080060c4, 0x0800604c, 0x00000000, 0x00000000 };
+static const u32 bnx2_COM_b09FwBss[(0x88/4) + 1] = { 0x0 };
+static const u32 bnx2_COM_b09FwSbss[(0x60/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_com_fw_09 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
-        .start_addr                     = 0x080000b0,
+        .start_addr                     = 0x080000b4,
 
         .text_addr                      = 0x08000000,
-        .text_len                       = 0x7c5c,
+        .text_len                       = 0x7dc0,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_COM_b09FwText,
         .gz_text_len                    = sizeof(bnx2_COM_b09FwText),
 
-        .data_addr                      = 0x08007d00,
+        .data_addr                      = 0x08007e60,
         .data_len                       = 0x0,
         .data_index                     = 0x0,
         .data                           = bnx2_COM_b09FwData,
 
-        .sbss_addr                      = 0x08007d00,
-        .sbss_len                       = 0x5c,
+        .sbss_addr                      = 0x08007e60,
+        .sbss_len                       = 0x60,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_COM_b09FwSbss,
 
-        .bss_addr                       = 0x08007d60,
+        .bss_addr                       = 0x08007ec0,
         .bss_len                        = 0x88,
         .bss_index                      = 0x0,
         .bss                            = bnx2_COM_b09FwBss,
 
-        .rodata_addr                    = 0x08007c60,
+        .rodata_addr                    = 0x08007dc0,
         .rodata_len                     = 0x88,
         .rodata_index                   = 0x0,
         .rodata                         = bnx2_COM_b09FwRodata,
 };
 
 static u8 bnx2_CP_b09FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0x8e, 0xfc, 0x2f, 0x45, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xbd, 0x7d, 0x0d, 0x74,
-        0x5c, 0x57, 0x7d, 0xe7, 0xff, 0xdd, 0x79, 0x92, 0xc6, 0xb2, 0x2c, 0x3f,
-        0xcb, 0x63, 0x65, 0x22, 0x0b, 0x7b, 0x46, 0x7a, 0xb2, 0x95, 0x58, 0x64,
-        0xc7, 0xae, 0x00, 0x6d, 0x3b, 0x85, 0xe9, 0x48, 0xb2, 0x9d, 0x0f, 0x8a,
-        0x4c, 0x44, 0x4f, 0x5a, 0xe8, 0x22, 0xc6, 0x76, 0x48, 0x80, 0xb2, 0x4e,
-        0x09, 0x69, 0x80, 0x04, 0x0f, 0x23, 0xf9, 0x83, 0x74, 0xec, 0x51, 0x12,
-        0xc5, 0x76, 0x4f, 0x73, 0x58, 0x55, 0x92, 0x1d, 0x43, 0xa7, 0x1e, 0x27,
-        0x71, 0x68, 0xf6, 0x6c, 0x68, 0xb4, 0x4a, 0xe2, 0xa6, 0x3d, 0xd9, 0xd6,
-        0xf4, 0x84, 0x6e, 0xda, 0x43, 0x77, 0x85, 0x71, 0x88, 0x4b, 0xb3, 0x4b,
-        0xf8, 0x68, 0x61, 0xa1, 0xe5, 0xed, 0xef, 0x77, 0xef, 0x7d, 0xd2, 0xe8,
-        0xc3, 0x09, 0xa1, 0xbb, 0xf5, 0x39, 0xcf, 0x6f, 0xde, 0xfd, 0xfc, 0xdf,
-        0xff, 0xfd, 0x7f, 0xdf, 0x0f, 0xad, 0x17, 0xa9, 0x17, 0xfb, 0x6f, 0x15,
-        0x9e, 0x6d, 0x89, 0x7d, 0xbb, 0xb7, 0x5e, 0xd7, 0x73, 0x1d, 0x7e, 0x6e,
-        0x75, 0x57, 0x46, 0x95, 0xbc, 0x89, 0x7f, 0x89, 0x9f, 0xa1, 0x4c, 0x44,
-        0xc4, 0x0b, 0xfb, 0xe2, 0x23, 0x51, 0x95, 0x1e, 0xfc, 0x64, 0xd6, 0x97,
-        0x68, 0x24, 0x7d, 0xf6, 0xb3, 0xbb, 0x7d, 0x91, 0x4c, 0x79, 0x4b, 0xa2,
-        0x57, 0xfe, 0x25, 0xc8, 0xc7, 0x5c, 0x61, 0xfa, 0x5b, 0xd2, 0xff, 0xfc,
-        0x9f, 0xbe, 0xf2, 0x8e, 0xe4, 0x6b, 0xe3, 0x11, 0x89, 0x7a, 0xe9, 0x8f,
-        0x89, 0xb7, 0x49, 0xa2, 0xad, 0xe9, 0x81, 0x4f, 0x3e, 0xbc, 0xf9, 0x6f,
-        0x44, 0x1a, 0xc3, 0xb6, 0x2e, 0x07, 0x5f, 0xd9, 0x2c, 0xf9, 0x96, 0x74,
-        0x7c, 0xc8, 0x4d, 0x7b, 0xf2, 0x74, 0x45, 0x06, 0x0a, 0xc5, 0xa8, 0x44,
-        0xd2, 0x1d, 0x2f, 0xf5, 0x46, 0xf6, 0x07, 0x11, 0xdf, 0xf7, 0x7a, 0xa5,
-        0xa1, 0x27, 0xdb, 0x8d, 0xf4, 0xf2, 0x56, 0x51, 0x7e, 0x54, 0xb2, 0x15,
-        0x69, 0x50, 0xbe, 0x8f, 0x77, 0xbd, 0xa8, 0x74, 0xd2, 0xcb, 0x46, 0x5c,
-        0x29, 0x54, 0x2e, 0xac, 0x30, 0x6d, 0x96, 0xec, 0xfb, 0x6f, 0xa2, 0xe6,
-        0x8d, 0x36, 0x4b, 0x51, 0x99, 0x8d, 0xc4, 0x05, 0xfd, 0x00, 0xe6, 0x06,
-        0x19, 0x2e, 0x25, 0x24, 0x5b, 0x64, 0xbf, 0xae, 0xe4, 0x3c, 0xf6, 0xd9,
-        0x80, 0xfa, 0x2b, 0x9d, 0xe5, 0xcb, 0xb3, 0xec, 0x4b, 0x28, 0x9b, 0x40,
-        0xb9, 0x56, 0x79, 0xbc, 0x12, 0x97, 0xc7, 0x2a, 0x31, 0x79, 0xb4, 0x72,
-        0x87, 0x64, 0x50, 0xf7, 0x6c, 0x05, 0x7d, 0x97, 0x6a, 0xa5, 0x77, 0xac,
-        0x5e, 0xb2, 0x63, 0xed, 0xf1, 0x9c, 0x04, 0xc1, 0x27, 0x52, 0x1f, 0x95,
-        0xa1, 0x26, 0x94, 0x2f, 0x31, 0x2f, 0xbe, 0x20, 0x2f, 0x97, 0xda, 0xe2,
-        0xe5, 0x94, 0x23, 0x99, 0xc1, 0x64, 0x7c, 0x48, 0xf1, 0xbb, 0x46, 0xb2,
-        0x5d, 0xf8, 0x1e, 0x70, 0x25, 0xe2, 0x07, 0xc1, 0x1d, 0xa9, 0x26, 0xc0,
-        0x91, 0x4c, 0x24, 0x14, 0xeb, 0xb2, 0x5e, 0x32, 0x9f, 0x50, 0x51, 0xc9,
-        0x57, 0xae, 0x93, 0x44, 0x53, 0x10, 0xbc, 0x37, 0xe5, 0x21, 0x5d, 0xa4,
-        0xb7, 0x28, 0xfb, 0x54, 0xda, 0x47, 0x9b, 0x92, 0x52, 0xe9, 0xb5, 0x18,
-        0xc7, 0x16, 0xe0, 0xa9, 0x56, 0x32, 0x31, 0xc9, 0xa8, 0xb4, 0x24, 0x54,
-        0x7a, 0x05, 0xd2, 0x1c, 0xa9, 0xf1, 0xa7, 0x2c, 0x9d, 0xac, 0xc6, 0xb7,
-        0x0c, 0xa8, 0x74, 0xd3, 0xa2, 0xf4, 0x64, 0x42, 0xd4, 0x8f, 0xea, 0xd0,
-        0x67, 0x67, 0x46, 0x31, 0x0d, 0x6f, 0x9d, 0x76, 0xfd, 0x32, 0x69, 0x1f,
-        0x74, 0x16, 0xa6, 0x3d, 0xb5, 0x8a, 0xb0, 0x8a, 0xe2, 0xef, 0x28, 0xe0,
-        0x6a, 0x41, 0xff, 0xed, 0x5e, 0x0d, 0xc6, 0x35, 0x90, 0x4a, 0x7a, 0xfd,
-        0xea, 0xc5, 0x40, 0x9a, 0x09, 0x33, 0xf3, 0x14, 0xf2, 0x50, 0x34, 0x9d,
-        0xc2, 0xbc, 0xb9, 0x72, 0x08, 0x63, 0xbb, 0x38, 0x96, 0xf4, 0xda, 0x14,
-        0xde, 0x53, 0xfc, 0xdd, 0x34, 0x14, 0x49, 0x07, 0x41, 0x36, 0x35, 0x2e,
-        0xb9, 0x72, 0xd2, 0x9b, 0x05, 0x70, 0xbd, 0x63, 0x71, 0x8c, 0x1f, 0xe3,
-        0x88, 0x65, 0x92, 0x6b, 0xa4, 0xcb, 0xce, 0xcf, 0x5f, 0xa2, 0xef, 0x76,
-        0xef, 0x0e, 0xd5, 0xee, 0xa5, 0x54, 0xd2, 0x9b, 0x90, 0x3f, 0xc4, 0x77,
-        0x10, 0xec, 0x4a, 0x25, 0xe3, 0x79, 0xcc, 0xdd, 0xa5, 0x62, 0x4c, 0x5e,
-        0x2e, 0x26, 0x41, 0xa9, 0xc9, 0xce, 0x49, 0xd9, 0x92, 0x9a, 0x04, 0xdc,
-        0x05, 0x3c, 0x07, 0x99, 0x57, 0x46, 0x5e, 0x99, 0x75, 0x83, 0xe0, 0xe6,
-        0xd4, 0x89, 0x60, 0xa8, 0xd9, 0xd0, 0xfe, 0xd3, 0x25, 0xcc, 0x2b, 0xe6,
-        0xe9, 0xb1, 0x12, 0xe6, 0xb5, 0x84, 0x39, 0xd5, 0xf3, 0xdf, 0x89, 0xf9,
-        0x27, 0x8d, 0x90, 0x3e, 0xb6, 0x59, 0x7a, 0x7d, 0xb7, 0x7d, 0x8b, 0x64,
-        0x4b, 0x8e, 0x64, 0x53, 0x3f, 0x09, 0x32, 0x9a, 0x27, 0xc4, 0xe9, 0x2d,
-        0x91, 0x26, 0x6b, 0x00, 0x2b, 0x3f, 0x7f, 0xdd, 0x96, 0x8b, 0x3a, 0x18,
-        0x06, 0xe7, 0x83, 0xf9, 0x51, 0xe5, 0xd7, 0xd9, 0xfc, 0x90, 0xf6, 0xf9,
-        0x0f, 0x74, 0xe7, 0xcf, 0x97, 0xcb, 0x92, 0x36, 0x2b, 0x22, 0xb9, 0x07,
-        0x03, 0xe9, 0x4d, 0x01, 0x5f, 0x6c, 0xd3, 0x4b, 0x89, 0xae, 0xeb, 0xb1,
-        0x8c, 0x2e, 0x8b, 0x7f, 0x3f, 0xae, 0x41, 0x1f, 0x4e, 0x5f, 0x69, 0xbe,
-        0x6e, 0x5f, 0xe9, 0x85, 0x98, 0x85, 0x0f, 0xdf, 0x3d, 0x4e, 0xb6, 0xf2,
-        0x77, 0x76, 0x8e, 0xc3, 0x71, 0x74, 0x2d, 0x43, 0xe3, 0x2e, 0xf8, 0xc1,
-        0x93, 0x5c, 0xb1, 0x07, 0xfd, 0xc6, 0xf0, 0x0e, 0x82, 0x91, 0x54, 0x26,
-        0xe9, 0x4a, 0x1a, 0xdf, 0x03, 0x98, 0xaf, 0x0e, 0xe0, 0x4f, 0xdc, 0xec,
-        0xe6, 0x94, 0xf4, 0x55, 0x40, 0x7b, 0x95, 0x37, 0x96, 0x14, 0x7a, 0x0c,
-        0xa9, 0x7f, 0xb1, 0xb8, 0x61, 0x3f, 0x7c, 0xbb, 0x32, 0x02, 0xfa, 0x28,
-        0x8c, 0xf9, 0x32, 0x5c, 0x9c, 0xf6, 0x94, 0x24, 0x41, 0xbb, 0x69, 0xe9,
-        0xad, 0xf8, 0x52, 0x28, 0xe2, 0x5d, 0x6a, 0x07, 0xfd, 0xba, 0x92, 0x89,
-        0x9b, 0x39, 0x29, 0x14, 0x7f, 0x09, 0xe3, 0x02, 0x8e, 0x7d, 0xfe, 0xee,
-        0xb1, 0xb0, 0x80, 0xf7, 0xbb, 0x53, 0x1a, 0x3f, 0x6f, 0x0e, 0x06, 0xf6,
-        0x8d, 0x31, 0x60, 0x9c, 0x85, 0xb2, 0x8b, 0x77, 0x0c, 0xef, 0x90, 0x16,
-        0xe3, 0x80, 0xa9, 0x55, 0x86, 0x41, 0x8b, 0xbd, 0x82, 0xdf, 0x53, 0x84,
-        0x91, 0xfd, 0xb6, 0xe8, 0xdf, 0xc3, 0x63, 0x1b, 0xf4, 0x77, 0x6e, 0xa0,
-        0x45, 0xf2, 0x53, 0xe1, 0x58, 0x28, 0x0f, 0x28, 0x03, 0x92, 0x87, 0x45,
-        0x28, 0x13, 0x82, 0xe0, 0xc1, 0x14, 0xe5, 0x42, 0x10, 0x3c, 0x96, 0xa2,
-        0x9c, 0x38, 0x07, 0xfe, 0xa7, 0x6c, 0x20, 0xaf, 0xae, 0x55, 0x9c, 0x83,
-        0x6c, 0x11, 0x7d, 0x40, 0x4e, 0xe4, 0xba, 0x4e, 0x40, 0x6e, 0x50, 0xae,
-        0x5c, 0xf8, 0x44, 0xd6, 0xcf, 0xc7, 0x23, 0x1a, 0x0f, 0x98, 0x6f, 0xc8,
-        0xbc, 0x8c, 0x86, 0xbc, 0x4d, 0x0a, 0x5d, 0xa3, 0xb6, 0xcc, 0x65, 0x5d,
-        0xc6, 0x5d, 0x52, 0xe6, 0x76, 0x65, 0xf8, 0xae, 0x15, 0xf3, 0xb1, 0x42,
-        0x11, 0x4f, 0x6d, 0x9b, 0xf8, 0x2d, 0xd1, 0x9a, 0xf4, 0x97, 0x90, 0x37,
-        0x7d, 0xd7, 0x49, 0x7f, 0xb9, 0xbc, 0x59, 0x77, 0x69, 0xde, 0x88, 0xb8,
-        0x7e, 0xb2, 0x73, 0x97, 0x9a, 0x01, 0x3d, 0x05, 0xc1, 0xc9, 0x54, 0x98,
-        0xfe, 0x8f, 0xee, 0xd2, 0x3e, 0x12, 0x35, 0x4b, 0xd3, 0xee, 0x5d, 0x26,
-        0xed, 0xc4, 0x32, 0x69, 0x1b, 0x6a, 0x97, 0xa6, 0xbd, 0x7f, 0x99, 0xb4,
-        0xfb, 0x97, 0x49, 0xfb, 0x5f, 0xcb, 0xa4, 0x7d, 0x67, 0x99, 0xb4, 0xef,
-        0x2d, 0x93, 0xd6, 0x52, 0xb7, 0x34, 0xcd, 0x05, 0x3f, 0x6d, 0x92, 0x42,
-        0xec, 0x73, 0x1c, 0xbb, 0xc5, 0xcd, 0xfe, 0xc8, 0x52, 0xdc, 0xd4, 0xa0,
-        0x5c, 0xeb, 0xa2, 0x72, 0x53, 0xcb, 0x94, 0xab, 0x45, 0xb9, 0xa6, 0x45,
-        0xe5, 0x92, 0xcb, 0xe0, 0xba, 0x4e, 0xeb, 0xaf, 0x85, 0xe5, 0x0a, 0xcb,
-        0x94, 0x63, 0xfa, 0x1e, 0xdb, 0xcf, 0x16, 0x68, 0x99, 0xd7, 0x9b, 0xaf,
-        0x5a, 0x91, 0x66, 0xa6, 0xb7, 0x42, 0x47, 0xac, 0x50, 0x86, 0xdf, 0x29,
-        0x5b, 0x98, 0xe6, 0x81, 0xee, 0xa3, 0xa0, 0x3b, 0xca, 0x47, 0xf0, 0x91,
-        0x4f, 0xfe, 0x5d, 0x25, 0x43, 0xb1, 0x2d, 0xde, 0x2f, 0xa8, 0x06, 0xd0,
-        0x58, 0xd2, 0x4b, 0x28, 0xf2, 0x97, 0xe4, 0x23, 0x69, 0x3f, 0xdf, 0x2b,
-        0x2a, 0xa6, 0x24, 0x90, 0xbe, 0x94, 0x6a, 0x52, 0xb2, 0x1f, 0xfc, 0x93,
-        0x81, 0x4e, 0xda, 0x15, 0xf4, 0x6a, 0x1e, 0x32, 0x65, 0xaf, 0x2c, 0x2b,
-        0x7d, 0x39, 0x48, 0x19, 0x97, 0xce, 0xdc, 0x95, 0xf5, 0xa7, 0x7b, 0x6a,
-        0x41, 0xb3, 0x17, 0x51, 0x67, 0x07, 0x6a, 0xee, 0x2d, 0xbb, 0xd2, 0x57,
-        0xee, 0x04, 0x2f, 0x38, 0x72, 0xde, 0x5f, 0x2d, 0xe7, 0x53, 0x28, 0x5b,
-        0x89, 0xc8, 0x4c, 0xcc, 0x91, 0x19, 0x7c, 0x67, 0x53, 0xc8, 0xab, 0x84,
-        0xbc, 0xd5, 0x29, 0x07, 0x4a, 0xbe, 0x1c, 0x2e, 0xfd, 0x92, 0x0a, 0xf5,
-        0x56, 0x7f, 0x6a, 0xa5, 0x9c, 0xf6, 0x4c, 0xdb, 0x3b, 0xfc, 0x69, 0x68,
-        0x4c, 0x57, 0x2e, 0xfa, 0xc9, 0xf8, 0x8c, 0xe6, 0x89, 0x1f, 0x06, 0x7d,
-        0x68, 0x67, 0xc2, 0x4f, 0x7a, 0x7f, 0x8a, 0xef, 0xa1, 0x32, 0xed, 0x90,
-        0xf9, 0xb6, 0x86, 0xd1, 0xd6, 0xa1, 0xd2, 0x2a, 0xf9, 0xb0, 0xad, 0xbf,
-        0xdd, 0x9f, 0xee, 0x04, 0xcf, 0x79, 0xa7, 0x28, 0x23, 0x8a, 0x80, 0x6b,
-        0x10, 0xbc, 0x8d, 0xba, 0xcf, 0x69, 0x39, 0x05, 0xbb, 0xa5, 0xb8, 0x1a,
-        0x72, 0xf7, 0x1f, 0x83, 0x0f, 0xc7, 0x58, 0x9e, 0x69, 0xd4, 0x25, 0x32,
-        0xaa, 0xd2, 0x90, 0x09, 0xdd, 0x94, 0x85, 0x09, 0xc8, 0x41, 0xc8, 0x96,
-        0xd2, 0x4f, 0x83, 0x8c, 0x5b, 0x2d, 0xdf, 0x24, 0x3f, 0x5f, 0x86, 0x69,
-        0x09, 0x23, 0x2f, 0x4b, 0xb3, 0x73, 0xb2, 0x22, 0x0f, 0xf9, 0xf2, 0x74,
-        0x85, 0x72, 0xe1, 0x7a, 0xf0, 0x68, 0xab, 0xf4, 0x15, 0x93, 0xf9, 0x8c,
-        0x6c, 0xc2, 0xfc, 0x7d, 0x1e, 0x73, 0xea, 0xe2, 0xb9, 0xaf, 0x5e, 0x1a,
-        0x53, 0xd0, 0xcd, 0x4c, 0x47, 0xa3, 0xcd, 0x51, 0xc8, 0xa8, 0xdf, 0x03,
-        0x1e, 0x86, 0x39, 0xe7, 0xf1, 0x6c, 0xc4, 0x19, 0xa0, 0x3d, 0x32, 0x40,
-        0xfd, 0x50, 0x66, 0xdb, 0x84, 0x37, 0x6e, 0x7f, 0x47, 0xb5, 0x8c, 0x31,
-        0xbf, 0x1b, 0xf0, 0x3b, 0x61, 0x7f, 0x7b, 0xf8, 0xed, 0xdb, 0xdf, 0x31,
-        0xfc, 0xee, 0xb4, 0xbf, 0xa1, 0x5b, 0x8b, 0x5d, 0xfa, 0xf7, 0x48, 0x69,
-        0xfb, 0x76, 0xe5, 0x5f, 0x27, 0xb9, 0xa9, 0x56, 0x39, 0x50, 0xf4, 0xad,
-        0x6c, 0xc1, 0x23, 0x4f, 0x3a, 0x66, 0x9c, 0x80, 0x9b, 0xb2, 0xb3, 0x94,
-        0x77, 0x06, 0x08, 0x3f, 0x68, 0xa0, 0xb7, 0xb8, 0xc5, 0x5b, 0x23, 0xa4,
-        0x81, 0x11, 0xa7, 0xb7, 0xe2, 0x64, 0x60, 0xaf, 0xc5, 0x87, 0xe5, 0x30,
-        0x7e, 0x8b, 0x17, 0x49, 0x3f, 0x89, 0xb7, 0xc1, 0x01, 0xf5, 0xce, 0x70,
-        0x89, 0xf2, 0xd2, 0xc7, 0xd8, 0x13, 0x72, 0x6e, 0x81, 0x0d, 0x45, 0x5c,
-        0x28, 0xc9, 0x8d, 0x25, 0x4f, 0xe4, 0x25, 0x99, 0x1f, 0x07, 0x43, 0xec,
-        0x4a, 0xb9, 0xf2, 0xde, 0x14, 0x68, 0xf7, 0x3a, 0x47, 0xb6, 0x5f, 0xe7,
-        0xc2, 0xe6, 0xf1, 0xc7, 0xb7, 0x83, 0xfe, 0x31, 0xcf, 0x9a, 0x1e, 0xd4,
-        0x19, 0x81, 0x9d, 0x08, 0x6c, 0x9f, 0xe9, 0xea, 0x1b, 0x2e, 0xe6, 0x3e,
-        0xa6, 0xd2, 0xfb, 0x3e, 0x95, 0xed, 0xbe, 0x46, 0x72, 0x83, 0x0a, 0x38,
-        0x6a, 0x1e, 0x82, 0x1e, 0xc4, 0xb8, 0x82, 0x00, 0xf4, 0x0c, 0x79, 0x7e,
-        0xf3, 0xcd, 0x91, 0x74, 0x8d, 0xf4, 0x0e, 0x36, 0xa3, 0x0e, 0xf3, 0x88,
-        0xaf, 0xaf, 0xa2, 0x9d, 0x64, 0xa2, 0x4f, 0xe4, 0x9e, 0x91, 0xee, 0x59,
-        0x67, 0x78, 0xf4, 0x37, 0xc0, 0x93, 0x5b, 0x51, 0xff, 0x01, 0xd4, 0x7f,
-        0xcd, 0x29, 0x8c, 0xfd, 0xc8, 0x19, 0x1e, 0xfb, 0x9e, 0x33, 0x32, 0xb6,
-        0x61, 0x43, 0x7f, 0xcf, 0x86, 0x0d, 0xbb, 0x7b, 0x5c, 0x99, 0x00, 0x8f,
-        0x65, 0xbc, 0x0d, 0x1b, 0x46, 0x7a, 0xba, 0x80, 0x83, 0x2d, 0x5e, 0x9f,
-        0xf8, 0xde, 0x76, 0x01, 0xff, 0xc4, 0xd8, 0x67, 0x14, 0xf9, 0x49, 0xe4,
-        0xb3, 0x7e, 0x5c, 0xe7, 0xf7, 0xca, 0x96, 0x78, 0x93, 0xb0, 0xff, 0x88,
-        0x2d, 0x53, 0x13, 0x91, 0xfa, 0x07, 0xec, 0xfc, 0x66, 0x9c, 0x1a, 0x9f,
-        0xe9, 0x1c, 0x0b, 0xd3, 0x39, 0xb7, 0x7f, 0x67, 0x6d, 0xd5, 0xd5, 0x48,
-        0xe7, 0x37, 0x71, 0x46, 0xbc, 0xd0, 0xc6, 0xa8, 0xd1, 0xb6, 0x61, 0xae,
-        0x48, 0x9a, 0x71, 0x65, 0x4f, 0xd1, 0x41, 0x1d, 0xd0, 0xc5, 0x19, 0xfb,
-        0x1c, 0x05, 0x6c, 0x83, 0x68, 0xeb, 0xe8, 0x21, 0xd4, 0xa3, 0xcc, 0x48,
-        0x76, 0x8a, 0xfa, 0x00, 0xca, 0x6c, 0xf1, 0xd6, 0x0a, 0x6d, 0x89, 0x3b,
-        0x25, 0x57, 0x22, 0x7f, 0x77, 0x00, 0x9e, 0xa8, 0x24, 0x9a, 0xf1, 0x5d,
-        0x81, 0x4d, 0xf1, 0x60, 0x8d, 0x58, 0xdb, 0x45, 0xe6, 0x6d, 0x91, 0x3b,
-        0x94, 0xc0, 0xde, 0x18, 0x9a, 0x5c, 0x8f, 0x72, 0x0e, 0xf0, 0x42, 0xfb,
-        0x03, 0xb4, 0x36, 0x99, 0x91, 0xec, 0x26, 0xf0, 0xc9, 0xa4, 0x87, 0x6f,
-        0xc0, 0x35, 0xf9, 0x16, 0xbc, 0x23, 0xfa, 0xdb, 0xc0, 0x09, 0xbc, 0xa6,
-        0x22, 0x56, 0x67, 0x75, 0xa1, 0xef, 0xf7, 0x48, 0x76, 0x34, 0x4e, 0x5b,
-        0x62, 0x75, 0xd6, 0xcf, 0x40, 0xd7, 0x2b, 0x28, 0x41, 0x8c, 0x61, 0xd2,
-        0x81, 0x3c, 0xa9, 0x95, 0xdd, 0x8f, 0xe0, 0xf7, 0x83, 0xc6, 0xe6, 0xdd,
-        0x3d, 0xc9, 0x7e, 0x1a, 0x00, 0x13, 0x6c, 0x90, 0x47, 0x60, 0x9b, 0x3e,
-        0x02, 0x1b, 0xe4, 0x91, 0x66, 0x3c, 0x1c, 0x1b, 0xdb, 0x9f, 0x59, 0x03,
-        0x31, 0xa9, 0xbf, 0x73, 0xa4, 0x57, 0xd8, 0xea, 0xb9, 0x62, 0xca, 0x94,
-        0x2f, 0x76, 0xeb, 0xb7, 0xa1, 0xeb, 0x1e, 0xfb, 0x3b, 0xae, 0xf9, 0x3a,
-        0xdf, 0x04, 0x9a, 0xaf, 0x74, 0x69, 0x99, 0x93, 0xf5, 0xf1, 0x86, 0xcd,
-        0x99, 0x69, 0xe2, 0x18, 0xe3, 0x36, 0x2d, 0xae, 0xd3, 0x12, 0x4d, 0xd6,
-        0xde, 0x28, 0x59, 0x5b, 0x03, 0xb8, 0x19, 0x6a, 0x06, 0xc4, 0x94, 0xcf,
-        0x12, 0xe2, 0x93, 0x32, 0x00, 0xf4, 0x0b, 0x9b, 0xe2, 0xdc, 0x15, 0xe5,
-        0xdf, 0xac, 0xb6, 0xb1, 0xce, 0x56, 0x48, 0xc7, 0xa4, 0xed, 0x20, 0xb8,
-        0x3f, 0x55, 0x87, 0xf6, 0xc9, 0xf3, 0xb0, 0x40, 0x8e, 0x02, 0x26, 0x60,
-        0xa2, 0xc6, 0x3f, 0xab, 0x69, 0xa0, 0xd6, 0x27, 0x0d, 0x57, 0xf3, 0x97,
-        0xe8, 0xf1, 0x9e, 0x05, 0x8f, 0xc1, 0xbe, 0x81, 0xfd, 0xd6, 0x01, 0xdb,
-        0x98, 0x7d, 0x1c, 0xe6, 0xb7, 0xa7, 0xc0, 0x53, 0xd9, 0x39, 0x9e, 0x12,
-        0x99, 0x28, 0x12, 0x37, 0xa1, 0x5d, 0xc7, 0x79, 0x26, 0x7e, 0x32, 0x18,
-        0x33, 0xdf, 0x7d, 0x16, 0x4f, 0x3b, 0x2d, 0x9e, 0x6e, 0xb2, 0xef, 0x11,
-        0xbc, 0x69, 0xe3, 0x0d, 0xe0, 0xcd, 0xf9, 0x19, 0xc4, 0x9b, 0xbc, 0x75,
-        0x0b, 0xde, 0x28, 0x5b, 0xca, 0xc8, 0x6e, 0x6d, 0x87, 0x45, 0xe4, 0x57,
-        0xb4, 0x6c, 0xfb, 0x02, 0xe6, 0xb2, 0x48, 0xfa, 0x95, 0x7c, 0x2c, 0x02,
-        0x9c, 0x14, 0xf0, 0xfb, 0x4e, 0xd7, 0xd0, 0x2a, 0x71, 0xb2, 0xc0, 0x57,
-        0xaa, 0x82, 0x29, 0x66, 0xe5, 0x5c, 0x42, 0xdb, 0xfa, 0xb9, 0xe2, 0x07,
-        0x34, 0x5c, 0xb7, 0x42, 0xde, 0xe5, 0x45, 0x35, 0x43, 0x37, 0x80, 0x16,
-        0x54, 0x0c, 0x9a, 0x2b, 0x78, 0x06, 0x7a, 0x29, 0x37, 0x49, 0xdb, 0xb8,
-        0x8d, 0x7e, 0x49, 0x34, 0xd7, 0xd5, 0x48, 0x3a, 0x52, 0x0a, 0xf6, 0x17,
-        0xbe, 0x55, 0xae, 0x4b, 0xd3, 0xa9, 0xa3, 0xfc, 0x98, 0xb6, 0x7f, 0x5d,
-        0x1f, 0xd2, 0xd6, 0xf8, 0xbd, 0xae, 0xf2, 0xd7, 0x2e, 0x4e, 0x4b, 0x50,
-        0x0f, 0xa3, 0x5e, 0x22, 0xd7, 0xd5, 0x4c, 0x1e, 0xf3, 0x40, 0xbf, 0x19,
-        0xe5, 0x6b, 0xdf, 0x27, 0xaf, 0xba, 0x57, 0x2f, 0x2a, 0xaf, 0xdf, 0x8e,
-        0xfd, 0x76, 0xed, 0xdb, 0xb3, 0xef, 0x84, 0x7d, 0xe7, 0xdd, 0x6e, 0xbe,
-        0x1d, 0x71, 0xd3, 0x7c, 0x83, 0x92, 0xd3, 0x6c, 0x43, 0xf3, 0x95, 0x95,
-        0x33, 0x1d, 0x5e, 0x41, 0xc8, 0x57, 0x9f, 0x93, 0x5b, 0x27, 0x8d, 0xfc,
-        0xdd, 0x0e, 0x19, 0x04, 0xff, 0xcc, 0x9b, 0x11, 0xc0, 0x3f, 0x98, 0x96,
-        0x5b, 0x2b, 0xc4, 0xdb, 0xef, 0x02, 0x7f, 0x60, 0xe2, 0x7a, 0xea, 0x74,
-        0xca, 0xdd, 0x3b, 0x61, 0xf7, 0xa2, 0x7c, 0x91, 0x38, 0x1f, 0xd2, 0x73,
-        0x53, 0x28, 0xee, 0xd1, 0x73, 0x73, 0xb0, 0x38, 0x03, 0xfc, 0xdc, 0x06,
-        0xba, 0x0f, 0x82, 0x99, 0x54, 0x01, 0x94, 0xf3, 0x11, 0xfc, 0x86, 0x1d,
-        0x50, 0xfc, 0x18, 0xf2, 0x1b, 0xa5, 0x30, 0x4a, 0x9e, 0x73, 0x2d, 0x0f,
-        0xbf, 0x13, 0xfc, 0x14, 0x45, 0xbb, 0x48, 0xeb, 0xe6, 0xef, 0x9f, 0x20,
-        0x0f, 0xef, 0x49, 0x4c, 0x62, 0x33, 0x6d, 0x1d, 0xf6, 0xcd, 0xb9, 0xe3,
-        0x9c, 0xc5, 0xb4, 0x2c, 0x3f, 0x3b, 0x37, 0x6f, 0x97, 0xe7, 0xe8, 0x36,
-        0x4f, 0x1f, 0x8f, 0xf9, 0x1a, 0x56, 0xd2, 0xfd, 0xb7, 0xb4, 0x5c, 0x72,
-        0x8f, 0xce, 0xac, 0x30, 0xef, 0xc5, 0x75, 0x39, 0xe7, 0xd5, 0x34, 0x48,
-        0xbf, 0x25, 0xd9, 0x93, 0x07, 0x3f, 0x61, 0x9c, 0xd2, 0xa7, 0x7d, 0x1d,
-        0xd2, 0x04, 0x69, 0x60, 0xdc, 0xd2, 0xe6, 0x94, 0xa5, 0xcd, 0x27, 0xf1,
-        0xc6, 0x53, 0xba, 0x60, 0x69, 0xf3, 0x29, 0xbc, 0xf1, 0x94, 0x5e, 0x9c,
-        0xe3, 0xe3, 0x5e, 0xf8, 0x72, 0xdb, 0xa1, 0xdf, 0x76, 0x57, 0x40, 0xbf,
-        0xe0, 0xbb, 0x1c, 0x7c, 0x80, 0x5c, 0x69, 0x1f, 0xde, 0xec, 0x67, 0xa3,
-        0x6d, 0x3f, 0x23, 0x7b, 0x4a, 0x01, 0xc6, 0x78, 0x37, 0xc6, 0xfb, 0x39,
-        0xbc, 0x3f, 0xa3, 0xe5, 0x8c, 0xf2, 0x0f, 0x5b, 0x79, 0xf5, 0x79, 0xbc,
-        0xdb, 0xe3, 0x07, 0xa5, 0xdd, 0x8b, 0xc8, 0x34, 0xda, 0xfa, 0xba, 0xec,
-        0xa9, 0xcc, 0xe2, 0xb9, 0x84, 0xe7, 0x55, 0x3c, 0x97, 0xd1, 0xde, 0x0b,
-        0x48, 0x5f, 0x29, 0xd3, 0x5e, 0x3d, 0xca, 0xbf, 0x86, 0xdf, 0xcf, 0xcb,
-        0xd0, 0x23, 0x2f, 0xe1, 0xf9, 0x01, 0xf2, 0x9f, 0x45, 0xfd, 0x60, 0xf5,
-        0x8c, 0x4f, 0x19, 0xf6, 0x9c, 0x6d, 0x3b, 0xe5, 0xe4, 0x2a, 0xa0, 0xe9,
-        0xd2, 0x00, 0xfa, 0xde, 0xa3, 0x79, 0xa6, 0x0f, 0x32, 0x3f, 0x07, 0x19,
-        0x37, 0xa4, 0x61, 0x6a, 0x07, 0x7c, 0x79, 0xcc, 0x05, 0xde, 0x93, 0xb5,
-        0x32, 0x1b, 0xa3, 0x1d, 0x79, 0x93, 0x2e, 0x9f, 0x2b, 0x35, 0x69, 0xbb,
-        0x7a, 0x7c, 0x09, 0xff, 0xd0, 0xef, 0x0a, 0xe5, 0x81, 0x91, 0xc6, 0x13,
-        0x45, 0xca, 0x02, 0xe8, 0x9f, 0xe2, 0x08, 0xde, 0xb5, 0x5a, 0x26, 0x14,
-        0x24, 0x94, 0x07, 0xac, 0x47, 0x99, 0x50, 0x2d, 0x77, 0x28, 0x6b, 0x28,
-        0x7b, 0x28, 0x4b, 0xcc, 0x7c, 0xec, 0x7e, 0x90, 0x32, 0x1c, 0xb4, 0x10,
-        0xa3, 0xfd, 0xe1, 0x19, 0x1f, 0x64, 0xec, 0x3e, 0x2b, 0x4f, 0x47, 0xf5,
-        0x5c, 0xec, 0x29, 0xaa, 0x98, 0x2b, 0xa7, 0x91, 0x86, 0xe7, 0xf8, 0xc3,
-        0x78, 0x7f, 0x49, 0xf6, 0xe0, 0xc9, 0x1d, 0xff, 0x02, 0x7e, 0x73, 0x6e,
-        0xca, 0x28, 0x87, 0xa7, 0x74, 0x02, 0x6f, 0x3c, 0xa5, 0x31, 0x2b, 0x47,
-        0xc6, 0xad, 0x1c, 0xe1, 0x9c, 0xde, 0x04, 0x3c, 0x70, 0x7c, 0x4a, 0xc7,
-        0x17, 0xc0, 0xcf, 0x4e, 0x6e, 0xf2, 0x5d, 0xd6, 0x8f, 0x6d, 0x14, 0xc3,
-        0x83, 0x78, 0x3a, 0xc9, 0xcf, 0x0d, 0xda, 0x0e, 0xce, 0x69, 0xda, 0xfd,
-        0x2b, 0xd7, 0xf0, 0x62, 0xcc, 0xe8, 0x14, 0xaf, 0x59, 0x34, 0xef, 0xcf,
-        0xe1, 0x31, 0x63, 0xf1, 0xc8, 0xdf, 0xca, 0xfe, 0x86, 0xdc, 0x82, 0x4d,
-        0x9b, 0xf5, 0x7d, 0xcc, 0x03, 0xc6, 0x72, 0x7c, 0x14, 0x7d, 0x3b, 0xb2,
-        0xdb, 0xa7, 0x0c, 0x67, 0x0c, 0x81, 0xe3, 0x63, 0xbb, 0x48, 0xd7, 0x38,
-        0x48, 0xc9, 0xbc, 0x6f, 0x7e, 0x13, 0xe6, 0x2c, 0x23, 0x7b, 0x4b, 0xf7,
-        0x6a, 0x5f, 0xb9, 0xf6, 0x68, 0x93, 0xf5, 0x73, 0xc2, 0x72, 0xa0, 0xd5,
-        0x18, 0x6d, 0x9b, 0x2f, 0xc5, 0x0c, 0xcd, 0xf3, 0x37, 0xe5, 0x73, 0xb5,
-        0xbc, 0x37, 0x76, 0x4d, 0x61, 0x81, 0xac, 0xa3, 0x6d, 0x81, 0x39, 0x2b,
-        0x57, 0xe3, 0x9d, 0xbe, 0x3b, 0xf9, 0x8a, 0xfc, 0x74, 0x10, 0x3c, 0xf1,
-        0x5d, 0xcb, 0xfb, 0xf4, 0x35, 0xd8, 0xe7, 0x62, 0x7e, 0xf2, 0x60, 0xfb,
-        0xba, 0x72, 0x0a, 0xb6, 0xdb, 0xf6, 0xb9, 0x36, 0xae, 0x06, 0x3c, 0x51,
-        0x79, 0xa4, 0xd8, 0x20, 0x93, 0x45, 0xd5, 0x1c, 0xb1, 0xb2, 0x33, 0x22,
-        0x09, 0x4d, 0xdf, 0xb4, 0xef, 0x7a, 0xc7, 0x22, 0x96, 0xee, 0xd6, 0xd5,
-        0x48, 0xfd, 0xef, 0x42, 0xc7, 0xa6, 0xa1, 0x63, 0x1b, 0xa1, 0x83, 0x17,
-        0xcb, 0x88, 0x35, 0x35, 0x4b, 0x65, 0x04, 0xeb, 0x24, 0xe1, 0x75, 0x1f,
-        0x44, 0xbd, 0x90, 0xfe, 0xa2, 0x9a, 0xd6, 0x72, 0x92, 0x77, 0xb6, 0x57,
-        0x46, 0x9c, 0x1d, 0x95, 0xc5, 0x3a, 0x68, 0x8b, 0xe7, 0x8a, 0x81, 0xf5,
-        0x91, 0x22, 0x6d, 0xd4, 0x64, 0x2a, 0x0b, 0x9c, 0xec, 0x00, 0xcc, 0xcf,
-        0x8c, 0xc2, 0x4f, 0xa7, 0x5c, 0x06, 0xcc, 0xa7, 0x01, 0xf3, 0xc4, 0xa8,
-        0x13, 0xda, 0x06, 0xc2, 0xa0, 0xc8, 0xc4, 0x58, 0x97, 0xcc, 0x4c, 0x91,
-        0x0e, 0x21, 0x03, 0x46, 0x31, 0x9f, 0xa9, 0x15, 0xb0, 0x03, 0xd8, 0x3f,
-        0xe4, 0xf6, 0x58, 0x8b, 0xce, 0x33, 0xfa, 0xbc, 0x55, 0x66, 0xca, 0x69,
-        0x0b, 0xdb, 0xe1, 0x2a, 0xd8, 0x56, 0xcc, 0xc1, 0xb6, 0x03, 0xb0, 0xed,
-        0x5c, 0x16, 0xb6, 0xe5, 0x74, 0x71, 0x1b, 0x6c, 0x1a, 0xa3, 0x8b, 0x0d,
-        0x5e, 0x9b, 0x2d, 0x3d, 0xbc, 0xdf, 0xda, 0xbb, 0xb4, 0x89, 0x7e, 0x0a,
-        0x78, 0x48, 0x63, 0xf8, 0x3d, 0x79, 0x2f, 0x65, 0x19, 0xd2, 0xf9, 0xbd,
-        0x07, 0x65, 0xf0, 0x3d, 0xf9, 0x67, 0x2b, 0x4c, 0xd9, 0xbb, 0x2d, 0x2c,
-        0xb4, 0x13, 0x32, 0xb0, 0x89, 0xfb, 0x9c, 0xec, 0x24, 0x61, 0xf8, 0x8f,
-        0x80, 0x17, 0x79, 0x95, 0xea, 0x36, 0xf9, 0x66, 0xbb, 0xd7, 0xda, 0x76,
-        0xd8, 0x76, 0x38, 0x96, 0x95, 0x56, 0xcf, 0x87, 0xf4, 0x15, 0xda, 0xd7,
-        0x23, 0x4e, 0x66, 0xc9, 0xb8, 0xaa, 0x69, 0x8e, 0xf2, 0xd6, 0x95, 0x7e,
-        0xd0, 0x49, 0xff, 0x02, 0x5a, 0x33, 0x72, 0xc3, 0xd0, 0xf1, 0x0a, 0x3b,
-        0xbe, 0x1a, 0xc3, 0x37, 0xa9, 0x28, 0xf4, 0x21, 0xe5, 0xcd, 0x0e, 0xe3,
-        0x9b, 0xcb, 0x43, 0x80, 0x35, 0xfc, 0x3e, 0xa8, 0x6d, 0xce, 0xa7, 0x4b,
-        0x94, 0x49, 0xf3, 0xb4, 0x68, 0x7c, 0x97, 0x56, 0xf4, 0x55, 0x6d, 0xaf,
-        0xbb, 0x32, 0x60, 0xe6, 0xfc, 0x30, 0xe7, 0x9c, 0xbe, 0x48, 0xfb, 0x03,
-        0x03, 0x96, 0xbf, 0x92, 0xa3, 0x79, 0x79, 0xbb, 0x1d, 0xfb, 0x1f, 0x2e,
-        0x33, 0x77, 0x8d, 0x73, 0x73, 0x37, 0x50, 0x59, 0x3c, 0x46, 0x91, 0xb6,
-        0x07, 0x58, 0xcf, 0x85, 0x8d, 0x94, 0x92, 0x5a, 0x9f, 0xf2, 0x93, 0xb6,
-        0x12, 0xd2, 0x27, 0xb6, 0x78, 0x4d, 0xf0, 0x01, 0x9e, 0x5e, 0x62, 0x77,
-        0x25, 0xac, 0xdc, 0xa4, 0x1f, 0x1c, 0xf6, 0x91, 0xb7, 0x72, 0x32, 0x8f,
-        0xf6, 0x47, 0x9c, 0xfe, 0xca, 0x72, 0xf2, 0x32, 0x94, 0x93, 0x1c, 0x8f,
-        0x23, 0x77, 0x3c, 0x48, 0x1e, 0x7d, 0xbf, 0xb6, 0xaf, 0xb7, 0x6e, 0xab,
-        0x01, 0xfe, 0x08, 0xc7, 0xcc, 0x1a, 0xa2, 0x33, 0xf7, 0x08, 0x6c, 0x22,
-        0x3b, 0x6f, 0xbb, 0xe7, 0xe6, 0x5f, 0xd3, 0x05, 0x7e, 0x33, 0x8e, 0x6a,
-        0x68, 0xa4, 0xc6, 0x77, 0x34, 0x2d, 0xd4, 0x2e, 0xb1, 0x65, 0x39, 0x06,
-        0xda, 0xb3, 0xb5, 0xc6, 0x16, 0x2c, 0xd1, 0xfe, 0xa4, 0xec, 0xa2, 0xfd,
-        0xf9, 0x43, 0xe0, 0x88, 0xe3, 0xe9, 0xb2, 0x69, 0xb4, 0x53, 0x17, 0x8f,
-        0x6f, 0xb1, 0xff, 0x48, 0x38, 0x09, 0xb7, 0xa1, 0xad, 0x84, 0x22, 0x6c,
-        0x81, 0x0c, 0x80, 0x97, 0x39, 0x07, 0x8a, 0xb6, 0xeb, 0xb6, 0xbf, 0xa8,
-        0x31, 0x31, 0xe4, 0xd5, 0xb5, 0x52, 0xcf, 0x3e, 0xc9, 0x7f, 0x7c, 0xaf,
-        0xd2, 0xf6, 0xef, 0x52, 0x59, 0x56, 0xad, 0x7b, 0xae, 0x9e, 0xc3, 0x5f,
-        0xff, 0x82, 0x39, 0x0a, 0xf1, 0x17, 0xd2, 0x45, 0x35, 0x0e, 0x49, 0x13,
-        0x86, 0x16, 0x0c, 0x2d, 0x6e, 0xb4, 0xfa, 0x26, 0xa4, 0xbd, 0xab, 0x40,
-        0x7b, 0xf7, 0x81, 0xc6, 0x28, 0xc3, 0x19, 0x97, 0x5b, 0x8b, 0xef, 0x23,
-        0xf8, 0x0e, 0xf9, 0xe4, 0x4a, 0x32, 0x9c, 0xf2, 0x9b, 0x75, 0xb2, 0x56,
-        0xee, 0x87, 0x7e, 0x2e, 0xeb, 0x70, 0xdc, 0x94, 0xff, 0xff, 0x15, 0xed,
-        0xac, 0xad, 0x35, 0xf6, 0xca, 0x8d, 0xb5, 0x94, 0xaf, 0x6b, 0xe4, 0x60,
-        0x55, 0xda, 0x95, 0xe4, 0x77, 0xf5, 0x98, 0xd7, 0xff, 0x3f, 0x18, 0x73,
-        0x7c, 0xd1, 0x98, 0x3d, 0x3b, 0xe6, 0x77, 0x21, 0xbf, 0xc9, 0xf8, 0x38,
-        0x1e, 0xf9, 0x2e, 0x1c, 0xb3, 0xc5, 0x85, 0x1e, 0x57, 0xb5, 0x9c, 0x08,
-        0x65, 0x04, 0xc7, 0x35, 0x60, 0xc7, 0xf0, 0xb9, 0xaa, 0x71, 0x0d, 0xbc,
-        0x89, 0x71, 0xb5, 0x2e, 0x18, 0xd7, 0xf6, 0x2b, 0x8e, 0x6b, 0x39, 0x1e,
-        0x27, 0x2f, 0x87, 0xe3, 0x8b, 0xca, 0xae, 0x22, 0xc7, 0xd8, 0x8f, 0x31,
-        0x1e, 0xd4, 0xfe, 0x80, 0x19, 0x63, 0xda, 0x8e, 0x51, 0x54, 0xdb, 0xb6,
-        0x7f, 0x8f, 0xdf, 0xd5, 0xe3, 0xa3, 0xee, 0xff, 0x3e, 0x68, 0xba, 0x4e,
-        0xb2, 0x5d, 0x75, 0x56, 0xfe, 0xdf, 0x24, 0x1f, 0x2e, 0x71, 0xae, 0x93,
-        0x19, 0x91, 0x51, 0xe8, 0xe0, 0xff, 0x5c, 0xcb, 0xd8, 0xfd, 0xf6, 0x94,
-        0xd5, 0x63, 0xd0, 0x17, 0x3b, 0x60, 0xf3, 0xf5, 0x17, 0x55, 0x77, 0x44,
-        0x82, 0xe0, 0xb6, 0xd4, 0xa7, 0xd1, 0xf7, 0x7e, 0xed, 0xab, 0x2e, 0x8d,
-        0x9b, 0x3f, 0x57, 0x2b, 0x3e, 0xed, 0x0d, 0xea, 0x73, 0xe8, 0xbb, 0xe3,
-        0xb4, 0xc1, 0xb2, 0xb0, 0x93, 0x33, 0xf1, 0x88, 0xb6, 0xc5, 0xa8, 0x13,
-        0x93, 0xf1, 0x8c, 0xa4, 0xd1, 0x5f, 0x26, 0xae, 0x84, 0x7d, 0xc0, 0x56,
-        0x83, 0x0d, 0xf9, 0xe1, 0xca, 0x3e, 0x3c, 0x0f, 0xcb, 0xad, 0xb0, 0x77,
-        0x6e, 0x7d, 0xe4, 0x0b, 0x72, 0x1b, 0x6c, 0x9d, 0xdb, 0x1e, 0x19, 0x93,
-        0xbd, 0xb0, 0x6d, 0xf6, 0xc2, 0xce, 0xd9, 0x5b, 0xa1, 0xed, 0x39, 0x8e,
-        0xb2, 0xad, 0x55, 0xb4, 0x46, 0x1b, 0x87, 0xe3, 0x23, 0xee, 0x0f, 0x72,
-        0x0e, 0x52, 0x09, 0xf5, 0x8a, 0x9e, 0x97, 0xa6, 0x05, 0x69, 0xaf, 0x27,
-        0xab, 0x42, 0xfd, 0xb4, 0xca, 0xc6, 0x8d, 0x8c, 0x0d, 0x78, 0x65, 0xda,
-        0x22, 0x8d, 0x78, 0xc0, 0x33, 0xf1, 0x47, 0xda, 0xaa, 0x1e, 0x7f, 0x63,
-        0x9d, 0xf8, 0x2b, 0xeb, 0xa4, 0xfe, 0x73, 0x90, 0xaf, 0xd5, 0x34, 0xc5,
-        0xb7, 0x67, 0x75, 0x0d, 0x69, 0x8b, 0x32, 0x38, 0xa4, 0x87, 0x8d, 0xaf,
-        0x23, 0x7f, 0xaf, 0x48, 0x4f, 0xfb, 0xb9, 0x2e, 0xb3, 0xbb, 0x5b, 0x56,
-        0x33, 0x1e, 0x90, 0xad, 0xcc, 0xc7, 0x04, 0x94, 0x5f, 0x1d, 0x13, 0xa0,
-        0x9f, 0xf5, 0x01, 0xe0, 0xec, 0x16, 0x3c, 0xfb, 0x64, 0x88, 0x71, 0x87,
-        0x4a, 0x68, 0x97, 0x7f, 0xd5, 0xda, 0xe5, 0x21, 0x1c, 0x09, 0xc0, 0x61,
-        0xe4, 0xf3, 0x52, 0x3d, 0xb7, 0x50, 0x7f, 0xe7, 0xe7, 0x6c, 0xda, 0x84,
-        0xec, 0x2a, 0x71, 0xdc, 0x94, 0xc1, 0xc4, 0x4d, 0xb5, 0x0c, 0x8e, 0x5b,
-        0x3b, 0x0a, 0x65, 0xb4, 0xfc, 0x5c, 0x2a, 0x3b, 0x29, 0xf7, 0x18, 0x9f,
-        0x7f, 0x20, 0x45, 0x5a, 0x7f, 0xb7, 0x64, 0xe6, 0xe2, 0xf3, 0x02, 0x7a,
-        0x93, 0x54, 0x24, 0xad, 0xd7, 0xd3, 0xbc, 0x09, 0xd9, 0x21, 0xbd, 0x31,
-        0xc6, 0x3a, 0x19, 0xcf, 0xf3, 0xf3, 0x13, 0xb0, 0x1f, 0x86, 0x4b, 0x0a,
-        0x16, 0x7c, 0xad, 0x0c, 0x79, 0x81, 0x6c, 0x4f, 0x39, 0x3a, 0x76, 0x6c,
-        0x74, 0x6d, 0xa9, 0xce, 0xd8, 0xae, 0x8e, 0x8e, 0xff, 0xce, 0x80, 0xfa,
-        0x66, 0xb4, 0x7d, 0xab, 0xb4, 0xfe, 0x9d, 0xd6, 0x65, 0x46, 0xeb, 0xc2,
-        0x38, 0xe6, 0x8c, 0x17, 0xb1, 0xe5, 0xaa, 0xd3, 0xa7, 0xea, 0x42, 0x5b,
-        0xb0, 0x50, 0x09, 0xd3, 0x9e, 0x5c, 0x26, 0xed, 0x85, 0x65, 0xd2, 0xfe,
-        0x76, 0x99, 0x34, 0x13, 0x17, 0xec, 0x2f, 0x5e, 0x46, 0xde, 0x88, 0xe6,
-        0x55, 0x69, 0x36, 0xf6, 0x75, 0x7e, 0xae, 0xcc, 0x2a, 0xeb, 0x97, 0x31,
-        0x46, 0x6c, 0x62, 0xc3, 0x39, 0x1d, 0x1b, 0xde, 0xe2, 0x6d, 0x53, 0x8c,
-        0x75, 0x11, 0x17, 0x09, 0xd9, 0xab, 0xf1, 0x42, 0x9c, 0x7c, 0x85, 0x31,
-        0xe0, 0x3c, 0xd7, 0x5a, 0x13, 0xea, 0x4a, 0xb4, 0x3d, 0x6f, 0x9b, 0x98,
-        0x79, 0x8b, 0xe9, 0x75, 0xd5, 0x3e, 0xd8, 0x0a, 0xfd, 0xc5, 0x26, 0xd9,
-        0x3e, 0x96, 0x58, 0x41, 0xbd, 0xb5, 0x63, 0xcc, 0xf8, 0x83, 0x7b, 0xc1,
-        0x57, 0x19, 0x21, 0x8c, 0xc9, 0x94, 0x08, 0x6d, 0xe2, 0xa5, 0xb6, 0xf0,
-        0xeb, 0xb7, 0xd7, 0x7b, 0x85, 0xf6, 0x1c, 0xd8, 0x0e, 0x3f, 0x6b, 0x7b,
-        0xf5, 0xd2, 0x37, 0x16, 0xe2, 0x4a, 0xfd, 0x9c, 0xf5, 0x22, 0x57, 0xa8,
-        0xa7, 0xed, 0x12, 0x79, 0x66, 0x4e, 0x16, 0x6f, 0x84, 0xcd, 0x24, 0x41,
-        0xb6, 0x5b, 0x5a, 0x23, 0xa2, 0x63, 0x3c, 0x29, 0x23, 0x9b, 0x3b, 0xb8,
-        0xb6, 0x03, 0xfa, 0x37, 0xb6, 0x8a, 0x89, 0x9b, 0x86, 0x76, 0xca, 0x72,
-        0xb4, 0x7b, 0xbd, 0xa5, 0x5d, 0xae, 0xa9, 0xee, 0xa0, 0xcc, 0xc5, 0x9c,
-        0x18, 0x3a, 0xde, 0x5e, 0x94, 0x44, 0x48, 0xc7, 0x33, 0xf0, 0x8b, 0xab,
-        0xe9, 0x78, 0x46, 0x52, 0x9a, 0x8e, 0x6b, 0x17, 0xd0, 0x71, 0xab, 0xa5,
-        0xe3, 0x77, 0x44, 0x0d, 0x5d, 0x28, 0xad, 0xa7, 0x48, 0xa7, 0x86, 0x8e,
-        0x1d, 0x4d, 0xc7, 0x33, 0x78, 0xbb, 0x7e, 0x8f, 0x2d, 0x13, 0xb1, 0x69,
-        0xfc, 0x1d, 0xa6, 0x51, 0x2e, 0xfe, 0x66, 0xd4, 0xe8, 0xa5, 0x14, 0xe8,
-        0x28, 0x4c, 0xff, 0x60, 0xd4, 0xd0, 0x67, 0x75, 0x9a, 0x89, 0x8f, 0xf4,
-        0x17, 0xdf, 0x13, 0x5d, 0x48, 0x9f, 0x29, 0xd0, 0x67, 0x58, 0xe6, 0xf5,
-        0xe8, 0xb3, 0xde, 0xae, 0x5b, 0x44, 0xf5, 0xba, 0x7b, 0x26, 0x66, 0x68,
-        0xf5, 0x56, 0x3d, 0x76, 0x8e, 0xfb, 0xd9, 0x9f, 0x81, 0x56, 0xcd, 0xdc,
-        0x9c, 0x9f, 0xf7, 0xb7, 0x19, 0x8b, 0x4a, 0x98, 0x18, 0x36, 0xe3, 0xa4,
-        0x57, 0xb2, 0x1d, 0x8d, 0x7c, 0xaa, 0xd1, 0xf2, 0xa9, 0x71, 0x48, 0xa5,
-        0xab, 0x65, 0x76, 0x37, 0x74, 0x05, 0x6d, 0x6c, 0x2d, 0xa7, 0x91, 0xd7,
-        0x9a, 0xc8, 0x16, 0xff, 0xd9, 0xee, 0x5f, 0xe0, 0xba, 0x80, 0x0c, 0x39,
-        0x48, 0x6b, 0x2b, 0x9b, 0x71, 0x29, 0xbf, 0x11, 0xdf, 0xdd, 0xd2, 0x56,
-        0x56, 0x72, 0xfb, 0x58, 0x83, 0xec, 0x2b, 0xba, 0xf2, 0x51, 0xd4, 0xff,
-        0x48, 0xd1, 0x83, 0x3f, 0x3e, 0x1e, 0xa5, 0x5d, 0xb8, 0xb7, 0xc8, 0xf5,
-        0x49, 0xc7, 0xac, 0x19, 0x2d, 0x58, 0xf3, 0x8c, 0x48, 0x5b, 0x47, 0x01,
-        0x9e, 0x8a, 0xb8, 0x3b, 0x01, 0x47, 0x5d, 0x3a, 0x2d, 0xaf, 0x74, 0x0f,
-        0x38, 0xda, 0x97, 0x70, 0x7a, 0xe4, 0xc6, 0x4a, 0x5a, 0x6e, 0xa8, 0x98,
-        0x75, 0xd2, 0xf9, 0x75, 0xd0, 0xa4, 0x37, 0x0d, 0x9d, 0x93, 0xf1, 0x82,
-        0xe0, 0x3c, 0xe4, 0xb7, 0x3a, 0xe2, 0x4a, 0xb4, 0x23, 0x19, 0x9f, 0x16,
-        0xf3, 0x7d, 0xb1, 0xfc, 0xe3, 0x60, 0x28, 0xe6, 0xca, 0x2b, 0x3e, 0xc7,
-        0xd5, 0x23, 0xd7, 0x97, 0xab, 0xfb, 0xe3, 0x5a, 0xe9, 0x13, 0x51, 0xae,
-        0x4d, 0x64, 0x2b, 0xe5, 0x28, 0xe3, 0xe7, 0x22, 0x79, 0x69, 0x7b, 0x2b,
-        0x7c, 0x37, 0x48, 0xeb, 0xb6, 0xb7, 0x82, 0x56, 0x62, 0xd0, 0xf3, 0x5b,
-        0x01, 0xd7, 0x56, 0xc6, 0xbb, 0x18, 0xe7, 0xe2, 0xf7, 0x5f, 0xa2, 0x5f,
-        0xd6, 0xfd, 0x5d, 0xbd, 0x66, 0x25, 0x8a, 0x73, 0x6e, 0xf8, 0x65, 0x79,
-        0x5d, 0xd3, 0x38, 0x14, 0x4d, 0x8b, 0x13, 0x7d, 0x5b, 0x5c, 0x56, 0xf8,
-        0xd5, 0xfd, 0x73, 0xed, 0x57, 0x14, 0x70, 0xe8, 0xee, 0xd8, 0xdc, 0x23,
-        0x7d, 0x18, 0x5f, 0xff, 0x92, 0xf1, 0xed, 0x17, 0xc6, 0x54, 0x2f, 0x16,
-        0x39, 0x86, 0xf9, 0x71, 0xa9, 0x3f, 0x32, 0xe3, 0x8a, 0x76, 0x2c, 0x1e,
-        0x8f, 0xae, 0xaf, 0x4e, 0x01, 0x96, 0xe7, 0xf4, 0x1e, 0x81, 0x20, 0xb8,
-        0xa6, 0xe3, 0x62, 0x90, 0x58, 0x97, 0xec, 0x9c, 0x9e, 0x5f, 0xd3, 0x19,
-        0x8a, 0xa4, 0x33, 0x1a, 0xff, 0xf8, 0x4e, 0xe4, 0xca, 0xdd, 0x98, 0x3b,
-        0x71, 0x73, 0x5d, 0xae, 0xe6, 0x8d, 0x9c, 0xdf, 0x6d, 0xd7, 0xad, 0x42,
-        0xbf, 0x29, 0x08, 0x94, 0xbf, 0x58, 0x56, 0x50, 0x47, 0x61, 0xec, 0xb2,
-        0xdb, 0xee, 0x4b, 0x49, 0x31, 0x6e, 0x38, 0xe4, 0xa6, 0xa3, 0x89, 0x42,
-        0xb9, 0x0b, 0xbf, 0x1b, 0xf0, 0xfe, 0x45, 0xd8, 0x28, 0x3d, 0xb0, 0x61,
-        0x24, 0xa6, 0x8c, 0x3c, 0x00, 0xfd, 0x76, 0xe4, 0x95, 0x22, 0x3f, 0x7a,
-        0x89, 0xe1, 0x72, 0x2c, 0x31, 0x5a, 0xde, 0xcb, 0xfa, 0x28, 0x7b, 0xa5,
-        0xf8, 0x1d, 0xfb, 0x62, 0x1f, 0xf4, 0x79, 0x7f, 0x96, 0x3e, 0x5c, 0xdb,
-        0x36, 0xdb, 0x0c, 0xf1, 0xe2, 0xd2, 0x0d, 0xc7, 0xbf, 0x6e, 0xeb, 0x8f,
-        0x70, 0x7c, 0x7b, 0x2d, 0xdc, 0x8b, 0xfb, 0x7d, 0x49, 0xdb, 0x2c, 0x8f,
-        0x55, 0x68, 0x27, 0x72, 0x4d, 0x27, 0x79, 0x62, 0x5c, 0x08, 0x47, 0x10,
-        0x5c, 0x48, 0x19, 0x7d, 0xfd, 0x74, 0x85, 0xeb, 0x1a, 0x41, 0xf0, 0x5d,
-        0xda, 0xc2, 0x83, 0x25, 0xf4, 0x17, 0xe2, 0x60, 0x63, 0xde, 0x85, 0x2c,
-        0x1c, 0xe9, 0x26, 0x7e, 0x05, 0x5e, 0x69, 0x87, 0xb7, 0x4b, 0xa2, 0x89,
-        0xdf, 0x2e, 0x37, 0x24, 0x3e, 0x51, 0xf6, 0x80, 0x67, 0x8e, 0x3b, 0x96,
-        0xd8, 0x63, 0xc7, 0xcc, 0xfd, 0x20, 0xaf, 0xbf, 0x4f, 0xe3, 0xa5, 0x05,
-        0x3e, 0x12, 0x61, 0x9a, 0x87, 0x85, 0xb0, 0x25, 0x2c, 0x6e, 0x82, 0xe0,
-        0xfb, 0x29, 0xf6, 0xd9, 0xcd, 0xfd, 0x00, 0x23, 0xe8, 0x37, 0xbf, 0x56,
-        0x11, 0x0f, 0xd1, 0xc4, 0x1d, 0xe8, 0xfb, 0xb7, 0xd1, 0xf7, 0xbe, 0x32,
-        0xfb, 0x83, 0x7c, 0xc0, 0xd8, 0x47, 0x2a, 0x21, 0xbc, 0xcb, 0xf5, 0x1d,
-        0xce, 0x79, 0xa7, 0xb5, 0xeb, 0xc2, 0x6f, 0x8d, 0x48, 0x4f, 0xc1, 0x97,
-        0xcb, 0x56, 0x66, 0xd6, 0xb8, 0xf2, 0x2e, 0xc8, 0xda, 0x40, 0x4e, 0x42,
-        0x86, 0xcd, 0x68, 0xba, 0xc9, 0xae, 0xe7, 0xff, 0x11, 0xf9, 0xe4, 0x0a,
-        0xc6, 0x94, 0x7b, 0x7d, 0xda, 0xab, 0xb3, 0xc1, 0x8c, 0x4f, 0x99, 0xbc,
-        0x4a, 0xc6, 0xbd, 0x7c, 0x27, 0xf4, 0x03, 0xd2, 0x1a, 0xe9, 0x63, 0x27,
-        0xb2, 0x91, 0x64, 0x62, 0x58, 0xb8, 0xc7, 0x89, 0xfb, 0x13, 0xb8, 0xef,
-        0x87, 0xf2, 0xc0, 0x85, 0x9c, 0xe3, 0x1c, 0x9a, 0xfe, 0x86, 0xcb, 0xf3,
-        0x65, 0x0f, 0x08, 0xd7, 0x09, 0x93, 0xf1, 0xbd, 0xda, 0x26, 0x01, 0xd5,
-        0x15, 0x59, 0x76, 0x33, 0x2c, 0x12, 0xbf, 0xaa, 0xbc, 0xde, 0x73, 0x05,
-        0x3e, 0x67, 0x1c, 0x21, 0x1a, 0xcd, 0x16, 0xe5, 0xb5, 0x48, 0xb7, 0xbc,
-        0x96, 0x4d, 0xd5, 0x4b, 0xaf, 0x96, 0xf9, 0xcc, 0xd3, 0xe9, 0xb3, 0x26,
-        0xdd, 0x85, 0x2e, 0xe1, 0x9c, 0xf4, 0x40, 0x46, 0x4f, 0x00, 0x6e, 0xe2,
-        0xb0, 0x87, 0x32, 0x89, 0xf3, 0xa7, 0x54, 0x3a, 0x16, 0xcd, 0x95, 0xa5,
-        0x2f, 0x57, 0xb4, 0xb1, 0x9e, 0x01, 0x8e, 0x7f, 0x95, 0xc5, 0x43, 0xa3,
-        0xb8, 0x80, 0xad, 0x2f, 0x92, 0x70, 0xe0, 0x2b, 0x43, 0xd7, 0x3f, 0xba,
-        0x4a, 0x1a, 0x89, 0x9b, 0x1e, 0xf0, 0x52, 0x0d, 0x74, 0xd1, 0xfd, 0xcd,
-        0x5c, 0x37, 0xd5, 0x36, 0x64, 0xec, 0x63, 0xbf, 0xac, 0xd2, 0x7f, 0x1b,
-        0x57, 0xe9, 0x51, 0x2b, 0x2f, 0xa3, 0x7d, 0x94, 0x97, 0x4f, 0x97, 0x08,
-        0x8f, 0x78, 0x11, 0x3f, 0xd1, 0xd7, 0x5b, 0x16, 0x15, 0x49, 0x7b, 0xd1,
-        0xde, 0xf2, 0x42, 0xfa, 0x7f, 0xba, 0xf2, 0x61, 0x6b, 0x0b, 0x56, 0xc7,
-        0x54, 0xab, 0xf3, 0xc8, 0x83, 0xcb, 0xe5, 0x11, 0x26, 0x89, 0xae, 0x48,
-        0x5f, 0xf8, 0x54, 0x7b, 0x47, 0xde, 0xab, 0x15, 0xe2, 0x39, 0x80, 0xdc,
-        0x06, 0xae, 0xcb, 0x5c, 0xaf, 0xde, 0x8f, 0x79, 0xfb, 0x3f, 0x41, 0x26,
-        0xc6, 0x7c, 0x4f, 0xea, 0xe0, 0xdb, 0xbe, 0x0c, 0xdd, 0xf9, 0x8a, 0x7f,
-        0xe1, 0x53, 0x9d, 0x1d, 0x41, 0xf0, 0xac, 0x9f, 0x4f, 0xb8, 0x90, 0x1f,
-        0x87, 0x2d, 0xbe, 0x87, 0x81, 0xef, 0x89, 0x39, 0x7c, 0x27, 0xe4, 0x62,
-        0xd7, 0xf7, 0x03, 0xae, 0xf5, 0x0d, 0x97, 0x6f, 0xbd, 0x55, 0xa5, 0x3f,
-        0xfe, 0xa1, 0x6c, 0x37, 0xfb, 0x1b, 0x91, 0xc3, 0x95, 0x9b, 0x88, 0xbf,
-        0x28, 0xc6, 0x7a, 0x4f, 0x9f, 0x6f, 0xfa, 0xed, 0x5b, 0xd0, 0x2f, 0xe9,
-        0xe5, 0x47, 0xac, 0x8b, 0x32, 0xd5, 0x75, 0x33, 0xa0, 0xcb, 0xbc, 0xad,
-        0x3b, 0x70, 0x85, 0xba, 0xde, 0x15, 0xea, 0x1e, 0x46, 0xdd, 0x3d, 0xb6,
-        0xee, 0x85, 0xcf, 0xbc, 0xb9, 0x7e, 0x07, 0xb8, 0xc7, 0x0e, 0x3e, 0x80,
-        0xb8, 0x11, 0xff, 0x36, 0xfc, 0xbe, 0x85, 0xed, 0x28, 0xda, 0xf7, 0x23,
-        0x95, 0x21, 0x19, 0xae, 0xec, 0xc4, 0x33, 0x88, 0xb4, 0x3e, 0x3c, 0xfb,
-        0xf0, 0x3b, 0x8d, 0x47, 0xa2, 0x6e, 0xfa, 0xc2, 0x5d, 0xc3, 0x7e, 0x88,
-        0x57, 0xae, 0xcd, 0xb3, 0x0f, 0xd8, 0x17, 0x5d, 0x3f, 0x41, 0x1f, 0x61,
-        0xfa, 0x07, 0x50, 0x67, 0x1a, 0x69, 0x2b, 0x69, 0x7b, 0x62, 0xae, 0xab,
-        0xeb, 0x54, 0xc3, 0x36, 0x1d, 0xce, 0x05, 0xf2, 0x0d, 0x8d, 0xf6, 0x16,
-        0x43, 0x18, 0xef, 0x44, 0x1b, 0xe3, 0x57, 0x29, 0xff, 0x1e, 0xc2, 0x15,
-        0x57, 0xfe, 0xc7, 0xf0, 0x7e, 0x2d, 0xd8, 0x9d, 0x62, 0x4c, 0x9e, 0xf3,
-        0x7e, 0xdd, 0xaa, 0xa5, 0x7b, 0x9f, 0x42, 0x1a, 0xe8, 0x84, 0x4e, 0x69,
-        0xb0, 0x74, 0x5a, 0x80, 0xe5, 0x43, 0x1a, 0xe5, 0x98, 0x17, 0x97, 0x4d,
-        0x76, 0xe6, 0xa5, 0x07, 0xba, 0x8c, 0xb2, 0xf6, 0xd3, 0xf5, 0x26, 0x0e,
-        0x03, 0xcb, 0xd1, 0xef, 0x04, 0x3d, 0x37, 0x88, 0x87, 0xfa, 0x03, 0x11,
-        0x0f, 0x34, 0x18, 0xd6, 0x4f, 0x7a, 0x03, 0x11, 0x8e, 0x19, 0x1c, 0x5f,
-        0xe6, 0xba, 0x34, 0x6d, 0x6b, 0xd6, 0x0f, 0x6d, 0x1c, 0xfe, 0x7b, 0x59,
-        0xc4, 0x67, 0x1a, 0xdb, 0x0b, 0xde, 0x55, 0xe3, 0x2f, 0x59, 0x63, 0xc1,
-        0x38, 0xf3, 0x49, 0x68, 0x30, 0xaf, 0x4f, 0xcb, 0xe9, 0xfc, 0x35, 0x35,
-        0xd2, 0xe0, 0xf5, 0xeb, 0xdf, 0x2c, 0xd3, 0xe0, 0x81, 0x4f, 0x17, 0x95,
-        0x61, 0x1a, 0xf3, 0x0a, 0x6b, 0x94, 0xde, 0xab, 0xa4, 0xf7, 0x28, 0xc9,
-        0x83, 0xa9, 0x64, 0x62, 0x48, 0x25, 0xbd, 0x71, 0xd9, 0x0f, 0xb9, 0x43,
-        0x39, 0x39, 0x73, 0x7f, 0x44, 0xb8, 0x9f, 0xef, 0x5d, 0x92, 0xf5, 0x29,
-        0x3f, 0x0b, 0x9f, 0x57, 0x94, 0x75, 0x95, 0x97, 0x1a, 0xcc, 0xd8, 0xb8,
-        0x0f, 0x01, 0x70, 0x36, 0xd1, 0x86, 0xbb, 0xb5, 0x81, 0x3c, 0x94, 0x50,
-        0x11, 0xd9, 0x45, 0x3f, 0x5f, 0x7d, 0xb1, 0x5e, 0xea, 0xa7, 0xd7, 0x78,
-        0x52, 0xd1, 0xe9, 0x66, 0x7f, 0x60, 0xb2, 0x73, 0x48, 0x89, 0x1e, 0x7b,
-        0x46, 0xbd, 0x91, 0xcc, 0x9e, 0xb5, 0xfa, 0x23, 0x90, 0xc7, 0xb4, 0xbe,
-        0x98, 0xf9, 0xbc, 0x2b, 0x17, 0x82, 0xb6, 0x4d, 0x17, 0xda, 0xb3, 0x5d,
-        0xb4, 0x73, 0x57, 0xd9, 0xfd, 0x95, 0x8c, 0x63, 0xbd, 0x4b, 0x9e, 0xf3,
-        0x0b, 0x18, 0xf7, 0x7e, 0xb9, 0xe0, 0xb3, 0xbf, 0x99, 0xcf, 0x79, 0xc2,
-        0x74, 0xc2, 0x6e, 0xfa, 0x13, 0xf5, 0xa7, 0x80, 0x87, 0x7d, 0x52, 0x07,
-        0x5f, 0xc9, 0xee, 0x4b, 0x0e, 0xe4, 0x45, 0xcf, 0x4b, 0x8f, 0xa0, 0xad,
-        0x15, 0x3e, 0xf8, 0x10, 0x76, 0x73, 0xcd, 0x91, 0xab, 0x21, 0x77, 0x1d,
-        0xbd, 0xc7, 0x02, 0x93, 0xe1, 0x4d, 0x61, 0xde, 0x33, 0x03, 0x2c, 0x57,
-        0x2f, 0xd3, 0x31, 0xf2, 0xba, 0xe6, 0x97, 0x4f, 0x65, 0xfd, 0x76, 0x4f,
-        0x39, 0xc3, 0x8c, 0x31, 0x00, 0xaf, 0xa4, 0xcd, 0x54, 0x6c, 0xbb, 0xcf,
-        0xb6, 0x58, 0xe6, 0x2a, 0xf9, 0xf6, 0xc0, 0x85, 0x7f, 0x78, 0xd6, 0xff,
-        0x7b, 0xc0, 0x91, 0x81, 0x4c, 0xe0, 0xf3, 0x6a, 0x90, 0x8f, 0x31, 0xa6,
-        0xf5, 0xbf, 0xeb, 0xad, 0x9d, 0xac, 0x79, 0x7f, 0x58, 0xef, 0x93, 0x79,
-        0xfe, 0x33, 0x59, 0xae, 0x77, 0xc0, 0x36, 0xc9, 0x69, 0xb9, 0x18, 0xfd,
-        0x69, 0x0e, 0xf0, 0x14, 0x2a, 0xb4, 0x43, 0xfe, 0x06, 0x76, 0x88, 0xd6,
-        0x93, 0xf2, 0xed, 0x41, 0xe6, 0xb1, 0xdd, 0xec, 0xd5, 0xae, 0xd6, 0x0b,
-        0x21, 0x2c, 0xc9, 0xce, 0x1c, 0xf2, 0x47, 0xb4, 0x1d, 0xef, 0xc9, 0xac,
-        0xe7, 0xea, 0x7d, 0x27, 0xf9, 0xc1, 0x20, 0x78, 0xc5, 0x77, 0xe5, 0xa4,
-        0x86, 0xf9, 0x05, 0xf4, 0xe1, 0xc8, 0xc4, 0x80, 0xfb, 0xd3, 0x93, 0x3e,
-        0xc7, 0xc7, 0x3c, 0xae, 0x2b, 0x6d, 0x8e, 0x1b, 0xf8, 0x68, 0x9b, 0x7e,
-        0x2f, 0x98, 0x8d, 0x71, 0xdd, 0x02, 0x3c, 0x5d, 0x6a, 0xf7, 0x6e, 0x90,
-        0xdb, 0xe6, 0x6c, 0x9a, 0x69, 0x31, 0x36, 0xa3, 0xd1, 0x69, 0x17, 0xfe,
-        0x61, 0xc4, 0xbf, 0xb0, 0xba, 0x80, 0xb9, 0x81, 0x0e, 0x5b, 0x0c, 0x4b,
-        0x8a, 0xb0, 0x0c, 0x6b, 0x58, 0x62, 0xc0, 0xa5, 0x0b, 0xd9, 0x77, 0x9b,
-        0x1c, 0x02, 0xde, 0x87, 0x06, 0x45, 0x9e, 0x85, 0x4d, 0x76, 0xbe, 0x0a,
-        0x9e, 0x19, 0xc0, 0x73, 0xde, 0xe7, 0x5e, 0x00, 0xe6, 0xf9, 0xde, 0xb0,
-        0x70, 0x2f, 0x00, 0x71, 0xd8, 0x81, 0xdf, 0x22, 0x33, 0xd0, 0xbf, 0x27,
-        0xfd, 0xd7, 0x82, 0xf1, 0x18, 0x75, 0x23, 0xda, 0x99, 0xdb, 0x1b, 0x14,
-        0xc8, 0xe7, 0x53, 0xd4, 0x43, 0xb5, 0xd2, 0xb6, 0x8e, 0x7e, 0x88, 0x91,
-        0x9f, 0x37, 0xf8, 0x19, 0xf4, 0xf5, 0x5b, 0x2b, 0xa5, 0x3e, 0x2f, 0xfd,
-        0x1d, 0x75, 0xc8, 0x73, 0x6d, 0xde, 0x80, 0xce, 0xeb, 0xef, 0x38, 0x8c,
-        0xfc, 0x8f, 0xaf, 0x64, 0xbc, 0xdb, 0xf5, 0xd7, 0x4b, 0xdb, 0x1a, 0xe6,
-        0x55, 0xf3, 0xe0, 0xab, 0xdc, 0x83, 0x69, 0x75, 0x38, 0x64, 0x59, 0x29,
-        0xef, 0x71, 0xa7, 0xdd, 0x21, 0xcc, 0xc5, 0x6e, 0x9f, 0xb2, 0xed, 0xbf,
-        0xa3, 0x6e, 0x4a, 0x6e, 0xf4, 0x07, 0x91, 0x37, 0x8d, 0xbc, 0xc3, 0x36,
-        0x6f, 0xd0, 0xe6, 0x6d, 0x43, 0xde, 0x3e, 0xe0, 0xef, 0x6e, 0x9d, 0x9e,
-        0xe5, 0x6f, 0x53, 0xc7, 0x5b, 0xd9, 0x71, 0xe1, 0x33, 0x37, 0xf8, 0x84,
-        0x0b, 0x79, 0x25, 0xae, 0x8b, 0xde, 0x26, 0x79, 0x2f, 0x79, 0x0b, 0x7b,
-        0xfd, 0x66, 0xb1, 0x0e, 0xb2, 0x89, 0x7b, 0x80, 0x69, 0xb3, 0x6e, 0xf1,
-        0x5e, 0x96, 0xff, 0x40, 0xba, 0xeb, 0xc9, 0x38, 0x5f, 0x5b, 0xc9, 0xb8,
-        0xd8, 0x88, 0x4f, 0xfb, 0x3a, 0x90, 0x9c, 0x5e, 0x3f, 0xa1, 0x7f, 0x5b,
-        0x44, 0x3a, 0xe9, 0x41, 0x35, 0x45, 0xf4, 0x3e, 0x2d, 0x7e, 0x47, 0x61,
-        0xf7, 0x06, 0x42, 0x9f, 0x8f, 0x36, 0x5d, 0xc6, 0xe3, 0xda, 0x50, 0x98,
-        0xe7, 0x21, 0x4f, 0x6d, 0x8a, 0xc0, 0x26, 0xaa, 0xf5, 0x1d, 0x1d, 0xa3,
-        0x2e, 0xe8, 0x75, 0x00, 0xc6, 0xdf, 0x32, 0xf0, 0x63, 0x02, 0xe9, 0x47,
-        0xdf, 0xa4, 0xfd, 0x68, 0x87, 0xef, 0x1d, 0x10, 0xee, 0x67, 0x65, 0x7a,
-        0xbb, 0xf7, 0x6d, 0x99, 0xa7, 0xf3, 0x19, 0x49, 0x66, 0x94, 0x03, 0xff,
-        0x75, 0xab, 0x23, 0xf5, 0xb0, 0x3d, 0x6e, 0x30, 0xfa, 0xcd, 0xe3, 0x9e,
-        0xc4, 0x8b, 0xda, 0x56, 0x6b, 0xb4, 0xf3, 0x91, 0x05, 0x6e, 0xb8, 0x1f,
-        0x7c, 0xe0, 0x9e, 0xdd, 0x7e, 0x21, 0x09, 0x6a, 0xd4, 0xba, 0x71, 0x18,
-        0xb4, 0x91, 0x4d, 0x19, 0xdd, 0x78, 0xc3, 0x9c, 0x6e, 0xfc, 0xf3, 0x95,
-        0xe4, 0x89, 0xe1, 0x72, 0x1c, 0x75, 0xf5, 0x3a, 0x4a, 0x82, 0x75, 0x6b,
-        0x31, 0x9f, 0xe7, 0xfd, 0xec, 0x35, 0xa0, 0x2f, 0xc8, 0xe1, 0x64, 0xe7,
-        0x29, 0xd4, 0x2d, 0xa0, 0xee, 0xe4, 0x5c, 0x5d, 0x47, 0x46, 0x7c, 0xbd,
-        0xef, 0x59, 0x26, 0xcb, 0x21, 0x1d, 0x26, 0xe3, 0xb7, 0x6a, 0x5e, 0xe0,
-        0x7e, 0x30, 0x37, 0x71, 0x9f, 0x6c, 0xd6, 0xb4, 0xdd, 0x27, 0xdc, 0x27,
-        0xc5, 0xb6, 0xef, 0x0b, 0xda, 0xd6, 0x10, 0xbe, 0x12, 0xde, 0xa4, 0x8d,
-        0x31, 0xbc, 0xc3, 0xf9, 0x37, 0xf3, 0x3e, 0xe4, 0x10, 0xdf, 0xbf, 0x1f,
-        0xe4, 0x07, 0x39, 0x2f, 0xfc, 0x9e, 0xa7, 0xb9, 0x11, 0xd0, 0x5c, 0xc4,
-        0x7f, 0xbb, 0x0c, 0xeb, 0x3d, 0x10, 0x29, 0x99, 0xd0, 0xf1, 0xcc, 0x0b,
-        0xc1, 0x23, 0x0b, 0xe4, 0xf8, 0x47, 0x94, 0xa1, 0x21, 0xfe, 0x2e, 0x24,
-        0xea, 0x64, 0x66, 0x4d, 0x9d, 0xde, 0xf1, 0x41, 0x7c, 0x8c, 0xde, 0x73,
-        0x3b, 0xf8, 0xf5, 0xfa, 0xb9, 0xb1, 0x00, 0xdf, 0xc0, 0xe3, 0x4e, 0x63,
-        0xeb, 0x63, 0x1c, 0x19, 0xed, 0xbf, 0x67, 0x8b, 0x4a, 0xef, 0x0b, 0xa2,
-        0x8e, 0x3f, 0x00, 0x9d, 0x6a, 0xf6, 0xa4, 0xe0, 0x5d, 0xe1, 0xbc, 0x29,
-        0xed, 0x73, 0x1c, 0x04, 0x0f, 0x1f, 0xf4, 0xb3, 0x6b, 0x6a, 0x75, 0xdb,
-        0x49, 0xef, 0x7a, 0x6d, 0x13, 0x6e, 0x94, 0x99, 0x14, 0xdb, 0x23, 0x5e,
-        0xfe, 0x47, 0x30, 0xe4, 0xcd, 0xa0, 0x7f, 0x43, 0xff, 0x59, 0x5f, 0xb5,
-        0xd4, 0x49, 0xf5, 0x3e, 0x53, 0xe2, 0xc9, 0x85, 0xbd, 0xd2, 0x01, 0xfc,
-        0x18, 0x78, 0x73, 0xe5, 0xb7, 0x49, 0x21, 0xe6, 0xda, 0xb1, 0x45, 0xb4,
-        0x2f, 0x37, 0x91, 0xaa, 0x83, 0x2d, 0xf8, 0x17, 0xc1, 0xe4, 0x82, 0x31,
-        0x1e, 0xac, 0x1a, 0xe3, 0x4c, 0x02, 0xd8, 0x68, 0x89, 0xcc, 0xc9, 0x01,
-        0xf6, 0x65, 0x64, 0x52, 0x38, 0xc6, 0x3a, 0x8c, 0x71, 0xc7, 0xdc, 0x18,
-        0x0f, 0x2f, 0x1a, 0xe3, 0x61, 0x8c, 0x11, 0xf6, 0x42, 0x29, 0xd3, 0xe9,
-        0xce, 0xcf, 0xfb, 0xd5, 0x35, 0x73, 0xf3, 0x29, 0xdc, 0xeb, 0x84, 0xf1,
-        0xd3, 0xa6, 0xd8, 0x08, 0x78, 0x74, 0x5b, 0x90, 0x71, 0x0e, 0x64, 0x5b,
-        0x76, 0x4d, 0x8d, 0x1d, 0xff, 0x76, 0x96, 0x2b, 0x1b, 0x1c, 0x9c, 0x4c,
-        0xb9, 0x9d, 0x8f, 0xa0, 0xbf, 0xbd, 0x76, 0x5c, 0xbd, 0xe5, 0xab, 0x31,
-        0xae, 0x0b, 0xdf, 0xc1, 0x18, 0xe0, 0xb3, 0x9d, 0xa0, 0x0f, 0x9c, 0x18,
-        0x92, 0x05, 0xb2, 0xeb, 0x33, 0xf3, 0x72, 0xd4, 0xc0, 0x4c, 0xdb, 0xba,
-        0x30, 0x07, 0xf3, 0xdd, 0x8b, 0x60, 0xbe, 0x1b, 0x30, 0xef, 0xb3, 0xf3,
-        0xb2, 0xaf, 0x6a, 0xcf, 0x62, 0x48, 0x47, 0xfc, 0xfd, 0xbc, 0xf5, 0x45,
-        0x3e, 0x20, 0xf7, 0x97, 0x3a, 0xe5, 0xcb, 0x95, 0xe4, 0x59, 0xc6, 0xd1,
-        0xcf, 0x55, 0x92, 0xe3, 0x22, 0x5d, 0xf2, 0xc7, 0xb0, 0x73, 0xae, 0x82,
-        0x6f, 0xf1, 0x34, 0xfc, 0xd7, 0x3f, 0xa9, 0xf8, 0xf2, 0xc4, 0xdc, 0x7e,
-        0x38, 0xea, 0xba, 0xb4, 0x9c, 0x84, 0x4f, 0xbb, 0xed, 0x68, 0x1b, 0xf7,
-        0x2a, 0x11, 0xbe, 0xbb, 0xa8, 0x73, 0xda, 0x94, 0xe6, 0xc5, 0xef, 0x62,
-        0xbc, 0xa7, 0xa9, 0x6b, 0xd6, 0xfa, 0xbe, 0x77, 0xb3, 0x5a, 0x47, 0x99,
-        0x90, 0xff, 0x5a, 0xe4, 0x03, 0xf5, 0x26, 0xc6, 0x92, 0xf1, 0x9a, 0xc9,
-        0x1b, 0xdb, 0x3a, 0x12, 0x7d, 0x42, 0x5b, 0x82, 0xfe, 0x36, 0x6c, 0xa1,
-        0xd2, 0xe6, 0xf8, 0x5a, 0xa1, 0x4c, 0xa2, 0x5d, 0x94, 0x96, 0x09, 0xc0,
-        0x3e, 0x06, 0x89, 0x50, 0x68, 0xf6, 0x47, 0x7b, 0xd5, 0x44, 0x03, 0x79,
-        0x70, 0xdb, 0x19, 0xd0, 0xd7, 0x36, 0x8c, 0xa9, 0x2b, 0x79, 0x76, 0x46,
-        0x65, 0x4e, 0xac, 0x95, 0x57, 0x82, 0xa1, 0x66, 0x47, 0x9e, 0xd8, 0xc4,
-        0x3c, 0x2d, 0xb7, 0x3f, 0xd5, 0x0b, 0xf9, 0xd4, 0xce, 0x73, 0x0b, 0x03,
-        0xf2, 0x2f, 0x77, 0x80, 0x06, 0x7f, 0xb8, 0xe9, 0x6b, 0xc1, 0x6c, 0xb3,
-        0x2b, 0x5b, 0x37, 0x25, 0xbd, 0xbc, 0xc2, 0x78, 0x4a, 0x18, 0x4f, 0x09,
-        0xe3, 0xe3, 0x98, 0x4b, 0x18, 0xd7, 0x15, 0xf7, 0x4a, 0xf5, 0x2c, 0x88,
-        0xcb, 0x1a, 0x3f, 0x2d, 0x93, 0x77, 0x65, 0x83, 0xdd, 0x2b, 0x35, 0x5c,
-        0x1f, 0xae, 0xb1, 0x65, 0x64, 0x3c, 0x28, 0xf8, 0x7f, 0x70, 0x55, 0xb6,
-        0x2b, 0xb6, 0x58, 0xe7, 0xdc, 0x35, 0xaf, 0x73, 0x44, 0x9e, 0x33, 0xf3,
-        0x86, 0x39, 0xf3, 0xbd, 0x49, 0x6e, 0x86, 0x87, 0x0e, 0xdc, 0xaa, 0xf7,
-        0x3c, 0x77, 0xe0, 0x9b, 0x36, 0xd5, 0xa7, 0xf5, 0x3a, 0xe2, 0x4c, 0xf9,
-        0x1e, 0x3b, 0x77, 0xf7, 0x68, 0x3d, 0xbb, 0x75, 0xd3, 0xa5, 0x80, 0xfb,
-        0xdc, 0xbc, 0x4d, 0xcb, 0xc5, 0x22, 0x68, 0xef, 0xd5, 0x69, 0xde, 0xe7,
-        0x7a, 0x76, 0x41, 0x9f, 0x13, 0x01, 0xde, 0xe6, 0xe2, 0x62, 0xf5, 0x48,
-        0xa3, 0xbe, 0xf8, 0x69, 0x83, 0x59, 0x47, 0xa5, 0x6c, 0x58, 0x83, 0x34,
-        0xd7, 0xec, 0x05, 0x5e, 0x90, 0xf7, 0xdf, 0xea, 0xcd, 0x9e, 0x8f, 0xea,
-        0xb2, 0xe0, 0x31, 0xbd, 0x2f, 0x84, 0xfb, 0x03, 0x7f, 0x79, 0xa5, 0xb1,
-        0x4d, 0xc3, 0x7c, 0xa6, 0xff, 0x38, 0x98, 0xd0, 0x31, 0x36, 0xf6, 0xf5,
-        0x43, 0xfc, 0x5e, 0xbc, 0x5f, 0x24, 0xb4, 0x5d, 0xeb, 0x40, 0xf7, 0xda,
-        0x5f, 0x16, 0x94, 0x89, 0xe7, 0x25, 0x22, 0x13, 0x55, 0x30, 0x4e, 0x10,
-        0xee, 0x52, 0xd7, 0xaa, 0xf9, 0xd8, 0xdd, 0x6a, 0xa4, 0x11, 0xc6, 0x75,
-        0x8b, 0xf2, 0xc8, 0x1b, 0xad, 0x2b, 0x49, 0x37, 0xd3, 0xc2, 0xb4, 0xf9,
-        0x31, 0xcd, 0x68, 0xfb, 0xb9, 0x6d, 0x95, 0xde, 0xfb, 0xc4, 0x35, 0x46,
-        0xc6, 0x08, 0x63, 0x26, 0xdf, 0xf5, 0xff, 0x56, 0xd7, 0x19, 0x9a, 0xab,
-        0xa3, 0xe7, 0x02, 0xf9, 0x6e, 0x55, 0x5e, 0x35, 0xdc, 0xd4, 0x5f, 0x43,
-        0x9d, 0x75, 0xd0, 0x89, 0x17, 0x53, 0xab, 0xc3, 0xbd, 0xf0, 0xb0, 0x21,
-        0xb2, 0xd7, 0xd4, 0x5a, 0x99, 0x3f, 0x81, 0x79, 0x7d, 0x26, 0x65, 0x78,
-        0x51, 0xf3, 0x61, 0xf1, 0x36, 0xf8, 0xeb, 0xa1, 0xde, 0xa0, 0x9c, 0x26,
-        0x6f, 0x22, 0xad, 0x42, 0x9f, 0xe0, 0xc2, 0xea, 0x99, 0xae, 0x57, 0x03,
-        0xee, 0xb3, 0x7c, 0x45, 0xdb, 0x51, 0x43, 0xb2, 0xb0, 0xed, 0xd1, 0x7b,
-        0x5e, 0xbf, 0xed, 0xa1, 0x65, 0xda, 0x1e, 0xb2, 0x6d, 0x8b, 0x6b, 0xda,
-        0x8e, 0x5e, 0xa1, 0xed, 0x81, 0x37, 0x68, 0x7b, 0x70, 0x99, 0xb6, 0x07,
-        0xc3, 0xb6, 0x95, 0x69, 0xdb, 0x0b, 0xdb, 0x4e, 0x2c, 0xc2, 0xc9, 0x67,
-        0x5e, 0xbf, 0xed, 0x7d, 0xcb, 0xb4, 0xbd, 0x6f, 0x11, 0xdc, 0xc4, 0x49,
-        0x2d, 0x74, 0xff, 0x3d, 0xda, 0xe6, 0xac, 0x03, 0xdf, 0x5c, 0x84, 0xfc,
-        0x36, 0xfe, 0xc8, 0x85, 0xbb, 0x66, 0xcb, 0xe0, 0x2b, 0xf8, 0xd7, 0x99,
-        0x72, 0x03, 0x9e, 0x71, 0xd8, 0x33, 0x28, 0x07, 0x7b, 0xbc, 0x26, 0x1d,
-        0xc8, 0xc9, 0x6e, 0x96, 0xcd, 0xc7, 0x6b, 0xe7, 0xf4, 0xc6, 0x3d, 0xe8,
-        0x8f, 0x6d, 0xfb, 0x5e, 0xbf, 0xbc, 0xa6, 0xfb, 0xcb, 0x95, 0xe9, 0x8f,
-        0x21, 0xbd, 0x42, 0x1f, 0x97, 0xf5, 0x42, 0x19, 0x58, 0x67, 0xd7, 0x3e,
-        0x68, 0x6b, 0x32, 0x0e, 0xa7, 0xed, 0x51, 0x29, 0x94, 0x7f, 0x12, 0x4c,
-        0x83, 0x2e, 0x46, 0xe6, 0x74, 0xc8, 0x93, 0xab, 0x68, 0xb3, 0x8f, 0x53,
-        0xb3, 0x54, 0xc5, 0xa0, 0x46, 0x7c, 0xa6, 0xfd, 0x98, 0x6d, 0xc2, 0x0e,
-        0x0c, 0xcb, 0x32, 0x6e, 0x6c, 0x62, 0x4e, 0x67, 0x21, 0x33, 0xcd, 0x9e,
-        0x0e, 0xfa, 0x2a, 0x4f, 0x81, 0x97, 0xf7, 0x43, 0x76, 0x24, 0xf3, 0x22,
-        0x3d, 0x8d, 0xe6, 0xac, 0x45, 0x4c, 0x72, 0x5d, 0xbf, 0x69, 0xf1, 0xb8,
-        0xef, 0xce, 0xe5, 0xcf, 0x59, 0x40, 0x3e, 0x38, 0x94, 0x91, 0xd7, 0x37,
-        0x9a, 0x75, 0xbb, 0xb7, 0x36, 0x32, 0x1e, 0xa3, 0x36, 0x75, 0xaf, 0xd6,
-        0xf2, 0xc7, 0x09, 0xbf, 0xbf, 0xb2, 0xe8, 0x3b, 0xac, 0xf7, 0x93, 0xd5,
-        0x0b, 0xeb, 0x85, 0xe9, 0x70, 0x4d, 0x16, 0xa4, 0x1f, 0x58, 0xb3, 0xb0,
-        0x7e, 0xac, 0x69, 0xe1, 0xf7, 0xe0, 0xa2, 0xef, 0xcf, 0x2c, 0xfa, 0x7e,
-        0x61, 0xd1, 0xf7, 0x75, 0x6b, 0x17, 0x95, 0x5f, 0xf4, 0xfd, 0xe5, 0xb5,
-        0xcb, 0xc3, 0xfb, 0x57, 0x6b, 0x17, 0xc2, 0xf5, 0x94, 0x5e, 0x73, 0x1d,
-        0xaf, 0xb8, 0xb2, 0xbd, 0x88, 0x7c, 0xe7, 0xd6, 0x18, 0xf2, 0xe1, 0xcb,
-        0x54, 0xe7, 0x73, 0x8d, 0xe3, 0x1d, 0xb1, 0x85, 0xed, 0xcd, 0xd7, 0xdb,
-        0x31, 0x5f, 0x2f, 0x35, 0x5f, 0xcf, 0xf8, 0x23, 0x13, 0x15, 0xe6, 0x31,
-        0x3d, 0x6c, 0xd7, 0xd4, 0x1d, 0x29, 0x79, 0xfa, 0x3c, 0xc2, 0x80, 0x3e,
-        0x8f, 0x90, 0x80, 0x6f, 0xf4, 0x94, 0x8e, 0xeb, 0xaf, 0x51, 0x48, 0xaf,
-        0x34, 0xea, 0xd8, 0xbe, 0xe8, 0x33, 0x09, 0x03, 0xb0, 0xb9, 0x78, 0x0e,
-        0x21, 0x90, 0x9d, 0x29, 0xf3, 0x36, 0xe7, 0x12, 0x0e, 0x07, 0xbd, 0x5e,
-        0x10, 0x0c, 0xfb, 0x67, 0xad, 0x2c, 0xc7, 0xbb, 0x62, 0xea, 0xd0, 0xd7,
-        0x7c, 0x14, 0xfa, 0x66, 0xde, 0xc7, 0x7c, 0x8a, 0xf6, 0x3a, 0x68, 0xa6,
-        0x1b, 0x7a, 0x37, 0xf9, 0xa4, 0x68, 0xdd, 0xd1, 0x05, 0x9d, 0xeb, 0xdd,
-        0xfb, 0x3e, 0xd8, 0x3a, 0x5f, 0x06, 0xad, 0x1f, 0x4b, 0xf5, 0x68, 0xff,
-        0xff, 0x1c, 0x74, 0x31, 0xe3, 0x84, 0x8f, 0x69, 0xda, 0x22, 0x8d, 0x35,
-        0xe8, 0xb3, 0x50, 0x27, 0x53, 0x4e, 0x34, 0xdb, 0x75, 0xde, 0xc4, 0xcd,
-        0x53, 0xed, 0xde, 0x73, 0xe0, 0xb5, 0x7e, 0x7f, 0x03, 0x6c, 0x66, 0xd1,
-        0x3a, 0xbf, 0x50, 0x5a, 0x6f, 0x6d, 0x83, 0x66, 0x19, 0x77, 0xb9, 0x56,
-        0x93, 0xec, 0x19, 0x32, 0x3e, 0x66, 0x3c, 0xa1, 0x18, 0x23, 0xe6, 0xfa,
-        0x05, 0xcf, 0x39, 0x70, 0x9d, 0x9b, 0xf1, 0x90, 0xf1, 0x7b, 0x47, 0xfc,
-        0xbc, 0x17, 0xb1, 0x67, 0x23, 0xb2, 0x45, 0x43, 0x9b, 0x7b, 0xb4, 0xad,
-        0x1a, 0x05, 0x3f, 0x7d, 0x0f, 0x74, 0xcf, 0xba, 0xa4, 0xfd, 0xef, 0x04,
-        0x93, 0xae, 0x89, 0x4f, 0x29, 0xd4, 0xcb, 0x6a, 0x5c, 0x3d, 0x25, 0x07,
-        0x4a, 0xe4, 0xff, 0xa8, 0x96, 0xe5, 0xbb, 0x53, 0x94, 0x07, 0x51, 0xe0,
-        0x71, 0x0a, 0xf8, 0x6b, 0x90, 0xdd, 0x5d, 0x45, 0x94, 0x89, 0xc8, 0xd0,
-        0x40, 0x03, 0x78, 0x8f, 0x76, 0x09, 0xdf, 0x2e, 0xca, 0x7b, 0x32, 0x55,
-        0x1c, 0xd7, 0x7b, 0x9e, 0x1f, 0x43, 0xdd, 0xc7, 0xf1, 0x4c, 0x14, 0xcb,
-        0xa8, 0xf3, 0xb0, 0x2e, 0x3f, 0x31, 0xca, 0x73, 0x22, 0x02, 0x7b, 0xff,
-        0x49, 0x29, 0x4c, 0xb6, 0xc1, 0x2f, 0x99, 0x1e, 0x77, 0xe7, 0xe2, 0xe4,
-        0xff, 0xa5, 0x91, 0xeb, 0xcc, 0x85, 0xeb, 0xb8, 0x27, 0x47, 0xdc, 0x81,
-        0xcd, 0xaa, 0xb3, 0x49, 0xaf, 0xf9, 0xf4, 0x48, 0x3f, 0x6c, 0x8a, 0x9b,
-        0x2b, 0xcf, 0xc4, 0xcc, 0xda, 0xc0, 0x82, 0xf5, 0x86, 0xc3, 0xc4, 0x8a,
-        0x3a, 0xea, 0xf2, 0xdc, 0xa7, 0x4c, 0x9c, 0x81, 0xf6, 0x39, 0x1a, 0xae,
-        0xe7, 0x30, 0xcd, 0x93, 0xb6, 0xeb, 0x00, 0xd7, 0x99, 0x7f, 0xd2, 0xf2,
-        0xf5, 0x89, 0x4d, 0x61, 0x5f, 0xf9, 0x60, 0x6c, 0x53, 0x5e, 0x3e, 0x81,
-        0x27, 0x77, 0x5d, 0x72, 0x34, 0xab, 0xd8, 0xef, 0x37, 0x02, 0xc6, 0x02,
-        0x54, 0xba, 0x55, 0xf2, 0x4d, 0xd5, 0xfd, 0x33, 0xad, 0xc3, 0x2b, 0xa8,
-        0xd7, 0x83, 0x63, 0x26, 0x11, 0x03, 0x0e, 0xf2, 0x6f, 0x08, 0xcf, 0x16,
-        0xcf, 0x57, 0xcb, 0xc1, 0x73, 0xc2, 0xae, 0xd7, 0x70, 0x0d, 0x66, 0x05,
-        0xf0, 0xd2, 0x80, 0xf4, 0x09, 0x19, 0x39, 0xfe, 0x3b, 0x31, 0xee, 0x17,
-        0xaa, 0xd1, 0x7e, 0xf5, 0x7d, 0xf5, 0x26, 0x06, 0xf2, 0x2c, 0xca, 0x30,
-        0x7f, 0x1c, 0x75, 0x92, 0xf9, 0x6c, 0x64, 0xad, 0x0c, 0xe9, 0x7e, 0x83,
-        0x48, 0xdb, 0xb6, 0x7a, 0xbd, 0x4f, 0x5f, 0xce, 0x30, 0x6e, 0x11, 0xd6,
-        0x7d, 0x56, 0xef, 0x83, 0x73, 0xd3, 0xc9, 0x7c, 0x5f, 0x84, 0xf2, 0xa9,
-        0x53, 0x7a, 0xb9, 0xce, 0x73, 0x66, 0x5c, 0xd3, 0x76, 0xfb, 0x26, 0x9e,
-        0x07, 0xdd, 0x02, 0xfb, 0xef, 0x3b, 0x80, 0x89, 0x30, 0x9e, 0x40, 0x3a,
-        0x7c, 0xc2, 0xd7, 0x85, 0x61, 0xfa, 0x4d, 0xc2, 0x30, 0xfd, 0x26, 0x61,
-        0x20, 0x2e, 0x00, 0x47, 0xa5, 0x7d, 0x75, 0x68, 0x53, 0x5c, 0x85, 0x71,
-        0x1c, 0x2c, 0x4d, 0xc3, 0xbf, 0xd5, 0x31, 0x94, 0xce, 0x69, 0x45, 0x9e,
-        0xf7, 0xc0, 0x73, 0xe0, 0xad, 0x12, 0x78, 0x0f, 0xb6, 0xe1, 0x97, 0x61,
-        0x1b, 0x3e, 0x01, 0xdb, 0xf0, 0x1c, 0x6c, 0xc3, 0xc7, 0x31, 0x37, 0x8f,
-        0x2d, 0xe0, 0xd5, 0x8c, 0xe6, 0xd5, 0x42, 0xe9, 0x02, 0x78, 0xb5, 0xeb,
-        0x0a, 0xfc, 0xe8, 0xc2, 0xc6, 0xa7, 0x0d, 0xed, 0xc0, 0x96, 0xff, 0xb8,
-        0xf6, 0x8b, 0x1f, 0x4c, 0x8d, 0xb1, 0x0e, 0x68, 0x38, 0x49, 0x9f, 0x16,
-        0xf2, 0x3f, 0x99, 0x07, 0xef, 0x61, 0xac, 0x8e, 0xa3, 0xae, 0x5b, 0x23,
-        0xd4, 0x1f, 0xee, 0x36, 0xee, 0xef, 0xe6, 0x58, 0x13, 0x8b, 0xf0, 0x64,
-        0xf8, 0x73, 0x8f, 0x4f, 0x3d, 0x42, 0xbe, 0x4c, 0x7c, 0x76, 0xc4, 0xaf,
-        0xe6, 0xc5, 0x1d, 0x1c, 0x5f, 0xe0, 0x6d, 0x5a, 0xae, 0xee, 0x7c, 0xf9,
-        0x35, 0x73, 0xe5, 0x75, 0xff, 0xa3, 0xe4, 0x37, 0xe8, 0x6e, 0xe2, 0x3e,
-        0x91, 0x8d, 0x6c, 0xb0, 0xb8, 0xdf, 0x2f, 0x6d, 0xdb, 0x60, 0xaf, 0x0f,
-        0x82, 0x7e, 0xa7, 0x02, 0xf1, 0xb7, 0x85, 0x6d, 0xce, 0xb7, 0xe3, 0xd9,
-        0x76, 0x76, 0xc3, 0x96, 0xed, 0xdb, 0xc4, 0xb5, 0x5e, 0xd8, 0xf2, 0xa9,
-        0x70, 0x3e, 0x60, 0xf9, 0xea, 0x39, 0xa7, 0x0c, 0xa5, 0xec, 0x6c, 0xb0,
-        0xf1, 0x7e, 0xb6, 0x77, 0x61, 0xd1, 0x3c, 0x5d, 0x0a, 0x78, 0xce, 0x76,
-        0xc4, 0x1f, 0xab, 0xa2, 0x95, 0xbf, 0xb2, 0xb4, 0xa2, 0x16, 0x8d, 0xe3,
-        0x9c, 0xa5, 0x95, 0x10, 0xde, 0x58, 0x48, 0x2b, 0x75, 0x21, 0xad, 0xe4,
-        0xc7, 0x43, 0x5a, 0x61, 0xdd, 0x73, 0x21, 0xad, 0x24, 0xaa, 0x69, 0x25,
-        0x3f, 0xee, 0xe0, 0x59, 0x0c, 0x07, 0xe9, 0x85, 0xed, 0x90, 0x5e, 0x00,
-        0x4b, 0xa5, 0x32, 0x47, 0x2f, 0x31, 0xb4, 0x73, 0xa8, 0xa4, 0x34, 0xad,
-        0x0c, 0xa9, 0x50, 0x47, 0x78, 0x98, 0x73, 0xcc, 0xfd, 0x15, 0x69, 0x24,
-        0x65, 0x69, 0x64, 0xfe, 0x2c, 0xd1, 0x22, 0xda, 0x00, 0xee, 0x79, 0x5e,
-        0x60, 0xb3, 0xa6, 0x8d, 0xfb, 0x53, 0x2f, 0xa0, 0xec, 0x28, 0x68, 0x23,
-        0xc4, 0xc1, 0x03, 0x16, 0x07, 0x8b, 0xe7, 0xf2, 0xb4, 0xc5, 0xc1, 0xa8,
-        0xc5, 0x81, 0xe6, 0x97, 0x3c, 0xe7, 0x4c, 0x69, 0x1c, 0xd4, 0x69, 0x1c,
-        0x88, 0x0a, 0xeb, 0x9e, 0x5e, 0x06, 0x07, 0x2c, 0x33, 0xaa, 0xc7, 0x1f,
-        0xc1, 0xf8, 0xf7, 0x61, 0xfc, 0x4a, 0x8f, 0x9f, 0xf3, 0xc0, 0xf1, 0x03,
-        0x96, 0xca, 0x77, 0xe6, 0xc6, 0xdf, 0x84, 0x36, 0x0e, 0x6a, 0xdb, 0x99,
-        0xf1, 0x54, 0xea, 0x46, 0x33, 0xfe, 0xc7, 0x2a, 0xe6, 0x8c, 0xc9, 0x63,
-        0x4b, 0xf4, 0xd8, 0x0b, 0x96, 0x37, 0x7c, 0xbd, 0xce, 0xc6, 0x73, 0x6d,
-        0xe7, 0xa0, 0xbb, 0xc6, 0x52, 0x09, 0x7b, 0xe6, 0xd4, 0xd8, 0x43, 0x5f,
-        0x4d, 0x91, 0x77, 0x3e, 0xaa, 0xf7, 0xfa, 0x9d, 0xa5, 0x5d, 0x54, 0x6a,
-        0x92, 0xbe, 0xb1, 0x6a, 0xb8, 0x09, 0x6f, 0x3e, 0x50, 0x3e, 0x63, 0x37,
-        0xfb, 0xa1, 0x3b, 0x4c, 0xdc, 0x1a, 0xb4, 0x84, 0xf4, 0x64, 0xbe, 0x37,
-        0x52, 0x27, 0xea, 0x81, 0x0f, 0x60, 0xcc, 0x2e, 0x7c, 0xcc, 0x76, 0x6f,
-        0x9b, 0xa2, 0xae, 0xbb, 0xba, 0x4a, 0xd7, 0x35, 0x5b, 0x5d, 0xb7, 0x86,
-        0xba, 0x0e, 0x70, 0x3f, 0x25, 0x87, 0x4b, 0x9c, 0xbf, 0x7c, 0xa2, 0x4e,
-        0xc7, 0x40, 0x1d, 0x1b, 0xe7, 0x4b, 0xc6, 0x0f, 0x6b, 0x5a, 0xa6, 0xce,
-        0x4a, 0xea, 0xb8, 0xe4, 0x4c, 0xd7, 0x3f, 0xd9, 0x75, 0x10, 0xea, 0xb5,
-        0xef, 0x07, 0x7f, 0xb0, 0x8c, 0x5e, 0x83, 0xfe, 0xd1, 0xf6, 0x59, 0x0d,
-        0x64, 0xad, 0x9c, 0x6a, 0xc6, 0xb3, 0x9a, 0xe7, 0xc1, 0x3a, 0x3b, 0x54,
-        0xbd, 0xd4, 0x9c, 0x6a, 0x94, 0x3d, 0x63, 0x7a, 0xdd, 0x5c, 0xd4, 0x29,
-        0xe0, 0xff, 0x14, 0xcf, 0x14, 0x88, 0x3e, 0x03, 0x95, 0x1b, 0x85, 0x3f,
-        0x33, 0xf1, 0x94, 0xd9, 0x1b, 0x38, 0x56, 0xa3, 0x7f, 0xd3, 0xc6, 0x28,
-        0xa4, 0x32, 0xfa, 0xec, 0xd0, 0x1e, 0xb4, 0xd9, 0xbe, 0xa9, 0x16, 0x63,
-        0x8e, 0xa1, 0x2e, 0xf7, 0x16, 0xaa, 0x36, 0x57, 0x6a, 0xc5, 0x9d, 0x88,
-        0xea, 0xf3, 0x4b, 0x3c, 0x7f, 0x9f, 0xed, 0x69, 0x42, 0x5e, 0x44, 0xaf,
-        0x15, 0xd4, 0x9c, 0x9a, 0x3f, 0xa7, 0xae, 0x8e, 0x8a, 0x5d, 0xc3, 0x4f,
-        0x6b, 0xbd, 0x12, 0x39, 0x4a, 0x9d, 0xc3, 0xfd, 0x55, 0x3d, 0x98, 0xf7,
-        0xe5, 0xf4, 0x8d, 0x31, 0x62, 0xb3, 0x98, 0x3f, 0x75, 0x86, 0x67, 0x8d,
-        0x5b, 0xf1, 0x0e, 0xdb, 0x0b, 0xf5, 0x08, 0x74, 0xdf, 0xdb, 0x3f, 0xe1,
-        0x49, 0x3d, 0xf0, 0x3d, 0xa1, 0x80, 0x6b, 0x57, 0xd3, 0x42, 0x5e, 0x85,
-        0xb1, 0x69, 0x43, 0x0f, 0x8f, 0xbf, 0x21, 0x3f, 0x90, 0x26, 0x3a, 0x6d,
-        0x6c, 0xc1, 0xb7, 0x31, 0x7e, 0xd2, 0xb6, 0xa1, 0x87, 0x47, 0x53, 0x19,
-        0xc5, 0xbd, 0x51, 0x66, 0x1d, 0x94, 0xb4, 0x41, 0x9a, 0x4f, 0xe8, 0xf5,
-        0xd1, 0x8c, 0xbc, 0x2c, 0x99, 0xa6, 0x76, 0xd8, 0x5d, 0xff, 0xb6, 0x73,
-        0x6c, 0xee, 0x2e, 0xd0, 0x34, 0x07, 0xdd, 0xc4, 0x7d, 0xca, 0x9d, 0xf2,
-        0x5e, 0x9e, 0x57, 0x98, 0x70, 0xa0, 0x94, 0x9f, 0xd2, 0x7b, 0xbf, 0x77,
-        0x14, 0x57, 0xcb, 0xad, 0xa9, 0xa8, 0x5d, 0xe7, 0xac, 0x05, 0x1d, 0x40,
-        0x50, 0x9f, 0xaa, 0xc5, 0x13, 0x75, 0x38, 0x7f, 0x17, 0x53, 0x99, 0xa4,
-        0x22, 0xb3, 0xc3, 0xe7, 0x9f, 0x91, 0x2d, 0xde, 0x1e, 0x7d, 0xce, 0x4e,
-        0x9c, 0xba, 0x53, 0x7f, 0xe9, 0xd1, 0x06, 0x25, 0xfd, 0xcc, 0xf8, 0xb5,
-        0x7a, 0x5d, 0xab, 0x3f, 0x15, 0x04, 0x39, 0xcc, 0x5f, 0x41, 0x4c, 0xfc,
-        0x6c, 0xc2, 0x67, 0x1a, 0xfd, 0xda, 0x06, 0xa7, 0xf6, 0x4c, 0xa3, 0x63,
-        0x68, 0x45, 0x22, 0x2a, 0x5d, 0xef, 0xd4, 0x9c, 0xba, 0x93, 0x73, 0x06,
-        0xba, 0xf2, 0x1c, 0x43, 0x57, 0x31, 0x67, 0x9e, 0xae, 0xd6, 0xd9, 0xdf,
-        0x2a, 0x5d, 0x27, 0x99, 0x64, 0x1d, 0xc6, 0xdb, 0x5b, 0x0c, 0x61, 0x3c,
-        0x0c, 0xb8, 0x08, 0xcf, 0xdd, 0x18, 0xc3, 0x30, 0x9e, 0x3c, 0x60, 0x01,
-        0xb3, 0x9f, 0x2a, 0x00, 0xe6, 0x83, 0x78, 0x18, 0x27, 0x6b, 0x76, 0x22,
-        0x13, 0xd5, 0xf0, 0x12, 0xc6, 0x1f, 0x5b, 0x78, 0x5f, 0x0f, 0x56, 0x4f,
-        0x66, 0xba, 0x8b, 0x80, 0x87, 0x70, 0xde, 0x07, 0x18, 0x69, 0x97, 0x8e,
-        0xe2, 0xdb, 0x03, 0x7c, 0x63, 0x16, 0x26, 0xd0, 0xe3, 0xd8, 0x43, 0xf3,
-        0xbf, 0x8b, 0xb4, 0x93, 0x8f, 0xd9, 0xef, 0xd6, 0x45, 0x32, 0xe0, 0x15,
-        0x87, 0x78, 0x1e, 0x29, 0xbd, 0xe6, 0xc0, 0x0e, 0x00, 0xdf, 0xbf, 0xe4,
-        0x44, 0xce, 0xc4, 0xe5, 0x50, 0x91, 0x31, 0x84, 0xe3, 0x0e, 0xe7, 0x41,
-        0xf9, 0x57, 0xa1, 0x4c, 0x5c, 0xc9, 0xc4, 0xd5, 0x78, 0xde, 0x82, 0x67,
-        0x03, 0x9e, 0x8d, 0x78, 0xd6, 0xe3, 0x69, 0xc5, 0xf3, 0x2d, 0x94, 0x53,
-        0xb1, 0x3a, 0xe1, 0x7e, 0xd5, 0x16, 0xa5, 0x34, 0x1f, 0x71, 0xcf, 0xc2,
-        0x65, 0xc0, 0xe5, 0x2b, 0xd0, 0x3b, 0x1e, 0x9e, 0xf1, 0xf8, 0x3a, 0xfa,
-        0x98, 0xc5, 0xd3, 0xa9, 0xe4, 0x4c, 0x17, 0x9e, 0x14, 0x9e, 0x6e, 0x3c,
-        0x3d, 0x78, 0xd2, 0x78, 0x5e, 0x75, 0x0c, 0xcf, 0x5d, 0x02, 0xbe, 0x42,
-        0x1e, 0x01, 0xce, 0x17, 0xf0, 0x9c, 0xe7, 0xbc, 0x09, 0x9e, 0x73, 0x2c,
-        0xcf, 0x39, 0xf3, 0x3c, 0x57, 0xeb, 0xa8, 0x63, 0xf5, 0x4e, 0xe4, 0x18,
-        0x7d, 0x85, 0x5a, 0xc7, 0xf0, 0x7f, 0x44, 0x7a, 0x07, 0x41, 0x4b, 0xc7,
-        0x30, 0x67, 0xc7, 0x48, 0x57, 0x2e, 0xd2, 0xc7, 0x16, 0xf5, 0x3b, 0xfa,
-        0x26, 0xfa, 0x3d, 0x61, 0xfb, 0x7d, 0xb8, 0xaa, 0xdf, 0x83, 0x68, 0xfb,
-        0x3e, 0xdb, 0xef, 0xc1, 0xaa, 0x7e, 0x41, 0x2b, 0xc7, 0xf2, 0x78, 0x48,
-        0x17, 0x23, 0x48, 0x0f, 0x65, 0xc2, 0xdd, 0x6b, 0xa4, 0xbe, 0x46, 0x9f,
-        0x27, 0x8d, 0xf9, 0x35, 0x73, 0xba, 0x31, 0x53, 0xa5, 0x1f, 0x7e, 0x16,
-        0xfd, 0x38, 0x5c, 0xa2, 0x8d, 0x38, 0x5d, 0x25, 0x17, 0xe8, 0xfb, 0x04,
-        0x72, 0x5c, 0xfb, 0x39, 0xf4, 0x79, 0xe8, 0xff, 0x2c, 0xb6, 0xad, 0x3e,
-        0xae, 0xf7, 0xe7, 0xde, 0x55, 0x6c, 0x95, 0x4f, 0x14, 0x69, 0x13, 0x92,
-        0x5e, 0x82, 0x60, 0xcf, 0x36, 0xda, 0xa7, 0xf9, 0x60, 0x9d, 0x9f, 0xd4,
-        0xb1, 0xb5, 0x4f, 0x2e, 0xd5, 0x19, 0xa3, 0xbd, 0xf0, 0xcd, 0xb3, 0x47,
-        0x3f, 0x08, 0x9d, 0x51, 0x03, 0xb8, 0x9f, 0xd2, 0x77, 0x80, 0xec, 0x1a,
-        0x55, 0x23, 0x6b, 0x25, 0x2e, 0x37, 0x17, 0x6b, 0x61, 0xf7, 0x30, 0x56,
-        0x5e, 0x2f, 0xed, 0xdb, 0xa2, 0xe6, 0x6c, 0x8d, 0x17, 0xc3, 0x6f, 0xcf,
-        0x9c, 0xf5, 0x89, 0xc5, 0x91, 0x1f, 0x69, 0xa2, 0x1c, 0x8c, 0xf9, 0xef,
-        0xd4, 0xfb, 0x26, 0xdb, 0xb6, 0xd1, 0x6e, 0xb9, 0x41, 0xeb, 0x70, 0x77,
-        0x89, 0x9d, 0xa4, 0x5a, 0x3c, 0x99, 0xb7, 0xd1, 0x76, 0x17, 0x93, 0x09,
-        0xc2, 0xf5, 0x90, 0x70, 0x3f, 0xc1, 0x7e, 0x29, 0xa4, 0x1a, 0x25, 0x92,
-        0xe6, 0xba, 0x5c, 0xb2, 0x93, 0xb6, 0xd1, 0xc4, 0x98, 0x67, 0xcf, 0x9e,
-        0xac, 0x96, 0x0b, 0xba, 0x9f, 0x5a, 0x0d, 0xa3, 0x39, 0x8f, 0xc6, 0x35,
-        0x2f, 0x9e, 0x81, 0x72, 0xf1, 0x6e, 0xd0, 0x7a, 0x67, 0xa2, 0xcc, 0xb3,
-        0x4e, 0xf0, 0x97, 0xca, 0x31, 0x7d, 0xc6, 0xd4, 0x7b, 0x3b, 0xfc, 0xd8,
-        0xf2, 0x06, 0xd9, 0x3d, 0xb6, 0x82, 0xeb, 0x28, 0xb1, 0xb5, 0xd0, 0x1f,
-        0xac, 0xd3, 0xb6, 0x0d, 0xfe, 0xdf, 0xf8, 0x46, 0x79, 0x7c, 0x9c, 0x6d,
-        0xb7, 0xc8, 0xe4, 0x94, 0x38, 0xde, 0xdb, 0x57, 0xa2, 0x8c, 0xc7, 0xf1,
-        0x08, 0xf7, 0x3c, 0xb5, 0x6d, 0x13, 0xe5, 0xbd, 0xdd, 0x95, 0xf3, 0xdd,
-        0x11, 0xbd, 0x26, 0xe3, 0x82, 0x4e, 0xd8, 0xde, 0xf9, 0xee, 0x56, 0x39,
-        0x3b, 0x05, 0x9a, 0x80, 0xdc, 0xef, 0x3b, 0x45, 0x98, 0x44, 0xb6, 0x4f,
-        0xc0, 0x5e, 0x90, 0x76, 0x3c, 0xa0, 0x0f, 0xc8, 0xef, 0x5b, 0xbb, 0xd9,
-        0x17, 0xf4, 0x12, 0x74, 0x5c, 0xdb, 0x36, 0x23, 0x0b, 0x32, 0x13, 0x35,
-        0x48, 0x67, 0xbb, 0xf0, 0x0f, 0x07, 0xd9, 0x4e, 0x58, 0x57, 0x61, 0x4c,
-        0xb5, 0x9a, 0x5e, 0x66, 0x17, 0xe9, 0x8f, 0x73, 0x3f, 0x97, 0xfd, 0xcd,
-        0x36, 0x3a, 0x41, 0x2b, 0xbe, 0xde, 0xc3, 0x63, 0x6c, 0x2b, 0xce, 0x09,
-        0x6d, 0x22, 0xda, 0x55, 0xd7, 0x6a, 0xfb, 0x62, 0xb2, 0xc2, 0x19, 0xe4,
-        0xda, 0x48, 0x38, 0x47, 0x71, 0x39, 0x59, 0x9a, 0x9b, 0xa7, 0x0d, 0x35,
-        0x0b, 0xe7, 0x89, 0xb4, 0x92, 0x1a, 0xb2, 0xb6, 0xc7, 0x8c, 0x3c, 0x0f,
-        0xbb, 0xac, 0x53, 0xcf, 0xd9, 0x0c, 0x6c, 0x59, 0x3b, 0x67, 0xda, 0x9e,
-        0x2d, 0x84, 0x73, 0x36, 0x00, 0x8d, 0x53, 0xbe, 0x41, 0xcf, 0x99, 0x07,
-        0xba, 0xc9, 0x03, 0xef, 0x79, 0xcc, 0x53, 0x1e, 0x73, 0x94, 0x2f, 0xb7,
-        0xc8, 0xc4, 0x71, 0xd5, 0x5a, 0x23, 0x92, 0xd8, 0xed, 0xb7, 0xc8, 0xf0,
-        0x14, 0x63, 0x05, 0x1b, 0x60, 0x83, 0x6d, 0xc4, 0xd3, 0x8a, 0x6f, 0xd6,
-        0xe3, 0x1d, 0x1f, 0x0a, 0x75, 0xeb, 0x96, 0xd8, 0x59, 0x67, 0xd1, 0xf7,
-        0xd3, 0xc0, 0xc3, 0xa3, 0xc0, 0xc3, 0x3c, 0xef, 0xbc, 0x50, 0x15, 0x5f,
-        0xe2, 0x58, 0xb5, 0x0e, 0xc5, 0x78, 0x63, 0x7a, 0x3e, 0x75, 0x9c, 0xa9,
-        0x54, 0xfb, 0x66, 0xec, 0xa9, 0x38, 0xed, 0xa9, 0xdc, 0xa8, 0x67, 0xce,
-        0x60, 0x0d, 0xc0, 0x77, 0xf2, 0xf7, 0x69, 0x5a, 0x1f, 0x1a, 0x27, 0x5c,
-        0xd1, 0x10, 0xae, 0x05, 0x73, 0xc6, 0x33, 0xb3, 0x4b, 0xe3, 0x18, 0x2f,
-        0xcc, 0xed, 0x11, 0x87, 0x2e, 0x97, 0xd1, 0x14, 0xe3, 0x24, 0xad, 0xcb,
-        0xc0, 0xf4, 0x94, 0xb6, 0x61, 0x45, 0x9d, 0x96, 0x03, 0x25, 0x9e, 0xb7,
-        0xe5, 0x1a, 0xcc, 0xef, 0x31, 0x7e, 0xd4, 0x39, 0x21, 0xc7, 0xd0, 0x37,
-        0xd7, 0xc5, 0x95, 0x8d, 0xcf, 0xac, 0xb2, 0x7b, 0xf2, 0xaa, 0x63, 0x34,
-        0x66, 0xdd, 0x7c, 0xe1, 0xd9, 0x93, 0xe4, 0xc0, 0xac, 0x5e, 0x77, 0xe5,
-        0x9a, 0xa1, 0x8c, 0x46, 0xa0, 0xfd, 0x76, 0x77, 0x27, 0x7b, 0xcc, 0x59,
-        0xc3, 0x84, 0xf4, 0x97, 0xcc, 0xf8, 0x2f, 0xea, 0x7d, 0x93, 0x66, 0x7f,
-        0xb8, 0xd9, 0x53, 0xb9, 0x5f, 0x2e, 0xa6, 0xa2, 0x55, 0x73, 0x5b, 0x27,
-        0xc3, 0xc0, 0x85, 0x5e, 0xcb, 0x84, 0x5d, 0x9c, 0xeb, 0x7e, 0xbc, 0x89,
-        0x67, 0xd1, 0xa2, 0x98, 0x9f, 0xc2, 0x38, 0xcf, 0xa7, 0xb3, 0xdd, 0x2b,
-        0xb5, 0x45, 0x31, 0xcb, 0xb3, 0x4e, 0x90, 0x95, 0x6f, 0xdd, 0x12, 0xaf,
-        0xd7, 0xf9, 0x2b, 0xec, 0x99, 0x16, 0xd8, 0x0d, 0xbb, 0x02, 0xf9, 0x33,
-        0xe8, 0xc9, 0xd3, 0x76, 0x4c, 0x09, 0x1d, 0x93, 0x92, 0xe0, 0x7c, 0x2a,
-        0x6e, 0xe3, 0xce, 0x1c, 0xcb, 0x98, 0xa5, 0x6f, 0x63, 0xff, 0xcc, 0xdb,
-        0xd0, 0x5d, 0x9a, 0xd6, 0x1f, 0xd7, 0xb2, 0xb0, 0xcb, 0xda, 0xce, 0x3a,
-        0x8e, 0x73, 0x42, 0xf4, 0x1e, 0xac, 0xd0, 0x37, 0xea, 0xa8, 0xf2, 0x0b,
-        0x8c, 0x2f, 0x57, 0x18, 0x5b, 0x4e, 0x46, 0xcd, 0xfb, 0x84, 0xf4, 0xe5,
-        0xf6, 0x6c, 0xe2, 0xdd, 0x30, 0xa1, 0x2f, 0xd7, 0x65, 0x7d, 0xb9, 0x46,
-        0xed, 0xcb, 0x99, 0xd8, 0x43, 0xe3, 0x9c, 0x2f, 0x57, 0x18, 0xcb, 0x83,
-        0x56, 0x6a, 0xed, 0x59, 0x09, 0x63, 0x0b, 0x0d, 0x17, 0x5d, 0xbd, 0x6f,
-        0x24, 0x37, 0xa0, 0xe0, 0x37, 0x18, 0x1f, 0x8b, 0xb1, 0x0a, 0xa5, 0xfe,
-        0xce, 0xfa, 0x17, 0x1b, 0x24, 0xd3, 0xbc, 0x02, 0xe3, 0x7e, 0x4a, 0xcf,
-        0xb9, 0x59, 0xc3, 0x82, 0x5c, 0x1b, 0x64, 0xcc, 0x87, 0x67, 0x47, 0x35,
-        0x7f, 0x25, 0x7a, 0x23, 0x9d, 0xc6, 0x9e, 0xf5, 0x13, 0x6b, 0xa5, 0xfe,
-        0xb8, 0x53, 0x18, 0x8f, 0xda, 0x7e, 0x13, 0x80, 0xa9, 0x06, 0x73, 0xf3,
-        0x4e, 0x2b, 0x93, 0xd9, 0xf7, 0x3b, 0xea, 0x18, 0x1b, 0x98, 0x2a, 0x9a,
-        0x18, 0x60, 0x5f, 0x31, 0x12, 0x9e, 0x5b, 0x57, 0x5c, 0x47, 0xce, 0x0c,
-        0xae, 0x00, 0x2c, 0x2b, 0x96, 0xb5, 0x59, 0x1f, 0x7b, 0x43, 0x1d, 0x45,
-        0x9a, 0x7a, 0x4a, 0xef, 0x2f, 0x5c, 0xd9, 0x9d, 0xdc, 0xa9, 0xcf, 0x23,
-        0xe9, 0x58, 0x62, 0x5e, 0xb8, 0x7f, 0xf7, 0x9b, 0xf2, 0x36, 0x2d, 0xfb,
-        0x0f, 0xa4, 0xa8, 0xc7, 0xb6, 0xe9, 0xdf, 0xb5, 0xe9, 0x20, 0x38, 0xdf,
-        0xfd, 0x2c, 0x6c, 0x16, 0xdf, 0xfb, 0x96, 0xb4, 0xc7, 0x7b, 0xb5, 0x0d,
-        0x85, 0xb9, 0x1a, 0xac, 0x97, 0x15, 0xfe, 0xb8, 0xdd, 0xab, 0x68, 0xd6,
-        0x03, 0x0b, 0xc2, 0xfb, 0x17, 0x3a, 0x6c, 0x5e, 0x3e, 0xa8, 0x07, 0x3d,
-        0x7d, 0x44, 0x8c, 0xac, 0xc9, 0xcd, 0xcb, 0x1a, 0xee, 0xa7, 0xcb, 0x90,
-        0xa0, 0xdd, 0x23, 0x92, 0xe4, 0xdd, 0x49, 0xec, 0xbb, 0x20, 0x57, 0x41,
-        0x3f, 0xb3, 0x1e, 0x6d, 0x56, 0x7e, 0x73, 0x0f, 0x8a, 0xef, 0x1d, 0x84,
-        0x8e, 0xb9, 0x61, 0xa9, 0x8e, 0x89, 0xd3, 0xbf, 0xcf, 0x8d, 0xd2, 0x47,
-        0x5c, 0x89, 0x3a, 0x2d, 0xf2, 0xd1, 0xb1, 0xdf, 0x5a, 0x4b, 0x1e, 0x1b,
-        0x82, 0x7c, 0x57, 0xf7, 0x87, 0xe7, 0x2e, 0x99, 0xc6, 0x7c, 0xb6, 0x5b,
-        0x27, 0x89, 0xf7, 0x79, 0xf2, 0xc5, 0x4a, 0x32, 0x31, 0x0b, 0x1d, 0x35,
-        0xe4, 0x0c, 0xb7, 0x9a, 0xd8, 0xe9, 0xa7, 0xd6, 0x9a, 0x73, 0x5a, 0xf5,
-        0xc0, 0x69, 0x18, 0x4f, 0xad, 0xa6, 0xdd, 0x59, 0x2b, 0x97, 0x83, 0xa0,
-        0xbe, 0x5b, 0xcb, 0xe2, 0x9d, 0x94, 0xc5, 0x07, 0x52, 0x1d, 0x86, 0x07,
-        0xb4, 0xef, 0xc4, 0x3d, 0x00, 0xc0, 0x43, 0xb7, 0xcb, 0xbd, 0xd0, 0x96,
-        0x4f, 0xfd, 0xcc, 0x8c, 0x95, 0x4f, 0xca, 0x59, 0xca, 0x9f, 0x6a, 0x6b,
-        0x74, 0x81, 0xec, 0x3d, 0x34, 0x46, 0xbd, 0x9c, 0x9a, 0xfe, 0x26, 0xe4,
-        0x55, 0x4e, 0xe3, 0xa1, 0x45, 0xee, 0x1b, 0x93, 0xcc, 0x45, 0xe8, 0xac,
-        0xc2, 0xd4, 0x42, 0x1e, 0x5d, 0xda, 0x1e, 0xc7, 0x7a, 0x7a, 0xad, 0xf1,
-        0x71, 0x17, 0x8e, 0x75, 0x9a, 0x7b, 0x8c, 0xf4, 0x58, 0xb9, 0x37, 0xff,
-        0x9c, 0x1d, 0xeb, 0xca, 0x70, 0xac, 0x3d, 0x0b, 0xc7, 0x1a, 0xfa, 0xf8,
-        0xa1, 0xfc, 0x4d, 0xe8, 0xb3, 0x49, 0xfa, 0x4c, 0xcc, 0xd8, 0x4a, 0xe9,
-        0x1d, 0x6d, 0xb4, 0x72, 0xd3, 0x83, 0x0e, 0xe2, 0x79, 0xa1, 0xe9, 0xcf,
-        0x79, 0x62, 0x71, 0xa6, 0x88, 0x07, 0xca, 0xdc, 0x26, 0x7d, 0x9e, 0x71,
-        0x02, 0x7e, 0xd6, 0x87, 0x8b, 0x2c, 0x1b, 0xe6, 0x5f, 0x29, 0x46, 0x1c,
-        0xfa, 0xd6, 0xf4, 0x9f, 0x3a, 0x97, 0xc4, 0x16, 0x4c, 0x1c, 0x98, 0xf1,
-        0x5f, 0x73, 0xcf, 0x02, 0xf7, 0x7d, 0xdf, 0x01, 0xde, 0xfa, 0xed, 0x62,
-        0xb2, 0x27, 0x1b, 0xa1, 0x3c, 0x9d, 0x95, 0x43, 0x95, 0x3e, 0x69, 0xd3,
-        0x67, 0xed, 0xdf, 0x30, 0x46, 0x9c, 0xa9, 0x8e, 0x11, 0x8b, 0x63, 0x62,
-        0xc4, 0x3b, 0x7f, 0x8e, 0x18, 0xb1, 0x38, 0x26, 0x46, 0xbc, 0x9c, 0x9f,
-        0x35, 0x52, 0x9a, 0xc5, 0xb8, 0xea, 0x21, 0x53, 0x94, 0x93, 0x9b, 0x6a,
-        0xc0, 0xbb, 0x16, 0x6f, 0xc0, 0x32, 0x56, 0xc0, 0xdb, 0xc3, 0xfb, 0x20,
-        0xde, 0x31, 0x19, 0x99, 0xd3, 0x1d, 0xb3, 0x90, 0x1f, 0xd4, 0x69, 0xac,
-        0x6b, 0xfc, 0x82, 0xc9, 0x72, 0x33, 0xca, 0x5d, 0x72, 0x26, 0x58, 0xaf,
-        0xd4, 0x28, 0xc3, 0x63, 0x94, 0xdd, 0x4d, 0x32, 0x3a, 0x16, 0xda, 0xb8,
-        0x9f, 0x5d, 0xcf, 0xb5, 0x81, 0x21, 0x09, 0x6d, 0xd8, 0x67, 0xd6, 0x9b,
-        0xb5, 0xdb, 0x2d, 0x31, 0xa9, 0x5f, 0x8d, 0x39, 0x38, 0xee, 0x5c, 0x1c,
-        0x5f, 0xbd, 0xc0, 0x96, 0x4d, 0xd8, 0xd8, 0xe0, 0xb8, 0xd5, 0xc1, 0xcb,
-        0xcb, 0x88, 0xea, 0xf9, 0x8f, 0xdb, 0x73, 0xbc, 0x51, 0x7b, 0xd7, 0x5f,
-        0x42, 0xcf, 0xcf, 0x40, 0x65, 0x16, 0xfd, 0xad, 0x57, 0x99, 0x71, 0x8e,
-        0x73, 0xee, 0x7e, 0x1e, 0xc8, 0xc5, 0x56, 0x35, 0x34, 0xbe, 0x80, 0x2e,
-        0x41, 0xb7, 0x1c, 0x9b, 0x03, 0xda, 0xbd, 0x57, 0x26, 0x46, 0x09, 0x5f,
-        0x47, 0x3c, 0xa2, 0xcf, 0xf5, 0xe2, 0x7b, 0xdc, 0x9c, 0x27, 0xea, 0xad,
-        0x84, 0x67, 0x7a, 0xd7, 0x00, 0xde, 0xc5, 0xe7, 0x7a, 0xad, 0x9e, 0xd6,
-        0x36, 0x04, 0xcf, 0xf7, 0x86, 0x63, 0x58, 0x8e, 0x9e, 0x02, 0x19, 0xd6,
-        0xfb, 0x7d, 0xd7, 0xca, 0xe9, 0x07, 0xe7, 0xce, 0x17, 0x34, 0xc1, 0x56,
-        0x69, 0x85, 0xa9, 0x3c, 0xe0, 0xa6, 0xb9, 0xef, 0x82, 0xfb, 0x0b, 0x3a,
-        0xe2, 0xb7, 0xe9, 0x73, 0x1f, 0xf3, 0x67, 0xac, 0xe7, 0xcf, 0x7e, 0x84,
-        0x67, 0x5a, 0xe3, 0xd2, 0x07, 0x3a, 0xec, 0xd7, 0xe9, 0x31, 0x8c, 0x87,
-        0x6b, 0xbe, 0x1a, 0x0f, 0x90, 0x3d, 0x5c, 0xfb, 0xc5, 0xd8, 0x2b, 0x2d,
-        0x2a, 0xa7, 0xcf, 0x58, 0x47, 0x2d, 0x8d, 0x5d, 0x76, 0xf6, 0x94, 0x13,
-        0x6a, 0x4f, 0xd9, 0x57, 0x7b, 0xcb, 0x36, 0xaf, 0xfb, 0x01, 0xcc, 0x07,
-        0x7e, 0x8f, 0x17, 0x9d, 0x21, 0xe0, 0xab, 0x50, 0x3a, 0xe2, 0x64, 0xf4,
-        0xfb, 0xa8, 0x7d, 0x43, 0x0e, 0x60, 0xae, 0x7a, 0xc7, 0xa3, 0x5a, 0xde,
-        0xcf, 0xdf, 0xd3, 0x17, 0xce, 0xeb, 0x0b, 0x7a, 0x0d, 0x68, 0x5a, 0x88,
-        0x6b, 0xcf, 0xda, 0x10, 0xc7, 0x9d, 0x9c, 0xc6, 0x3d, 0xcb, 0x7c, 0x4b,
-        0xff, 0x06, 0x9d, 0x2b, 0xd3, 0x5e, 0x2b, 0xde, 0x8b, 0xf7, 0x4d, 0x86,
-        0xfa, 0x86, 0x70, 0xdf, 0x09, 0xbd, 0x16, 0xec, 0x37, 0xf2, 0x6a, 0x56,
-        0x46, 0x2a, 0x5c, 0xc3, 0x64, 0x3b, 0x48, 0x2f, 0xd7, 0xc0, 0x1e, 0x58,
-        0x78, 0xbe, 0xba, 0x7f, 0x7e, 0x1e, 0x12, 0xe3, 0x42, 0x58, 0xee, 0xd6,
-        0x67, 0x17, 0xab, 0xef, 0x1e, 0xb9, 0xf2, 0xbf, 0x70, 0xfd, 0xd0, 0xc8,
-        0x50, 0x0b, 0x47, 0x86, 0xf2, 0xce, 0xc8, 0x95, 0xaf, 0xcb, 0x41, 0xe0,
-        0xf1, 0x30, 0x60, 0x52, 0xf7, 0xf3, 0xce, 0xab, 0x57, 0xa5, 0x30, 0x59,
-        0x2f, 0xea, 0xa1, 0x82, 0xe3, 0x3e, 0x54, 0x2b, 0x91, 0x87, 0x94, 0x53,
-        0xf3, 0x50, 0xbb, 0xf6, 0xcf, 0x77, 0xa4, 0xda, 0xe3, 0x7b, 0xe5, 0xb8,
-        0xe3, 0xde, 0xaf, 0xf4, 0x59, 0xdb, 0x82, 0xc7, 0x58, 0xdf, 0x71, 0x27,
-        0x72, 0x7f, 0xd4, 0x9e, 0xd3, 0x37, 0xf1, 0xbd, 0x59, 0xcd, 0xf7, 0xdf,
-        0x58, 0x47, 0x9c, 0xcd, 0x0a, 0xf1, 0xf1, 0x59, 0xc8, 0xad, 0x4f, 0x4b,
-        0x76, 0x34, 0x31, 0x57, 0xc6, 0xec, 0xb3, 0xdf, 0xb0, 0xce, 0xf0, 0x0b,
-        0xcb, 0xbc, 0xe2, 0xf0, 0xce, 0x1c, 0xa3, 0x33, 0x3e, 0xdf, 0x12, 0xee,
-        0xb9, 0x37, 0x73, 0xca, 0xfc, 0xc6, 0x75, 0x52, 0xff, 0x0a, 0xe6, 0x8b,
-        0xfd, 0x11, 0x57, 0xab, 0xf4, 0x3d, 0x05, 0x9e, 0x6c, 0x89, 0xd7, 0xcd,
-        0xd9, 0x43, 0x46, 0xf6, 0xd6, 0x01, 0x6e, 0xc0, 0x6f, 0xec, 0x3b, 0x21,
-        0x9d, 0x0a, 0x24, 0x37, 0x69, 0xb6, 0xa3, 0x67, 0x87, 0x98, 0x39, 0x33,
-        0x34, 0xb3, 0xc2, 0xd8, 0x91, 0xf8, 0x36, 0x74, 0xa1, 0x64, 0xfb, 0xd8,
-        0x4b, 0x4e, 0x3f, 0xcf, 0x3c, 0x8a, 0xb6, 0x1b, 0x97, 0xb3, 0x09, 0xc1,
-        0x4b, 0xcf, 0x5b, 0xff, 0x32, 0x08, 0xc6, 0x52, 0x29, 0xde, 0x2b, 0xb8,
-        0x8c, 0x4f, 0xb9, 0xca, 0x99, 0x1c, 0x6d, 0x70, 0x26, 0x46, 0x03, 0xd9,
-        0x93, 0xe2, 0x9d, 0x49, 0xdc, 0x93, 0xa0, 0xe3, 0xe3, 0x48, 0x6b, 0x87,
-        0x6e, 0x7d, 0xc7, 0x3a, 0xee, 0x71, 0xbb, 0xd9, 0x6f, 0xb4, 0xe5, 0x88,
-        0x63, 0xfa, 0xca, 0xed, 0x27, 0x72, 0xc2, 0xbb, 0x8b, 0xb6, 0xc4, 0x63,
-        0x7a, 0x7f, 0xe2, 0x17, 0x50, 0x0f, 0x7d, 0x94, 0xd8, 0xaf, 0xeb, 0x4c,
-        0x40, 0x9e, 0x4d, 0x8e, 0xf1, 0xbe, 0x14, 0x9e, 0x63, 0x88, 0xb4, 0x2a,
-        0xb9, 0xd6, 0x1b, 0xb6, 0xf7, 0x69, 0xe6, 0xe1, 0x0a, 0x45, 0x74, 0xda,
-        0x16, 0x6f, 0xf7, 0xdc, 0x1d, 0x9b, 0x61, 0x5a, 0x78, 0xd7, 0xa6, 0xd2,
-        0x67, 0x56, 0xe0, 0xd3, 0x9e, 0x1e, 0x92, 0xb8, 0x33, 0x55, 0x6c, 0x75,
-        0x4e, 0x16, 0x33, 0x5b, 0xd7, 0x81, 0x3e, 0xce, 0xa7, 0x3e, 0x46, 0xf9,
-        0x05, 0xdb, 0xef, 0x45, 0xc9, 0x57, 0x3e, 0x24, 0xe3, 0x2d, 0xed, 0xde,
-        0xfd, 0x7a, 0x6e, 0x2e, 0x03, 0x67, 0x2d, 0x2a, 0x3b, 0xfa, 0xc4, 0x3a,
-        0xea, 0xb7, 0xdd, 0x45, 0x05, 0x5e, 0x56, 0xbf, 0x88, 0x07, 0x36, 0x6e,
-        0xad, 0xb6, 0x51, 0xf6, 0xa6, 0x58, 0xae, 0xc1, 0xe9, 0x1d, 0x5d, 0x85,
-        0x79, 0xdc, 0x05, 0xfd, 0xe9, 0xc0, 0x46, 0x22, 0xae, 0x1b, 0x9c, 0x3d,
-        0xa3, 0x79, 0xf4, 0xc8, 0x7d, 0xd6, 0xbc, 0xf7, 0xf0, 0x30, 0xc6, 0xa8,
-        0xe5, 0x2b, 0x78, 0xf7, 0x12, 0xd7, 0xdb, 0x83, 0x49, 0xd8, 0x06, 0xb9,
-        0xae, 0x7f, 0x67, 0xd7, 0xab, 0xa7, 0xaf, 0xb0, 0x5e, 0xed, 0xc9, 0x23,
-        0x15, 0x7d, 0x6f, 0x48, 0xe7, 0xb8, 0xe2, 0x3a, 0x6e, 0xf3, 0x55, 0x7a,
-        0x7e, 0x54, 0x87, 0xdd, 0x1b, 0x78, 0x72, 0x9d, 0xbd, 0xd3, 0x06, 0x70,
-        0x5c, 0x05, 0x18, 0x36, 0x62, 0xfc, 0x84, 0xc1, 0xd4, 0x11, 0x75, 0x4b,
-        0x9c, 0x3a, 0x70, 0x56, 0x4e, 0xaf, 0x0b, 0xf7, 0x7b, 0xa0, 0x1d, 0xc8,
-        0xb5, 0x47, 0xe3, 0x46, 0x37, 0xae, 0x5d, 0xa6, 0x9d, 0x70, 0x3c, 0x8e,
-        0x1d, 0x0f, 0x69, 0x75, 0x43, 0x0b, 0xfd, 0x89, 0x59, 0xa9, 0x5b, 0x54,
-        0x9e, 0xf1, 0xfc, 0x5d, 0xad, 0x66, 0xdf, 0x11, 0xcb, 0x7a, 0xb0, 0x4b,
-        0x69, 0xe3, 0x12, 0x77, 0x7a, 0xae, 0x8a, 0xdc, 0x5b, 0x9c, 0xf3, 0x2f,
-        0x43, 0x9e, 0x5c, 0xeb, 0xbd, 0x4d, 0x91, 0xf6, 0x42, 0xfc, 0x12, 0xb7,
-        0x09, 0xe0, 0x95, 0x71, 0x95, 0xd3, 0x41, 0x66, 0x80, 0x7c, 0xc5, 0x36,
-        0x98, 0xff, 0xa2, 0x8e, 0xe5, 0x0e, 0xa6, 0x18, 0x27, 0x6a, 0x3f, 0x71,
-        0x87, 0x0a, 0x65, 0xd3, 0x2c, 0xd7, 0x10, 0x1c, 0xde, 0x21, 0xba, 0x0b,
-        0x1d, 0x5e, 0x9c, 0x52, 0xce, 0x37, 0xc7, 0x5c, 0x7c, 0xd7, 0xd8, 0xfb,
-        0x42, 0x8d, 0x6e, 0x12, 0xf9, 0xeb, 0x70, 0xbc, 0xf1, 0x3c, 0xe6, 0xfb,
-        0x12, 0xe6, 0x7b, 0xf9, 0xfb, 0x41, 0x91, 0x57, 0x46, 0x5e, 0xf9, 0x43,
-        0x41, 0xa6, 0x89, 0xf4, 0x47, 0x9a, 0x7b, 0x3d, 0x9f, 0x59, 0xef, 0x63,
-        0x02, 0x6c, 0x67, 0xc1, 0x0b, 0x19, 0xae, 0x25, 0x07, 0xc7, 0x52, 0x37,
-        0x81, 0x17, 0x76, 0xca, 0x9f, 0xc0, 0x16, 0xf8, 0xe3, 0x4a, 0x1a, 0x3c,
-        0xd1, 0x03, 0x1e, 0xe9, 0x06, 0x5f, 0xa4, 0xb4, 0x5d, 0xfc, 0x28, 0x74,
-        0xde, 0xd9, 0x4a, 0xc9, 0xd9, 0x3b, 0x5a, 0x74, 0x72, 0xa3, 0x47, 0x41,
-        0x17, 0xdc, 0x03, 0xab, 0xae, 0xa9, 0x11, 0x37, 0x3e, 0x29, 0xa4, 0xff,
-        0x76, 0xee, 0xed, 0x68, 0x06, 0xae, 0xce, 0x10, 0x57, 0x93, 0x95, 0x2d,
-        0xde, 0x3a, 0xf0, 0x41, 0xb3, 0xe6, 0x83, 0x46, 0x27, 0xe3, 0xdd, 0x64,
-        0xf9, 0x60, 0x04, 0x7c, 0x50, 0x58, 0xc2, 0x07, 0xcf, 0x58, 0x9a, 0x9f,
-        0xae, 0xe2, 0x83, 0x49, 0x9b, 0x36, 0x7e, 0x05, 0x3e, 0xb8, 0xca, 0x4f,
-        0x3e, 0x39, 0x24, 0x27, 0xc0, 0x07, 0x0f, 0x6b, 0x3e, 0xb8, 0x4a, 0xf3,
-        0x01, 0xe3, 0x46, 0xe4, 0x85, 0x56, 0xc8, 0x0e, 0xf2, 0xc2, 0xb3, 0x32,
-        0x0b, 0x5e, 0x78, 0x51, 0xb1, 0xef, 0xcb, 0xb4, 0x0f, 0x46, 0xe9, 0x8f,
-        0x9d, 0x2a, 0x15, 0xc1, 0xbb, 0x4a, 0xbe, 0x30, 0x16, 0x04, 0x33, 0xf0,
-        0xd1, 0x1f, 0x84, 0x0d, 0xef, 0xea, 0x3b, 0x69, 0xa7, 0x61, 0xbb, 0x10,
-        0x36, 0xda, 0xe4, 0xe3, 0x0e, 0xe8, 0xfd, 0xf0, 0x04, 0xc6, 0xb0, 0x47,
-        0xfd, 0x3e, 0xfc, 0x60, 0x0f, 0xf3, 0x4a, 0xdb, 0xfe, 0xb8, 0xe6, 0x9b,
-        0x1a, 0xe8, 0x80, 0x93, 0xdd, 0x8c, 0x33, 0xf9, 0xde, 0x5e, 0xd5, 0x9e,
-        0xef, 0x03, 0xcc, 0x11, 0x75, 0xbf, 0x30, 0xc6, 0xd1, 0xb4, 0xc8, 0xb6,
-        0xa7, 0x5c, 0x18, 0x90, 0xfb, 0x6c, 0x5e, 0x3e, 0xa8, 0x83, 0x1d, 0x5a,
-        0xa7, 0x8c, 0x5d, 0xae, 0xb6, 0x25, 0xbd, 0xdf, 0x80, 0xd0, 0xac, 0x4d,
-        0x9b, 0x3d, 0x81, 0x7d, 0xc5, 0x6a, 0xbb, 0xfe, 0x5e, 0xd8, 0xf5, 0xac,
-        0x23, 0xae, 0xb1, 0xeb, 0xef, 0xb2, 0xbc, 0xc6, 0xdf, 0x9e, 0xb6, 0xf1,
-        0x0f, 0x00, 0xbe, 0x1d, 0x73, 0x36, 0x3e, 0xdb, 0xa0, 0xad, 0x21, 0x72,
-        0x03, 0xec, 0xbc, 0x1b, 0xc1, 0x83, 0x37, 0xc1, 0x8f, 0x7a, 0x77, 0xd1,
-        0x93, 0x9d, 0xc5, 0x66, 0xf8, 0xdb, 0xad, 0xf2, 0xab, 0x63, 0x1b, 0xa5,
-        0x7f, 0xf4, 0x77, 0x9a, 0xa1, 0x57, 0x61, 0x97, 0xbe, 0x08, 0x38, 0x23,
-        0x56, 0x56, 0x47, 0xc1, 0x03, 0xed, 0x89, 0x1f, 0xa8, 0x44, 0xab, 0x91,
-        0xed, 0x3c, 0x4b, 0xbe, 0x5c, 0x3b, 0x31, 0xd4, 0x67, 0x1c, 0xa5, 0x45,
-        0xce, 0x1c, 0xa7, 0xe7, 0x95, 0x80, 0x2d, 0x9e, 0x82, 0x1d, 0xb2, 0x01,
-        0xed, 0x31, 0x96, 0xbc, 0x5a, 0x9e, 0xd9, 0xea, 0xde, 0x9d, 0xd3, 0x7c,
-        0x78, 0xc9, 0xc9, 0x8e, 0xdd, 0x24, 0x85, 0xc1, 0x28, 0xc6, 0xa0, 0x9a,
-        0xd7, 0xca, 0xf5, 0xd2, 0xaf, 0xc7, 0x73, 0x59, 0x0e, 0x42, 0x1f, 0xff,
-        0x69, 0xb1, 0x5f, 0x66, 0x07, 0x9a, 0xf0, 0x1d, 0x95, 0x67, 0x8a, 0x5b,
-        0xe0, 0xef, 0xfc, 0x0a, 0x70, 0x54, 0x8b, 0xef, 0x5a, 0xe9, 0x5d, 0x47,
-        0x5e, 0x6d, 0x90, 0x19, 0xa4, 0xdf, 0x28, 0xbf, 0x64, 0xd3, 0x99, 0x46,
-        0xde, 0x68, 0x40, 0xdd, 0xa8, 0x9c, 0x2f, 0xd2, 0x96, 0xd4, 0x3c, 0xd1,
-        0xf3, 0xb2, 0x6c, 0xc9, 0xbc, 0x0c, 0xdb, 0xf4, 0x59, 0x3c, 0xcf, 0x4b,
-        0x72, 0xe7, 0x6e, 0x67, 0x4b, 0xa2, 0xdd, 0x81, 0xbe, 0xc4, 0xe3, 0x3a,
-        0x5b, 0xbc, 0x5a, 0xe7, 0x5a, 0xdb, 0x46, 0x8d, 0x3c, 0x3f, 0xa8, 0xe2,
-        0x0d, 0x98, 0x93, 0xcd, 0x4e, 0x87, 0x4d, 0xe3, 0xb7, 0xbe, 0x2f, 0x51,
-        0xda, 0xcf, 0xa8, 0x0d, 0xab, 0x44, 0xda, 0x1a, 0x60, 0xe7, 0xec, 0x11,
-        0xd5, 0xdc, 0x20, 0xae, 0xb4, 0x4f, 0xa8, 0x56, 0xa4, 0xf9, 0x36, 0x2d,
-        0xd6, 0x00, 0x9d, 0x80, 0xb4, 0x16, 0xa4, 0x6d, 0xb2, 0x69, 0x4d, 0x0d,
-        0x52, 0x8b, 0xb4, 0xcb, 0x9a, 0xe7, 0x2f, 0x76, 0xf8, 0x5e, 0xce, 0xa9,
-        0x97, 0xb6, 0x53, 0x0d, 0x90, 0x0d, 0xab, 0x65, 0x66, 0x6b, 0x9d, 0xb4,
-        0x21, 0x8f, 0x31, 0xee, 0xd4, 0xa9, 0xa8, 0xbc, 0xf3, 0x54, 0x7b, 0xfc,
-        0xa3, 0x18, 0x43, 0xfb, 0x19, 0xc6, 0xbc, 0xff, 0xac, 0x99, 0x31, 0x9f,
-        0xb6, 0x33, 0x7c, 0xd7, 0x69, 0xf9, 0x43, 0x7c, 0x98, 0x3b, 0xdf, 0x60,
-        0x63, 0x94, 0x8e, 0x3b, 0xc3, 0xa3, 0xd4, 0xdb, 0xed, 0xf6, 0x7e, 0xa2,
-        0xff, 0xd9, 0x4c, 0x5f, 0x6d, 0x82, 0x36, 0x54, 0x89, 0xfc, 0x48, 0xdd,
-        0x83, 0xf7, 0xb8, 0x23, 0x85, 0x79, 0x99, 0x35, 0x45, 0xbe, 0x3a, 0xae,
-        0xb8, 0x4f, 0x05, 0x69, 0x95, 0x77, 0x05, 0x66, 0x8e, 0xc9, 0x0b, 0x46,
-        0x2e, 0xfd, 0x9a, 0x91, 0x4b, 0xa7, 0xcf, 0x2d, 0x90, 0x4b, 0x05, 0x2d,
-        0x97, 0x06, 0x05, 0xef, 0xa9, 0x02, 0xe4, 0xd2, 0x08, 0xbe, 0x3d, 0x2d,
-        0x97, 0x62, 0x62, 0x6d, 0x64, 0x89, 0x5e, 0xc5, 0xfe, 0x27, 0x4b, 0xae,
-        0xb6, 0xa5, 0x0a, 0xe3, 0xb0, 0x43, 0x4a, 0x23, 0x56, 0x67, 0x4b, 0xba,
-        0x49, 0x3a, 0x7a, 0x7e, 0x2a, 0xa1, 0x9d, 0x39, 0xdb, 0xcc, 0x3b, 0x8f,
-        0x5f, 0x54, 0x94, 0x61, 0x27, 0x20, 0xc3, 0x1e, 0xbe, 0x82, 0x0c, 0x43,
-        0x5e, 0x19, 0x79, 0x65, 0xb6, 0xfb, 0xdd, 0x9f, 0x0e, 0x79, 0x94, 0x1f,
-        0x94, 0x19, 0x90, 0x49, 0x25, 0xc8, 0xa4, 0x12, 0xe4, 0x54, 0x09, 0x72,
-        0xa9, 0x04, 0xb9, 0x54, 0x82, 0x5c, 0x2a, 0x41, 0x2e, 0x41, 0xc6, 0x3d,
-        0x0a, 0x19, 0x67, 0x64, 0xda, 0x00, 0xed, 0x35, 0xb9, 0xcf, 0xea, 0x77,
-        0x13, 0x27, 0xe9, 0xb2, 0x7e, 0x91, 0xd9, 0xb3, 0x7a, 0xae, 0x2a, 0x2e,
-        0xb8, 0xeb, 0x88, 0xe6, 0x77, 0xcf, 0x57, 0xd7, 0x3a, 0xdc, 0x1f, 0xf3,
-        0x03, 0xed, 0xb3, 0x6f, 0xe6, 0x6f, 0xa9, 0x03, 0x5f, 0xbf, 0x62, 0xf9,
-        0x7a, 0xf3, 0x1c, 0x5f, 0x27, 0x1d, 0xc6, 0x89, 0x97, 0xe7, 0xeb, 0x16,
-        0x9b, 0x97, 0x0f, 0x56, 0x80, 0xaf, 0x57, 0x2c, 0xe2, 0xeb, 0x28, 0xf8,
-        0x7a, 0xe7, 0x12, 0xbe, 0x5e, 0xe5, 0xf4, 0xea, 0x3a, 0x3c, 0x83, 0xc6,
-        0xef, 0x5a, 0x67, 0x9e, 0xaf, 0xf7, 0x6b, 0xbe, 0x3e, 0x04, 0xbe, 0xbe,
-        0xbe, 0x8a, 0xaf, 0x77, 0x4a, 0xf2, 0x96, 0x6c, 0x64, 0xa3, 0xec, 0xbe,
-        0x5f, 0x35, 0xaf, 0x91, 0x7f, 0x11, 0x53, 0xdf, 0xf0, 0x58, 0xef, 0x58,
-        0xb3, 0xe4, 0x1e, 0xfa, 0x11, 0xd7, 0x06, 0xc8, 0x23, 0x43, 0x19, 0xc7,
-        0x93, 0x83, 0x47, 0x7e, 0x20, 0xd3, 0x9a, 0xb7, 0x44, 0xf6, 0x1c, 0x89,
-        0xca, 0xf0, 0x11, 0xc6, 0x1e, 0xbe, 0x63, 0xe9, 0xbd, 0x4e, 0x86, 0x07,
-        0xb9, 0x5f, 0xd2, 0x95, 0xdd, 0x47, 0xe0, 0x63, 0x1d, 0x61, 0xec, 0xe1,
-        0xf2, 0x1c, 0x8f, 0x4d, 0x43, 0xb6, 0xec, 0x3e, 0xa2, 0xe7, 0x1a, 0xed,
-        0x34, 0xc8, 0xa1, 0x23, 0x22, 0xb7, 0x1d, 0x71, 0xe5, 0xf6, 0x23, 0x73,
-        0xbc, 0x36, 0x10, 0xf2, 0xda, 0x9f, 0x83, 0xd7, 0xda, 0x2d, 0xaf, 0xa9,
-        0x39, 0x5e, 0xfb, 0x5a, 0x15, 0xaf, 0xb1, 0x3e, 0x79, 0xed, 0x82, 0x4d,
-        0xe3, 0xb7, 0x2b, 0x7b, 0x8f, 0xb4, 0xca, 0xee, 0x87, 0xde, 0x22, 0x7b,
-        0xee, 0x27, 0xac, 0xe6, 0x9e, 0x3c, 0xda, 0x5f, 0xe3, 0x95, 0x76, 0xb4,
-        0x1f, 0xee, 0x0f, 0xd2, 0x77, 0x65, 0x75, 0x4e, 0x48, 0x32, 0xcf, 0xfe,
-        0x6a, 0xe1, 0x3b, 0x9f, 0x82, 0x4f, 0xb1, 0x17, 0x30, 0xdd, 0x7a, 0x44,
-        0x92, 0xae, 0xbc, 0x26, 0x23, 0xa9, 0x47, 0x5b, 0x8d, 0x3d, 0x71, 0x09,
-        0xbc, 0x42, 0xfa, 0xcf, 0x48, 0xee, 0xed, 0x81, 0xf6, 0x2b, 0x46, 0xcb,
-        0x42, 0xff, 0x9f, 0x31, 0x73, 0xc7, 0xdc, 0x77, 0xc7, 0xf3, 0xbe, 0x35,
-        0xfa, 0xbc, 0x9b, 0x8e, 0xd7, 0x76, 0x33, 0xbf, 0x46, 0xef, 0x37, 0xcd,
-        0xe9, 0xb3, 0xdc, 0xac, 0xcf, 0x76, 0x62, 0x3a, 0x9e, 0x5e, 0x28, 0xf3,
-        0x8e, 0x30, 0xde, 0xbd, 0xcc, 0xbb, 0x06, 0xff, 0xf8, 0x2a, 0x13, 0x9b,
-        0x25, 0xdf, 0x7d, 0xdd, 0xc9, 0x15, 0x2f, 0xe9, 0x7d, 0x85, 0x59, 0x1f,
-        0xbf, 0xcb, 0xfc, 0x66, 0xf9, 0x4b, 0x8c, 0x71, 0x24, 0x12, 0xea, 0x81,
-        0x56, 0xee, 0x3b, 0x18, 0x9c, 0x32, 0x76, 0x94, 0xe1, 0xd1, 0x06, 0xed,
-        0x6b, 0x8c, 0xe0, 0x7b, 0xf7, 0x68, 0xa3, 0x53, 0xa0, 0x6d, 0x32, 0xd0,
-        0xe0, 0xe4, 0xc7, 0xf7, 0xb4, 0x1a, 0x9b, 0x79, 0x20, 0xce, 0x3d, 0x85,
-        0x19, 0xb5, 0x54, 0x26, 0x9f, 0x92, 0x50, 0x26, 0x27, 0x6f, 0xc9, 0xc0,
-        0xb6, 0xce, 0x1d, 0xd1, 0xf7, 0xf7, 0x25, 0xda, 0x15, 0xc7, 0xf4, 0x09,
-        0xc8, 0xd7, 0x90, 0x16, 0xe2, 0xf2, 0xf1, 0x23, 0xa4, 0x07, 0x15, 0x6b,
-        0x94, 0xdf, 0xb2, 0xf4, 0x70, 0x59, 0x8a, 0x90, 0x3b, 0x47, 0x8e, 0xdc,
-        0x2e, 0xe3, 0xbb, 0x16, 0xd3, 0xc3, 0x9e, 0x79, 0x7a, 0x88, 0xc1, 0x3e,
-        0x73, 0xaa, 0xe9, 0xe1, 0x37, 0xe7, 0xe8, 0x61, 0xdc, 0xf9, 0xd7, 0xd2,
-        0xc3, 0x0d, 0x0b, 0xe8, 0x61, 0x44, 0xd3, 0x43, 0xff, 0x1c, 0x3d, 0x8c,
-        0x1c, 0x61, 0xbf, 0x7a, 0x5d, 0xd4, 0x9b, 0x71, 0x38, 0xe7, 0x73, 0xb4,
-        0x90, 0x18, 0xd6, 0xfb, 0x44, 0x93, 0x79, 0x9e, 0x25, 0x5d, 0xa5, 0x18,
-        0x1b, 0x99, 0x9f, 0xff, 0xc6, 0x7f, 0xd3, 0xf9, 0x7f, 0x47, 0xfc, 0xff,
-        0xef, 0xfc, 0x5f, 0x8f, 0xf6, 0x29, 0x8b, 0x43, 0x79, 0x1c, 0xd2, 0xc3,
-        0x7b, 0xe2, 0x46, 0x2f, 0x70, 0x8e, 0xf9, 0x6d, 0xf6, 0xac, 0x9f, 0x83,
-        0xfc, 0x7b, 0x1c, 0xf2, 0xef, 0xb1, 0x05, 0xeb, 0x01, 0x3d, 0x36, 0x06,
-        0x11, 0xc8, 0xc1, 0xd4, 0x3c, 0x3e, 0x66, 0xba, 0x89, 0x0f, 0xb3, 0xf7,
-        0xe4, 0x6c, 0x65, 0x31, 0x4e, 0x5c, 0xbd, 0xdf, 0xe8, 0x64, 0xaa, 0x1a,
-        0x27, 0x84, 0x7b, 0xb6, 0x6a, 0x8c, 0xf8, 0x5d, 0xe6, 0xf7, 0x65, 0xbd,
-        0x87, 0xa4, 0xa0, 0xd7, 0x9f, 0x88, 0x17, 0xae, 0x3f, 0x11, 0x27, 0xae,
-        0xb6, 0xf7, 0x0b, 0xe5, 0x3a, 0xbd, 0x2f, 0xfc, 0xc0, 0x54, 0x4c, 0x66,
-        0x62, 0x8c, 0xeb, 0xf1, 0xde, 0x57, 0xfa, 0xca, 0x7e, 0xbc, 0x20, 0x79,
-        0x7b, 0xd6, 0x67, 0x95, 0xa5, 0x6d, 0xc6, 0x03, 0x79, 0x27, 0x42, 0xb8,
-        0x0e, 0xd1, 0x69, 0x65, 0x5d, 0x43, 0x55, 0x9c, 0x12, 0x78, 0x1f, 0x93,
-        0x44, 0xb6, 0x1b, 0xef, 0x29, 0xf6, 0xfd, 0xa4, 0x8c, 0x3c, 0x58, 0x86,
-        0x2d, 0xf7, 0x30, 0x74, 0x8e, 0x23, 0x10, 0x93, 0xfa, 0x2e, 0x14, 0xc2,
-        0x30, 0xa1, 0xef, 0xf5, 0xa3, 0xdf, 0x47, 0x7a, 0x88, 0xe3, 0xfb, 0xb2,
-        0x8d, 0x25, 0xc5, 0xa5, 0x50, 0xfc, 0x01, 0xe0, 0xe7, 0x1d, 0x94, 0x3f,
-        0xc2, 0xfb, 0x8d, 0xe6, 0xc3, 0xf8, 0x21, 0x03, 0xfa, 0xcd, 0xb9, 0x79,
-        0xcd, 0xc9, 0x94, 0xcd, 0xfe, 0x96, 0xaa, 0xfb, 0xf5, 0xe5, 0xb0, 0xb6,
-        0x9f, 0xd3, 0x76, 0x5f, 0x0b, 0xcf, 0xe7, 0x19, 0x1b, 0xfa, 0xcb, 0xb0,
-        0xa1, 0x9f, 0xa8, 0x64, 0xf4, 0x1a, 0xd6, 0x63, 0xb0, 0xa1, 0x1f, 0x85,
-        0xee, 0xa1, 0xce, 0x89, 0x59, 0x9d, 0x33, 0xa2, 0x76, 0x69, 0x9d, 0xf3,
-        0xd7, 0x5a, 0xe7, 0xfc, 0xea, 0x12, 0x9d, 0x73, 0x48, 0xb5, 0x8f, 0x52,
-        0xe7, 0xf4, 0xaa, 0x9d, 0x0e, 0xed, 0xc5, 0xb5, 0xcb, 0xe8, 0x9c, 0xf7,
-        0xca, 0xaf, 0xd8, 0xbc, 0xfd, 0xf2, 0xbe, 0x6d, 0x7a, 0xdd, 0xc6, 0x9b,
-        0x50, 0xbc, 0xcb, 0xce, 0xe8, 0xa0, 0xeb, 0x55, 0xa7, 0x5e, 0xef, 0xfd,
-        0x6a, 0x95, 0xce, 0x69, 0x53, 0xdd, 0x4e, 0xaf, 0xae, 0xc3, 0x78, 0x04,
-        0xbf, 0x53, 0x4e, 0x66, 0xa0, 0x0e, 0xdf, 0x71, 0x89, 0x1c, 0xc1, 0xd8,
-        0xcd, 0x7d, 0x7b, 0xca, 0xe4, 0x5d, 0x63, 0xf3, 0x54, 0x98, 0xee, 0x9a,
-        0xf4, 0x76, 0x9b, 0x6e, 0x74, 0x55, 0x9b, 0x6a, 0xd5, 0xba, 0x6a, 0x33,
-        0x18, 0x6a, 0x02, 0xfa, 0x75, 0xa2, 0x14, 0xea, 0x2c, 0xfe, 0x66, 0xbc,
-        0x99, 0x71, 0x89, 0x30, 0x6e, 0x9d, 0x40, 0x19, 0x3c, 0xa5, 0xd0, 0xa6,
-        0xe4, 0x6f, 0xf8, 0x0a, 0x78, 0xa6, 0x80, 0xd7, 0x5b, 0xc0, 0x3f, 0xbf,
-        0x5e, 0x64, 0xdc, 0xb3, 0x59, 0x8e, 0x8e, 0x55, 0xe7, 0xb5, 0xca, 0xbb,
-        0xc7, 0x36, 0xc8, 0xbe, 0x51, 0xff, 0x6a, 0xa9, 0xdf, 0x28, 0x23, 0xa3,
-        0x2f, 0xea, 0xfb, 0x40, 0xd6, 0xe8, 0x7b, 0x92, 0x78, 0x7f, 0x98, 0x91,
-        0x91, 0xfd, 0x8e, 0x91, 0x91, 0x19, 0x35, 0x6f, 0xb3, 0x86, 0x6d, 0xf2,
-        0x6e, 0xa6, 0xbe, 0xd1, 0xb8, 0xbe, 0x43, 0x7a, 0xa2, 0x72, 0xad, 0xfc,
-        0xd1, 0x71, 0x75, 0xa7, 0x9a, 0xbf, 0x4b, 0x41, 0xdb, 0xac, 0x93, 0x0b,
-        0x6c, 0xd6, 0xbf, 0x97, 0x99, 0xf7, 0x45, 0x31, 0x4e, 0xd0, 0xf0, 0x75,
-        0x2f, 0x73, 0x1d, 0xb4, 0x39, 0x26, 0x97, 0xa4, 0x4f, 0xe3, 0x8f, 0xf2,
-        0xb4, 0x01, 0x72, 0x70, 0x56, 0xeb, 0xd7, 0xb5, 0xbc, 0xf3, 0xf8, 0x08,
-        0x6d, 0xd7, 0xaf, 0x6b, 0x79, 0xb6, 0xd6, 0xda, 0xae, 0xd3, 0x90, 0xd3,
-        0x94, 0xa3, 0x37, 0xca, 0x5f, 0xdb, 0x74, 0xa6, 0x25, 0xe3, 0xb3, 0x42,
-        0x7d, 0x17, 0x83, 0x0c, 0xa5, 0x3c, 0xfd, 0x59, 0x6d, 0xd7, 0xe7, 0x6c,
-        0x1b, 0x94, 0x9f, 0x46, 0x76, 0x6f, 0x76, 0xa6, 0x6d, 0x1a, 0xbf, 0xc3,
-        0x18, 0xba, 0x9f, 0xc9, 0x59, 0x3e, 0x53, 0xce, 0x93, 0xc8, 0x5f, 0x83,
-        0x7c, 0xf2, 0xd9, 0x63, 0x9a, 0xcf, 0xb4, 0x7d, 0xe2, 0x74, 0xd9, 0x35,
-        0x85, 0xb9, 0xf5, 0x80, 0x3c, 0xf9, 0x4c, 0x1d, 0xf5, 0xa6, 0x8d, 0x3c,
-        0xf0, 0x90, 0xfe, 0x45, 0xe8, 0x0e, 0xd6, 0x45, 0xfa, 0xb1, 0x0c, 0xe6,
-        0xf0, 0x24, 0xfc, 0x9f, 0x46, 0x7c, 0x37, 0xe3, 0x7b, 0x42, 0x7e, 0x75,
-        0x30, 0xaa, 0xc7, 0x3d, 0x82, 0x71, 0x1c, 0x38, 0x82, 0x31, 0x39, 0xc6,
-        0x76, 0x76, 0xcf, 0xb8, 0x52, 0x73, 0x86, 0x7c, 0xc7, 0x33, 0x86, 0x41,
-        0xb0, 0xb7, 0x8b, 0x74, 0x9b, 0xf4, 0xfa, 0xf5, 0xf9, 0xb7, 0xcd, 0xf1,
-        0x08, 0x70, 0x72, 0x00, 0xf3, 0x31, 0x52, 0xf4, 0xbd, 0xac, 0xe3, 0xc7,
-        0x31, 0x4e, 0xd8, 0x80, 0xed, 0xb0, 0x05, 0xdb, 0x61, 0x07, 0xb6, 0xc3,
-        0x0e, 0x5c, 0x2d, 0xa7, 0xb6, 0x72, 0x7f, 0x49, 0xfe, 0x9d, 0xbc, 0x77,
-        0xf9, 0x1b, 0x3a, 0x36, 0x5f, 0x7b, 0x4b, 0x1f, 0x7c, 0x76, 0xf1, 0x92,
-        0x03, 0xdc, 0x63, 0x3f, 0xeb, 0xd5, 0xde, 0xd2, 0x2f, 0xed, 0x3d, 0xc8,
-        0xef, 0xb9, 0x24, 0x1d, 0xb7, 0x7c, 0xd8, 0xa9, 0x1d, 0xe8, 0x03, 0x1e,
-        0x33, 0x4e, 0x32, 0x3e, 0xe4, 0x30, 0x4e, 0x91, 0xdd, 0x1c, 0xd1, 0x67,
-        0xc4, 0xa6, 0x19, 0x8b, 0xb8, 0xa5, 0x3d, 0xb2, 0x25, 0xb1, 0xdb, 0x49,
-        0x0e, 0xa8, 0x48, 0x72, 0xa0, 0xcf, 0x09, 0xcb, 0xf1, 0x0e, 0x6a, 0xc8,
-        0x19, 0xc0, 0x7a, 0xa0, 0xf4, 0x75, 0xd0, 0xd3, 0x79, 0x29, 0x1c, 0x6f,
-        0x90, 0xa9, 0x62, 0xbb, 0x97, 0x55, 0x31, 0xe1, 0xbe, 0x12, 0x75, 0x0a,
-        0x44, 0x7f, 0x26, 0x2a, 0x13, 0xa3, 0x1b, 0x45, 0x69, 0xdb, 0xbd, 0x45,
-        0xb2, 0x63, 0xa3, 0x72, 0xbe, 0x5b, 0x9a, 0x14, 0xda, 0xe7, 0xdd, 0xde,
-        0xea, 0x14, 0xd7, 0x11, 0x43, 0x5e, 0x58, 0x4f, 0x3e, 0x19, 0x05, 0x0e,
-        0x41, 0xb7, 0x8c, 0xeb, 0xd6, 0x09, 0xe5, 0xde, 0xed, 0x3a, 0x66, 0xca,
-        0x38, 0x6d, 0xf5, 0x7a, 0x03, 0xf9, 0x23, 0xba, 0x2c, 0x7f, 0x4c, 0x96,
-        0xb8, 0x36, 0x23, 0x79, 0x97, 0x71, 0x61, 0x1f, 0xbf, 0xc7, 0x59, 0xb6,
-        0x4e, 0x46, 0xba, 0xf3, 0x76, 0x8f, 0xc7, 0x37, 0xc1, 0x07, 0x1c, 0x9f,
-        0x5e, 0x27, 0x01, 0xaf, 0x2f, 0x5e, 0xcf, 0x88, 0x56, 0xc9, 0x03, 0x47,
-        0x66, 0x46, 0xc3, 0xf5, 0x0f, 0xb6, 0x87, 0xef, 0x71, 0x23, 0x6f, 0xb3,
-        0x4b, 0xea, 0x11, 0x2e, 0xae, 0x55, 0x2e, 0x94, 0xb1, 0x4a, 0x9f, 0x13,
-        0xf6, 0xb4, 0x7c, 0x3d, 0x5d, 0x31, 0xb2, 0x75, 0xbc, 0x12, 0xea, 0x96,
-        0xa8, 0xd1, 0xa5, 0x4b, 0xf4, 0x89, 0x89, 0x60, 0xce, 0xeb, 0x93, 0x4b,
-        0x3a, 0x46, 0xf7, 0x6b, 0x53, 0x2d, 0xe2, 0x1e, 0x93, 0xd9, 0x11, 0xff,
-        0x54, 0x2b, 0xf7, 0x69, 0x8c, 0xa4, 0xde, 0x8c, 0x7e, 0x8c, 0xb5, 0x50,
-        0x1f, 0x0e, 0xa9, 0xb5, 0x78, 0xaf, 0xd1, 0xf4, 0x07, 0x9e, 0xc2, 0xb7,
-        0xf1, 0x13, 0xbe, 0x0c, 0x3f, 0xe1, 0x09, 0xe8, 0xba, 0x73, 0xf0, 0x13,
-        0x1e, 0x87, 0x9f, 0xf0, 0x18, 0xfc, 0x84, 0x47, 0xa1, 0x27, 0xab, 0xfd,
-        0x83, 0xe1, 0x05, 0xfe, 0x41, 0xa0, 0xf9, 0x9f, 0x31, 0xc0, 0xc7, 0xab,
-        0x7c, 0x83, 0xbd, 0x46, 0x5f, 0xc1, 0xef, 0x37, 0x7c, 0xd4, 0xa6, 0x6e,
-        0xd6, 0xfa, 0xd1, 0xec, 0xd9, 0x1d, 0x98, 0xd3, 0x57, 0x6d, 0xca, 0xe8,
-        0xab, 0x89, 0x79, 0x7d, 0x65, 0xf8, 0xe8, 0xd8, 0xa8, 0x44, 0xfc, 0xd1,
-        0xe9, 0x6c, 0x6a, 0xbb, 0xe6, 0xa1, 0x26, 0x7f, 0xa3, 0x44, 0x1e, 0x50,
-        0xcd, 0x35, 0x92, 0xb5, 0xdf, 0xa0, 0xaf, 0xa3, 0x5f, 0x47, 0x5b, 0xef,
-        0x94, 0x9c, 0xb6, 0xcf, 0xae, 0x8c, 0xef, 0x47, 0x17, 0xe1, 0xbb, 0x50,
-        0x7a, 0x56, 0xe3, 0xfc, 0x7e, 0x7d, 0x26, 0xbf, 0x41, 0x86, 0xcb, 0x21,
-        0xce, 0x79, 0x06, 0x8e, 0xfb, 0x30, 0x5a, 0x25, 0x72, 0xac, 0x45, 0xfa,
-        0x53, 0xa2, 0x72, 0xa9, 0x95, 0x7a, 0xff, 0xca, 0xa9, 0x6e, 0x89, 0xe7,
-        0xba, 0x49, 0xab, 0xf7, 0xc9, 0x84, 0x9e, 0x8b, 0x16, 0xa9, 0x39, 0x46,
-        0x1b, 0x25, 0x5c, 0xc3, 0xbb, 0xbd, 0xc5, 0xde, 0x41, 0x1d, 0x35, 0xe5,
-        0x44, 0x0e, 0xea, 0xf9, 0x9a, 0xd5, 0x7b, 0x0c, 0x6f, 0x9e, 0x62, 0x2c,
-        0x9e, 0xf7, 0xfd, 0x31, 0x0e, 0xff, 0xaf, 0x99, 0xbf, 0x42, 0x8b, 0xb1,
-        0x67, 0xd6, 0x58, 0x3b, 0xc6, 0xc4, 0xa9, 0x96, 0xb7, 0x61, 0xd8, 0x4e,
-        0xf5, 0x1d, 0xb5, 0xab, 0xe0, 0x03, 0x37, 0xa0, 0x4d, 0xae, 0x63, 0xdb,
-        0xbf, 0x17, 0xe4, 0xfd, 0xb3, 0x73, 0xc0, 0x5f, 0x85, 0xb4, 0x06, 0xe4,
-        0x31, 0x66, 0xf3, 0x85, 0x16, 0xc6, 0x65, 0xb3, 0x7e, 0xa3, 0x4d, 0x5b,
-        0xe5, 0x8c, 0x8c, 0xb6, 0xc3, 0x37, 0xe7, 0x39, 0x76, 0xe6, 0xf7, 0x73,
-        0xee, 0x84, 0x7f, 0xab, 0x69, 0x12, 0xf2, 0x67, 0x8f, 0x5c, 0x6b, 0xe3,
-        0xce, 0xd4, 0xc3, 0xbf, 0xb8, 0x60, 0xbd, 0xf6, 0x10, 0xf4, 0xd8, 0xad,
-        0x90, 0x47, 0xd4, 0xc3, 0x87, 0xe4, 0x17, 0x2c, 0x3d, 0x2f, 0xd4, 0xc3,
-        0x17, 0x85, 0xb1, 0xe1, 0x2e, 0xe4, 0xe5, 0x83, 0x28, 0xe8, 0xe1, 0x70,
-        0x95, 0xaf, 0x46, 0xbf, 0xaf, 0x2e, 0x6d, 0xd6, 0xc0, 0x16, 0xfa, 0x7d,
-        0x90, 0x03, 0xb1, 0xd0, 0xcf, 0xab, 0x9d, 0x5b, 0xa3, 0xdd, 0x69, 0xeb,
-        0x8e, 0xa4, 0x5e, 0x22, 0x8e, 0x12, 0x87, 0xe4, 0xf6, 0xf5, 0xbc, 0x26,
-        0xcf, 0xf5, 0xbf, 0xa5, 0x71, 0x26, 0x8a, 0xb4, 0xb7, 0x46, 0xc3, 0x68,
-        0xe5, 0x7c, 0x22, 0xdc, 0xbf, 0x51, 0xb0, 0x75, 0xf7, 0xd8, 0xf5, 0xf8,
-        0x82, 0x7c, 0x9b, 0x71, 0xce, 0x44, 0x5f, 0x64, 0x25, 0xcf, 0x64, 0xa3,
-        0xee, 0xed, 0xda, 0x6f, 0xcf, 0x48, 0xd8, 0x16, 0xbf, 0x6b, 0xaa, 0xda,
-        0xa6, 0x1d, 0xc5, 0xf7, 0xe2, 0xfb, 0x1b, 0x9e, 0xd7, 0x6b, 0x8b, 0xe6,
-        0x6e, 0x9a, 0x90, 0x4f, 0xc8, 0x3b, 0x09, 0x7d, 0x8e, 0xc9, 0x3f, 0x46,
-        0xbb, 0x87, 0xeb, 0xae, 0xde, 0xf4, 0x70, 0xea, 0x23, 0xfa, 0x0e, 0xd5,
-        0x71, 0x11, 0xa7, 0x90, 0xda, 0xab, 0xf7, 0x9d, 0x14, 0x74, 0x7c, 0x39,
-        0x8f, 0xf7, 0xbc, 0x8f, 0xda, 0x76, 0x8c, 0x7f, 0x0b, 0x88, 0x69, 0x1f,
-        0x04, 0x6c, 0xd4, 0x21, 0x94, 0xbd, 0x31, 0x69, 0x3b, 0xfa, 0x7e, 0xcd,
-        0x0b, 0x6b, 0xe1, 0x0b, 0xf4, 0x1e, 0x85, 0xae, 0x3e, 0x1a, 0x97, 0xfe,
-        0xa3, 0x5a, 0x37, 0x66, 0x96, 0xc6, 0x0a, 0xb6, 0x78, 0x2e, 0xfd, 0x89,
-        0x98, 0x27, 0xd7, 0x1c, 0x8d, 0xc8, 0xe1, 0xd8, 0x16, 0xaf, 0xc3, 0xb9,
-        0xd1, 0xea, 0x42, 0x43, 0x7f, 0xa0, 0x15, 0xd4, 0x37, 0xeb, 0x90, 0xbd,
-        0xf3, 0xb1, 0x6b, 0xd4, 0x7f, 0x49, 0x46, 0xc8, 0x4b, 0x95, 0x88, 0x8c,
-        0x0f, 0xb6, 0x02, 0x9e, 0xb7, 0xae, 0x07, 0x0e, 0x40, 0x53, 0x98, 0x1f,
-        0xfd, 0xf7, 0x3c, 0xdc, 0x38, 0xe5, 0x57, 0x1b, 0xfa, 0xef, 0x3b, 0x4a,
-        0x1d, 0xe6, 0x6b, 0xbe, 0x46, 0xbf, 0x5e, 0x8d, 0xf6, 0x3d, 0xc8, 0x8b,
-        0x6f, 0x11, 0xff, 0x01, 0xc8, 0xb5, 0xa3, 0x51, 0xe9, 0x38, 0xda, 0x20,
-        0x9b, 0x8e, 0xd2, 0xf7, 0xa8, 0xf6, 0x45, 0x69, 0x8b, 0x5e, 0xc2, 0xb8,
-        0x6e, 0x34, 0xf7, 0x0d, 0x4e, 0x45, 0x65, 0x1f, 0xf9, 0x15, 0x65, 0x73,
-        0xb0, 0x93, 0xb3, 0x47, 0x3d, 0xbd, 0x16, 0x9a, 0xc5, 0x38, 0xf9, 0x37,
-        0x2c, 0xfa, 0x8e, 0x1a, 0x39, 0x53, 0xa0, 0x6f, 0x32, 0xd0, 0x02, 0xbc,
-        0x3e, 0x60, 0xf9, 0xe5, 0x3d, 0xeb, 0x2d, 0x5f, 0xfe, 0x9c, 0xfc, 0x96,
-        0x5b, 0x6f, 0xe4, 0xe5, 0x87, 0xd6, 0x73, 0x2f, 0xd2, 0x5a, 0x9f, 0xef,
-        0x3a, 0x6d, 0x43, 0x18, 0xb9, 0xf9, 0x7a, 0xfc, 0x27, 0xc0, 0x51, 0xb8,
-        0xfe, 0x44, 0x3e, 0xe4, 0x1a, 0xb2, 0x3e, 0xb3, 0x92, 0x9a, 0xd1, 0x7f,
-        0x53, 0x89, 0x6b, 0x61, 0xf3, 0xf7, 0x59, 0x6d, 0xaf, 0x30, 0x36, 0xfe,
-        0x4c, 0xf8, 0x37, 0x9c, 0xaa, 0xf6, 0x19, 0x56, 0xaf, 0x75, 0x31, 0xbe,
-        0x34, 0xb7, 0x17, 0x28, 0x18, 0xd5, 0x77, 0xc2, 0xc5, 0x9c, 0x8b, 0xc5,
-        0x5a, 0xe7, 0x9b, 0x63, 0x12, 0xb8, 0x7e, 0xdc, 0xf9, 0x96, 0xcf, 0xb5,
-        0x71, 0xcf, 0x79, 0xb9, 0xe8, 0x83, 0xf7, 0xfe, 0x02, 0xe3, 0x68, 0x75,
-        0x5e, 0xc1, 0x9c, 0x1e, 0x2c, 0x65, 0x92, 0x9e, 0x8d, 0x83, 0x3f, 0x5b,
-        0x6c, 0x75, 0x9e, 0x9b, 0x8f, 0x21, 0xf5, 0x84, 0x74, 0x71, 0x88, 0x79,
-        0x65, 0xe4, 0x95, 0x19, 0xeb, 0xad, 0x77, 0x26, 0xc7, 0xec, 0x7e, 0x12,
-        0xa3, 0x8b, 0xe6, 0xd6, 0x5f, 0x06, 0xf4, 0xfa, 0x84, 0xeb, 0x4c, 0x4e,
-        0x4d, 0xaf, 0x37, 0xfb, 0x8a, 0x6a, 0x91, 0x67, 0xf6, 0x58, 0x4e, 0x4c,
-        0xd5, 0xa2, 0x4c, 0xbd, 0x33, 0xa1, 0x63, 0x5e, 0xda, 0xf6, 0x70, 0xc6,
-        0xa7, 0xea, 0x9d, 0x29, 0xbd, 0xd6, 0x1c, 0x75, 0x4e, 0x8e, 0xb1, 0xed,
-        0x28, 0xca, 0x88, 0x73, 0x0a, 0xed, 0x4d, 0x8d, 0xb5, 0xc7, 0xf7, 0x49,
-        0x3b, 0x6c, 0x01, 0xfe, 0x8d, 0x34, 0xde, 0x17, 0xe0, 0x3a, 0x53, 0x73,
-        0xed, 0x2a, 0xb4, 0xc3, 0xb2, 0xa4, 0x41, 0xf6, 0xeb, 0xa2, 0xfd, 0xa5,
-        0x6b, 0x52, 0x4b, 0x71, 0x32, 0x06, 0x9c, 0x1c, 0xb4, 0x38, 0x39, 0x61,
-        0x71, 0x32, 0x5a, 0x85, 0x93, 0x87, 0x17, 0xe1, 0xe4, 0x04, 0x70, 0xf2,
-        0xf0, 0x15, 0x70, 0x82, 0xbc, 0xf2, 0xc3, 0x16, 0x27, 0xf7, 0x2d, 0xc2,
-        0x49, 0x7e, 0x2e, 0x16, 0x6f, 0x70, 0x32, 0x02, 0x9c, 0xd4, 0xb4, 0x1a,
-        0xd8, 0x0f, 0x5a, 0x9c, 0xe0, 0x3d, 0x75, 0x10, 0x65, 0xee, 0xab, 0xc2,
-        0xc9, 0x41, 0xe0, 0xe4, 0x3e, 0x8b, 0x93, 0xc3, 0x16, 0x27, 0x87, 0x51,
-        0x26, 0x0f, 0x9c, 0x14, 0x96, 0xc1, 0xc9, 0x08, 0x70, 0x12, 0xb6, 0x5b,
-        0x40, 0x3b, 0x87, 0xab, 0x70, 0x32, 0xb2, 0x0c, 0x4e, 0xb8, 0xe6, 0x1a,
-        0xee, 0xe1, 0xbe, 0xfc, 0x06, 0x7b, 0xb8, 0x53, 0x9f, 0x7d, 0xe3, 0x3d,
-        0xdc, 0x2c, 0x73, 0xb9, 0xea, 0xcc, 0xfb, 0xb3, 0x76, 0x4f, 0x9a, 0xd9,
-        0xfb, 0x37, 0x7f, 0x0f, 0x5e, 0x3b, 0xf8, 0xbc, 0x90, 0xf7, 0xc4, 0xec,
-        0x21, 0x75, 0xb7, 0x4d, 0x81, 0xd7, 0x8e, 0xca, 0x81, 0xe3, 0xb5, 0x87,
-        0x73, 0x36, 0xcd, 0xdf, 0xd6, 0x9e, 0x57, 0x8a, 0x79, 0xe1, 0xde, 0x83,
-        0x17, 0xcd, 0x5d, 0x50, 0x31, 0x9e, 0xc7, 0xa8, 0x5e, 0x7b, 0x7e, 0xd1,
-        0xde, 0x55, 0xe4, 0xdd, 0x9b, 0xf5, 0xa7, 0x13, 0xdc, 0x57, 0x55, 0xd0,
-        0xf0, 0x72, 0x2d, 0xad, 0x47, 0xef, 0xa5, 0xca, 0x16, 0x69, 0x67, 0x27,
-        0xb8, 0x27, 0x0d, 0xf6, 0x31, 0xf7, 0xed, 0x9a, 0x7d, 0xba, 0xbd, 0x0b,
-        0xf6, 0xe9, 0x56, 0x9f, 0xef, 0x26, 0xdf, 0xcd, 0xd3, 0xcd, 0xc1, 0xb9,
-        0xbb, 0x57, 0x8f, 0x3b, 0xcf, 0xe8, 0xf8, 0x70, 0x3d, 0xe6, 0x27, 0x08,
-        0x4e, 0xa7, 0x4c, 0x5c, 0x76, 0x46, 0xc7, 0x65, 0x05, 0x1e, 0xf8, 0xb0,
-        0x8d, 0xcd, 0x76, 0xf4, 0x5c, 0x9e, 0x8b, 0xcb, 0x2e, 0xd8, 0xa3, 0xa3,
-        0xef, 0xff, 0xc8, 0x8e, 0x5e, 0xd2, 0x7b, 0x71, 0xfa, 0x52, 0x8e, 0x14,
-        0x20, 0x23, 0xf6, 0x8c, 0xbf, 0x2a, 0xc3, 0x0f, 0xf2, 0x9b, 0x3a, 0x2d,
-        0x02, 0xbd, 0x45, 0xb9, 0x9d, 0x97, 0x6c, 0x0f, 0xd3, 0x4c, 0x9d, 0x3e,
-        0xed, 0x23, 0x1f, 0x77, 0x7a, 0xe7, 0xfa, 0x27, 0x7e, 0xc3, 0x35, 0x70,
-        0xfe, 0xa6, 0x9d, 0x93, 0x71, 0xb2, 0x15, 0xe6, 0x87, 0x6b, 0xe1, 0x77,
-        0xdb, 0xfb, 0x08, 0x99, 0x5f, 0x7d, 0xff, 0xb5, 0xe1, 0xd3, 0xac, 0xfe,
-        0x3b, 0x22, 0x23, 0x4e, 0x1f, 0xea, 0x4c, 0x7b, 0x0d, 0x03, 0x2a, 0x7d,
-        0xd3, 0x00, 0xcf, 0xca, 0x4d, 0x2c, 0xf9, 0xfb, 0x01, 0xf3, 0xba, 0xb0,
-        0xa0, 0xe7, 0x94, 0xfb, 0xb0, 0xa6, 0x41, 0x8b, 0x9a, 0xb6, 0x34, 0xfd,
-        0x1f, 0x98, 0xd3, 0x91, 0xd4, 0xad, 0xd4, 0x93, 0xa1, 0x8e, 0x4c, 0xc6,
-        0xfb, 0x78, 0x7f, 0x84, 0xa6, 0x71, 0x7b, 0x97, 0xc4, 0xd4, 0x39, 0xad,
-        0xdf, 0x47, 0x52, 0xbc, 0x5f, 0x66, 0x99, 0xb2, 0xa3, 0x55, 0x65, 0xf5,
-        0xb8, 0x3d, 0xf9, 0x43, 0xcc, 0xcd, 0x17, 0x61, 0x6f, 0xf6, 0x8e, 0xbd,
-        0x0a, 0x9f, 0x31, 0x2e, 0x5f, 0x2a, 0xbd, 0x04, 0x7a, 0xcd, 0xaf, 0xb5,
-        0x77, 0xe1, 0x65, 0x01, 0x37, 0xcf, 0x38, 0xeb, 0xfd, 0xc3, 0x91, 0x3f,
-        0x02, 0x5d, 0xfc, 0xc1, 0x4b, 0xec, 0x03, 0xb0, 0x44, 0x60, 0xcf, 0xc3,
-        0x36, 0x18, 0x7f, 0x49, 0xef, 0x95, 0xbb, 0xbe, 0xfc, 0x92, 0x8e, 0x53,
-        0xf4, 0x97, 0x5b, 0x65, 0x7b, 0xb9, 0x41, 0x76, 0x40, 0x2f, 0xec, 0x28,
-        0xfb, 0x78, 0xa2, 0x72, 0x63, 0xd9, 0xcc, 0xd3, 0x47, 0xca, 0x9c, 0xef,
-        0x6d, 0x32, 0x71, 0xbc, 0x9a, 0x66, 0xa7, 0xed, 0xde, 0x31, 0xd2, 0x0f,
-        0x9e, 0x52, 0x32, 0x3f, 0xad, 0xc7, 0xce, 0x5d, 0xac, 0xc9, 0xc3, 0xb3,
-        0xc2, 0xbd, 0xf8, 0xfc, 0x1b, 0x74, 0xdf, 0x68, 0xe5, 0x19, 0x77, 0xde,
-        0x8f, 0xd8, 0x5f, 0x09, 0xf7, 0x86, 0xbf, 0xfe, 0x19, 0x10, 0xfd, 0x77,
-        0x5d, 0xf4, 0xde, 0x70, 0x4d, 0x7b, 0xd2, 0x76, 0x26, 0xa6, 0x75, 0x84,
-        0xa1, 0xf1, 0xf9, 0xbf, 0xe7, 0x22, 0xf2, 0x7f, 0x01, 0x95, 0xf6, 0x2d,
-        0x58, 0xd0, 0x73, 0x00, 0x00, 0x00 };
-static u32 bnx2_CP_b09FwData[(0x50/4) + 1] = {
-        0x00010030, 0x00000030, 0x00000000, 0x00000001, 0x00010fd0, 0x00000fd0,
-        0x00001430, 0x0000007f, 0x00030400, 0x00001000, 0x00000030, 0x00000020,
-        0x00050200, 0x00001000, 0x00000030, 0x00000010, 0x00010400, 0x00000400,
-        0x00001030, 0x00000020, 0x00000000 };
-static u32 bnx2_CP_b09FwRodata[(0x118/4) + 1] = {
-        0x080005d8, 0x080007f8, 0x0800073c, 0x08000764, 0x0800078c, 0x080007b4,
-        0x08000610, 0x080005fc, 0x08000820, 0x08000820, 0x0800062c, 0x08000648,
-        0x08000648, 0x08000820, 0x08000660, 0x08000674, 0x08000820, 0x08000688,
-        0x08000820, 0x08000820, 0x0800069c, 0x08000820, 0x08000820, 0x08000820,
-        0x08000820, 0x08000820, 0x08000820, 0x08000820, 0x08000820, 0x08000820,
-        0x08000820, 0x080006b0, 0x08000820, 0x080006c4, 0x080006d8, 0x080006ec,
-        0x08000820, 0x08000700, 0x08000714, 0x08000728, 0x08003740, 0x08003758,
-        0x08003768, 0x08003778, 0x08003790, 0x080037a8, 0x080037b8, 0x080037c8,
-        0x080037e8, 0x080037f8, 0x08003808, 0x08003898, 0x080037d8, 0x08003818,
-        0x08003828, 0x08003840, 0x08003860, 0x08003898, 0x08003878, 0x08003878,
-        0x080055f0, 0x080055f0, 0x080055f0, 0x080055f0, 0x080055f0, 0x08005618,
-        0x08005618, 0x08005640, 0x08005690, 0x08005660, 0x00000000 };
-static u32 bnx2_CP_b09FwBss[(0x870/4) + 1] = { 0x0 };
-static u32 bnx2_CP_b09FwSbss[(0xe9/4) + 1] = { 0x0 };
+        0x1f, 0x8b, 0x08, 0x00, 0x0f, 0x34, 0xe7, 0x45, 0x00, 0x03, 0xbd, 0x7d,
+        0x0d, 0x74, 0x5c, 0x57, 0x7d, 0xe7, 0xff, 0xdd, 0x19, 0x49, 0x63, 0x59,
+        0x96, 0x9f, 0xe5, 0x89, 0x32, 0x51, 0x84, 0x3d, 0x23, 0x3d, 0xd9, 0x22,
+        0x12, 0xe1, 0xc5, 0x11, 0xac, 0xda, 0x2a, 0xe9, 0x30, 0x92, 0x3f, 0x12,
+        0x02, 0xab, 0x10, 0x43, 0xb3, 0x1c, 0x4a, 0xc5, 0x48, 0x4e, 0x02, 0x04,
+        0xea, 0x40, 0xe8, 0x86, 0xdd, 0xec, 0x66, 0x32, 0x92, 0x3f, 0x9a, 0x8e,
+        0x3d, 0x93, 0x44, 0x89, 0xbd, 0xdd, 0x9c, 0xad, 0x90, 0x14, 0x3b, 0x74,
+        0x07, 0x4f, 0xe2, 0x98, 0x96, 0x73, 0x0a, 0x8d, 0x50, 0x8c, 0x9b, 0xe6,
+        0xb0, 0xdd, 0xd0, 0xa6, 0x34, 0xdb, 0x86, 0x22, 0x8c, 0x81, 0xf4, 0x2c,
+        0xdd, 0x86, 0x42, 0x77, 0xd3, 0x36, 0xe5, 0xed, 0xef, 0x77, 0xef, 0x7d,
+        0x9a, 0x91, 0x34, 0xce, 0x07, 0xdd, 0xad, 0xcf, 0x79, 0x7e, 0xf3, 0xee,
+        0xbb, 0x1f, 0xff, 0xfb, 0xbf, 0xff, 0xef, 0xfb, 0xbf, 0x4f, 0x97, 0x8b,
+        0x34, 0x8b, 0xfd, 0xb7, 0x01, 0xd7, 0xd5, 0xc9, 0xfd, 0xe3, 0x57, 0x5f,
+        0x39, 0x70, 0x25, 0x9f, 0xa3, 0x91, 0x68, 0x44, 0xde, 0xc4, 0xbf, 0xe4,
+        0x1b, 0xa8, 0x83, 0x0e, 0xdd, 0x70, 0x2c, 0x5e, 0x12, 0x53, 0x43, 0xde,
+        0xfe, 0x8c, 0x27, 0xb1, 0xc8, 0x50, 0xee, 0xce, 0x71, 0x4f, 0x24, 0x5d,
+        0xee, 0x4b, 0x0e, 0xcb, 0x3f, 0x05, 0xb9, 0x78, 0x54, 0x58, 0xfe, 0x96,
+        0xa1, 0x57, 0x7f, 0xeb, 0x2b, 0xff, 0x2a, 0xf5, 0xf2, 0x4c, 0x44, 0x62,
+        0xee, 0xd0, 0xed, 0xe2, 0x6e, 0x93, 0x58, 0xe7, 0x50, 0x72, 0xff, 0x23,
+        0xdb, 0x97, 0x44, 0x5a, 0xc3, 0xbe, 0x5e, 0x0a, 0xbe, 0xb2, 0x5d, 0x72,
+        0x1d, 0x43, 0x89, 0xb1, 0x86, 0x21, 0x57, 0x9e, 0xaa, 0xc8, 0xe8, 0x89,
+        0xc2, 0xcb, 0x41, 0x74, 0x28, 0x88, 0x4c, 0x0d, 0x38, 0x12, 0x19, 0x92,
+        0xb3, 0xe3, 0x03, 0xf7, 0x04, 0xca, 0xf3, 0xfc, 0x45, 0x69, 0x19, 0x3c,
+        0x37, 0x80, 0xf7, 0x65, 0x41, 0xdd, 0xbd, 0xd7, 0x9c, 0x28, 0xc4, 0x44,
+        0x0d, 0xf5, 0xbc, 0x90, 0x89, 0x5c, 0x25, 0x7c, 0x7f, 0x56, 0x7a, 0xfc,
+        0xa7, 0x05, 0xe5, 0xe5, 0x98, 0x64, 0x2a, 0xd2, 0x82, 0x32, 0xdc, 0x9b,
+        0x51, 0x27, 0xe5, 0x66, 0x22, 0xae, 0xe4, 0x2b, 0x3f, 0x5e, 0x67, 0xc6,
+        0x9d, 0xb3, 0xf7, 0xbf, 0x8e, 0x99, 0x3b, 0xc6, 0x2d, 0xc6, 0x64, 0x29,
+        0x92, 0x10, 0xc0, 0x82, 0x79, 0x25, 0x64, 0xb2, 0x98, 0x94, 0x4c, 0x81,
+        0xb0, 0x45, 0x25, 0xeb, 0x12, 0xae, 0x04, 0xda, 0xb7, 0x39, 0xf5, 0xeb,
+        0xb3, 0xee, 0x0b, 0xa8, 0x9b, 0x44, 0xbd, 0x4e, 0x79, 0x12, 0x75, 0x4f,
+        0x57, 0xe2, 0xf2, 0x44, 0xe5, 0x57, 0x25, 0x8d, 0xb6, 0x8f, 0x57, 0x30,
+        0x76, 0xb1, 0x51, 0x86, 0xa7, 0x9b, 0x25, 0x33, 0xdd, 0x9d, 0xc8, 0x4a,
+        0x10, 0x7c, 0xda, 0xff, 0xa8, 0x8c, 0xb5, 0xa1, 0x7e, 0x91, 0xef, 0x12,
+        0x2b, 0xde, 0x65, 0xfd, 0x3e, 0x37, 0xab, 0x1c, 0x49, 0xef, 0x4d, 0x25,
+        0xc6, 0x14, 0x9f, 0x1b, 0x24, 0xd3, 0x8f, 0xe7, 0xd1, 0xa8, 0x44, 0xbc,
+        0x20, 0xb8, 0xc3, 0xbf, 0x0c, 0x70, 0xa4, 0x92, 0x49, 0xc5, 0xb6, 0x6c,
+        0x97, 0xca, 0x25, 0x55, 0x5c, 0x72, 0x95, 0x2b, 0x25, 0xd9, 0x16, 0x04,
+        0xef, 0xf3, 0x3b, 0x51, 0x2e, 0x32, 0x5c, 0x90, 0xfd, 0x58, 0x23, 0xf4,
+        0x29, 0xbe, 0x1a, 0xda, 0x8c, 0x79, 0xf4, 0xb9, 0xc3, 0xd2, 0x28, 0xe9,
+        0xb8, 0xa4, 0xd5, 0x90, 0x24, 0xd5, 0xd0, 0x3a, 0x94, 0x39, 0xd2, 0xe0,
+        0x7d, 0xc1, 0xd2, 0xd2, 0x46, 0x3c, 0xcb, 0xa8, 0x1a, 0x6a, 0x5b, 0x55,
+        0x9e, 0x4a, 0x8a, 0x5a, 0x07, 0x5c, 0xa5, 0x7a, 0xd3, 0x8a, 0x65, 0xb8,
+        0xeb, 0xb2, 0x0f, 0x36, 0xad, 0x2d, 0xdb, 0xef, 0xac, 0x2c, 0xbb, 0xbd,
+        0x85, 0xb0, 0x8a, 0xe2, 0xef, 0xb8, 0x9e, 0x6b, 0x3a, 0xde, 0xed, 0x36,
+        0x60, 0x5e, 0xa3, 0x7e, 0xca, 0xdd, 0xa9, 0x9e, 0x0f, 0xa4, 0x9d, 0x30,
+        0xf3, 0x9d, 0xc2, 0x3b, 0x54, 0x1d, 0xf2, 0xb1, 0x6e, 0xae, 0x1c, 0xc2,
+        0xdc, 0xce, 0x4f, 0xa7, 0xdc, 0x2e, 0x85, 0xfb, 0x3c, 0x7f, 0x07, 0x41,
+        0xc6, 0xcf, 0xe9, 0x35, 0xfd, 0xee, 0x74, 0x02, 0xcf, 0x80, 0x3f, 0x9e,
+        0x4e, 0x6d, 0x92, 0xab, 0xed, 0xba, 0x7c, 0x13, 0x63, 0x76, 0xbb, 0x77,
+        0xa8, 0x6e, 0xd7, 0x57, 0x29, 0x77, 0x56, 0xce, 0xe0, 0x39, 0x08, 0x6e,
+        0xf4, 0x53, 0x89, 0x1c, 0xd6, 0xec, 0x42, 0x21, 0x2e, 0xdf, 0x2b, 0xa4,
+        0x40, 0xc5, 0xa9, 0xde, 0x39, 0xe9, 0xf3, 0xe7, 0x00, 0x6f, 0x1e, 0xd7,
+        0x41, 0xbe, 0x2b, 0xe3, 0x5d, 0x99, 0x6d, 0x83, 0xe0, 0x26, 0xff, 0x37,
+        0x83, 0xb1, 0x76, 0xc3, 0x17, 0x4f, 0x15, 0xb1, 0x9e, 0x80, 0xf9, 0x74,
+        0x11, 0xeb, 0x89, 0xb5, 0x7a, 0x5c, 0xaf, 0x7b, 0x2f, 0xd6, 0x9d, 0xb4,
+        0x41, 0xba, 0xd8, 0x61, 0x69, 0xf9, 0x03, 0xf6, 0x2e, 0x92, 0x29, 0x3a,
+        0x92, 0xf1, 0xff, 0x31, 0x48, 0x6b, 0x7e, 0x11, 0x67, 0xb8, 0x48, 0x5a,
+        0x6c, 0x00, 0xac, 0x7c, 0xcc, 0xda, 0x7a, 0x1b, 0x1d, 0xe0, 0x96, 0xeb,
+        0xc0, 0xf7, 0x31, 0xe5, 0x35, 0xd9, 0xf7, 0x21, 0x5f, 0xf0, 0xdf, 0x26,
+        0x47, 0xbc, 0x6a, 0xbd, 0x0c, 0x69, 0xb2, 0x92, 0x93, 0xec, 0x83, 0x81,
+        0x0c, 0xfb, 0xc0, 0x13, 0xfb, 0x74, 0x7d, 0xd1, 0x6d, 0x5d, 0xd6, 0xd1,
+        0x75, 0xf1, 0x6f, 0x7d, 0x23, 0xc6, 0x70, 0x46, 0x8a, 0xd5, 0xb6, 0x23,
+        0xc5, 0xfc, 0x66, 0x0b, 0x1f, 0x9e, 0x07, 0x9d, 0x4c, 0xe5, 0x82, 0x5d,
+        0xdb, 0x70, 0x1e, 0x57, 0xd7, 0xa1, 0x6d, 0x17, 0x7c, 0xe0, 0x4a, 0xb6,
+        0x30, 0x88, 0x71, 0xe3, 0xb8, 0x07, 0xc1, 0x94, 0x9f, 0x4e, 0x45, 0x65,
+        0x08, 0xcf, 0xa3, 0xe4, 0x3d, 0xe0, 0x4f, 0xa2, 0x99, 0xed, 0xbe, 0x8c,
+        0x80, 0xee, 0xf3, 0x95, 0xd7, 0x97, 0x22, 0x7a, 0x0e, 0xfe, 0x3f, 0x59,
+        0xdc, 0x70, 0x1c, 0x33, 0xe6, 0x54, 0xb1, 0x43, 0xf2, 0xd3, 0x9e, 0x4c,
+        0x16, 0x16, 0x7a, 0x95, 0xbc, 0x4c, 0x7e, 0xc7, 0xfa, 0xa5, 0x40, 0xbb,
+        0x43, 0x32, 0x5c, 0xf1, 0x24, 0x5f, 0xc0, 0xbd, 0xd8, 0x0d, 0xfa, 0x8d,
+        0x4a, 0x3a, 0x61, 0xd6, 0x26, 0x5f, 0x18, 0xc1, 0xfc, 0x80, 0x6b, 0x8f,
+        0xbf, 0x07, 0x2d, 0x4c, 0xae, 0x64, 0x06, 0x48, 0x3f, 0x6f, 0x06, 0x96,
+        0x98, 0xcc, 0xfa, 0xe0, 0x0b, 0xd7, 0xc0, 0x92, 0x2f, 0xc6, 0xa2, 0xc3,
+        0x98, 0xf7, 0x70, 0xf9, 0x57, 0xd0, 0x7f, 0x8b, 0xfe, 0x0d, 0x7e, 0xb2,
+        0x65, 0x51, 0xdc, 0xe3, 0xb8, 0x13, 0xe6, 0x90, 0x56, 0x21, 0x1b, 0xa6,
+        0x3b, 0x65, 0x12, 0xb4, 0x3a, 0x2c, 0xf8, 0x3d, 0xcf, 0xb9, 0x10, 0xae,
+        0x0e, 0xfd, 0x7b, 0x72, 0x7a, 0x8b, 0x7e, 0xce, 0x8e, 0x76, 0x48, 0x6e,
+        0x3e, 0x9c, 0x33, 0xe5, 0x05, 0x65, 0x44, 0xea, 0xb0, 0x08, 0x65, 0x46,
+        0x10, 0x3c, 0xe8, 0x53, 0x6e, 0x04, 0xc1, 0x69, 0x9f, 0x72, 0xe4, 0x0c,
+        0xe4, 0x03, 0x65, 0x07, 0x79, 0xd9, 0x53, 0x5c, 0xab, 0x4c, 0xa1, 0x17,
+        0xeb, 0xd1, 0x28, 0xd9, 0xfe, 0xe3, 0x84, 0x15, 0x72, 0xe7, 0xa5, 0x4f,
+        0x66, 0xbc, 0x5c, 0x22, 0xa2, 0xf1, 0x04, 0xca, 0x82, 0x3c, 0x4c, 0xeb,
+        0x99, 0x75, 0x49, 0xbe, 0xbf, 0x64, 0xeb, 0xc8, 0xaf, 0xb2, 0x4e, 0x74,
+        0x4d, 0x9d, 0x7f, 0xa7, 0x0c, 0x5f, 0xf6, 0x62, 0xdd, 0x3a, 0x14, 0xf1,
+        0xd8, 0xb5, 0x8d, 0xcf, 0x12, 0x6b, 0x18, 0xfa, 0x3d, 0xbc, 0x7b, 0xee,
+        0x53, 0x8f, 0x7a, 0xf5, 0xde, 0xfd, 0x28, 0xba, 0xf6, 0xdd, 0x94, 0x44,
+        0xbd, 0x54, 0xef, 0x8d, 0xea, 0x4f, 0x1a, 0xa4, 0x35, 0x08, 0x1e, 0xf5,
+        0xc3, 0xf2, 0xc6, 0x86, 0xb5, 0x63, 0x5c, 0x55, 0xa7, 0xec, 0x68, 0x9d,
+        0xb2, 0xcf, 0xd7, 0x29, 0x7b, 0x7b, 0xe3, 0xda, 0xb2, 0xdb, 0xeb, 0x94,
+        0xcd, 0xd6, 0x29, 0xfb, 0x69, 0x9d, 0x32, 0x69, 0x5a, 0x5b, 0x16, 0xa9,
+        0x53, 0xd6, 0x57, 0xa7, 0x2c, 0x0a, 0xbe, 0xdb, 0x26, 0xf9, 0xf8, 0xbd,
+        0x9c, 0xbb, 0xc5, 0x4d, 0x29, 0xb2, 0x16, 0x37, 0x0d, 0xa8, 0xd7, 0xb9,
+        0xaa, 0xde, 0x17, 0xeb, 0xd4, 0x6b, 0x44, 0xbd, 0xb6, 0x55, 0xf5, 0x76,
+        0xd4, 0xc1, 0x75, 0x13, 0xea, 0xc5, 0x56, 0xd5, 0x7b, 0xb0, 0x4e, 0x3d,
+        0x96, 0x7f, 0xc6, 0x8e, 0xd3, 0x07, 0x2d, 0xf4, 0x5a, 0xeb, 0xd5, 0x28,
+        0xd2, 0xce, 0xf2, 0x5e, 0xe8, 0x90, 0x0e, 0x65, 0xe4, 0x02, 0x65, 0x10,
+        0xcb, 0x3a, 0x41, 0xe7, 0x71, 0xd0, 0x1d, 0xe5, 0x28, 0xf8, 0x8c, 0x73,
+        0xa9, 0x6c, 0x90, 0xb1, 0x78, 0x9f, 0x7b, 0xb5, 0x6a, 0x01, 0x8d, 0xa5,
+        0xdc, 0xa4, 0x22, 0xff, 0x49, 0x2e, 0x32, 0xe4, 0xe5, 0x86, 0x45, 0xc5,
+        0x95, 0x04, 0x32, 0xe2, 0xab, 0x36, 0x25, 0xf7, 0x80, 0xbf, 0xd2, 0xd0,
+        0x59, 0x37, 0x06, 0xc3, 0x9a, 0xb7, 0x4c, 0xdd, 0x8b, 0xcb, 0x54, 0x5f,
+        0x0e, 0x52, 0x16, 0x0e, 0x8d, 0x7e, 0x2a, 0xe3, 0x2d, 0x0c, 0x36, 0x82,
+        0x66, 0xcf, 0xa3, 0xcd, 0x6e, 0xb4, 0xdc, 0x57, 0x8e, 0xca, 0x48, 0x79,
+        0x00, 0xbc, 0xe0, 0xc8, 0x39, 0x6f, 0xa3, 0x9c, 0xf3, 0x51, 0xb7, 0x12,
+        0x91, 0xc5, 0xb8, 0x23, 0x8b, 0x78, 0xce, 0xf8, 0x78, 0x57, 0x09, 0x79,
+        0x6b, 0x40, 0x0e, 0x14, 0x7d, 0x39, 0x5c, 0xbc, 0x41, 0x85, 0x7a, 0x6d,
+        0xa7, 0xbf, 0x5e, 0x1e, 0x73, 0x4d, 0xdf, 0xbb, 0xbd, 0x05, 0x68, 0xd4,
+        0xa8, 0x9c, 0xf7, 0x52, 0x89, 0x45, 0xcd, 0x13, 0xff, 0x27, 0x18, 0x41,
+        0x3f, 0xb3, 0x5e, 0xca, 0xfd, 0x03, 0x3c, 0x8f, 0x95, 0x69, 0xcb, 0x54,
+        0xfb, 0x9a, 0x44, 0x5f, 0x87, 0x8a, 0x1b, 0xe4, 0x56, 0xdb, 0x7e, 0x97,
+        0xb7, 0xd0, 0x0b, 0x9e, 0x73, 0x4f, 0x50, 0x86, 0x14, 0x00, 0xd7, 0x5e,
+        0xf0, 0x36, 0xda, 0x7e, 0x4d, 0xcb, 0x33, 0xd8, 0x3e, 0x85, 0x8d, 0x90,
+        0xcf, 0x7f, 0x17, 0xdc, 0x1a, 0x67, 0x7d, 0x96, 0x51, 0xe7, 0x48, 0x49,
+        0x0d, 0x41, 0x26, 0x0c, 0x50, 0x66, 0x26, 0x21, 0x2f, 0x21, 0x7b, 0x8a,
+        0x3f, 0x0d, 0xd2, 0xd1, 0x5a, 0x39, 0x28, 0xb9, 0x6a, 0x1d, 0x96, 0x25,
+        0x8d, 0x5c, 0x2d, 0x2e, 0x2d, 0xcb, 0x8a, 0x1c, 0xe4, 0xcb, 0x53, 0x15,
+        0xca, 0x85, 0x0f, 0x82, 0x47, 0x3b, 0x65, 0xa4, 0x90, 0xca, 0xa5, 0x65,
+        0x1b, 0xd6, 0xef, 0xd7, 0xb1, 0xa6, 0x51, 0x5c, 0x0f, 0xad, 0x97, 0x56,
+        0x1f, 0xba, 0x9b, 0xe5, 0xe8, 0xb4, 0x9d, 0x36, 0xd2, 0x6f, 0x03, 0x0f,
+        0x93, 0x5c, 0xf3, 0x44, 0x26, 0xe2, 0x8c, 0xd2, 0x5e, 0x19, 0x85, 0x7c,
+        0xcc, 0x96, 0xd9, 0x37, 0xe1, 0x4d, 0xd8, 0xdf, 0xb0, 0x9b, 0x0a, 0x9d,
+        0xf6, 0x77, 0x0b, 0x7e, 0x27, 0xed, 0x6f, 0xc8, 0xd4, 0x82, 0x67, 0x7f,
+        0xc7, 0xb5, 0x1c, 0x32, 0xbf, 0x13, 0xf8, 0xdd, 0xaf, 0x7f, 0x4f, 0x15,
+        0x77, 0xed, 0x52, 0xde, 0x95, 0x92, 0x9d, 0xef, 0x94, 0x03, 0x85, 0x77,
+        0x58, 0xd9, 0x82, 0x4b, 0xbe, 0xe4, 0x98, 0x79, 0x26, 0xf4, 0xba, 0xe7,
+        0x8b, 0x39, 0x67, 0x94, 0xf0, 0xe3, 0xf7, 0x70, 0xa1, 0xcf, 0xdd, 0x24,
+        0xa4, 0x81, 0x29, 0x67, 0xb8, 0xe2, 0xa4, 0x23, 0x43, 0x3d, 0x89, 0x49,
+        0x39, 0x8c, 0xdf, 0xe2, 0x46, 0x86, 0xbe, 0x84, 0xbb, 0xc1, 0xc1, 0x57,
+        0xb6, 0x43, 0xb6, 0x16, 0x29, 0x2f, 0x3d, 0xcc, 0x3d, 0x29, 0x67, 0x56,
+        0xd8, 0x58, 0xc4, 0x85, 0x92, 0xec, 0x74, 0xea, 0x78, 0x4e, 0x52, 0xb9,
+        0x19, 0x30, 0xc4, 0x8d, 0x7e, 0x54, 0xde, 0xe7, 0x83, 0x76, 0xaf, 0x74,
+        0x64, 0xd7, 0x95, 0x51, 0xd8, 0x44, 0xde, 0xcc, 0x2e, 0xc8, 0x58, 0xc8,
+        0xbe, 0x08, 0xe9, 0x41, 0x9d, 0x92, 0xb1, 0xe8, 0x10, 0xb0, 0x7d, 0xaa,
+        0x7f, 0x64, 0xb2, 0x90, 0xbd, 0x5d, 0x0d, 0xed, 0xff, 0x6c, 0x66, 0xe0,
+        0xad, 0x92, 0xdd, 0xab, 0x80, 0xa3, 0xf6, 0x31, 0xc8, 0x4c, 0xcc, 0x2b,
+        0x08, 0x40, 0xcf, 0x90, 0xe7, 0x37, 0xdd, 0x14, 0x19, 0x6a, 0x90, 0xe1,
+        0xbd, 0xed, 0x68, 0xc3, 0x77, 0xc4, 0xd7, 0x79, 0xe0, 0x33, 0x95, 0x1c,
+        0x11, 0xb9, 0x7b, 0x6a, 0x60, 0xc9, 0x99, 0x2c, 0x7d, 0x10, 0x3c, 0x79,
+        0x15, 0xda, 0x3f, 0x80, 0xf6, 0x2f, 0x3b, 0xf9, 0xe9, 0x57, 0x9c, 0xc9,
+        0xe9, 0xbf, 0x75, 0xa6, 0xa6, 0xb7, 0x6c, 0xd9, 0x39, 0xb8, 0x65, 0xcb,
+        0xf8, 0x60, 0xd4, 0xea, 0x97, 0x2d, 0x5b, 0xa6, 0x06, 0x07, 0x81, 0x83,
+        0x3e, 0x77, 0x44, 0x3c, 0x77, 0x97, 0x80, 0x7f, 0xe2, 0x1c, 0x93, 0xfa,
+        0x27, 0x85, 0xf7, 0x6c, 0xef, 0xe9, 0xf7, 0xc3, 0xd2, 0x97, 0x68, 0x13,
+        0x8e, 0x1f, 0xb1, 0x75, 0xda, 0x01, 0xfb, 0x03, 0x76, 0x7d, 0x0b, 0xaa,
+        0xc1, 0x63, 0x39, 0xe7, 0xc2, 0x72, 0xae, 0xed, 0x8f, 0xac, 0x2d, 0xbb,
+        0x11, 0xe5, 0x7c, 0x26, 0xce, 0x88, 0x17, 0xda, 0x22, 0x0d, 0xda, 0x76,
+        0xcc, 0x16, 0x48, 0x33, 0x51, 0x99, 0x28, 0xb4, 0xa1, 0x0d, 0xe8, 0xe2,
+        0x94, 0xbd, 0x8e, 0x02, 0xb6, 0xbd, 0xe8, 0xeb, 0xe8, 0x21, 0xb4, 0xa3,
+        0xcc, 0x48, 0xf5, 0x8a, 0xfa, 0x04, 0xea, 0xf4, 0xb9, 0x9b, 0x85, 0x36,
+        0xc7, 0x71, 0xc9, 0x16, 0xc9, 0xdf, 0x3d, 0x80, 0x27, 0x26, 0xc9, 0x76,
+        0x3c, 0x57, 0x0e, 0xc0, 0x0e, 0x69, 0xb0, 0x3a, 0x33, 0x94, 0x17, 0xfc,
+        0x77, 0x87, 0x12, 0xef, 0x80, 0x8c, 0xcd, 0x5d, 0x8e, 0x7a, 0x0e, 0xf0,
+        0x42, 0x3b, 0x05, 0x36, 0xcb, 0x5c, 0x5a, 0x32, 0xdb, 0xee, 0xc5, 0xdd,
+        0xc5, 0x73, 0x1e, 0xf7, 0xb7, 0xe0, 0x3e, 0x89, 0x7b, 0x08, 0x27, 0xf0,
+        0xea, 0x47, 0xac, 0xce, 0xba, 0x06, 0x63, 0xff, 0x6b, 0xc9, 0x94, 0x12,
+        0xb4, 0x39, 0x36, 0x66, 0xbc, 0xb4, 0xab, 0x44, 0x6d, 0x56, 0x32, 0x85,
+        0xfa, 0xf0, 0x09, 0xbc, 0x83, 0x32, 0x7e, 0x12, 0xbf, 0x1f, 0xa4, 0x4d,
+        0x3c, 0x25, 0xe3, 0x73, 0x1c, 0xa7, 0x00, 0x98, 0x4a, 0x92, 0x3d, 0xf9,
+        0x00, 0xae, 0x69, 0x5c, 0x0f, 0xe3, 0xe2, 0xdc, 0xd8, 0xff, 0xe2, 0x26,
+        0x05, 0x5c, 0xf3, 0x39, 0x4b, 0x3a, 0xae, 0xe0, 0x37, 0x69, 0xb8, 0x42,
+        0xdb, 0x06, 0xf4, 0x5b, 0x09, 0xe9, 0xda, 0xb7, 0xbf, 0x13, 0x9a, 0xaf,
+        0x73, 0x6d, 0xa0, 0x99, 0xca, 0xa0, 0x96, 0x39, 0x19, 0x0f, 0xf7, 0x0a,
+        0x6c, 0x8f, 0x36, 0xce, 0xd1, 0xb3, 0x65, 0x9e, 0x2e, 0x4b, 0xea, 0xb2,
+        0x7e, 0x5b, 0x86, 0x7b, 0xa5, 0x41, 0xc6, 0xda, 0x01, 0x31, 0xe5, 0xb3,
+        0x84, 0xf8, 0xa4, 0x0c, 0x00, 0xfd, 0xc2, 0x66, 0x38, 0x73, 0x51, 0xf9,
+        0xb7, 0xa4, 0x6d, 0xb1, 0xc7, 0x2b, 0xa4, 0x63, 0xd2, 0x76, 0x10, 0xdc,
+        0xef, 0x37, 0xa1, 0x7f, 0xf2, 0xbc, 0x48, 0xc3, 0xd1, 0xa8, 0xcc, 0xb8,
+        0xa4, 0x85, 0x77, 0xb4, 0x90, 0x06, 0x1a, 0x3d, 0xd2, 0x70, 0x2d, 0x7f,
+        0x71, 0x0d, 0xd9, 0x5f, 0x0e, 0xf6, 0x1d, 0xed, 0xbc, 0x1e, 0xd8, 0xce,
+        0x1c, 0xe3, 0x30, 0x9f, 0x5d, 0x05, 0x9e, 0xca, 0x2c, 0xf3, 0x94, 0xc8,
+        0x6c, 0x81, 0xb8, 0x09, 0xed, 0x3f, 0xae, 0x33, 0xf1, 0xf3, 0x38, 0xe6,
+        0xcc, 0xfb, 0x19, 0x8b, 0xa7, 0x2f, 0x59, 0x3c, 0x7d, 0xd9, 0xde, 0x5d,
+        0x27, 0xab, 0x6d, 0xc1, 0x05, 0x3c, 0x73, 0x7d, 0xa2, 0x1a, 0x67, 0xd9,
+        0xc2, 0x0c, 0xee, 0xa8, 0x5b, 0x7c, 0x5c, 0xc6, 0xb5, 0x9d, 0x16, 0x91,
+        0x77, 0x69, 0xd9, 0x06, 0x21, 0xdd, 0x5c, 0x00, 0xcc, 0x0d, 0x92, 0x8b,
+        0x47, 0xf4, 0xda, 0x47, 0xbd, 0x03, 0x51, 0x43, 0xab, 0xc4, 0xc9, 0x0a,
+        0x5f, 0xaa, 0x06, 0xa6, 0xb8, 0x95, 0x73, 0x84, 0x8b, 0xb4, 0xfb, 0x88,
+        0x86, 0xeb, 0x16, 0xc8, 0xbb, 0x9c, 0xa8, 0xf6, 0x46, 0xb9, 0x0c, 0xb4,
+        0xa0, 0xe2, 0xd0, 0x5c, 0xc1, 0xd3, 0xb0, 0x9b, 0xb2, 0x73, 0xb4, 0xa1,
+        0xbb, 0xe8, 0xb7, 0xc4, 0xb2, 0xfd, 0xad, 0xa4, 0x23, 0xa5, 0x60, 0x7f,
+        0xe1, 0x59, 0x65, 0xfb, 0x35, 0x9d, 0x3a, 0xca, 0x8b, 0x6b, 0x3b, 0x19,
+        0xbc, 0x12, 0xb1, 0xbe, 0x73, 0x54, 0x79, 0x9b, 0x57, 0x97, 0x25, 0xa9,
+        0x87, 0xd1, 0x2e, 0x99, 0xed, 0x6f, 0x27, 0x8f, 0xb9, 0xca, 0x03, 0x2e,
+        0x3d, 0xed, 0x1b, 0xe5, 0xd4, 0xc0, 0xc6, 0x55, 0xf5, 0xf5, 0xdd, 0xb1,
+        0xcf, 0x51, 0x7b, 0x77, 0xed, 0x3d, 0x69, 0xef, 0xb9, 0xe8, 0x00, 0xef,
+        0x8e, 0x44, 0x87, 0x78, 0xc7, 0x1a, 0x0e, 0xb1, 0x0f, 0xcd, 0x57, 0x56,
+        0xce, 0xf4, 0xb8, 0x79, 0x21, 0x5f, 0xfd, 0xa9, 0xdc, 0x32, 0x67, 0xe4,
+        0xef, 0x2e, 0xc8, 0x20, 0xf8, 0x6f, 0xee, 0xa2, 0x00, 0xfe, 0xbd, 0x65,
+        0xb9, 0xa5, 0x42, 0xbc, 0xfd, 0x06, 0xf0, 0xb7, 0x35, 0x4a, 0xde, 0x74,
+        0x85, 0x72, 0xf7, 0x4e, 0xd1, 0xf6, 0x69, 0x81, 0x38, 0x3f, 0x2b, 0x5c,
+        0x9b, 0x7c, 0xe1, 0x19, 0xbd, 0x36, 0x07, 0x0b, 0x8b, 0xc0, 0xcf, 0xd7,
+        0x41, 0xf7, 0x41, 0xb0, 0xe8, 0xe7, 0x41, 0x39, 0x7f, 0x84, 0xdf, 0xe8,
+        0xbb, 0xf0, 0x1c, 0xde, 0xb7, 0x4a, 0xbe, 0x44, 0x9e, 0x8b, 0x5a, 0x1e,
+        0x3e, 0x05, 0x7e, 0xba, 0x0c, 0xfd, 0xa2, 0x6c, 0x80, 0xbf, 0xff, 0x11,
+        0xef, 0x70, 0x9f, 0xc3, 0x22, 0xb6, 0xd3, 0xd6, 0xe1, 0xd8, 0x5c, 0x3b,
+        0xae, 0x59, 0x5c, 0xfb, 0xad, 0x8f, 0x2f, 0xaf, 0x1b, 0xd7, 0x2b, 0xd5,
+        0x9b, 0x93, 0x70, 0xcd, 0x44, 0x1e, 0x2f, 0xb0, 0x3e, 0xe9, 0xff, 0x1f,
+        0x62, 0x46, 0x17, 0xfc, 0xc9, 0x3a, 0x73, 0x5f, 0xdd, 0x96, 0x6b, 0x5e,
+        0x4b, 0x83, 0xf4, 0x6f, 0x52, 0x83, 0x39, 0xc8, 0x9d, 0xa8, 0xd7, 0x2a,
+        0x23, 0xda, 0x27, 0x22, 0x4d, 0x90, 0x06, 0x6e, 0x56, 0x86, 0x36, 0x3f,
+        0xa4, 0x0c, 0x6d, 0x3e, 0x03, 0x5a, 0xc4, 0x55, 0x5c, 0x72, 0x0c, 0x6d,
+        0x7e, 0x1d, 0x77, 0x5c, 0xc5, 0x0b, 0x4e, 0xc8, 0xc7, 0xc3, 0xf0, 0xf9,
+        0x76, 0x15, 0xa2, 0xce, 0x78, 0x05, 0xf4, 0x5b, 0x8c, 0xa1, 0x7c, 0x81,
+        0x38, 0xc7, 0xfc, 0x39, 0xce, 0x56, 0xdb, 0xff, 0xe3, 0x32, 0x51, 0x0c,
+        0xb4, 0x5d, 0x95, 0x9d, 0xbb, 0x17, 0xf7, 0xf5, 0x5a, 0xce, 0x28, 0x2f,
+        0xad, 0x8c, 0xbc, 0x7a, 0x17, 0xee, 0xdd, 0x89, 0x83, 0xd2, 0xed, 0x46,
+        0xe4, 0x39, 0xf4, 0xf5, 0x43, 0x67, 0xa2, 0xf2, 0x32, 0xae, 0x9f, 0xe0,
+        0x7a, 0x15, 0xd7, 0x2b, 0xe8, 0xf7, 0x45, 0x94, 0xaf, 0x97, 0x05, 0xb7,
+        0x19, 0xf5, 0x45, 0x8d, 0x57, 0x5e, 0x70, 0xc6, 0x4e, 0xbe, 0x84, 0x2b,
+        0xaa, 0x26, 0x2a, 0xcf, 0x3b, 0xd9, 0xb9, 0x60, 0xe3, 0xa2, 0x47, 0x19,
+        0xf6, 0xa7, 0x8e, 0xe9, 0x7b, 0x08, 0x73, 0x00, 0x4d, 0x17, 0x17, 0x30,
+        0xf6, 0x33, 0x9a, 0x67, 0x46, 0x20, 0xf3, 0xb3, 0xb0, 0x4b, 0xc6, 0x34,
+        0x4c, 0x97, 0x03, 0x3e, 0xf8, 0xba, 0x03, 0xb8, 0xcf, 0x35, 0xca, 0x52,
+        0x9c, 0x76, 0xe4, 0x97, 0x75, 0xfd, 0x6c, 0xb1, 0x5b, 0xe3, 0x76, 0x66,
+        0x0d, 0xff, 0xd0, 0x3f, 0x0b, 0xe5, 0x81, 0x91, 0xc6, 0xb3, 0x05, 0xca,
+        0x02, 0xe8, 0x9f, 0xc2, 0x14, 0xee, 0x8d, 0x5a, 0x26, 0xe4, 0x25, 0x94,
+        0x07, 0x6c, 0x47, 0x99, 0x50, 0x2b, 0x77, 0x28, 0x6b, 0x28, 0x7b, 0x28,
+        0x4b, 0xcc, 0x7a, 0x8c, 0x3f, 0x48, 0x19, 0x7e, 0x2d, 0xfc, 0x53, 0xda,
+        0x1f, 0x9d, 0xc6, 0x07, 0x99, 0xce, 0x28, 0x23, 0x4f, 0xf7, 0xe8, 0xb5,
+        0x98, 0x28, 0xa8, 0x38, 0x20, 0x47, 0x19, 0xae, 0x63, 0x7b, 0x71, 0xcf,
+        0xaa, 0x09, 0x5c, 0xd9, 0x63, 0x1f, 0xc0, 0x6f, 0xae, 0xcd, 0x04, 0xea,
+        0xe1, 0x2a, 0x8e, 0xe2, 0x8e, 0x0b, 0xb6, 0x99, 0x91, 0x23, 0x5c, 0xd3,
+        0x84, 0x5d, 0xd3, 0x2f, 0x03, 0x0f, 0x9c, 0x9f, 0xd2, 0xf1, 0x07, 0xe5,
+        0xed, 0x00, 0xde, 0x2b, 0xd6, 0xdf, 0x6d, 0x15, 0xc3, 0x83, 0xb8, 0x7a,
+        0xc9, 0xcf, 0x2d, 0x66, 0xbd, 0x34, 0xed, 0x7e, 0x37, 0x6a, 0x78, 0x31,
+        0x8e, 0xb2, 0x08, 0xca, 0xda, 0x45, 0xf3, 0xfe, 0x32, 0x1e, 0xd3, 0x16,
+        0x8f, 0xfc, 0xad, 0xec, 0x6f, 0xd0, 0x13, 0x6c, 0xda, 0x8c, 0x37, 0x80,
+        0x71, 0x31, 0x97, 0x63, 0x7b, 0xd4, 0x38, 0xe4, 0xf7, 0xb8, 0x47, 0x19,
+        0xce, 0x38, 0x03, 0xe7, 0xc7, 0x7e, 0x51, 0xae, 0x71, 0xe0, 0x4b, 0xd5,
+        0x87, 0xff, 0x32, 0xd6, 0xec, 0x71, 0xd9, 0x57, 0xbc, 0x5a, 0xfb, 0xd4,
+        0x8d, 0x47, 0xcd, 0x7a, 0x88, 0x0a, 0xeb, 0xa1, 0xef, 0x38, 0x6d, 0x9b,
+        0x31, 0xfd, 0x3e, 0x7a, 0x94, 0xbf, 0x29, 0x9f, 0x6b, 0xe5, 0xbd, 0xb1,
+        0x6b, 0xf2, 0x2b, 0x64, 0x1d, 0x6d, 0x0b, 0xac, 0x59, 0xb9, 0x16, 0xef,
+        0xf4, 0xf1, 0x29, 0xf3, 0xc8, 0x4f, 0x07, 0xc1, 0x13, 0xaa, 0xc1, 0xf0,
+        0x3e, 0x7d, 0x8d, 0x7a, 0xfc, 0x04, 0xfb, 0x0b, 0xbc, 0x72, 0x02, 0xb6,
+        0xdb, 0xae, 0xe5, 0x3e, 0x20, 0x2b, 0xe3, 0x31, 0x39, 0x59, 0x68, 0x91,
+        0xb9, 0x82, 0x82, 0xc1, 0x60, 0x64, 0x67, 0x44, 0x12, 0x5a, 0xff, 0xd2,
+        0xbe, 0x1b, 0x9e, 0x8e, 0x58, 0xba, 0x83, 0xc3, 0xd2, 0xfc, 0x1b, 0xd0,
+        0xb1, 0x65, 0xe8, 0xd8, 0x56, 0xe8, 0xe0, 0xd5, 0x32, 0xa2, 0xab, 0x61,
+        0xad, 0x8c, 0x60, 0x9b, 0x14, 0xbc, 0xf2, 0x83, 0x68, 0x17, 0xd2, 0x5f,
+        0x4c, 0xd3, 0x5a, 0x56, 0x72, 0xce, 0xae, 0xca, 0x94, 0xb3, 0xbb, 0xb2,
+        0x5a, 0x07, 0xf5, 0xb9, 0x51, 0x31, 0xb0, 0x9e, 0xd4, 0x71, 0xbc, 0x94,
+        0x9f, 0x01, 0x4e, 0x76, 0x83, 0xee, 0x9e, 0x2e, 0xc1, 0x8f, 0xa7, 0x5c,
+        0x06, 0xcc, 0x8f, 0x01, 0xe6, 0xd9, 0x92, 0x13, 0xda, 0x06, 0xc2, 0xe0,
+        0xc9, 0xec, 0x74, 0xbf, 0x2c, 0xce, 0x93, 0x0e, 0x21, 0x03, 0x4a, 0x58,
+        0x4f, 0x7f, 0x1d, 0xec, 0x00, 0x8e, 0x0f, 0xb9, 0x3d, 0xdd, 0xa1, 0xdf,
+        0x19, 0x7d, 0xde, 0x29, 0x8b, 0xe5, 0xf7, 0x58, 0xd8, 0x0e, 0xd7, 0xc0,
+        0xb6, 0x6e, 0x19, 0xb6, 0xdd, 0x80, 0x6d, 0x4f, 0x5d, 0xd8, 0xea, 0xe9,
+        0xe2, 0x2e, 0xd8, 0x34, 0xe4, 0x8f, 0x10, 0xaf, 0xed, 0x96, 0x1e, 0x6e,
+        0xb7, 0xf6, 0x2e, 0x6d, 0xa2, 0x9f, 0x02, 0x1e, 0xd2, 0x18, 0x7e, 0xcf,
+        0x3d, 0x4a, 0x59, 0x86, 0x72, 0x3e, 0x7f, 0x06, 0x75, 0xf0, 0x3c, 0xf7,
+        0xe7, 0x56, 0x0e, 0xde, 0x65, 0x61, 0xa1, 0x9d, 0x90, 0x86, 0x4d, 0x3c,
+        0xe2, 0x64, 0xe6, 0x08, 0x43, 0x0e, 0xf0, 0xe2, 0x5d, 0xa5, 0xb6, 0x4f,
+        0xde, 0xd9, 0xef, 0x15, 0xb6, 0x1f, 0xf6, 0x1d, 0xce, 0x65, 0xbd, 0xd5,
+        0xf3, 0x21, 0x7d, 0x85, 0xf6, 0xf5, 0x94, 0x93, 0x5e, 0x33, 0xaf, 0x5a,
+        0x9a, 0xa3, 0xbc, 0x8d, 0xca, 0x4e, 0xd0, 0xc9, 0xce, 0x15, 0xb4, 0xa6,
+        0xdd, 0x10, 0x4b, 0xc7, 0xeb, 0xec, 0xfc, 0x0e, 0x18, 0xbe, 0xf1, 0x63,
+        0xd0, 0x87, 0x94, 0x37, 0x37, 0x1b, 0xdf, 0x5c, 0x4e, 0x00, 0xd6, 0xf0,
+        0x99, 0xb4, 0xc9, 0xdf, 0x94, 0x49, 0x55, 0x5a, 0x34, 0xbe, 0x4b, 0xa7,
+        0x8e, 0x9f, 0x56, 0xed, 0xf5, 0xa8, 0x8c, 0x9a, 0x35, 0x3f, 0xcc, 0x35,
+        0xa7, 0x2f, 0xd2, 0xfd, 0xc0, 0xa8, 0xe5, 0xaf, 0x54, 0x29, 0x27, 0xbb,
+        0xed, 0xdc, 0xbf, 0x5c, 0x67, 0xed, 0x5a, 0x97, 0xd7, 0x6e, 0xb4, 0xb2,
+        0x7a, 0x8e, 0x22, 0x5d, 0x0f, 0x44, 0xb5, 0x6f, 0x2b, 0xca, 0x97, 0x46,
+        0x8f, 0xf2, 0x93, 0xb6, 0x12, 0xca, 0x67, 0xfb, 0xdc, 0x36, 0xd0, 0xdb,
+        0x53, 0x6b, 0xec, 0xae, 0xa4, 0x95, 0x9b, 0xf4, 0x83, 0xc3, 0x31, 0x72,
+        0x56, 0x4e, 0xe6, 0xd0, 0xff, 0x94, 0xb3, 0xb3, 0x52, 0x4f, 0x5e, 0x86,
+        0x72, 0x92, 0xf3, 0xb9, 0x57, 0xee, 0x78, 0x90, 0x3c, 0x7a, 0xbb, 0xb6,
+        0xaf, 0xaf, 0xda, 0x71, 0x00, 0xf8, 0x23, 0xfc, 0x8b, 0x9b, 0x60, 0x32,
+        0x40, 0xe7, 0xa6, 0x65, 0xdc, 0xae, 0xdb, 0xf8, 0xf2, 0xfa, 0xf3, 0x6a,
+        0xc7, 0x6f, 0xc6, 0x59, 0x95, 0x85, 0x59, 0xdb, 0xb1, 0xb0, 0xeb, 0x56,
+        0xdb, 0xb2, 0x9c, 0x03, 0xed, 0xd9, 0x46, 0x63, 0x0b, 0x16, 0x69, 0x7f,
+        0x52, 0x76, 0xd1, 0xfe, 0x8c, 0x35, 0x4a, 0x33, 0xe7, 0x33, 0x68, 0xcb,
+        0x68, 0xa7, 0xae, 0x9e, 0xdf, 0x6a, 0xff, 0x91, 0x70, 0x12, 0x6e, 0x43,
+        0x5b, 0x49, 0x45, 0xd8, 0x02, 0x19, 0xf5, 0xaf, 0xd5, 0x6b, 0xa0, 0x68,
+        0xbb, 0xee, 0xf8, 0x76, 0x83, 0x89, 0x31, 0x27, 0xd1, 0x3f, 0xc7, 0x24,
+        0xff, 0xf1, 0x4e, 0x3b, 0xbf, 0x9e, 0x2c, 0xab, 0xd5, 0x3d, 0x97, 0x2d,
+        0xe3, 0x6f, 0xe7, 0x8a, 0x35, 0x0a, 0xf1, 0x17, 0xd2, 0x45, 0x2d, 0x0e,
+        0x49, 0x13, 0xa4, 0x85, 0x90, 0x16, 0xb7, 0x5a, 0x7d, 0x13, 0xd2, 0xde,
+        0xa5, 0xa0, 0xbd, 0xfb, 0x80, 0x27, 0xca, 0x70, 0xc6, 0xed, 0x36, 0xe3,
+        0xf9, 0x08, 0x9e, 0x43, 0x3e, 0xb9, 0x98, 0x0c, 0xa7, 0xfc, 0x66, 0x9b,
+        0x8c, 0x95, 0xfb, 0xa1, 0x9f, 0xcb, 0x36, 0x9c, 0x37, 0xe5, 0xff, 0x57,
+        0xe9, 0x77, 0x35, 0x1a, 0x3b, 0xfd, 0x43, 0x8d, 0x94, 0xaf, 0x9b, 0xe4,
+        0x60, 0x4d, 0xd9, 0xc5, 0xe4, 0x77, 0xed, 0x9c, 0x2f, 0xff, 0x7f, 0x30,
+        0xe7, 0xc4, 0xaa, 0x39, 0xbb, 0x76, 0xce, 0x15, 0xbc, 0x6f, 0xc3, 0xfb,
+        0x16, 0xea, 0x82, 0x64, 0x55, 0xde, 0x58, 0x5c, 0xe8, 0x79, 0xd5, 0xca,
+        0x89, 0x50, 0x46, 0x70, 0x5e, 0x1f, 0xb1, 0x73, 0x78, 0xa0, 0x66, 0x5e,
+        0x1f, 0x79, 0x13, 0xf3, 0xea, 0x5c, 0x31, 0xaf, 0x5d, 0x17, 0x9d, 0x57,
+        0x3d, 0x1e, 0x27, 0x2f, 0x87, 0xf3, 0x8b, 0xc9, 0x8d, 0x05, 0xce, 0x71,
+        0x27, 0xe6, 0x48, 0x18, 0xc2, 0x39, 0x0e, 0xd9, 0x39, 0x8a, 0xea, 0xda,
+        0xf1, 0x73, 0xf8, 0x5d, 0x3b, 0x3f, 0xea, 0xfe, 0x1f, 0x83, 0xa6, 0x9b,
+        0x24, 0xd3, 0xdf, 0x64, 0xe5, 0xff, 0x97, 0xe5, 0xd6, 0x22, 0xd7, 0x3a,
+        0x95, 0x16, 0xd9, 0xa3, 0xf6, 0x15, 0x9f, 0x6d, 0x64, 0x8c, 0x7f, 0x97,
+        0x6f, 0xf5, 0x18, 0xf4, 0xc5, 0x6e, 0xd8, 0x7c, 0x3b, 0x0b, 0x6a, 0x20,
+        0x22, 0x41, 0x70, 0x9b, 0xdf, 0x8c, 0xb1, 0x37, 0x6a, 0x5f, 0x75, 0x6d,
+        0x7c, 0xfd, 0x99, 0x46, 0xf1, 0x68, 0x6f, 0x50, 0x9f, 0x43, 0xdf, 0x1d,
+        0xa3, 0x0d, 0x96, 0x81, 0x9d, 0x9c, 0x4e, 0x44, 0xb4, 0x2d, 0x46, 0x9d,
+        0x98, 0x4a, 0xa4, 0xa5, 0x2c, 0xd9, 0x63, 0xe9, 0x84, 0x12, 0x8e, 0x01,
+        0x5b, 0x0d, 0x36, 0xe4, 0xad, 0x90, 0x35, 0xb7, 0x56, 0xf6, 0xaa, 0x5b,
+        0x60, 0xef, 0xdc, 0x72, 0xf2, 0x03, 0xea, 0x36, 0xd8, 0x3a, 0xb7, 0x9d,
+        0xbc, 0x41, 0xed, 0x83, 0x6d, 0xb3, 0x0f, 0x76, 0xce, 0xbe, 0x0a, 0x6d,
+        0xcf, 0x9b, 0x41, 0x7b, 0x9d, 0x35, 0xb4, 0x46, 0x1b, 0x87, 0xf3, 0x23,
+        0xee, 0x8f, 0x71, 0x0d, 0xfc, 0xa4, 0x7a, 0x45, 0xaf, 0x4b, 0xdb, 0x8a,
+        0xb2, 0xd7, 0x92, 0x55, 0xa1, 0x7e, 0xda, 0x60, 0xe3, 0x46, 0x94, 0xb7,
+        0xaf, 0x45, 0x5b, 0xa4, 0x11, 0x17, 0x78, 0x26, 0xfe, 0x48, 0x5b, 0xb5,
+        0xf3, 0xdf, 0xd4, 0x24, 0x5e, 0x67, 0x93, 0x34, 0xdf, 0x0b, 0xf9, 0x5a,
+        0x4b, 0x53, 0xbc, 0xbb, 0x56, 0xd7, 0x90, 0xb6, 0x28, 0x83, 0x43, 0x7a,
+        0xd8, 0xfa, 0x1a, 0xf2, 0xf7, 0xa2, 0xf4, 0x74, 0x4f, 0x64, 0x28, 0x08,
+        0xc6, 0x07, 0x64, 0x23, 0xe3, 0x01, 0x99, 0x4a, 0x35, 0x26, 0xa0, 0xbc,
+        0xda, 0x98, 0x00, 0xfd, 0xac, 0x47, 0x80, 0xdf, 0x19, 0x5c, 0x22, 0x63,
+        0x8c, 0x3b, 0x54, 0x42, 0xbb, 0xfc, 0x1b, 0xd6, 0x2e, 0x0f, 0xe1, 0x48,
+        0x02, 0x0e, 0x23, 0x9f, 0xd7, 0xea, 0xb9, 0x95, 0xfa, 0x3b, 0xb7, 0x6c,
+        0xd3, 0x26, 0xe5, 0xc6, 0x22, 0xe7, 0x4d, 0x19, 0x4c, 0xdc, 0xd4, 0xca,
+        0xe0, 0x84, 0xb5, 0xa3, 0x50, 0x47, 0xcb, 0xcf, 0xb5, 0xb2, 0x93, 0x72,
+        0x8f, 0xf1, 0xf9, 0x07, 0x7c, 0xd2, 0xfa, 0x7b, 0x24, 0xbd, 0x1c, 0x9f,
+        0x17, 0xd0, 0x9b, 0xf8, 0x91, 0x21, 0xbd, 0xdf, 0xe6, 0xce, 0xca, 0x6e,
+        0x19, 0x8e, 0x33, 0xd6, 0xc9, 0x78, 0x9e, 0x97, 0x9b, 0x05, 0x0f, 0x4c,
+        0x16, 0x15, 0x2c, 0xf8, 0x46, 0x19, 0x73, 0x03, 0xd9, 0xe5, 0x3b, 0x3a,
+        0x76, 0x6c, 0x74, 0xed, 0x4c, 0x93, 0xb1, 0x5d, 0x1d, 0x1d, 0xff, 0x5d,
+        0x04, 0xf5, 0x2d, 0x6a, 0xfb, 0x56, 0x69, 0xfd, 0xbb, 0xa0, 0xeb, 0x7c,
+        0xae, 0x29, 0x8c, 0x63, 0x2e, 0xba, 0x11, 0x5b, 0xaf, 0xb6, 0xfc, 0x8b,
+        0x36, 0x3e, 0x9d, 0x84, 0xec, 0x0f, 0xcb, 0xfe, 0xb0, 0x4e, 0xd9, 0xb7,
+        0xea, 0x94, 0xfd, 0xcf, 0x3a, 0x65, 0x26, 0x2e, 0xb8, 0xb3, 0xf0, 0xf7,
+        0x78, 0x37, 0xa5, 0x7d, 0x77, 0xb1, 0xfb, 0x61, 0xb9, 0xe5, 0x3a, 0x1b,
+        0xac, 0x5f, 0xc6, 0x18, 0xb1, 0x89, 0x0d, 0x67, 0x75, 0x6c, 0xb8, 0xcf,
+        0xdd, 0xa1, 0xf4, 0x5e, 0xca, 0x7e, 0xc6, 0x19, 0xf7, 0x69, 0xbc, 0x10,
+        0x27, 0x5f, 0x61, 0x0c, 0x38, 0xc7, 0xbd, 0xd8, 0xa4, 0xba, 0x18, 0x6d,
+        0x57, 0x6d, 0x13, 0xb3, 0x6e, 0xb4, 0x8b, 0x5b, 0x64, 0x04, 0xb6, 0xc2,
+        0xce, 0x42, 0x9b, 0xec, 0x9a, 0x1e, 0x58, 0x47, 0xbd, 0xb5, 0x7b, 0xda,
+        0xf8, 0x83, 0xfb, 0xc0, 0x57, 0x69, 0x21, 0x8c, 0x29, 0x5f, 0x84, 0x36,
+        0xf1, 0x5a, 0x5b, 0xf8, 0xb5, 0xfb, 0xfb, 0xa5, 0x8b, 0xf4, 0xe7, 0xc0,
+        0x76, 0x78, 0xa3, 0xfd, 0x35, 0xcb, 0xc8, 0x74, 0x88, 0x2b, 0xf5, 0x33,
+        0xb6, 0x8b, 0x5c, 0xa4, 0x9d, 0xb6, 0x4b, 0xe4, 0xe9, 0x65, 0x59, 0xbc,
+        0x15, 0x36, 0x93, 0x04, 0x99, 0x01, 0xe9, 0x8c, 0x88, 0x8e, 0xf1, 0xf8,
+        0x46, 0x36, 0xf7, 0x70, 0x6f, 0x07, 0xf4, 0x6f, 0x6c, 0x15, 0x13, 0x37,
+        0x0d, 0xed, 0x94, 0x7a, 0xb4, 0x7b, 0x9d, 0xa5, 0x5d, 0xee, 0xb9, 0xee,
+        0xa6, 0xcc, 0xd5, 0x6b, 0x42, 0x3a, 0xde, 0x55, 0x90, 0x64, 0x48, 0xc7,
+        0x8b, 0x92, 0x5e, 0x41, 0xc7, 0x8b, 0x32, 0xa4, 0xe9, 0xb8, 0x71, 0x05,
+        0x1d, 0x77, 0x5a, 0x3a, 0xde, 0x13, 0x33, 0x74, 0xa1, 0xb4, 0x9e, 0x22,
+        0x9d, 0x1a, 0x3a, 0x76, 0x34, 0x1d, 0x2f, 0xe2, 0x1e, 0xf5, 0xae, 0xb3,
+        0x75, 0x22, 0xb6, 0x8c, 0xbf, 0xc3, 0x32, 0xca, 0xc5, 0x4f, 0xc6, 0x8c,
+        0x5e, 0x1a, 0x02, 0x1d, 0x85, 0xe5, 0xfb, 0x6d, 0xfc, 0xa0, 0xb6, 0xcc,
+        0xc4, 0x47, 0x76, 0x16, 0xc6, 0x62, 0x2b, 0xe9, 0x73, 0x08, 0xf4, 0x19,
+        0xd6, 0x79, 0x2d, 0xfa, 0x6c, 0xb6, 0xfb, 0x16, 0x71, 0xbd, 0x2f, 0x9f,
+        0x8e, 0x1b, 0x5a, 0xbd, 0x45, 0xcf, 0x9d, 0xf3, 0x3e, 0xfb, 0x06, 0x68,
+        0xd5, 0xac, 0xcd, 0xb9, 0xaa, 0xbf, 0xcd, 0x58, 0x54, 0xd2, 0xc4, 0xb0,
+        0x19, 0x27, 0xbd, 0x98, 0xed, 0x68, 0xe4, 0x53, 0x83, 0x96, 0x4f, 0xad,
+        0x63, 0xcc, 0x35, 0xa8, 0xca, 0xec, 0x01, 0xe8, 0x0a, 0xda, 0xd8, 0x5a,
+        0x4e, 0xe3, 0x5d, 0x67, 0x32, 0x53, 0x78, 0x35, 0x88, 0x78, 0x8c, 0x0f,
+        0x71, 0x5f, 0x40, 0xc6, 0x1c, 0x94, 0x75, 0x95, 0xcd, 0xbc, 0x94, 0xd7,
+        0x8a, 0xe7, 0x01, 0xe9, 0x2a, 0x2b, 0xf9, 0xe8, 0x74, 0x8b, 0xec, 0x2f,
+        0x44, 0xe5, 0xe3, 0x68, 0xff, 0xb1, 0x82, 0x0b, 0x7f, 0xfc, 0x4c, 0x8c,
+        0x76, 0xe1, 0xbe, 0x02, 0xf7, 0x27, 0x59, 0x37, 0xbe, 0x6a, 0x7f, 0x36,
+        0x22, 0x5d, 0x3d, 0x79, 0x78, 0x2a, 0x12, 0xdd, 0x03, 0x38, 0x9a, 0x86,
+        0x86, 0xe4, 0x07, 0x03, 0x1b, 0x51, 0xf6, 0xb2, 0x1d, 0x6f, 0xd4, 0x31,
+        0xf1, 0xde, 0x41, 0x79, 0x77, 0x65, 0x48, 0xae, 0xaf, 0x98, 0x3d, 0xd5,
+        0xea, 0x9e, 0x69, 0xca, 0x5d, 0x80, 0xfe, 0x49, 0xbb, 0x41, 0x70, 0xce,
+        0xc3, 0xaa, 0x1f, 0x89, 0x4a, 0xac, 0x27, 0x95, 0x58, 0x10, 0xf3, 0x7c,
+        0xbe, 0xfc, 0x0f, 0xc1, 0x58, 0x3c, 0x2a, 0x3f, 0xf0, 0x38, 0xc7, 0x41,
+        0xb9, 0xae, 0x5c, 0x3b, 0x36, 0x97, 0xf3, 0x0f, 0x63, 0xdc, 0xa7, 0xc8,
+        0x54, 0x16, 0x62, 0x8c, 0xa5, 0xd3, 0xe7, 0xe8, 0x7a, 0x1b, 0xfc, 0x38,
+        0x48, 0xee, 0xae, 0xb7, 0x81, 0x6e, 0xe2, 0xd0, 0xf9, 0x57, 0x01, 0xc6,
+        0xab, 0x18, 0xfb, 0x62, 0xcc, 0x8b, 0xcf, 0x5f, 0xc7, 0xb8, 0x6c, 0xfb,
+        0x1b, 0xd6, 0x5e, 0xe6, 0xfa, 0x1b, 0xde, 0xa9, 0xaf, 0x77, 0x5a, 0xc7,
+        0x62, 0x43, 0xe2, 0xc4, 0xde, 0x91, 0x90, 0x75, 0x5e, 0xed, 0xf8, 0xdc,
+        0x27, 0x86, 0xc5, 0x38, 0x20, 0xd1, 0xdd, 0xdb, 0x07, 0x65, 0x04, 0xf3,
+        0xdb, 0xb9, 0x66, 0x7e, 0xf7, 0x08, 0xe3, 0xab, 0xe7, 0x0b, 0x9c, 0x43,
+        0x75, 0x5e, 0xea, 0x0b, 0x66, 0x5e, 0xb1, 0x9e, 0xd5, 0xf3, 0xd1, 0xed,
+        0xd5, 0x09, 0xc0, 0xf2, 0x35, 0x9d, 0x57, 0x10, 0x04, 0x6f, 0xed, 0x39,
+        0x1f, 0x24, 0x2f, 0x49, 0xf5, 0x2e, 0x54, 0xf7, 0x77, 0xc6, 0x22, 0x43,
+        0x69, 0xad, 0xcf, 0xf0, 0x9c, 0xcc, 0x96, 0xd3, 0x58, 0x47, 0x89, 0x66,
+        0xfb, 0xa3, 0x9a, 0x4f, 0xb2, 0x5e, 0xda, 0xee, 0x61, 0x85, 0x3e, 0x54,
+        0x10, 0x28, 0x6f, 0xb5, 0xdc, 0xa0, 0xbe, 0xc2, 0xdc, 0xe5, 0xdf, 0xda,
+        0x1c, 0x96, 0x5e, 0xc6, 0xb3, 0xc6, 0xa2, 0x43, 0xb1, 0x64, 0xbe, 0xec,
+        0xe1, 0x77, 0x0b, 0xee, 0x3b, 0x60, 0xaf, 0xf8, 0xb0, 0x67, 0x24, 0xae,
+        0x8c, 0x6c, 0x00, 0x2d, 0xf7, 0xe4, 0x94, 0x22, 0x6f, 0xba, 0xc9, 0xc9,
+        0x72, 0x3c, 0x59, 0x2a, 0x7f, 0x96, 0xed, 0x51, 0xb7, 0x5e, 0x2c, 0xcf,
+        0xc8, 0x86, 0xa7, 0x2a, 0x1c, 0x83, 0xfe, 0xef, 0x1b, 0x19, 0x23, 0x6a,
+        0xfb, 0x66, 0x9f, 0x21, 0x5e, 0xa2, 0x74, 0xc9, 0xf1, 0x2f, 0x6d, 0x7d,
+        0x13, 0xce, 0xef, 0xb3, 0x16, 0xee, 0xd5, 0xe3, 0xbe, 0xa0, 0xed, 0x97,
+        0xd3, 0x15, 0xda, 0x8c, 0xdc, 0xdf, 0x49, 0x1d, 0x9f, 0x11, 0xc2, 0x11,
+        0x04, 0xcf, 0xf9, 0x46, 0x77, 0x3f, 0x55, 0xe1, 0x1e, 0x47, 0x10, 0xfc,
+        0x88, 0x76, 0xf1, 0xde, 0x22, 0xc6, 0x0b, 0x71, 0xb0, 0x35, 0x17, 0x85,
+        0x5c, 0x9c, 0x1a, 0x20, 0x7e, 0x05, 0x1e, 0x6a, 0x8f, 0x7b, 0xa3, 0xc4,
+        0x92, 0x9f, 0x2a, 0xb7, 0x24, 0x3f, 0x5d, 0x76, 0x81, 0x67, 0xce, 0x3b,
+        0x9e, 0x9c, 0xb0, 0x73, 0xce, 0x96, 0x89, 0xdf, 0xd7, 0xda, 0x87, 0x7c,
+        0x61, 0x85, 0xbf, 0x44, 0x98, 0xaa, 0xb0, 0x10, 0xb6, 0xa4, 0xc5, 0x4d,
+        0x10, 0xfc, 0xd8, 0x37, 0x6b, 0x3a, 0x55, 0x94, 0x29, 0x8c, 0x9b, 0xdb,
+        0xac, 0x88, 0x87, 0x58, 0xf2, 0x0e, 0x8c, 0xfd, 0x29, 0x8c, 0xbd, 0xbf,
+        0xcc, 0xf1, 0x20, 0x2b, 0x30, 0xf7, 0xa9, 0x4a, 0x08, 0x6f, 0xbd, 0xb1,
+        0xc3, 0x35, 0xef, 0xb5, 0x36, 0x5e, 0xf8, 0xac, 0x11, 0xd9, 0xae, 0xbc,
+        0x7e, 0xd0, 0xd7, 0xe2, 0xa6, 0xa8, 0xfc, 0x22, 0xe4, 0x6e, 0x20, 0x8f,
+        0x42, 0x9e, 0x2d, 0x6a, 0xba, 0xc9, 0x5c, 0xce, 0xff, 0x23, 0xf2, 0xeb,
+        0xeb, 0x18, 0x5f, 0x1e, 0xf6, 0x68, 0xbb, 0x2e, 0x05, 0x8b, 0x1e, 0xe5,
+        0xf3, 0x06, 0x99, 0x71, 0x73, 0xbd, 0xd0, 0x15, 0x28, 0x6b, 0xa5, 0xbf,
+        0x9d, 0xcc, 0x44, 0x52, 0xc9, 0x49, 0x61, 0x3e, 0x14, 0x73, 0x15, 0x98,
+        0x23, 0x44, 0xd9, 0x10, 0x85, 0xcc, 0xe3, 0x1a, 0x9a, 0xf1, 0x26, 0xcb,
+        0xd5, 0xba, 0x07, 0x84, 0x7b, 0x86, 0xa9, 0xc4, 0x3e, 0x6d, 0x9f, 0x88,
+        0x8c, 0x17, 0x58, 0x77, 0x3b, 0xac, 0x13, 0xaf, 0xa6, 0xbe, 0xce, 0xe1,
+        0x02, 0x9f, 0x87, 0x71, 0xac, 0x58, 0x2c, 0x53, 0x90, 0x97, 0x23, 0x03,
+        0xf2, 0x32, 0xed, 0xce, 0x61, 0xd0, 0xb6, 0xeb, 0xf1, 0xbd, 0x29, 0xcf,
+        0xf8, 0xb2, 0x94, 0x19, 0xec, 0xa3, 0x9d, 0x9d, 0x53, 0x9a, 0x27, 0x44,
+        0xa1, 0x6d, 0x2c, 0x5b, 0x96, 0x91, 0x6c, 0xc1, 0xc6, 0x7a, 0x46, 0x39,
+        0xe7, 0x0d, 0x35, 0x73, 0x6f, 0x95, 0x28, 0x60, 0x1a, 0x89, 0x24, 0x9d,
+        0x06, 0xef, 0x23, 0x2d, 0x46, 0xe7, 0x43, 0xee, 0xb7, 0xdd, 0xdf, 0xce,
+        0x3d, 0x53, 0x05, 0x1f, 0x5a, 0xb5, 0xdf, 0x7e, 0x8d, 0x1a, 0xfa, 0xf3,
+        0x04, 0xf4, 0xa0, 0x95, 0x95, 0xb1, 0x91, 0xae, 0x65, 0xfa, 0xe6, 0xf8,
+        0xd2, 0x1e, 0xf1, 0x92, 0x23, 0xc3, 0x65, 0x51, 0x91, 0x21, 0x37, 0x36,
+        0x5c, 0x5e, 0x49, 0xf3, 0x4f, 0x55, 0xfe, 0xbd, 0xb5, 0x05, 0x6b, 0x63,
+        0xaa, 0xb5, 0xef, 0xc8, 0x77, 0x2b, 0xf6, 0x2b, 0x92, 0x26, 0x07, 0x86,
+        0xfb, 0xb4, 0x5c, 0x93, 0xf4, 0x5b, 0x1b, 0xa0, 0x7c, 0x66, 0xb4, 0x8f,
+        0xc6, 0x9c, 0x8b, 0x98, 0xcd, 0x3d, 0x33, 0xb8, 0x4e, 0x97, 0x1d, 0x99,
+        0x82, 0x7c, 0x38, 0x20, 0x7f, 0x1f, 0xa4, 0xe3, 0xe6, 0xbd, 0x59, 0x5f,
+        0xd6, 0xe7, 0x5e, 0x44, 0xb3, 0xe4, 0x4f, 0x46, 0x25, 0x77, 0x92, 0x7b,
+        0x60, 0xcf, 0xed, 0xaf, 0xe6, 0x6d, 0x50, 0x0e, 0x70, 0xbf, 0xd6, 0x91,
+        0x3c, 0xfc, 0xda, 0x11, 0xee, 0xc3, 0xf7, 0xff, 0x1f, 0xf4, 0xc1, 0x7a,
+        0x61, 0xdb, 0x16, 0xb4, 0x6d, 0xb4, 0x6d, 0x47, 0xef, 0x78, 0x73, 0x6d,
+        0x5b, 0xd1, 0x36, 0x16, 0x8e, 0xfb, 0x06, 0xdb, 0x6a, 0x7c, 0x5e, 0x33,
+        0x5c, 0x28, 0x2e, 0xc1, 0x4f, 0x4e, 0x4c, 0x48, 0xda, 0x19, 0x1f, 0xd0,
+        0xf3, 0xb9, 0x66, 0xb8, 0x0c, 0x38, 0xe2, 0x41, 0x90, 0xf7, 0x43, 0x3d,
+        0xcc, 0x7f, 0xc7, 0x44, 0x3c, 0x96, 0x71, 0xdf, 0x92, 0xfe, 0x04, 0xa3,
+        0xa4, 0x2e, 0xf3, 0xd9, 0x24, 0xcf, 0xfd, 0xc9, 0xf8, 0x46, 0xdc, 0x55,
+        0x17, 0x71, 0x92, 0xf5, 0x18, 0xef, 0xdd, 0x68, 0xcb, 0x23, 0x2c, 0x4f,
+        0x45, 0x21, 0x4b, 0x4c, 0x79, 0xc4, 0x96, 0x03, 0x26, 0x3f, 0x9f, 0x04,
+        0xb7, 0xd9, 0x72, 0x3e, 0x2b, 0x5d, 0x6e, 0x9e, 0x0d, 0x0f, 0x8d, 0x09,
+        0xe3, 0x3a, 0x99, 0xeb, 0x1a, 0x64, 0x2b, 0xd6, 0x87, 0x3e, 0xa3, 0x23,
+        0xcd, 0x80, 0xe3, 0x9c, 0xff, 0x76, 0xd8, 0xd6, 0x81, 0xfc, 0xc0, 0x37,
+        0xf4, 0x3f, 0x2b, 0x3d, 0x69, 0xe5, 0x30, 0x07, 0x20, 0x90, 0x9d, 0xfe,
+        0xb6, 0xc4, 0x2e, 0xfc, 0x1e, 0xef, 0x4f, 0xca, 0xec, 0x20, 0xe8, 0xb1,
+        0x9f, 0xbc, 0xb1, 0x15, 0x36, 0x0f, 0x7e, 0xf7, 0xb4, 0xc8, 0x92, 0x9b,
+        0x73, 0xd7, 0xc1, 0x5f, 0x1b, 0xc1, 0xac, 0xe6, 0x0a, 0x9e, 0x7b, 0x1b,
+        0x84, 0x5c, 0xda, 0xed, 0xc1, 0xbd, 0x76, 0xbe, 0xdf, 0xc2, 0x7c, 0x7f,
+        0xad, 0x59, 0x9a, 0x59, 0x5e, 0x5b, 0xb7, 0x51, 0xf6, 0xb8, 0xdb, 0xdd,
+        0xd8, 0x8a, 0xba, 0xe7, 0x51, 0x97, 0x65, 0x9e, 0xcb, 0x1c, 0x9d, 0xd9,
+        0x32, 0xe9, 0xcc, 0xc0, 0xda, 0xd5, 0x13, 0x04, 0xd7, 0xf9, 0x1c, 0x37,
+        0x08, 0xae, 0xf7, 0xfb, 0xdc, 0x67, 0xe5, 0xf9, 0xc0, 0xd8, 0x54, 0x21,
+        0xed, 0x3c, 0x67, 0xe5, 0x75, 0x10, 0xbc, 0xec, 0xf7, 0xca, 0xef, 0x54,
+        0x52, 0x8f, 0xd3, 0xe7, 0x3e, 0x83, 0xe7, 0x33, 0xbe, 0xc9, 0x2b, 0xfa,
+        0x13, 0xb4, 0x8b, 0xab, 0x7e, 0xd0, 0xb0, 0x27, 0x5f, 0xd4, 0x3e, 0x3a,
+        0xf1, 0x67, 0x62, 0xfc, 0x55, 0x18, 0x30, 0x61, 0x2f, 0xb3, 0xc9, 0x65,
+        0x7e, 0xa0, 0xa6, 0xdf, 0xda, 0x77, 0x0a, 0xef, 0x58, 0x16, 0x04, 0x97,
+        0x0c, 0xfc, 0x31, 0xe6, 0x94, 0x2a, 0x71, 0xef, 0xee, 0x03, 0x9a, 0xff,
+        0x04, 0x7e, 0x3d, 0xe9, 0x24, 0xea, 0x2a, 0xe5, 0x1d, 0xee, 0x52, 0xa9,
+        0x9c, 0xc8, 0x5b, 0xb0, 0xfe, 0x5c, 0x63, 0x30, 0x48, 0x1b, 0x60, 0xdf,
+        0xb6, 0xbd, 0xd9, 0xc4, 0x92, 0xe8, 0x4b, 0xa7, 0x37, 0xc1, 0xd7, 0xd5,
+        0xf6, 0x4c, 0x14, 0x7c, 0x3d, 0xd1, 0x16, 0x04, 0xef, 0xf7, 0xc3, 0x35,
+        0xb3, 0xb1, 0x6a, 0xe8, 0xf8, 0x6c, 0xff, 0xb9, 0x66, 0x63, 0xc7, 0x31,
+        0x4f, 0x30, 0xa9, 0xe3, 0xfa, 0xaa, 0x1d, 0x3a, 0x64, 0xdb, 0x57, 0x39,
+        0x7e, 0x8e, 0xe5, 0xef, 0xf3, 0x43, 0x98, 0xaa, 0xed, 0xb3, 0xfd, 0xeb,
+        0xac, 0xcd, 0x19, 0x05, 0x2e, 0x3d, 0xb7, 0x4b, 0xfd, 0x4d, 0x60, 0x74,
+        0x6b, 0x48, 0xc3, 0x7f, 0x17, 0x3c, 0x18, 0x37, 0xcf, 0x99, 0x6d, 0xec,
+        0x63, 0xab, 0x4c, 0x6e, 0xc3, 0x73, 0xf4, 0x5a, 0xdc, 0x87, 0x2f, 0x8b,
+        0xc8, 0x15, 0x89, 0x61, 0xb5, 0xcd, 0x7d, 0x50, 0xfa, 0xac, 0x8c, 0xfb,
+        0x1a, 0xf4, 0x7d, 0x0e, 0xfe, 0x78, 0x93, 0x3c, 0x08, 0x9a, 0x56, 0x03,
+        0xa9, 0xe4, 0x82, 0x4a, 0xf5, 0xce, 0xa8, 0x94, 0x3f, 0xa6, 0xae, 0xe7,
+        0xbc, 0x06, 0x89, 0x8b, 0x19, 0xe2, 0xb7, 0x08, 0xfc, 0x17, 0x81, 0xe3,
+        0x8b, 0xee, 0xf1, 0xfa, 0x56, 0xb7, 0x18, 0xfd, 0x96, 0xd3, 0xb4, 0x69,
+        0xec, 0xf2, 0x3f, 0xf6, 0xc3, 0x35, 0x84, 0x6d, 0xc8, 0x1c, 0x99, 0xba,
+        0x6b, 0x94, 0xe5, 0x1a, 0x41, 0x31, 0xe4, 0x40, 0xf7, 0xa9, 0xe4, 0x84,
+        0x5a, 0x0a, 0x36, 0xed, 0xe8, 0xee, 0x7d, 0x42, 0xf7, 0x93, 0xf2, 0xd3,
+        0x2a, 0x0f, 0x78, 0xb6, 0x4a, 0xd3, 0x0e, 0xe2, 0x99, 0xb0, 0xc6, 0x18,
+        0x4f, 0x72, 0xef, 0x40, 0xdd, 0x31, 0xa5, 0xf7, 0xa0, 0x6d, 0x1d, 0xc2,
+        0x1c, 0x5f, 0x2f, 0xcd, 0xd4, 0x43, 0x8c, 0x93, 0xbd, 0x96, 0x2e, 0x84,
+        0x4c, 0x3a, 0x46, 0x19, 0x18, 0x31, 0xb1, 0xdf, 0xca, 0xcf, 0xa1, 0x9d,
+        0xce, 0x67, 0x89, 0x45, 0x21, 0xa3, 0xa6, 0xc0, 0xc5, 0x87, 0x8e, 0x49,
+        0xb4, 0xc1, 0xfb, 0x5f, 0xcd, 0xc6, 0x6f, 0xa2, 0x0f, 0xc5, 0xb1, 0x1b,
+        0x24, 0xbf, 0x26, 0xde, 0x52, 0x02, 0xfc, 0xcd, 0x32, 0x79, 0x8c, 0x6b,
+        0x11, 0x85, 0xcc, 0xe1, 0xd8, 0x12, 0xcd, 0xf4, 0x07, 0xc1, 0x38, 0xcb,
+        0x4f, 0x92, 0x7f, 0x25, 0xc5, 0x77, 0xb9, 0x93, 0x0b, 0x9b, 0xd4, 0x0a,
+        0x59, 0xdb, 0x62, 0xe1, 0xd0, 0x78, 0x92, 0x92, 0x96, 0x23, 0xd4, 0x37,
+        0xb7, 0xd5, 0xc0, 0x33, 0x7a, 0xc7, 0x94, 0xd7, 0xf8, 0x26, 0xe0, 0xf9,
+        0x3d, 0xc0, 0xd3, 0x62, 0xe1, 0x69, 0x5c, 0x05, 0x4f, 0x4b, 0x08, 0x0f,
+        0xe4, 0x1c, 0xe5, 0x6a, 0xec, 0x9a, 0x74, 0x59, 0x9c, 0xbc, 0x27, 0x9d,
+        0x4a, 0xfb, 0x2f, 0xd4, 0x37, 0x8d, 0xee, 0xf8, 0x80, 0x2b, 0xe3, 0x5a,
+        0xd7, 0x44, 0xaf, 0xe9, 0x2e, 0x2f, 0xc0, 0x7a, 0x15, 0x27, 0xe3, 0x11,
+        0xf6, 0x7a, 0x76, 0xd5, 0x3d, 0x90, 0xff, 0x8b, 0xa9, 0xa8, 0xb5, 0x25,
+        0x4a, 0x3e, 0xfd, 0x96, 0xb8, 0xde, 0xdb, 0xaf, 0xc2, 0xf4, 0x12, 0x60,
+        0x82, 0x3c, 0x3e, 0xd6, 0xe7, 0x8e, 0xca, 0xa5, 0xda, 0x37, 0xb3, 0xb8,
+        0xc6, 0xdc, 0x62, 0x35, 0x73, 0x83, 0xfe, 0x53, 0xe1, 0xdc, 0x20, 0x13,
+        0x51, 0xaf, 0x24, 0xf7, 0x5b, 0x5c, 0xb4, 0x62, 0x4e, 0xb1, 0x9a, 0xf9,
+        0x74, 0x27, 0xf6, 0xb3, 0xcc, 0xcc, 0xa7, 0x27, 0xef, 0xc5, 0x2c, 0x7e,
+        0x57, 0xc3, 0x58, 0xf5, 0x17, 0x67, 0x24, 0x90, 0x29, 0x1f, 0x6b, 0xd4,
+        0x4b, 0xff, 0x24, 0x66, 0xf3, 0x98, 0x15, 0x9e, 0x37, 0x58, 0xfe, 0x72,
+        0x25, 0xaf, 0xfd, 0xb7, 0x2f, 0xad, 0x37, 0x7c, 0x1a, 0xb5, 0xf9, 0x6b,
+        0xfc, 0xdd, 0xb1, 0xde, 0xee, 0xef, 0xe7, 0xd2, 0xf2, 0xfb, 0xeb, 0x69,
+        0x97, 0x34, 0x78, 0x43, 0xab, 0xca, 0x62, 0x28, 0xbb, 0x7d, 0xbd, 0x95,
+        0x0b, 0x28, 0xbb, 0x07, 0x7e, 0x1a, 0xf3, 0x34, 0xf8, 0x8e, 0x32, 0xb8,
+        0x16, 0x27, 0x7d, 0x60, 0x45, 0xf2, 0x3c, 0xe5, 0x22, 0x6d, 0x4a, 0xcc,
+        0x51, 0x7d, 0x27, 0x8c, 0xa3, 0xe3, 0x77, 0x3d, 0xdb, 0x9f, 0xf8, 0x26,
+        0xae, 0xe5, 0xdb, 0x53, 0xe0, 0xfb, 0x03, 0xbe, 0x13, 0x9d, 0x65, 0x1e,
+        0x80, 0xa6, 0xe1, 0xda, 0xbe, 0xaf, 0x47, 0xdf, 0x21, 0x2d, 0x93, 0x5e,
+        0xae, 0xd7, 0x74, 0xd3, 0x44, 0x5d, 0x7c, 0x8c, 0xf4, 0xc7, 0x58, 0x72,
+        0xb3, 0xd6, 0x8f, 0xd5, 0x75, 0x6c, 0x82, 0xae, 0x89, 0x1b, 0x1e, 0x75,
+        0xcd, 0x7e, 0x77, 0xb5, 0xbf, 0x31, 0xf4, 0x47, 0x3b, 0x0d, 0x7e, 0xba,
+        0xc7, 0x68, 0x0e, 0xe5, 0x97, 0x13, 0x55, 0x57, 0x6a, 0x3f, 0x33, 0xa6,
+        0xf3, 0x8e, 0x96, 0xeb, 0x4e, 0xd8, 0xb1, 0x49, 0xb7, 0x26, 0xfe, 0x5f,
+        0x1d, 0x5f, 0x1c, 0xb5, 0x4d, 0x40, 0x65, 0x8d, 0x32, 0x35, 0x40, 0x1a,
+        0xe5, 0xdc, 0xb5, 0x0d, 0x75, 0x0d, 0xed, 0x08, 0x43, 0x9f, 0xb4, 0x9d,
+        0xa2, 0xd7, 0x64, 0x0b, 0x8d, 0xc6, 0x67, 0x89, 0xcb, 0xe6, 0x06, 0x9d,
+        0x47, 0x80, 0xb2, 0x72, 0xa8, 0xcb, 0xa2, 0x32, 0xdb, 0xff, 0xbf, 0x83,
+        0xf4, 0x5e, 0xd6, 0xad, 0xbb, 0x6f, 0x9f, 0x98, 0x11, 0x8d, 0xa7, 0xbf,
+        0xa8, 0xe2, 0xc9, 0xce, 0x2d, 0xbe, 0x7a, 0x6e, 0x05, 0xc0, 0x7b, 0x0f,
+        0x64, 0x27, 0xd7, 0xc9, 0xe4, 0x6f, 0x3f, 0x2e, 0x4e, 0x34, 0xd3, 0x5b,
+        0x6f, 0x6e, 0xa5, 0x10, 0xaf, 0x9c, 0x1b, 0x68, 0x35, 0x9c, 0x17, 0x69,
+        0x3b, 0xae, 0xf7, 0x89, 0x94, 0x22, 0x2c, 0xad, 0xab, 0x70, 0x1b, 0xd2,
+        0x9d, 0xa1, 0xb9, 0xa7, 0x34, 0xcd, 0xb5, 0x58, 0x9a, 0x43, 0x5d, 0x97,
+        0xfb, 0xde, 0xa3, 0x2d, 0x55, 0x9a, 0xdb, 0x60, 0x69, 0xee, 0x99, 0xf5,
+        0x66, 0x4f, 0xfc, 0xfd, 0x2d, 0x66, 0x4f, 0xea, 0x2f, 0x57, 0x3d, 0x6f,
+        0xa2, 0xcd, 0x08, 0x5f, 0x2c, 0x7c, 0xae, 0x85, 0xf5, 0x0c, 0x60, 0xad,
+        0x95, 0x35, 0x4d, 0x36, 0xee, 0xc6, 0xfd, 0x73, 0xfa, 0x7d, 0x51, 0x79,
+        0x14, 0x76, 0x50, 0xbe, 0xfc, 0x8f, 0xc1, 0x02, 0x7c, 0xbf, 0xa9, 0x65,
+        0xdd, 0x7b, 0x5b, 0x0b, 0xf9, 0x6d, 0x06, 0xbf, 0x0e, 0xd6, 0xf8, 0x3c,
+        0x98, 0x2f, 0xca, 0xfe, 0x01, 0xeb, 0x01, 0xb9, 0xbc, 0x5c, 0x97, 0x31,
+        0x0b, 0xe3, 0xe3, 0x30, 0x66, 0x68, 0xf6, 0x13, 0x29, 0xe7, 0xef, 0x84,
+        0x4f, 0x74, 0x0f, 0xf4, 0x24, 0xe9, 0xfb, 0xa5, 0x16, 0x93, 0xe7, 0x1b,
+        0x87, 0x1e, 0xfb, 0x65, 0x9b, 0x0b, 0x75, 0xf8, 0x57, 0xeb, 0xe7, 0xf8,
+        0x82, 0xf6, 0x1d, 0xd2, 0xcc, 0xdf, 0xb7, 0x98, 0x98, 0xf1, 0xb7, 0x5a,
+        0xc8, 0x67, 0x6a, 0xdb, 0x0f, 0x37, 0x68, 0xbe, 0x70, 0xc2, 0xe7, 0xcf,
+        0xb4, 0xae, 0x7c, 0x0e, 0xdb, 0x3d, 0xd9, 0xba, 0xb2, 0x5d, 0x58, 0xfe,
+        0x73, 0x1b, 0x57, 0x96, 0x5f, 0xe3, 0xae, 0x6c, 0xff, 0xf5, 0x55, 0xcf,
+        0x2d, 0x9b, 0x56, 0x3e, 0x5f, 0xbd, 0xea, 0x79, 0x6a, 0xd5, 0xf3, 0x85,
+        0x55, 0xcf, 0x57, 0xb5, 0xad, 0x7c, 0xbe, 0xbd, 0xad, 0x3e, 0xbc, 0x87,
+        0xdb, 0x56, 0xc2, 0x75, 0xa7, 0x8e, 0xf7, 0xcf, 0x54, 0xa2, 0xb2, 0xab,
+        0x80, 0xf7, 0x4e, 0xe7, 0x66, 0xa3, 0xd7, 0x6a, 0xdf, 0x33, 0xbe, 0xf6,
+        0xd7, 0xab, 0xfa, 0xab, 0xb6, 0xdb, 0x5d, 0x6d, 0xe7, 0x57, 0xdb, 0x19,
+        0xd9, 0x36, 0x5b, 0xe1, 0x3b, 0x96, 0x87, 0xfd, 0x9a, 0xb6, 0x53, 0xc5,
+        0x4e, 0x9d, 0x0b, 0x3b, 0xaa, 0x73, 0x61, 0x93, 0xe0, 0xc3, 0x3b, 0x75,
+        0x4c, 0x69, 0x93, 0x42, 0x79, 0xa5, 0x55, 0xc7, 0x95, 0x74, 0x2c, 0xb5,
+        0x30, 0x0a, 0xdb, 0x96, 0x39, 0xb0, 0x81, 0xec, 0xf1, 0xcd, 0xdd, 0xe4,
+        0xc4, 0x1e, 0x0e, 0x86, 0xdd, 0x20, 0x98, 0xf4, 0x6e, 0xb3, 0xf9, 0x62,
+        0xb8, 0x57, 0x4c, 0x1b, 0xea, 0xe0, 0x27, 0xa0, 0x83, 0xab, 0xba, 0xf7,
+        0x4e, 0x8c, 0xb5, 0x00, 0x9a, 0x19, 0x90, 0xdf, 0xad, 0xa4, 0xbe, 0x24,
+        0xfa, 0xcc, 0x4d, 0x3f, 0x6c, 0xb8, 0xa5, 0x4f, 0xbd, 0xdf, 0xf3, 0x61,
+        0xeb, 0x05, 0xf2, 0xb0, 0x3f, 0x08, 0x1a, 0xea, 0x85, 0xbd, 0xe7, 0x69,
+        0xbf, 0xf4, 0xb4, 0xa6, 0x2d, 0xd2, 0x58, 0x8b, 0xce, 0xd7, 0x7f, 0xd4,
+        0x77, 0x62, 0x99, 0xfe, 0x3f, 0x32, 0x71, 0x1a, 0xbf, 0xdb, 0xfd, 0x1a,
+        0xf8, 0x76, 0xa7, 0xb7, 0x05, 0x3e, 0x0a, 0x69, 0x88, 0xf1, 0xaf, 0xcb,
+        0x75, 0x1e, 0x21, 0x03, 0x68, 0x33, 0x51, 0xc6, 0x09, 0x53, 0x83, 0x63,
+        0xc2, 0x79, 0xa7, 0x12, 0x49, 0xa5, 0xed, 0xaa, 0xe0, 0x46, 0x9f, 0x39,
+        0xb6, 0xdc, 0x63, 0x21, 0x3f, 0xef, 0xff, 0xf4, 0x94, 0x97, 0x73, 0x23,
+        0x36, 0x2f, 0x37, 0x53, 0x30, 0xb4, 0x39, 0x41, 0xda, 0x84, 0x3f, 0xb5,
+        0xd8, 0xff, 0xb7, 0x01, 0xed, 0xfb, 0xa4, 0x22, 0xed, 0xff, 0x4d, 0x30,
+        0x17, 0x65, 0x5f, 0x84, 0x7b, 0xff, 0xa7, 0x33, 0x1a, 0x57, 0x77, 0xca,
+        0x81, 0x22, 0x6d, 0xe1, 0x98, 0xce, 0xe7, 0x18, 0xf7, 0x69, 0xa7, 0xc5,
+        0x80, 0xc7, 0x0f, 0x01, 0x7f, 0x2d, 0xb0, 0xb9, 0x47, 0x50, 0x27, 0x22,
+        0x63, 0x60, 0xf1, 0xd9, 0x02, 0xf9, 0x93, 0xf7, 0x28, 0xea, 0xbb, 0x32,
+        0x5f, 0xb8, 0x59, 0xe7, 0xdb, 0x9d, 0x46, 0xdb, 0x27, 0x71, 0xcd, 0x16,
+        0x26, 0xd0, 0x66, 0xaf, 0xae, 0x3f, 0x5b, 0x62, 0x8e, 0xb2, 0x40, 0x2e,
+        0xed, 0x97, 0xfc, 0x5c, 0x97, 0x8c, 0xc5, 0x17, 0x66, 0xa2, 0xcb, 0x71,
+        0x99, 0x8f, 0x6f, 0xe0, 0x1e, 0x47, 0xfe, 0x4a, 0xee, 0x07, 0x4b, 0x74,
+        0x74, 0xbb, 0xea, 0x6d, 0xd3, 0x3e, 0xd7, 0xa0, 0xec, 0xac, 0x0c, 0xc9,
+        0x4d, 0x95, 0xcf, 0x6e, 0x36, 0xb1, 0xa8, 0x15, 0xf1, 0xad, 0xc3, 0xc4,
+        0x8a, 0x3a, 0x1a, 0xe5, 0xb9, 0x25, 0x99, 0x3d, 0x25, 0x12, 0x39, 0x1a,
+        0xc6, 0x12, 0x59, 0xe6, 0x4a, 0xd7, 0x95, 0x80, 0xeb, 0x14, 0x64, 0x6b,
+        0x3c, 0x26, 0x5f, 0xdc, 0x16, 0x8e, 0x95, 0x0b, 0xa6, 0xb7, 0xe5, 0xe4,
+        0xd3, 0xb8, 0xb2, 0x57, 0xa6, 0x4a, 0x19, 0xc5, 0x71, 0xbf, 0x13, 0x50,
+        0x96, 0xa9, 0x21, 0x4f, 0x72, 0x6d, 0xe1, 0xd8, 0xf0, 0x6f, 0x76, 0x84,
+        0xe3, 0xd3, 0xe6, 0x36, 0x67, 0x1e, 0xf2, 0xdc, 0x77, 0x01, 0xfd, 0x45,
+        0x86, 0xee, 0xde, 0x40, 0xdf, 0x61, 0x58, 0xd8, 0x0e, 0x32, 0x5d, 0xb1,
+        0x6f, 0xc2, 0x49, 0xf8, 0x6b, 0xe1, 0x5c, 0x4c, 0xc6, 0x81, 0xa3, 0xdc,
+        0xeb, 0xc2, 0xdb, 0xe7, 0x7a, 0xaa, 0x1e, 0xbc, 0xa3, 0x36, 0x96, 0xc8,
+        0xf8, 0xe0, 0x3a, 0xe0, 0xad, 0x05, 0xe5, 0x1f, 0x94, 0xa9, 0x63, 0x6f,
+        0xdb, 0xcc, 0xbd, 0xec, 0x06, 0xcf, 0xb1, 0x39, 0xa7, 0x3c, 0xbf, 0x73,
+        0x37, 0xea, 0xf0, 0xfd, 0xcd, 0x68, 0x93, 0xca, 0x65, 0x22, 0x9b, 0xe1,
+        0x13, 0x71, 0xdc, 0x20, 0xd2, 0xb5, 0xa3, 0x59, 0xe7, 0x90, 0xca, 0x29,
+        0xea, 0xf3, 0xb0, 0xed, 0xdd, 0x3a, 0x47, 0x03, 0x7e, 0x7b, 0x6e, 0x24,
+        0x42, 0xf9, 0xd5, 0x2b, 0xc3, 0xd4, 0x27, 0xa7, 0x6e, 0xd6, 0xb4, 0xdf,
+        0xbd, 0x8d, 0x67, 0x99, 0xfa, 0x8c, 0x8d, 0x1e, 0x27, 0x8c, 0xa3, 0x28,
+        0x87, 0xfd, 0xfe, 0x9a, 0x30, 0xdc, 0xf5, 0x26, 0x61, 0xb8, 0xeb, 0x4d,
+        0xc2, 0x40, 0x5c, 0x00, 0x8e, 0xca, 0x5f, 0x6c, 0x08, 0x63, 0xd5, 0x97,
+        0x62, 0x1e, 0x07, 0x8b, 0x77, 0xc9, 0xa1, 0xa2, 0xa3, 0xe3, 0x8e, 0x0b,
+        0x8a, 0x32, 0xc1, 0x05, 0x4f, 0x82, 0xf7, 0x8a, 0xe0, 0xcd, 0x22, 0x78,
+        0xb1, 0x08, 0xbe, 0x84, 0xfd, 0x7f, 0x06, 0xf6, 0xff, 0x93, 0x58, 0x9b,
+        0xd3, 0x2b, 0x78, 0x39, 0xad, 0x79, 0x39, 0x5f, 0xa4, 0xaf, 0xd6, 0x7f,
+        0x11, 0x7e, 0x8d, 0xca, 0x70, 0x21, 0x05, 0x55, 0xe2, 0x44, 0xb3, 0xfd,
+        0x9f, 0x24, 0xbf, 0xca, 0x83, 0xfe, 0x0d, 0x68, 0x73, 0x18, 0x34, 0x9e,
+        0xa2, 0x1d, 0x48, 0xfb, 0x27, 0x07, 0xde, 0x3c, 0x4c, 0x5f, 0x4d, 0x5d,
+        0xb9, 0x49, 0xa8, 0x5f, 0xa2, 0x3b, 0x98, 0x7b, 0xc8, 0xb9, 0x26, 0x57,
+        0xe1, 0xc9, 0xf0, 0xef, 0x84, 0x47, 0x3d, 0x43, 0xbe, 0x7d, 0x99, 0x7c,
+        0x5b, 0xc3, 0xab, 0x01, 0xe7, 0x17, 0xb8, 0xdb, 0xea, 0xb5, 0xad, 0xd6,
+        0xdf, 0xb4, 0x5c, 0x5f, 0x8f, 0x5f, 0x22, 0x3f, 0x42, 0x27, 0x11, 0xf7,
+        0xc9, 0x4c, 0x64, 0x8b, 0xc5, 0x3d, 0x6c, 0xb7, 0x1d, 0x97, 0x00, 0xf7,
+        0x9d, 0x92, 0x9b, 0x0f, 0xc4, 0xdb, 0x11, 0xf6, 0x59, 0xed, 0xc7, 0xb5,
+        0xfd, 0x8c, 0x17, 0x1c, 0x19, 0xd9, 0xc6, 0x7d, 0x08, 0x07, 0x7a, 0x3e,
+        0x5c, 0x0f, 0xd8, 0xfb, 0x7a, 0xcd, 0x29, 0x63, 0x29, 0x5b, 0x5b, 0x6c,
+        0xfc, 0x89, 0xfd, 0x1d, 0x5e, 0xb5, 0x4e, 0x17, 0x02, 0x9e, 0x11, 0x9b,
+        0xf2, 0x6e, 0xa8, 0xa1, 0x95, 0xfb, 0x2c, 0xad, 0xa8, 0x55, 0xf3, 0xb8,
+        0xdd, 0xd2, 0x4a, 0x08, 0x6f, 0x3c, 0xa4, 0x95, 0xa6, 0x90, 0x56, 0x72,
+        0x33, 0x21, 0xad, 0xb0, 0xed, 0xed, 0x21, 0xad, 0x24, 0x6b, 0x69, 0x25,
+        0x37, 0xe3, 0xe0, 0x5a, 0x0d, 0x07, 0xe9, 0x85, 0xfd, 0x90, 0x5e, 0x00,
+        0x4b, 0xe5, 0xd6, 0xd6, 0x90, 0x5e, 0xe2, 0xe8, 0xe7, 0x50, 0xd1, 0xe4,
+        0x74, 0xc0, 0xef, 0xb2, 0x3a, 0xc4, 0xc5, 0x9a, 0x1b, 0x1f, 0xb1, 0x3e,
+        0x8d, 0xf8, 0x96, 0x46, 0xaa, 0x79, 0xee, 0xab, 0x68, 0x03, 0xb8, 0x67,
+        0x2e, 0xeb, 0x76, 0x4d, 0x1b, 0xf7, 0xfb, 0x53, 0xa8, 0xbb, 0x07, 0xb4,
+        0x11, 0xe2, 0xe0, 0x7a, 0x8b, 0x83, 0xd5, 0x6b, 0x39, 0x66, 0x71, 0xb0,
+        0xc7, 0xe2, 0x40, 0xf3, 0x4b, 0x8e, 0x6b, 0xa6, 0x34, 0x0e, 0x9a, 0x34,
+        0x0e, 0x44, 0x85, 0x6d, 0xc7, 0xea, 0xe0, 0x80, 0x75, 0xf6, 0xe8, 0xf9,
+        0x47, 0x30, 0xff, 0xfd, 0x98, 0xbf, 0xd2, 0xf3, 0xe7, 0x3a, 0x70, 0xfe,
+        0x80, 0xa5, 0x72, 0x72, 0x79, 0xfe, 0x6d, 0xe8, 0xe3, 0x60, 0x31, 0xa2,
+        0xe7, 0x0f, 0xdb, 0x7e, 0x30, 0x9c, 0xff, 0xe9, 0x8a, 0xc9, 0x7f, 0x3e,
+        0xbd, 0x46, 0xcf, 0x4d, 0x59, 0xde, 0xf0, 0xb4, 0x5f, 0xcc, 0x98, 0xf6,
+        0x19, 0xe8, 0xb6, 0x69, 0x3f, 0x69, 0xcf, 0x43, 0x19, 0x7b, 0xe9, 0x1b,
+        0x3e, 0x79, 0xe7, 0xe3, 0x3a, 0x0f, 0xe5, 0x71, 0xda, 0x4d, 0xc5, 0x36,
+        0x19, 0x99, 0xae, 0x85, 0x9b, 0xf0, 0xe6, 0xb4, 0x1c, 0xcd, 0x62, 0x7e,
+        0xe3, 0x7e, 0x2f, 0xe4, 0x9b, 0xa6, 0x25, 0x94, 0xa7, 0x72, 0xc3, 0x91,
+        0x26, 0x51, 0x0f, 0x7c, 0x08, 0x73, 0x8e, 0xca, 0x66, 0xaf, 0xdb, 0xdd,
+        0xa1, 0xa8, 0x0b, 0x2f, 0xab, 0xd1, 0x85, 0xed, 0x56, 0x17, 0x6e, 0xa2,
+        0x2e, 0x04, 0xdc, 0x77, 0xca, 0xe1, 0x22, 0xd7, 0x2f, 0x97, 0x6c, 0x82,
+        0xfe, 0xff, 0x81, 0xc7, 0xb3, 0x27, 0x3a, 0x6e, 0x96, 0x38, 0xac, 0x69,
+        0x99, 0x3a, 0x2d, 0xa5, 0xcf, 0x6a, 0x2c, 0xd2, 0xc6, 0x8e, 0x33, 0x16,
+        0x4a, 0xbd, 0xf7, 0xe3, 0xe0, 0x73, 0x75, 0xf4, 0xde, 0x64, 0xd1, 0xd8,
+        0x6f, 0x0d, 0xb0, 0x09, 0xe5, 0x44, 0x3b, 0xae, 0x8d, 0x3c, 0xab, 0xd0,
+        0xdb, 0xa3, 0x9a, 0xa5, 0xe1, 0x44, 0xab, 0x4c, 0x4c, 0x1b, 0x1b, 0x57,
+        0x9d, 0x00, 0xfe, 0x4f, 0x30, 0xdf, 0x55, 0x74, 0x7e, 0x7e, 0xb6, 0x04,
+        0x3b, 0x77, 0xf6, 0x4e, 0x93, 0xb7, 0x32, 0xdd, 0xa0, 0x7f, 0xd3, 0x06,
+        0xc9, 0xfb, 0x69, 0xe8, 0xbb, 0x98, 0x4c, 0xa0, 0xcf, 0xee, 0x6d, 0x8d,
+        0x98, 0x73, 0x1c, 0x6d, 0xe9, 0xf3, 0x31, 0x8e, 0xd6, 0x28, 0xd1, 0xd9,
+        0xb8, 0xce, 0xad, 0xe7, 0xd9, 0xd1, 0xcc, 0x60, 0x1b, 0xde, 0x31, 0x9f,
+        0xc1, 0xc5, 0x58, 0xa1, 0xec, 0x47, 0xbf, 0x47, 0xc5, 0xee, 0xf7, 0x0c,
+        0x69, 0xfd, 0x17, 0x39, 0xea, 0xda, 0x33, 0x74, 0x83, 0x58, 0xf7, 0x7a,
+        0x7a, 0xd1, 0x18, 0xb9, 0x19, 0xac, 0x9f, 0x3a, 0x15, 0xc5, 0xbd, 0x13,
+        0xf7, 0xb0, 0xbf, 0x50, 0x8f, 0x40, 0x37, 0xbe, 0xb3, 0x6f, 0xa3, 0x34,
+        0x03, 0xdf, 0xb3, 0x0a, 0xb8, 0x36, 0x39, 0x59, 0x39, 0xcd, 0x0b, 0x55,
+        0x7a, 0x78, 0xf2, 0x75, 0xf9, 0x81, 0x34, 0x41, 0x5a, 0xa0, 0x5c, 0x24,
+        0x6d, 0x50, 0x26, 0x3a, 0xfa, 0x6c, 0x03, 0xe9, 0xe1, 0x09, 0xdf, 0x8b,
+        0x70, 0xdf, 0xde, 0xc4, 0xe5, 0x49, 0x1b, 0xa4, 0xf9, 0xa4, 0x8e, 0xd7,
+        0xa7, 0xe5, 0x7b, 0x92, 0x6e, 0xeb, 0x86, 0x5d, 0xf6, 0x2f, 0xbb, 0xc6,
+        0xe6, 0xdc, 0xad, 0xa6, 0x39, 0xe8, 0x26, 0xe6, 0xd0, 0xf5, 0xca, 0xfb,
+        0x2a, 0x39, 0xe0, 0xe1, 0x5e, 0x28, 0xe5, 0x3b, 0x75, 0x5e, 0xe2, 0xee,
+        0xc2, 0x46, 0xb9, 0xc5, 0x8f, 0xd9, 0xb8, 0xfb, 0x41, 0xd0, 0xc1, 0xa2,
+        0x23, 0x27, 0xce, 0xe2, 0x3a, 0xe7, 0x70, 0xfd, 0xce, 0xfb, 0xe9, 0x94,
+        0x22, 0xb3, 0x7b, 0xd1, 0xc4, 0xa2, 0xf4, 0xb9, 0x13, 0xfa, 0x0c, 0xc8,
+        0x82, 0xd3, 0x74, 0xe2, 0xd0, 0x46, 0xe3, 0x4b, 0x03, 0x16, 0xaf, 0xd1,
+        0x1d, 0xa1, 0x2d, 0xe7, 0x07, 0x41, 0x96, 0x76, 0x83, 0x28, 0xed, 0x23,
+        0xc1, 0xe7, 0x43, 0x19, 0xe3, 0x13, 0x5b, 0x9d, 0xc6, 0x53, 0x2f, 0x5a,
+        0x5a, 0x91, 0x88, 0x1a, 0x7a, 0xc6, 0x69, 0x38, 0x71, 0x9c, 0x6b, 0xa6,
+        0xf3, 0xa4, 0x0d, 0x5d, 0x3d, 0xe7, 0x54, 0xe9, 0xea, 0x1b, 0xf6, 0xb7,
+        0x1a, 0x6a, 0x92, 0x74, 0xaa, 0x09, 0xf3, 0x1d, 0x2e, 0x84, 0x30, 0x7e,
+        0x1f, 0x70, 0x11, 0x1e, 0xd0, 0xed, 0xec, 0x9f, 0xe1, 0x5a, 0x02, 0x2c,
+        0xf7, 0x01, 0xee, 0xf3, 0x80, 0xf9, 0x02, 0x2e, 0xd5, 0x11, 0x91, 0x3f,
+        0x76, 0x22, 0xb3, 0xb5, 0xf0, 0x12, 0xc6, 0xd3, 0x16, 0xde, 0xd7, 0x82,
+        0xd5, 0x95, 0xc5, 0x81, 0x2e, 0xc0, 0x43, 0x38, 0x5f, 0x02, 0x8c, 0xb4,
+        0x5b, 0x9f, 0xc7, 0xb3, 0x0b, 0xf8, 0x5e, 0xb0, 0x30, 0x81, 0x1e, 0xa7,
+        0xff, 0x47, 0xf5, 0x77, 0x81, 0x76, 0xf4, 0x9f, 0xdb, 0xe7, 0xce, 0x55,
+        0x32, 0xa0, 0xc7, 0x21, 0x9e, 0xa7, 0x8a, 0x4b, 0xb4, 0x03, 0xc0, 0xf7,
+        0x3f, 0x94, 0xc8, 0xa9, 0x84, 0x1c, 0x2a, 0x70, 0x0f, 0xe8, 0x24, 0xf0,
+        0xa1, 0xcf, 0xa4, 0xa0, 0xce, 0x15, 0xb8, 0xa0, 0xec, 0x67, 0xb7, 0xe3,
+        0xea, 0xc5, 0xf5, 0x56, 0x5c, 0x20, 0x87, 0xd9, 0x13, 0xb8, 0xfa, 0xd0,
+        0xb7, 0x8a, 0x37, 0x09, 0x73, 0xa9, 0xbe, 0x8d, 0x36, 0xda, 0xb6, 0xcc,
+        0xa9, 0xa1, 0x01, 0xe0, 0x6f, 0x00, 0xb0, 0x25, 0x70, 0x31, 0xff, 0xf8,
+        0x87, 0x8e, 0x9c, 0x7a, 0x19, 0x17, 0x18, 0xec, 0x14, 0x08, 0xf3, 0xd4,
+        0x20, 0x2e, 0x28, 0xb1, 0x53, 0x69, 0x5c, 0x23, 0xb8, 0xfe, 0xd2, 0x31,
+        0x3c, 0xd7, 0x09, 0x7c, 0x85, 0x3c, 0x02, 0x9c, 0xaf, 0xe0, 0xb9, 0xaf,
+        0x3b, 0x6f, 0x9c, 0xe7, 0x7e, 0xe2, 0x18, 0x9e, 0x7b, 0xc5, 0xa9, 0xf2,
+        0xdc, 0x59, 0x47, 0x3d, 0xfc, 0x8c, 0x13, 0x79, 0x98, 0xbe, 0xc4, 0x59,
+        0xc7, 0xf0, 0x7f, 0x44, 0x86, 0xf7, 0x82, 0x96, 0x1e, 0x5e, 0xc0, 0x45,
+        0xba, 0x7a, 0x16, 0xe5, 0x2f, 0xac, 0x1a, 0xf7, 0xf9, 0x37, 0x31, 0xee,
+        0xab, 0x76, 0x5c, 0x51, 0xd5, 0x71, 0x2f, 0xa0, 0xef, 0x97, 0xec, 0xb8,
+        0x17, 0x6a, 0xc6, 0x05, 0xad, 0x3c, 0xbc, 0x84, 0x8b, 0x74, 0xf1, 0x22,
+        0xca, 0x43, 0x99, 0x80, 0x85, 0x6e, 0x6e, 0xd0, 0x67, 0x9d, 0xe2, 0x5e,
+        0xc3, 0xb2, 0x6e, 0x4c, 0xd7, 0xe8, 0x87, 0x37, 0xa2, 0x1f, 0x27, 0x8b,
+        0xb4, 0x11, 0x17, 0x6a, 0xe4, 0x02, 0x7d, 0xa3, 0x40, 0x8e, 0x69, 0x3f,
+        0x88, 0x3e, 0x11, 0xfd, 0xa3, 0xd5, 0xb6, 0xd5, 0x27, 0x75, 0xee, 0xd8,
+        0xaf, 0x15, 0x3a, 0xe5, 0xd3, 0x05, 0xda, 0x84, 0xa4, 0x97, 0x20, 0x98,
+        0xd8, 0x41, 0xfb, 0x34, 0x17, 0x5c, 0xe2, 0x91, 0x4e, 0x3c, 0xf7, 0x33,
+        0x6b, 0x75, 0x46, 0x69, 0x18, 0xbe, 0x7b, 0xe6, 0xe8, 0xaf, 0x40, 0x67,
+        0x34, 0x00, 0x6e, 0xd2, 0x5b, 0x87, 0xdc, 0x58, 0x52, 0x53, 0x9b, 0x25,
+        0x21, 0x37, 0x15, 0x1a, 0x61, 0xf7, 0x30, 0xaf, 0xaa, 0x59, 0xba, 0x77,
+        0xc4, 0x4c, 0xde, 0xb7, 0x1b, 0xc7, 0x6f, 0xd7, 0xe4, 0xa1, 0xc7, 0x13,
+        0x78, 0xff, 0x7b, 0x2e, 0xe5, 0x60, 0xdc, 0xbb, 0x56, 0xe7, 0xf4, 0x74,
+        0xed, 0xa0, 0xdd, 0x72, 0xbd, 0xd6, 0xe1, 0xd1, 0x35, 0x76, 0x92, 0xea,
+        0x70, 0xa5, 0x6a, 0xa3, 0x8d, 0x17, 0x52, 0x49, 0xc2, 0xf5, 0x90, 0x70,
+        0xff, 0xeb, 0x1e, 0xc9, 0xfb, 0xad, 0xf0, 0x0b, 0x18, 0x3b, 0x4f, 0xf5,
+        0xd2, 0x36, 0x9a, 0x9d, 0x76, 0x6d, 0x5e, 0xf4, 0x46, 0x79, 0x4e, 0x8f,
+        0xd3, 0xa8, 0x61, 0x34, 0x67, 0x25, 0xb8, 0x8f, 0x10, 0xd3, 0xe7, 0x73,
+        0x66, 0xcb, 0x2d, 0x5a, 0xef, 0xcc, 0x96, 0x99, 0x87, 0x0f, 0x7f, 0xaa,
+        0xcc, 0xbc, 0x7b, 0x5f, 0xdc, 0x77, 0xc2, 0xcf, 0x2d, 0x6f, 0x91, 0xf1,
+        0xe9, 0x75, 0xd2, 0xe8, 0xa9, 0xf8, 0x66, 0xc8, 0x47, 0xb6, 0xe9, 0xda,
+        0x01, 0xff, 0x70, 0x66, 0xab, 0x3c, 0x39, 0xc3, 0xbe, 0x3b, 0x64, 0x6e,
+        0x5e, 0x1c, 0xf7, 0x9d, 0xeb, 0x51, 0x07, 0x72, 0x7d, 0x07, 0xcb, 0x92,
+        0xb8, 0x8b, 0x72, 0xdf, 0x19, 0x95, 0x73, 0x03, 0x7c, 0x66, 0xee, 0xbf,
+        0x44, 0xd9, 0xdf, 0xb9, 0x81, 0x4e, 0x79, 0x7c, 0x1e, 0x34, 0x01, 0xb9,
+        0x3f, 0x72, 0x82, 0x30, 0x89, 0xec, 0x9a, 0x65, 0x2c, 0xbd, 0xdb, 0x65,
+        0xdc, 0x94, 0xfb, 0x34, 0xb7, 0x0c, 0x70, 0x2c, 0xe8, 0x25, 0xe8, 0xb8,
+        0xae, 0x1d, 0x46, 0x16, 0xa4, 0x67, 0x1b, 0x50, 0xce, 0x7e, 0xe1, 0x3f,
+        0xee, 0x65, 0x3f, 0x61, 0x5b, 0x85, 0x39, 0x35, 0x6a, 0x7a, 0x59, 0x5a,
+        0xa5, 0x3f, 0xce, 0xfc, 0x4c, 0xf6, 0x37, 0xfb, 0xe8, 0xd5, 0x7b, 0x21,
+        0xdc, 0x53, 0x36, 0xb6, 0x15, 0xd7, 0x44, 0xef, 0x29, 0xc0, 0xae, 0xba,
+        0x42, 0xdb, 0x17, 0x73, 0x15, 0xae, 0x20, 0x63, 0x51, 0xe1, 0x1a, 0x25,
+        0xe4, 0xd1, 0xe2, 0xf2, 0x3a, 0x6d, 0x69, 0x58, 0xb9, 0x4e, 0xa4, 0x15,
+        0x7f, 0xcc, 0xda, 0x1e, 0x8b, 0x92, 0x83, 0x5d, 0xd6, 0xab, 0xd7, 0x6c,
+        0x11, 0xb6, 0xac, 0x5d, 0x33, 0x6d, 0xcf, 0xe6, 0xc3, 0x35, 0x1b, 0x85,
+        0xc6, 0x29, 0xab, 0x4d, 0x5c, 0x33, 0x97, 0xf1, 0x6e, 0xe0, 0x3d, 0x87,
+        0x75, 0xca, 0x61, 0x8d, 0x72, 0xe5, 0x0e, 0x99, 0x3d, 0xa6, 0x3a, 0x1b,
+        0x44, 0x92, 0xe3, 0x5e, 0x87, 0x4c, 0xce, 0x33, 0x96, 0xb0, 0x05, 0x36,
+        0xd8, 0x56, 0x5c, 0x9d, 0x78, 0x66, 0x3b, 0xf0, 0x54, 0x59, 0xa1, 0x6d,
+        0xd3, 0x1a, 0x3b, 0xeb, 0x71, 0x8c, 0xcd, 0x1c, 0xe1, 0x27, 0x80, 0x87,
+        0x2a, 0xef, 0x4c, 0xd5, 0xc4, 0x9f, 0x38, 0x57, 0xad, 0x43, 0x31, 0xdf,
+        0xb8, 0x5e, 0x4f, 0x1d, 0x87, 0x2a, 0x36, 0xbe, 0x19, 0x7b, 0x2a, 0x41,
+        0x7b, 0x2a, 0x5b, 0x72, 0xcd, 0xf9, 0x80, 0x51, 0xf8, 0x4e, 0x5e, 0xef,
+        0x26, 0xd2, 0xfa, 0xd8, 0x0c, 0xe1, 0x8a, 0x85, 0x70, 0xad, 0x58, 0x33,
+        0x9e, 0xe7, 0x5a, 0x1b, 0xe7, 0x98, 0x5a, 0xce, 0x5f, 0x34, 0xb1, 0x7d,
+        0xc6, 0x51, 0x3a, 0xeb, 0xc0, 0x74, 0xa7, 0xb6, 0x61, 0x45, 0x8d, 0xc9,
+        0x81, 0x22, 0xcf, 0x82, 0x31, 0x9e, 0x78, 0x23, 0xe3, 0x49, 0xbd, 0xb3,
+        0xf2, 0x5e, 0x8c, 0xcd, 0x5c, 0x1d, 0x65, 0xe3, 0x37, 0x1b, 0x6c, 0x8e,
+        0x48, 0x6d, 0x0c, 0xc7, 0xe4, 0xf2, 0xac, 0xcc, 0x8b, 0x4e, 0x8d, 0x2e,
+        0x61, 0x9d, 0x7f, 0x5d, 0xef, 0x0d, 0x4a, 0x29, 0x02, 0xed, 0x37, 0x3e,
+        0x90, 0x1a, 0x34, 0xe7, 0x60, 0x92, 0xb2, 0xb3, 0x68, 0xe6, 0x7f, 0x5e,
+        0xe7, 0xf4, 0x98, 0xdc, 0x45, 0x93, 0xef, 0x73, 0x8f, 0x9c, 0x87, 0x0e,
+        0xaf, 0xae, 0x6d, 0x93, 0x4c, 0x02, 0x17, 0x59, 0xbd, 0x2f, 0x91, 0x94,
+        0xec, 0xc0, 0xc7, 0x37, 0xf1, 0x9c, 0x44, 0x0c, 0xeb, 0x93, 0x9f, 0xe1,
+        0xd9, 0x49, 0xf6, 0x7b, 0xb1, 0xbe, 0x28, 0x66, 0x99, 0x87, 0x0f, 0x59,
+        0xf9, 0xb6, 0xbe, 0x44, 0xb3, 0x7e, 0xbf, 0xce, 0xe6, 0x5b, 0x3b, 0x22,
+        0x37, 0x06, 0xf2, 0x87, 0x10, 0x9f, 0x8f, 0xd9, 0x39, 0x25, 0x75, 0xcc,
+        0x4a, 0x82, 0x73, 0x7e, 0xc2, 0xc6, 0x2c, 0x39, 0x97, 0x1b, 0x2c, 0x7d,
+        0x1b, 0xfb, 0xa7, 0x6a, 0x43, 0x9b, 0x7d, 0xbf, 0x27, 0xb5, 0x2c, 0xec,
+        0xb7, 0xb6, 0xb3, 0x8e, 0xf3, 0x1c, 0x17, 0x9d, 0x13, 0x10, 0xfa, 0x46,
+        0x3d, 0x35, 0x7e, 0x81, 0xf1, 0xe5, 0xf2, 0xd3, 0xf5, 0x64, 0x54, 0xd5,
+        0x27, 0xa4, 0x2f, 0x37, 0xb1, 0x8d, 0xdf, 0x2d, 0x08, 0x7d, 0xb9, 0x7e,
+        0xeb, 0xcb, 0xb5, 0x6a, 0x5f, 0xce, 0xc4, 0x1e, 0x5a, 0x97, 0x7d, 0xb9,
+        0xfc, 0x74, 0x0e, 0xb4, 0x12, 0x7e, 0x67, 0xc1, 0xd8, 0x42, 0x93, 0x05,
+        0x9e, 0x79, 0x69, 0x94, 0xec, 0xa8, 0x82, 0xdf, 0x60, 0x7c, 0x2c, 0xc6,
+        0x2a, 0x94, 0xfa, 0x96, 0xf5, 0x2f, 0x3a, 0x25, 0xdd, 0xbe, 0x0e, 0xf3,
+        0xbe, 0x53, 0xaf, 0xf9, 0x5c, 0xc1, 0xec, 0x7d, 0x66, 0xf7, 0x32, 0x26,
+        0xc4, 0x73, 0x4d, 0x9a, 0xbf, 0x92, 0xc3, 0x91, 0x5e, 0x63, 0xcf, 0x7a,
+        0xdf, 0x04, 0xde, 0x4f, 0x02, 0xe7, 0x31, 0x3b, 0x6e, 0x12, 0x30, 0x1d,
+        0xc0, 0xda, 0x5c, 0x6b, 0x65, 0x32, 0xc7, 0xde, 0xd3, 0xc4, 0xd8, 0xc0,
+        0x7c, 0x21, 0x8c, 0x11, 0x46, 0xec, 0x99, 0x4a, 0x2f, 0xd2, 0xe8, 0xad,
+        0xab, 0x6b, 0xab, 0x9e, 0x7e, 0x5d, 0xdd, 0x44, 0x5a, 0xba, 0x53, 0xe7,
+        0xb9, 0xac, 0x1f, 0x48, 0xed, 0xd1, 0x39, 0xf2, 0x3a, 0xc6, 0x98, 0x13,
+        0xe6, 0x94, 0x7d, 0x57, 0xde, 0xa1, 0x65, 0xfe, 0x01, 0x9f, 0xfa, 0x6b,
+        0x87, 0xfe, 0xdd, 0x38, 0x14, 0x04, 0xe7, 0x06, 0xee, 0x86, 0xad, 0xe2,
+        0xb9, 0xdf, 0x97, 0xee, 0xc4, 0xb0, 0xb6, 0x9d, 0xb0, 0x46, 0x7b, 0x9b,
+        0x65, 0x9d, 0x77, 0xb3, 0xcd, 0x99, 0xc9, 0x41, 0x6e, 0xa6, 0x60, 0x33,
+        0xf1, 0x4c, 0x70, 0x8f, 0x7d, 0x97, 0x0b, 0x9a, 0x41, 0x47, 0x1f, 0x13,
+        0x23, 0x63, 0xb2, 0x55, 0x19, 0xc3, 0x5c, 0x83, 0x34, 0x09, 0x39, 0x7a,
+        0x44, 0x52, 0xfc, 0xee, 0x07, 0xc7, 0xce, 0xcb, 0xa5, 0xd0, 0xcb, 0x6c,
+        0xa7, 0xbf, 0xd9, 0x83, 0x67, 0xee, 0xe1, 0x78, 0xee, 0x41, 0xe8, 0x96,
+        0xeb, 0xd7, 0xea, 0x96, 0x04, 0xfd, 0xfa, 0x6c, 0x89, 0xbe, 0xe1, 0x7a,
+        0xb4, 0xe9, 0x90, 0x8f, 0x4f, 0x77, 0xb7, 0x91, 0xb7, 0xc6, 0x20, 0xd7,
+        0xd5, 0xfd, 0xe1, 0x59, 0x20, 0x96, 0xf1, 0x3d, 0xfb, 0x6d, 0x92, 0xe4,
+        0xfb, 0x5d, 0xf9, 0x7c, 0x25, 0x95, 0x5c, 0x82, 0x6e, 0x1a, 0x73, 0x7e,
+        0xf1, 0x72, 0x13, 0x53, 0x7d, 0x7b, 0x9b, 0x39, 0x3b, 0xd0, 0x4c, 0x9b,
+        0xdd, 0xc6, 0x59, 0x6b, 0x69, 0x76, 0xc9, 0xca, 0xe3, 0x20, 0x68, 0x1e,
+        0xd0, 0x32, 0x78, 0x0f, 0x65, 0xf0, 0x01, 0xbf, 0xc7, 0xd0, 0xbe, 0xf6,
+        0x99, 0x02, 0xac, 0x23, 0xf0, 0x30, 0x10, 0x65, 0x7e, 0x9e, 0xe5, 0x4f,
+        0x2f, 0xbd, 0x68, 0xe5, 0x92, 0x72, 0xd6, 0xf2, 0xa5, 0xba, 0x2a, 0xb6,
+        0x42, 0xe6, 0x1e, 0x9a, 0xa6, 0x3e, 0xf6, 0x17, 0xbe, 0x0b, 0x39, 0x95,
+        0xd5, 0x78, 0xe8, 0x90, 0xfb, 0xa6, 0x25, 0x7d, 0x1e, 0xba, 0x2a, 0x3f,
+        0xbf, 0x92, 0x37, 0xd7, 0xf6, 0xc7, 0xb9, 0x7e, 0xb8, 0xcd, 0xf8, 0xb6,
+        0x2b, 0xe7, 0xba, 0x80, 0xb9, 0xa6, 0xf5, 0x5c, 0xb9, 0x6f, 0xf3, 0x31,
+        0x3b, 0xd7, 0xf5, 0xe1, 0x5c, 0x07, 0x57, 0xce, 0x35, 0xf4, 0xed, 0x43,
+        0xb9, 0x9b, 0xd4, 0xf9, 0xf2, 0x3a, 0x4f, 0x7b, 0x7a, 0xbd, 0x0c, 0x97,
+        0x5a, 0xad, 0xbc, 0x74, 0xa1, 0x7b, 0x98, 0xc3, 0xbe, 0x70, 0xaf, 0x2b,
+        0x16, 0x67, 0x8a, 0x78, 0xa0, 0xac, 0x6d, 0xd3, 0x67, 0x6c, 0x66, 0xe1,
+        0x5f, 0xdd, 0x5a, 0x60, 0xdd, 0xf0, 0xfd, 0xc5, 0x62, 0xc7, 0xa1, 0x4f,
+        0x4d, 0xbf, 0xa9, 0x77, 0x4d, 0x4c, 0xc1, 0xc4, 0x87, 0x19, 0x17, 0x36,
+        0x67, 0x7f, 0x99, 0x8b, 0x78, 0x07, 0x78, 0xea, 0x53, 0x85, 0xd4, 0x60,
+        0x26, 0x42, 0x39, 0x7a, 0x5c, 0x0e, 0x55, 0x46, 0xa4, 0x4b, 0x9f, 0xff,
+        0x7c, 0xdd, 0xd8, 0x71, 0xba, 0x36, 0x76, 0xcc, 0x74, 0x02, 0xc6, 0x8e,
+        0xf7, 0xfc, 0x0c, 0xb1, 0x63, 0x71, 0x4c, 0xec, 0xb8, 0x9e, 0x7f, 0x35,
+        0x55, 0x3c, 0x8e, 0x79, 0x35, 0x43, 0x96, 0x2c, 0x3a, 0xd9, 0xf9, 0x16,
+        0xdc, 0xcf, 0xe2, 0x1e, 0xc3, 0xfd, 0x3c, 0xee, 0x2e, 0xee, 0x17, 0x70,
+        0x8f, 0xcb, 0xd4, 0xb2, 0xce, 0x38, 0x0e, 0xb9, 0x41, 0x5d, 0xc6, 0xb6,
+        0xc6, 0x1f, 0x98, 0x2b, 0xb7, 0xf3, 0x7b, 0x2d, 0xce, 0xec, 0x3c, 0xe7,
+        0xd0, 0x2a, 0x93, 0xd3, 0x94, 0xd9, 0x6d, 0x52, 0x9a, 0x0e, 0x6d, 0xdb,
+        0x9f, 0xef, 0xe0, 0x9e, 0xc1, 0x98, 0x84, 0xb6, 0xeb, 0x3d, 0x1d, 0x66,
+        0xaf, 0xf1, 0x3b, 0x58, 0xe3, 0x8d, 0x58, 0x83, 0x93, 0x72, 0x7e, 0x66,
+        0xe3, 0x0a, 0x1b, 0x36, 0x69, 0x63, 0x82, 0x33, 0x56, 0xf7, 0xd6, 0x97,
+        0x11, 0xb5, 0xeb, 0x9f, 0xb0, 0x67, 0xcb, 0xc2, 0x1c, 0xa1, 0xa4, 0x5e,
+        0x9f, 0xd1, 0xca, 0x71, 0x8c, 0x37, 0x28, 0xe9, 0x19, 0xce, 0x73, 0xf9,
+        0x9b, 0x11, 0x90, 0x87, 0x27, 0xa0, 0x57, 0x57, 0xd0, 0x25, 0xe8, 0x96,
+        0x73, 0x73, 0x40, 0xbb, 0x8f, 0xca, 0x6c, 0x89, 0xf0, 0xf5, 0x24, 0x22,
+        0xfa, 0xac, 0x19, 0x9e, 0x67, 0x4c, 0x8e, 0xfb, 0x70, 0x25, 0x3c, 0x67,
+        0xb6, 0x89, 0x67, 0x07, 0x57, 0x9d, 0x35, 0xb3, 0xfa, 0x59, 0xdb, 0x0e,
+        0x3c, 0x73, 0x16, 0xce, 0xa1, 0x1e, 0x3d, 0x05, 0x32, 0xa9, 0xf3, 0xce,
+        0x36, 0xcb, 0x63, 0x0f, 0x2e, 0xe7, 0xbc, 0xb6, 0xc1, 0x46, 0xe9, 0x84,
+        0x89, 0x3c, 0x1a, 0x1d, 0xea, 0x81, 0x8f, 0xc7, 0x3c, 0x99, 0x9e, 0xc4,
+        0x6d, 0x3a, 0x17, 0xb9, 0x7a, 0xee, 0xaf, 0x9a, 0x8f, 0x1c, 0x9e, 0xb3,
+        0x4a, 0xe8, 0xef, 0x5a, 0xec, 0xd4, 0xe5, 0x71, 0xcc, 0x87, 0xfb, 0x7e,
+        0x1a, 0x0f, 0x09, 0x7e, 0xa7, 0xeb, 0x29, 0xe0, 0x60, 0xb2, 0xf2, 0x6d,
+        0xd0, 0xbb, 0x63, 0xcf, 0x9c, 0x91, 0xc6, 0x06, 0x64, 0xa2, 0x9c, 0x70,
+        0x26, 0xca, 0x03, 0xce, 0xbe, 0xb2, 0x7d, 0x37, 0xb0, 0x67, 0xb3, 0x34,
+        0xe3, 0xf7, 0x4c, 0x97, 0x33, 0x06, 0x7c, 0xe5, 0x8b, 0xdd, 0x4e, 0x5a,
+        0xdf, 0x3d, 0x7b, 0x87, 0x1c, 0xc0, 0x5a, 0x0d, 0xcf, 0xc4, 0xb5, 0x9c,
+        0xaf, 0x7e, 0x5b, 0x2a, 0x5c, 0x57, 0x7e, 0x13, 0x89, 0x7c, 0x7c, 0x5c,
+        0x7f, 0xe7, 0xc8, 0xd8, 0x0e, 0x27, 0xd1, 0xdf, 0x71, 0x1b, 0x13, 0xef,
+        0x73, 0xb2, 0xba, 0x1f, 0xb3, 0x1e, 0xf9, 0xe2, 0x09, 0xdc, 0x57, 0x9f,
+        0x79, 0x0e, 0xf5, 0x8c, 0x85, 0xbb, 0x10, 0xdc, 0x63, 0xe4, 0xd5, 0x71,
+        0x99, 0xaa, 0x30, 0x7f, 0xc4, 0xd1, 0x7c, 0x34, 0x59, 0x3e, 0x00, 0x9d,
+        0xb4, 0xf2, 0xcc, 0xdf, 0xce, 0xea, 0x3a, 0x24, 0x67, 0x84, 0xb0, 0x70,
+        0x0d, 0x56, 0x9e, 0x87, 0xbf, 0xf8, 0xbf, 0x70, 0x5f, 0xd1, 0xc8, 0x50,
+        0x0b, 0x47, 0x9a, 0xf2, 0xce, 0xc8, 0x95, 0x69, 0x39, 0x08, 0x78, 0x0e,
+        0xe3, 0x52, 0xf7, 0xf3, 0x3b, 0x2c, 0xf3, 0x92, 0x9f, 0xbb, 0x4f, 0xd4,
+        0x43, 0xe7, 0x9d, 0xe8, 0x43, 0x07, 0x25, 0xf2, 0xd0, 0xa2, 0xd3, 0xf0,
+        0x50, 0xb7, 0xf6, 0xcb, 0x77, 0xfb, 0xdd, 0x89, 0x7d, 0x72, 0x52, 0xa2,
+        0xf7, 0x2b, 0x7d, 0xfe, 0x2b, 0xef, 0x32, 0xc6, 0x77, 0x52, 0x22, 0xf7,
+        0xc7, 0xec, 0xd9, 0x51, 0x13, 0xd7, 0x5b, 0xd2, 0x7c, 0xff, 0x9b, 0x71,
+        0xe2, 0x6c, 0x49, 0x8e, 0x6b, 0xde, 0x19, 0x86, 0x9e, 0xc8, 0x94, 0x92,
+        0xcb, 0x75, 0x4c, 0xbe, 0xe7, 0xf3, 0x9b, 0x0d, 0xbf, 0xb0, 0x4e, 0x8f,
+        0xc3, 0xef, 0x38, 0x18, 0x9d, 0x91, 0xb9, 0x2c, 0xcc, 0xfd, 0x34, 0x6b,
+        0xca, 0xf7, 0x67, 0xb1, 0x86, 0x3d, 0x58, 0x2f, 0x8e, 0xe7, 0xe8, 0xfd,
+        0x5c, 0x9e, 0x9d, 0x75, 0xa5, 0x2f, 0xd1, 0xb4, 0x6c, 0x07, 0xb1, 0xee,
+        0x7d, 0xd2, 0x04, 0xb8, 0xd5, 0x43, 0x79, 0x63, 0xd7, 0x09, 0xe9, 0x54,
+        0x20, 0xb9, 0x49, 0xb3, 0x3d, 0x83, 0xbb, 0xf5, 0x1a, 0xde, 0x6b, 0x69,
+        0x66, 0x9d, 0xb1, 0x1f, 0xf1, 0x6c, 0xe8, 0x22, 0x2f, 0xbb, 0xa6, 0x7f,
+        0x08, 0x3d, 0xcf, 0x7d, 0x17, 0x6d, 0x2f, 0xd6, 0xb1, 0x05, 0xc9, 0x4b,
+        0xcf, 0x58, 0xbf, 0x32, 0x08, 0xa6, 0x7d, 0x1f, 0x78, 0xac, 0xe7, 0x4b,
+        0x6e, 0x71, 0xe6, 0x4a, 0x5b, 0x9d, 0xd9, 0x52, 0x20, 0x13, 0x3e, 0xbf,
+        0xe3, 0xc1, 0x1c, 0x00, 0xda, 0x5b, 0x2c, 0xeb, 0x86, 0x6e, 0xfd, 0xeb,
+        0xcd, 0x3c, 0x8f, 0x74, 0x93, 0xf7, 0xa2, 0x98, 0x7a, 0xc4, 0x31, 0x7d,
+        0xe4, 0xee, 0xe3, 0x59, 0xe1, 0xf7, 0x34, 0xfa, 0x12, 0x71, 0xfd, 0x5d,
+        0x8f, 0xcf, 0xa1, 0x1d, 0xc6, 0x28, 0x72, 0xdc, 0x67, 0x9d, 0x59, 0xc8,
+        0xb3, 0xb9, 0x69, 0x9e, 0xe1, 0x67, 0x3e, 0x6d, 0xa4, 0x53, 0xc9, 0x15,
+        0xee, 0xa4, 0xfd, 0x06, 0x5c, 0x0e, 0x2e, 0x50, 0x44, 0x97, 0xf5, 0xb9,
+        0xe3, 0xcb, 0xdf, 0x85, 0x0b, 0xcb, 0xc2, 0xef, 0xc3, 0x29, 0x9d, 0x3b,
+        0x0d, 0x5f, 0xf6, 0xb1, 0x31, 0xf9, 0x89, 0x33, 0x5f, 0x78, 0xc5, 0x79,
+        0xb4, 0x90, 0xbe, 0xea, 0x12, 0xd0, 0xc7, 0x39, 0xbf, 0x97, 0xf2, 0x0b,
+        0x36, 0x5f, 0x41, 0x72, 0x95, 0x09, 0x99, 0xe9, 0xe8, 0x76, 0xef, 0xd7,
+        0x6b, 0x33, 0x03, 0x9c, 0x7d, 0x1b, 0xeb, 0xf7, 0xc9, 0x38, 0xf5, 0xdb,
+        0x78, 0x41, 0x81, 0x97, 0xd5, 0xcf, 0xe3, 0x82, 0x6d, 0xdb, 0xa8, 0x6d,
+        0x94, 0x7d, 0x3e, 0xeb, 0x6d, 0x75, 0x86, 0x4b, 0x5b, 0xb0, 0x8e, 0x7b,
+        0xa1, 0x3f, 0x1d, 0xd8, 0x69, 0xa0, 0x6d, 0x94, 0x4d, 0x02, 0x07, 0xe3,
+        0xbe, 0x91, 0xe7, 0xc3, 0x92, 0xd3, 0x3e, 0x9e, 0xb9, 0xa7, 0x95, 0x89,
+        0x99, 0x05, 0xc1, 0x1c, 0xec, 0x83, 0x6c, 0x7f, 0x09, 0xbc, 0xf0, 0x08,
+        0xae, 0xb7, 0xdb, 0x3d, 0xed, 0x17, 0x2e, 0xb2, 0xa7, 0xed, 0xca, 0xc9,
+        0x8a, 0x3e, 0xd7, 0xae, 0xf3, 0xab, 0x92, 0xea, 0xbf, 0x5f, 0xa2, 0xd7,
+        0x4a, 0xf5, 0xe8, 0x9c, 0xb4, 0xb4, 0x7c, 0x38, 0x6e, 0xf4, 0x30, 0x61,
+        0x4a, 0x02, 0x9e, 0xad, 0xc0, 0x05, 0xe1, 0x31, 0x6d, 0x44, 0x6d, 0xba,
+        0x94, 0xfa, 0x70, 0x49, 0x3e, 0x12, 0x0f, 0xcf, 0x14, 0xa0, 0x1f, 0xc8,
+        0xb8, 0x8f, 0x5d, 0x6a, 0xf4, 0xe4, 0xe6, 0x3a, 0xfd, 0x84, 0x73, 0x73,
+        0xec, 0xdc, 0x48, 0xb7, 0x7f, 0x96, 0xa0, 0x4f, 0xb1, 0x24, 0x4d, 0xab,
+        0xea, 0x33, 0xa6, 0xbf, 0xe1, 0x72, 0x73, 0x46, 0x81, 0x75, 0x5d, 0xd8,
+        0xa6, 0xb4, 0x73, 0x89, 0x47, 0xbd, 0x6e, 0x05, 0x25, 0x3c, 0x67, 0x00,
+        0x6e, 0xae, 0x5c, 0xe1, 0xbe, 0x43, 0x91, 0x0e, 0x43, 0x5c, 0x7f, 0x5b,
+        0xf3, 0xc9, 0x78, 0x81, 0xb1, 0x95, 0x47, 0x83, 0xf4, 0x28, 0x79, 0x8c,
+        0x7d, 0xf0, 0x7d, 0x41, 0xc7, 0x73, 0xf7, 0xfa, 0x8c, 0x15, 0x75, 0x1f,
+        0xbf, 0x43, 0x85, 0x72, 0x0a, 0xfa, 0xb7, 0xb8, 0xe8, 0xf0, 0x1b, 0x78,
+        0x37, 0x0a, 0xee, 0xf3, 0x8b, 0xce, 0x77, 0xa7, 0x9f, 0xc5, 0x73, 0x83,
+        0xfd, 0xee, 0x9d, 0xd1, 0x53, 0x22, 0xc5, 0x70, 0xbe, 0x89, 0x1c, 0xd6,
+        0xfe, 0x02, 0xd6, 0xbe, 0xfe, 0x77, 0xee, 0xf0, 0xae, 0x8c, 0x77, 0xe5,
+        0x0f, 0x07, 0xe9, 0x36, 0xd2, 0x22, 0xe9, 0xef, 0xb5, 0xfc, 0xe6, 0x41,
+        0xcd, 0x17, 0x93, 0xc5, 0xc7, 0xc1, 0x17, 0x69, 0xee, 0x37, 0x07, 0x0f,
+        0xfb, 0x37, 0x80, 0x2f, 0xf6, 0xc8, 0xef, 0xc3, 0x2e, 0xf8, 0xdd, 0xca,
+        0x10, 0xf8, 0x63, 0x10, 0xfc, 0x32, 0x00, 0x1e, 0xf1, 0xb5, 0x8d, 0xfc,
+        0x04, 0xf4, 0x1f, 0xf4, 0x9a, 0xb3, 0xaf, 0xd4, 0xe5, 0x64, 0x4b, 0x9e,
+        0x33, 0x51, 0xe2, 0xf7, 0x5a, 0xd4, 0x5b, 0x1b, 0x24, 0x9a, 0x98, 0x13,
+        0xf2, 0x42, 0x37, 0x73, 0x1c, 0xdb, 0x81, 0xab, 0x53, 0xc4, 0xd5, 0x5c,
+        0xa5, 0xcf, 0xbd, 0x04, 0x3c, 0xd1, 0xae, 0x79, 0xa2, 0xd5, 0x49, 0xbb,
+        0x37, 0x58, 0x9e, 0x78, 0x11, 0x3c, 0x71, 0x7e, 0x0d, 0x4f, 0x3c, 0x6d,
+        0xe9, 0x7f, 0xa1, 0x86, 0x27, 0xe6, 0x6c, 0xd9, 0xcc, 0x45, 0x78, 0xe2,
+        0x52, 0x2f, 0xf5, 0xa5, 0x31, 0x79, 0x15, 0x3c, 0x21, 0x8a, 0x3c, 0x71,
+        0xa9, 0xe6, 0x09, 0xc6, 0x8e, 0xc8, 0x17, 0x9d, 0x90, 0x23, 0xe4, 0x8b,
+        0xb3, 0xb2, 0x04, 0xbe, 0x78, 0x5e, 0x71, 0xec, 0x19, 0xda, 0x0a, 0x25,
+        0xfa, 0x64, 0x27, 0x8a, 0x5d, 0xe0, 0x77, 0x25, 0xff, 0x65, 0x3a, 0x08,
+        0x16, 0xe1, 0xa7, 0x3f, 0x08, 0x7b, 0x3e, 0xaa, 0xbf, 0xa9, 0xb8, 0x00,
+        0xba, 0x0f, 0xe9, 0x7d, 0xc2, 0x01, 0xbd, 0x1f, 0x9e, 0xc5, 0x1c, 0x26,
+        0xd4, 0x7f, 0x86, 0x2f, 0xec, 0x62, 0x5d, 0x69, 0xe7, 0x1f, 0xd3, 0x3c,
+        0xd4, 0x00, 0x7d, 0xf0, 0xe8, 0x00, 0x63, 0x4d, 0x9e, 0xbb, 0x4f, 0x75,
+        0xe7, 0x46, 0x00, 0x73, 0x44, 0xdd, 0x2f, 0x8c, 0x73, 0xb4, 0xad, 0xb2,
+        0xf3, 0x29, 0x23, 0x46, 0x21, 0xeb, 0xcc, 0xbb, 0x5c, 0xd0, 0x04, 0x9b,
+        0xb4, 0x49, 0x19, 0x1b, 0x5d, 0xed, 0x48, 0xb9, 0x1f, 0x84, 0x00, 0x6d,
+        0x84, 0xbd, 0xb0, 0x0b, 0xab, 0x3d, 0x52, 0xa8, 0xb5, 0xf1, 0xff, 0x03,
+        0x6c, 0x7c, 0xb6, 0x91, 0xa8, 0xb1, 0xf1, 0x7f, 0xcd, 0xf2, 0x1a, 0x7f,
+        0xbb, 0xda, 0xde, 0x3f, 0x00, 0xf8, 0x76, 0x2f, 0xdb, 0xfb, 0xec, 0x83,
+        0x76, 0x87, 0xc8, 0xf5, 0xb0, 0xf9, 0xde, 0x0d, 0x1e, 0xbc, 0x01, 0xbe,
+        0xd4, 0x7b, 0x0a, 0xae, 0xec, 0x29, 0xb4, 0xc3, 0xe7, 0xee, 0x94, 0xf7,
+        0x4e, 0x6f, 0x95, 0x9d, 0x25, 0xff, 0x12, 0x69, 0xee, 0x80, 0x8d, 0x5a,
+        0x00, 0x9c, 0x11, 0x2b, 0xb7, 0xcf, 0x02, 0x6f, 0xdd, 0xc9, 0x9f, 0xa8,
+        0x17, 0xad, 0x5d, 0xc4, 0xb3, 0x8e, 0xf5, 0xfa, 0x89, 0xa3, 0x3d, 0x63,
+        0x29, 0x1d, 0x72, 0xea, 0x18, 0xbd, 0xaf, 0x24, 0xec, 0x72, 0x1f, 0x36,
+        0xc9, 0x16, 0xf4, 0xc7, 0x78, 0xf2, 0x46, 0x79, 0xfa, 0xaa, 0xe8, 0x5d,
+        0x59, 0xcd, 0x87, 0x9d, 0x4e, 0x66, 0x1a, 0x3e, 0xc0, 0xde, 0x18, 0xe6,
+        0xa0, 0xda, 0x37, 0xcb, 0x75, 0xb2, 0x53, 0xcf, 0x67, 0x46, 0x0e, 0x42,
+        0x37, 0xff, 0x41, 0x61, 0xa7, 0x2c, 0x8d, 0xb6, 0xe1, 0x39, 0x26, 0x4f,
+        0x17, 0xfa, 0xe0, 0xfb, 0xbc, 0x0b, 0x38, 0x6a, 0xc4, 0x73, 0xa3, 0x0c,
+        0x5f, 0x42, 0x5e, 0x6d, 0x91, 0x45, 0x94, 0xbf, 0x5b, 0x7e, 0xc1, 0x96,
+        0xb3, 0x8c, 0xbc, 0xd1, 0x82, 0xb6, 0x31, 0x39, 0x57, 0xa0, 0x5d, 0xa9,
+        0x79, 0x62, 0xf0, 0x7b, 0xd2, 0x97, 0xfe, 0x1e, 0xec, 0xd4, 0xb3, 0xb8,
+        0x9e, 0x91, 0xd4, 0x9e, 0x71, 0xa7, 0x2f, 0xd9, 0xed, 0x40, 0x77, 0xe2,
+        0x8a, 0x3a, 0x7d, 0x6e, 0xa3, 0x73, 0x85, 0xed, 0xa3, 0x41, 0x9e, 0xd9,
+        0xab, 0x12, 0x2d, 0x58, 0x93, 0xed, 0x4e, 0x8f, 0x2d, 0xe3, 0x73, 0xca,
+        0x78, 0x40, 0xa7, 0xd4, 0x96, 0x0d, 0x22, 0x5d, 0x2d, 0xb0, 0x79, 0x26,
+        0x44, 0xb5, 0xb7, 0x48, 0x54, 0xba, 0x67, 0x55, 0x27, 0xca, 0x3c, 0x5b,
+        0x16, 0x6f, 0x81, 0x7e, 0x40, 0x59, 0x07, 0xca, 0xb6, 0xd9, 0xb2, 0xb6,
+        0x16, 0x69, 0x44, 0xd9, 0x8c, 0xe6, 0xf9, 0xf3, 0x3d, 0x9e, 0x9b, 0x75,
+        0x9a, 0xa5, 0xeb, 0x44, 0x0b, 0x64, 0xc3, 0x46, 0x59, 0xbc, 0xaa, 0x49,
+        0xba, 0xf0, 0x8e, 0x71, 0x6e, 0xff, 0x44, 0x4c, 0xae, 0x3d, 0xd1, 0x9d,
+        0xf8, 0x38, 0xe6, 0xd0, 0x7d, 0x8a, 0x71, 0xef, 0xfc, 0x25, 0x8c, 0xfb,
+        0x74, 0x9d, 0xe2, 0xbd, 0x49, 0xcb, 0x1f, 0xe2, 0xc3, 0x7c, 0x93, 0x88,
+        0x32, 0xf9, 0x24, 0xfc, 0x5c, 0xea, 0xf0, 0x6e, 0xfb, 0xfd, 0x8c, 0xe3,
+        0x97, 0xd0, 0x6f, 0x9b, 0xa5, 0x5d, 0x52, 0x24, 0x3f, 0x52, 0x0f, 0xe1,
+        0x3e, 0xe3, 0x48, 0xbe, 0x2a, 0xb3, 0xe6, 0xc9, 0x57, 0xc7, 0x14, 0x73,
+        0x59, 0x50, 0x56, 0xf9, 0xc5, 0xc0, 0xac, 0x31, 0x79, 0xc1, 0xc8, 0xa5,
+        0x0f, 0x18, 0xb9, 0xf4, 0xd8, 0x99, 0x15, 0x72, 0xe9, 0xbc, 0x96, 0x4b,
+        0x7b, 0x05, 0xf7, 0xf9, 0xf3, 0x90, 0x4b, 0x2f, 0xe2, 0xd9, 0xd5, 0x72,
+        0x29, 0x2e, 0xd6, 0x5e, 0x96, 0xaf, 0xea, 0xf1, 0xe7, 0x8a, 0x51, 0x6d,
+        0x57, 0xe5, 0x67, 0x60, 0x93, 0x14, 0xa7, 0xac, 0xfe, 0x96, 0xa1, 0x36,
+        0xe9, 0x19, 0xfc, 0xa9, 0x84, 0x36, 0xe7, 0x7f, 0xba, 0x84, 0xdf, 0xee,
+        0x7c, 0x5e, 0x51, 0x86, 0xbd, 0x0a, 0x19, 0x26, 0xaa, 0xbe, 0x0c, 0xc3,
+        0xbb, 0x32, 0xde, 0x95, 0xd9, 0xef, 0x8f, 0x7e, 0x3a, 0xe6, 0x52, 0x7e,
+        0x50, 0x66, 0x40, 0x26, 0x15, 0x21, 0x93, 0x8a, 0x90, 0x53, 0x45, 0xc8,
+        0x25, 0xd8, 0x6c, 0x67, 0x8a, 0x90, 0x4b, 0x45, 0xc8, 0x25, 0xc8, 0xb8,
+        0x27, 0x20, 0xe3, 0x8c, 0x4c, 0x1b, 0x85, 0x4c, 0x9b, 0x91, 0xfb, 0xac,
+        0xae, 0x37, 0xb1, 0x92, 0x7e, 0xeb, 0x23, 0x0d, 0xe8, 0x18, 0xf2, 0x99,
+        0x9a, 0xd8, 0xe0, 0x8d, 0x47, 0x34, 0xbf, 0xbb, 0x9e, 0xba, 0xc2, 0x61,
+        0x0e, 0xcd, 0x4f, 0xb4, 0xff, 0xbe, 0x9d, 0xbf, 0xa5, 0x09, 0x7c, 0xfd,
+        0x03, 0xcb, 0xd7, 0xdb, 0x97, 0xf9, 0x3a, 0xe5, 0x30, 0x56, 0x5c, 0x9f,
+        0xaf, 0x3b, 0xec, 0xbb, 0x5c, 0xb0, 0x0e, 0x7c, 0xbd, 0x6e, 0x15, 0x5f,
+        0xc7, 0xc0, 0xd7, 0x7b, 0xd6, 0xf0, 0xf5, 0x06, 0x67, 0x58, 0xb7, 0xe1,
+        0x19, 0x09, 0x3e, 0x37, 0x3a, 0x55, 0xbe, 0xbe, 0x47, 0xf3, 0xf5, 0x21,
+        0xf0, 0xf5, 0x75, 0x35, 0x7c, 0xbd, 0x47, 0x52, 0x37, 0x67, 0x22, 0x5b,
+        0x65, 0xfc, 0x7e, 0xd5, 0xbe, 0x49, 0xfe, 0x49, 0x4c, 0x7b, 0xc3, 0x63,
+        0xc3, 0xd3, 0xed, 0x92, 0x7d, 0xe8, 0x15, 0x94, 0x91, 0xcf, 0x52, 0x63,
+        0x69, 0xc7, 0x95, 0x83, 0x47, 0x7e, 0x22, 0x0b, 0x9a, 0xb7, 0x44, 0x26,
+        0x8e, 0xc4, 0x64, 0xf2, 0x08, 0xe3, 0x10, 0x7f, 0x63, 0xe9, 0xbd, 0x49,
+        0x26, 0xf7, 0x32, 0x6f, 0x2e, 0x2a, 0xe3, 0x47, 0xe0, 0x6f, 0x1d, 0x61,
+        0x1c, 0xe2, 0xa5, 0x65, 0x1e, 0x5b, 0x80, 0x6c, 0x19, 0x3f, 0xc2, 0xb5,
+        0x8e, 0xa1, 0x9f, 0x16, 0x39, 0x74, 0x44, 0xe4, 0xb6, 0x23, 0x51, 0xf9,
+        0xe8, 0x91, 0x65, 0x5e, 0x1b, 0x0d, 0x79, 0xed, 0x59, 0xf0, 0x5a, 0xb7,
+        0xe5, 0x35, 0xb5, 0xcc, 0x6b, 0x7f, 0x5a, 0xc3, 0x6b, 0x6c, 0x4f, 0x5e,
+        0x7b, 0xce, 0x96, 0xf1, 0x39, 0x2a, 0xfb, 0x8e, 0x74, 0xca, 0xf8, 0x43,
+        0x6f, 0x91, 0x89, 0xfb, 0x09, 0xab, 0xf9, 0x8e, 0x13, 0x6d, 0xb1, 0x99,
+        0x4a, 0x37, 0xfa, 0x0f, 0x73, 0x88, 0xf4, 0xf7, 0x10, 0x7a, 0x67, 0x25,
+        0x95, 0xe3, 0x78, 0x8d, 0xf0, 0xa3, 0x4f, 0xc0, 0xbf, 0xd8, 0x07, 0x98,
+        0x6e, 0x39, 0x22, 0xa9, 0xa8, 0xbc, 0x2c, 0x53, 0xfe, 0x27, 0x2e, 0x37,
+        0xf6, 0x04, 0x6c, 0x11, 0x6d, 0xfb, 0xa4, 0x25, 0xfb, 0xce, 0x40, 0xfb,
+        0x18, 0xa5, 0xb2, 0x30, 0x16, 0xc0, 0xb8, 0xb9, 0x63, 0xbe, 0xc7, 0xc4,
+        0xfc, 0xc7, 0x06, 0x7d, 0xe6, 0x45, 0xc7, 0x6c, 0x07, 0xf8, 0x9e, 0xcf,
+        0xb0, 0x67, 0xf4, 0x59, 0x43, 0xb6, 0x7f, 0x44, 0x7f, 0x1b, 0x91, 0x31,
+        0xf5, 0x7c, 0x99, 0xdf, 0xb0, 0x81, 0xff, 0x59, 0xe6, 0xb7, 0xb0, 0xf6,
+        0xb7, 0x9b, 0xf8, 0x2c, 0xf9, 0xee, 0x87, 0x0e, 0xbf, 0x5d, 0x35, 0xa5,
+        0x73, 0xbd, 0xf0, 0xbb, 0xcc, 0x67, 0xd6, 0x7f, 0x84, 0xf1, 0x8e, 0x64,
+        0x52, 0xbd, 0xf7, 0x72, 0xe6, 0x1e, 0xec, 0x9d, 0x67, 0xdd, 0xad, 0x96,
+        0x47, 0xb7, 0x6a, 0xbf, 0x83, 0x36, 0xd6, 0x78, 0xe9, 0x45, 0xc9, 0xd3,
+        0x36, 0x19, 0xdd, 0xea, 0xe4, 0x66, 0x92, 0x97, 0x1b, 0xfb, 0x79, 0xdd,
+        0xa5, 0xcc, 0x3b, 0x4c, 0xab, 0xb5, 0x32, 0xf9, 0x84, 0x84, 0x32, 0x39,
+        0x75, 0x33, 0xbf, 0xb7, 0x9b, 0x3d, 0xa2, 0xbf, 0x2f, 0x95, 0xec, 0x56,
+        0x9c, 0xd3, 0xa7, 0x21, 0x5f, 0x43, 0x5a, 0x48, 0xc8, 0x27, 0x8f, 0x90,
+        0x1e, 0x54, 0xbc, 0x55, 0x3e, 0x61, 0xe9, 0x61, 0x46, 0x0a, 0x90, 0x3b,
+        0x47, 0x8e, 0x7c, 0x54, 0x66, 0x6e, 0x5c, 0x4d, 0x0f, 0x13, 0x55, 0x7a,
+        0x88, 0xc3, 0x3e, 0x73, 0x6a, 0xe9, 0xe1, 0x97, 0x97, 0xe9, 0x61, 0xc6,
+        0xf9, 0xe7, 0xd2, 0xc3, 0xf5, 0x2b, 0xe8, 0x61, 0x4a, 0xd3, 0xc3, 0xce,
+        0x65, 0x7a, 0x98, 0x3a, 0xc2, 0x71, 0xf5, 0xde, 0xa8, 0xbb, 0xe8, 0x70,
+        0xcd, 0x97, 0x69, 0x21, 0x39, 0xa9, 0xf3, 0xf5, 0x53, 0x39, 0x9e, 0x6f,
+        0xda, 0xa0, 0x18, 0x27, 0xa9, 0xae, 0x7f, 0xeb, 0xbf, 0xe8, 0xfa, 0xbf,
+        0xfc, 0xff, 0x79, 0xfd, 0xd5, 0xa5, 0xcc, 0xdd, 0xe7, 0x99, 0x55, 0x23,
+        0x8f, 0x43, 0x7a, 0x88, 0x5d, 0x6a, 0xf4, 0x02, 0xd7, 0x98, 0xcf, 0x90,
+        0x67, 0x90, 0x7f, 0x67, 0x20, 0xff, 0x9e, 0x84, 0xfc, 0x3b, 0xbd, 0x62,
+        0x4f, 0x60, 0xd0, 0xc6, 0x23, 0x02, 0x39, 0xe8, 0x57, 0xf1, 0xb1, 0x38,
+        0x40, 0x7c, 0x98, 0xfc, 0x13, 0xe6, 0xfe, 0xae, 0xc4, 0x49, 0x54, 0xe7,
+        0x1c, 0x3d, 0xea, 0xd7, 0xe2, 0x84, 0x70, 0xbf, 0x5c, 0x33, 0x47, 0xfc,
+        0x2e, 0xf3, 0x79, 0x46, 0xe7, 0x91, 0xe4, 0xf5, 0x1e, 0x14, 0xf1, 0xc2,
+        0x3d, 0x28, 0xe2, 0x24, 0xaa, 0xed, 0xfd, 0x7c, 0xb9, 0x49, 0xe7, 0xd0,
+        0x1f, 0x98, 0x8f, 0xcb, 0x62, 0x9c, 0x31, 0x3e, 0x7e, 0x97, 0x90, 0x7e,
+        0xb3, 0x97, 0xc8, 0x4b, 0x8e, 0xb9, 0x72, 0xe0, 0xe9, 0x0d, 0x96, 0xb6,
+        0x19, 0x1b, 0xe4, 0x99, 0xdd, 0x70, 0x2f, 0xa2, 0xd7, 0xca, 0xba, 0x96,
+        0x9a, 0x98, 0x25, 0xf0, 0x3e, 0x2d, 0xc9, 0xcc, 0x00, 0xee, 0xf3, 0x1c,
+        0x7b, 0xbf, 0x4c, 0x3d, 0x38, 0x01, 0x5b, 0x6e, 0x2f, 0x74, 0x0e, 0xcf,
+        0x9f, 0x99, 0xef, 0x70, 0x13, 0x86, 0x59, 0xfd, 0xdd, 0x29, 0xfa, 0x80,
+        0xa4, 0x87, 0x04, 0x9e, 0x67, 0x6c, 0x5c, 0x29, 0x21, 0xf9, 0xc2, 0x05,
+        0xf3, 0x6d, 0xcb, 0xc2, 0x4b, 0xb8, 0xbf, 0xde, 0x7a, 0x18, 0x3f, 0x64,
+        0xd4, 0xdc, 0xd1, 0xd7, 0x92, 0xa4, 0xcb, 0x26, 0xc7, 0xa5, 0x1a, 0x37,
+        0x99, 0x91, 0xc3, 0xda, 0x7e, 0x1e, 0xb2, 0xb9, 0x2d, 0xa9, 0xd1, 0x9c,
+        0x18, 0x1b, 0xfa, 0x77, 0x60, 0x43, 0x7f, 0xb1, 0x92, 0xd6, 0xfb, 0x58,
+        0xa7, 0x61, 0x43, 0x3f, 0x01, 0xdd, 0x43, 0x9d, 0x13, 0xb7, 0x3a, 0x67,
+        0x4a, 0xdd, 0xa8, 0x75, 0xce, 0x37, 0xb5, 0xce, 0x79, 0xef, 0x1a, 0x9d,
+        0x73, 0x48, 0x75, 0x97, 0xa8, 0x73, 0x86, 0xd5, 0x1e, 0x87, 0xf6, 0xe2,
+        0xe6, 0x3a, 0x3a, 0xe7, 0x7d, 0xf2, 0x2e, 0xfb, 0xee, 0x1e, 0x79, 0xff,
+        0x0e, 0xbd, 0x77, 0xe3, 0xce, 0x2a, 0x7e, 0x6b, 0xc9, 0xe8, 0xa0, 0xeb,
+        0x54, 0xaf, 0xde, 0xf3, 0xfd, 0x46, 0x8d, 0xce, 0xe9, 0x52, 0x03, 0xce,
+        0xb0, 0x6e, 0xc3, 0xd8, 0x04, 0x9f, 0x7d, 0x27, 0x3d, 0xda, 0x84, 0xe7,
+        0x84, 0x44, 0x8e, 0x60, 0xee, 0xe6, 0x7b, 0x50, 0xca, 0xbc, 0x7b, 0xab,
+        0x7d, 0xa7, 0xc2, 0xf2, 0xa8, 0x29, 0xef, 0xb6, 0xe5, 0x46, 0x57, 0x75,
+        0xa9, 0x4e, 0xad, 0xab, 0xb6, 0x83, 0xa1, 0x66, 0xa1, 0x5f, 0x67, 0x8b,
+        0xa1, 0xce, 0xe2, 0x6f, 0xc6, 0x9e, 0x19, 0xa3, 0x08, 0x63, 0xd8, 0x49,
+        0xd4, 0xc1, 0x55, 0x0c, 0x6d, 0x4a, 0xfe, 0x86, 0xaf, 0x80, 0x6b, 0x1e,
+        0x78, 0xbd, 0x19, 0xfc, 0xf3, 0x6f, 0x0a, 0x8c, 0x81, 0xb6, 0xcb, 0xd1,
+        0xe9, 0xda, 0x77, 0x9d, 0xf2, 0x9e, 0xe9, 0x2d, 0xb2, 0xbf, 0xf4, 0x2d,
+        0xf0, 0xc1, 0x56, 0x99, 0x2a, 0x15, 0xf4, 0x79, 0xf5, 0x4d, 0xfa, 0x3b,
+        0x1e, 0xfc, 0xbe, 0x8d, 0x91, 0x91, 0x3b, 0x1d, 0x23, 0x23, 0xd3, 0xaa,
+        0x6a, 0xb3, 0x86, 0x7d, 0xf2, 0xdb, 0x21, 0x23, 0xa5, 0x84, 0xfe, 0xc6,
+        0xe9, 0x6c, 0xe5, 0x0a, 0xf9, 0xc2, 0x31, 0x75, 0xa7, 0xaa, 0x9e, 0xef,
+        0xd5, 0x36, 0xeb, 0xdc, 0x0a, 0x9b, 0xf5, 0xaf, 0x64, 0xf1, 0xfd, 0x31,
+        0xcc, 0x13, 0x34, 0x7c, 0xe5, 0xf7, 0xb8, 0x17, 0xda, 0x1e, 0x97, 0x0b,
+        0x32, 0xa2, 0xf1, 0x47, 0x79, 0xda, 0x02, 0x39, 0xb8, 0xa4, 0xf5, 0xeb,
+        0x66, 0xd0, 0x20, 0x65, 0xe9, 0xc7, 0xe4, 0x45, 0x2d, 0xcf, 0x36, 0x5b,
+        0xdb, 0x75, 0x81, 0xb1, 0xd4, 0x23, 0xb4, 0x5d, 0xbf, 0x69, 0xcb, 0x59,
+        0x96, 0x4a, 0x2c, 0x09, 0xf5, 0x5d, 0x1c, 0x32, 0x94, 0xf2, 0xf4, 0x8d,
+        0xda, 0xae, 0x5f, 0xb3, 0x7d, 0x50, 0x7e, 0x1a, 0xd9, 0xbd, 0xdd, 0x59,
+        0xb0, 0x65, 0x7c, 0x0e, 0xe3, 0xe9, 0x5e, 0x3a, 0x6b, 0xf9, 0x4c, 0x39,
+        0x5f, 0xc2, 0xfb, 0x4d, 0x78, 0x4f, 0x3e, 0x3b, 0xad, 0xf9, 0x4c, 0xdb,
+        0x27, 0x4e, 0xbf, 0xdd, 0x5f, 0x58, 0xde, 0x1b, 0xc8, 0x91, 0xcf, 0xd4,
+        0x51, 0x77, 0xc1, 0xc8, 0x03, 0xe6, 0xa9, 0x7e, 0x1e, 0xba, 0x83, 0x6d,
+        0x51, 0xfe, 0x70, 0x9a, 0xbe, 0x2d, 0xfc, 0x9f, 0x56, 0x3c, 0xb7, 0xe3,
+        0x79, 0x56, 0xde, 0xbb, 0x37, 0xa6, 0xe7, 0x3d, 0x85, 0x79, 0x1c, 0x38,
+        0x82, 0x39, 0x39, 0xc6, 0x76, 0x8e, 0x9e, 0x8a, 0x4a, 0xc3, 0x29, 0xf2,
+        0x1d, 0xcf, 0xda, 0x04, 0xc1, 0xbe, 0x7e, 0xd2, 0x6d, 0xca, 0xdd, 0xa9,
+        0xcf, 0x96, 0x6e, 0x4f, 0x44, 0x80, 0x93, 0x03, 0x58, 0x8f, 0xa9, 0x82,
+        0xe7, 0x66, 0x1c, 0x2f, 0x81, 0x79, 0xc2, 0x06, 0xec, 0x86, 0x2d, 0xd8,
+        0x0d, 0x3b, 0xb0, 0x1b, 0x76, 0xe0, 0x46, 0x39, 0x71, 0x15, 0x73, 0x4c,
+        0x72, 0xd7, 0xc2, 0x2b, 0x97, 0xef, 0xe8, 0x38, 0x7d, 0xe3, 0xcd, 0x23,
+        0xf0, 0xd9, 0xc5, 0x4d, 0x8d, 0x32, 0x0f, 0x7f, 0xc9, 0x6d, 0xbc, 0x79,
+        0xa7, 0x74, 0x0f, 0xe2, 0xfd, 0xe0, 0x05, 0xe9, 0xb9, 0xf9, 0x56, 0xa7,
+        0x71, 0x74, 0x04, 0x78, 0x4c, 0x3b, 0xa9, 0xc4, 0x98, 0xb3, 0x80, 0x71,
+        0x32, 0xdb, 0x23, 0xc2, 0xb8, 0xe5, 0x02, 0x63, 0x11, 0x37, 0x77, 0x47,
+        0xfa, 0x92, 0xe3, 0x4e, 0x6a, 0x54, 0x45, 0x52, 0xa3, 0x23, 0x4e, 0x58,
+        0x8f, 0xdf, 0x48, 0x85, 0x9c, 0x01, 0xac, 0x07, 0x8a, 0xd3, 0xa0, 0xa7,
+        0xff, 0x28, 0xf9, 0x63, 0x2d, 0x32, 0x5f, 0xe8, 0x76, 0x33, 0x2a, 0xae,
+        0x73, 0x4b, 0xd4, 0x09, 0x10, 0xfd, 0xa9, 0x98, 0xcc, 0x96, 0xb6, 0x8a,
+        0xd2, 0xb6, 0x7b, 0x87, 0x64, 0xa6, 0x4b, 0x72, 0x6e, 0x40, 0xda, 0x14,
+        0xfa, 0xe7, 0xb7, 0x67, 0xd5, 0x09, 0xee, 0x25, 0x86, 0xbc, 0x70, 0x39,
+        0xf9, 0xa4, 0x04, 0x1c, 0x82, 0x6e, 0x19, 0xe3, 0x6d, 0x12, 0xca, 0xbd,
+        0x8f, 0xea, 0xf8, 0x29, 0x63, 0xb6, 0xb5, 0x7b, 0x0f, 0xe4, 0x8f, 0x58,
+        0x5d, 0xfe, 0x98, 0x2b, 0x72, 0x9f, 0x46, 0x72, 0x51, 0xc6, 0x88, 0x3d,
+        0xfc, 0x9e, 0x61, 0xdd, 0x26, 0x99, 0x1a, 0xc8, 0xd9, 0x3c, 0x8f, 0x47,
+        0x12, 0xcc, 0x21, 0x26, 0x4e, 0xc6, 0x07, 0xc8, 0xeb, 0xab, 0xf7, 0x36,
+        0x62, 0x35, 0xf2, 0xc0, 0x91, 0xc5, 0x52, 0xb8, 0x17, 0xc2, 0xfe, 0xf0,
+        0x3c, 0x63, 0xe4, 0x6d, 0x66, 0x4d, 0x3b, 0xc2, 0xc5, 0xfd, 0xca, 0x95,
+        0x32, 0x56, 0x79, 0x94, 0xa9, 0xae, 0x96, 0xaf, 0x8f, 0x55, 0x8c, 0x6c,
+        0x9d, 0xa9, 0x84, 0xba, 0x25, 0x66, 0x74, 0xe9, 0x1a, 0x7d, 0x62, 0xa2,
+        0x99, 0x55, 0x7d, 0x42, 0xbd, 0xa8, 0xe4, 0x03, 0xf3, 0x1d, 0x12, 0x7d,
+        0x58, 0x96, 0xa6, 0xbc, 0xec, 0xe5, 0xcc, 0xd5, 0x98, 0xf2, 0xdf, 0x8c,
+        0x7e, 0xfc, 0x6f, 0x09, 0xea, 0xc3, 0x31, 0xf5, 0x75, 0xdc, 0x37, 0x69,
+        0xfa, 0x03, 0x4f, 0xe1, 0xd9, 0xf8, 0x09, 0xbf, 0x03, 0x3f, 0xe1, 0x8b,
+        0xd0, 0x75, 0x67, 0xe0, 0x27, 0x3c, 0x09, 0x3f, 0xe1, 0x34, 0xfc, 0x84,
+        0x27, 0xa0, 0x27, 0x6b, 0xfd, 0x83, 0xc9, 0x15, 0xfe, 0x41, 0xa0, 0xf9,
+        0x9f, 0xf1, 0xc0, 0x27, 0x6b, 0x7c, 0x83, 0x7d, 0x46, 0x5f, 0xc1, 0xef,
+        0x37, 0x7c, 0xd4, 0xa5, 0x6e, 0xd2, 0xfa, 0xd1, 0xe4, 0xed, 0x8e, 0x2e,
+        0xeb, 0xab, 0x2e, 0x65, 0xf4, 0xd5, 0x6c, 0x55, 0x5f, 0x19, 0x3e, 0x7a,
+        0xb8, 0x24, 0x11, 0xaf, 0xb4, 0x90, 0xf1, 0x77, 0x69, 0x1e, 0x6a, 0xf3,
+        0xb6, 0x4a, 0xe4, 0x01, 0xd5, 0xde, 0x20, 0x19, 0xfb, 0x0c, 0xfa, 0x3a,
+        0x3a, 0x8d, 0xbe, 0xae, 0x95, 0xac, 0xb6, 0xcf, 0x2e, 0x8e, 0xef, 0x27,
+        0x56, 0xe1, 0x3b, 0x5f, 0xbc, 0x5b, 0xe3, 0xfc, 0xfe, 0x32, 0xf7, 0x59,
+        0x5a, 0x64, 0xb2, 0x1c, 0xe2, 0x9c, 0xe7, 0x59, 0x99, 0x8b, 0xd1, 0x29,
+        0x91, 0x87, 0x3b, 0x78, 0xce, 0x4a, 0x65, 0xfd, 0xf5, 0x3a, 0x87, 0xe5,
+        0xc4, 0x80, 0x24, 0xb2, 0x03, 0xa4, 0xd5, 0xfb, 0x64, 0x56, 0xaf, 0x45,
+        0x87, 0x34, 0x3c, 0x4c, 0x1b, 0x25, 0xdc, 0xcf, 0xeb, 0xba, 0xcc, 0x7e,
+        0x23, 0x35, 0x66, 0xea, 0x89, 0x1c, 0xd4, 0xeb, 0x75, 0x5c, 0xe7, 0x19,
+        0xde, 0x34, 0xcf, 0xb8, 0x3c, 0xbf, 0x47, 0xc5, 0x98, 0xfc, 0x3f, 0x67,
+        0xfd, 0x7e, 0xe1, 0x32, 0x63, 0xcf, 0x6c, 0xb2, 0x76, 0x8c, 0x89, 0x53,
+        0xd5, 0xb7, 0x61, 0xd8, 0x4f, 0xed, 0x37, 0x14, 0xb7, 0x38, 0x93, 0xa5,
+        0xad, 0x4e, 0xbe, 0xc4, 0xbd, 0x6c, 0xfb, 0xf7, 0x2e, 0xdc, 0x3d, 0xce,
+        0x01, 0x6f, 0x0b, 0xca, 0x18, 0xb3, 0x64, 0xcc, 0xe6, 0x97, 0x2e, 0x63,
+        0x8c, 0x36, 0xe3, 0x71, 0x6c, 0x96, 0x6d, 0x71, 0xa6, 0x4a, 0xdd, 0xf0,
+        0xcd, 0x79, 0xae, 0x8a, 0xef, 0x77, 0x72, 0xed, 0xa0, 0x83, 0x5d, 0x7d,
+        0x66, 0x77, 0x42, 0xae, 0xb0, 0x31, 0x68, 0xea, 0xe1, 0x9f, 0x5f, 0xb1,
+        0x77, 0x7b, 0x08, 0x7a, 0xec, 0x16, 0xc8, 0x23, 0xea, 0xe1, 0x43, 0x72,
+        0xb5, 0xa5, 0xe7, 0x95, 0x7a, 0xf8, 0xbc, 0x30, 0x4e, 0xdc, 0x8f, 0x77,
+        0xb9, 0x20, 0x06, 0x7a, 0x38, 0x5c, 0xe3, 0xab, 0xd1, 0xef, 0x6b, 0x1a,
+        0x32, 0xfb, 0x61, 0x2b, 0xfd, 0x3e, 0xc8, 0x81, 0x78, 0xe8, 0xe7, 0x35,
+        0x2e, 0xef, 0xd7, 0xee, 0xb1, 0x6d, 0xa7, 0xfc, 0xfb, 0x89, 0xa3, 0xe4,
+        0x21, 0xe9, 0x81, 0x2e, 0x63, 0x0e, 0xc8, 0x6f, 0x69, 0x9c, 0x89, 0x22,
+        0xed, 0x6d, 0xd2, 0x30, 0x5a, 0x39, 0x9f, 0x0c, 0x73, 0x38, 0xf2, 0xb6,
+        0xed, 0x84, 0xdd, 0x93, 0xcf, 0xcb, 0xdc, 0x65, 0xd4, 0x83, 0x23, 0x91,
+        0xf5, 0xfc, 0x7e, 0x22, 0xda, 0xf6, 0x18, 0xbd, 0x28, 0x61, 0x5f, 0x7c,
+        0x6e, 0xa8, 0xe9, 0x9b, 0x76, 0x14, 0xef, 0xab, 0xcf, 0x91, 0x3d, 0xa3,
+        0xf7, 0x19, 0xcd, 0xf7, 0x12, 0x42, 0x3e, 0x21, 0xef, 0x24, 0xf5, 0x59,
+        0x27, 0xef, 0x61, 0xda, 0x3d, 0xdc, 0x83, 0x75, 0x17, 0x26, 0xfd, 0x4f,
+        0xe8, 0x6f, 0xfc, 0xcd, 0x88, 0x38, 0x79, 0xff, 0x36, 0x9d, 0x7b, 0x92,
+        0xd7, 0xb1, 0xe6, 0x1c, 0xee, 0x55, 0x1f, 0xb5, 0xeb, 0x61, 0xfe, 0x4d,
+        0x0b, 0x96, 0x65, 0x01, 0x1b, 0x75, 0x08, 0x65, 0x6f, 0x5c, 0xba, 0x8e,
+        0x7e, 0x58, 0xf3, 0xc2, 0x66, 0xf8, 0x02, 0xc3, 0x47, 0xa1, 0xab, 0x8f,
+        0x26, 0x64, 0xe7, 0x51, 0xad, 0x1b, 0xd3, 0x6b, 0x63, 0x05, 0x7d, 0x6e,
+        0xd4, 0x79, 0x8f, 0x3e, 0xc7, 0xf6, 0xd6, 0xa3, 0x11, 0x39, 0x1c, 0xef,
+        0x73, 0x7b, 0x9c, 0xf7, 0x5a, 0x5d, 0x18, 0xc6, 0xb0, 0x5b, 0xd0, 0xfe,
+        0xf5, 0xe2, 0xd8, 0x61, 0xfc, 0x3a, 0x22, 0x33, 0x7b, 0x3b, 0x01, 0xdb,
+        0x5f, 0x5d, 0x66, 0xce, 0x20, 0x63, 0xad, 0xf4, 0xb7, 0xe7, 0xa3, 0x09,
+        0xca, 0xb2, 0x2e, 0xc0, 0x32, 0x72, 0x94, 0xfa, 0xcc, 0xd3, 0x3c, 0x0e,
+        0x18, 0xdc, 0x06, 0xed, 0x87, 0x90, 0x2f, 0xdf, 0x22, 0xde, 0x03, 0x90,
+        0x71, 0x47, 0x63, 0xd2, 0x73, 0xb4, 0x45, 0xb6, 0x1d, 0xa5, 0x1f, 0x52,
+        0xeb, 0x97, 0xd2, 0x2e, 0x7d, 0x04, 0x73, 0x7c, 0xb7, 0x96, 0x93, 0xdc,
+        0xd3, 0xdc, 0x4f, 0xde, 0x45, 0xdd, 0x2c, 0x6c, 0xe6, 0xcc, 0x51, 0x57,
+        0xef, 0x91, 0x66, 0x30, 0xe7, 0x6c, 0xd9, 0xc5, 0x38, 0x46, 0xe6, 0xe4,
+        0xe9, 0xa7, 0x8c, 0x76, 0x00, 0xc7, 0xef, 0xb5, 0xbc, 0xb3, 0xbe, 0xc3,
+        0xf2, 0xe8, 0xcf, 0xc8, 0x7b, 0x5b, 0x3a, 0x8c, 0xec, 0x7c, 0x4b, 0x07,
+        0x73, 0x93, 0x36, 0x7b, 0xbc, 0x37, 0x69, 0x7b, 0xc2, 0xc8, 0xd0, 0xd7,
+        0xe2, 0x45, 0x01, 0x8e, 0xc2, 0x7d, 0x29, 0x7d, 0x96, 0x2f, 0x38, 0xe7,
+        0xeb, 0xf3, 0x2b, 0xfe, 0xa2, 0xfe, 0x3b, 0x21, 0xdc, 0x23, 0xab, 0x7e,
+        0x6f, 0x65, 0x57, 0x85, 0x71, 0xf2, 0xcf, 0x86, 0x7f, 0x97, 0xa4, 0x26,
+        0xef, 0xb0, 0x76, 0x0f, 0x8c, 0xb1, 0xa6, 0xe5, 0xdc, 0xa0, 0xa0, 0xa4,
+        0xbf, 0x5f, 0xf4, 0x9c, 0x73, 0xbe, 0x70, 0xd6, 0xf9, 0xee, 0xb4, 0x04,
+        0x51, 0xef, 0x27, 0xce, 0xf7, 0x3d, 0xee, 0x99, 0x7f, 0xdd, 0xf9, 0x5e,
+        0xc1, 0x03, 0x1f, 0xde, 0x87, 0x79, 0xbc, 0xe2, 0xfc, 0x00, 0xeb, 0x7b,
+        0xb0, 0x98, 0x4e, 0xb9, 0x36, 0x26, 0x7e, 0xb6, 0xf0, 0x8a, 0xf3, 0xb5,
+        0x6a, 0x3c, 0x69, 0x30, 0xa4, 0x91, 0x43, 0x7c, 0x57, 0xc6, 0xbb, 0xb2,
+        0xde, 0xff, 0x71, 0xe6, 0xa6, 0x6d, 0x7e, 0x89, 0xe6, 0xe3, 0x85, 0xe5,
+        0x7d, 0x99, 0x51, 0xbd, 0x57, 0xf1, 0xac, 0x33, 0x37, 0x7f, 0x77, 0x87,
+        0xc9, 0x33, 0x3a, 0x8b, 0x77, 0x26, 0xe7, 0x72, 0x76, 0xfe, 0x2c, 0xea,
+        0x3c, 0xe3, 0xcc, 0xea, 0xf8, 0x97, 0xf6, 0xc5, 0x9d, 0x99, 0xf9, 0x67,
+        0x9c, 0x79, 0xbd, 0x07, 0x7d, 0xce, 0x79, 0x74, 0x9a, 0x7d, 0x9f, 0x43,
+        0x9d, 0x05, 0xe7, 0x04, 0xfa, 0x9b, 0x9f, 0xe6, 0x79, 0xdc, 0x6e, 0xd8,
+        0x05, 0xfc, 0x7b, 0x3f, 0xfc, 0x1e, 0xc7, 0xb3, 0xce, 0xfc, 0x72, 0xbf,
+        0x8b, 0xe8, 0x87, 0x75, 0x49, 0x8b, 0x1c, 0xf7, 0x59, 0xf4, 0xbf, 0x76,
+        0xaf, 0x6a, 0x2d, 0x4e, 0x5e, 0x00, 0x4e, 0x2e, 0x58, 0x9c, 0xbc, 0x6a,
+        0x71, 0xf2, 0x7c, 0x0d, 0x4e, 0x44, 0xad, 0xc4, 0xc9, 0xab, 0xc0, 0x89,
+        0xa8, 0xfa, 0x38, 0xc1, 0xbb, 0x32, 0xde, 0x69, 0x9c, 0xbc, 0xb4, 0x0a,
+        0x27, 0x4b, 0xcb, 0x71, 0x79, 0x83, 0x93, 0x17, 0x81, 0x93, 0xaf, 0x5a,
+        0xd8, 0x2f, 0x58, 0x9c, 0xe0, 0x3e, 0x7f, 0x01, 0x75, 0x5e, 0xaa, 0xc1,
+        0xc9, 0x05, 0xe0, 0xe4, 0x25, 0x8b, 0x93, 0xef, 0x5b, 0x9c, 0x7c, 0x1f,
+        0x75, 0x96, 0x80, 0x93, 0xf3, 0x75, 0x70, 0xf2, 0x22, 0x70, 0x12, 0xf6,
+        0x7b, 0x1e, 0xfd, 0x7c, 0xbf, 0x06, 0x27, 0x2f, 0xd6, 0xc1, 0x09, 0xf7,
+        0x62, 0xc3, 0x9c, 0xee, 0x99, 0xd7, 0xc9, 0xe9, 0x96, 0x3b, 0x5f, 0x3f,
+        0xa7, 0x9b, 0x75, 0x66, 0xa4, 0xfa, 0x37, 0x25, 0xee, 0xb6, 0x39, 0x6a,
+        0x26, 0x17, 0xb0, 0xfa, 0xcd, 0xa6, 0x6e, 0xf0, 0x79, 0x3e, 0xe7, 0x8a,
+        0xc9, 0x29, 0x8d, 0xee, 0xf8, 0x10, 0x78, 0x6d, 0x97, 0x1c, 0x38, 0xd6,
+        0x78, 0x38, 0x6b, 0xcb, 0xbc, 0x1d, 0xdd, 0x39, 0xa5, 0xf8, 0x2e, 0xcc,
+        0x49, 0xa0, 0x5f, 0xd2, 0xc0, 0x6f, 0x0b, 0xf6, 0xa6, 0xa5, 0x76, 0x4f,
+        0xba, 0xc0, 0x6f, 0x34, 0x61, 0xec, 0x25, 0xfe, 0xfd, 0x8b, 0x24, 0xf3,
+        0xac, 0xf2, 0x1a, 0xde, 0x14, 0xf4, 0xc7, 0xa0, 0xce, 0xad, 0xca, 0x14,
+        0x68, 0x73, 0x27, 0x99, 0xa3, 0x06, 0x5b, 0x79, 0xc8, 0x9e, 0x09, 0xf3,
+        0xf5, 0x39, 0x95, 0x2a, 0xff, 0xd4, 0x9e, 0x87, 0x26, 0xdf, 0x55, 0xe9,
+        0xe6, 0xe0, 0xf2, 0x77, 0x02, 0x4f, 0xca, 0xd3, 0x3a, 0x56, 0xdc, 0x8c,
+        0xf5, 0x09, 0x82, 0xc7, 0x7c, 0x13, 0xa3, 0x5d, 0xd4, 0x31, 0x5a, 0x81,
+        0x37, 0x3e, 0x69, 0xe3, 0xb4, 0x3d, 0x83, 0x2f, 0x2d, 0xc7, 0x68, 0x6b,
+        0xf3, 0x59, 0xcc, 0xfe, 0x7a, 0xa6, 0xf4, 0x88, 0xce, 0xd1, 0x19, 0xe1,
+        0xf7, 0x37, 0x20, 0x23, 0x26, 0x66, 0xe6, 0x65, 0xf2, 0x41, 0x3e, 0x53,
+        0xbf, 0x45, 0xa0, 0xc3, 0x28, 0xc3, 0x73, 0x92, 0x19, 0x64, 0x99, 0x69,
+        0x33, 0xa2, 0xfd, 0xe5, 0x93, 0x32, 0xbc, 0x3c, 0x3e, 0xf1, 0x7b, 0x57,
+        0xcd, 0x77, 0xab, 0x69, 0xf3, 0xa4, 0x9d, 0x4c, 0x85, 0xef, 0xc3, 0x3d,
+        0xf2, 0xbb, 0xec, 0xb7, 0xb3, 0xf8, 0xbe, 0xf6, 0x5b, 0xad, 0x5a, 0x74,
+        0xe0, 0x37, 0xbf, 0x87, 0x36, 0xe5, 0x8c, 0xa0, 0xcd, 0x82, 0xdb, 0x32,
+        0xaa, 0x86, 0x6e, 0x18, 0xe5, 0xb9, 0xb9, 0xd9, 0x35, 0xdf, 0xba, 0xae,
+        0xea, 0xc5, 0xbc, 0x5e, 0x53, 0xe6, 0x67, 0xdd, 0x05, 0x5a, 0xd4, 0xb4,
+        0xa5, 0xe9, 0xff, 0xc0, 0xb2, 0xbe, 0xa4, 0x9e, 0x35, 0xdf, 0x9e, 0x31,
+        0xfa, 0x32, 0x95, 0x18, 0xc1, 0xf8, 0xfa, 0x6f, 0x2a, 0xd8, 0x73, 0xbd,
+        0xd9, 0xf9, 0xdb, 0xb5, 0xae, 0x9f, 0xf2, 0xd3, 0xc9, 0xa8, 0xd4, 0xa9,
+        0x5b, 0xaa, 0xa9, 0xab, 0xe7, 0xed, 0xca, 0x7f, 0xc5, 0xda, 0x7c, 0xbe,
+        0x58, 0x96, 0xe1, 0xe9, 0xbf, 0x84, 0xff, 0x98, 0x90, 0xdf, 0x2e, 0x96,
+        0x40, 0xaf, 0xb9, 0xcd, 0xf6, 0x5b, 0x4d, 0x19, 0xc0, 0xcd, 0x6f, 0xaf,
+        0xe8, 0x7c, 0xe2, 0xc8, 0x17, 0x40, 0x17, 0x9f, 0x2b, 0x71, 0x0c, 0xc0,
+        0x12, 0x81, 0x6d, 0x0f, 0x3b, 0x61, 0xa6, 0xa4, 0x73, 0xe7, 0xae, 0x2b,
+        0x97, 0x74, 0xcc, 0x62, 0x67, 0xb9, 0x53, 0x76, 0x95, 0x5b, 0x64, 0x37,
+        0xf4, 0xc2, 0xee, 0xb2, 0x87, 0x2b, 0x26, 0xef, 0x2e, 0x9b, 0x75, 0xfa,
+        0x58, 0x99, 0xeb, 0xbd, 0x43, 0x66, 0x8f, 0xad, 0xfe, 0x3e, 0xe7, 0x42,
+        0x2e, 0xfc, 0x3b, 0x4b, 0x4a, 0x31, 0xbf, 0x8c, 0xb4, 0x84, 0xab, 0x98,
+        0x3a, 0xbc, 0xa0, 0xf1, 0xc0, 0x0c, 0xd7, 0x54, 0x69, 0x49, 0x98, 0xa7,
+        0xcf, 0xbf, 0xad, 0x34, 0x73, 0x39, 0xcf, 0x4d, 0xf3, 0x5b, 0x5e, 0x3b,
+        0x2b, 0x61, 0xde, 0x78, 0xbd, 0x9c, 0x71, 0xd8, 0xf9, 0x3b, 0xc2, 0x1c,
+        0xbf, 0x18, 0x73, 0xc6, 0xa5, 0xeb, 0x54, 0x0b, 0xee, 0xa7, 0x2f, 0xd7,
+        0x67, 0x9b, 0x4f, 0x89, 0x2d, 0xd3, 0xf9, 0xe4, 0x78, 0x5e, 0xfd, 0x7d,
+        0xb5, 0x90, 0x1f, 0xaa, 0x7f, 0xa7, 0x40, 0xe4, 0xff, 0x02, 0xfb, 0x2e,
+        0x88, 0x71, 0xec, 0x6e, 0x00, 0x00, 0x00 };
+
+static const u32 bnx2_CP_b09FwData[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_CP_b09FwRodata[(0x118/4) + 1] = {
+        0x0800061c, 0x0800083c, 0x08000780, 0x080007a8, 0x080007d0, 0x080007f8,
+        0x08000654, 0x08000640, 0x08000864, 0x08000864, 0x08000670, 0x0800068c,
+        0x0800068c, 0x08000864, 0x080006a4, 0x080006b8, 0x08000864, 0x080006cc,
+        0x08000864, 0x08000864, 0x080006e0, 0x08000864, 0x08000864, 0x08000864,
+        0x08000864, 0x08000864, 0x08000864, 0x08000864, 0x08000864, 0x08000864,
+        0x08000864, 0x080006f4, 0x08000864, 0x08000708, 0x0800071c, 0x08000730,
+        0x08000864, 0x08000744, 0x08000758, 0x0800076c, 0x08003200, 0x08003218,
+        0x08003228, 0x08003238, 0x08003250, 0x08003268, 0x08003278, 0x08003288,
+        0x080032a8, 0x080032b8, 0x080032c8, 0x08003358, 0x08003298, 0x080032d8,
+        0x080032e8, 0x08003300, 0x08003320, 0x08003358, 0x08003338, 0x08003338,
+        0x080050d4, 0x080050d4, 0x080050d4, 0x080050d4, 0x080050d4, 0x080050fc,
+        0x080050fc, 0x08005124, 0x08005174, 0x08005144, 0x00000000 };
+static const u32 bnx2_CP_b09FwBss[(0x3b0/4) + 1] = { 0x0 };
+static const u32 bnx2_CP_b09FwSbss[(0xa1/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_cp_fw_09 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
         .start_addr                     = 0x0800006c,
 
         .text_addr                      = 0x08000000,
-        .text_len                       = 0x73cc,
+        .text_len                       = 0x6ee8,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_CP_b09FwText,
         .gz_text_len                    = sizeof(bnx2_CP_b09FwText),
 
-        .data_addr                      = 0x08007500,
-        .data_len                       = 0x50,
+        .data_addr                      = 0x08007020,
+        .data_len                       = 0x0,
         .data_index                     = 0x0,
         .data                           = bnx2_CP_b09FwData,
 
-        .sbss_addr                      = 0x08007554,
-        .sbss_len                       = 0xe9,
+        .sbss_addr                      = 0x08007024,
+        .sbss_len                       = 0xa1,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_CP_b09FwSbss,
 
-        .bss_addr                       = 0x08007640,
-        .bss_len                        = 0x870,
+        .bss_addr                       = 0x080070d0,
+        .bss_len                        = 0x3b0,
         .bss_index                      = 0x0,
         .bss                            = bnx2_CP_b09FwBss,
 
-        .rodata_addr                    = 0x080073d0,
+        .rodata_addr                    = 0x08006ee8,
         .rodata_len                     = 0x118,
         .rodata_index                   = 0x0,
         .rodata                         = bnx2_CP_b09FwRodata,
 };
 
 static u8 bnx2_RXP_b09FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0x19, 0xfd, 0x2f, 0x45, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xec, 0x5c, 0x6b, 0x6c,
-        0x1c, 0xd7, 0x75, 0x3e, 0xf3, 0x20, 0xb5, 0xa2, 0xf8, 0x18, 0x2e, 0x57,
-        0xcc, 0x4a, 0x66, 0xec, 0x5d, 0x71, 0x24, 0xb2, 0x16, 0x6b, 0x8c, 0xd8,
-        0xad, 0x4d, 0x04, 0x6b, 0x7b, 0x33, 0xbb, 0x92, 0x98, 0x54, 0x85, 0x29,
-        0x87, 0x75, 0x0c, 0xc3, 0x75, 0xd9, 0xa5, 0x1a, 0xbb, 0xae, 0x51, 0xc8,
-        0x8f, 0xc4, 0x06, 0x6a, 0xd6, 0x9b, 0x25, 0xdd, 0xa8, 0xe9, 0x82, 0x43,
-        0x4b, 0xaa, 0xe9, 0x02, 0x69, 0xbb, 0x20, 0xa9, 0xc7, 0x8f, 0x85, 0x56,
-        0x76, 0x52, 0xc7, 0xf9, 0xe1, 0x48, 0x50, 0x95, 0x20, 0x28, 0x0c, 0x43,
-        0x48, 0x8d, 0xd6, 0x3f, 0xda, 0x40, 0x95, 0x9f, 0x68, 0x92, 0x42, 0x41,
-        0x0b, 0xc7, 0x68, 0x6c, 0x4f, 0xbf, 0xef, 0xce, 0x0c, 0xb9, 0xa4, 0x5f,
-        0x40, 0x7f, 0xf4, 0x4f, 0xe7, 0x02, 0x8b, 0xb9, 0xf7, 0xce, 0x3d, 0xe7,
-        0x9e, 0x7b, 0xde, 0xe7, 0x0e, 0xa5, 0xdf, 0xef, 0x94, 0x0e, 0x09, 0x5b,
-        0x17, 0x7e, 0x99, 0xc3, 0x8f, 0x3d, 0x74, 0xc3, 0xd8, 0x0d, 0xa3, 0x22,
-        0x7b, 0xf6, 0x18, 0x5b, 0x12, 0x7a, 0x34, 0x1f, 0xb7, 0xb8, 0xc5, 0x2d,
-        0x6e, 0x71, 0x8b, 0x5b, 0xdc, 0xe2, 0x16, 0xb7, 0xb8, 0xc5, 0x2d, 0x6e,
-        0x71, 0x8b, 0x5b, 0xdc, 0xe2, 0x16, 0xb7, 0xb8, 0xc5, 0x2d, 0x6e, 0x71,
-        0x8b, 0x5b, 0xdc, 0xe2, 0x16, 0xb7, 0xb8, 0xc5, 0x2d, 0x6e, 0x71, 0x8b,
-        0x5b, 0xdc, 0xe2, 0x16, 0xb7, 0xb8, 0xc5, 0x2d, 0x6e, 0x71, 0x8b, 0x5b,
-        0xdc, 0xe2, 0x16, 0xb7, 0xb8, 0xc5, 0x2d, 0x6e, 0x71, 0x8b, 0x5b, 0xdc,
-        0xe2, 0xf6, 0xff, 0xbd, 0x19, 0x22, 0x16, 0x9f, 0x5d, 0xe1, 0x4f, 0x12,
-        0x7a, 0xfe, 0xf2, 0x1f, 0xba, 0xb6, 0x24, 0x8c, 0xfc, 0xcf, 0x66, 0xa6,
-        0x6d, 0x91, 0x42, 0x63, 0x77, 0xa6, 0x28, 0xef, 0xfb, 0x95, 0x94, 0x29,
-        0x9c, 0xff, 0x6c, 0xfe, 0xbd, 0xbf, 0x7d, 0xf1, 0xa6, 0xec, 0xd5, 0xba,
-        0x21, 0x09, 0x2b, 0x3f, 0xb7, 0xc7, 0xda, 0x25, 0x89, 0x01, 0xc0, 0x7c,
-        0x6b, 0xe8, 0xc7, 0xdd, 0xd2, 0x2d, 0x6b, 0x78, 0xec, 0x84, 0x5c, 0x36,
-        0x5e, 0xd0, 0xdc, 0xa6, 0xef, 0x9f, 0x70, 0x7c, 0xff, 0x87, 0xf8, 0xbd,
-        0xe5, 0x60, 0xec, 0x7d, 0xe0, 0x17, 0x4c, 0x43, 0x74, 0xfb, 0x2f, 0x34,
-        0x77, 0xb9, 0x43, 0xaa, 0x8b, 0xa6, 0xcc, 0x7a, 0x29, 0x39, 0xe2, 0x55,
-        0xb4, 0x52, 0xb3, 0xa6, 0xed, 0x3d, 0x35, 0xaf, 0xed, 0x3b, 0x75, 0x44,
-        0xdb, 0x7f, 0x6a, 0x41, 0x73, 0x4f, 0x49, 0x45, 0xdf, 0xd3, 0x29, 0x05,
-        0xeb, 0xb4, 0x56, 0x6c, 0xf6, 0x6b, 0xee, 0xe2, 0x7b, 0xbe, 0xeb, 0x64,
-        0xad, 0xbb, 0xc4, 0x2c, 0x80, 0x16, 0x71, 0x6b, 0x3e, 0xc6, 0xa6, 0x14,
-        0x52, 0xbe, 0xaf, 0xe7, 0xfd, 0x27, 0xdc, 0x9c, 0x6d, 0xe9, 0x5a, 0x4a,
-        0xaa, 0xcd, 0x7e, 0xe0, 0xed, 0xd4, 0x8a, 0x8b, 0xa6, 0x56, 0xf2, 0xfc,
-        0x73, 0xae, 0x23, 0x03, 0x86, 0xf8, 0xfe, 0x9c, 0xb3, 0x33, 0x7d, 0x48,
-        0x4e, 0x02, 0x6f, 0x03, 0xf8, 0xc4, 0xd2, 0xf3, 0xa4, 0x8f, 0x74, 0x92,
-        0xe4, 0x8a, 0x56, 0x1c, 0x8a, 0xe8, 0x93, 0x0c, 0xe9, 0x2f, 0xaf, 0xe8,
-        0xa0, 0x73, 0x8b, 0x94, 0xeb, 0x96, 0x4c, 0xad, 0x6c, 0x5c, 0x7f, 0xd9,
-        0x7f, 0x71, 0x28, 0x25, 0xcf, 0x36, 0xb3, 0x47, 0x2a, 0x92, 0x90, 0x39,
-        0x2f, 0x23, 0x7a, 0x5e, 0x0a, 0x6e, 0x6e, 0x40, 0xce, 0x35, 0xd3, 0xf2,
-        0x5c, 0xd3, 0x4e, 0x57, 0x65, 0x93, 0x94, 0x53, 0x96, 0x9c, 0x6d, 0xa6,
-        0x70, 0x46, 0xff, 0x9c, 0x6e, 0xdb, 0x56, 0x15, 0x6b, 0xab, 0xcd, 0x97,
-        0xf8, 0xef, 0x5f, 0xac, 0xe9, 0x9c, 0x82, 0xa9, 0x80, 0xee, 0x70, 0x2d,
-        0xcf, 0xa1, 0xd6, 0xaa, 0xb3, 0x04, 0x6b, 0xa5, 0x32, 0x9d, 0xc3, 0x5c,
-        0x73, 0x34, 0xe4, 0xef, 0x16, 0x9c, 0x97, 0x4f, 0x4b, 0xaa, 0x9e, 0x01,
-        0xde, 0xb0, 0xff, 0xcf, 0xc0, 0x37, 0x80, 0xf3, 0x5e, 0xab, 0x7e, 0xee,
-        0xa2, 0xa4, 0x74, 0xd9, 0x99, 0x2e, 0x0b, 0x78, 0xdb, 0xec, 0xc4, 0x98,
-        0xf4, 0xf9, 0xfe, 0x7e, 0x47, 0xac, 0xaa, 0xd3, 0x03, 0x98, 0x8c, 0x54,
-        0x9d, 0x6e, 0xe0, 0x69, 0x13, 0xcb, 0xe6, 0xb9, 0xb8, 0xd7, 0x66, 0xcc,
-        0xfb, 0x5d, 0x46, 0xde, 0xf7, 0xa7, 0x73, 0xd2, 0x1d, 0xcc, 0xed, 0x56,
-        0x38, 0xa6, 0x26, 0x34, 0xac, 0xfb, 0x05, 0x69, 0x4e, 0x24, 0xf3, 0xec,
-        0xf3, 0x99, 0x13, 0x77, 0xfe, 0xda, 0x90, 0x96, 0x34, 0x68, 0xb9, 0x26,
-        0xec, 0x83, 0xff, 0x1e, 0xf8, 0xe0, 0x7c, 0x06, 0x63, 0xed, 0x3a, 0xe0,
-        0x19, 0xae, 0x0a, 0xf7, 0xe8, 0x93, 0xa5, 0x94, 0xe8, 0x57, 0x9c, 0xde,
-        0x70, 0x5d, 0x37, 0x68, 0x8d, 0xf4, 0xa0, 0x5f, 0xe6, 0x16, 0xc9, 0xeb,
-        0x1a, 0x64, 0x83, 0xe7, 0x8d, 0x15, 0xad, 0xd0, 0x3c, 0x82, 0xbe, 0x29,
-        0xd3, 0xb6, 0x7f, 0x6e, 0xce, 0x99, 0xd7, 0x8a, 0xa7, 0x4e, 0x6a, 0xa5,
-        0x53, 0x2f, 0x68, 0x7b, 0x9b, 0x2f, 0x74, 0x49, 0x47, 0x16, 0xa7, 0x4e,
-        0xc8, 0x93, 0x9e, 0x26, 0xa4, 0x73, 0x09, 0xbc, 0x2b, 0x58, 0x15, 0x31,
-        0xed, 0x6e, 0x6d, 0x1f, 0xf0, 0xb4, 0xd9, 0x7f, 0xd2, 0x29, 0xdd, 0x86,
-        0x6c, 0xb2, 0xa3, 0xb5, 0x29, 0xf9, 0x33, 0xd0, 0x74, 0xc1, 0x49, 0x91,
-        0x5f, 0x3d, 0x01, 0x4c, 0x44, 0x07, 0xf5, 0x8a, 0x3a, 0xa5, 0x17, 0x4a,
-        0xc7, 0xff, 0xbc, 0xaf, 0x3a, 0xb2, 0x85, 0x6b, 0xa0, 0xff, 0xd6, 0xfd,
-        0xd3, 0xb6, 0xdb, 0x6b, 0x4a, 0xc5, 0xd2, 0x25, 0x6b, 0x15, 0xe5, 0x3a,
-        0x99, 0x73, 0x44, 0x8a, 0x35, 0xec, 0x69, 0x9b, 0xe0, 0x8d, 0x0d, 0xde,
-        0xec, 0x3c, 0x32, 0xa8, 0xff, 0x96, 0x64, 0xfa, 0x2b, 0x9a, 0x19, 0xf2,
-        0x71, 0x49, 0x6e, 0x51, 0xf0, 0x7a, 0xde, 0x81, 0x7e, 0x76, 0xb0, 0x8f,
-        0x7d, 0x13, 0x6a, 0x5f, 0x23, 0x6f, 0xa7, 0x97, 0x45, 0x34, 0x3d, 0xbf,
-        0x1b, 0xf8, 0xa8, 0xb7, 0x5c, 0xf7, 0x04, 0x68, 0x24, 0xed, 0xec, 0xdb,
-        0x80, 0x49, 0x88, 0xeb, 0x74, 0xb5, 0xd0, 0x49, 0x79, 0x93, 0xd7, 0xe4,
-        0x9d, 0x3a, 0xa7, 0xb6, 0x76, 0xce, 0x5f, 0xf9, 0x9b, 0x46, 0x4d, 0xf9,
-        0xa1, 0x3a, 0x2f, 0x6d, 0x8c, 0xeb, 0x52, 0xa1, 0x4e, 0x24, 0xa0, 0x47,
-        0xa2, 0x95, 0x1d, 0x6b, 0x15, 0x57, 0x59, 0x44, 0x37, 0xf2, 0x9d, 0x52,
-        0x54, 0xf4, 0x8d, 0x61, 0x2f, 0xda, 0x1e, 0x6c, 0xc8, 0xe6, 0x59, 0x38,
-        0x97, 0x87, 0x8d, 0x67, 0xd9, 0x97, 0xf2, 0x02, 0xed, 0x9d, 0xb4, 0x9d,
-        0xcf, 0xaa, 0x7f, 0x8e, 0x45, 0x5d, 0x3c, 0xd6, 0x03, 0xda, 0x38, 0x86,
-        0x1d, 0xda, 0x78, 0x3f, 0xa2, 0x89, 0x3b, 0x36, 0x08, 0xfe, 0x70, 0x9d,
-        0x9d, 0x81, 0x9c, 0x0b, 0x2e, 0xf6, 0x74, 0x9d, 0xdf, 0x50, 0x3c, 0xe8,
-        0xc5, 0x79, 0x06, 0xe7, 0xc9, 0xaf, 0x0e, 0xe8, 0xb6, 0x26, 0x65, 0x27,
-        0x9b, 0xa1, 0xdc, 0x03, 0xda, 0x75, 0xd9, 0x74, 0x63, 0x2b, 0xed, 0x91,
-        0xac, 0xa8, 0x87, 0xa6, 0x24, 0x47, 0xb9, 0x96, 0xeb, 0xb8, 0x3e, 0x3b,
-        0x26, 0xfa, 0xaf, 0x7c, 0x6b, 0xdd, 0x59, 0x6d, 0xd9, 0x31, 0x0f, 0x1a,
-        0x02, 0xde, 0x82, 0x27, 0x9f, 0xb6, 0x96, 0x7c, 0xdd, 0xc8, 0x3f, 0xae,
-        0x6d, 0x5d, 0x07, 0x9d, 0xe8, 0x27, 0x0d, 0x27, 0x3a, 0x03, 0x5b, 0x8b,
-        0x68, 0x8a, 0x64, 0xa3, 0x85, 0x38, 0x3e, 0xe9, 0x1c, 0x5c, 0x0f, 0x1f,
-        0xe0, 0xc1, 0x07, 0xc0, 0xaf, 0x3d, 0xeb, 0xc1, 0xfe, 0x3d, 0xfa, 0x8c,
-        0x8c, 0xbc, 0x38, 0x04, 0x1f, 0xb7, 0xe6, 0x63, 0xd0, 0xc6, 0xd1, 0xd7,
-        0xc5, 0x80, 0x8f, 0x99, 0xad, 0xeb, 0xb0, 0x59, 0xf0, 0x78, 0x85, 0x73,
-        0xb0, 0xed, 0x95, 0x12, 0x9e, 0xb6, 0x54, 0x1b, 0xd4, 0xab, 0xc8, 0x97,
-        0xd2, 0xe7, 0xa4, 0xe1, 0x5f, 0xe8, 0x77, 0xe8, 0x57, 0xb8, 0xd6, 0xf7,
-        0x4b, 0x0e, 0x61, 0x7d, 0x99, 0x70, 0x68, 0x43, 0x9d, 0xa2, 0x27, 0x2b,
-        0xda, 0xc1, 0x21, 0xd8, 0xd6, 0xf5, 0x6d, 0xa0, 0x95, 0x36, 0x76, 0x8d,
-        0x48, 0x3b, 0xf7, 0xfb, 0x69, 0x57, 0xf0, 0xef, 0xee, 0x36, 0x61, 0x0d,
-        0x9f, 0xef, 0x86, 0x63, 0x2d, 0xf4, 0x2d, 0x7c, 0x9f, 0xcd, 0x14, 0xa4,
-        0x3f, 0x1c, 0xb3, 0xbf, 0x4a, 0xaf, 0xa3, 0xdf, 0x98, 0x90, 0x1d, 0x27,
-        0x03, 0x9f, 0xb8, 0x63, 0xc9, 0x12, 0xfb, 0x64, 0x40, 0xe3, 0x8e, 0x33,
-        0x91, 0x6f, 0x7c, 0x1f, 0xf0, 0xa0, 0xcf, 0x5b, 0x8d, 0x03, 0x68, 0x3f,
-        0xd3, 0x60, 0x2a, 0x98, 0xdb, 0xc8, 0x0b, 0xfa, 0x63, 0xda, 0x9b, 0xd5,
-        0x6a, 0x6f, 0x7b, 0x60, 0x6f, 0x4e, 0xbb, 0x64, 0x9d, 0xbf, 0x87, 0xbd,
-        0x7d, 0xc3, 0xd1, 0xc0, 0x1b, 0x91, 0x8b, 0xb5, 0x34, 0x6c, 0xdd, 0x4c,
-        0xbf, 0x26, 0x3b, 0x33, 0xb3, 0xa2, 0xc9, 0x09, 0xce, 0x35, 0x30, 0xa7,
-        0x7c, 0x71, 0xe0, 0x0b, 0x2e, 0x1b, 0x4f, 0x81, 0x2e, 0xdf, 0x9f, 0x05,
-        0xce, 0xf2, 0x88, 0x11, 0xda, 0x56, 0x34, 0x6f, 0xdd, 0xef, 0xda, 0xee,
-        0xaf, 0x19, 0x52, 0x19, 0x6e, 0x93, 0xec, 0xf0, 0x12, 0x70, 0x4f, 0x3b,
-        0x81, 0x1d, 0x53, 0xd7, 0x97, 0x81, 0x7f, 0xce, 0x1b, 0x82, 0x1e, 0xd3,
-        0x0e, 0x40, 0x17, 0xf0, 0x2f, 0x03, 0xff, 0x5c, 0xb3, 0x4d, 0xbe, 0x6e,
-        0x46, 0xb1, 0x32, 0x3a, 0x4f, 0x37, 0x96, 0x45, 0xfb, 0x1e, 0x96, 0x2f,
-        0x7a, 0x49, 0xcd, 0x3d, 0x46, 0xff, 0x5a, 0x1d, 0x86, 0x9d, 0x68, 0x55,
-        0x87, 0x7b, 0x1b, 0xb2, 0xbc, 0xba, 0x46, 0x0a, 0xd5, 0xc0, 0x06, 0x0b,
-        0xee, 0x50, 0x25, 0x6d, 0x28, 0x5f, 0x22, 0xb2, 0x0f, 0xb6, 0xb7, 0x6c,
-        0x73, 0xcc, 0xf9, 0x60, 0x6e, 0xbc, 0xd6, 0x0f, 0x9f, 0xc8, 0xf1, 0x7b,
-        0xfe, 0xb4, 0x13, 0xcc, 0x7d, 0xa1, 0x76, 0x57, 0x37, 0xfd, 0x2e, 0xe2,
-        0x44, 0xa6, 0xea, 0xfc, 0xbb, 0x0f, 0xfd, 0x5d, 0x07, 0xf3, 0xd1, 0x78,
-        0xb2, 0xe3, 0x81, 0xce, 0x8a, 0xb6, 0xdf, 0xd6, 0xfb, 0xdb, 0x43, 0x1f,
-        0xb6, 0x1f, 0x93, 0x7b, 0x6b, 0xd5, 0xbe, 0x76, 0x79, 0xcf, 0x60, 0x1c,
-        0xbd, 0x22, 0x62, 0xba, 0xb5, 0x5d, 0xe0, 0x47, 0xb5, 0xb7, 0x65, 0x2e,
-        0x51, 0xaa, 0xf9, 0x72, 0xc1, 0x09, 0x60, 0x30, 0xee, 0x2c, 0xd6, 0xf4,
-        0xfe, 0x84, 0xac, 0x8e, 0x2d, 0xc2, 0xac, 0xc8, 0xae, 0xe1, 0x65, 0x51,
-        0xb0, 0x7d, 0x89, 0x35, 0xd8, 0x54, 0xa9, 0x56, 0xed, 0x6d, 0x19, 0xa7,
-        0x8b, 0xc0, 0xa5, 0xef, 0x59, 0x85, 0x1d, 0x58, 0x83, 0xdd, 0x2a, 0x99,
-        0x5e, 0xc2, 0xeb, 0xfd, 0x9b, 0xd7, 0x70, 0x67, 0x42, 0x7a, 0xfa, 0x36,
-        0xaf, 0xe1, 0xb0, 0x89, 0xb3, 0x65, 0x3c, 0x4c, 0x9c, 0x3b, 0xd6, 0x70,
-        0x8e, 0xac, 0xa7, 0xe7, 0xb0, 0xc0, 0x07, 0x25, 0xda, 0xf3, 0xb2, 0xe7,
-        0x62, 0x6d, 0x70, 0xe2, 0x8b, 0x82, 0x58, 0x37, 0xb2, 0x29, 0xf4, 0xc9,
-        0xe6, 0x1e, 0x17, 0xbc, 0x32, 0x85, 0x3e, 0x4e, 0x93, 0x2a, 0xe4, 0x7c,
-        0x7f, 0x43, 0xf6, 0x5c, 0x68, 0x98, 0xa1, 0x2e, 0x51, 0x27, 0xde, 0x86,
-        0x8d, 0x75, 0x4e, 0x99, 0x88, 0xc3, 0xe7, 0x94, 0x8d, 0xc9, 0x44, 0xb5,
-        0x26, 0x95, 0xed, 0xf9, 0x27, 0x7c, 0xe8, 0xe2, 0x94, 0x05, 0x3f, 0x5a,
-        0x94, 0xce, 0x31, 0x37, 0x87, 0xf9, 0x06, 0x6d, 0x0b, 0x7e, 0x05, 0xb0,
-        0xd0, 0xb5, 0x84, 0x31, 0xbf, 0xf3, 0x55, 0xd7, 0xe0, 0x3e, 0x19, 0xe4,
-        0x4d, 0x89, 0x84, 0x3e, 0x7f, 0xd5, 0xa7, 0x9e, 0x4d, 0x8f, 0x5c, 0x45,
-        0x9e, 0x62, 0xc1, 0x57, 0xc2, 0x7f, 0x40, 0xdf, 0x67, 0x9b, 0x82, 0xb8,
-        0xfe, 0x40, 0x4f, 0x60, 0x63, 0x47, 0xb7, 0x06, 0x4f, 0x31, 0xe9, 0x9b,
-        0xa7, 0x73, 0xcc, 0x01, 0xda, 0x13, 0x6e, 0x6e, 0x7c, 0x9b, 0x71, 0xe6,
-        0xc0, 0x36, 0xfd, 0x4c, 0x65, 0x9b, 0x0e, 0x9f, 0x0e, 0x9b, 0xd2, 0xdd,
-        0x1c, 0xfa, 0x67, 0x22, 0x1b, 0x4a, 0xc3, 0x86, 0xde, 0x56, 0x39, 0xc8,
-        0xb9, 0xe6, 0x29, 0xd8, 0xab, 0xa2, 0x55, 0x26, 0x90, 0x13, 0xe8, 0xa3,
-        0xef, 0x43, 0x4f, 0x70, 0x16, 0xf8, 0xc0, 0x02, 0xb8, 0xa4, 0x8f, 0xbe,
-        0x11, 0xda, 0x33, 0xfb, 0xef, 0xf8, 0x41, 0x7c, 0xf8, 0x7c, 0xb8, 0xff,
-        0x3f, 0x75, 0x07, 0x3e, 0x20, 0xc2, 0x45, 0x3c, 0xc3, 0xda, 0x04, 0xf2,
-        0x99, 0x89, 0xa6, 0xa9, 0xd1, 0x9f, 0x17, 0x3d, 0xe6, 0x21, 0xcc, 0x41,
-        0x1e, 0x0b, 0xfd, 0x22, 0x73, 0x8f, 0xce, 0x90, 0xa7, 0xb9, 0x28, 0xce,
-        0x29, 0x7b, 0x43, 0xcc, 0xc9, 0x94, 0x9d, 0x36, 0xe5, 0x93, 0xa7, 0x73,
-        0x9d, 0x58, 0x87, 0xb9, 0x26, 0xce, 0x0d, 0xbf, 0x84, 0x5c, 0x06, 0x6b,
-        0xce, 0x63, 0x7d, 0x7b, 0x68, 0xf3, 0x17, 0xa5, 0x0c, 0x9f, 0x6a, 0xda,
-        0x7c, 0x9f, 0xeb, 0x91, 0x0e, 0x8c, 0x1b, 0xd8, 0x0b, 0x7e, 0xc2, 0x50,
-        0x7c, 0x46, 0x2c, 0x48, 0x5d, 0xc7, 0x1c, 0x09, 0x6b, 0x33, 0x58, 0x4b,
-        0xbf, 0xcb, 0xb5, 0xcf, 0x82, 0x0e, 0x8c, 0x1b, 0x84, 0xa1, 0x8f, 0x12,
-        0xdf, 0xcd, 0x6d, 0x86, 0x26, 0xf9, 0xe7, 0x0c, 0x3b, 0x5a, 0x1b, 0xe1,
-        0xdd, 0xb8, 0x96, 0xf9, 0x09, 0x71, 0xf7, 0x84, 0xf1, 0x7f, 0x5c, 0x0a,
-        0xcd, 0x02, 0x7e, 0x22, 0xd3, 0xc7, 0x90, 0x8f, 0xd9, 0x6d, 0x88, 0x55,
-        0x9c, 0xdf, 0x6a, 0x05, 0x67, 0x8d, 0xe0, 0xee, 0xef, 0x5b, 0x3f, 0xfe,
-        0x42, 0x72, 0xcd, 0x47, 0xd2, 0xc2, 0xa4, 0x80, 0x18, 0x01, 0x5e, 0x65,
-        0xa6, 0x98, 0xc3, 0x15, 0x1b, 0x4a, 0xa6, 0x98, 0x1b, 0x83, 0x5f, 0x0c,
-        0xf2, 0xa2, 0x73, 0xde, 0x46, 0xd9, 0x59, 0xe0, 0x77, 0x01, 0x3c, 0xce,
-        0x40, 0x87, 0xc6, 0x01, 0x2b, 0x87, 0x81, 0x83, 0xf1, 0xd7, 0xd1, 0xf3,
-        0x49, 0x29, 0x5b, 0xcc, 0x13, 0xda, 0x49, 0x67, 0x81, 0xf6, 0xaf, 0xe7,
-        0x37, 0x63, 0x8e, 0xfd, 0x7b, 0x7b, 0x02, 0x99, 0x75, 0x71, 0x3c, 0xa1,
-        0xe7, 0x7b, 0x36, 0xcc, 0x7f, 0xbf, 0x2b, 0xa0, 0x4d, 0x8d, 0x31, 0xff,
-        0xf2, 0x86, 0xf1, 0xef, 0x25, 0xd7, 0x8f, 0xef, 0xda, 0x16, 0xea, 0x20,
-        0xfa, 0x8f, 0x85, 0xf4, 0x82, 0xb6, 0x55, 0x5a, 0xa3, 0x9c, 0x57, 0x16,
-        0x74, 0xe4, 0x7f, 0x6e, 0x6e, 0x27, 0x62, 0x7d, 0x46, 0x4a, 0x4d, 0xd0,
-        0xbd, 0x1a, 0xcb, 0x56, 0xd7, 0x54, 0xd6, 0xd6, 0x04, 0xbe, 0xbe, 0xd4,
-        0xf4, 0x91, 0x3b, 0xb5, 0xc6, 0xbd, 0x61, 0xf4, 0x2b, 0xd8, 0xa7, 0x20,
-        0xd3, 0xde, 0x85, 0x82, 0x6e, 0x1f, 0x09, 0xf2, 0x3e, 0xfb, 0x9b, 0x5a,
-        0x69, 0x99, 0xf9, 0x20, 0xec, 0xc9, 0x56, 0xf9, 0x3f, 0xe2, 0xca, 0x51,
-        0xad, 0x70, 0xea, 0x38, 0xf2, 0xc1, 0x15, 0xfc, 0x4e, 0xe3, 0xd7, 0xc0,
-        0x2f, 0xca, 0xc3, 0x9f, 0x41, 0x1e, 0xaf, 0x7c, 0x2c, 0xe2, 0x41, 0xb0,
-        0xff, 0x1b, 0x2b, 0xd0, 0xb3, 0xe3, 0x29, 0xf9, 0x86, 0xad, 0xf7, 0xe9,
-        0x81, 0x5f, 0x29, 0x20, 0x8f, 0xb5, 0xde, 0x96, 0xdf, 0x0e, 0xf3, 0x22,
-        0x91, 0xd7, 0x16, 0xc0, 0xc7, 0x91, 0xfd, 0xa1, 0xce, 0x16, 0xee, 0x75,
-        0x95, 0xff, 0x0c, 0xf3, 0x1e, 0xe4, 0x5f, 0x05, 0xb5, 0xea, 0x5b, 0xe0,
-        0x8d, 0x26, 0x6f, 0x41, 0x87, 0x5e, 0x5b, 0xe8, 0x00, 0x3d, 0xb6, 0x94,
-        0x27, 0x91, 0x2f, 0x68, 0x83, 0xd6, 0x26, 0xad, 0x03, 0x76, 0x0c, 0x1b,
-        0x57, 0x63, 0x49, 0xb4, 0xe5, 0x2f, 0xcd, 0x2c, 0xd5, 0x74, 0xac, 0x45,
-        0xee, 0x93, 0x43, 0x1f, 0xb2, 0xbf, 0xb2, 0x40, 0x38, 0x5d, 0x5e, 0x5f,
-        0x30, 0xe4, 0x4d, 0xe4, 0x52, 0x6f, 0xd9, 0x97, 0x66, 0x10, 0xb7, 0xfa,
-        0x11, 0x23, 0x50, 0x8b, 0xec, 0xa4, 0x9f, 0xde, 0x61, 0xe2, 0x59, 0xc2,
-        0x6f, 0x1f, 0x72, 0xc1, 0x8f, 0x86, 0xf9, 0xb8, 0xf5, 0xa4, 0x2d, 0x01,
-        0x18, 0xae, 0x37, 0x41, 0x5b, 0x37, 0xe4, 0x9f, 0xb5, 0xa6, 0xe4, 0xf5,
-        0x1e, 0x95, 0xaf, 0x68, 0x9c, 0x0f, 0x7c, 0xd3, 0x87, 0xe7, 0xc9, 0x67,
-        0x03, 0x3a, 0xce, 0x31, 0xdf, 0xd1, 0x87, 0x12, 0x5f, 0x76, 0xac, 0x80,
-        0xc3, 0x5c, 0x59, 0x08, 0xfa, 0xd1, 0x9c, 0x68, 0x51, 0x1c, 0xa3, 0x6f,
-        0x2c, 0xc1, 0x4e, 0x38, 0x9e, 0x10, 0x25, 0x83, 0x75, 0xf2, 0x94, 0x84,
-        0x99, 0x3f, 0x3b, 0x33, 0x67, 0x53, 0xae, 0xf0, 0x71, 0xb5, 0x48, 0xae,
-        0x94, 0x51, 0xbb, 0x54, 0x17, 0xbe, 0x09, 0xb9, 0xea, 0x61, 0xbe, 0x0f,
-        0x1b, 0x3f, 0x4e, 0xf9, 0xa2, 0xfe, 0x5b, 0x40, 0xee, 0xb3, 0x20, 0xc9,
-        0xa0, 0x5e, 0x39, 0x8a, 0x3c, 0x1f, 0xf2, 0xab, 0x1d, 0x07, 0x0e, 0xd8,
-        0x69, 0x6d, 0x05, 0x4f, 0xd4, 0x16, 0xb5, 0xd3, 0x78, 0x0e, 0xe0, 0xd9,
-        0xa0, 0x6e, 0x86, 0xb9, 0xc6, 0x87, 0xe8, 0x81, 0x3d, 0x95, 0x68, 0x4f,
-        0xf2, 0xfd, 0x66, 0x5e, 0xbe, 0xdb, 0x1c, 0x93, 0xe7, 0x9b, 0x39, 0xf9,
-        0xbb, 0xa6, 0x23, 0xdf, 0x69, 0x8e, 0xc8, 0xb7, 0x9b, 0xc3, 0xac, 0xc9,
-        0x90, 0x37, 0x65, 0x98, 0x37, 0xc9, 0xbd, 0xde, 0xad, 0xb0, 0x77, 0xca,
-        0xff, 0xd2, 0x4c, 0xa1, 0x31, 0x28, 0xe5, 0x63, 0xf0, 0xcf, 0xce, 0xcd,
-        0xac, 0x25, 0xe5, 0x11, 0x87, 0x35, 0x41, 0x1b, 0xdf, 0xa3, 0xce, 0x84,
-        0xff, 0x86, 0x3f, 0x9b, 0x4a, 0x65, 0x4f, 0xbb, 0x46, 0x47, 0xe8, 0x03,
-        0x6e, 0x49, 0x4a, 0x07, 0xf6, 0x82, 0x0f, 0x5c, 0x7a, 0x1a, 0x36, 0xa0,
-        0x6a, 0x9a, 0x04, 0xfc, 0x0d, 0x73, 0x01, 0x93, 0x76, 0x8c, 0x3a, 0x30,
-        0x9b, 0x71, 0x0d, 0xd6, 0x77, 0xb4, 0x67, 0x03, 0x81, 0x83, 0x70, 0xfb,
-        0x2c, 0xca, 0xcd, 0xb4, 0xe9, 0x57, 0x0b, 0xa1, 0x8f, 0x4b, 0x84, 0x7a,
-        0x69, 0x61, 0xfe, 0xf1, 0xd0, 0x27, 0x6f, 0xdc, 0x07, 0xf1, 0x02, 0xf9,
-        0x64, 0xb0, 0x8e, 0xb0, 0x5a, 0x08, 0xdb, 0x17, 0xce, 0x75, 0x82, 0xdf,
-        0x8e, 0x94, 0xbd, 0x37, 0x35, 0xe6, 0xd9, 0xc8, 0x77, 0x30, 0x1e, 0xc1,
-        0xf8, 0x4a, 0x38, 0xfe, 0x9c, 0x4c, 0x2f, 0x0a, 0x68, 0xfd, 0x89, 0x56,
-        0x54, 0xe3, 0x31, 0x8c, 0x75, 0x8c, 0x0d, 0xd6, 0x02, 0x68, 0x37, 0x27,
-        0xa9, 0xeb, 0xba, 0x4d, 0x5f, 0x38, 0x19, 0xfa, 0xc3, 0x82, 0x1c, 0xf6,
-        0x06, 0x0b, 0x57, 0x11, 0x33, 0xb4, 0xb6, 0x28, 0xff, 0xd9, 0x0e, 0xbe,
-        0xf8, 0xfe, 0xed, 0xac, 0xb9, 0x93, 0xa6, 0x7c, 0x7b, 0x3e, 0x6b, 0x3d,
-        0xa4, 0x7f, 0x0d, 0x67, 0xf2, 0xfd, 0x83, 0x76, 0xf6, 0xc8, 0x94, 0xde,
-        0x25, 0xdf, 0x3d, 0xca, 0xd8, 0x7b, 0x76, 0xe6, 0x07, 0xd0, 0xbd, 0xfa,
-        0x4a, 0xbb, 0xd4, 0xeb, 0xa6, 0x5c, 0x19, 0x1d, 0x04, 0x9d, 0x96, 0xd4,
-        0x1b, 0x49, 0xe4, 0x73, 0x9b, 0x65, 0xb6, 0x5f, 0x19, 0x18, 0xfc, 0xf4,
-        0xb0, 0xf2, 0xd3, 0xae, 0x8d, 0x67, 0xe3, 0xe7, 0x3d, 0xeb, 0xcf, 0x5c,
-        0x02, 0xfd, 0xd0, 0xeb, 0xe4, 0x76, 0x25, 0xe7, 0xb2, 0x37, 0x68, 0x95,
-        0x75, 0xc4, 0x2e, 0x73, 0xd0, 0xba, 0x57, 0xff, 0x2f, 0xff, 0xf3, 0x26,
-        0x65, 0xf7, 0xaa, 0xaa, 0x61, 0x54, 0xac, 0xc3, 0x7e, 0x4b, 0x2b, 0x2f,
-        0x83, 0x16, 0xf8, 0xd8, 0xc6, 0xf6, 0x70, 0x9c, 0x51, 0xbc, 0x38, 0xdb,
-        0xe8, 0x90, 0xef, 0xd4, 0xb7, 0xc8, 0x72, 0x9d, 0xef, 0xdb, 0x65, 0xa9,
-        0x3e, 0x78, 0xb5, 0x4f, 0xef, 0x97, 0xf3, 0xd7, 0x5c, 0x6f, 0xdd, 0xa3,
-        0x23, 0x37, 0x98, 0xfc, 0x40, 0x7e, 0x39, 0xda, 0x23, 0x3f, 0xfe, 0x72,
-        0xf6, 0x99, 0x3f, 0xd5, 0x61, 0x03, 0xa3, 0x9d, 0xb4, 0x6d, 0xf4, 0x39,
-        0x9f, 0xbd, 0x5a, 0xd0, 0xa9, 0xdb, 0x3f, 0x02, 0x4f, 0xb3, 0x0b, 0x81,
-        0x1d, 0x10, 0x37, 0xf1, 0x42, 0x37, 0xec, 0xef, 0x01, 0x27, 0xde, 0x35,
-        0x06, 0x81, 0xeb, 0x7b, 0x8a, 0x17, 0xb7, 0x3b, 0xd9, 0xab, 0x08, 0x49,
-        0xfe, 0x15, 0x7b, 0x70, 0x78, 0x87, 0xbe, 0x5d, 0xea, 0xe9, 0xeb, 0xad,
-        0xe7, 0xe0, 0xff, 0x0b, 0xa9, 0xec, 0x91, 0xcb, 0x72, 0x76, 0xe6, 0xa2,
-        0x4d, 0xfd, 0xa7, 0xdf, 0x78, 0x09, 0xb9, 0xa7, 0x25, 0x0b, 0x0d, 0xfa,
-        0x4b, 0xe2, 0x62, 0xfe, 0xbf, 0xcb, 0x3a, 0xac, 0x33, 0x4f, 0xc0, 0x3b,
-        0xcc, 0x1b, 0xbf, 0x4e, 0x39, 0xb7, 0x11, 0x76, 0xb8, 0xa0, 0xff, 0x62,
-        0x03, 0x8f, 0x06, 0xad, 0xbd, 0x3a, 0xf7, 0xfb, 0x37, 0xec, 0xfb, 0x0e,
-        0x68, 0x1d, 0x04, 0x2c, 0x62, 0x66, 0xba, 0x75, 0x8f, 0x57, 0xd4, 0x1e,
-        0xc7, 0x1a, 0xc8, 0xf5, 0x56, 0xf7, 0xc0, 0x5c, 0x43, 0xc7, 0x39, 0x4d,
-        0x25, 0x97, 0x2b, 0xa3, 0xe4, 0xef, 0x9e, 0x5e, 0xe6, 0x99, 0x46, 0xfe,
-        0xaf, 0xfd, 0xa8, 0x7e, 0x7c, 0x7e, 0x7e, 0x12, 0xfe, 0xd9, 0xf7, 0x2f,
-        0xec, 0x1a, 0x04, 0x0d, 0xa8, 0x43, 0xd3, 0xe4, 0xf9, 0xd9, 0x19, 0x17,
-        0x38, 0x8a, 0x0a, 0xf7, 0x25, 0x59, 0x01, 0xee, 0x09, 0xf2, 0x01, 0xb8,
-        0xe7, 0x38, 0xaf, 0x64, 0x80, 0xf9, 0x46, 0x06, 0x78, 0x23, 0xfd, 0x4c,
-        0x42, 0xd7, 0x76, 0x5b, 0xb7, 0x07, 0xba, 0x9e, 0x60, 0x6c, 0x7b, 0x0e,
-        0xba, 0x57, 0x48, 0x52, 0x7f, 0xda, 0x7b, 0xd7, 0xf4, 0xa7, 0x15, 0x7f,
-        0xbb, 0x94, 0x16, 0x12, 0xc0, 0x6b, 0xca, 0x5c, 0x8e, 0x78, 0x31, 0xae,
-        0x53, 0xf7, 0x2b, 0xa1, 0xee, 0x77, 0x86, 0xb8, 0x17, 0xc1, 0x93, 0x6c,
-        0xa6, 0xae, 0xb3, 0x8e, 0xda, 0xa6, 0x6a, 0x5b, 0x03, 0x36, 0x5d, 0xae,
-        0xb1, 0x0e, 0xe5, 0xfd, 0xc8, 0xa5, 0x99, 0x69, 0xd4, 0xaa, 0xe5, 0xda,
-        0x88, 0x56, 0x6e, 0xda, 0x5a, 0xd9, 0xa3, 0xbe, 0xed, 0xb2, 0x2e, 0x28,
-        0x1e, 0xa7, 0x65, 0xa9, 0xf9, 0x4b, 0xbf, 0xba, 0x6b, 0x13, 0xfa, 0xd0,
-        0xfd, 0x09, 0xca, 0xf7, 0xb3, 0xa4, 0x0b, 0x41, 0x9c, 0xfc, 0x4e, 0xc9,
-        0xc9, 0x21, 0x14, 0xbd, 0xc8, 0xad, 0x4e, 0x0d, 0x11, 0x3f, 0xe8, 0x48,
-        0xa5, 0x64, 0xd9, 0xe3, 0x1e, 0x67, 0x67, 0xc8, 0xcb, 0xf2, 0x71, 0x4b,
-        0x0e, 0x2b, 0xf9, 0xbd, 0xac, 0x6c, 0xbb, 0xbc, 0x62, 0xc8, 0x74, 0x72,
-        0xd0, 0x7a, 0x58, 0xb2, 0x57, 0x2f, 0x18, 0xd9, 0x67, 0xa6, 0x60, 0xd7,
-        0x4b, 0x8b, 0x86, 0xb8, 0xaa, 0xde, 0xa2, 0x8c, 0xb2, 0x0b, 0xb0, 0xfc,
-        0xf0, 0xec, 0x7b, 0x5b, 0xce, 0xde, 0x2d, 0x2b, 0x4f, 0xff, 0x26, 0x7c,
-        0xce, 0x01, 0xc8, 0xc2, 0xcc, 0x1c, 0x42, 0x5e, 0xf1, 0xb4, 0x0c, 0x5a,
-        0x55, 0xe4, 0xc9, 0xe0, 0x3b, 0xda, 0x01, 0x65, 0x03, 0x17, 0x74, 0x8c,
-        0x07, 0xc8, 0x27, 0x8e, 0xaf, 0x95, 0x0b, 0xca, 0x96, 0xd2, 0xea, 0xdd,
-        0x0e, 0xe0, 0x08, 0xde, 0x71, 0xfc, 0x19, 0xd9, 0xa1, 0xde, 0xdd, 0xa9,
-        0xde, 0x55, 0xe9, 0x2b, 0x94, 0xfc, 0xbe, 0x82, 0x3d, 0xc9, 0xe3, 0x68,
-        0xbe, 0x4b, 0x02, 0x5b, 0x8a, 0xf8, 0x6e, 0xc9, 0xc1, 0x46, 0x4a, 0xbe,
-        0x84, 0xfa, 0xe7, 0x8e, 0xc6, 0x80, 0x94, 0x20, 0xc7, 0xe9, 0xdc, 0x83,
-        0xbd, 0x3c, 0x5b, 0x71, 0x25, 0xfb, 0x8c, 0xe8, 0xa4, 0xf5, 0x4e, 0x39,
-        0xe4, 0x45, 0xf4, 0x74, 0x86, 0xf4, 0x4d, 0x86, 0xe3, 0x44, 0x48, 0x43,
-        0x2b, 0xbe, 0x4e, 0xe0, 0x42, 0xac, 0xcf, 0x79, 0x21, 0x1e, 0xfa, 0x11,
-        0xd0, 0x3a, 0x99, 0x96, 0x15, 0x8f, 0x74, 0x6c, 0x91, 0x6a, 0x8a, 0xfd,
-        0x03, 0xd0, 0x37, 0xe2, 0xd9, 0xc4, 0x7c, 0x66, 0x1d, 0x8f, 0x1f, 0x6c,
-        0x54, 0xc0, 0x63, 0xf2, 0x97, 0xeb, 0x10, 0x23, 0x3e, 0x47, 0xf9, 0xed,
-        0x46, 0x2e, 0x6f, 0x07, 0xba, 0x69, 0xad, 0xed, 0x59, 0x3a, 0xde, 0x0d,
-        0x59, 0x71, 0xdf, 0x0e, 0x99, 0x84, 0xdd, 0x17, 0xeb, 0xdc, 0x7f, 0x12,
-        0x7a, 0x74, 0x51, 0xed, 0x5f, 0x5a, 0xe9, 0x0f, 0xe1, 0x09, 0xdb, 0xbd,
-        0x01, 0xb6, 0x5d, 0xf6, 0x2e, 0x58, 0x1f, 0x01, 0xff, 0xbb, 0x80, 0xd7,
-        0xe5, 0x44, 0x8e, 0xf0, 0xc4, 0x83, 0x75, 0xf5, 0xd4, 0x27, 0xe0, 0x49,
-        0xaa, 0xba, 0xbe, 0x58, 0x6f, 0x97, 0xe2, 0x42, 0x84, 0x8b, 0x78, 0x3e,
-        0x40, 0xdd, 0x7b, 0xb7, 0xc2, 0x35, 0xad, 0x70, 0xe1, 0x7d, 0x9d, 0x3e,
-        0xe7, 0x26, 0xc0, 0xa3, 0x76, 0xb7, 0x41, 0x5b, 0xb2, 0x4b, 0xaa, 0xaa,
-        0x76, 0xef, 0x50, 0xbe, 0xa6, 0x9a, 0xdc, 0x8c, 0xf7, 0x3e, 0xf6, 0xdc,
-        0x8d, 0x7c, 0xa6, 0x1b, 0x73, 0x99, 0x0d, 0x73, 0x1b, 0xe9, 0x4f, 0x6c,
-        0xa0, 0xff, 0xbf, 0x7b, 0x19, 0x52, 0xe6, 0x72, 0xc1, 0xba, 0x12, 0xd6,
-        0xcd, 0x1e, 0x87, 0x4d, 0x30, 0x4f, 0x4f, 0x31, 0x36, 0x5f, 0xa3, 0x68,
-        0x99, 0x5d, 0xf9, 0x29, 0xd6, 0xf5, 0x03, 0x36, 0x1a, 0x07, 0x7c, 0x78,
-        0x0a, 0x78, 0x8e, 0xd7, 0xd5, 0x1d, 0x05, 0x64, 0xf0, 0xbe, 0x3a, 0x7b,
-        0xb5, 0xfe, 0x69, 0x3c, 0xbb, 0xa6, 0x85, 0x5f, 0xe4, 0x15, 0xe9, 0x25,
-        0xad, 0xbc, 0x2f, 0x82, 0xbd, 0x39, 0xd0, 0xe3, 0xa4, 0x21, 0xa5, 0x1c,
-        0xe2, 0xba, 0xc7, 0xbb, 0x57, 0xda, 0xe5, 0x40, 0x50, 0x23, 0xd8, 0x8c,
-        0xef, 0xa6, 0x3a, 0xfb, 0xa1, 0x15, 0xde, 0xbf, 0x66, 0x78, 0x47, 0x37,
-        0x8c, 0xda, 0x5b, 0x1e, 0x5a, 0xb1, 0xe5, 0x6b, 0x8d, 0x61, 0x79, 0xb8,
-        0x91, 0xb5, 0xee, 0x81, 0x0f, 0x28, 0xaf, 0xde, 0xcb, 0x6e, 0x4b, 0xd2,
-        0x7f, 0x99, 0xc8, 0x3d, 0xdb, 0xec, 0x20, 0x17, 0xa9, 0xb2, 0x36, 0x3b,
-        0x9e, 0xe5, 0x7d, 0x8d, 0x55, 0x97, 0x8d, 0xf9, 0xca, 0xff, 0x65, 0xae,
-        0xc2, 0xfd, 0xe9, 0xaf, 0x91, 0x9b, 0x78, 0xc8, 0x4d, 0x3c, 0xe4, 0x26,
-        0x1e, 0x72, 0x13, 0x0f, 0xb9, 0x89, 0x87, 0xdc, 0xc4, 0x43, 0x6e, 0xe2,
-        0x21, 0x37, 0x41, 0x1d, 0x10, 0xd4, 0x07, 0xe3, 0xc8, 0xb9, 0xe1, 0xbf,
-        0xbc, 0x5b, 0xc2, 0xdc, 0x22, 0x8a, 0xcd, 0x9c, 0x3b, 0xbf, 0xc9, 0x0d,
-        0xea, 0x2b, 0xe5, 0x13, 0x0a, 0xcd, 0x89, 0x30, 0x07, 0xe2, 0x9a, 0x28,
-        0x76, 0x73, 0x9d, 0x8c, 0xb9, 0xa8, 0x3d, 0x0b, 0x93, 0xcc, 0x91, 0x82,
-        0x98, 0x15, 0xe4, 0xe7, 0xaf, 0x22, 0x4f, 0xca, 0x20, 0x4f, 0x1a, 0x40,
-        0x4e, 0xc4, 0x7b, 0xea, 0xe8, 0x2e, 0xa9, 0xa0, 0x1d, 0xf4, 0xc6, 0xb5,
-        0x2f, 0x79, 0xcc, 0xdf, 0xed, 0x4c, 0x59, 0xd7, 0x8f, 0xf7, 0x89, 0x2f,
-        0xc5, 0xd1, 0xaf, 0x23, 0x57, 0xfe, 0x4b, 0x75, 0x6f, 0x36, 0x31, 0x44,
-        0x99, 0xdf, 0xf7, 0x31, 0xf9, 0x72, 0xc4, 0xdf, 0xe0, 0xbe, 0x4f, 0x5f,
-        0x22, 0xff, 0x44, 0x7a, 0xcf, 0x80, 0xe1, 0x67, 0x12, 0x92, 0x3c, 0xb9,
-        0x05, 0x73, 0x96, 0xf4, 0xa9, 0x3b, 0x23, 0x88, 0xf2, 0xcc, 0x7f, 0x40,
-        0x5e, 0xb6, 0xe8, 0x67, 0x78, 0xb3, 0x40, 0xbc, 0xf4, 0xaf, 0xf5, 0x99,
-        0x62, 0xbd, 0xae, 0x74, 0xea, 0x60, 0xa3, 0x84, 0x3c, 0xca, 0xe8, 0x93,
-        0x0e, 0x13, 0xb5, 0x54, 0x84, 0x9b, 0x38, 0xdf, 0x4c, 0xaa, 0x1a, 0xe7,
-        0xcc, 0xaa, 0x3c, 0x21, 0x6b, 0xee, 0x53, 0x9f, 0xa9, 0x2e, 0x64, 0xd3,
-        0xac, 0x71, 0x0b, 0x56, 0x7d, 0xe6, 0x49, 0xe0, 0x58, 0x46, 0x6e, 0x60,
-        0xa8, 0xbd, 0xeb, 0x33, 0xb3, 0x0b, 0xc1, 0xbd, 0x55, 0x40, 0x03, 0xe3,
-        0x55, 0x87, 0x18, 0x4b, 0xc1, 0xfd, 0x95, 0xae, 0x60, 0x09, 0x47, 0x78,
-        0x13, 0x70, 0x94, 0xdb, 0x30, 0x60, 0x29, 0x3b, 0xd2, 0x50, 0x9f, 0xa9,
-        0xd4, 0x5b, 0x69, 0x20, 0x1e, 0xe2, 0x8d, 0xce, 0xc3, 0xb3, 0x24, 0x45,
-        0x3f, 0xe9, 0xfb, 0xe5, 0xd1, 0x81, 0xb0, 0xae, 0x44, 0x1d, 0x79, 0xcc,
-        0x0c, 0xf4, 0x5c, 0x8d, 0xff, 0x58, 0xc5, 0xa9, 0x8c, 0xce, 0x79, 0x3e,
-        0xf1, 0x2e, 0xf7, 0x28, 0xe6, 0x30, 0x5e, 0x8e, 0xd6, 0xea, 0xe1, 0xda,
-        0xae, 0x16, 0x7e, 0xb6, 0x85, 0xfb, 0x91, 0x26, 0x9e, 0xf3, 0x15, 0xec,
-        0x45, 0xba, 0xb8, 0xc6, 0x04, 0x6d, 0x90, 0xa5, 0xf7, 0xbf, 0xe5, 0x7d,
-        0xeb, 0x99, 0xc8, 0x53, 0x13, 0x30, 0x5c, 0x4f, 0x1c, 0x11, 0x0c, 0x5e,
-        0x9c, 0x09, 0xe0, 0xf4, 0xd5, 0x7b, 0xbe, 0x4f, 0xda, 0xb7, 0x95, 0xd6,
-        0x68, 0xff, 0x08, 0xcf, 0x70, 0x20, 0xb7, 0x55, 0x78, 0xf5, 0x7f, 0x7f,
-        0xe1, 0x09, 0x5d, 0xfc, 0xd0, 0x7d, 0xe9, 0x70, 0x4b, 0x8d, 0x1c, 0xdd,
-        0x3b, 0xb0, 0xfe, 0x67, 0x3d, 0xcf, 0xef, 0x03, 0xad, 0xf5, 0x69, 0x29,
-        0x8c, 0x65, 0xdb, 0xa4, 0x60, 0xb2, 0x56, 0x19, 0x0f, 0xc7, 0x5b, 0x11,
-        0xdb, 0x38, 0xbe, 0x15, 0xfc, 0x85, 0x2e, 0x3b, 0x1d, 0x61, 0xad, 0x94,
-        0x0c, 0xbe, 0xeb, 0x0c, 0xd3, 0x8e, 0x58, 0x6b, 0x6e, 0x0e, 0xe7, 0x22,
-        0x3b, 0xa2, 0x1f, 0x36, 0xc3, 0x39, 0xfa, 0x5b, 0x1d, 0xf5, 0x12, 0xfb,
-        0xc0, 0xb3, 0xdc, 0x6a, 0x4b, 0xd1, 0x33, 0x29, 0xa7, 0x17, 0x23, 0xbf,
-        0x05, 0x9f, 0x32, 0x64, 0x86, 0xbe, 0xbf, 0x13, 0xbe, 0xaf, 0x5b, 0xf6,
-        0xc2, 0x67, 0xed, 0x83, 0xcf, 0xda, 0x8f, 0x1a, 0x75, 0x7c, 0xa5, 0xf5,
-        0x3e, 0x97, 0x75, 0x71, 0x55, 0x0e, 0x29, 0xf9, 0x57, 0x7c, 0xc3, 0xfe,
-        0x00, 0x3a, 0xb0, 0x53, 0xe5, 0x7b, 0x81, 0x4e, 0xc0, 0xdf, 0x3a, 0x49,
-        0xe8, 0xc4, 0xc6, 0x7b, 0xe3, 0x61, 0xd8, 0x46, 0x47, 0x41, 0xc5, 0x86,
-        0x95, 0x80, 0xf7, 0xd5, 0x7a, 0xc0, 0x7b, 0xf8, 0x65, 0xe0, 0x37, 0xa5,
-        0xd2, 0xb0, 0xa4, 0x82, 0x7d, 0x2b, 0xd8, 0xb7, 0x82, 0xda, 0x72, 0xb6,
-        0xd1, 0xfa, 0xed, 0xaa, 0x2b, 0xa4, 0x9d, 0xb0, 0x51, 0xdf, 0x6a, 0x39,
-        0x7f, 0xf4, 0x3c, 0x02, 0xfe, 0x3f, 0x02, 0xfe, 0x1f, 0x46, 0x4d, 0xf5,
-        0x00, 0x6a, 0xaa, 0xfb, 0x50, 0x53, 0x1d, 0x42, 0x4d, 0x35, 0x85, 0x9a,
-        0xea, 0x6e, 0xf8, 0x8f, 0x3b, 0xe1, 0x3f, 0x26, 0xe1, 0x3f, 0x26, 0xd4,
-        0x9d, 0xd1, 0x41, 0x6f, 0xe3, 0x1d, 0x4a, 0xb4, 0x17, 0xdb, 0x1b, 0x22,
-        0x50, 0x81, 0xf2, 0xb1, 0x71, 0xa9, 0x37, 0x59, 0x5b, 0x39, 0xea, 0x3e,
-        0x6c, 0xda, 0x99, 0xd4, 0xa6, 0x90, 0xbf, 0xdf, 0x33, 0xc2, 0x9a, 0x2b,
-        0xa9, 0x15, 0x55, 0xcd, 0x95, 0x7d, 0xc1, 0x45, 0x8a, 0x84, 0xdc, 0x0f,
-        0x67, 0xce, 0x9e, 0x2e, 0x1a, 0x51, 0xbd, 0xd3, 0xbb, 0x5a, 0xef, 0x2c,
-        0xcf, 0xb3, 0xde, 0x79, 0x75, 0xb5, 0xde, 0x59, 0x9e, 0x67, 0xbd, 0xf3,
-        0xca, 0xba, 0x7a, 0xe7, 0xca, 0xd3, 0x97, 0xd6, 0xd5, 0x3b, 0x57, 0x9e,
-        0x7e, 0x29, 0x1c, 0x4b, 0xa8, 0x0f, 0x21, 0xad, 0x96, 0x83, 0x67, 0x4f,
-        0x98, 0x73, 0x34, 0xfb, 0xd6, 0xff, 0xdf, 0x74, 0xca, 0x96, 0x35, 0xb1,
-        0xff, 0x68, 0x6b, 0x50, 0x23, 0xb5, 0xce, 0x77, 0xb7, 0xcc, 0x5f, 0x56,
-        0xdf, 0x4b, 0xcb, 0xb5, 0xcd, 0xef, 0xc2, 0x03, 0xcb, 0xca, 0x10, 0xf3,
-        0xbc, 0x0f, 0x7c, 0x7e, 0xf3, 0x73, 0xf5, 0x0e, 0xf5, 0xcd, 0xcd, 0x55,
-        0xf9, 0x36, 0xec, 0x7c, 0xf4, 0xd1, 0xad, 0x81, 0x2f, 0x60, 0x3f, 0xa5,
-        0x05, 0xfe, 0xfd, 0x01, 0xe0, 0x01, 0xaf, 0x3d, 0x53, 0xdd, 0x07, 0x05,
-        0xe7, 0x0d, 0xee, 0xc6, 0xcd, 0xfc, 0xe5, 0x19, 0xe6, 0xd6, 0x55, 0x85,
-        0x9b, 0xf5, 0x23, 0x6b, 0xce, 0x28, 0x06, 0x44, 0xb8, 0x5e, 0x4d, 0x05,
-        0x74, 0xbb, 0xa8, 0x1d, 0xb9, 0x26, 0x1a, 0xb7, 0xd6, 0x9a, 0x9d, 0xe1,
-        0xbd, 0xdb, 0xe5, 0x20, 0xaf, 0x52, 0xf8, 0xcc, 0x10, 0xdf, 0xcf, 0xfd,
-        0xc0, 0xf7, 0x10, 0xde, 0x6a, 0x81, 0x1f, 0x47, 0xae, 0xc7, 0x7b, 0x1a,
-        0xe6, 0x6c, 0xa6, 0xbc, 0x33, 0xdf, 0x25, 0xff, 0x79, 0xd4, 0xf7, 0x27,
-        0x9c, 0xec, 0xf0, 0x25, 0xd4, 0x1e, 0x27, 0x69, 0x27, 0xa3, 0xa4, 0x73,
-        0x30, 0x33, 0x2b, 0xa9, 0x3e, 0xd2, 0x72, 0x5e, 0x3f, 0xac, 0x7d, 0x98,
-        0x6e, 0x3d, 0xdc, 0xe7, 0x1f, 0x5b, 0xf6, 0xc9, 0xb4, 0xec, 0x53, 0xa0,
-        0xcd, 0xd6, 0xef, 0xc0, 0x99, 0x2b, 0xdb, 0xaf, 0xb7, 0x52, 0x61, 0x5d,
-        0xf6, 0xf0, 0xe8, 0x66, 0x59, 0xe8, 0xcf, 0x9e, 0x7d, 0x05, 0xf9, 0x7a,
-        0x79, 0x14, 0x73, 0xa9, 0x41, 0xbc, 0xe3, 0x7c, 0xb6, 0x8e, 0x5c, 0xf4,
-        0x6c, 0x5d, 0xb6, 0x01, 0x3e, 0x5b, 0x11, 0xe1, 0x3c, 0xfb, 0x8a, 0xb6,
-        0x7a, 0xe8, 0x03, 0xd2, 0x17, 0x70, 0xe6, 0x29, 0xd4, 0x5f, 0x87, 0x83,
-        0x7b, 0xb4, 0x70, 0x9f, 0x1b, 0xb5, 0x20, 0x6f, 0xce, 0x69, 0x95, 0xf0,
-        0x0e, 0xf0, 0x2b, 0xf0, 0x17, 0x86, 0x4e, 0xd8, 0x77, 0x80, 0x5b, 0x93,
-        0xa5, 0xa3, 0x86, 0xba, 0x3b, 0x2d, 0x8f, 0x52, 0xd6, 0x7c, 0x7e, 0x14,
-        0xef, 0xa2, 0x33, 0xfd, 0x4d, 0x78, 0xa6, 0xd1, 0xb0, 0x6e, 0x8f, 0xce,
-        0x94, 0x90, 0xd7, 0xe7, 0x2d, 0xc0, 0x8e, 0x80, 0x1f, 0x25, 0x59, 0x69,
-        0x66, 0x3e, 0x05, 0x4f, 0xad, 0x85, 0x37, 0xe6, 0x06, 0x19, 0x46, 0x75,
-        0x0f, 0x78, 0x30, 0x91, 0x86, 0x1d, 0xde, 0xd7, 0x17, 0xdd, 0xe9, 0x1a,
-        0xb6, 0xae, 0x05, 0x75, 0x3c, 0xe7, 0x07, 0x60, 0x8b, 0x19, 0xd8, 0x27,
-        0x73, 0xa6, 0x12, 0x6b, 0x15, 0xda, 0x93, 0xe5, 0x1a, 0x59, 0x6b, 0x52,
-        0x86, 0x51, 0xef, 0xf0, 0xfc, 0x79, 0x59, 0x6e, 0x46, 0x34, 0xe4, 0x60,
-        0x8f, 0x63, 0xf8, 0x8d, 0xe0, 0x9d, 0x83, 0x1f, 0x6b, 0xa5, 0x82, 0x7c,
-        0x55, 0xe5, 0xe2, 0xc8, 0xb5, 0x87, 0x48, 0xdf, 0x01, 0xac, 0xa7, 0x3e,
-        0x53, 0x4f, 0x0f, 0x88, 0xdb, 0x4f, 0x5f, 0x91, 0x06, 0x6e, 0xc0, 0x78,
-        0xaf, 0xc1, 0xd6, 0x07, 0xf0, 0xcc, 0x5a, 0x65, 0xf2, 0x56, 0xe1, 0xf7,
-        0x7d, 0x23, 0xc7, 0x6f, 0x11, 0xe3, 0xe1, 0x78, 0xd0, 0xfa, 0x1d, 0xea,
-        0x5e, 0xfa, 0x5a, 0x39, 0xbb, 0x18, 0xc5, 0xc1, 0x19, 0xd8, 0x20, 0xef,
-        0x68, 0xc7, 0xc1, 0x17, 0x8e, 0xb5, 0x30, 0x1e, 0x62, 0x7e, 0xf9, 0xaf,
-        0x70, 0xee, 0xbc, 0x9c, 0x44, 0xfd, 0x2f, 0xfd, 0x7c, 0x66, 0x80, 0x7f,
-        0x4b, 0xa8, 0xef, 0xeb, 0xe1, 0x0d, 0x9b, 0xfd, 0x71, 0xd0, 0x67, 0xb6,
-        0xc0, 0x13, 0x26, 0xac, 0x4f, 0x04, 0xf1, 0x38, 0xed, 0xdf, 0xaa, 0xe7,
-        0xef, 0x96, 0x3f, 0x50, 0x67, 0xca, 0xcb, 0xa1, 0x45, 0xdf, 0x77, 0x73,
-        0x83, 0xc3, 0xcb, 0x92, 0x1d, 0x7e, 0x52, 0x76, 0x5b, 0x7b, 0x59, 0x8f,
-        0x59, 0xc4, 0xe3, 0xdf, 0xda, 0x96, 0xf7, 0xfd, 0x13, 0xa0, 0xfd, 0x07,
-        0x6a, 0x9f, 0xbb, 0x41, 0x3f, 0x78, 0xa5, 0x6a, 0x12, 0xd2, 0x0a, 0xde,
-        0xa4, 0x48, 0x6f, 0xa7, 0x1c, 0x6a, 0x3e, 0x1f, 0xca, 0xe6, 0x11, 0x71,
-        0xbd, 0xb7, 0x0d, 0xde, 0x6f, 0x97, 0x9b, 0x8f, 0x86, 0xb4, 0xe5, 0x41,
-        0x2f, 0xf6, 0x6f, 0xfe, 0x43, 0x8a, 0xbe, 0x81, 0x32, 0x77, 0x91, 0x35,
-        0xba, 0xa3, 0xcf, 0x40, 0x07, 0x3f, 0xce, 0x0f, 0x24, 0x65, 0xbd, 0x1f,
-        0x20, 0x5c, 0xf2, 0x23, 0x74, 0x85, 0x74, 0x88, 0xf2, 0x9f, 0x2a, 0x6e,
-        0x29, 0x7c, 0xc6, 0x06, 0x5f, 0xf0, 0xa4, 0x7a, 0x9e, 0x37, 0xe8, 0x9b,
-        0x18, 0xff, 0xa8, 0xc3, 0xdd, 0xf0, 0x7f, 0xd0, 0x41, 0xd8, 0x71, 0x71,
-        0x91, 0xf7, 0x13, 0x43, 0xea, 0x4e, 0xab, 0x04, 0xd9, 0x2e, 0xf1, 0x3b,
-        0x63, 0x2a, 0xc8, 0x27, 0x83, 0xfa, 0x2b, 0x43, 0x5f, 0x88, 0xf6, 0xb8,
-        0xf2, 0x93, 0x25, 0xf5, 0x5d, 0x31, 0x89, 0x35, 0x3e, 0x9e, 0xad, 0x7f,
-        0x27, 0xf1, 0xa3, 0x42, 0xf0, 0x77, 0x12, 0xe1, 0x37, 0xde, 0x7a, 0x90,
-        0x47, 0x3c, 0xd8, 0x30, 0x65, 0xaa, 0x11, 0xfd, 0xdd, 0x04, 0xe5, 0x60,
-        0x4b, 0xb9, 0x11, 0xe5, 0x0e, 0x7e, 0x50, 0xd3, 0xac, 0x93, 0xe5, 0xe3,
-        0x61, 0x4e, 0xc4, 0x1a, 0x80, 0x3c, 0xc4, 0x78, 0x39, 0x90, 0xdf, 0x92,
-        0xbe, 0x03, 0xf2, 0x03, 0xcf, 0x3d, 0x13, 0xb6, 0x94, 0x0e, 0xe3, 0xba,
-        0xc5, 0x1a, 0x33, 0xac, 0x7b, 0xb7, 0x4b, 0x75, 0x92, 0xef, 0x13, 0xf2,
-        0xda, 0xfc, 0x40, 0x70, 0x4f, 0x24, 0x89, 0xf0, 0x3d, 0xc7, 0x49, 0x29,
-        0xab, 0xf7, 0x77, 0x86, 0xf8, 0x50, 0xa7, 0xdd, 0x19, 0x8d, 0xd3, 0x90,
-        0x63, 0x00, 0x37, 0x8d, 0x58, 0xf6, 0x55, 0xc4, 0xb1, 0x69, 0xf0, 0xbd,
-        0x38, 0x51, 0x91, 0x6b, 0x6d, 0x4b, 0xc5, 0x7d, 0x37, 0x49, 0x1d, 0xa3,
-        0x7e, 0x11, 0xa6, 0x07, 0xb9, 0x2a, 0xce, 0x3b, 0x2a, 0x53, 0x46, 0xfe,
-        0xdd, 0xdb, 0xca, 0xb5, 0xac, 0x55, 0x90, 0xf7, 0x7d, 0xd7, 0xe4, 0xf8,
-        0xfc, 0x6d, 0x0f, 0x06, 0x77, 0xfe, 0xba, 0x9e, 0xbf, 0x78, 0x5b, 0x39,
-        0xe8, 0xe3, 0xcc, 0xef, 0x86, 0x7d, 0xc2, 0x19, 0xea, 0x7b, 0xec, 0x4f,
-        0x6e, 0x32, 0xe5, 0xc2, 0x4d, 0xbe, 0x7f, 0x0f, 0xbf, 0x09, 0x85, 0x75,
-        0xac, 0xa5, 0xea, 0xd8, 0x0e, 0x95, 0x8f, 0xb8, 0xa3, 0x19, 0xad, 0x04,
-        0xdb, 0x3d, 0xe9, 0xa1, 0xe6, 0xd1, 0xb3, 0x63, 0xe7, 0x75, 0x0b, 0xf1,
-        0x37, 0x9b, 0x39, 0x2e, 0xb9, 0x3e, 0x7e, 0x63, 0x9e, 0x73, 0xb8, 0x66,
-        0x5b, 0x70, 0xef, 0x75, 0x83, 0xab, 0x7c, 0xae, 0x48, 0x18, 0x87, 0x6e,
-        0x68, 0xb5, 0x8f, 0xd6, 0x3c, 0x93, 0x76, 0x21, 0x53, 0x26, 0xe8, 0xa9,
-        0xd6, 0xa2, 0x9c, 0x8d, 0x7f, 0x0f, 0x70, 0xfe, 0xb6, 0xa7, 0x1a, 0x17,
-        0x6f, 0x9b, 0x85, 0x7c, 0x78, 0xa6, 0xd9, 0x46, 0xa4, 0x7f, 0x51, 0xdd,
-        0xc0, 0x3e, 0xe2, 0xbf, 0x87, 0xf8, 0xef, 0x21, 0xfe, 0x7b, 0x88, 0xff,
-        0x1e, 0xe2, 0xbf, 0x87, 0xf8, 0x0f, 0x1e, 0x3e, 0x07, 0x7d, 0x79, 0xd6,
-        0x9b, 0x08, 0x73, 0xb6, 0xc7, 0x56, 0x73, 0x36, 0xfe, 0xcd, 0xcb, 0xb9,
-        0xa6, 0xa2, 0xa5, 0x52, 0x91, 0x20, 0xe7, 0x15, 0x9d, 0xf9, 0x4d, 0x94,
-        0xf3, 0x7e, 0xf4, 0xf7, 0x90, 0x00, 0x8e, 0xf9, 0x1e, 0xe1, 0x2a, 0x9a,
-        0x6e, 0x13, 0x2e, 0xc8, 0xf9, 0x58, 0x67, 0xad, 0x87, 0xe1, 0x77, 0x37,
-        0xfa, 0xb6, 0xe0, 0x9b, 0x4f, 0xf0, 0x7d, 0xa9, 0x76, 0x87, 0x8b, 0x58,
-        0x5c, 0x6e, 0xa8, 0x78, 0x8c, 0x71, 0xe3, 0x0e, 0xfe, 0xad, 0x02, 0x64,
-        0xc0, 0x77, 0x5f, 0x66, 0x6d, 0x51, 0x6e, 0x20, 0x2f, 0x5a, 0x8e, 0x72,
-        0x21, 0xc0, 0x79, 0x6f, 0x6a, 0xa5, 0x05, 0xca, 0x59, 0x97, 0xd9, 0x14,
-        0x98, 0x62, 0xb7, 0xe6, 0x78, 0x97, 0x54, 0xbd, 0x74, 0xb6, 0x49, 0x7a,
-        0x46, 0x40, 0x5b, 0x74, 0x8f, 0x2c, 0x62, 0xcc, 0xa7, 0x44, 0x9f, 0x47,
-        0x7e, 0x6b, 0x0f, 0xa9, 0xbf, 0x6f, 0xe8, 0xc5, 0x3e, 0xfa, 0xfc, 0x8e,
-        0x96, 0x7b, 0x5a, 0x29, 0x04, 0x3e, 0x9b, 0xb1, 0x87, 0xe7, 0x48, 0xc1,
-        0x76, 0xdd, 0x6d, 0x38, 0x1b, 0xe4, 0xfa, 0xaf, 0x5b, 0x55, 0x0e, 0x0e,
-        0x3f, 0x7a, 0x62, 0xa8, 0xbf, 0x5f, 0xba, 0xb7, 0xcb, 0xc9, 0x21, 0xd6,
-        0x6b, 0x9b, 0x81, 0x8f, 0x6b, 0x79, 0xff, 0xb4, 0x5d, 0x4e, 0x2d, 0xc2,
-        0xcf, 0x2e, 0x66, 0x1d, 0xea, 0xf2, 0xd2, 0x50, 0x0a, 0xfe, 0xf9, 0xe6,
-        0x7e, 0xc6, 0xe7, 0xe5, 0x26, 0x75, 0xa5, 0x17, 0xf0, 0x03, 0xd0, 0xcb,
-        0x4d, 0xb0, 0x27, 0x1d, 0xfb, 0x47, 0xb8, 0xff, 0x45, 0xe1, 0xee, 0xb5,
-        0x9d, 0x6d, 0x4a, 0x37, 0xf4, 0xac, 0x95, 0xd1, 0x41, 0xfb, 0xff, 0x14,
-        0x6e, 0x6d, 0x31, 0x71, 0x5c, 0x67, 0xf8, 0x3f, 0xb3, 0xdc, 0x8c, 0xd7,
-        0x30, 0x86, 0xf5, 0xb2, 0x58, 0xae, 0xba, 0x03, 0x63, 0x33, 0xd1, 0x62,
-        0x65, 0xb0, 0xec, 0x16, 0x55, 0x96, 0xba, 0xda, 0x05, 0x42, 0xe2, 0x3a,
-        0xdd, 0x24, 0xb4, 0x72, 0xd5, 0x2a, 0x42, 0x60, 0x37, 0x8e, 0xfa, 0xd2,
-        0x46, 0x55, 0xdb, 0x37, 0xaf, 0x16, 0xec, 0x38, 0xcd, 0xac, 0x17, 0x37,
-        0x38, 0xf4, 0x71, 0xb3, 0x2c, 0x0e, 0x90, 0x75, 0x56, 0x6e, 0xf2, 0x90,
-        0x3e, 0x19, 0x6d, 0xa2, 0x24, 0x55, 0xa5, 0xbc, 0x54, 0x7d, 0xab, 0x5a,
-        0x0b, 0x27, 0xc4, 0x0f, 0xa9, 0xad, 0xf6, 0xa5, 0x77, 0x4d, 0xbf, 0xef,
-        0xcc, 0x2c, 0xc6, 0xa4, 0x51, 0x91, 0x56, 0x73, 0xe6, 0xcc, 0xb9, 0x9f,
-        0xff, 0xf2, 0xfd, 0x17, 0x3e, 0x67, 0x67, 0xba, 0xc2, 0xbd, 0xcd, 0x95,
-        0x76, 0xc6, 0xfe, 0xb6, 0xd4, 0xcc, 0x02, 0xf3, 0x1a, 0x86, 0x64, 0xdc,
-        0x64, 0xae, 0xcf, 0x96, 0x3a, 0x57, 0x66, 0x1b, 0x1b, 0x65, 0xda, 0xe4,
-        0x4b, 0x6a, 0xa6, 0xdc, 0x23, 0x17, 0x41, 0xc7, 0x85, 0xe1, 0xd6, 0xd0,
-        0xf7, 0xda, 0x19, 0xf2, 0x73, 0x77, 0x3c, 0xd4, 0x57, 0x1a, 0x57, 0x16,
-        0x34, 0xb6, 0xee, 0xde, 0xf5, 0xed, 0x49, 0xac, 0x29, 0x41, 0x5f, 0x79,
-        0x5c, 0xcb, 0x26, 0x83, 0xef, 0x7d, 0xbb, 0xde, 0xe3, 0xbb, 0xde, 0x0f,
-        0xfc, 0x8f, 0xf6, 0x2c, 0xef, 0xa6, 0x07, 0xae, 0xd3, 0x1a, 0xe5, 0x2c,
-        0x05, 0xcf, 0x36, 0x66, 0x3d, 0x2b, 0x4d, 0x5c, 0x90, 0x15, 0x5f, 0x65,
-        0xdd, 0x36, 0xc8, 0xbb, 0x36, 0x99, 0x5f, 0x04, 0xcd, 0x63, 0x1f, 0xed,
-        0x36, 0x63, 0xe4, 0x43, 0x71, 0xf2, 0x4c, 0x07, 0xae, 0xc1, 0xb0, 0x07,
-        0x13, 0x68, 0xe7, 0x3f, 0xef, 0xa6, 0xcc, 0xb3, 0xda, 0x97, 0x43, 0x3c,
-        0xe3, 0xab, 0x82, 0xce, 0xf7, 0x60, 0x9b, 0x16, 0xb9, 0x63, 0x67, 0x7a,
-        0xc2, 0x7c, 0x20, 0xd8, 0xbe, 0x5f, 0x8d, 0x13, 0x6b, 0x3c, 0xe7, 0x6e,
-        0xd7, 0x99, 0x9b, 0xc2, 0x1c, 0x2b, 0x10, 0xcd, 0x53, 0x22, 0xe5, 0xaa,
-        0xc8, 0xeb, 0xf8, 0xfd, 0xa6, 0x1a, 0xc6, 0x4f, 0x14, 0xed, 0xee, 0x93,
-        0xb2, 0x5e, 0xfa, 0x9a, 0xd4, 0xa0, 0x7f, 0xd6, 0x5c, 0xdf, 0xbf, 0xeb,
-        0x26, 0xf5, 0x99, 0xbf, 0xe8, 0x29, 0x19, 0x18, 0xa1, 0x7e, 0x6b, 0x93,
-        0x97, 0x17, 0x5b, 0x64, 0xc3, 0xb4, 0xcc, 0xbb, 0x44, 0x01, 0x5e, 0x42,
-        0x26, 0x63, 0x11, 0x8d, 0x51, 0xe5, 0x5b, 0x22, 0x5b, 0xf8, 0xb6, 0xb5,
-        0xf8, 0x4c, 0x9c, 0xfe, 0x97, 0x4f, 0x16, 0xf9, 0x6e, 0xe0, 0x69, 0x48,
-        0xc3, 0x8e, 0x00, 0xcb, 0x42, 0x08, 0x99, 0x3c, 0x77, 0xee, 0xf7, 0xbb,
-        0x5c, 0x1b, 0xea, 0x68, 0xcf, 0xb6, 0x49, 0xe1, 0x30, 0x64, 0xa2, 0x1a,
-        0xd4, 0x39, 0x47, 0x8d, 0x98, 0x96, 0xd1, 0x91, 0x0a, 0x7d, 0xf8, 0xe6,
-        0x5e, 0x2d, 0xaf, 0x33, 0x37, 0x7e, 0xa4, 0xf7, 0x82, 0x72, 0xbe, 0xe2,
-        0x92, 0x56, 0x4d, 0x59, 0x03, 0xaf, 0xad, 0xd6, 0x5f, 0xed, 0xe3, 0x5d,
-        0xad, 0xd7, 0x5f, 0x88, 0x07, 0xf6, 0x1a, 0xeb, 0x7e, 0x1c, 0x0f, 0xea,
-        0x92, 0xa1, 0xfd, 0x45, 0x3b, 0xad, 0x8c, 0xbd, 0xbd, 0x20, 0xf5, 0xa5,
-        0x9f, 0xc9, 0x3b, 0xa5, 0x9f, 0xc8, 0xaf, 0x97, 0xce, 0x00, 0x7f, 0x58,
-        0xe5, 0x3c, 0xf4, 0xc9, 0xcd, 0xba, 0xef, 0xdf, 0x74, 0xa7, 0x60, 0x2b,
-        0xf8, 0xfe, 0xef, 0xdc, 0x0d, 0x19, 0x38, 0xf6, 0x3d, 0xec, 0x39, 0x07,
-        0x1e, 0xa2, 0x2c, 0x9c, 0x04, 0xbd, 0xb9, 0x7d, 0xd2, 0x19, 0xd5, 0x74,
-        0x32, 0x78, 0xac, 0x15, 0x7b, 0x30, 0x42, 0x4c, 0xce, 0xbd, 0x8c, 0xf4,
-        0x91, 0x66, 0x8c, 0x7a, 0x09, 0xf3, 0xb7, 0x82, 0x2f, 0xf6, 0xe2, 0xa7,
-        0xe4, 0xee, 0x08, 0xd6, 0x3a, 0x42, 0xda, 0x6b, 0x95, 0x81, 0x47, 0xb1,
-        0x8f, 0x5c, 0x8b, 0xdc, 0xf3, 0x7e, 0x19, 0xa7, 0x6f, 0xef, 0x9e, 0xc7,
-        0xb2, 0xf1, 0x95, 0x2e, 0xf1, 0xa5, 0x05, 0xba, 0x7c, 0xfe, 0x78, 0x80,
-        0x9b, 0xde, 0x55, 0x43, 0x68, 0x6f, 0xe7, 0xdf, 0x53, 0xc4, 0x79, 0x79,
-        0xbf, 0x15, 0xb8, 0x7c, 0x1c, 0x78, 0x28, 0x53, 0xbf, 0x20, 0x8d, 0x91,
-        0x28, 0xda, 0x10, 0xaf, 0x68, 0x59, 0x22, 0x59, 0x8f, 0x39, 0x5a, 0xcc,
-        0x97, 0xc2, 0x1a, 0xa7, 0x74, 0x2e, 0x57, 0x1f, 0xcf, 0x9c, 0x58, 0x3e,
-        0xa8, 0xb3, 0x41, 0x23, 0xac, 0x23, 0x7d, 0xa7, 0x35, 0xa6, 0x82, 0x0e,
-        0xc5, 0x78, 0xc3, 0x92, 0xd1, 0xe5, 0x2e, 0x8c, 0x77, 0x41, 0x32, 0x6e,
-        0x73, 0xcc, 0x51, 0xb4, 0xa1, 0x9c, 0x19, 0x05, 0x96, 0xf8, 0x58, 0x8d,
-        0x2d, 0xc6, 0xa0, 0xcb, 0xe3, 0x32, 0x66, 0xee, 0xd9, 0xb1, 0xc7, 0xbc,
-        0xb6, 0x15, 0x0c, 0x63, 0x38, 0x5c, 0x53, 0xd7, 0x8e, 0x35, 0xb1, 0x3f,
-        0x7e, 0xb0, 0x93, 0x33, 0x8b, 0x0b, 0x90, 0x53, 0x0b, 0x1f, 0x66, 0xdc,
-        0x67, 0x25, 0x1b, 0x6b, 0xd3, 0xb6, 0x4d, 0x05, 0xf7, 0x92, 0xf5, 0xe8,
-        0xd3, 0xfa, 0x0e, 0xe4, 0xd0, 0x9e, 0xb0, 0x8e, 0x6d, 0xc5, 0xc8, 0xe0,
-        0xec, 0x03, 0x1b, 0x97, 0x75, 0x5f, 0x96, 0xcc, 0x42, 0x4e, 0x26, 0x74,
-        0x3f, 0x9e, 0xe1, 0x41, 0x8d, 0x43, 0xc8, 0xab, 0x03, 0xbd, 0x38, 0xcb,
-        0xd4, 0x03, 0x7b, 0x38, 0xd9, 0x4b, 0x2e, 0xfa, 0x4f, 0xc8, 0xb3, 0xf8,
-        0xd6, 0xcb, 0x3b, 0x6a, 0x93, 0x81, 0x67, 0xa0, 0x2f, 0xbd, 0x66, 0x7d,
-        0x54, 0x3e, 0xf3, 0xfc, 0x38, 0x63, 0x2e, 0x7f, 0xf6, 0x4c, 0xf9, 0xc4,
-        0xd3, 0xb1, 0xd8, 0xe9, 0x88, 0x58, 0xe7, 0x03, 0x5b, 0xfd, 0xf0, 0xf4,
-        0xbc, 0xe2, 0xf7, 0xc3, 0xe7, 0x57, 0x54, 0x07, 0xda, 0x46, 0xd1, 0x8e,
-        0xeb, 0x30, 0x65, 0xdc, 0xfb, 0xab, 0x3f, 0x73, 0xc4, 0xf7, 0x27, 0x74,
-        0x4e, 0x58, 0xca, 0x9c, 0x57, 0x4d, 0x7c, 0xee, 0x88, 0x17, 0x6b, 0xc7,
-        0x5c, 0x29, 0x73, 0x45, 0x1d, 0xc6, 0x7a, 0x58, 0xee, 0x25, 0x4f, 0x24,
-        0x36, 0x84, 0xe3, 0x5b, 0x93, 0xcb, 0x2a, 0x95, 0x1c, 0x54, 0x56, 0xba,
-        0x80, 0x5f, 0x8b, 0xd2, 0x71, 0xcc, 0x44, 0x52, 0x81, 0x77, 0xb1, 0x27,
-        0xfb, 0xa8, 0xef, 0x4f, 0xda, 0xac, 0x4f, 0x99, 0x51, 0x45, 0xdf, 0x4b,
-        0xa7, 0x8e, 0x77, 0x5e, 0x3e, 0x90, 0x32, 0x8f, 0xaa, 0xfd, 0xe1, 0xfb,
-        0x28, 0x64, 0xe6, 0xf6, 0x78, 0x67, 0x96, 0x95, 0x29, 0x2f, 0x79, 0xa9,
-        0xe4, 0xac, 0xb2, 0x72, 0x18, 0x33, 0x37, 0xa6, 0x28, 0x37, 0x52, 0x66,
-        0xa7, 0xa2, 0x7f, 0xb4, 0x5d, 0xef, 0x7b, 0x12, 0xfd, 0x53, 0xaa, 0x25,
-        0x5c, 0x0f, 0xef, 0xeb, 0x4a, 0x5f, 0xc0, 0x33, 0x94, 0x39, 0xfd, 0xc6,
-        0xcc, 0x02, 0xf3, 0xcb, 0x74, 0x5e, 0x43, 0x7a, 0xe0, 0x18, 0xdf, 0x0d,
-        0xb9, 0x7f, 0xe2, 0x6f, 0xa8, 0x43, 0xb9, 0xcc, 0x3a, 0x27, 0xe4, 0xb7,
-        0x23, 0x1a, 0x3f, 0xdf, 0x3f, 0x91, 0xd7, 0xb9, 0x8b, 0x0d, 0x35, 0x10,
-        0xee, 0x7b, 0xfb, 0xce, 0x92, 0x19, 0xf7, 0x4b, 0x1c, 0x67, 0x21, 0x72,
-        0xb2, 0x5d, 0x98, 0x23, 0x3a, 0x5e, 0x6a, 0xd2, 0x06, 0x7d, 0x03, 0xcc,
-        0x15, 0x68, 0xc6, 0xdd, 0x2f, 0x88, 0x71, 0xac, 0x63, 0x07, 0x9d, 0x00,
-        0x77, 0x02, 0xaf, 0x56, 0x31, 0x4e, 0x61, 0x51, 0xf2, 0x41, 0x7f, 0xe9,
-        0x60, 0x4e, 0x6a, 0xa1, 0xfa, 0x45, 0x63, 0x04, 0x3a, 0x70, 0x1c, 0xef,
-        0xf7, 0x4f, 0x90, 0x3e, 0x79, 0x36, 0x49, 0x35, 0xbe, 0xc4, 0xf5, 0x1c,
-        0x94, 0x89, 0x45, 0x60, 0x23, 0xfc, 0xe6, 0x17, 0x83, 0x7b, 0xbb, 0x0e,
-        0x9c, 0x3d, 0xe1, 0x99, 0x9a, 0x5f, 0x67, 0x5d, 0xc6, 0x4f, 0xc0, 0x2b,
-        0x3a, 0x8f, 0x8a, 0x7d, 0x99, 0x4b, 0x78, 0x88, 0xfa, 0xd1, 0x6d, 0x48,
-        0x0c, 0x6d, 0x89, 0x59, 0x59, 0x6f, 0x8d, 0x26, 0x23, 0xdd, 0x32, 0x0f,
-        0x79, 0x57, 0x81, 0xee, 0x2c, 0x5c, 0x89, 0xca, 0xac, 0xa7, 0xe3, 0xd9,
-        0xc9, 0x8f, 0x95, 0x2b, 0xb5, 0xfa, 0x71, 0xb9, 0x51, 0x77, 0xf4, 0x37,
-        0xea, 0xb5, 0xc2, 0xab, 0x86, 0x7c, 0xff, 0x88, 0xce, 0xa5, 0x73, 0x2a,
-        0xd2, 0xd9, 0x4f, 0xcc, 0xb3, 0xa2, 0xf3, 0xea, 0x20, 0x3b, 0x80, 0x39,
-        0xde, 0x06, 0xe6, 0x78, 0x0b, 0x98, 0xe3, 0x57, 0xc0, 0xd8, 0x37, 0x4b,
-        0x93, 0xa1, 0xfc, 0x9f, 0x86, 0x1c, 0xa2, 0xae, 0xb6, 0xce, 0xe0, 0x4e,
-        0xa7, 0xf3, 0xa0, 0xc1, 0xdb, 0xb0, 0x3f, 0xd6, 0x4b, 0x19, 0x59, 0x5d,
-        0x9a, 0x90, 0xb5, 0xa5, 0x20, 0x0f, 0xf9, 0x03, 0xe6, 0x7d, 0x8d, 0xf0,
-        0x9e, 0x1c, 0xc8, 0xa1, 0x3d, 0x32, 0x70, 0x94, 0xf2, 0xa3, 0x43, 0x96,
-        0x8b, 0xab, 0x5a, 0x0e, 0x2d, 0x17, 0x59, 0x8e, 0x88, 0xce, 0x21, 0x9b,
-        0xda, 0x90, 0x8a, 0x5b, 0x47, 0xfd, 0x3e, 0xed, 0x0f, 0x0a, 0xfc, 0xf3,
-        0x94, 0x97, 0x7f, 0x0a, 0xef, 0x5e, 0xe9, 0xdc, 0xba, 0x19, 0xb3, 0x1b,
-        0xed, 0x9a, 0xb2, 0x6b, 0x30, 0x88, 0xb9, 0xab, 0xdb, 0x68, 0x83, 0x39,
-        0x80, 0x19, 0xaf, 0x43, 0x87, 0x34, 0x9c, 0x6e, 0x8d, 0xfd, 0x1a, 0xce,
-        0x21, 0x9d, 0x77, 0xcb, 0x71, 0x0a, 0x45, 0x5b, 0xe6, 0x8a, 0x56, 0x32,
-        0x0f, 0xfa, 0xbb, 0x01, 0xbb, 0x6d, 0x15, 0x77, 0xb0, 0x86, 0x33, 0x58,
-        0xaf, 0x53, 0xcf, 0x6f, 0x6a, 0xd9, 0xbb, 0x5c, 0xff, 0x23, 0xc6, 0xb1,
-        0xce, 0xa4, 0xe5, 0x0f, 0x7d, 0x94, 0x81, 0xf4, 0x4d, 0x65, 0x75, 0xff,
-        0xa0, 0xdf, 0x2a, 0xda, 0xae, 0xd5, 0x29, 0x8f, 0x45, 0x2e, 0x79, 0x36,
-        0x74, 0xc9, 0xcb, 0x09, 0x62, 0x80, 0xb2, 0x6a, 0xf6, 0xf3, 0xc3, 0x35,
-        0xfb, 0xfe, 0x5e, 0x9b, 0xeb, 0x72, 0x42, 0xb9, 0x4d, 0xdd, 0xbf, 0xa1,
-        0xb1, 0x8d, 0x57, 0x7a, 0x56, 0xde, 0xc4, 0x7d, 0x07, 0x18, 0x27, 0x27,
-        0x6f, 0x00, 0xe3, 0xd5, 0x4b, 0xcd, 0xbc, 0xed, 0x93, 0x38, 0xa7, 0x92,
-        0x9a, 0xbb, 0xda, 0x29, 0x97, 0xaf, 0x15, 0xd4, 0x4b, 0xd7, 0x3c, 0xf5,
-        0xf3, 0xab, 0x45, 0x55, 0xb8, 0xea, 0xfb, 0xff, 0x70, 0x67, 0xe4, 0x9d,
-        0x25, 0x5f, 0x4e, 0xbb, 0x46, 0x7f, 0x44, 0x9a, 0xf9, 0x74, 0xbe, 0xdf,
-        0x01, 0xd9, 0xbc, 0x7e, 0xc0, 0xf7, 0x1f, 0x19, 0x19, 0x11, 0xe7, 0x00,
-        0x31, 0xca, 0x70, 0x82, 0x39, 0xae, 0x94, 0x39, 0x19, 0xdb, 0x3e, 0x5f,
-        0x51, 0x0a, 0xf2, 0xad, 0x3b, 0xc0, 0x2f, 0x8f, 0xee, 0x0b, 0xe3, 0x26,
-        0x3f, 0x7c, 0x9e, 0x7e, 0xe5, 0xc4, 0xe7, 0xfc, 0xca, 0xa6, 0x9c, 0x2d,
-        0xf6, 0xa2, 0x7f, 0x4c, 0x7e, 0x50, 0x8c, 0xee, 0x2a, 0x9b, 0x78, 0x3a,
-        0x46, 0xa1, 0x78, 0xcf, 0x1f, 0xd4, 0xf1, 0x03, 0x60, 0x12, 0xd3, 0xf7,
-        0x67, 0x5d, 0xce, 0xd7, 0x8d, 0xf9, 0x36, 0xcc, 0x7d, 0xd0, 0xff, 0xa7,
-        0xb5, 0x7e, 0x2e, 0x2b, 0xd8, 0xc1, 0xe0, 0xef, 0x98, 0x8c, 0x15, 0xa1,
-        0xe3, 0x15, 0xf3, 0x4c, 0x89, 0x15, 0xac, 0xc4, 0x2c, 0x64, 0xc7, 0x0c,
-        0xe4, 0xcd, 0x29, 0x1d, 0x67, 0xed, 0xd5, 0xb2, 0x67, 0x8e, 0xe5, 0x9c,
-        0xa4, 0x2b, 0x6e, 0x8f, 0x3e, 0xbf, 0xcd, 0x1b, 0x2f, 0x26, 0x82, 0x3b,
-        0x07, 0x1f, 0xe7, 0x94, 0xb4, 0xc1, 0x1e, 0xca, 0xae, 0x4c, 0x81, 0x27,
-        0x12, 0x38, 0xdb, 0x56, 0xcd, 0x0f, 0x0d, 0xe8, 0xef, 0x86, 0xf6, 0x29,
-        0x06, 0xb1, 0x8b, 0x86, 0xc9, 0x76, 0xa7, 0xd0, 0xaf, 0x5d, 0x32, 0x57,
-        0xdb, 0xb4, 0x5c, 0x7d, 0xb8, 0x2e, 0x0d, 0x1c, 0xf2, 0x04, 0xca, 0x11,
-        0xd4, 0x25, 0xc3, 0xb2, 0x81, 0xf2, 0x34, 0xca, 0x2d, 0x78, 0xb2, 0xcd,
-        0x61, 0xe0, 0x0a, 0x3c, 0x5f, 0xc3, 0x78, 0x23, 0x58, 0x73, 0xce, 0x94,
-        0x8f, 0x4e, 0x50, 0x97, 0x38, 0x06, 0x73, 0x91, 0x67, 0x6d, 0x3c, 0x6b,
-        0x45, 0x95, 0x5d, 0x60, 0x19, 0xcf, 0x72, 0xf0, 0xfd, 0x21, 0x99, 0x84,
-        0x3e, 0x99, 0x6b, 0x81, 0x4c, 0xfa, 0x68, 0x5b, 0x26, 0xb1, 0xae, 0x5d,
-        0xc6, 0xae, 0x92, 0xd7, 0x4d, 0xd0, 0x5b, 0xa7, 0x64, 0xaf, 0xc5, 0x34,
-        0x1e, 0xad, 0x80, 0x16, 0xaf, 0x83, 0xae, 0x96, 0x41, 0x53, 0x99, 0xa2,
-        0x35, 0x3a, 0xad, 0x92, 0xda, 0x2f, 0xf0, 0x38, 0xe8, 0xb5, 0xe3, 0x0a,
-        0xb1, 0x28, 0x79, 0xd9, 0x01, 0xed, 0x89, 0xdf, 0x61, 0xdb, 0x93, 0x8e,
-        0xb2, 0x41, 0x83, 0xa0, 0xcb, 0x62, 0xc0, 0xd3, 0xef, 0x29, 0x2d, 0x57,
-        0x47, 0xef, 0x48, 0x2a, 0x7d, 0x47, 0x2c, 0xc8, 0x02, 0xcb, 0xfd, 0x50,
-        0x5c, 0x8c, 0x79, 0x5c, 0x5e, 0xc7, 0x3c, 0x06, 0xf8, 0xfb, 0xc8, 0x90,
-        0xe6, 0xef, 0x51, 0x89, 0xec, 0xe6, 0x71, 0xd0, 0x1b, 0x64, 0x50, 0xc0,
-        0xd3, 0xe9, 0x90, 0x46, 0x9f, 0x06, 0xff, 0x5a, 0xb0, 0xca, 0x92, 0x32,
-        0x0f, 0xfe, 0xbf, 0x8e, 0xef, 0xb7, 0xea, 0x9f, 0xaa, 0xb9, 0x05, 0x15,
-        0xe6, 0xb2, 0x7c, 0x1b, 0x38, 0xf9, 0xf7, 0x38, 0xbb, 0x2e, 0x8d, 0xdd,
-        0x07, 0x46, 0x18, 0x4b, 0xfb, 0xb7, 0xba, 0x6c, 0x1f, 0x95, 0xcd, 0xe1,
-        0xe3, 0x28, 0xef, 0xc3, 0xd3, 0xc0, 0x39, 0x44, 0x75, 0x2c, 0x7c, 0xd9,
-        0x1b, 0x36, 0x0a, 0x3a, 0xef, 0xe0, 0x98, 0xce, 0xcf, 0x37, 0xec, 0x03,
-        0xf8, 0x4e, 0xbf, 0x0c, 0xf7, 0x06, 0xcc, 0xa4, 0x12, 0x3a, 0xc7, 0xb4,
-        0x02, 0x2c, 0xb1, 0x82, 0xf1, 0xde, 0xa7, 0x5f, 0xaf, 0x06, 0x1e, 0x1e,
-        0xfe, 0xa7, 0x9f, 0x8e, 0x31, 0x27, 0x7d, 0x33, 0x11, 0xe8, 0xbf, 0xcf,
-        0xfc, 0x4d, 0x7b, 0x6e, 0xd4, 0xc0, 0xcb, 0x6d, 0x33, 0x86, 0xb6, 0xd0,
-        0x65, 0xd0, 0x45, 0x65, 0x4d, 0xbf, 0x6c, 0x17, 0xf4, 0x2d, 0xd4, 0x52,
-        0xe6, 0x07, 0x12, 0xf4, 0x9d, 0xb7, 0xa9, 0x77, 0xda, 0x21, 0x5f, 0x92,
-        0x1a, 0x57, 0xbe, 0x6f, 0xe7, 0x21, 0x15, 0xac, 0xe4, 0x24, 0x68, 0xb4,
-        0x4d, 0x2c, 0x67, 0x5c, 0x1e, 0xcc, 0x3b, 0xab, 0xfb, 0xb2, 0x6d, 0xb3,
-        0x6f, 0x73, 0x5e, 0xae, 0x9f, 0x7b, 0xe1, 0x1e, 0xe8, 0xa7, 0x36, 0x35,
-        0x8d, 0x36, 0x6a, 0xed, 0xfd, 0x01, 0x8d, 0x36, 0xf7, 0x11, 0xfb, 0x3f,
-        0xfb, 0x20, 0x9d, 0x0c, 0x1b, 0x41, 0x0e, 0x06, 0x9e, 0x35, 0x9e, 0xe7,
-        0xa7, 0xc0, 0xf7, 0x3b, 0xe9, 0xa7, 0xe9, 0x67, 0x0c, 0xe8, 0xe7, 0x91,
-        0x6d, 0xfa, 0x21, 0xdd, 0x74, 0xca, 0xd8, 0x35, 0x5b, 0x26, 0x8a, 0xfa,
-        0xbe, 0x81, 0x35, 0xe9, 0x3f, 0x3a, 0x0e, 0xba, 0x21, 0xad, 0x93, 0xb7,
-        0x4c, 0x29, 0x83, 0x8e, 0xca, 0x90, 0x4f, 0x65, 0xd0, 0x14, 0x31, 0x50,
-        0x19, 0xf2, 0xad, 0x5c, 0xb7, 0x9c, 0x2a, 0xf6, 0x4c, 0x9d, 0xbd, 0x02,
-        0x3a, 0xba, 0x5e, 0xe7, 0xfd, 0xeb, 0x35, 0x9b, 0xd4, 0x83, 0xb7, 0xb6,
-        0xef, 0xfe, 0xef, 0xb8, 0xfb, 0x43, 0x72, 0x03, 0x76, 0xcb, 0x9b, 0xa5,
-        0x61, 0xc8, 0x24, 0x21, 0x5e, 0x04, 0x6d, 0x8c, 0xca, 0x6a, 0xe9, 0xa4,
-        0xac, 0x41, 0x3f, 0xad, 0x2f, 0x0d, 0x00, 0x4f, 0x43, 0x8e, 0xbe, 0x72,
-        0x44, 0xde, 0x58, 0x52, 0x32, 0x63, 0x43, 0xbf, 0x2c, 0xd3, 0x07, 0x0f,
-        0x7a, 0x2e, 0x77, 0xea, 0x98, 0xfd, 0x58, 0x35, 0xf0, 0xc5, 0x8f, 0x57,
-        0xbb, 0x64, 0xa2, 0x6a, 0xca, 0x63, 0xd5, 0x1e, 0x79, 0xa2, 0x1a, 0x93,
-        0xd3, 0xb5, 0x84, 0x7c, 0xa3, 0x7a, 0x50, 0x4e, 0x55, 0x0f, 0xc9, 0x93,
-        0xb5, 0xa4, 0x7c, 0x13, 0x76, 0x61, 0xae, 0xe6, 0xc8, 0x64, 0x6d, 0x58,
-        0x1e, 0xaf, 0xd1, 0xc7, 0x8e, 0xf9, 0xf0, 0xcb, 0x6e, 0xfb, 0x2e, 0xb8,
-        0xae, 0x0e, 0xac, 0xcb, 0x51, 0xe3, 0x3a, 0x66, 0x29, 0xb9, 0xc0, 0xff,
-        0x21, 0x72, 0x0e, 0x7d, 0x2f, 0xbe, 0xa2, 0xa4, 0xa2, 0xe7, 0x6f, 0xfe,
-        0xdf, 0x48, 0x54, 0xdb, 0x46, 0xe7, 0xca, 0x07, 0xd1, 0xc6, 0xa6, 0x4d,
-        0x12, 0xfa, 0x41, 0x9a, 0xfe, 0xff, 0xa6, 0xed, 0x65, 0x68, 0x1f, 0xf6,
-        0x2d, 0xda, 0x5e, 0xfa, 0xec, 0x29, 0x3f, 0x68, 0xe7, 0xd0, 0xd6, 0xda,
-        0x19, 0xe7, 0x68, 0xce, 0x7b, 0x31, 0xf7, 0xf0, 0xff, 0xa7, 0x04, 0xf1,
-        0xaa, 0xb3, 0xb5, 0x83, 0xfc, 0x3f, 0x15, 0xac, 0xe5, 0x8b, 0xf3, 0xc5,
-        0x27, 0x4a, 0x63, 0xea, 0xb1, 0x12, 0x11, 0x8d, 0x2f, 0x17, 0xb7, 0x73,
-        0xf2, 0xbe, 0x2e, 0xcb, 0x6e, 0x54, 0xaf, 0x21, 0xf0, 0xdb, 0xa7, 0x75,
-        0x7e, 0xde, 0xd8, 0x10, 0xe9, 0x8f, 0x71, 0xb8, 0xae, 0x30, 0xb6, 0x00,
-        0x6c, 0xeb, 0x9a, 0x72, 0xa9, 0x1a, 0xf8, 0xaf, 0xe6, 0x34, 0xbd, 0xbc,
-        0x05, 0x9a, 0x63, 0xfc, 0x21, 0x78, 0xe6, 0xcb, 0x41, 0xdf, 0xec, 0x90,
-        0x43, 0x7b, 0x1c, 0xfb, 0x35, 0x7a, 0x38, 0x17, 0xff, 0x4f, 0x07, 0xe5,
-        0x70, 0xbd, 0xcc, 0x2f, 0xb6, 0x35, 0x2d, 0x06, 0x31, 0x5e, 0x47, 0x9e,
-        0xc3, 0x5d, 0x54, 0x4c, 0xae, 0xbf, 0x43, 0x2a, 0x0e, 0x6d, 0x5b, 0xca,
-        0xef, 0x21, 0x29, 0x63, 0x9e, 0x8a, 0xd3, 0xf4, 0x8d, 0x05, 0x72, 0xb6,
-        0x62, 0x3e, 0x98, 0x77, 0xba, 0xbc, 0x1f, 0xef, 0xa8, 0x73, 0x80, 0x99,
-        0xa6, 0xf8, 0x7e, 0x11, 0x65, 0xfa, 0x46, 0xe6, 0xf0, 0x4c, 0x84, 0x75,
-        0xaf, 0xf5, 0x6b, 0xac, 0x7e, 0xf2, 0x41, 0xbf, 0x99, 0xb2, 0x95, 0xcf,
-        0x44, 0xb6, 0x94, 0xf1, 0x8b, 0xf5, 0x7e, 0xca, 0xdc, 0xfd, 0x36, 0x7f,
-        0x51, 0xf9, 0x8b, 0xa9, 0x7d, 0x0a, 0xe1, 0xb7, 0x3d, 0xf2, 0x94, 0xc9,
-        0xdc, 0xf5, 0xb4, 0x1a, 0x2b, 0xfd, 0x34, 0xcc, 0xd3, 0xdd, 0x52, 0xfb,
-        0x2b, 0x6f, 0xf7, 0x07, 0x79, 0xee, 0x1c, 0x7b, 0x67, 0x6e, 0xfb, 0x4e,
-        0x3a, 0x61, 0x8e, 0x7b, 0x3b, 0x70, 0xab, 0x56, 0x62, 0xe0, 0x41, 0xc8,
-        0x3b, 0xbb, 0x45, 0xf3, 0x63, 0xa1, 0xf6, 0x2f, 0x7f, 0x43, 0xf3, 0x73,
-        0xd3, 0xc7, 0xf0, 0xdb, 0x7e, 0xda, 0xb6, 0x94, 0x1b, 0x97, 0x02, 0xbf,
-        0x91, 0xb6, 0xa1, 0x21, 0x2b, 0x50, 0x47, 0x5e, 0x05, 0x9f, 0x6c, 0xb7,
-        0xe5, 0xdf, 0x7f, 0x01, 0x99, 0xe7, 0xd3, 0x46, 0x40, 0x67, 0x00, 0x00,
-        0x00 };
-static u32 bnx2_RXP_b09FwData[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_RXP_b09FwRodata[(0x278/4) + 1] = {
-        0x08003fa4, 0x08003ea4, 0x08003f48, 0x08003f60, 0x08003f78, 0x08003f98,
-        0x08003fa4, 0x08003fa4, 0x08003eac, 0x00000000, 0x080049d4, 0x08004a0c,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004a44, 0x08004c08,
-        0x08004b50, 0x08004b88, 0x08004c08, 0x08004ad8, 0x08004c08, 0x08004c08,
-        0x08004b88, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004bc8,
-        0x08004c08, 0x08004bc8, 0x08004b50, 0x08004c08, 0x08004c08, 0x08004bc8,
-        0x08004bc8, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08, 0x08004c08,
-        0x08004ab4, 0x00000000, 0x0800602c, 0x08006044, 0x08006044, 0x08006044,
-        0x0800602c, 0x08006044, 0x08006044, 0x08006044, 0x0800602c, 0x08006044,
-        0x08006044, 0x08006044, 0x0800602c, 0x08006044, 0x08006044, 0x08006044,
-        0x08006038, 0x00000000, 0x00000000 };
-static u32 bnx2_RXP_b09FwBss[(0x13dc/4) + 1] = { 0x0 };
-static u32 bnx2_RXP_b09FwSbss[(0x2c/4) + 1] = { 0x0 };
+        0x1f, 0x8b, 0x08, 0x00, 0x0e, 0x34, 0xe7, 0x45, 0x00, 0x03, 0xec, 0x5c,
+        0x5d, 0x6c, 0x1c, 0xd7, 0x75, 0x3e, 0xf3, 0x43, 0x6a, 0x49, 0xf1, 0x67,
+        0xb8, 0x5c, 0xb1, 0x2b, 0x99, 0x96, 0x77, 0xc9, 0x91, 0xc8, 0x58, 0x8a,
+        0x31, 0xa2, 0x09, 0x5b, 0x48, 0x17, 0xf6, 0x76, 0x76, 0x25, 0xb1, 0xb1,
+        0x03, 0x53, 0xb6, 0x62, 0x07, 0x45, 0x6a, 0xb0, 0x4b, 0xb9, 0x0e, 0x8c,
+        0x06, 0x90, 0xff, 0x52, 0xbf, 0xb0, 0xde, 0x2c, 0xa9, 0x58, 0x4d, 0x17,
+        0x9c, 0xb5, 0x4d, 0x9b, 0x0e, 0x60, 0xb7, 0x0b, 0x92, 0x12, 0xf5, 0xb0,
+        0xd0, 0xb2, 0xa9, 0xdb, 0xea, 0xc1, 0x8e, 0x09, 0x56, 0xb1, 0x53, 0xa0,
+        0x2d, 0x5c, 0x27, 0x69, 0xfc, 0x10, 0x14, 0xaa, 0xec, 0xc4, 0x42, 0xd1,
+        0xa2, 0x02, 0x12, 0xd8, 0x29, 0x22, 0x7b, 0xfa, 0x7d, 0x77, 0x66, 0xc8,
+        0x25, 0x2d, 0xdb, 0x41, 0x1f, 0xfa, 0xd2, 0xbd, 0xc0, 0x62, 0xee, 0xbd,
+        0x73, 0xee, 0xb9, 0xe7, 0x9e, 0xff, 0x73, 0x87, 0xd2, 0x1f, 0x74, 0x48,
+        0xbb, 0x84, 0xad, 0x13, 0xbf, 0xd4, 0x89, 0x27, 0x1e, 0xb9, 0x69, 0xf4,
+        0xa6, 0x9b, 0xd1, 0xbd, 0xd9, 0x30, 0x4c, 0x23, 0x9a, 0x6f, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66,
+        0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0x6b, 0xb6, 0x66, 0xfb, 0xff, 0xde,
+        0x0c, 0x11, 0x8b, 0xcf, 0xce, 0xf0, 0x27, 0x31, 0x3d, 0x23, 0x0f, 0xb9,
+        0xb6, 0xc4, 0x8c, 0xcc, 0xd5, 0xa9, 0x49, 0x5b, 0x24, 0x5b, 0xdb, 0x97,
+        0xca, 0xc9, 0x87, 0x7e, 0x31, 0x61, 0x0a, 0xe7, 0xaf, 0xcf, 0x5c, 0xfd,
+        0x8b, 0x57, 0x6f, 0x4d, 0x5f, 0xa9, 0x1a, 0x12, 0xb3, 0x32, 0x33, 0x07,
+        0xac, 0xbd, 0x12, 0xeb, 0xc7, 0x9a, 0x17, 0x87, 0xfe, 0xa9, 0x4b, 0xba,
+        0x22, 0x5c, 0x22, 0x0b, 0xe5, 0xb4, 0x73, 0x18, 0xcf, 0x33, 0xb5, 0x7d,
+        0xce, 0x9a, 0x98, 0xb2, 0x6a, 0x05, 0x3b, 0x96, 0xca, 0x1a, 0xf1, 0x48,
+        0xa9, 0x16, 0x93, 0x8b, 0xea, 0xdf, 0x79, 0x60, 0x4f, 0x9b, 0xfd, 0xf3,
+        0x9a, 0x5b, 0xf7, 0xfd, 0xd3, 0x8e, 0xef, 0xbf, 0x8e, 0xdf, 0x7b, 0x0e,
+        0xc6, 0xde, 0x47, 0x7e, 0xd6, 0x34, 0x44, 0xb7, 0xff, 0x4c, 0x73, 0x17,
+        0x5b, 0xa5, 0x34, 0x2f, 0x32, 0xed, 0xc5, 0xe4, 0x94, 0x57, 0xd4, 0xf2,
+        0xf5, 0xb2, 0x76, 0x68, 0x79, 0x56, 0x3b, 0xbc, 0x7c, 0x4a, 0x3b, 0xb2,
+        0x5c, 0xd1, 0xdc, 0x65, 0x29, 0xea, 0x07, 0x3a, 0x24, 0x6b, 0x9d, 0xd5,
+        0x72, 0xf5, 0x3e, 0xcd, 0x9d, 0xbf, 0xea, 0xbb, 0x4e, 0xda, 0xfa, 0x3d,
+        0x31, 0xb3, 0xdc, 0xcf, 0x2d, 0xfb, 0x18, 0x9b, 0x92, 0x4d, 0xf8, 0xbe,
+        0x9e, 0xf1, 0x9f, 0x74, 0x47, 0x6d, 0x4b, 0xd7, 0x62, 0x52, 0xaa, 0xb7,
+        0x03, 0x6f, 0x87, 0x96, 0x9b, 0x37, 0xb5, 0xbc, 0xe7, 0xbf, 0xe6, 0x3a,
+        0xd2, 0x6f, 0x88, 0xef, 0xcf, 0x38, 0x7b, 0x92, 0xc7, 0xe5, 0x0c, 0xf0,
+        0xd6, 0x80, 0x4f, 0x2c, 0x3d, 0x43, 0xfa, 0x22, 0x9a, 0x8b, 0x5a, 0x6e,
+        0x28, 0xa2, 0x4f, 0x52, 0xa4, 0xbf, 0xb0, 0xa4, 0x83, 0xce, 0xed, 0x52,
+        0xa8, 0x5a, 0x32, 0xb1, 0xb4, 0x15, 0xfe, 0xa2, 0xff, 0xea, 0x50, 0x42,
+        0xfe, 0xb2, 0x9e, 0x3e, 0x55, 0x04, 0x2f, 0x66, 0xbc, 0x94, 0x80, 0xcf,
+        0x59, 0x77, 0xb4, 0x5f, 0x5e, 0xab, 0x27, 0xe5, 0xbb, 0x75, 0x3b, 0x59,
+        0x92, 0x6d, 0x52, 0x48, 0x58, 0xb2, 0x82, 0x35, 0xd3, 0xa0, 0x43, 0xb7,
+        0x6d, 0xab, 0x04, 0xd8, 0x52, 0xfd, 0x27, 0xfc, 0xb7, 0x32, 0xd6, 0xe4,
+        0xa8, 0x5a, 0x53, 0x04, 0xdd, 0x21, 0x2c, 0xcf, 0xa1, 0x60, 0xd5, 0x59,
+        0x02, 0x58, 0x29, 0x4e, 0x8e, 0x62, 0xae, 0xfe, 0x85, 0x50, 0x16, 0xad,
+        0x38, 0x2f, 0x9f, 0xbb, 0x71, 0xbe, 0xdd, 0xe0, 0x89, 0x24, 0x74, 0xd9,
+        0x93, 0x2c, 0x60, 0x66, 0xba, 0xde, 0x81, 0x31, 0x69, 0xf1, 0xfd, 0x23,
+        0x8e, 0x58, 0x25, 0xa7, 0x1b, 0xbc, 0x4b, 0x49, 0xc9, 0xe9, 0xc2, 0x9a,
+        0x16, 0xb1, 0x6c, 0x9e, 0x81, 0x78, 0xdb, 0x30, 0xef, 0x77, 0x1a, 0x19,
+        0xdf, 0x9f, 0x1c, 0x95, 0xae, 0x60, 0x6e, 0x1f, 0x70, 0x98, 0x32, 0x31,
+        0xae, 0x01, 0xee, 0x03, 0xd2, 0x17, 0x8b, 0x67, 0xd8, 0xe7, 0x73, 0x54,
+        0xdc, 0xd9, 0x54, 0xb8, 0x6f, 0x87, 0x94, 0xbc, 0xeb, 0xc3, 0x3e, 0x78,
+        0xed, 0xe1, 0xcc, 0xce, 0x4e, 0x8c, 0xb5, 0x1b, 0x80, 0xc7, 0x29, 0x09,
+        0xf7, 0xd8, 0x21, 0x6b, 0x09, 0xd1, 0x2f, 0x39, 0xbd, 0x21, 0x5c, 0x17,
+        0x68, 0x8d, 0x64, 0xde, 0x2e, 0x33, 0xf3, 0xad, 0x72, 0x72, 0x9e, 0xbc,
+        0x2d, 0x43, 0x16, 0x78, 0xde, 0x52, 0xd4, 0xb2, 0xf5, 0x53, 0xe8, 0x9b,
+        0x32, 0x69, 0xfb, 0xaf, 0xcd, 0x38, 0xb3, 0x5a, 0x6e, 0xf9, 0x8c, 0x96,
+        0x87, 0x0e, 0x1c, 0x5a, 0x3e, 0xaf, 0x1d, 0xae, 0xaf, 0x76, 0x4a, 0x7b,
+        0x1a, 0xda, 0x66, 0xca, 0x49, 0x4f, 0x13, 0xd2, 0xbb, 0x00, 0x7e, 0x65,
+        0x2d, 0x70, 0xde, 0xee, 0xd2, 0x0e, 0x03, 0x57, 0x8b, 0xfd, 0xad, 0x0e,
+        0xe9, 0x32, 0x64, 0x9b, 0x1d, 0xc1, 0xc6, 0xe4, 0x5b, 0xa0, 0x6d, 0xcd,
+        0x49, 0x00, 0x4e, 0xba, 0x83, 0x35, 0x3d, 0x21, 0x3d, 0xd4, 0x25, 0xea,
+        0x91, 0x9e, 0xcd, 0xcf, 0xfd, 0x69, 0x6f, 0x69, 0xff, 0x76, 0xc2, 0xc0,
+        0x3e, 0x52, 0x0f, 0x4d, 0xda, 0x6e, 0x8f, 0x29, 0x45, 0x4b, 0x97, 0xb4,
+        0x95, 0x93, 0x1b, 0x64, 0xc6, 0x11, 0xc9, 0x41, 0xbf, 0x75, 0xdb, 0x04,
+        0x8f, 0x6c, 0xf0, 0x68, 0xcf, 0xa9, 0x41, 0xfd, 0x0e, 0x49, 0xf5, 0x15,
+        0x35, 0x33, 0xe4, 0xe7, 0x82, 0xdc, 0xa6, 0xd6, 0xeb, 0x19, 0x07, 0x3a,
+        0xd9, 0xce, 0x3e, 0xf6, 0x8d, 0xa9, 0x7d, 0x8d, 0x8c, 0x9d, 0x5c, 0x14,
+        0xd1, 0xf4, 0xcc, 0x3e, 0xe0, 0xa3, 0xae, 0x12, 0xee, 0x29, 0xd0, 0x48,
+        0xda, 0xd9, 0xb7, 0xb1, 0x26, 0x26, 0xae, 0xd3, 0xd9, 0x40, 0x27, 0xe8,
+        0x49, 0x90, 0xe7, 0xe4, 0xa1, 0x3a, 0xa7, 0xb6, 0x71, 0xce, 0x5f, 0xfb,
+        0xdb, 0x46, 0x4c, 0x79, 0x5d, 0x9d, 0x97, 0x76, 0x45, 0x38, 0x75, 0x46,
+        0x21, 0x7f, 0xa6, 0x3d, 0xd1, 0x0a, 0x8e, 0xb5, 0x8e, 0x0b, 0x7a, 0xa1,
+        0x1b, 0x99, 0x0e, 0xc9, 0x29, 0xfa, 0x0e, 0x62, 0x2f, 0xda, 0x1b, 0xec,
+        0xc6, 0xe6, 0x59, 0x38, 0x97, 0x81, 0xed, 0xa6, 0x95, 0xfe, 0x14, 0x2a,
+        0xf4, 0x07, 0xa4, 0x6d, 0x35, 0xad, 0x4b, 0x80, 0xaf, 0xf4, 0x6c, 0x37,
+        0x68, 0xe3, 0x18, 0xb6, 0x67, 0xe3, 0xfd, 0x7e, 0xd8, 0xfa, 0xc1, 0x41,
+        0xf0, 0x87, 0x70, 0x76, 0x0a, 0xf2, 0xce, 0xba, 0xd8, 0xd3, 0x75, 0x6e,
+        0x56, 0x3c, 0xe8, 0xc1, 0x79, 0x06, 0x67, 0xc9, 0xaf, 0x76, 0xe8, 0xb3,
+        0x26, 0x05, 0x27, 0x9d, 0xa2, 0xfc, 0x03, 0xda, 0x75, 0xd9, 0x76, 0x4b,
+        0x23, 0xed, 0x91, 0xac, 0xa8, 0x8f, 0xa6, 0xc4, 0x47, 0x08, 0x4b, 0x38,
+        0xc2, 0xa7, 0x0f, 0x8a, 0xfe, 0x6b, 0xdf, 0xda, 0x74, 0x56, 0x5b, 0x06,
+        0x66, 0x41, 0x43, 0xc0, 0x5b, 0xf0, 0xe4, 0xb3, 0x60, 0xc9, 0xd7, 0xad,
+        0xfc, 0x23, 0x6c, 0x23, 0x1c, 0x74, 0xa2, 0x8f, 0x34, 0xac, 0x74, 0x04,
+        0xf6, 0x15, 0xd1, 0x14, 0xc9, 0x46, 0x0b, 0x71, 0x7c, 0xda, 0x39, 0x08,
+        0x0f, 0xbb, 0xf7, 0x60, 0xf7, 0x1e, 0x7c, 0x82, 0x07, 0x9b, 0xf7, 0xe8,
+        0x27, 0x52, 0xf2, 0xea, 0x10, 0xfc, 0xda, 0x86, 0x5f, 0x41, 0x1b, 0x43,
+        0x5f, 0x17, 0x03, 0x7e, 0x65, 0xba, 0xaa, 0xc3, 0x76, 0x61, 0x43, 0x4b,
+        0x9c, 0xb3, 0xf0, 0xcc, 0xe3, 0x69, 0xc3, 0x8f, 0x52, 0xaf, 0x22, 0xff,
+        0x49, 0x3f, 0x93, 0x84, 0x4f, 0xa1, 0xaf, 0xa1, 0x2f, 0x21, 0xac, 0xef,
+        0xe7, 0x1d, 0xae, 0xf5, 0x65, 0xdc, 0xa1, 0x1d, 0x75, 0x88, 0x1e, 0x2f,
+        0x6a, 0x47, 0x87, 0x60, 0x63, 0x37, 0xb6, 0x80, 0x56, 0xda, 0xda, 0x75,
+        0x74, 0x15, 0x68, 0xbf, 0xe8, 0x0c, 0xfe, 0x5d, 0xde, 0x36, 0xc0, 0x28,
+        0xa1, 0x76, 0x05, 0xe3, 0xb6, 0xd0, 0x9f, 0xf0, 0x7d, 0x3a, 0x95, 0x95,
+        0xdd, 0xe1, 0x98, 0xfd, 0x75, 0x7a, 0x1d, 0xfd, 0x96, 0x98, 0x0c, 0x9c,
+        0x09, 0xfc, 0xe0, 0xc0, 0x82, 0x25, 0xf6, 0x99, 0x80, 0xc6, 0x81, 0x73,
+        0x91, 0x3f, 0x6c, 0x01, 0x3e, 0xd0, 0xe7, 0x6d, 0xc4, 0x09, 0x91, 0xf7,
+        0x34, 0x98, 0x0a, 0xe6, 0xb6, 0xf2, 0x82, 0x3e, 0x98, 0xf6, 0x66, 0x35,
+        0xda, 0xdb, 0x01, 0xd8, 0x9b, 0xd3, 0x2a, 0x69, 0xe7, 0xef, 0x60, 0x6f,
+        0x4f, 0x39, 0x1a, 0x78, 0x23, 0x72, 0xa1, 0xdc, 0x01, 0x5b, 0x37, 0x93,
+        0xef, 0xc8, 0x9e, 0xd4, 0xb4, 0x68, 0x72, 0x9a, 0x73, 0x35, 0xcc, 0x29,
+        0xff, 0x1b, 0xd8, 0xf7, 0x45, 0xe3, 0x69, 0xd0, 0xe5, 0xfb, 0xd3, 0xc0,
+        0x59, 0xd8, 0x6f, 0x84, 0xb6, 0x15, 0xcd, 0xa7, 0x10, 0xf3, 0xdc, 0xcf,
+        0x19, 0x52, 0x1c, 0x6e, 0x91, 0xf4, 0xf0, 0x02, 0x70, 0x4f, 0x3a, 0x81,
+        0x1d, 0x53, 0xd7, 0x17, 0x81, 0x7f, 0xc6, 0x1b, 0x82, 0x1e, 0xd3, 0x0e,
+        0x40, 0x17, 0xf0, 0x2f, 0x02, 0xff, 0x4c, 0xbd, 0x45, 0xbe, 0x69, 0x46,
+        0xb1, 0x34, 0x3a, 0x4f, 0x1b, 0xc0, 0xa2, 0x7d, 0x4f, 0xc8, 0x17, 0xbd,
+        0xb8, 0xe6, 0x3e, 0x4b, 0x3f, 0x5b, 0x1a, 0x86, 0x9d, 0x68, 0x25, 0x87,
+        0x7b, 0x1b, 0xb2, 0xb8, 0x0e, 0x23, 0xd9, 0x52, 0x60, 0x83, 0x59, 0x77,
+        0xa8, 0x98, 0x34, 0x94, 0x2f, 0x11, 0x39, 0x5c, 0x36, 0x01, 0xc3, 0x31,
+        0xe7, 0x83, 0xb9, 0xb1, 0x72, 0x1f, 0x7c, 0x23, 0xc7, 0x57, 0xfd, 0x49,
+        0x27, 0x98, 0xfb, 0xdd, 0x72, 0x81, 0x32, 0x62, 0xdc, 0x4e, 0x95, 0x9c,
+        0x7f, 0xf7, 0xa1, 0xbf, 0x9b, 0xd6, 0x5c, 0x1b, 0x4f, 0x7a, 0x2c, 0x8c,
+        0xf5, 0xda, 0x11, 0x5b, 0xef, 0x6b, 0x0d, 0x7d, 0xd8, 0x11, 0x4c, 0x1e,
+        0x2a, 0x97, 0x7a, 0x5b, 0xe5, 0xaa, 0xc1, 0xd8, 0x79, 0x09, 0x46, 0xed,
+        0x96, 0xf7, 0x82, 0x1f, 0xa5, 0x9e, 0x86, 0xb9, 0x58, 0xbe, 0xec, 0xcb,
+        0x9a, 0x13, 0xac, 0xc1, 0xb8, 0x23, 0x57, 0xd6, 0xfb, 0x62, 0xb2, 0x3e,
+        0xb6, 0xb8, 0x66, 0x49, 0xf6, 0x0e, 0x2f, 0x8a, 0x5a, 0xdb, 0x1b, 0xdb,
+        0x58, 0x9b, 0xc8, 0x97, 0x4b, 0x3d, 0x0d, 0xe3, 0x64, 0x0e, 0xb8, 0xf4,
+        0x03, 0xeb, 0x6b, 0xfb, 0x37, 0xd6, 0xee, 0x90, 0x54, 0x0f, 0xd7, 0xeb,
+        0x7d, 0x6d, 0x1b, 0xb8, 0x53, 0x21, 0x3d, 0xbd, 0x6d, 0x1b, 0x38, 0x6c,
+        0xe2, 0x6c, 0x18, 0x0f, 0x13, 0xe7, 0xc0, 0x06, 0xce, 0xfd, 0x9b, 0xe9,
+        0x39, 0x21, 0xf0, 0x41, 0xb1, 0xd6, 0x8c, 0x1c, 0xb8, 0x50, 0x1e, 0x1c,
+        0xff, 0xa2, 0x20, 0xe6, 0xed, 0xdf, 0x16, 0xfa, 0x64, 0xf3, 0x80, 0x0b,
+        0x5e, 0x99, 0x42, 0x1f, 0xa7, 0x49, 0x09, 0x72, 0x7e, 0xa8, 0x26, 0x07,
+        0xd6, 0x6a, 0x12, 0xea, 0x12, 0x75, 0xe2, 0x32, 0x6c, 0x4c, 0x8a, 0xbb,
+        0x32, 0x1d, 0x13, 0x66, 0xc6, 0x82, 0xad, 0xc9, 0x78, 0x09, 0x3e, 0xd9,
+        0xc8, 0xec, 0x79, 0x3b, 0x67, 0x3c, 0xe9, 0x1b, 0x88, 0xdb, 0x39, 0xe9,
+        0x38, 0xe8, 0x8e, 0x62, 0xbe, 0x46, 0xdb, 0x82, 0x5f, 0xa9, 0x13, 0xf7,
+        0x7c, 0xb7, 0x74, 0x21, 0x2e, 0xd6, 0x5e, 0xda, 0x11, 0xd8, 0x8e, 0x98,
+        0x26, 0x7c, 0xed, 0xcc, 0x28, 0xe3, 0x78, 0x6b, 0x0c, 0xf0, 0x13, 0x46,
+        0x66, 0x6c, 0xe7, 0xf1, 0xda, 0x9d, 0x3b, 0x0b, 0xb5, 0xe2, 0xce, 0x42,
+        0xd9, 0xa2, 0x9d, 0xe8, 0xee, 0x28, 0xfa, 0x2a, 0x57, 0x4a, 0xc2, 0x26,
+        0x2e, 0xab, 0x3c, 0xe2, 0xb5, 0x7a, 0x1d, 0xf6, 0x47, 0xfb, 0x16, 0x19,
+        0xf7, 0xb0, 0xc7, 0xc8, 0x87, 0x90, 0x3b, 0x68, 0x83, 0x4f, 0xcb, 0xe2,
+        0xd4, 0xfa, 0xc8, 0xbf, 0x85, 0xf6, 0xc9, 0xfe, 0xfb, 0x7e, 0xe0, 0xef,
+        0xef, 0xe8, 0x0e, 0xe6, 0xde, 0x0a, 0x6d, 0x3a, 0xc2, 0x45, 0x3c, 0xc3,
+        0xda, 0x38, 0x72, 0x92, 0xf1, 0xba, 0xa9, 0xd1, 0x3f, 0xe7, 0x3c, 0xe6,
+        0x12, 0xcc, 0x23, 0xa6, 0x43, 0x3f, 0x27, 0xd9, 0x1c, 0xfc, 0x88, 0x8e,
+        0xdc, 0xa2, 0x00, 0xbb, 0x31, 0x33, 0x57, 0x64, 0x46, 0xf9, 0x48, 0x89,
+        0xb5, 0x64, 0x9e, 0x00, 0xcc, 0x7f, 0xc0, 0xe6, 0xda, 0xba, 0x43, 0x3d,
+        0x0c, 0x7d, 0xbc, 0xf2, 0xbb, 0x80, 0xbd, 0xbc, 0x05, 0xf6, 0xdd, 0x46,
+        0x58, 0xbc, 0xbf, 0xb8, 0xe5, 0xfd, 0x4f, 0x69, 0xbf, 0x78, 0xb7, 0x0a,
+        0x7f, 0xda, 0x1a, 0xda, 0xfe, 0x05, 0x29, 0xc0, 0xb7, 0x9a, 0x36, 0x73,
+        0xc7, 0xdb, 0xb0, 0x16, 0xe3, 0x1a, 0x68, 0x84, 0xbf, 0x40, 0xcc, 0x04,
+        0xbf, 0x11, 0x13, 0x12, 0x37, 0x30, 0x3f, 0xa2, 0x9f, 0x00, 0x2c, 0xfd,
+        0x2f, 0x61, 0x5f, 0xe9, 0x20, 0xcf, 0x0b, 0x35, 0xae, 0xa1, 0xaf, 0x12,
+        0xdf, 0x1d, 0x6d, 0x83, 0x46, 0xf9, 0xaf, 0x19, 0x76, 0x04, 0x1b, 0xe1,
+        0xdd, 0x0a, 0xcb, 0x7c, 0x85, 0xb8, 0xbb, 0xc3, 0x3c, 0x60, 0x4c, 0xb2,
+        0xf5, 0x2c, 0x7e, 0x45, 0x99, 0x7c, 0x16, 0xb9, 0x98, 0xdd, 0x42, 0x5e,
+        0x90, 0x35, 0x56, 0xc0, 0xa3, 0x68, 0xdd, 0x13, 0xbd, 0x9b, 0xc7, 0xf7,
+        0xc5, 0x37, 0x7c, 0x25, 0x2d, 0x4d, 0xb2, 0x88, 0x15, 0xe0, 0x71, 0x6a,
+        0x42, 0xcf, 0x24, 0x24, 0x57, 0x0b, 0xf8, 0x8b, 0x78, 0x0b, 0xff, 0xc8,
+        0x2e, 0x64, 0xb2, 0xee, 0x07, 0x23, 0x99, 0x53, 0xcf, 0xb2, 0x90, 0x4d,
+        0x0a, 0xba, 0x34, 0x86, 0xb5, 0x72, 0x02, 0x38, 0x18, 0x87, 0x1d, 0x3d,
+        0x13, 0x97, 0x82, 0xc5, 0x7c, 0x41, 0xe5, 0x7a, 0x59, 0xfa, 0x01, 0x3d,
+        0xd3, 0x86, 0x39, 0xf6, 0x1f, 0xee, 0x0e, 0x64, 0xdd, 0xc9, 0xf1, 0xb8,
+        0x9e, 0xe9, 0xde, 0x32, 0xff, 0x7a, 0x67, 0x40, 0x9b, 0x1a, 0x63, 0xfe,
+        0x5f, 0xb6, 0x8c, 0xbf, 0x1e, 0xdf, 0x3c, 0x7e, 0x60, 0x67, 0xa4, 0x0f,
+        0x7a, 0xe6, 0x89, 0x90, 0x5e, 0xea, 0xe9, 0x56, 0x5a, 0x7f, 0x13, 0x7d,
+        0x79, 0x0e, 0x38, 0x95, 0x8e, 0xff, 0x06, 0xfa, 0xb2, 0x0e, 0xfb, 0x09,
+        0xfa, 0xd2, 0x48, 0xc3, 0x7a, 0x5d, 0x51, 0xd1, 0x91, 0x93, 0xba, 0xa3,
+        0x7b, 0x90, 0x77, 0xa4, 0x24, 0x5f, 0x07, 0xef, 0xd6, 0xe3, 0xea, 0x3a,
+        0x4c, 0x71, 0x03, 0x26, 0x88, 0x3b, 0xf9, 0xba, 0x8f, 0x3c, 0xae, 0x31,
+        0x06, 0x0f, 0xa3, 0x5f, 0xc4, 0x59, 0x57, 0x64, 0xd2, 0x5b, 0xcb, 0xea,
+        0xf6, 0xa9, 0x20, 0x0f, 0xb5, 0xbf, 0xad, 0xe5, 0x17, 0x99, 0xa3, 0xc6,
+        0xd0, 0x57, 0xf5, 0x07, 0x62, 0xdc, 0x33, 0x5a, 0x76, 0x79, 0x0e, 0xf9,
+        0xe9, 0x12, 0x7e, 0x67, 0xf1, 0xab, 0xe1, 0x17, 0xd5, 0x01, 0x2f, 0xa0,
+        0x8e, 0x50, 0xfe, 0x1e, 0xb1, 0x29, 0xd8, 0xff, 0x67, 0x4b, 0xc8, 0x8f,
+        0xe7, 0x12, 0xf2, 0x94, 0xad, 0xf7, 0xea, 0x81, 0x8f, 0xcb, 0x22, 0xb7,
+        0xb6, 0x2e, 0xcb, 0x97, 0xc2, 0x1c, 0x4d, 0xe4, 0x9d, 0x0a, 0x64, 0xb9,
+        0xff, 0x48, 0xe8, 0x9f, 0xbe, 0xf6, 0xa0, 0xab, 0x7c, 0x79, 0x98, 0x83,
+        0xc1, 0xef, 0x64, 0x15, 0xd4, 0x1b, 0xe0, 0x8f, 0x26, 0xef, 0x41, 0x8f,
+        0xdf, 0xa9, 0xb4, 0x83, 0x1e, 0x5b, 0x0a, 0xc7, 0x90, 0xbb, 0x68, 0x83,
+        0xd6, 0x36, 0xad, 0x1d, 0x79, 0x18, 0xfc, 0x8e, 0x1a, 0x93, 0x67, 0x17,
+        0xa7, 0x16, 0xca, 0x3a, 0x60, 0xc1, 0xf3, 0x51, 0xf4, 0xa1, 0x7f, 0x97,
+        0x2a, 0x5c, 0xa7, 0xcb, 0xbb, 0x15, 0x43, 0x7e, 0x8e, 0xbc, 0xee, 0x3d,
+        0xfb, 0xe2, 0x14, 0x6c, 0xb0, 0x0f, 0xf1, 0x0a, 0xb5, 0xd0, 0x1e, 0xc6,
+        0x8c, 0x01, 0x13, 0xcf, 0x3c, 0x7e, 0x87, 0x91, 0xe7, 0x5d, 0x7b, 0xcd,
+        0x27, 0xc1, 0x93, 0xb6, 0x18, 0xd6, 0x10, 0xde, 0x04, 0x6d, 0x5d, 0xd0,
+        0xc1, 0xb4, 0x35, 0x21, 0xdd, 0x96, 0xca, 0x9d, 0x34, 0xce, 0x07, 0x7e,
+        0xf2, 0xe3, 0xf3, 0xe4, 0xb3, 0x01, 0x1d, 0xe2, 0x98, 0xef, 0xe8, 0xcf,
+        0x89, 0x2f, 0x7d, 0x30, 0x8b, 0xc3, 0x5c, 0xaa, 0x04, 0xfd, 0x68, 0x4e,
+        0xb4, 0x28, 0xa6, 0xd2, 0x4f, 0xe7, 0x61, 0xab, 0x1c, 0x8f, 0x8b, 0x92,
+        0xc1, 0x26, 0x79, 0x52, 0x8f, 0x56, 0xa7, 0x66, 0x6c, 0xca, 0xd5, 0x92,
+        0xe9, 0x72, 0x24, 0x57, 0xca, 0x08, 0x75, 0x66, 0xe5, 0xdb, 0x90, 0xab,
+        0x1e, 0xd6, 0x20, 0xf0, 0x03, 0x73, 0x94, 0x2f, 0xea, 0xc4, 0x0a, 0xf2,
+        0xb0, 0x8a, 0xc4, 0x83, 0x1a, 0xea, 0x19, 0xd4, 0x1d, 0x90, 0x5f, 0x79,
+        0x0e, 0x38, 0x12, 0x78, 0x2e, 0xe1, 0x99, 0xc4, 0xf3, 0x2c, 0x9e, 0xfd,
+        0x78, 0xd6, 0x68, 0x1f, 0x61, 0xde, 0xf3, 0x31, 0x7a, 0x60, 0x27, 0x79,
+        0xda, 0xb4, 0x7c, 0xaf, 0x9e, 0x91, 0xbf, 0xad, 0x1f, 0x94, 0xbf, 0xa9,
+        0x8f, 0xca, 0x5f, 0xd7, 0x1d, 0x79, 0xb9, 0xbe, 0x5f, 0xfe, 0xaa, 0x3e,
+        0xcc, 0x9a, 0x10, 0x39, 0x5c, 0x0a, 0xbe, 0xf9, 0xbc, 0x3c, 0xe8, 0xd5,
+        0xe1, 0x73, 0x28, 0xff, 0x8b, 0x53, 0xd9, 0xda, 0x75, 0x52, 0x78, 0xd6,
+        0x42, 0x9e, 0x69, 0xb0, 0x2e, 0x93, 0xc7, 0x9c, 0x3b, 0xe2, 0x94, 0xbd,
+        0x6e, 0xb3, 0x4e, 0x39, 0x49, 0x38, 0xd4, 0xbb, 0x1a, 0xf2, 0x97, 0x16,
+        0x99, 0x48, 0xa4, 0x57, 0x5c, 0x23, 0x19, 0xfa, 0xa3, 0x3b, 0x01, 0x87,
+        0x3d, 0xbd, 0x0e, 0x59, 0x7b, 0x1e, 0xb6, 0xe0, 0xa0, 0x56, 0x4e, 0xc4,
+        0xe0, 0xfb, 0x54, 0x7e, 0xa2, 0x7c, 0x4b, 0xe0, 0x4b, 0xa3, 0x9a, 0x91,
+        0x73, 0xd9, 0x70, 0x8e, 0xf1, 0xd1, 0x02, 0xec, 0x72, 0x18, 0x43, 0xb6,
+        0xe2, 0xa4, 0x6f, 0x3c, 0x16, 0xfa, 0xc7, 0x15, 0x39, 0xe1, 0x0d, 0x66,
+        0xaf, 0x20, 0xf6, 0x68, 0x2d, 0x51, 0x5e, 0xb4, 0x0b, 0xb4, 0xf9, 0xfe,
+        0xdd, 0xac, 0xbf, 0xe3, 0xa6, 0xfc, 0x70, 0x36, 0x6d, 0x3d, 0xa2, 0xcf,
+        0x40, 0xce, 0xbe, 0x7f, 0xd4, 0x4e, 0x9f, 0x9a, 0xd0, 0x3b, 0xe5, 0x27,
+        0xcf, 0x30, 0x26, 0xaf, 0x4e, 0x7d, 0x1f, 0x7a, 0x50, 0x5d, 0x6a, 0x95,
+        0x6a, 0xd5, 0x94, 0x4b, 0x23, 0x83, 0x6a, 0xdf, 0x6a, 0x2d, 0x8e, 0x3c,
+        0xaf, 0x4d, 0xa6, 0xfb, 0x94, 0xb2, 0xc3, 0x6f, 0x0f, 0x2b, 0xbf, 0xed,
+        0xda, 0x78, 0xd6, 0x92, 0xd6, 0x66, 0x5a, 0x5e, 0x96, 0x82, 0x07, 0x1d,
+        0x8b, 0xef, 0x02, 0x4f, 0xd8, 0x1f, 0xb4, 0x0a, 0x3a, 0x62, 0xa0, 0x39,
+        0x68, 0x3d, 0xa8, 0xff, 0xd2, 0xff, 0x1d, 0x93, 0x7c, 0x7c, 0x1b, 0xb1,
+        0x85, 0xb1, 0x52, 0x53, 0x7a, 0xb7, 0xb0, 0xf4, 0x53, 0x8b, 0xfe, 0x65,
+        0xa5, 0xb6, 0x2b, 0x1c, 0xd3, 0xbf, 0x73, 0xdc, 0x2e, 0x2f, 0x57, 0xb7,
+        0xcb, 0x62, 0x95, 0xef, 0x5b, 0x65, 0xa1, 0x3a, 0x78, 0xa5, 0x57, 0xef,
+        0x93, 0xd5, 0xeb, 0x6e, 0xb4, 0xee, 0xd7, 0xc1, 0x93, 0x63, 0x1f, 0xc9,
+        0x07, 0x23, 0xdd, 0xf2, 0xd6, 0x7d, 0xe9, 0x17, 0xfe, 0x44, 0x87, 0x3e,
+        0x8e, 0x74, 0xd0, 0xce, 0xd0, 0xe7, 0x7c, 0xfa, 0x4a, 0x56, 0xa7, 0x9e,
+        0xfd, 0x00, 0xfa, 0x95, 0xae, 0x04, 0x3a, 0x49, 0xdc, 0xc4, 0x0b, 0xf9,
+        0xd8, 0x6f, 0x00, 0x27, 0xde, 0xd5, 0x06, 0x81, 0xeb, 0x0d, 0xc5, 0x8b,
+        0xbb, 0x9d, 0xf4, 0x15, 0x84, 0x28, 0xff, 0x92, 0x3d, 0x38, 0x3c, 0xa0,
+        0xef, 0x92, 0x6a, 0xf2, 0x46, 0xeb, 0xbb, 0x88, 0x07, 0xd9, 0x44, 0xfa,
+        0xd4, 0x45, 0x59, 0x9d, 0xba, 0x60, 0x53, 0x17, 0x69, 0xc3, 0xff, 0x80,
+        0x9c, 0xd4, 0x92, 0x4a, 0x8d, 0xbe, 0x8b, 0xb8, 0x58, 0x17, 0xec, 0xb5,
+        0x4e, 0x80, 0x06, 0x77, 0x3f, 0xde, 0x61, 0xde, 0xf8, 0x3c, 0xe5, 0xd6,
+        0xc2, 0xb5, 0xc3, 0x59, 0xbd, 0x7f, 0x0b, 0x8f, 0x06, 0xad, 0x43, 0x3a,
+        0xf7, 0xfb, 0x2f, 0xec, 0xfb, 0x3e, 0x68, 0x1d, 0xc4, 0x5a, 0xc4, 0xd0,
+        0x64, 0xe3, 0x1e, 0x3f, 0x52, 0x7b, 0x3c, 0x5b, 0x43, 0x0e, 0xb8, 0xbe,
+        0x07, 0xe6, 0x6a, 0x3a, 0xce, 0x69, 0x2a, 0xb9, 0x5c, 0x1a, 0x21, 0x7f,
+        0x6f, 0xef, 0x61, 0x2c, 0x37, 0x32, 0x2f, 0x85, 0x79, 0x46, 0x4c, 0x7e,
+        0x8c, 0xba, 0x6b, 0x12, 0xfe, 0x7f, 0x61, 0xef, 0x20, 0x68, 0x40, 0x7d,
+        0x9a, 0x54, 0xf1, 0x7c, 0xca, 0x05, 0x8e, 0x9c, 0xc2, 0xfd, 0xa6, 0x2c,
+        0x01, 0xf7, 0x38, 0xf9, 0x00, 0xdc, 0x33, 0x9c, 0x57, 0x32, 0xc0, 0x7c,
+        0x2d, 0x05, 0xbc, 0xbd, 0xa1, 0xff, 0x8b, 0x43, 0x57, 0xf7, 0x59, 0x77,
+        0x4b, 0x2c, 0xf4, 0x7f, 0x71, 0x79, 0xeb, 0x79, 0xe8, 0x7d, 0x9c, 0xfa,
+        0x93, 0xe8, 0xd9, 0xd0, 0x9f, 0x46, 0xfc, 0xad, 0x92, 0xaf, 0xc4, 0x80,
+        0x17, 0x39, 0xf7, 0x28, 0xf1, 0x62, 0x5c, 0xa5, 0x2e, 0x17, 0x43, 0x5d,
+        0xee, 0x08, 0x71, 0xaf, 0x41, 0x97, 0xd3, 0xa9, 0x55, 0x9d, 0xf5, 0xd5,
+        0x4e, 0x55, 0xf3, 0x1a, 0xb0, 0xaf, 0x42, 0x99, 0xb1, 0x88, 0xb6, 0x75,
+        0x71, 0x6a, 0x12, 0x35, 0x6c, 0xa1, 0x7c, 0x50, 0x2f, 0xd4, 0x47, 0xf5,
+        0x82, 0x47, 0x7d, 0xdb, 0x6b, 0x2d, 0x28, 0x1e, 0x27, 0x65, 0xa1, 0xfe,
+        0x81, 0x5f, 0xda, 0xbb, 0x0d, 0x7d, 0xe8, 0xfe, 0x38, 0xe5, 0x7b, 0x3d,
+        0xe9, 0x42, 0x50, 0x27, 0xbf, 0x13, 0x72, 0x66, 0xe8, 0x7b, 0xdd, 0xcc,
+        0xd1, 0x96, 0x87, 0x88, 0x1f, 0x74, 0x24, 0x12, 0xb2, 0xe8, 0x71, 0x8f,
+        0xd5, 0x29, 0xf2, 0xb2, 0x30, 0x67, 0xc9, 0x09, 0x25, 0x3f, 0x9e, 0x9b,
+        0xf7, 0x47, 0x86, 0x4c, 0xc6, 0x07, 0xad, 0x47, 0x25, 0x7d, 0x65, 0xcd,
+        0x48, 0xbf, 0x30, 0x81, 0xb8, 0xba, 0x30, 0x6f, 0x88, 0xab, 0xea, 0x30,
+        0xca, 0x28, 0x5d, 0x81, 0x35, 0x86, 0x67, 0xbf, 0xa7, 0xe1, 0xec, 0x5d,
+        0x72, 0xe1, 0xf9, 0xcf, 0xc3, 0xee, 0x5f, 0x81, 0x2c, 0xcc, 0xd4, 0x71,
+        0xe4, 0x19, 0xcf, 0xc9, 0xa0, 0x55, 0x42, 0xfe, 0x0c, 0xbe, 0xa3, 0xbd,
+        0xa2, 0x6c, 0x60, 0x41, 0xc7, 0xb8, 0x9f, 0x7c, 0xe2, 0x78, 0xb7, 0x2c,
+        0xf4, 0x05, 0x36, 0xce, 0x77, 0x03, 0xc0, 0x11, 0xbc, 0xe3, 0xf8, 0xb7,
+        0x64, 0x40, 0xbd, 0xab, 0xaa, 0x75, 0x25, 0xe9, 0x0d, 0xe5, 0xf7, 0x18,
+        0xf6, 0x24, 0x8f, 0xa3, 0xf9, 0x4e, 0x09, 0x6c, 0x29, 0xe2, 0xbb, 0x25,
+        0x47, 0x6b, 0x09, 0xb9, 0xa7, 0x96, 0x94, 0x2f, 0xd7, 0xfa, 0x25, 0x0f,
+        0x39, 0x4e, 0x8e, 0x3e, 0xd9, 0xc3, 0xb3, 0xe5, 0x96, 0xd2, 0x2f, 0x88,
+        0x4e, 0x5a, 0xab, 0x72, 0xdc, 0x8b, 0xe8, 0xe9, 0x08, 0xe9, 0x33, 0xc3,
+        0x71, 0x2c, 0xa4, 0xa1, 0x11, 0x5f, 0x07, 0x70, 0x65, 0x81, 0xe7, 0xa5,
+        0x10, 0x0f, 0xfd, 0x08, 0x68, 0x3d, 0x96, 0x94, 0x25, 0x8f, 0x74, 0x6c,
+        0x97, 0x52, 0x82, 0xfd, 0x57, 0xa0, 0x6f, 0xc4, 0xb3, 0x8d, 0xf9, 0xcd,
+        0x26, 0x1e, 0x3f, 0x5c, 0x2b, 0x82, 0xc7, 0xe4, 0x2f, 0xe1, 0xe0, 0xaf,
+        0xbf, 0x40, 0xf9, 0xed, 0x43, 0x8e, 0x6f, 0x07, 0xba, 0x69, 0x6d, 0xec,
+        0x99, 0x9f, 0xeb, 0x82, 0xac, 0xb8, 0x6f, 0xbb, 0x1c, 0x83, 0xdd, 0xe7,
+        0xaa, 0xdc, 0xff, 0x18, 0xf4, 0xe8, 0x2d, 0xb5, 0x7f, 0x7e, 0xa9, 0x2f,
+        0x5c, 0xcf, 0xb5, 0x5d, 0x5b, 0xd6, 0xb6, 0xca, 0xa1, 0x8a, 0x75, 0x8d,
+        0xf5, 0xbf, 0x8f, 0xf5, 0xba, 0x9c, 0x1e, 0xe5, 0x7a, 0xe2, 0x01, 0x5c,
+        0x35, 0xf1, 0x29, 0x78, 0xe2, 0xaa, 0xde, 0xcf, 0x55, 0x5b, 0x25, 0x57,
+        0x89, 0x70, 0x11, 0xcf, 0x47, 0xa8, 0x87, 0xbf, 0xaa, 0x70, 0x4d, 0x2a,
+        0x5c, 0x78, 0x5f, 0xa5, 0xcf, 0xb9, 0x15, 0xeb, 0x3b, 0xe8, 0xff, 0xa5,
+        0x14, 0xef, 0x94, 0x92, 0xaa, 0xe9, 0xdb, 0x95, 0xaf, 0x29, 0xc5, 0xdb,
+        0xf0, 0xbe, 0x13, 0x36, 0xbf, 0x0f, 0xb9, 0x45, 0x17, 0xeb, 0xdc, 0x2d,
+        0x73, 0x5b, 0xe9, 0x8f, 0x6d, 0xa1, 0x3f, 0x06, 0xb8, 0x5e, 0xec, 0x19,
+        0xc0, 0xe5, 0x01, 0x37, 0x3d, 0x07, 0x3e, 0x3b, 0xf4, 0x2b, 0x8c, 0x93,
+        0xd7, 0x29, 0x5a, 0xa6, 0x97, 0xfe, 0x1b, 0xe7, 0xea, 0xc3, 0xda, 0x68,
+        0x1c, 0xf0, 0xe1, 0x69, 0xe0, 0x99, 0xab, 0xaa, 0xbb, 0x0b, 0xc8, 0x60,
+        0x7b, 0x9c, 0x67, 0x2f, 0x55, 0x3f, 0x8b, 0x67, 0xd7, 0x35, 0xf0, 0x8b,
+        0xbc, 0x22, 0xbd, 0xa4, 0x95, 0xf7, 0x48, 0xb0, 0x37, 0x07, 0x7a, 0x1c,
+        0x37, 0x24, 0x3f, 0x6a, 0x21, 0x3f, 0xe7, 0x3d, 0x2c, 0xed, 0xd2, 0xe2,
+        0xdd, 0x67, 0x4c, 0xb7, 0x19, 0x6b, 0x4d, 0x75, 0xf6, 0xe3, 0x4b, 0xbc,
+        0x8b, 0x4d, 0xf1, 0xee, 0x6e, 0x98, 0xd7, 0x18, 0x8f, 0x2c, 0xd9, 0xf2,
+        0x78, 0x6d, 0x58, 0x1e, 0xad, 0xa5, 0xad, 0xfb, 0xe1, 0x03, 0x0a, 0xeb,
+        0x77, 0xb4, 0x43, 0x71, 0xfa, 0x2f, 0x13, 0x79, 0x60, 0x8b, 0x1d, 0xe4,
+        0x05, 0x25, 0xd6, 0x6c, 0x73, 0x69, 0xde, 0xe3, 0x58, 0x55, 0xd9, 0x9a,
+        0x3b, 0xfc, 0x5f, 0xe6, 0x0d, 0xdc, 0x9f, 0xfe, 0x1a, 0x79, 0x82, 0x87,
+        0x3c, 0xc1, 0x43, 0x9e, 0xe0, 0x21, 0x4f, 0xf0, 0x90, 0x27, 0x78, 0xc8,
+        0x13, 0x3c, 0xe4, 0x09, 0x1e, 0xf2, 0x04, 0xc4, 0xee, 0xa0, 0x5e, 0x18,
+        0x43, 0xfe, 0x0b, 0xff, 0xe5, 0xdd, 0x06, 0x3e, 0xf1, 0xfe, 0x92, 0x31,
+        0x87, 0xb1, 0x99, 0x73, 0xab, 0xdb, 0x5c, 0xca, 0x4d, 0xf9, 0xbe, 0x3b,
+        0x31, 0x37, 0x1e, 0xe6, 0x23, 0x84, 0x89, 0x62, 0x37, 0xe1, 0xe4, 0xa0,
+        0xeb, 0x68, 0xb0, 0x31, 0xe6, 0x2b, 0x41, 0xcc, 0x0a, 0x72, 0xe5, 0xb7,
+        0x91, 0xb3, 0xa4, 0x90, 0xb3, 0xf4, 0x23, 0x3f, 0xe1, 0x9d, 0x75, 0x74,
+        0xc7, 0x94, 0xd5, 0x8e, 0x7a, 0x63, 0xda, 0x3d, 0x1e, 0x73, 0x69, 0x3b,
+        0x55, 0xd0, 0xf5, 0xb9, 0x5e, 0xf1, 0x25, 0x37, 0xf2, 0x4d, 0xe4, 0xad,
+        0xcf, 0xa9, 0xfb, 0xb4, 0xf1, 0x21, 0xca, 0xbc, 0xf2, 0x09, 0xb9, 0x6b,
+        0xc4, 0xdf, 0xe0, 0x1e, 0x50, 0x5f, 0x20, 0xff, 0x44, 0x7a, 0xce, 0x81,
+        0xe1, 0xe7, 0x62, 0x12, 0x3f, 0xb3, 0x1d, 0x73, 0x96, 0xf4, 0xaa, 0xbb,
+        0x24, 0x88, 0xf2, 0xdc, 0x55, 0xc8, 0xcb, 0x16, 0xfd, 0x1c, 0x6f, 0x1c,
+        0x88, 0x97, 0xfe, 0x75, 0x65, 0x2a, 0x57, 0x5d, 0x51, 0x3a, 0x75, 0xb4,
+        0x96, 0x47, 0x7d, 0xd4, 0xd3, 0x2b, 0xed, 0x26, 0x6a, 0xab, 0x08, 0x37,
+        0x71, 0xfe, 0x32, 0xae, 0x6a, 0x9e, 0x73, 0xeb, 0xf2, 0x84, 0xac, 0xb9,
+        0xcf, 0xca, 0x54, 0xa9, 0x92, 0x4e, 0xb2, 0x56, 0xce, 0x5a, 0x2b, 0x53,
+        0x27, 0x81, 0x63, 0x11, 0xb9, 0x81, 0xa1, 0xf6, 0x5e, 0x99, 0x9a, 0xae,
+        0x04, 0xf7, 0x59, 0x01, 0x0d, 0x8c, 0x57, 0xed, 0x62, 0x2c, 0x04, 0xf7,
+        0x5a, 0xba, 0x5a, 0xcb, 0x75, 0x5c, 0x6f, 0x62, 0x1d, 0xe5, 0x36, 0x8c,
+        0xb5, 0x94, 0x1d, 0x69, 0x58, 0x99, 0x2a, 0x56, 0x1b, 0x69, 0x20, 0x1e,
+        0xe2, 0x8d, 0xce, 0xc3, 0xb3, 0xc4, 0x45, 0x3f, 0xe3, 0xfb, 0x85, 0x91,
+        0xfe, 0x30, 0xef, 0x3a, 0x89, 0xfc, 0xce, 0x0c, 0xf4, 0x5c, 0x8d, 0xbf,
+        0xa3, 0xe2, 0x54, 0x4a, 0xe7, 0x3c, 0x9f, 0x78, 0x37, 0xba, 0x80, 0x39,
+        0x8c, 0x17, 0x23, 0x58, 0x3d, 0x84, 0xed, 0x6c, 0xe0, 0x67, 0x4b, 0xb8,
+        0x1f, 0x69, 0xe2, 0x39, 0x2f, 0x61, 0x2f, 0xd2, 0x45, 0x98, 0x38, 0x68,
+        0x83, 0x2c, 0xbd, 0xff, 0x2d, 0xef, 0x1b, 0xcf, 0x44, 0x9e, 0x9a, 0x58,
+        0x43, 0x78, 0xe2, 0x88, 0xd6, 0xe0, 0xc5, 0xb9, 0x60, 0x9d, 0xbe, 0x7e,
+        0xff, 0xf7, 0x69, 0xfb, 0x36, 0xd2, 0x1a, 0xed, 0x1f, 0xe1, 0x19, 0x0e,
+        0xe4, 0xb6, 0xbe, 0x5e, 0xfd, 0x9f, 0x61, 0x78, 0x42, 0x17, 0x3f, 0x76,
+        0x8f, 0x3a, 0xdc, 0x50, 0x87, 0x46, 0xf7, 0x17, 0xbc, 0x0f, 0x60, 0x7d,
+        0xcf, 0x6f, 0x07, 0x8d, 0xb5, 0xe2, 0xcb, 0x61, 0x2c, 0xdb, 0x29, 0x59,
+        0x93, 0x75, 0xc3, 0xf9, 0x70, 0xbc, 0x03, 0xb1, 0x8d, 0xe3, 0x3a, 0xf8,
+        0x0b, 0x5d, 0x76, 0xda, 0xc3, 0xba, 0x25, 0x1e, 0x7c, 0xe3, 0x19, 0xa6,
+        0x1d, 0xb1, 0xee, 0x6b, 0x0b, 0xe7, 0x22, 0x3b, 0xa2, 0x1f, 0x36, 0xc3,
+        0x39, 0xfa, 0x5b, 0x1d, 0xb5, 0x0b, 0xfb, 0xc0, 0xb3, 0xd8, 0x68, 0x4b,
+        0xd1, 0x33, 0x2e, 0x67, 0xe7, 0x23, 0xbf, 0x05, 0x9f, 0x32, 0x64, 0x86,
+        0xbe, 0xbf, 0x03, 0xbe, 0xaf, 0x4b, 0x0e, 0xc1, 0x67, 0x1d, 0x86, 0xcf,
+        0x3a, 0x82, 0x7a, 0x71, 0x6c, 0xa9, 0xf1, 0x9e, 0x97, 0x35, 0x6a, 0x97,
+        0x76, 0x5c, 0xc9, 0xbf, 0xe8, 0x1b, 0xf6, 0x47, 0xd0, 0x01, 0xd6, 0x5d,
+        0x91, 0x4e, 0xc0, 0xdf, 0x3a, 0x71, 0xe8, 0xc4, 0xd6, 0xfb, 0xe4, 0x61,
+        0xd8, 0x46, 0x7b, 0x56, 0xc5, 0x86, 0xa5, 0x80, 0xf7, 0xa5, 0x6a, 0xc0,
+        0x7b, 0xf8, 0x65, 0xe0, 0x37, 0xa5, 0x58, 0xb3, 0xa4, 0x88, 0x7d, 0x8b,
+        0xd8, 0xb7, 0x88, 0x3a, 0x6f, 0xba, 0xd6, 0xf8, 0x1d, 0xab, 0x33, 0xa4,
+        0x9d, 0x6b, 0xa3, 0xbe, 0xd5, 0x70, 0xfe, 0xe8, 0x79, 0x0a, 0xfc, 0x7f,
+        0x0c, 0xfc, 0x3f, 0x81, 0xfa, 0xe6, 0x8f, 0x50, 0xdf, 0x7c, 0x0d, 0xf5,
+        0xcd, 0x71, 0xd4, 0x37, 0x13, 0xa8, 0x6f, 0xbe, 0x0a, 0xff, 0xf1, 0x15,
+        0xf8, 0x8f, 0x63, 0xf0, 0x1f, 0xe3, 0xea, 0xee, 0xe9, 0xa8, 0xb7, 0xf5,
+        0x4e, 0x25, 0xda, 0x8b, 0xed, 0x67, 0x22, 0x76, 0x11, 0x67, 0x1a, 0x93,
+        0x6a, 0x9d, 0xf5, 0x8d, 0x23, 0xee, 0x41, 0xd6, 0x37, 0xc7, 0xb4, 0x09,
+        0xe4, 0xef, 0xf7, 0xef, 0x67, 0xdd, 0x13, 0xd7, 0x72, 0xaa, 0xee, 0x49,
+        0x9f, 0x77, 0x91, 0x22, 0x21, 0xf7, 0xc3, 0x99, 0xd3, 0x67, 0x73, 0xa0,
+        0x25, 0xc8, 0xf9, 0x7a, 0x42, 0xbf, 0xd7, 0x21, 0x8b, 0xb3, 0xa8, 0x19,
+        0xbc, 0x1f, 0x6b, 0x05, 0xe5, 0x1b, 0x2d, 0x8c, 0x51, 0x2b, 0x7b, 0xff,
+        0x1c, 0x8e, 0x47, 0x64, 0x72, 0x1e, 0xb5, 0xed, 0xf3, 0xff, 0xa8, 0xe5,
+        0xd4, 0xd8, 0xc1, 0x18, 0xf9, 0xee, 0xf3, 0x7f, 0x1f, 0x8e, 0x8b, 0xa1,
+        0x3e, 0x84, 0xb4, 0x5a, 0x0e, 0x9e, 0xdd, 0x61, 0xce, 0xf1, 0x6a, 0xef,
+        0xe6, 0xff, 0xd3, 0x8e, 0xad, 0x45, 0x13, 0xfb, 0x1b, 0x3b, 0x82, 0xfa,
+        0xac, 0x71, 0xbe, 0xab, 0x61, 0xfe, 0x8a, 0xfa, 0xce, 0x5a, 0x28, 0xb7,
+        0xfd, 0x0a, 0x1e, 0x58, 0x96, 0x86, 0x98, 0xe7, 0x7d, 0xe4, 0xf3, 0xfb,
+        0x9f, 0xab, 0xb7, 0xab, 0x6f, 0x72, 0xae, 0xca, 0xb7, 0x61, 0xe7, 0x23,
+        0xa5, 0x1d, 0x81, 0x2f, 0x60, 0x3f, 0xa1, 0x05, 0xfe, 0xfd, 0x8f, 0x81,
+        0x07, 0xbc, 0xf6, 0x1a, 0x6b, 0x38, 0x2b, 0xbc, 0x4b, 0xb9, 0x32, 0xc5,
+        0xdc, 0xba, 0xa4, 0x70, 0xb3, 0xd6, 0x63, 0xdd, 0x17, 0xc5, 0x80, 0x08,
+        0xd7, 0xcf, 0x13, 0x01, 0xdd, 0xe3, 0xa8, 0xe9, 0x08, 0x13, 0x8d, 0x1b,
+        0xeb, 0xbf, 0x8e, 0xf0, 0x1e, 0xee, 0x4a, 0x90, 0x57, 0x29, 0x7c, 0x66,
+        0x88, 0xef, 0x3f, 0xfd, 0xc0, 0xf7, 0x70, 0xbd, 0xd5, 0xb0, 0xfe, 0x3c,
+        0x72, 0x3d, 0xde, 0x99, 0xec, 0x52, 0xdf, 0x19, 0xdf, 0x9f, 0xed, 0x94,
+        0x5f, 0x3c, 0xe3, 0xfb, 0xe3, 0x4e, 0x7a, 0xf8, 0x4d, 0xd4, 0x1e, 0x67,
+        0x68, 0x27, 0x23, 0xa4, 0x73, 0x30, 0x35, 0x2d, 0x03, 0xbd, 0x41, 0x2e,
+        0xfe, 0x75, 0xed, 0xe3, 0x74, 0xeb, 0xe1, 0x3e, 0x3f, 0x6c, 0xd8, 0x27,
+        0xd5, 0xb0, 0xcf, 0x0a, 0x6d, 0xb6, 0x7a, 0x2f, 0xce, 0x5c, 0xdc, 0x75,
+        0xa3, 0x95, 0x08, 0xeb, 0xb2, 0x47, 0x47, 0xda, 0xa4, 0xd2, 0x97, 0x5e,
+        0xf9, 0x11, 0xf2, 0xf5, 0xc2, 0x08, 0xe6, 0x12, 0x83, 0x78, 0xc7, 0xf9,
+        0x74, 0x15, 0xb9, 0xe8, 0x4a, 0x55, 0x86, 0xb0, 0x3e, 0x5d, 0x14, 0xe1,
+        0x3c, 0xfb, 0x8a, 0xb6, 0x6a, 0xe8, 0x03, 0x92, 0x6b, 0x38, 0xf3, 0x04,
+        0xea, 0xaf, 0x13, 0xeb, 0xf5, 0x30, 0xf7, 0xb9, 0x59, 0x5b, 0x53, 0xb9,
+        0xf1, 0x01, 0xad, 0x98, 0x08, 0xce, 0xf8, 0x87, 0xf0, 0x17, 0x86, 0xce,
+        0xb5, 0xef, 0x03, 0xb7, 0x26, 0x0b, 0xcf, 0x18, 0xea, 0x0e, 0xb6, 0x30,
+        0x42, 0x59, 0xf3, 0x79, 0x2d, 0xde, 0x45, 0x67, 0xfa, 0xf3, 0xf0, 0x4c,
+        0xd9, 0xb0, 0x9e, 0x8e, 0xce, 0x14, 0x93, 0x77, 0x67, 0x2d, 0xac, 0xfd,
+        0x1c, 0xf8, 0x91, 0x97, 0xa5, 0x7a, 0xea, 0x33, 0xf0, 0x94, 0x1b, 0x78,
+        0x63, 0x6e, 0x91, 0x61, 0x71, 0xa3, 0x86, 0x1f, 0x4f, 0xc2, 0x0e, 0xbf,
+        0xd1, 0x1b, 0xdd, 0x0d, 0x1b, 0xb6, 0xcf, 0xba, 0x07, 0x8d, 0xf3, 0xfd,
+        0xb0, 0xc5, 0x14, 0xec, 0x93, 0x39, 0x53, 0x9e, 0xb5, 0x0a, 0xed, 0xc9,
+        0x72, 0x8d, 0xb4, 0x75, 0x4c, 0x86, 0x51, 0xef, 0xf0, 0xfc, 0x19, 0x59,
+        0xac, 0x47, 0x34, 0x8c, 0xc2, 0x1e, 0x0f, 0xe2, 0xb7, 0x1f, 0xef, 0x1c,
+        0xfc, 0x58, 0x2b, 0xad, 0xc8, 0xe3, 0x2a, 0x17, 0x47, 0xae, 0x3d, 0x44,
+        0xfa, 0xee, 0x04, 0x3c, 0xf5, 0x99, 0x7a, 0x7a, 0xa7, 0xb8, 0x7d, 0xf4,
+        0x15, 0x49, 0xe0, 0xc6, 0x1a, 0xef, 0x22, 0x6c, 0xbd, 0x1f, 0xcf, 0xb4,
+        0x55, 0x20, 0x6f, 0x15, 0x7e, 0xdf, 0x37, 0x46, 0xf9, 0x8d, 0xe2, 0x7c,
+        0x38, 0x1e, 0xb4, 0xbe, 0x4c, 0xdd, 0x4b, 0xee, 0x96, 0x95, 0xf9, 0x28,
+        0x0e, 0x9e, 0x86, 0x0d, 0xf2, 0xce, 0x76, 0x0c, 0x7c, 0xe1, 0x58, 0x0b,
+        0xe3, 0x21, 0xe6, 0x17, 0x97, 0x71, 0xee, 0x8c, 0x9c, 0x41, 0xfd, 0x2f,
+        0x7d, 0x7c, 0xa6, 0x80, 0x7f, 0x7b, 0xa8, 0xef, 0x9b, 0xd7, 0x1b, 0x36,
+        0xfb, 0x63, 0xa0, 0xcf, 0x6c, 0x58, 0xcf, 0x35, 0x41, 0x7d, 0xb2, 0x26,
+        0x88, 0xc7, 0x49, 0xff, 0x76, 0x3d, 0xf3, 0xa2, 0x3c, 0xa0, 0xce, 0x54,
+        0x93, 0xe3, 0xf3, 0xbe, 0xef, 0x8e, 0x0e, 0x0e, 0x2f, 0x4a, 0x7a, 0xf8,
+        0xa4, 0xec, 0xb3, 0x0e, 0xb1, 0x1e, 0xb3, 0x88, 0xc7, 0xbf, 0xbd, 0x25,
+        0xe3, 0xfb, 0xa7, 0x41, 0xfb, 0xf7, 0xd5, 0x3e, 0x2f, 0x82, 0x7e, 0xf0,
+        0x4a, 0xd5, 0x24, 0xa4, 0x15, 0xcf, 0x04, 0xe9, 0x2d, 0xcb, 0xf1, 0xfa,
+        0x85, 0x50, 0x36, 0x8f, 0x89, 0xeb, 0x5d, 0x36, 0x5c, 0xbb, 0x0c, 0xd8,
+        0x85, 0x90, 0xb6, 0x0c, 0xe8, 0xc5, 0xfe, 0xf5, 0xb7, 0x13, 0xf4, 0x0d,
+        0x94, 0xb9, 0x8b, 0xac, 0xd1, 0x1d, 0x41, 0x1e, 0x95, 0xf8, 0x24, 0x3f,
+        0x10, 0x97, 0xcd, 0x7e, 0x80, 0xeb, 0xe2, 0xd7, 0xd0, 0x15, 0xd2, 0x51,
+        0x54, 0xfe, 0x53, 0xc5, 0x2d, 0x85, 0xcf, 0xd8, 0xe2, 0x0b, 0x2a, 0xea,
+        0xb9, 0x6a, 0xd0, 0x37, 0x31, 0xfe, 0x51, 0x87, 0xbb, 0xe0, 0xff, 0xa0,
+        0x83, 0xb0, 0xe3, 0xdc, 0x3c, 0xef, 0x27, 0x86, 0x78, 0xaf, 0x74, 0x36,
+        0x0f, 0xd9, 0x2e, 0xf0, 0xfb, 0x63, 0x22, 0xa8, 0x31, 0x83, 0xfa, 0x2b,
+        0x45, 0x5f, 0x88, 0xb6, 0xa4, 0xfc, 0x64, 0x5e, 0x7d, 0x6f, 0x8c, 0x03,
+        0xc6, 0xa7, 0xef, 0x6c, 0xf8, 0x9b, 0x89, 0x1f, 0x64, 0x83, 0xbf, 0x99,
+        0x08, 0xbf, 0xfd, 0x56, 0x83, 0x3c, 0xe2, 0xe1, 0x9a, 0x29, 0x13, 0xb5,
+        0xe8, 0x6f, 0x28, 0x28, 0x07, 0xf8, 0xe6, 0x5a, 0x94, 0x3b, 0xf8, 0x41,
+        0x4d, 0xb3, 0x49, 0x96, 0x4b, 0x61, 0x4e, 0xc4, 0x1a, 0x80, 0x3c, 0xc4,
+        0x78, 0x31, 0xaa, 0x2f, 0x07, 0x20, 0x3f, 0xf0, 0x1c, 0x74, 0xbd, 0x3b,
+        0x1b, 0xd4, 0xb9, 0x25, 0xfa, 0xc5, 0xfe, 0xa8, 0xee, 0xdd, 0x25, 0xa5,
+        0x63, 0x7c, 0x1f, 0x93, 0x77, 0x66, 0x63, 0xea, 0x7d, 0x41, 0x62, 0xe1,
+        0x7b, 0x8e, 0xe3, 0x52, 0x50, 0xef, 0xab, 0x21, 0x3e, 0xd4, 0x69, 0x5f,
+        0x89, 0xc6, 0xa6, 0x76, 0xbc, 0x1e, 0xac, 0x9b, 0xac, 0x57, 0xe5, 0xf1,
+        0xfa, 0x2a, 0xce, 0xaf, 0x49, 0x6e, 0xbc, 0x28, 0xbb, 0x6d, 0x4b, 0xc5,
+        0x7d, 0x37, 0x4e, 0x1d, 0xa3, 0x7e, 0x8d, 0xa9, 0xba, 0xb3, 0x88, 0x7c,
+        0xa1, 0x30, 0xc2, 0x6f, 0x3c, 0xbf, 0xba, 0xab, 0x50, 0x4e, 0x5b, 0x59,
+        0xf9, 0xd0, 0x77, 0x4d, 0x8e, 0x45, 0x47, 0x3d, 0x74, 0xd7, 0xc3, 0xb5,
+        0x0b, 0x77, 0x05, 0x67, 0xc5, 0xfb, 0x1a, 0x61, 0x0d, 0xf5, 0x6d, 0xf6,
+        0x5f, 0x6f, 0x35, 0x65, 0xed, 0x56, 0xdf, 0xbf, 0xdf, 0xb1, 0xc4, 0x0d,
+        0x6b, 0x57, 0x4b, 0xd5, 0xae, 0xed, 0x2a, 0x07, 0x71, 0x47, 0x52, 0x5a,
+        0x1e, 0xf6, 0x7a, 0xc6, 0x43, 0x9d, 0xa3, 0xa7, 0x0f, 0xae, 0xea, 0x16,
+        0x62, 0x6e, 0x3a, 0x35, 0x27, 0x6e, 0x2f, 0xbf, 0x37, 0xcf, 0x38, 0x84,
+        0xd9, 0x19, 0xdc, 0x75, 0xdd, 0x34, 0xae, 0xfc, 0xac, 0x48, 0x18, 0x7b,
+        0x6e, 0x6a, 0xb4, 0x89, 0xc6, 0xdc, 0x92, 0xb6, 0x20, 0x13, 0x26, 0x68,
+        0x29, 0x95, 0xa3, 0x3c, 0x8d, 0x7f, 0x1b, 0xb0, 0x7a, 0xd7, 0xd3, 0xa0,
+        0x73, 0x1a, 0x74, 0xf2, 0x1c, 0xd3, 0xb5, 0x48, 0xe7, 0xa2, 0x5a, 0x81,
+        0x7d, 0xc4, 0x7c, 0x0f, 0x31, 0xdf, 0x43, 0xcc, 0xf7, 0x10, 0xf3, 0x3d,
+        0xc4, 0x7c, 0x0f, 0x31, 0xdf, 0x43, 0xcc, 0xf7, 0x10, 0xf3, 0xbd, 0xf1,
+        0x30, 0x4f, 0x7b, 0x62, 0x3d, 0x4f, 0x5b, 0xa9, 0xf3, 0x3b, 0x94, 0xa2,
+        0xa5, 0x58, 0x94, 0x20, 0xcf, 0x15, 0x9d, 0x39, 0x4d, 0x94, 0xe7, 0x5e,
+        0xfb, 0x9b, 0x48, 0xb0, 0x8e, 0x39, 0x1e, 0xd7, 0x15, 0x35, 0xdd, 0xe6,
+        0xba, 0x20, 0xcf, 0x63, 0x6d, 0xb5, 0x79, 0x0d, 0xf2, 0xb5, 0x0c, 0xfd,
+        0x19, 0xed, 0x22, 0x11, 0xd4, 0x8b, 0x99, 0xf3, 0xf7, 0xba, 0x88, 0xbf,
+        0x85, 0x9a, 0x8a, 0xc1, 0xbc, 0x17, 0xbc, 0x97, 0x7f, 0xb7, 0x00, 0x39,
+        0xf0, 0xdd, 0x7d, 0xac, 0x27, 0x0a, 0xb5, 0xa4, 0x14, 0x17, 0xa3, 0xfc,
+        0x07, 0xeb, 0xbc, 0x7d, 0x5a, 0xbe, 0x42, 0xd9, 0xea, 0x32, 0x9d, 0x00,
+        0x53, 0xec, 0xc6, 0xbc, 0xee, 0x4d, 0x55, 0x23, 0xad, 0xd4, 0x49, 0xcf,
+        0x7e, 0xd0, 0x16, 0xdd, 0xe3, 0x8a, 0x18, 0xb3, 0x09, 0xd1, 0x67, 0x91,
+        0xd3, 0xda, 0x43, 0xea, 0x6f, 0x1d, 0x7a, 0xb0, 0x8f, 0x3e, 0x3b, 0x10,
+        0xfd, 0x2d, 0x06, 0xeb, 0xae, 0xec, 0xc6, 0xfd, 0x2b, 0xcf, 0x91, 0x80,
+        0xbd, 0x7e, 0x69, 0x27, 0xce, 0x06, 0xb9, 0x5e, 0xde, 0xa1, 0xf2, 0x6e,
+        0xf8, 0xce, 0xd3, 0x43, 0xe9, 0x3e, 0xe9, 0xda, 0x25, 0x67, 0x86, 0x58,
+        0xa3, 0xb5, 0x01, 0x1f, 0x61, 0x79, 0xe7, 0xb4, 0x4b, 0x96, 0xe7, 0xe1,
+        0x5b, 0xe7, 0xd3, 0x0e, 0xff, 0xbe, 0x60, 0x01, 0x21, 0x6d, 0xa1, 0x3e,
+        0xd6, 0xc7, 0x98, 0xbc, 0x58, 0xa7, 0xae, 0xf4, 0x60, 0x7d, 0x3f, 0x74,
+        0x71, 0x1b, 0x6c, 0x48, 0xc7, 0xfe, 0x11, 0xee, 0xf7, 0x14, 0xee, 0x1e,
+        0xfb, 0xb7, 0x77, 0x2a, 0xdd, 0xd0, 0xd3, 0x56, 0x4a, 0x07, 0xed, 0x1f,
+        0xab, 0x2d, 0x1d, 0xe1, 0xf7, 0xc2, 0x69, 0xaf, 0xf1, 0xbb, 0xe1, 0x3e,
+        0xad, 0x50, 0xe1, 0xdf, 0x38, 0x0c, 0xc9, 0x21, 0x8b, 0x7f, 0xff, 0xb3,
+        0x4f, 0x7b, 0xa0, 0x4a, 0x18, 0x1b, 0x7d, 0xd6, 0xe1, 0xcb, 0xb0, 0xe5,
+        0xff, 0x29, 0xdc, 0xea, 0x62, 0xdb, 0x3a, 0xcb, 0xf0, 0xfb, 0x1d, 0xe7,
+        0xc7, 0x4d, 0xdd, 0xe4, 0x34, 0x71, 0x12, 0x27, 0xca, 0xc0, 0xc7, 0x39,
+        0x49, 0x3d, 0x39, 0xd5, 0x4e, 0xa2, 0x14, 0x22, 0x88, 0x84, 0xe5, 0xfc,
+        0xcc, 0x63, 0x14, 0x3c, 0xc8, 0xa6, 0x4e, 0x42, 0x55, 0x94, 0x74, 0x5b,
+        0x27, 0xee, 0xb8, 0x40, 0x5c, 0x80, 0x6a, 0x39, 0x69, 0xe9, 0x86, 0x3d,
+        0xa7, 0x5b, 0xba, 0x00, 0x57, 0x9e, 0xe3, 0xa4, 0x4d, 0xe7, 0xcc, 0x1a,
+        0x03, 0x69, 0x70, 0x41, 0x23, 0x33, 0x6d, 0xe3, 0x66, 0x37, 0x48, 0x5c,
+        0x57, 0x29, 0x83, 0x02, 0x6b, 0x2b, 0xb8, 0xe1, 0xef, 0xe2, 0xf0, 0x3c,
+        0xdf, 0x39, 0x76, 0xd3, 0xc0, 0x44, 0x24, 0xeb, 0x7c, 0xe7, 0x3b, 0xdf,
+        0xff, 0xf7, 0xbe, 0xcf, 0xfb, 0x9b, 0x6e, 0xb9, 0x08, 0x3a, 0xce, 0x8d,
+        0xb5, 0xfa, 0xfe, 0xd6, 0x0e, 0x9f, 0x87, 0x07, 0xfb, 0x7c, 0x19, 0xa5,
+        0x75, 0xc9, 0x9c, 0xd6, 0xa7, 0xbb, 0x0e, 0x7d, 0x7b, 0x16, 0x6b, 0x8a,
+        0xe0, 0x1c, 0x1e, 0xe9, 0xd3, 0x78, 0x64, 0xf0, 0xbd, 0xff, 0xd0, 0x7b,
+        0xdf, 0xa1, 0xf7, 0xde, 0xff, 0xd1, 0x9e, 0xe5, 0xc3, 0xf4, 0xc0, 0x75,
+        0x5a, 0x53, 0x1a, 0xfd, 0xf2, 0x93, 0x6a, 0x39, 0x6f, 0x25, 0xa9, 0x0b,
+        0xcc, 0x88, 0xab, 0x66, 0x9c, 0x36, 0x60, 0x5c, 0x9b, 0xac, 0xae, 0x83,
+        0xe6, 0xb1, 0x8f, 0x76, 0x9b, 0xf1, 0xf2, 0x89, 0x3e, 0xf2, 0x4c, 0x10,
+        0xd7, 0x60, 0xd8, 0xc3, 0x11, 0xb4, 0x73, 0x5f, 0x74, 0x12, 0xe6, 0x39,
+        0xed, 0xbf, 0xa1, 0x0e, 0xe3, 0xaa, 0x9c, 0xce, 0xfd, 0x60, 0x9b, 0x16,
+        0xb9, 0x6d, 0xa7, 0xba, 0xfd, 0xdc, 0x20, 0xd8, 0xbb, 0xa9, 0x3e, 0xea,
+        0x17, 0x2f, 0x38, 0xcd, 0x3a, 0x73, 0x5f, 0x98, 0x77, 0x05, 0xa2, 0x79,
+        0x4a, 0xa4, 0x54, 0x11, 0xb9, 0x86, 0xdf, 0x6f, 0x2a, 0x7e, 0xfc, 0x42,
+        0xd1, 0xd6, 0x9e, 0x96, 0x1b, 0xc5, 0x2f, 0x48, 0x15, 0x32, 0x67, 0xc7,
+        0x71, 0xdd, 0x3b, 0x4e, 0x54, 0x9f, 0xf9, 0x0f, 0xf2, 0x4a, 0x62, 0xe3,
+        0x94, 0x69, 0x6d, 0xf2, 0xc3, 0x75, 0xe6, 0xd5, 0x59, 0xe6, 0x1d, 0x61,
+        0x7e, 0x5b, 0x44, 0xd2, 0xe1, 0x80, 0xd6, 0x4b, 0xe5, 0x69, 0x68, 0x12,
+        0xf8, 0xf6, 0x87, 0xf5, 0xb3, 0x7d, 0xf4, 0xb9, 0x7c, 0xbc, 0xce, 0x77,
+        0x03, 0x4f, 0x43, 0xea, 0x76, 0x00, 0xfa, 0x2b, 0x80, 0xc7, 0xe4, 0xb9,
+        0x73, 0xbf, 0xcf, 0x73, 0x6d, 0xa8, 0xa3, 0x0d, 0xdb, 0x26, 0xb9, 0x11,
+        0xe0, 0xa0, 0x1a, 0xd6, 0xf9, 0x47, 0xf5, 0xb0, 0xc6, 0xe5, 0x40, 0x99,
+        0x7e, 0x7b, 0xf3, 0xa8, 0xc6, 0xe8, 0xd4, 0xee, 0xf7, 0xf4, 0x5e, 0x50,
+        0xce, 0x96, 0x1d, 0xd2, 0xaa, 0x29, 0x3b, 0xe0, 0xb5, 0xeb, 0xb5, 0x37,
+        0xfa, 0x79, 0x57, 0x37, 0x6a, 0xdf, 0xef, 0xf3, 0x6c, 0x34, 0xd6, 0x5d,
+        0xe8, 0xf3, 0xea, 0xa2, 0xbe, 0xcd, 0x45, 0xdb, 0xac, 0x84, 0xbd, 0x7d,
+        0x5b, 0x6a, 0x1b, 0xdf, 0x95, 0x77, 0x8b, 0xdf, 0x91, 0x5f, 0x6c, 0x9c,
+        0x81, 0xce, 0x61, 0x95, 0xb2, 0x90, 0x27, 0x6f, 0xd7, 0x5c, 0xf7, 0x6d,
+        0x67, 0x01, 0xf6, 0x81, 0xeb, 0xfe, 0xd6, 0xd9, 0x93, 0xd8, 0xc4, 0x37,
+        0xb1, 0xe7, 0x0c, 0x78, 0x88, 0x58, 0x98, 0x06, 0xbd, 0x7d, 0xb1, 0x5f,
+        0x3a, 0x42, 0x9a, 0x4e, 0x86, 0x27, 0x5a, 0xb1, 0x07, 0xc3, 0xd7, 0xc3,
+        0xb9, 0x97, 0xe9, 0x7e, 0xd2, 0x8c, 0x51, 0xfb, 0x09, 0xe6, 0x6f, 0x05,
+        0x5f, 0x1c, 0xc5, 0x4f, 0xc9, 0x9d, 0x71, 0xac, 0x75, 0x9c, 0xb4, 0xd7,
+        0x2a, 0xb1, 0xc7, 0xb0, 0x8f, 0x4c, 0x8b, 0xdc, 0xcb, 0x6f, 0xf6, 0xd1,
+        0x9f, 0x77, 0x2f, 0xcf, 0xb2, 0xf1, 0xb9, 0x4e, 0x71, 0xa5, 0x05, 0xf2,
+        0x7b, 0x75, 0xd2, 0xd3, 0x95, 0x7e, 0xad, 0x4e, 0xa0, 0xbd, 0x9d, 0x7d,
+        0x4f, 0x51, 0xb7, 0xcb, 0xba, 0xad, 0xd0, 0xc5, 0xe7, 0xa0, 0x03, 0xa5,
+        0x6a, 0x17, 0xa4, 0x3e, 0x1e, 0x42, 0x1b, 0xea, 0x28, 0x1a, 0x4b, 0x64,
+        0x26, 0xcf, 0x7c, 0x2d, 0xe6, 0x4e, 0x61, 0x8d, 0x0b, 0xc4, 0x0d, 0xae,
+        0xb1, 0x8d, 0x31, 0x38, 0xbf, 0xce, 0x06, 0x8d, 0xb0, 0x8e, 0xf4, 0x9d,
+        0x04, 0x4f, 0x26, 0x29, 0x37, 0x31, 0xde, 0x18, 0xc6, 0x63, 0xb9, 0x13,
+        0xe3, 0x5d, 0x90, 0x94, 0xd3, 0x18, 0x73, 0x0a, 0x6d, 0x88, 0x33, 0x53,
+        0xd0, 0x1f, 0x86, 0xd4, 0xec, 0x7a, 0x18, 0xf2, 0xbb, 0x4f, 0x66, 0xcd,
+        0x23, 0x07, 0xf6, 0x98, 0xd5, 0xf6, 0x81, 0x61, 0x8c, 0xf9, 0x6b, 0xea,
+        0x3c, 0xb0, 0x26, 0xf6, 0xc7, 0x0f, 0xb6, 0x71, 0x6a, 0x7d, 0x0d, 0x38,
+        0xb5, 0xf6, 0x61, 0xca, 0x39, 0x2b, 0x33, 0x61, 0xae, 0x89, 0xf5, 0x61,
+        0xac, 0x99, 0x7e, 0xac, 0x67, 0x81, 0x43, 0x47, 0xfc, 0x3a, 0xb6, 0x15,
+        0x23, 0x85, 0xb3, 0xf7, 0xec, 0x5a, 0xd6, 0x7d, 0x56, 0x52, 0x6b, 0x19,
+        0x99, 0xd7, 0xfd, 0x78, 0x86, 0x83, 0x5a, 0xf7, 0x20, 0xaf, 0xc6, 0x7a,
+        0x70, 0x96, 0x89, 0x07, 0x36, 0x70, 0xb4, 0x47, 0xcb, 0xcc, 0x7e, 0x8f,
+        0x67, 0xf1, 0xad, 0x87, 0x77, 0xd4, 0x26, 0xb1, 0x6f, 0x40, 0x46, 0xe6,
+        0x1b, 0xf5, 0x21, 0xf9, 0x24, 0xdf, 0xd1, 0xcf, 0x38, 0xcb, 0xdd, 0xbc,
+        0x29, 0x1f, 0xe7, 0x75, 0x2c, 0x74, 0x31, 0x20, 0xd6, 0x79, 0xcf, 0x3e,
+        0x1f, 0x59, 0x5c, 0x55, 0xfc, 0x3e, 0x72, 0x7e, 0x4b, 0x05, 0xd1, 0x36,
+        0x84, 0x76, 0x5c, 0x87, 0x29, 0x73, 0xf9, 0xbf, 0xb9, 0x4b, 0xa3, 0xae,
+        0x3b, 0xaf, 0xf3, 0xc3, 0x12, 0xe6, 0xaa, 0x6a, 0xe8, 0xe4, 0x71, 0xc9,
+        0x87, 0xdb, 0x31, 0x57, 0xc2, 0xdc, 0x52, 0x23, 0x58, 0x0f, 0xcb, 0x3d,
+        0xe4, 0x89, 0xc8, 0x9e, 0x70, 0x7c, 0x2b, 0xbd, 0xa9, 0x12, 0xd1, 0x61,
+        0x65, 0x25, 0x73, 0xf8, 0xb5, 0x28, 0x1d, 0x47, 0x8c, 0x44, 0x15, 0x78,
+        0x17, 0x7b, 0xb2, 0x4f, 0xba, 0x6e, 0xda, 0x66, 0x7d, 0xc2, 0x0c, 0x29,
+        0xfa, 0x5b, 0x3a, 0x74, 0xbc, 0xf1, 0x72, 0x6f, 0xc2, 0x3c, 0xa9, 0x8e,
+        0xfb, 0xef, 0x53, 0xc0, 0xcc, 0xe6, 0x78, 0x67, 0x36, 0x95, 0x29, 0x2f,
+        0xe5, 0x13, 0xd1, 0x65, 0x65, 0x65, 0x30, 0x66, 0x66, 0x56, 0x11, 0x37,
+        0x12, 0x66, 0x87, 0xa2, 0x4f, 0xb4, 0x5d, 0xef, 0x3b, 0x8d, 0xfe, 0x09,
+        0xd5, 0xe2, 0xaf, 0x87, 0xf7, 0xf5, 0xe3, 0x7e, 0x8f, 0x67, 0x88, 0x39,
+        0xa3, 0xc0, 0x4c, 0xe6, 0x9a, 0xe9, 0xdc, 0x86, 0x64, 0x6c, 0x62, 0x54,
+        0x63, 0xe8, 0xfd, 0x53, 0x7f, 0x47, 0x1d, 0xca, 0x25, 0xd6, 0xc5, 0x7d,
+        0x7e, 0x1b, 0xd5, 0x3a, 0xf3, 0xfd, 0x53, 0x59, 0x9d, 0xc7, 0x58, 0x57,
+        0x31, 0x7f, 0xdf, 0xcd, 0x3b, 0x8b, 0xa6, 0x9c, 0x47, 0x38, 0xce, 0x5a,
+        0x60, 0xba, 0x5d, 0x98, 0x23, 0x3a, 0x57, 0x6c, 0xd0, 0x06, 0xfd, 0x01,
+        0xcc, 0x17, 0x68, 0xc4, 0xbd, 0x2f, 0x88, 0x31, 0x11, 0x3c, 0x40, 0x27,
+        0xd0, 0x35, 0xa1, 0xa3, 0x56, 0x30, 0x4e, 0x6e, 0x5d, 0xb2, 0x5e, 0x7f,
+        0x09, 0x32, 0x27, 0x35, 0x57, 0xf9, 0xb4, 0x31, 0x38, 0x37, 0xe6, 0xc0,
+        0xfb, 0xfd, 0x53, 0xa4, 0x4f, 0x9e, 0x4d, 0x54, 0xcd, 0x6d, 0x70, 0x3d,
+        0x83, 0x32, 0xbf, 0x3e, 0x24, 0xcb, 0xf8, 0xad, 0xae, 0x7b, 0xf7, 0xb6,
+        0x0d, 0xdd, 0x7a, 0x3e, 0x6f, 0x6a, 0x7e, 0x5d, 0x76, 0x18, 0x33, 0x01,
+        0xaf, 0xe8, 0x9c, 0x2a, 0xf6, 0x65, 0x5e, 0xe1, 0x10, 0xe5, 0xa3, 0x53,
+        0x87, 0x5c, 0xdd, 0xae, 0x51, 0x4f, 0x65, 0xbd, 0x35, 0x15, 0x0d, 0x74,
+        0xc9, 0x2a, 0xf0, 0xae, 0x0c, 0xd9, 0x99, 0x7b, 0x25, 0x24, 0xcb, 0x79,
+        0x1d, 0x4f, 0x8e, 0xfe, 0x5e, 0x39, 0x52, 0xad, 0x4d, 0xca, 0x6e, 0x2d,
+        0xae, 0xbf, 0x51, 0xae, 0xe5, 0x5e, 0x37, 0xe4, 0xf9, 0x51, 0x9d, 0x57,
+        0x17, 0x2f, 0x4b, 0xef, 0x00, 0x75, 0x9e, 0x2d, 0x9d, 0x63, 0x07, 0xec,
+        0x80, 0xce, 0xf1, 0x33, 0xe8, 0x1c, 0xef, 0x40, 0xe7, 0xf8, 0x69, 0x11,
+        0xf8, 0x52, 0x4c, 0xfb, 0xf8, 0xbf, 0x08, 0x1c, 0xa2, 0xac, 0xb6, 0xce,
+        0xe0, 0x4e, 0x17, 0xb3, 0xa0, 0xc1, 0x5b, 0x92, 0x06, 0xde, 0xa6, 0xe4,
+        0xfa, 0xc6, 0xbc, 0xec, 0x6c, 0x78, 0x79, 0xc8, 0x1f, 0x30, 0x07, 0x6c,
+        0x9c, 0xf7, 0x14, 0x07, 0x0e, 0x1d, 0x91, 0xd8, 0x49, 0xe2, 0x47, 0x50,
+        0x36, 0x0b, 0xef, 0x68, 0x1c, 0xda, 0x2c, 0xb0, 0x1c, 0x10, 0x9d, 0x4f,
+        0xb6, 0xb0, 0x27, 0x65, 0xe7, 0x97, 0xa8, 0x3f, 0xa6, 0x7d, 0x40, 0x9e,
+        0x4f, 0x9e, 0x78, 0xf9, 0x67, 0xff, 0xee, 0x95, 0xce, 0xb3, 0x5b, 0x32,
+        0xbb, 0xd0, 0xae, 0x81, 0x5d, 0xc3, 0x5e, 0xcc, 0x5b, 0xfd, 0x05, 0x6d,
+        0x30, 0x47, 0xb1, 0x4b, 0xb6, 0x21, 0x43, 0xea, 0xf1, 0x2e, 0xad, 0xfb,
+        0xd5, 0xe3, 0x43, 0x3a, 0x17, 0x97, 0xe3, 0xe4, 0x0a, 0xb6, 0xac, 0x14,
+        0xac, 0x68, 0x16, 0xf4, 0xb7, 0x0b, 0x5b, 0xed, 0x3a, 0xee, 0x60, 0x07,
+        0x67, 0x70, 0xa3, 0x46, 0x39, 0x7f, 0x57, 0x63, 0xef, 0x66, 0xed, 0x4f,
+        0x18, 0xc7, 0x3a, 0x93, 0x94, 0x3f, 0xf6, 0x13, 0x03, 0xe9, 0x8f, 0x9a,
+        0xd1, 0xfd, 0xbd, 0x7e, 0xd7, 0xd1, 0x76, 0xa7, 0x46, 0x3c, 0x16, 0xb9,
+        0x94, 0xb7, 0x21, 0x4b, 0x5e, 0x8f, 0x50, 0x07, 0x28, 0xa9, 0x46, 0x3f,
+        0xd7, 0x5f, 0xb3, 0xeb, 0x1e, 0xb5, 0xb9, 0xae, 0xb8, 0x8f, 0xdb, 0x94,
+        0xfd, 0x7b, 0x5a, 0xee, 0xe7, 0x8b, 0x67, 0xe5, 0x2d, 0xdc, 0xb7, 0xa7,
+        0xe3, 0x64, 0xe4, 0x4d, 0xe8, 0x78, 0xb5, 0x62, 0x23, 0x6f, 0x7b, 0x1a,
+        0xe7, 0x64, 0xa9, 0x95, 0x2b, 0x2f, 0xcb, 0xe5, 0xab, 0xfb, 0xea, 0xa5,
+        0xab, 0x31, 0xf5, 0xf2, 0x95, 0x61, 0x95, 0xbb, 0xe2, 0xba, 0xff, 0x74,
+        0x96, 0xe4, 0xdd, 0x0d, 0x57, 0x4e, 0x3b, 0xc6, 0x40, 0x40, 0x1a, 0xb9,
+        0x75, 0xae, 0x1b, 0x04, 0x36, 0xdf, 0xe8, 0x75, 0xdd, 0x47, 0xc7, 0xc7,
+        0x25, 0xde, 0x4b, 0x1d, 0xe5, 0xf3, 0x11, 0xe6, 0xbb, 0x12, 0x73, 0x52,
+        0xb6, 0x7d, 0xbe, 0xac, 0x14, 0xf0, 0xad, 0xcb, 0xd3, 0x5f, 0x1e, 0x3b,
+        0xe6, 0xc7, 0x4a, 0x7e, 0xf4, 0x22, 0x7d, 0xc9, 0x91, 0xff, 0xf2, 0x25,
+        0x9b, 0x72, 0xae, 0xf0, 0x19, 0xf4, 0x0f, 0xcb, 0xb7, 0x0a, 0xa1, 0x43,
+        0x65, 0x13, 0xcf, 0x31, 0x95, 0x2b, 0xdc, 0x73, 0x87, 0x75, 0xcc, 0x00,
+        0x3a, 0x89, 0xe9, 0xba, 0xcb, 0x0e, 0xe7, 0xeb, 0xc2, 0x7c, 0x7b, 0xe6,
+        0x31, 0xc8, 0xff, 0xd3, 0x5a, 0x3e, 0x9f, 0x53, 0xb0, 0x7d, 0xc1, 0xdf,
+        0x61, 0x99, 0x2d, 0x40, 0xc6, 0x2b, 0xe6, 0x9c, 0x52, 0x57, 0xb0, 0x22,
+        0xcb, 0xc0, 0x8e, 0x25, 0xe0, 0xcd, 0x93, 0x3a, 0xb6, 0xda, 0xa3, 0xb1,
+        0x67, 0x85, 0xe5, 0x8c, 0x24, 0xcb, 0x4e, 0xb7, 0x3e, 0xbf, 0xfd, 0xdd,
+        0x57, 0x23, 0xde, 0x9d, 0x83, 0x8f, 0x33, 0x4a, 0xda, 0x60, 0x03, 0xcd,
+        0x6c, 0x2d, 0x80, 0x27, 0x22, 0x38, 0xdb, 0x56, 0xcd, 0x0f, 0x75, 0xc8,
+        0xef, 0xba, 0xf6, 0x23, 0x7a, 0xf1, 0x8a, 0xba, 0xc9, 0x76, 0xcf, 0xa0,
+        0x5f, 0xbb, 0xa4, 0xae, 0xb4, 0x69, 0x5c, 0x7d, 0xb8, 0x2e, 0x09, 0x3d,
+        0xe4, 0x69, 0x94, 0x03, 0xa8, 0x8b, 0xfa, 0x65, 0x03, 0xe5, 0x45, 0x94,
+        0x5b, 0xf0, 0x64, 0x9b, 0x11, 0xe8, 0x15, 0x78, 0xbe, 0x81, 0xf1, 0xc6,
+        0xb1, 0xe6, 0x8c, 0x29, 0x1f, 0x9d, 0xa2, 0x2c, 0x19, 0x53, 0xcc, 0x4b,
+        0x5e, 0xb6, 0xf1, 0xac, 0x0e, 0xab, 0x99, 0x35, 0x96, 0xf1, 0x2c, 0x79,
+        0xdf, 0x1f, 0xc2, 0x24, 0xf4, 0x49, 0x5d, 0xf5, 0x30, 0xe9, 0xa3, 0x26,
+        0x26, 0xb1, 0xae, 0x5d, 0x66, 0xaf, 0x90, 0xd7, 0x4d, 0xd0, 0x5b, 0x87,
+        0xcc, 0x5c, 0x0d, 0x6b, 0x7d, 0xb4, 0x0c, 0x5a, 0xdc, 0x06, 0x5d, 0x6d,
+        0x82, 0xa6, 0x52, 0x05, 0x6b, 0x6a, 0x51, 0x45, 0xb5, 0x2f, 0xe0, 0x09,
+        0xd0, 0x6b, 0xf0, 0x15, 0xea, 0xa2, 0xe4, 0xe5, 0x38, 0x68, 0x4f, 0xdc,
+        0xa0, 0x6d, 0xa7, 0xe3, 0xca, 0x06, 0x0d, 0x82, 0x2e, 0x0b, 0x1e, 0x4f,
+        0xbf, 0xa7, 0x34, 0xae, 0x4e, 0xdd, 0x96, 0x44, 0xf2, 0xb6, 0x58, 0xc0,
+        0x02, 0xcb, 0xf9, 0x50, 0x1c, 0x8c, 0x39, 0x29, 0xd7, 0x30, 0x8f, 0x01,
+        0xfe, 0x1e, 0x3d, 0xa1, 0xf9, 0x7b, 0x4a, 0x02, 0x87, 0x79, 0x1c, 0xf4,
+        0x06, 0x0c, 0xf2, 0x78, 0x3a, 0xe9, 0xd3, 0xe8, 0xd7, 0xc1, 0xbf, 0x16,
+        0x2c, 0xb1, 0xb0, 0xac, 0x82, 0xff, 0xb7, 0xf1, 0xfd, 0x66, 0x6d, 0x44,
+        0xad, 0xac, 0x29, 0x3f, 0x97, 0xe4, 0x19, 0xe8, 0xc9, 0xb7, 0x70, 0x76,
+        0x9d, 0x5a, 0x77, 0x8f, 0x8d, 0x33, 0x7e, 0x96, 0x56, 0x97, 0xed, 0x93,
+        0xb2, 0x3f, 0x36, 0x89, 0xf2, 0x31, 0x3c, 0x0d, 0x9c, 0x43, 0x48, 0xc7,
+        0xbf, 0x37, 0xf3, 0x8e, 0xf2, 0xfe, 0x67, 0x61, 0x42, 0xe7, 0xe7, 0x1b,
+        0x76, 0x2f, 0xbe, 0xd3, 0x17, 0xc3, 0xbd, 0x41, 0x67, 0x52, 0x11, 0x9d,
+        0x6f, 0x5a, 0x86, 0x2e, 0xb1, 0x85, 0xf1, 0xde, 0xa7, 0x2f, 0xaf, 0x0a,
+        0x1e, 0x1e, 0xfb, 0x97, 0x9b, 0x0c, 0x33, 0x47, 0xfd, 0x6e, 0xc4, 0x93,
+        0x7f, 0x9f, 0xb8, 0xfb, 0xf6, 0xca, 0x94, 0x81, 0x97, 0x5b, 0x66, 0x18,
+        0x6d, 0x21, 0xcb, 0x20, 0x8b, 0x4a, 0x9a, 0x7e, 0xd9, 0xce, 0xeb, 0x9b,
+        0xab, 0x26, 0xcc, 0x0f, 0xc4, 0xeb, 0xbb, 0x6a, 0x53, 0xee, 0xb4, 0x03,
+        0x5f, 0xa2, 0x5a, 0xaf, 0x7c, 0xdf, 0xce, 0x02, 0x15, 0xac, 0x68, 0x1a,
+        0x34, 0xda, 0x26, 0x56, 0x7c, 0x4e, 0x1e, 0xcc, 0xbb, 0xac, 0xfb, 0xb2,
+        0x6d, 0xa3, 0x6f, 0x63, 0x5e, 0xae, 0x9f, 0x7b, 0xe1, 0x1e, 0xe8, 0x9b,
+        0x36, 0x35, 0x8d, 0xd6, 0xab, 0xdd, 0x03, 0x1e, 0x8d, 0x36, 0xf6, 0x11,
+        0xfe, 0x3f, 0xfb, 0x20, 0x9d, 0x38, 0xca, 0xcb, 0xbb, 0xc0, 0xb3, 0xca,
+        0xf3, 0x1c, 0x01, 0x6d, 0x1c, 0xa4, 0x9f, 0x86, 0x6f, 0xd1, 0xa3, 0x9f,
+        0x47, 0x9b, 0xf4, 0x43, 0xba, 0xe9, 0x90, 0xd9, 0xab, 0xb6, 0xcc, 0x17,
+        0xf4, 0x7d, 0x43, 0xd7, 0xa4, 0xcf, 0x68, 0x12, 0x74, 0x43, 0x5a, 0x27,
+        0x6f, 0x99, 0x52, 0x02, 0x1d, 0x95, 0x80, 0x4f, 0x25, 0xd0, 0x54, 0x19,
+        0xf8, 0x56, 0x02, 0xbe, 0x95, 0x6a, 0x56, 0xbc, 0x82, 0x3d, 0x53, 0x66,
+        0x6f, 0x81, 0x8e, 0xb6, 0x6b, 0xbc, 0x7f, 0xbd, 0x66, 0x93, 0x72, 0xf0,
+        0x66, 0xf3, 0xee, 0xff, 0x81, 0xbb, 0x1f, 0x92, 0x5d, 0xd8, 0x2d, 0x6f,
+        0x15, 0xc7, 0x80, 0x49, 0x02, 0x8c, 0x72, 0x40, 0x1b, 0x53, 0x72, 0xbd,
+        0x38, 0x2d, 0x3b, 0x90, 0x4f, 0x37, 0x36, 0x62, 0xd0, 0xa7, 0x23, 0xb2,
+        0xf2, 0xda, 0xa8, 0xbc, 0xb9, 0xa1, 0x64, 0x09, 0xf4, 0x9b, 0xdb, 0xa4,
+        0xdf, 0x1d, 0xf4, 0x5c, 0xea, 0xd0, 0x71, 0xfa, 0xd9, 0x8a, 0xe7, 0x7f,
+        0x9f, 0xab, 0x74, 0xca, 0x7c, 0xc5, 0x94, 0xc7, 0x2b, 0xdd, 0xf2, 0xe5,
+        0x4a, 0x58, 0x4e, 0xc3, 0x0e, 0xfc, 0x4a, 0x65, 0x50, 0x9e, 0xac, 0x0c,
+        0xc9, 0x57, 0xab, 0x51, 0xf9, 0x5a, 0xd5, 0x96, 0x4c, 0x35, 0x2e, 0xe9,
+        0xea, 0x98, 0x3c, 0x51, 0xa5, 0x5f, 0x1d, 0xf3, 0xe1, 0x37, 0xd3, 0xf4,
+        0x57, 0x70, 0x5d, 0x41, 0xac, 0x2b, 0xae, 0xe6, 0x74, 0x9c, 0x52, 0x32,
+        0x9e, 0xcf, 0x43, 0xe4, 0x39, 0x8c, 0x75, 0xf1, 0x35, 0x25, 0x65, 0x3d,
+        0x7f, 0xe3, 0xff, 0x46, 0x42, 0xda, 0x36, 0x7a, 0xae, 0x34, 0x88, 0x36,
+        0x90, 0x7b, 0xf9, 0x86, 0xef, 0xa3, 0xe1, 0xf3, 0x6f, 0xd8, 0x5e, 0x86,
+        0xf6, 0x5b, 0xdf, 0xa4, 0xed, 0xa5, 0xcf, 0x9e, 0xf8, 0x41, 0x3b, 0xe7,
+        0x9a, 0xf6, 0x9b, 0x3c, 0x88, 0x6d, 0x34, 0xe6, 0xbd, 0x98, 0x79, 0xf8,
+        0xff, 0x53, 0xbc, 0x18, 0xd5, 0xb9, 0xea, 0x20, 0xff, 0x4f, 0x05, 0x6b,
+        0xf9, 0xf4, 0xdc, 0xf1, 0xf9, 0xe2, 0xac, 0x7a, 0xbc, 0x48, 0x8d, 0xc6,
+        0x95, 0x8b, 0xcd, 0x9c, 0xb8, 0x2f, 0xc9, 0xa6, 0x13, 0xd2, 0x6b, 0xf0,
+        0xf3, 0x1f, 0x75, 0x7e, 0xdc, 0xec, 0x09, 0xd2, 0x1f, 0x63, 0x6f, 0x9d,
+        0x7e, 0x3c, 0x01, 0xba, 0xad, 0x63, 0xca, 0xa5, 0x8a, 0xe7, 0xb3, 0x5a,
+        0xd1, 0xf4, 0xf2, 0x2b, 0xd0, 0x1c, 0x63, 0x0e, 0xde, 0x33, 0x5b, 0xf2,
+        0xfa, 0xce, 0xe0, 0xde, 0x60, 0x8f, 0x63, 0xbf, 0x46, 0x37, 0xe7, 0xe2,
+        0xff, 0xe9, 0xa0, 0xec, 0xaf, 0x97, 0xb9, 0xc6, 0xb6, 0xa6, 0x45, 0x2f,
+        0xae, 0x1b, 0x97, 0x17, 0x70, 0x7e, 0x65, 0x93, 0xeb, 0x0f, 0x4a, 0x39,
+        0x4e, 0xdb, 0x96, 0xf8, 0x7d, 0x42, 0x4a, 0x98, 0xa7, 0x1c, 0x6f, 0xf8,
+        0xc3, 0x3c, 0x9c, 0x2d, 0x9b, 0x0f, 0xe6, 0x5d, 0x2c, 0x1d, 0xc7, 0x3b,
+        0xea, 0xe2, 0xd0, 0x99, 0x16, 0xf8, 0x7e, 0x11, 0x65, 0xfa, 0x46, 0x56,
+        0xf0, 0x8c, 0xf8, 0x75, 0xd5, 0x01, 0xad, 0xab, 0x4f, 0x3f, 0xe8, 0xb7,
+        0x54, 0xb2, 0xb2, 0xa9, 0x40, 0x42, 0x19, 0xaf, 0xfe, 0x7c, 0x80, 0x98,
+        0x7b, 0xdc, 0xe6, 0x2f, 0x24, 0x7f, 0x35, 0xb5, 0x4f, 0xc1, 0xff, 0x76,
+        0x44, 0x9e, 0x32, 0x99, 0xc7, 0x9e, 0x54, 0xb3, 0xc5, 0x9c, 0x9f, 0xe3,
+        0x9b, 0x50, 0xc7, 0xcb, 0x37, 0x07, 0xbc, 0x9c, 0x77, 0x8e, 0x7d, 0x30,
+        0xcf, 0xfd, 0x20, 0x9d, 0x30, 0xdf, 0xbd, 0xbd, 0xf9, 0x3f, 0x52, 0xe5,
+        0x3c, 0xf0, 0xce, 0x6e, 0xd1, 0xfc, 0x98, 0xab, 0xfe, 0xdb, 0xdd, 0xd3,
+        0xfc, 0xdc, 0xf0, 0x31, 0xfc, 0x6e, 0x80, 0xb6, 0x2d, 0x71, 0xe3, 0x92,
+        0x97, 0x3b, 0xaa, 0x6d, 0x68, 0x60, 0x05, 0xea, 0xc8, 0xab, 0xe0, 0x93,
+        0x66, 0x5b, 0xfe, 0xfd, 0x07, 0x69, 0x3f, 0x51, 0x42, 0x6c, 0x67, 0x00,
+        0x00, 0x00 };
+
+static const u32 bnx2_RXP_b09FwData[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_RXP_b09FwRodata[(0x278/4) + 1] = {
+        0x08004050, 0x08003f50, 0x08003ff4, 0x0800400c, 0x08004024, 0x08004044,
+        0x08004050, 0x08004050, 0x08003f58, 0x00000000, 0x08004a0c, 0x08004a44,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004a7c, 0x08004c40,
+        0x08004b88, 0x08004bc0, 0x08004c40, 0x08004b10, 0x08004c40, 0x08004c40,
+        0x08004bc0, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c00,
+        0x08004c40, 0x08004c00, 0x08004b88, 0x08004c40, 0x08004c40, 0x08004c00,
+        0x08004c00, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40, 0x08004c40,
+        0x08004aec, 0x00000000, 0x08006058, 0x08006070, 0x08006070, 0x08006070,
+        0x08006058, 0x08006070, 0x08006070, 0x08006070, 0x08006058, 0x08006070,
+        0x08006070, 0x08006070, 0x08006058, 0x08006070, 0x08006070, 0x08006070,
+        0x08006064, 0x00000000, 0x00000000 };
+static const u32 bnx2_RXP_b09FwBss[(0x13dc/4) + 1] = { 0x0 };
+static const u32 bnx2_RXP_b09FwSbss[(0x20/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_rxp_fw_09 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
         .start_addr                     = 0x08003184,
 
         .text_addr                      = 0x08000000,
-        .text_len                       = 0x673c,
+        .text_len                       = 0x6768,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_RXP_b09FwText,
         .gz_text_len                    = sizeof(bnx2_RXP_b09FwText),
 
-        .data_addr                      = 0x080069e0,
+        .data_addr                      = 0x08006a00,
         .data_len                       = 0x0,
         .data_index                     = 0x0,
         .data                           = bnx2_RXP_b09FwData,
 
-        .sbss_addr                      = 0x080069e0,
-        .sbss_len                       = 0x2c,
+        .sbss_addr                      = 0x08006a00,
+        .sbss_len                       = 0x20,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_RXP_b09FwSbss,
 
-        .bss_addr                       = 0x08006a10,
+        .bss_addr                       = 0x08006a20,
         .bss_len                        = 0x13dc,
         .bss_index                      = 0x0,
         .bss                            = bnx2_RXP_b09FwBss,
 
-        .rodata_addr                    = 0x08006740,
+        .rodata_addr                    = 0x08006768,
         .rodata_len                     = 0x278,
         .rodata_index                   = 0x0,
         .rodata                         = bnx2_RXP_b09FwRodata,
 };
 
 static u8 bnx2_TPAT_b09FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0xdb, 0xfd, 0x2f, 0x45, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xc5, 0x58, 0x5d, 0x6c,
-        0x1c, 0x57, 0x15, 0x3e, 0xf3, 0xbb, 0x13, 0x77, 0xed, 0xbd, 0x49, 0x97,
-        0x6a, 0x13, 0xb9, 0x74, 0xc6, 0x1e, 0x3b, 0x8b, 0x1c, 0x35, 0x93, 0xb0,
-        0x24, 0x16, 0x5a, 0xd1, 0xc9, 0xcc, 0xae, 0x6b, 0xe5, 0x29, 0x86, 0xbc,
-        0xf1, 0xb2, 0xac, 0xed, 0x46, 0x54, 0x48, 0x4d, 0x51, 0x84, 0x22, 0x81,
-        0x94, 0x65, 0x76, 0x53, 0x40, 0x5a, 0x65, 0xc1, 0xa0, 0x04, 0x21, 0x84,
-        0x22, 0x9b, 0x66, 0x91, 0x58, 0x3c, 0x4d, 0xe9, 0x6b, 0x94, 0xbc, 0x90,
-        0x96, 0x17, 0x9e, 0x4b, 0x9e, 0xac, 0x02, 0x12, 0x0f, 0xa8, 0x8a, 0x78,
-        0x40, 0x15, 0x0d, 0x1e, 0xbe, 0x33, 0x3f, 0x9b, 0x5d, 0xd7, 0x29, 0x79,
-        0xa8, 0x84, 0xa5, 0xf1, 0xcc, 0xfd, 0x39, 0xf7, 0xe7, 0x7c, 0xdf, 0x77,
-        0xee, 0xb9, 0x5b, 0x92, 0x69, 0x82, 0xd2, 0xbf, 0x49, 0x3c, 0x97, 0xbe,
-        0x71, 0xf1, 0xd2, 0xe2, 0x8b, 0x27, 0x4d, 0x3a, 0x71, 0xe2, 0x45, 0xe9,
-        0x19, 0x43, 0xa6, 0xcf, 0xe0, 0x4f, 0x21, 0x12, 0xd9, 0xf8, 0xfc, 0x90,
-        0x21, 0x57, 0x6f, 0x4e, 0x7b, 0x36, 0x19, 0x4a, 0xd5, 0x79, 0x61, 0xd5,
-        0x26, 0x72, 0x07, 0x0b, 0xa6, 0x4f, 0xff, 0x89, 0x5a, 0x45, 0x95, 0xb8,
-        0xfe, 0xf9, 0xea, 0xa3, 0xe3, 0x77, 0x4e, 0x5b, 0x0f, 0x6f, 0x2a, 0x64,
-        0x88, 0x6a, 0xc3, 0x10, 0xf3, 0x64, 0x4c, 0xc3, 0xe6, 0x97, 0x47, 0x57,
-        0x34, 0x9a, 0xca, 0xc6, 0x12, 0x14, 0xf4, 0x0c, 0xaa, 0x77, 0x31, 0x8e,
-        0x7d, 0x59, 0xf2, 0x43, 0x55, 0xf2, 0x6f, 0x18, 0x24, 0x57, 0x5d, 0xc9,
-        0x0b, 0x6d, 0xb4, 0x49, 0xe4, 0x39, 0x39, 0x72, 0x45, 0x14, 0x7d, 0xd3,
-        0x91, 0x49, 0xb6, 0x77, 0xa3, 0xd9, 0xb9, 0x25, 0xc9, 0xeb, 0x2f, 0x4b,
-        0x7e, 0xdf, 0xe3, 0x7d, 0x63, 0x1d, 0x4b, 0x92, 0xdb, 0xe7, 0x77, 0xd5,
-        0xf0, 0xbb, 0x53, 0xd4, 0x28, 0x52, 0x41, 0xb6, 0xd9, 0xd6, 0x24, 0xdf,
-        0x59, 0x28, 0x29, 0x34, 0x8b, 0xe7, 0x00, 0xad, 0x3b, 0x94, 0xf7, 0x1c,
-        0x52, 0x15, 0x5b, 0x26, 0xbf, 0x28, 0xd1, 0xaf, 0x2b, 0x1a, 0x9e, 0xb3,
-        0x52, 0xad, 0xbf, 0x96, 0x8e, 0x53, 0xa4, 0x36, 0xd6, 0xd2, 0x2c, 0xf2,
-        0xda, 0x12, 0x7b, 0xcf, 0x59, 0x10, 0x32, 0xcd, 0xe2, 0x99, 0xc4, 0x77,
-        0x13, 0xfd, 0x34, 0xf2, 0x2a, 0x7b, 0xdb, 0x0e, 0xe0, 0x1b, 0xeb, 0xc4,
-        0x58, 0x5e, 0xbc, 0x0e, 0x13, 0xeb, 0xb0, 0xa9, 0xd3, 0x5b, 0xc6, 0x3e,
-        0xe6, 0x4a, 0x4d, 0xd2, 0xa9, 0x13, 0xaf, 0x7d, 0x92, 0x02, 0xa1, 0x50,
-        0x70, 0x4c, 0x23, 0xf7, 0x9c, 0x8a, 0xf2, 0x21, 0x6a, 0x09, 0x09, 0x7d,
-        0x3a, 0x29, 0x7e, 0x39, 0xb4, 0xeb, 0xa8, 0x2f, 0x50, 0x50, 0x3c, 0x28,
-        0xc9, 0xd5, 0xef, 0xa1, 0x7e, 0x4e, 0x34, 0xe9, 0xbb, 0x78, 0x4b, 0x28,
-        0x1f, 0xe4, 0xf1, 0x50, 0x96, 0x48, 0xb1, 0x49, 0x78, 0xa1, 0x49, 0xed,
-        0x30, 0xb3, 0xe5, 0xfa, 0xa4, 0xae, 0x15, 0xee, 0xc5, 0x0e, 0xfd, 0x7a,
-        0x75, 0x6a, 0x08, 0x6a, 0xa9, 0x55, 0xf4, 0xe9, 0xd9, 0xa2, 0x06, 0x9c,
-        0xdc, 0x18, 0xcf, 0x97, 0xb8, 0x9e, 0xff, 0x50, 0x6f, 0x92, 0x52, 0xb5,
-        0x85, 0x4f, 0x5f, 0xa6, 0xa4, 0x8d, 0xf7, 0x29, 0x63, 0x6f, 0xa7, 0xd2,
-        0x72, 0x51, 0x78, 0x37, 0xbe, 0x48, 0x6e, 0xec, 0x1f, 0x03, 0xdf, 0x02,
-        0x7b, 0xd4, 0x81, 0x75, 0xe0, 0xca, 0xd4, 0x2a, 0x19, 0x64, 0x2d, 0xae,
-        0xa1, 0xe5, 0x6f, 0x5d, 0x05, 0x7e, 0x67, 0xdc, 0xd4, 0xd4, 0x8e, 0x71,
-        0xfe, 0x23, 0xd6, 0xd9, 0x12, 0x06, 0xf0, 0x6e, 0x9c, 0x8f, 0xa2, 0x37,
-        0x9d, 0x28, 0xd2, 0xab, 0x76, 0xf9, 0x16, 0x2d, 0x94, 0x34, 0x9a, 0x17,
-        0x78, 0xc3, 0x8f, 0x36, 0x7c, 0xa5, 0x65, 0xeb, 0xc9, 0x78, 0x86, 0xbf,
-        0xcb, 0x12, 0x96, 0x42, 0x1f, 0x74, 0xdf, 0x63, 0x7f, 0x94, 0x97, 0x62,
-        0x9b, 0x28, 0xda, 0x5c, 0xfc, 0x34, 0x9b, 0xef, 0xa7, 0x36, 0x51, 0x54,
-        0xaf, 0xf0, 0xbc, 0x16, 0xf6, 0xcc, 0x5c, 0x25, 0xaa, 0x0f, 0x1c, 0xa3,
-        0xd9, 0xc5, 0xfa, 0x6c, 0xbc, 0x07, 0x25, 0xec, 0xc1, 0x2a, 0x9b, 0x92,
-        0x41, 0x81, 0x1d, 0xbd, 0x00, 0x7e, 0xb8, 0xbe, 0x6d, 0xbd, 0xef, 0x2b,
-        0x05, 0xda, 0x72, 0xf2, 0xd4, 0x09, 0x4b, 0x14, 0x84, 0x1d, 0xf2, 0x42,
-        0x19, 0x73, 0x14, 0x68, 0xd3, 0x7e, 0x18, 0xd5, 0x1d, 0x07, 0x7e, 0x21,
-        0xb6, 0x2b, 0xd5, 0x69, 0x1a, 0xed, 0x0b, 0x62, 0x8d, 0x1c, 0x60, 0x21,
-        0xc3, 0x37, 0xb3, 0xf1, 0x77, 0x10, 0x3a, 0x68, 0xa7, 0x96, 0x5c, 0xb1,
-        0x44, 0x40, 0x56, 0xc9, 0x53, 0x48, 0xc8, 0x55, 0x81, 0x3e, 0x2d, 0xaa,
-        0x85, 0x06, 0xed, 0x28, 0x97, 0x63, 0x7e, 0xb7, 0x7b, 0x3b, 0xd1, 0x9d,
-        0xa3, 0x25, 0xba, 0x1b, 0x16, 0xe9, 0x76, 0x48, 0x72, 0xd3, 0x01, 0x37,
-        0x8a, 0x82, 0xde, 0x0a, 0x47, 0xf7, 0xf2, 0x1b, 0xec, 0x25, 0x38, 0xa2,
-        0x40, 0x83, 0xab, 0xce, 0x3d, 0x30, 0xc8, 0x02, 0x46, 0x2d, 0xec, 0x3d,
-        0x7b, 0xf3, 0xbe, 0x76, 0xa6, 0x57, 0x6d, 0xeb, 0x87, 0x3e, 0xa3, 0x76,
-        0x4d, 0x43, 0xed, 0x5e, 0x7f, 0x0c, 0x30, 0x86, 0xa0, 0xab, 0xd0, 0x93,
-        0x0c, 0xbf, 0xcc, 0x6c, 0x1b, 0xd4, 0xef, 0xe6, 0xc8, 0xdc, 0x54, 0xa9,
-        0xd9, 0x2b, 0x92, 0x33, 0x6f, 0x99, 0x24, 0xcb, 0x45, 0x99, 0x54, 0x9a,
-        0xd9, 0x8c, 0x68, 0x09, 0xeb, 0xb8, 0x6f, 0xff, 0x48, 0xa7, 0xa9, 0xc0,
-        0xd1, 0x89, 0xfb, 0x18, 0x34, 0x73, 0xcb, 0x90, 0xfc, 0x1e, 0xef, 0x83,
-        0x7d, 0x6e, 0xa4, 0x3e, 0x57, 0x25, 0xef, 0x46, 0x8e, 0x66, 0x37, 0xfe,
-        0x11, 0x79, 0x36, 0x7c, 0x0d, 0x9e, 0xaf, 0x56, 0xbe, 0xa0, 0xd0, 0x04,
-        0xea, 0x36, 0xb9, 0xed, 0x61, 0x5a, 0xcf, 0x63, 0x44, 0x91, 0xe7, 0x3c,
-        0x4b, 0x1e, 0xf3, 0xff, 0x3c, 0xdb, 0xe4, 0x68, 0x66, 0x83, 0x75, 0x83,
-        0xf7, 0x26, 0x97, 0x79, 0x6d, 0x07, 0xa8, 0x89, 0x1d, 0x35, 0xcb, 0x45,
-        0xf8, 0x41, 0x8e, 0x35, 0xd2, 0xc4, 0x8e, 0x65, 0x7b, 0x02, 0x6f, 0x9e,
-        0xef, 0xac, 0x92, 0xf0, 0x9d, 0xe3, 0x46, 0x9e, 0x7c, 0xe0, 0xab, 0x62,
-        0x3d, 0x6b, 0x34, 0x57, 0x5a, 0x8f, 0xdb, 0x50, 0x37, 0xe0, 0x36, 0xb1,
-        0xa7, 0x0d, 0xe5, 0x41, 0xb6, 0x06, 0x70, 0xda, 0x6e, 0x63, 0x16, 0x2d,
-        0xde, 0x6b, 0xdd, 0xe1, 0xfe, 0xdc, 0xb7, 0x55, 0xd6, 0xc8, 0x2a, 0x6f,
-        0x62, 0xf4, 0x7e, 0x17, 0xfb, 0xbd, 0xce, 0xb1, 0xc8, 0x36, 0xff, 0x4a,
-        0xdc, 0x7f, 0x16, 0x7b, 0x9e, 0x5b, 0x6c, 0x73, 0xdb, 0x40, 0x23, 0x7b,
-        0xa3, 0x25, 0x54, 0xf8, 0x5f, 0x86, 0xf3, 0xfd, 0x1f, 0xff, 0x2b, 0xd2,
-        0xaa, 0xe0, 0x74, 0xa5, 0x00, 0x7c, 0x2c, 0xb3, 0x0d, 0xbd, 0xdb, 0x18,
-        0x37, 0x70, 0x14, 0xd8, 0x25, 0x38, 0x71, 0xbf, 0xa5, 0x6e, 0x44, 0xed,
-        0x78, 0xae, 0x2b, 0x3c, 0x17, 0x62, 0x92, 0xbd, 0xf8, 0x07, 0x70, 0xa3,
-        0x49, 0x79, 0x9a, 0xdf, 0xce, 0xd3, 0x85, 0x41, 0x9e, 0x66, 0xae, 0xe9,
-        0xf0, 0x43, 0x14, 0x75, 0x2a, 0xac, 0x51, 0xe0, 0x6d, 0x73, 0x3f, 0xab,
-        0xa4, 0xc8, 0xbc, 0x0e, 0xb4, 0x6f, 0x13, 0xad, 0x0d, 0x74, 0xf8, 0x4d,
-        0x1d, 0x19, 0x5b, 0xa6, 0x97, 0x7f, 0x46, 0xf4, 0xf2, 0x80, 0x6d, 0x79,
-        0xfc, 0xc4, 0xa6, 0x89, 0x3d, 0xcb, 0xc0, 0xfc, 0xc2, 0x40, 0x46, 0xbc,
-        0x40, 0x3c, 0xed, 0x7b, 0x88, 0x93, 0x35, 0x3c, 0x4b, 0x88, 0x9d, 0x8c,
-        0x0d, 0xc7, 0x91, 0x5d, 0xe0, 0xb3, 0x8c, 0xb6, 0xb3, 0xa8, 0x4b, 0xf4,
-        0xae, 0xd8, 0x3a, 0xd5, 0x9c, 0x49, 0x6a, 0x67, 0xb1, 0x4a, 0x70, 0xac,
-        0x3a, 0x08, 0x4e, 0x1d, 0x40, 0xfc, 0xf9, 0x9d, 0x32, 0x1e, 0xab, 0x10,
-        0xd3, 0x8a, 0x87, 0x11, 0x9b, 0xfa, 0xa8, 0xe7, 0xf1, 0x6e, 0xe1, 0x7d,
-        0x00, 0xe5, 0xc3, 0xe8, 0x3b, 0x1a, 0xa7, 0x32, 0xbb, 0x27, 0xc5, 0x28,
-        0xf0, 0x6e, 0xc3, 0x40, 0x7f, 0x13, 0xba, 0x61, 0x7f, 0xe7, 0x10, 0x3f,
-        0xd8, 0xe7, 0x39, 0xf8, 0x54, 0xc7, 0xdc, 0x82, 0x66, 0xb7, 0xa9, 0xa5,
-        0xa4, 0xf1, 0xcb, 0x1f, 0xc6, 0xaf, 0x52, 0xcc, 0x83, 0x20, 0x14, 0xb0,
-        0x61, 0xfd, 0x66, 0x7a, 0x65, 0xec, 0xc8, 0xf5, 0xa0, 0x65, 0x4f, 0x89,
-        0xa2, 0x55, 0xa7, 0x40, 0x4d, 0xe0, 0xee, 0x42, 0xc3, 0x4d, 0x68, 0xd8,
-        0x1f, 0xd1, 0xb0, 0xff, 0x3f, 0x35, 0x0c, 0x7d, 0x42, 0x23, 0xb7, 0xc1,
-        0xa9, 0xb7, 0x7a, 0xfb, 0xe9, 0x99, 0xb5, 0xcc, 0x9a, 0x36, 0xe9, 0xce,
-        0xd1, 0xa7, 0xd5, 0x74, 0x49, 0x7e, 0x4a, 0x4d, 0xb7, 0x58, 0xd3, 0x2a,
-        0x6b, 0xba, 0xb8, 0x57, 0xd3, 0xd3, 0x18, 0x23, 0xd1, 0xe6, 0x19, 0xb5,
-        0x48, 0xda, 0x3c, 0xf0, 0xd8, 0xc8, 0x93, 0x72, 0xed, 0x31, 0xef, 0x98,
-        0xcb, 0xfe, 0x00, 0xff, 0xb6, 0x35, 0xb4, 0x49, 0xe3, 0xf5, 0x88, 0x81,
-        0x6a, 0xd5, 0x2a, 0xad, 0xc5, 0x7d, 0x54, 0xd2, 0xe1, 0xff, 0xd7, 0x8f,
-        0x5a, 0xa6, 0x29, 0x8f, 0x6a, 0x1f, 0xea, 0xdf, 0x88, 0xae, 0x68, 0x55,
-        0x9e, 0xa7, 0x65, 0x82, 0xf3, 0xe6, 0x4f, 0x80, 0x55, 0xbb, 0xcb, 0x7c,
-        0xb7, 0x45, 0x3d, 0xe6, 0x19, 0xca, 0xd0, 0x84, 0x06, 0xde, 0xe6, 0xd0,
-        0x4f, 0xdd, 0x48, 0x74, 0x74, 0x1b, 0xe3, 0x6e, 0x75, 0x99, 0x67, 0x06,
-        0xe9, 0xd7, 0xed, 0xd2, 0x85, 0x38, 0x06, 0xcf, 0x8a, 0x25, 0x62, 0x0d,
-        0xf2, 0xb9, 0x88, 0xf6, 0x41, 0x8e, 0x94, 0x58, 0xf7, 0x13, 0xa9, 0xee,
-        0x9f, 0x87, 0xaf, 0x26, 0x50, 0x66, 0xed, 0x1f, 0x4e, 0xb5, 0x3f, 0x85,
-        0x37, 0xd7, 0xad, 0xa8, 0x09, 0x87, 0xc0, 0xc7, 0x0d, 0xc6, 0x37, 0x8f,
-        0x58, 0xc7, 0xf3, 0xff, 0x33, 0x5a, 0xb5, 0x19, 0x63, 0xdb, 0xfc, 0x01,
-        0xcd, 0x41, 0x7f, 0xa8, 0xdf, 0xe6, 0xbe, 0x6c, 0x93, 0xf5, 0x15, 0x69,
-        0xdf, 0x0f, 0xf7, 0xf4, 0x45, 0xfd, 0x36, 0xf7, 0x63, 0x7d, 0x1c, 0x22,
-        0xe5, 0x3a, 0x9f, 0xdb, 0x1e, 0xeb, 0x03, 0x76, 0x35, 0xd4, 0x71, 0x6e,
-        0xc1, 0xf6, 0x7c, 0x86, 0xf3, 0x3a, 0x39, 0xef, 0xe0, 0x73, 0x7e, 0xcf,
-        0x79, 0x3e, 0xd4, 0xc8, 0x19, 0xf0, 0xfe, 0x3b, 0xea, 0x27, 0x35, 0xb2,
-        0x02, 0x4d, 0x5c, 0x54, 0x13, 0x8d, 0xbc, 0x86, 0xf7, 0x19, 0x94, 0x57,
-        0xf6, 0x68, 0x24, 0xb3, 0x7b, 0xf2, 0x39, 0x1e, 0xf4, 0x4a, 0xf1, 0x99,
-        0xcb, 0xf3, 0x29, 0x1b, 0xd4, 0xd2, 0x52, 0x3d, 0xd4, 0x87, 0x7a, 0x98,
-        0x40, 0xcc, 0xc8, 0xa5, 0x5c, 0xc7, 0xdb, 0xfe, 0x48, 0xf1, 0x1d, 0x4b,
-        0xb4, 0x89, 0xb5, 0x31, 0x7a, 0x9e, 0xfd, 0xbf, 0xf4, 0x41, 0xe0, 0x51,
-        0x3c, 0x37, 0x72, 0x11, 0x3e, 0x17, 0xa2, 0xe8, 0x15, 0x07, 0xed, 0x59,
-        0x4e, 0x12, 0x63, 0x9f, 0xc3, 0xd9, 0xcb, 0x78, 0x20, 0x0f, 0xb4, 0x67,
-        0xa1, 0x07, 0x8e, 0x05, 0xbb, 0xd1, 0x96, 0xed, 0xa1, 0xae, 0x06, 0xff,
-        0x33, 0x26, 0xcb, 0xd2, 0x52, 0xdf, 0x60, 0x3b, 0xe8, 0x6d, 0xbf, 0x5c,
-        0x4c, 0x87, 0xae, 0x1e, 0xe3, 0xc4, 0x3c, 0x6a, 0x8e, 0xe0, 0xd4, 0x88,
-        0x71, 0xda, 0x19, 0xe2, 0xd4, 0x4c, 0x71, 0x6a, 0xc6, 0x38, 0x3d, 0x48,
-        0x71, 0xfa, 0xf3, 0x13, 0x70, 0xda, 0x79, 0x0a, 0x9c, 0x0c, 0xda, 0xb2,
-        0x4b, 0x38, 0x6f, 0xf5, 0x38, 0x77, 0xbd, 0xef, 0xec, 0x97, 0x7b, 0xb1,
-        0xdf, 0xc7, 0xb0, 0x8a, 0x18, 0xab, 0x2d, 0x1a, 0xcd, 0x43, 0x2c, 0xf3,
-        0x1e, 0x15, 0x70, 0x6e, 0xe4, 0xe9, 0xea, 0x9e, 0x5c, 0x24, 0x00, 0x4e,
-        0xb5, 0x14, 0xa7, 0xab, 0xc0, 0xa9, 0x96, 0xe2, 0xb4, 0x3e, 0x82, 0xd3,
-        0xfa, 0x18, 0x4e, 0x1c, 0x53, 0x2a, 0xc6, 0x7a, 0x37, 0xc3, 0x28, 0xc3,
-        0x47, 0xa7, 0x9b, 0x62, 0x0a, 0xfb, 0x3f, 0x4e, 0xed, 0x9f, 0xaa, 0x9c,
-        0xff, 0x02, 0xbb, 0x97, 0x54, 0x39, 0x3e, 0x17, 0xf8, 0xfb, 0x71, 0xbe,
-        0x82, 0xb9, 0x5c, 0xcf, 0xe1, 0x3d, 0x21, 0xcf, 0xb5, 0x47, 0x63, 0xd1,
-        0x07, 0x88, 0x45, 0x5c, 0xc7, 0xfd, 0x54, 0xa9, 0x06, 0xcd, 0x2b, 0xc8,
-        0xe1, 0xfd, 0x61, 0x0e, 0x9f, 0xf8, 0xe1, 0x6a, 0x9a, 0xc3, 0x6f, 0xd9,
-        0x9c, 0xc3, 0x9f, 0xd0, 0x68, 0x62, 0x39, 0xc5, 0x93, 0x79, 0x3d, 0x89,
-        0xb6, 0xb3, 0x31, 0xee, 0x6d, 0xc4, 0xf2, 0x55, 0xf8, 0xa0, 0x19, 0xf3,
-        0x13, 0x79, 0x57, 0xca, 0x5d, 0xe4, 0xbb, 0xe4, 0x87, 0x09, 0x4f, 0x3f,
-        0xdb, 0x5c, 0xec, 0xef, 0x88, 0xd9, 0x46, 0x43, 0xc5, 0x1d, 0xe0, 0x6e,
-        0x18, 0xc7, 0xea, 0x73, 0x41, 0x97, 0x5a, 0x47, 0xaa, 0x57, 0x22, 0xe0,
-        0xee, 0x7e, 0xfd, 0x34, 0x9f, 0x39, 0xf9, 0x45, 0xaf, 0x82, 0xfa, 0x81,
-        0x41, 0xc8, 0x83, 0x70, 0xa7, 0xa1, 0x96, 0x77, 0x5a, 0x42, 0xbe, 0x83,
-        0x32, 0x6c, 0x82, 0x70, 0xba, 0x21, 0x57, 0x4b, 0xe0, 0x43, 0x8b, 0x5c,
-        0xac, 0xd3, 0x0d, 0xe3, 0x7b, 0x4d, 0x43, 0xa9, 0x1a, 0xc8, 0x37, 0xc9,
-        0xc0, 0x99, 0x0f, 0x9f, 0x98, 0x46, 0x7b, 0x80, 0x9c, 0x08, 0x79, 0x80,
-        0xb7, 0x08, 0xbf, 0x1c, 0x03, 0x76, 0xa1, 0x0a, 0xdb, 0x6f, 0xe9, 0xc9,
-        0x9d, 0x88, 0xc8, 0x8b, 0xfd, 0xf5, 0x71, 0xca, 0x91, 0x38, 0xe7, 0x92,
-        0x6a, 0x3d, 0x32, 0x9b, 0x0e, 0xb8, 0x8e, 0x33, 0xa5, 0x13, 0x72, 0x5e,
-        0x7d, 0xcc, 0x90, 0xaf, 0x71, 0x3c, 0x7f, 0x00, 0x1f, 0xe2, 0x7b, 0x9b,
-        0xcf, 0x19, 0x85, 0x73, 0x73, 0xdc, 0x7d, 0xca, 0x88, 0x37, 0x34, 0x89,
-        0xd8, 0x87, 0xd8, 0x3b, 0xcd, 0x58, 0xb9, 0xc9, 0x19, 0xc4, 0xe3, 0x1d,
-        0x97, 0x93, 0x79, 0xfe, 0xa4, 0x25, 0x1c, 0xc6, 0x7d, 0x07, 0xfe, 0x5b,
-        0xed, 0x39, 0x1c, 0x73, 0x3f, 0xaf, 0xd0, 0x43, 0x8a, 0x39, 0x29, 0x4e,
-        0x20, 0x16, 0x9f, 0x86, 0x8d, 0x1b, 0xeb, 0x31, 0xc9, 0xbd, 0x32, 0x9b,
-        0x0f, 0xf7, 0x8c, 0xf1, 0x17, 0x65, 0xbc, 0xec, 0x82, 0xd3, 0x95, 0x74,
-        0xbe, 0x51, 0x8e, 0x2c, 0x20, 0xe5, 0x79, 0xa0, 0x0d, 0xf3, 0xb7, 0xa2,
-        0x8e, 0x7e, 0xbc, 0x46, 0xd6, 0x25, 0xdb, 0x1c, 0xd1, 0xc6, 0xc7, 0x99,
-        0xdd, 0x67, 0x8c, 0xea, 0xc8, 0x18, 0x45, 0xde, 0x9b, 0x68, 0x3a, 0xcf,
-        0xa4, 0xf7, 0x0c, 0x8e, 0x2d, 0x02, 0x3a, 0x95, 0x9f, 0x93, 0xb1, 0x0f,
-        0x0f, 0x7b, 0xf6, 0xe3, 0xfa, 0x5f, 0xe9, 0xe3, 0xe3, 0xfe, 0x56, 0x4d,
-        0xca, 0xc7, 0x12, 0x6e, 0xda, 0x78, 0x87, 0x0f, 0x46, 0xd6, 0xae, 0xed,
-        0x33, 0xef, 0xd7, 0x38, 0x5d, 0x43, 0xbc, 0x21, 0x57, 0xc1, 0x1d, 0xcc,
-        0x27, 0x7c, 0x87, 0xaf, 0x67, 0x3e, 0x04, 0x6f, 0xe8, 0x5c, 0x3b, 0xe5,
-        0x8b, 0x9c, 0xf0, 0x85, 0xf3, 0xba, 0xc5, 0x55, 0xf0, 0xa5, 0x0d, 0xbe,
-        0xc0, 0xae, 0xa1, 0x55, 0xa7, 0xc1, 0x05, 0x8e, 0x4d, 0x28, 0x87, 0xcc,
-        0x1d, 0xe6, 0x0a, 0xf3, 0xe6, 0x31, 0x5f, 0x5e, 0xe9, 0x1a, 0xc6, 0xe6,
-        0xa7, 0x70, 0xe5, 0x8d, 0x98, 0x2b, 0xcc, 0xd9, 0x24, 0x7e, 0x74, 0x80,
-        0x55, 0x90, 0xc6, 0x8f, 0x00, 0xf1, 0xa3, 0xc6, 0xf9, 0x4f, 0x1c, 0x0b,
-        0x12, 0xfd, 0xac, 0x41, 0x3f, 0x35, 0x85, 0xf3, 0x23, 0xd6, 0x0e, 0xdb,
-        0xb1, 0x7e, 0xd8, 0xae, 0x90, 0xda, 0x8d, 0xc7, 0x91, 0x76, 0xcf, 0x32,
-        0xb3, 0x38, 0xd2, 0x86, 0x76, 0x3a, 0xa9, 0x8e, 0xda, 0xa9, 0x8e, 0xd0,
-        0xa7, 0xa5, 0x54, 0xf8, 0x4c, 0xb0, 0x4c, 0x1f, 0xf1, 0xa3, 0x13, 0x8f,
-        0xd9, 0xa2, 0xe4, 0x2e, 0xc3, 0xda, 0xe6, 0xb8, 0x3b, 0x12, 0x6f, 0xd3,
-        0x7b, 0x6e, 0x23, 0xbe, 0xe7, 0x7e, 0x45, 0x1f, 0x8f, 0xb7, 0x38, 0x6b,
-        0xe2, 0x7b, 0xee, 0x29, 0x9d, 0xef, 0xb9, 0x01, 0x7d, 0x49, 0x1f, 0xbd,
-        0xe7, 0x06, 0x63, 0xf7, 0xdc, 0xcc, 0x96, 0xeb, 0xf7, 0x8b, 0xbb, 0x99,
-        0x4f, 0x38, 0xf6, 0x32, 0x9f, 0xf6, 0xcb, 0x15, 0xb3, 0x3e, 0x1c, 0x93,
-        0x58, 0xef, 0x1c, 0xcb, 0x92, 0xdc, 0xec, 0x6e, 0x98, 0xe9, 0xe2, 0x55,
-        0xcc, 0x83, 0x72, 0x6f, 0x3f, 0x5d, 0x18, 0xa9, 0x2e, 0x26, 0x13, 0x9b,
-        0xde, 0xa8, 0x36, 0x5e, 0xd5, 0xc7, 0xb5, 0x91, 0x8d, 0x93, 0x69, 0x23,
-        0x19, 0x73, 0x47, 0x29, 0xe1, 0x0c, 0x2c, 0x23, 0x1e, 0x09, 0xbe, 0xa3,
-        0x21, 0x5e, 0x54, 0xf3, 0xb8, 0xa7, 0x14, 0x78, 0xec, 0x76, 0xf8, 0x2c,
-        0x35, 0x8a, 0x8c, 0x0b, 0xaf, 0xff, 0x61, 0x7c, 0x7f, 0xc0, 0xba, 0x0b,
-        0x01, 0xff, 0xfe, 0xf1, 0x09, 0x3e, 0xbe, 0x06, 0x3e, 0x66, 0xfb, 0x19,
-        0xad, 0xbf, 0x34, 0x52, 0x5f, 0x4e, 0x31, 0x4f, 0x7c, 0x7e, 0x2f, 0xd5,
-        0xc8, 0x26, 0x72, 0xb7, 0xfb, 0xc8, 0x8b, 0xde, 0x44, 0xfc, 0x0e, 0x06,
-        0x1f, 0x47, 0xf7, 0x8a, 0x2a, 0x75, 0x86, 0x36, 0xbf, 0xc0, 0xba, 0x2d,
-        0x71, 0x13, 0x5f, 0x6f, 0x0c, 0xb2, 0xb1, 0xb9, 0x9d, 0xeb, 0xfe, 0x8d,
-        0xf3, 0x19, 0x79, 0xdf, 0xb0, 0xef, 0xfb, 0x11, 0xe7, 0xbb, 0x77, 0x81,
-        0xc5, 0x3b, 0xe1, 0x34, 0xfd, 0x1e, 0x1c, 0x7b, 0x3b, 0xce, 0x79, 0x93,
-        0x5c, 0x17, 0xfe, 0xc3, 0x99, 0xc7, 0x67, 0xbd, 0xf7, 0x39, 0x99, 0x2e,
-        0xd3, 0x57, 0x1d, 0xae, 0x93, 0xa9, 0x7e, 0x2a, 0x8a, 0x2e, 0xe2, 0xdc,
-        0x5f, 0x19, 0x3b, 0xf7, 0x71, 0x07, 0x3c, 0xc9, 0xf9, 0x7f, 0x96, 0xf3,
-        0xef, 0x46, 0x33, 0xf3, 0xd6, 0x4d, 0x97, 0x5c, 0xa9, 0xde, 0xe7, 0x7c,
-        0x6c, 0x98, 0x8b, 0x11, 0x1d, 0x7a, 0x14, 0xc9, 0xf3, 0x7c, 0x36, 0xbd,
-        0x9b, 0xfa, 0x1c, 0x6d, 0x37, 0x1e, 0xe1, 0x1e, 0x53, 0x8b, 0x7f, 0x17,
-        0x72, 0xfb, 0x3c, 0x0f, 0x97, 0xf1, 0x0e, 0x39, 0x47, 0x78, 0xd2, 0x6f,
-        0x35, 0x2a, 0xf0, 0xb5, 0xcc, 0x75, 0x85, 0xe2, 0x7b, 0x21, 0xee, 0x6e,
-        0x3f, 0x6f, 0x53, 0x12, 0x3b, 0x6a, 0xce, 0x39, 0xac, 0x05, 0x98, 0x88,
-        0x06, 0x30, 0x9e, 0x47, 0xac, 0xb2, 0xcc, 0x93, 0x72, 0xf2, 0x5b, 0xd5,
-        0x1a, 0xc6, 0x56, 0x4e, 0x72, 0x2e, 0xf9, 0x51, 0xb4, 0x36, 0x88, 0xcf,
-        0x44, 0x87, 0xb9, 0xe6, 0x87, 0x07, 0x65, 0x7e, 0xbb, 0x21, 0x7f, 0xeb,
-        0x98, 0xc7, 0x7c, 0x02, 0x0f, 0x8b, 0xa2, 0x76, 0xc3, 0x14, 0xf5, 0x9e,
-        0x29, 0x96, 0x7a, 0x32, 0x54, 0x52, 0xc8, 0xd1, 0x14, 0xe7, 0x08, 0x3a,
-        0xd1, 0x73, 0x58, 0xcb, 0x2d, 0x53, 0xf8, 0xc8, 0xa3, 0xbe, 0xad, 0x58,
-        0x62, 0x85, 0x76, 0xb1, 0xc7, 0x47, 0x51, 0x72, 0xa7, 0x35, 0x45, 0x6d,
-        0x38, 0xf7, 0x23, 0xcc, 0xcd, 0x6b, 0x62, 0x2d, 0xf3, 0x79, 0xb6, 0x2c,
-        0x9d, 0x83, 0x8f, 0xce, 0xf7, 0x77, 0x11, 0x43, 0xf9, 0x3c, 0xcb, 0x23,
-        0xe6, 0x59, 0x26, 0x5f, 0xf6, 0xef, 0x62, 0xff, 0xef, 0xf4, 0x80, 0x0f,
-        0x72, 0xc7, 0xb7, 0x87, 0x79, 0x1a, 0x63, 0x58, 0x06, 0x17, 0xd9, 0x3e,
-        0x8a, 0x82, 0xc5, 0x38, 0x47, 0xc1, 0x5a, 0xe6, 0xca, 0xb7, 0x90, 0xa7,
-        0xd7, 0x69, 0xa1, 0x5c, 0x8f, 0xdf, 0x11, 0x72, 0x12, 0xfe, 0x5d, 0xc0,
-        0x12, 0x4d, 0x7c, 0xd7, 0xd2, 0xef, 0x80, 0x73, 0xf8, 0x45, 0x1e, 0x83,
-        0x73, 0x79, 0xd6, 0xe1, 0x7f, 0x01, 0x17, 0xc6, 0xf1, 0xb2, 0x84, 0x14,
-        0x00, 0x00, 0x00 };
-static u32 bnx2_TPAT_b09FwData[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_TPAT_b09FwRodata[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_TPAT_b09FwBss[(0x250/4) + 1] = { 0x0 };
-static u32 bnx2_TPAT_b09FwSbss[(0x34/4) + 1] = { 0x0 };
+        0x1f, 0x8b, 0x08, 0x00, 0x0e, 0x34, 0xe7, 0x45, 0x00, 0x03, 0xcd, 0x58,
+        0x5d, 0x68, 0x1c, 0xd7, 0x15, 0x3e, 0xf3, 0xb7, 0x3b, 0x52, 0x24, 0xeb,
+        0x5a, 0xd9, 0xa6, 0xeb, 0xa0, 0x34, 0x33, 0xda, 0x91, 0xac, 0x22, 0x13,
+        0x4f, 0x9d, 0x25, 0x16, 0x65, 0x21, 0x93, 0xd9, 0x91, 0xac, 0x98, 0x3c,
+        0x28, 0xc5, 0x90, 0x87, 0x52, 0x50, 0x57, 0x32, 0x09, 0x79, 0x69, 0xda,
+        0xc6, 0x90, 0x3e, 0x79, 0x3b, 0x2b, 0xc7, 0x0e, 0x6c, 0xbc, 0x8d, 0x52,
+        0xe4, 0x52, 0xfa, 0x60, 0xd6, 0xb1, 0x05, 0xcd, 0x46, 0x93, 0xd4, 0x7e,
+        0x35, 0x36, 0x4e, 0x93, 0xa7, 0x42, 0x9f, 0x52, 0xf4, 0x18, 0xd2, 0x12,
+        0xda, 0x52, 0x8a, 0x69, 0xa1, 0x09, 0x8d, 0xeb, 0xdb, 0xef, 0xdc, 0x99,
+        0x91, 0x57, 0xb6, 0xec, 0xa4, 0x25, 0x85, 0x0a, 0x56, 0x77, 0xe6, 0xce,
+        0x3d, 0xe7, 0x9e, 0x7b, 0xee, 0x77, 0xbe, 0x73, 0xee, 0x2d, 0xeb, 0x34,
+        0x48, 0xd9, 0xdf, 0x30, 0x7e, 0x2f, 0x7e, 0xf7, 0x85, 0x17, 0xab, 0x8f,
+        0x3c, 0xea, 0x10, 0x3d, 0xfa, 0x88, 0x66, 0x98, 0x06, 0x7d, 0x09, 0x7f,
+        0x50, 0x22, 0x72, 0xfd, 0xfc, 0x23, 0x5b, 0xaf, 0x9d, 0x72, 0x42, 0x8f,
+        0x6c, 0xa3, 0x26, 0xbe, 0xbe, 0xe4, 0x11, 0x05, 0xbd, 0x69, 0xa7, 0x4e,
+        0xff, 0x92, 0xcd, 0x92, 0x49, 0xdc, 0xff, 0x50, 0xed, 0xc6, 0xfe, 0xcb,
+        0x07, 0xdd, 0xeb, 0x67, 0x0d, 0xb2, 0x45, 0x6d, 0xd1, 0x16, 0x93, 0x64,
+        0x8f, 0xd5, 0x9a, 0xce, 0x2f, 0xf6, 0x1e, 0x28, 0xd0, 0xae, 0x5c, 0x97,
+        0xa0, 0xb8, 0x43, 0x4d, 0xab, 0x66, 0x53, 0xd4, 0x7e, 0x49, 0x0b, 0x3b,
+        0x9e, 0x98, 0x85, 0x8e, 0xa0, 0x04, 0xfd, 0x1e, 0xde, 0x13, 0x53, 0x8b,
+        0xce, 0xd8, 0xa4, 0xd7, 0x02, 0x3c, 0x4f, 0x51, 0xab, 0x23, 0xe5, 0x2b,
+        0xbe, 0x46, 0x4b, 0xbe, 0x4d, 0x8b, 0xc2, 0x0d, 0x1c, 0xed, 0xa6, 0xac,
+        0x4c, 0x48, 0xf9, 0x9c, 0xaf, 0x93, 0xee, 0xcd, 0x69, 0xe1, 0xfa, 0xbc,
+        0x56, 0x5f, 0x9f, 0x67, 0x7f, 0xc0, 0xbe, 0x39, 0x2d, 0x58, 0xe7, 0xb6,
+        0x66, 0xd7, 0xdb, 0xbb, 0x68, 0xb1, 0x44, 0x23, 0xba, 0x37, 0x85, 0xf9,
+        0x4a, 0xd0, 0xe3, 0x50, 0xe8, 0x4f, 0x0b, 0x9d, 0x2a, 0xf8, 0x0d, 0xd0,
+        0xac, 0x4f, 0x03, 0xba, 0xa7, 0x53, 0xa3, 0xa4, 0xd1, 0x1b, 0x55, 0x0b,
+        0xbf, 0xc3, 0x5a, 0xb4, 0xfe, 0x7c, 0xa6, 0x87, 0xc7, 0xdb, 0xf8, 0xc6,
+        0x36, 0xb3, 0x7c, 0xbf, 0xec, 0x30, 0x9e, 0x9f, 0xc3, 0x38, 0x8b, 0xc2,
+        0xea, 0xed, 0xdf, 0x06, 0xf0, 0xac, 0xa1, 0xff, 0x30, 0xec, 0x62, 0x3d,
+        0x0e, 0xec, 0x28, 0xd3, 0x4a, 0x67, 0x1e, 0xeb, 0x29, 0x50, 0x53, 0x4c,
+        0x4c, 0x35, 0xc8, 0x84, 0x8c, 0x41, 0x41, 0xe9, 0x8a, 0xd4, 0x6b, 0x52,
+        0x86, 0x55, 0x6f, 0xaa, 0xab, 0xe6, 0xd0, 0xc9, 0xf0, 0x0a, 0x14, 0xf9,
+        0xc3, 0xd4, 0x12, 0x06, 0xc5, 0xfb, 0x2c, 0x0a, 0x16, 0x4c, 0xac, 0x71,
+        0x14, 0x72, 0x1a, 0xe4, 0x5f, 0xcb, 0xf6, 0xbc, 0x48, 0xb1, 0x28, 0xa0,
+        0x7f, 0x84, 0xe2, 0xd2, 0x6e, 0x4d, 0xaf, 0xbd, 0x82, 0xfe, 0x09, 0xd1,
+        0xa5, 0x53, 0x68, 0x35, 0xbc, 0xef, 0xc6, 0x58, 0x7e, 0xd7, 0xa0, 0x8f,
+        0x44, 0x98, 0x78, 0xd4, 0x4a, 0x72, 0x59, 0xee, 0x4f, 0xfb, 0x9a, 0xc9,
+        0xed, 0xfb, 0xed, 0xc1, 0x4e, 0x41, 0x27, 0x3a, 0xb3, 0x98, 0x8f, 0x9a,
+        0x46, 0x0d, 0xe3, 0xb0, 0x37, 0xbc, 0xbf, 0x81, 0xc2, 0xc1, 0xe3, 0xdc,
+        0xcf, 0x7f, 0xe8, 0x77, 0xc8, 0xa8, 0xf1, 0xb7, 0x6f, 0x52, 0xfa, 0x2d,
+        0xb5, 0x3f, 0xf4, 0x1f, 0xcb, 0xde, 0x4b, 0x22, 0x3c, 0xf3, 0x28, 0xd6,
+        0xa8, 0x60, 0x83, 0xe7, 0x02, 0xf0, 0x11, 0xcf, 0xe8, 0xd4, 0x2c, 0x17,
+        0xc9, 0xf5, 0x8f, 0xa2, 0xf7, 0xd7, 0x6d, 0x83, 0xea, 0xec, 0x2b, 0xdf,
+        0xcc, 0x64, 0x18, 0x1b, 0x1f, 0x64, 0x76, 0x0a, 0x5a, 0x3c, 0x22, 0xe5,
+        0x8a, 0x2f, 0xa5, 0x55, 0xf3, 0x9c, 0x13, 0x34, 0x5d, 0x36, 0x69, 0x52,
+        0xa0, 0x85, 0x8f, 0xbd, 0x72, 0x83, 0x2c, 0x60, 0xa1, 0x1f, 0xff, 0xfc,
+        0xf7, 0xa6, 0x86, 0x25, 0xd0, 0xb5, 0x36, 0xeb, 0x98, 0x70, 0x66, 0x95,
+        0x8c, 0x94, 0xf1, 0xcc, 0xbd, 0x64, 0x2e, 0x65, 0x32, 0x52, 0x46, 0x55,
+        0x81, 0x3d, 0x6f, 0x0a, 0xd8, 0x87, 0x75, 0x31, 0xc6, 0x89, 0xa2, 0x9e,
+        0x6f, 0x37, 0xda, 0xb0, 0xd1, 0x43, 0xdb, 0x13, 0xf0, 0x0f, 0x51, 0x0b,
+        0x63, 0xf5, 0xea, 0x7d, 0x8c, 0x0d, 0xec, 0xef, 0x82, 0x1d, 0xb5, 0xdd,
+        0xf2, 0x29, 0x5a, 0xb0, 0xeb, 0xbd, 0xe9, 0xf2, 0x32, 0x3d, 0xc4, 0x73,
+        0xd8, 0x56, 0xed, 0x88, 0xdd, 0x55, 0x72, 0x88, 0xc4, 0x41, 0x3c, 0xf7,
+        0x88, 0xe2, 0x36, 0x69, 0xa1, 0x7f, 0x1f, 0xaf, 0x15, 0x72, 0xf3, 0x99,
+        0xdc, 0x7c, 0x26, 0x37, 0x92, 0xc9, 0x3d, 0xd5, 0x27, 0xf7, 0x14, 0xcb,
+        0x61, 0x6c, 0x90, 0x8d, 0x0d, 0xb2, 0xb1, 0x66, 0x36, 0x36, 0xca, 0xc6,
+        0xa2, 0xed, 0x8d, 0xc1, 0x36, 0x77, 0xca, 0xd1, 0x6c, 0x8a, 0x3d, 0xf9,
+        0x70, 0xe8, 0x53, 0x50, 0xf7, 0xdc, 0xcd, 0xba, 0x31, 0x42, 0xe7, 0xfc,
+        0x21, 0x5a, 0x49, 0xc6, 0x28, 0x4e, 0x56, 0x28, 0x4c, 0x74, 0xc8, 0x8e,
+        0x50, 0xd7, 0xbb, 0x2e, 0x67, 0x7d, 0x1f, 0x7b, 0x66, 0xb3, 0x5c, 0x79,
+        0x96, 0x1c, 0x7c, 0x9f, 0x16, 0xcb, 0xe4, 0x03, 0x2b, 0x3a, 0xf6, 0xad,
+        0xa2, 0x9e, 0xe3, 0xc4, 0xe7, 0x35, 0x37, 0xf5, 0xaa, 0x2b, 0x62, 0x72,
+        0xcb, 0xa1, 0x41, 0x42, 0xaf, 0xc1, 0x4f, 0x49, 0x93, 0xa2, 0xc4, 0xa6,
+        0x0f, 0x8d, 0x97, 0x54, 0x8c, 0xc6, 0x9d, 0x4d, 0x79, 0x79, 0xaf, 0x43,
+        0x57, 0x30, 0xcf, 0xc5, 0xa4, 0x4c, 0xbf, 0x4a, 0x4a, 0xf4, 0x4e, 0x42,
+        0x7a, 0xe8, 0x03, 0xc3, 0x25, 0x41, 0x6f, 0x27, 0xfd, 0x3e, 0xff, 0x88,
+        0x7d, 0x6e, 0xdf, 0x5f, 0x23, 0x7b, 0xb4, 0xc6, 0x38, 0x4b, 0x39, 0xa0,
+        0x9e, 0x72, 0x80, 0xc2, 0x52, 0xab, 0x13, 0x3f, 0x68, 0x80, 0x7f, 0x96,
+        0xfc, 0x60, 0xb7, 0xa1, 0xf6, 0xa3, 0x89, 0x3d, 0xcc, 0x5b, 0xde, 0x9b,
+        0xab, 0xce, 0x92, 0xe7, 0x9e, 0xaa, 0x33, 0x6a, 0x4f, 0x5b, 0x39, 0x2e,
+        0xfb, 0xe6, 0xf8, 0x33, 0xe6, 0x18, 0xa2, 0x06, 0xe2, 0xec, 0x09, 0x13,
+        0xb1, 0xe3, 0xfd, 0xdd, 0x60, 0x5c, 0x39, 0x1b, 0x8c, 0x6f, 0xa2, 0xf1,
+        0x0d, 0x9b, 0xd6, 0xdb, 0x45, 0x72, 0xba, 0x43, 0xb4, 0xd4, 0x19, 0xa4,
+        0xca, 0x05, 0x13, 0x63, 0xef, 0xa3, 0xca, 0xaa, 0x5e, 0xe2, 0x38, 0xae,
+        0xc3, 0xc7, 0xe3, 0x5d, 0x09, 0x7c, 0x0e, 0xd2, 0xf8, 0x9a, 0xab, 0xb0,
+        0xb3, 0xe4, 0xb5, 0x7c, 0x83, 0x7e, 0x4c, 0xd7, 0xf6, 0x15, 0xb0, 0xa6,
+        0x12, 0xf9, 0x93, 0xfd, 0xf3, 0xe9, 0x80, 0x18, 0xf7, 0xc5, 0x45, 0xda,
+        0xe5, 0x3a, 0xa4, 0xb3, 0x3e, 0x9b, 0xc6, 0x2f, 0xd8, 0x5a, 0xbd, 0xc3,
+        0x3e, 0x63, 0xfc, 0xd9, 0x19, 0xfe, 0x4c, 0x2d, 0x3c, 0x53, 0xc4, 0x5c,
+        0x7f, 0x91, 0xa1, 0x27, 0xb1, 0x0f, 0x3a, 0x2d, 0x55, 0x7f, 0x04, 0xfb,
+        0xd0, 0xd7, 0xe5, 0x6f, 0xd7, 0xb3, 0x7e, 0xd6, 0x01, 0x7e, 0xf0, 0xef,
+        0xa7, 0x90, 0xb9, 0xe0, 0x08, 0xcb, 0x14, 0x69, 0x7c, 0x95, 0xf9, 0x05,
+        0x6d, 0x97, 0xdf, 0x79, 0x6d, 0x03, 0xd4, 0x80, 0x57, 0x1a, 0x53, 0x25,
+        0xd8, 0xa5, 0x2b, 0xbe, 0x68, 0x80, 0x3f, 0x74, 0x6f, 0x10, 0x2d, 0xcf,
+        0xf7, 0x73, 0x23, 0x8f, 0xa9, 0xb8, 0x33, 0x44, 0x75, 0xe0, 0xd7, 0x84,
+        0x3d, 0xcb, 0x34, 0x51, 0x3e, 0xaa, 0xbe, 0xa1, 0xaf, 0xc7, 0xdf, 0xc4,
+        0x6d, 0xdf, 0xf0, 0xde, 0xcb, 0x6d, 0x40, 0x6c, 0x7b, 0x2d, 0xcc, 0x62,
+        0x65, 0x7e, 0xe1, 0xf1, 0xcd, 0x32, 0xf6, 0x06, 0x7c, 0x46, 0xf0, 0x25,
+        0x51, 0xb7, 0x6d, 0x82, 0x6f, 0xf4, 0xaf, 0xea, 0x2c, 0x57, 0x62, 0x3d,
+        0x58, 0xff, 0x9a, 0xa9, 0xd5, 0xcf, 0x78, 0xce, 0x1f, 0x88, 0xe5, 0x2b,
+        0xf0, 0xc1, 0xc4, 0x4c, 0x8b, 0xc7, 0xf7, 0x2c, 0xf2, 0x56, 0x9b, 0xc2,
+        0xc4, 0x9e, 0xc2, 0x73, 0x54, 0xff, 0xc9, 0x08, 0xf6, 0xda, 0x75, 0x5a,
+        0xf4, 0x5b, 0xd8, 0x53, 0x20, 0xaf, 0x6b, 0xd2, 0x1b, 0x6d, 0xf6, 0x85,
+        0x4d, 0x95, 0x35, 0x29, 0x4f, 0xfa, 0xbc, 0x27, 0xbf, 0x83, 0x5f, 0x08,
+        0x2b, 0x9c, 0x98, 0xf9, 0x08, 0xfb, 0xb3, 0xde, 0xe3, 0xbd, 0xb1, 0x94,
+        0x4f, 0xbc, 0xd5, 0x29, 0xec, 0xeb, 0x54, 0x66, 0x23, 0xef, 0x97, 0x49,
+        0x2b, 0x55, 0x9d, 0xce, 0x57, 0x3f, 0x93, 0xba, 0xc7, 0xfc, 0x5a, 0x80,
+        0x6f, 0x31, 0xae, 0x8b, 0x71, 0x49, 0x01, 0x3e, 0xfc, 0x07, 0x78, 0x45,
+        0xca, 0xf3, 0x55, 0xf4, 0xaf, 0x1e, 0x87, 0xad, 0x06, 0x64, 0x53, 0x8c,
+        0xb1, 0x3d, 0x73, 0xed, 0x7c, 0x7d, 0xde, 0xcc, 0x7b, 0x4a, 0xdf, 0x10,
+        0x4d, 0x6e, 0x0c, 0xd1, 0xb3, 0xbd, 0x21, 0x1a, 0x3f, 0xcd, 0x32, 0xe0,
+        0xa6, 0xaa, 0x27, 0x22, 0xc6, 0xa8, 0xa7, 0xfc, 0x50, 0x36, 0x74, 0x5e,
+        0x27, 0xbe, 0x6f, 0x10, 0x2d, 0xf7, 0x78, 0x0e, 0xb3, 0x4f, 0xa7, 0x4e,
+        0x87, 0x7e, 0x4a, 0x74, 0xa8, 0xc7, 0xb2, 0x5b, 0xbe, 0x83, 0x5e, 0x01,
+        0x9d, 0x82, 0x38, 0x0f, 0x19, 0x1e, 0xf2, 0xdd, 0x7a, 0x88, 0xfc, 0x15,
+        0xe1, 0x37, 0x87, 0x9c, 0xc6, 0xeb, 0x9f, 0x42, 0xfc, 0x31, 0x8f, 0xdf,
+        0xc4, 0xda, 0x0b, 0xb4, 0xe2, 0xcf, 0x63, 0x0c, 0xef, 0xf1, 0x61, 0x7c,
+        0x1f, 0x46, 0x1e, 0xc8, 0xf2, 0x84, 0xe0, 0x3c, 0xb1, 0x1b, 0x71, 0x30,
+        0x00, 0xee, 0xdf, 0x63, 0x6e, 0xcf, 0x13, 0x18, 0x57, 0xda, 0x83, 0xbc,
+        0x70, 0x3f, 0xfa, 0x59, 0xd7, 0x28, 0xda, 0x01, 0xbc, 0xef, 0xc1, 0xd8,
+        0xfe, 0x1c, 0x91, 0xcb, 0xdd, 0x2d, 0x3f, 0x20, 0x26, 0x56, 0x11, 0x2b,
+        0x6b, 0x9c, 0x27, 0x38, 0x16, 0x79, 0x4f, 0x8b, 0xe0, 0x6f, 0x1b, 0x3a,
+        0x78, 0x6f, 0x8b, 0xd8, 0x43, 0xce, 0x71, 0x82, 0x2a, 0x1b, 0x3b, 0xe5,
+        0x0f, 0x5e, 0x0f, 0x38, 0xec, 0x34, 0xaf, 0xc5, 0x15, 0x0d, 0xf0, 0x59,
+        0xb8, 0x31, 0x8d, 0xef, 0xc8, 0x85, 0x22, 0xb2, 0x1b, 0xa7, 0x53, 0x2e,
+        0x6b, 0x6c, 0x8c, 0x29, 0x9c, 0xc6, 0x89, 0xc0, 0x3b, 0x73, 0x59, 0xce,
+        0x5d, 0x8c, 0x25, 0x0a, 0x20, 0xbb, 0x19, 0x1a, 0x52, 0x2e, 0xf9, 0x23,
+        0xd4, 0x00, 0x2e, 0x03, 0xf0, 0x59, 0x03, 0x7c, 0x56, 0xef, 0xe3, 0xb3,
+        0xfa, 0xe7, 0xf2, 0x19, 0xb8, 0xaa, 0x03, 0xae, 0xea, 0x80, 0xab, 0x50,
+        0x1b, 0xbc, 0x03, 0xec, 0xbf, 0xdd, 0xd9, 0x89, 0xe3, 0x98, 0xdf, 0x98,
+        0xe7, 0xa6, 0xe8, 0xf2, 0xde, 0xff, 0x94, 0xe7, 0x8e, 0x83, 0x13, 0x6c,
+        0xfa, 0xfe, 0xde, 0x7b, 0x73, 0xdd, 0x09, 0x70, 0x9d, 0xf5, 0xf9, 0x5c,
+        0xd7, 0x64, 0xae, 0x33, 0x81, 0xbd, 0x26, 0x78, 0x40, 0x5f, 0xed, 0x9f,
+        0xe7, 0x24, 0xe6, 0xe1, 0x3e, 0x33, 0xcb, 0xa5, 0x3a, 0x75, 0x81, 0x7b,
+        0xc3, 0xe3, 0x79, 0x60, 0x73, 0x92, 0x72, 0xd1, 0x13, 0x66, 0x89, 0xac,
+        0x49, 0xe0, 0x61, 0x75, 0x88, 0x8c, 0xd3, 0xb7, 0xf0, 0x8e, 0x7a, 0x00,
+        0x71, 0x8e, 0x7f, 0x1b, 0xb9, 0x8e, 0x41, 0x70, 0x8d, 0x49, 0x85, 0x55,
+        0x0b, 0xef, 0xda, 0xb6, 0x71, 0x87, 0x90, 0x6f, 0x8c, 0x9a, 0x3b, 0xf3,
+        0x7b, 0x7e, 0xee, 0xf1, 0x98, 0x41, 0xd2, 0xd7, 0x5c, 0xc7, 0xd1, 0x5d,
+        0xff, 0x1a, 0xb8, 0xe1, 0x7d, 0x8f, 0xf9, 0x2f, 0x06, 0x0a, 0x0a, 0x64,
+        0xae, 0xca, 0xe3, 0x56, 0x8d, 0xe7, 0x6e, 0x3a, 0x88, 0x73, 0xe7, 0x35,
+        0xe0, 0x87, 0x73, 0xe7, 0xf9, 0x2a, 0xd7, 0x7b, 0x69, 0x8c, 0xb6, 0x7a,
+        0xf9, 0x9c, 0xa3, 0xb0, 0xdb, 0x82, 0x4c, 0xff, 0x58, 0xc6, 0x8b, 0x94,
+        0xcf, 0x62, 0x4d, 0x06, 0xe6, 0xb1, 0xd6, 0x6c, 0x2a, 0xac, 0xb1, 0x5f,
+        0x5c, 0xc8, 0x57, 0xc4, 0x1c, 0x6d, 0x6e, 0xe3, 0x83, 0x93, 0xbd, 0x0f,
+        0x4c, 0xe6, 0x50, 0x03, 0xb1, 0x59, 0xc4, 0xbc, 0xd6, 0x96, 0x2e, 0xca,
+        0x74, 0xb1, 0xbc, 0x57, 0x7e, 0x76, 0x4b, 0x9e, 0x79, 0x6d, 0xa2, 0xcc,
+        0xfc, 0xc5, 0x76, 0x18, 0x8a, 0x4b, 0x07, 0x33, 0x2e, 0xad, 0x60, 0x3f,
+        0x07, 0x55, 0x5c, 0xea, 0xde, 0xc3, 0x19, 0x9f, 0xee, 0x46, 0xcb, 0x7d,
+        0x37, 0xb2, 0x38, 0x31, 0x61, 0x2f, 0xeb, 0x1d, 0x24, 0x03, 0x76, 0x45,
+        0x6a, 0x4d, 0x7f, 0x93, 0x4b, 0x1e, 0x73, 0x04, 0xe3, 0x53, 0x71, 0x29,
+        0xfa, 0x27, 0x60, 0x33, 0xf3, 0x02, 0xcb, 0xb1, 0xfc, 0x4e, 0x72, 0x7f,
+        0x85, 0x9c, 0xd8, 0x41, 0x0e, 0x7d, 0x1b, 0x2c, 0xc3, 0xdc, 0x30, 0x8a,
+        0xf1, 0x21, 0xf3, 0x02, 0x7c, 0xc6, 0xb2, 0xe5, 0x2c, 0x0e, 0x23, 0x7c,
+        0xe3, 0xba, 0x97, 0xe3, 0x23, 0x20, 0xab, 0xc6, 0xeb, 0xe0, 0x9a, 0x98,
+        0xf3, 0x22, 0xd7, 0xa1, 0x5c, 0x6f, 0xe6, 0xf5, 0xa9, 0x37, 0x35, 0x7b,
+        0xb7, 0x5a, 0x53, 0xf4, 0xd7, 0x9a, 0xe8, 0xd8, 0xb1, 0xd6, 0xf4, 0xac,
+        0xb4, 0xd6, 0xac, 0x58, 0x77, 0xaf, 0x35, 0x73, 0xd9, 0x7b, 0xd7, 0x9a,
+        0x71, 0x87, 0xf7, 0x08, 0xb9, 0x54, 0xf0, 0x5a, 0xa8, 0x69, 0x66, 0x7c,
+        0x11, 0xdd, 0xc6, 0x17, 0xd1, 0x69, 0xb7, 0x7c, 0x8e, 0x38, 0xa6, 0xdd,
+        0x72, 0x8b, 0x6b, 0xa0, 0x0d, 0xae, 0x81, 0x0c, 0xe4, 0xd2, 0x7e, 0xce,
+        0xc8, 0x7d, 0xc2, 0xbe, 0x1c, 0x04, 0x27, 0xb3, 0x1f, 0x8b, 0x19, 0x3f,
+        0xa0, 0xf5, 0x3e, 0x05, 0x3f, 0xe4, 0xbc, 0xc2, 0x3e, 0xfb, 0x7f, 0xe2,
+        0x15, 0xb2, 0x07, 0xc0, 0x0f, 0x36, 0xea, 0xcd, 0x46, 0x47, 0xd9, 0x02,
+        0x5f, 0x48, 0x39, 0xe7, 0x33, 0xf6, 0x53, 0xbe, 0x50, 0x3e, 0x51, 0x78,
+        0x2c, 0xd2, 0xbb, 0x3e, 0x63, 0x01, 0xe7, 0x23, 0x8f, 0x73, 0x22, 0xf3,
+        0xef, 0x4d, 0xf9, 0xae, 0x17, 0xa2, 0x2f, 0xc2, 0x9e, 0x33, 0x0e, 0xe6,
+        0xb5, 0x43, 0xeb, 0x36, 0xe4, 0x18, 0x0b, 0xe5, 0x3b, 0xce, 0x3d, 0xe9,
+        0xf9, 0x84, 0x6b, 0xe1, 0xff, 0x16, 0x1b, 0x17, 0xef, 0x82, 0x8d, 0x37,
+        0x33, 0x6c, 0xfc, 0xf2, 0x1e, 0xd8, 0xb8, 0xf8, 0x05, 0xb1, 0xe1, 0x3a,
+        0x1f, 0xa3, 0x5e, 0x7a, 0xcf, 0x63, 0x7c, 0x48, 0xf9, 0xb1, 0xbf, 0x53,
+        0x3e, 0x09, 0x6c, 0xe3, 0xd5, 0x9b, 0x32, 0xce, 0x72, 0x89, 0xfe, 0xd6,
+        0xad, 0x5c, 0x32, 0xfe, 0x6a, 0x8a, 0x8b, 0xf1, 0xb7, 0xa4, 0x3c, 0xb7,
+        0x03, 0x0e, 0xb8, 0x56, 0xbe, 0x0a, 0x1e, 0x68, 0xd1, 0xff, 0xa2, 0x56,
+        0x66, 0xce, 0xae, 0xda, 0x47, 0xdb, 0xf9, 0xbe, 0xe7, 0x7b, 0x5e, 0xa0,
+        0xb3, 0x62, 0x17, 0xfc, 0xb5, 0x9f, 0x5a, 0xaf, 0x9b, 0x7c, 0x7e, 0x00,
+        0x1e, 0x1e, 0x37, 0x39, 0x56, 0x71, 0x56, 0xc4, 0x73, 0x7f, 0x3d, 0x0d,
+        0x3c, 0xfa, 0xbc, 0x76, 0xb5, 0xee, 0x3e, 0xae, 0xff, 0x1e, 0x4a, 0x92,
+        0x3b, 0xf2, 0xc8, 0xb6, 0x73, 0xb3, 0x81, 0x73, 0x73, 0x5d, 0xe9, 0xe0,
+        0xb3, 0x55, 0xea, 0xbf, 0x13, 0xea, 0xac, 0x7c, 0x53, 0x9e, 0x53, 0xe7,
+        0xe5, 0xd1, 0x02, 0x0d, 0xce, 0x67, 0x58, 0x61, 0x5f, 0x0c, 0xab, 0x7a,
+        0x82, 0x31, 0xd5, 0x42, 0xbe, 0x5d, 0x82, 0x3f, 0x1a, 0x2a, 0x16, 0xb0,
+        0xf6, 0xcc, 0x1f, 0x2d, 0xf8, 0xa3, 0x9e, 0xa4, 0x31, 0xf1, 0xe5, 0x9e,
+        0x1d, 0xfe, 0x88, 0x7c, 0x6a, 0x2f, 0x9a, 0x38, 0x6f, 0x5f, 0x49, 0x54,
+        0xfe, 0x5c, 0x68, 0xb5, 0xa9, 0xf9, 0x60, 0xed, 0x38, 0xd7, 0x6d, 0x5c,
+        0x77, 0xcd, 0x2c, 0x55, 0xd1, 0xd7, 0xb3, 0x29, 0x84, 0x4f, 0xbe, 0x7d,
+        0x90, 0x16, 0x8d, 0x1a, 0xe3, 0x17, 0xef, 0x09, 0x35, 0xc3, 0x83, 0xa8,
+        0xa5, 0x92, 0xb1, 0x45, 0xbd, 0x36, 0x06, 0x1c, 0x35, 0x29, 0x80, 0x9d,
+        0x01, 0x74, 0xcf, 0xb5, 0x6d, 0x7b, 0xb9, 0xcd, 0x67, 0xa4, 0x26, 0xf1,
+        0x19, 0xbc, 0xdb, 0xbb, 0x0e, 0x7d, 0x03, 0xcf, 0xe0, 0xcc, 0xea, 0xc4,
+        0xc0, 0xd5, 0xcb, 0x89, 0x45, 0xad, 0x12, 0xdf, 0x51, 0x30, 0x57, 0x96,
+        0xa1, 0xe3, 0x99, 0x42, 0x8a, 0xcb, 0x32, 0xf4, 0x70, 0xcc, 0x10, 0xe6,
+        0x63, 0xff, 0xe5, 0x58, 0x2b, 0xf7, 0xd5, 0xee, 0x85, 0xec, 0xbc, 0x4a,
+        0xca, 0x07, 0xec, 0xdf, 0xd0, 0x7b, 0xbe, 0x90, 0xdf, 0xc7, 0xb4, 0x10,
+        0xf3, 0x8d, 0x7d, 0x8c, 0x43, 0x0d, 0x78, 0xc3, 0x98, 0x84, 0xfb, 0x90,
+        0x57, 0xf6, 0x21, 0x37, 0x97, 0x8a, 0xaa, 0x6d, 0x26, 0xc7, 0xb2, 0xf1,
+        0xba, 0x1a, 0xc7, 0x39, 0x21, 0x4e, 0xd4, 0x59, 0x41, 0x8b, 0x3a, 0xe4,
+        0x34, 0x7c, 0x9c, 0x81, 0x50, 0x5b, 0xac, 0x24, 0x9c, 0xcf, 0xf7, 0xd9,
+        0xba, 0xe2, 0xb9, 0x4d, 0xc8, 0xe0, 0x79, 0x83, 0xf4, 0x86, 0xcf, 0xf7,
+        0x07, 0xd9, 0xdd, 0x46, 0x89, 0x86, 0x21, 0x0f, 0xbb, 0xc6, 0xd8, 0xae,
+        0xa0, 0xa1, 0x6a, 0x11, 0xd6, 0xbd, 0x5f, 0x4f, 0xef, 0x5c, 0x7e, 0x93,
+        0xcd, 0x65, 0x83, 0x5f, 0x08, 0xe7, 0x1d, 0x9f, 0xf3, 0xda, 0xd7, 0x0c,
+        0xba, 0x4e, 0x8a, 0x23, 0xc5, 0x37, 0x90, 0xef, 0x0e, 0x42, 0x26, 0x50,
+        0xfc, 0x92, 0x9e, 0x19, 0x72, 0x99, 0x8a, 0xb1, 0x5d, 0xc7, 0x77, 0xcc,
+        0xed, 0xef, 0x01, 0x62, 0xab, 0x9a, 0xcd, 0xd7, 0x8f, 0xd3, 0x4d, 0xe0,
+        0x74, 0xb3, 0xb0, 0x75, 0xee, 0x28, 0x15, 0x30, 0x8e, 0x6d, 0x64, 0x2e,
+        0x61, 0x99, 0x4f, 0xac, 0xed, 0x7a, 0x2a, 0x3b, 0xe8, 0xf8, 0x53, 0x9f,
+        0x8e, 0x12, 0xaf, 0x4d, 0x34, 0xd2, 0xf3, 0xb3, 0xfa, 0x6b, 0xc0, 0xcf,
+        0x38, 0x6f, 0x3c, 0xa0, 0x63, 0x1d, 0x5c, 0x7f, 0xd5, 0x55, 0x3f, 0x0e,
+        0x56, 0xdb, 0xf4, 0xfe, 0x30, 0x9b, 0x67, 0x5f, 0x1a, 0x0f, 0x1e, 0xda,
+        0x64, 0xb3, 0xcf, 0x76, 0x6b, 0x87, 0x79, 0x91, 0xd8, 0xbd, 0x19, 0x8d,
+        0xf1, 0x66, 0xd4, 0x38, 0x07, 0xe3, 0x79, 0x0b, 0x1f, 0x8c, 0xd5, 0xcf,
+        0xc7, 0xa8, 0xf5, 0x05, 0x31, 0xfa, 0x46, 0x9b, 0xb9, 0x22, 0xc5, 0x68,
+        0xe3, 0x0e, 0x8c, 0xa2, 0x06, 0x2a, 0xe5, 0xf8, 0xe4, 0x78, 0xc9, 0xf1,
+        0x99, 0x3f, 0xf3, 0xfd, 0x08, 0x38, 0x38, 0xe3, 0xb6, 0x18, 0xdc, 0x16,
+        0xa9, 0x1c, 0xe7, 0x96, 0x23, 0x4a, 0xe3, 0x78, 0x19, 0x71, 0x1c, 0x19,
+        0x9c, 0xf3, 0x38, 0x86, 0x59, 0x8e, 0xe3, 0x98, 0xe5, 0x46, 0x32, 0x39,
+        0xb4, 0x88, 0xe7, 0x28, 0x8b, 0xe7, 0x16, 0x78, 0x37, 0xca, 0xe2, 0xb9,
+        0x85, 0x18, 0x5e, 0xc9, 0xe2, 0xb9, 0x95, 0xc5, 0x33, 0xdf, 0xdb, 0x19,
+        0x55, 0x95, 0x8b, 0x9d, 0x3a, 0x78, 0x6d, 0x45, 0xe9, 0x6c, 0x62, 0x9d,
+        0xb0, 0xb1, 0x93, 0xc7, 0xc5, 0x1d, 0xf7, 0x5b, 0x58, 0xcf, 0xad, 0xbc,
+        0x32, 0x8b, 0xbc, 0x72, 0x0e, 0x79, 0xa5, 0xdb, 0x77, 0xbf, 0x75, 0x56,
+        0xe5, 0x95, 0x27, 0x8b, 0x79, 0x5e, 0xe9, 0x66, 0x79, 0xa5, 0xab, 0xf2,
+        0xca, 0x13, 0x45, 0xce, 0x2b, 0x31, 0x05, 0xc5, 0xfe, 0xbc, 0x12, 0x6f,
+        0xcb, 0x2b, 0xb9, 0x2c, 0xf7, 0xef, 0x94, 0x57, 0x72, 0x9f, 0x71, 0x6e,
+        0xb1, 0x72, 0x5e, 0xbd, 0x2d, 0x9f, 0xe4, 0x63, 0xd8, 0x56, 0xe6, 0x25,
+        0xe6, 0xe0, 0xb4, 0xae, 0xbf, 0x92, 0xe4, 0xb1, 0x74, 0x0c, 0xf3, 0xe0,
+        0xbd, 0xb3, 0x53, 0x2c, 0xd9, 0x59, 0x2c, 0x0d, 0xa7, 0x32, 0x9d, 0xfe,
+        0x78, 0x3a, 0x56, 0xdc, 0x1e, 0x4f, 0xb9, 0x9e, 0x3c, 0x9e, 0x52, 0x9d,
+        0x1f, 0x1a, 0x65, 0xae, 0x07, 0x70, 0x96, 0x76, 0xfd, 0x39, 0xf4, 0x5e,
+        0xe8, 0x4d, 0xa3, 0xae, 0x36, 0xe9, 0x6a, 0xce, 0x37, 0xea, 0xbe, 0x07,
+        0x6d, 0x2f, 0xb7, 0xb5, 0xb8, 0xf5, 0xad, 0x8b, 0xda, 0xfa, 0x7d, 0xf0,
+        0xc8, 0x79, 0xf5, 0xfd, 0x33, 0x79, 0xb5, 0x84, 0x33, 0xb0, 0x97, 0x8f,
+        0x7b, 0x1d, 0xf3, 0xb9, 0xe2, 0x2c, 0x9e, 0x5e, 0xee, 0xdd, 0x82, 0xf9,
+        0x8a, 0xc7, 0x7d, 0xff, 0x44, 0x0e, 0x41, 0x5d, 0xbe, 0x35, 0x96, 0xcf,
+        0x38, 0x1e, 0xd6, 0xec, 0xd0, 0xa5, 0x6d, 0xe7, 0x9c, 0xf4, 0x7c, 0x83,
+        0x75, 0xa3, 0x3e, 0xe1, 0x3a, 0x25, 0xfc, 0x8a, 0x4e, 0x2f, 0xd1, 0xb7,
+        0x7c, 0xee, 0xd3, 0x69, 0xf6, 0x31, 0x29, 0x5f, 0x40, 0xcd, 0xf2, 0xf4,
+        0xb6, 0x9a, 0xa5, 0x48, 0xe3, 0x07, 0xfa, 0xcf, 0x87, 0x37, 0xe5, 0xf8,
+        0xa4, 0x7b, 0x36, 0xa0, 0x40, 0x9b, 0x5d, 0xe7, 0x5a, 0x76, 0xab, 0x76,
+        0x25, 0x1a, 0xbd, 0x21, 0xf5, 0x49, 0xce, 0x85, 0x57, 0x33, 0x5f, 0xe1,
+        0xdb, 0x99, 0x1b, 0xe0, 0xd6, 0x48, 0xdd, 0xf1, 0x06, 0xeb, 0x3c, 0x0f,
+        0xbf, 0xa3, 0x4d, 0xb8, 0xbe, 0xb9, 0xdb, 0xbd, 0xab, 0x89, 0x7d, 0x71,
+        0x9d, 0xa3, 0x06, 0xa9, 0xbb, 0x8b, 0x25, 0xdf, 0xfd, 0x59, 0x8b, 0x52,
+        0x9e, 0x88, 0xfc, 0x05, 0xd8, 0x02, 0x9c, 0x8b, 0x45, 0xec, 0xcd, 0x24,
+        0x78, 0xc9, 0x75, 0x0e, 0xe8, 0x42, 0x61, 0x7f, 0x19, 0xba, 0x8d, 0x03,
+        0x5c, 0x3f, 0x7e, 0x2a, 0x97, 0x7b, 0x2a, 0x07, 0xfb, 0x8c, 0x91, 0x7a,
+        0xb2, 0x5b, 0xe7, 0x36, 0x48, 0xf8, 0xb9, 0x80, 0x79, 0x9c, 0xbb, 0xe0,
+        0xa7, 0x24, 0xa2, 0x33, 0x8e, 0x98, 0xed, 0x38, 0x62, 0xae, 0xa3, 0x03,
+        0xdd, 0xb6, 0x4d, 0xbb, 0xb0, 0x27, 0xc8, 0xc1, 0xf4, 0x00, 0x6c, 0xb9,
+        0xe0, 0x88, 0x3a, 0x6a, 0xc1, 0x1f, 0x18, 0xae, 0x78, 0x9a, 0x3e, 0xc1,
+        0x1a, 0x6f, 0xc8, 0xf4, 0xde, 0xc5, 0x11, 0xd1, 0xd6, 0xdc, 0x37, 0x30,
+        0x37, 0xdb, 0xc4, 0x31, 0xca, 0xf9, 0x72, 0x5e, 0x5b, 0x80, 0x8f, 0x8e,
+        0xac, 0x6b, 0xe0, 0x35, 0xce, 0x97, 0x23, 0xd9, 0xfd, 0x12, 0xf6, 0x07,
+        0xeb, 0xbf, 0x74, 0x47, 0xad, 0x99, 0xd7, 0x94, 0xe9, 0xdd, 0x69, 0x3c,
+        0xc3, 0xf3, 0x13, 0x6c, 0x99, 0x98, 0xba, 0xa0, 0xce, 0x3d, 0xd3, 0xa8,
+        0xf1, 0xb8, 0x95, 0xa8, 0x83, 0xf8, 0xae, 0x8b, 0x6b, 0x27, 0x89, 0xf8,
+        0x4f, 0x9f, 0x63, 0x3e, 0x13, 0xcd, 0xb0, 0x0e, 0x3e, 0x1b, 0x71, 0xfc,
+        0xfc, 0x1b, 0x2f, 0xf3, 0x0a, 0xbd, 0x68, 0x18, 0x00, 0x00, 0x00 };
+
+static const u32 bnx2_TPAT_b09FwData[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_TPAT_b09FwRodata[(0x0/4) + 1] = { 0x0 };
+static const u32 bnx2_TPAT_b09FwBss[(0x850/4) + 1] = { 0x0 };
+static const u32 bnx2_TPAT_b09FwSbss[(0x2c/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_tpat_fw_09 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
         .start_addr                     = 0x08000860,
 
         .text_addr                      = 0x08000800,
-        .text_len                       = 0x1480,
+        .text_len                       = 0x1864,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_TPAT_b09FwText,
         .gz_text_len                    = sizeof(bnx2_TPAT_b09FwText),
 
-        .data_addr                      = 0x08001ca0,
+        .data_addr                      = 0x08002080,
         .data_len                       = 0x0,
         .data_index                     = 0x0,
         .data                           = bnx2_TPAT_b09FwData,
 
-        .sbss_addr                      = 0x08001ca0,
-        .sbss_len                       = 0x34,
+        .sbss_addr                      = 0x08002088,
+        .sbss_len                       = 0x2c,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_TPAT_b09FwSbss,
 
-        .bss_addr                       = 0x08001ce0,
-        .bss_len                        = 0x250,
+        .bss_addr                       = 0x080020c0,
+        .bss_len                        = 0x850,
         .bss_index                      = 0x0,
         .bss                            = bnx2_TPAT_b09FwBss,
 
@@ -3308,732 +3279,769 @@ static struct fw_info bnx2_tpat_fw_09 = {
 };
 
 static u8 bnx2_TXP_b09FwText[] = {
-        0x1f, 0x8b, 0x08, 0x08, 0x51, 0xfe, 0x2f, 0x45, 0x00, 0x03, 0x74, 0x65,
-        0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xcd, 0x7b, 0x7f, 0x70,
-        0x1b, 0xe7, 0x99, 0xde, 0xbb, 0x0b, 0x80, 0x04, 0x29, 0x8a, 0x5a, 0x31,
-        0x30, 0x83, 0x38, 0xb4, 0x8d, 0x15, 0x17, 0x34, 0x6d, 0xf2, 0x1c, 0x58,
-        0xe5, 0xf9, 0xd8, 0x06, 0xb5, 0xd7, 0xc0, 0x92, 0xa2, 0x63, 0x26, 0x47,
-        0xbb, 0xcc, 0x9d, 0x92, 0x51, 0x7d, 0x28, 0x48, 0x29, 0x6e, 0xe3, 0xb4,
-        0xaa, 0xe3, 0x3f, 0x34, 0x4d, 0x5b, 0xc3, 0x00, 0x25, 0xcb, 0x2e, 0x44,
-        0xd0, 0x16, 0x63, 0xa5, 0x33, 0x37, 0x53, 0x18, 0x80, 0x28, 0xe7, 0xba,
-        0x24, 0xdc, 0xe4, 0x2e, 0xe9, 0x1f, 0xc9, 0x99, 0xa5, 0x6c, 0xc5, 0x6d,
-        0xae, 0x33, 0xbe, 0x3f, 0xda, 0xa6, 0x37, 0xd7, 0x19, 0x8d, 0xfc, 0x23,
-        0xce, 0x8f, 0xb9, 0xb8, 0x69, 0x7a, 0x56, 0x5b, 0xd9, 0xe8, 0xf3, 0x7c,
-        0xbb, 0x4b, 0x82, 0x32, 0x15, 0x5b, 0xd7, 0x76, 0xa6, 0x9c, 0xc1, 0x10,
-        0xfb, 0xed, 0xb7, 0xdf, 0xf7, 0xfe, 0x7e, 0xdf, 0xe7, 0xfd, 0x16, 0x71,
-        0x91, 0x6e, 0xf1, 0xff, 0x76, 0xe3, 0x93, 0x38, 0x7a, 0xec, 0xb1, 0x3b,
-        0xc6, 0xef, 0xd8, 0x2f, 0x72, 0xe7, 0x9d, 0xb2, 0x2b, 0xaa, 0xf3, 0xe6,
-        0xdb, 0x21, 0x91, 0xdc, 0x4f, 0xe5, 0xaf, 0xfc, 0x87, 0xc7, 0x8d, 0x60,
-        0x7d, 0x7e, 0x24, 0xaa, 0xa7, 0x5f, 0xcc, 0x64, 0x2c, 0x89, 0x86, 0xd2,
-        0x33, 0x9f, 0x9d, 0xb3, 0x44, 0x6c, 0x77, 0x24, 0x91, 0x95, 0xf7, 0x5a,
-        0x85, 0x58, 0x58, 0x38, 0x7e, 0x53, 0xfa, 0xca, 0xe3, 0xdf, 0xff, 0x2d,
-        0xf3, 0x9d, 0x6a, 0x48, 0xa2, 0x46, 0x3a, 0x27, 0xc6, 0x90, 0x44, 0x07,
-        0xf0, 0xcc, 0xef, 0xdf, 0x3a, 0xa5, 0x4b, 0x6f, 0xb0, 0x56, 0x5c, 0x16,
-        0x2a, 0x6f, 0xb7, 0xbe, 0x7f, 0x6b, 0x4c, 0xfe, 0x55, 0xd3, 0x90, 0x17,
-        0x9b, 0x61, 0x6d, 0xb2, 0xd2, 0x23, 0xa5, 0x8a, 0x2b, 0xc7, 0xcb, 0x05,
-        0xc9, 0x36, 0x5f, 0x90, 0xe2, 0xb2, 0xd1, 0x9b, 0x39, 0xf7, 0x07, 0x52,
-        0x5a, 0xee, 0xeb, 0xcd, 0x9e, 0x73, 0xa5, 0x58, 0x8e, 0xf7, 0x66, 0x9a,
-        0x46, 0x6f, 0xf6, 0x4c, 0x0c, 0xd7, 0x7d, 0xbd, 0x99, 0x33, 0x66, 0x41,
-        0xa4, 0x1f, 0x73, 0xe2, 0xbd, 0xd9, 0x8a, 0x99, 0x13, 0x19, 0x4c, 0xbd,
-        0x22, 0x03, 0xbd, 0xd9, 0x66, 0x4d, 0x5b, 0x37, 0x34, 0x29, 0xfe, 0x86,
-        0x18, 0xbd, 0xe9, 0xcb, 0xad, 0x4f, 0x58, 0x86, 0xec, 0xb5, 0x64, 0xcf,
-        0x1e, 0x4b, 0x9e, 0x88, 0xa7, 0xa3, 0x92, 0x3f, 0xdd, 0x25, 0xb6, 0xe2,
-        0xc9, 0x90, 0xfc, 0x99, 0x11, 0x63, 0x43, 0x22, 0x62, 0xc7, 0x82, 0xeb,
-        0x56, 0x2b, 0x93, 0xfa, 0x02, 0xe5, 0x8a, 0xbd, 0xa4, 0x77, 0xb2, 0x29,
-        0x92, 0xa9, 0x44, 0x25, 0x93, 0x7a, 0xaf, 0xe5, 0x3d, 0x13, 0xc5, 0xbe,
-        0xe1, 0xde, 0x89, 0x4a, 0xab, 0xe5, 0xa4, 0xb0, 0x47, 0x2a, 0x78, 0x36,
-        0x22, 0xd5, 0x98, 0x5d, 0x2d, 0xa5, 0x4c, 0xdd, 0xd3, 0x09, 0x79, 0xe4,
-        0xb5, 0x2d, 0xba, 0xf5, 0xdb, 0x92, 0x8f, 0x49, 0xb5, 0x98, 0xba, 0x4b,
-        0x9e, 0x4e, 0x19, 0x72, 0x12, 0xeb, 0x3d, 0x95, 0x82, 0x1c, 0xad, 0x63,
-        0x5a, 0xa6, 0x69, 0xc6, 0x45, 0x7b, 0x5a, 0x32, 0x67, 0x06, 0x8d, 0xac,
-        0x60, 0x6f, 0xab, 0x75, 0x4b, 0x26, 0x85, 0xfd, 0x46, 0xff, 0x67, 0xcb,
-        0x8e, 0x99, 0xb9, 0xaa, 0x0c, 0x48, 0xb1, 0x32, 0x98, 0xfa, 0x13, 0xd1,
-        0xa4, 0xd3, 0xa2, 0x7c, 0x5a, 0x72, 0x3f, 0xf6, 0xcd, 0x58, 0x18, 0x6f,
-        0x8a, 0xad, 0x27, 0x23, 0xf2, 0x0f, 0x0c, 0x33, 0x91, 0x09, 0xf5, 0x4b,
-        0xf1, 0x74, 0x27, 0xe8, 0xb4, 0xfb, 0x74, 0xcc, 0x3d, 0x30, 0x26, 0xb1,
-        0x5d, 0x22, 0x5a, 0x28, 0x9d, 0xc4, 0xba, 0x22, 0x45, 0x77, 0x00, 0xcf,
-        0x26, 0xc7, 0x7f, 0x2a, 0x7b, 0x24, 0xb1, 0x37, 0x2c, 0x25, 0xb7, 0x1b,
-        0x72, 0x34, 0xa0, 0x83, 0xe4, 0xf8, 0x5f, 0x40, 0x29, 0xba, 0x95, 0x8c,
-        0x1f, 0x93, 0x9c, 0x96, 0x6d, 0x76, 0x48, 0x29, 0x19, 0x95, 0x05, 0xd0,
-        0xb1, 0x90, 0xfa, 0xa2, 0x96, 0x39, 0x77, 0x50, 0xcb, 0x9e, 0xc3, 0xbc,
-        0x66, 0xdd, 0xb7, 0x35, 0x03, 0xeb, 0xe8, 0x52, 0x4c, 0x1e, 0xc4, 0xbd,
-        0xa8, 0xcc, 0x61, 0xde, 0x1c, 0x78, 0x2a, 0x35, 0xf7, 0xc8, 0xfa, 0x6c,
-        0xac, 0x37, 0x03, 0x1d, 0x16, 0x71, 0xff, 0xb7, 0x67, 0x34, 0x31, 0x2c,
-        0x5b, 0x7e, 0x3c, 0x06, 0x1d, 0x9e, 0x81, 0xfe, 0xce, 0xc4, 0xe5, 0x78,
-        0x45, 0x62, 0xba, 0x24, 0xe3, 0x79, 0x79, 0x41, 0xea, 0x2e, 0xf5, 0x0f,
-        0x7d, 0x42, 0xdf, 0x45, 0x97, 0xcf, 0x41, 0x6f, 0x15, 0x07, 0xf2, 0x98,
-        0x02, 0x0d, 0x0f, 0x6a, 0xf7, 0xd7, 0x67, 0xb5, 0x03, 0xcd, 0x1f, 0x6b,
-        0xd2, 0x7d, 0x4c, 0xfb, 0x5c, 0xf3, 0x88, 0xe6, 0xcb, 0x1e, 0xba, 0x8b,
-        0x8a, 0x3d, 0x13, 0x95, 0x95, 0xa6, 0xa7, 0xbb, 0x1a, 0xec, 0xd3, 0x36,
-        0x6c, 0xe8, 0xe1, 0x6f, 0x6f, 0xce, 0x59, 0x69, 0xc6, 0x64, 0x01, 0xb4,
-        0x1d, 0x6f, 0x72, 0xfe, 0xef, 0x41, 0x3f, 0x51, 0x71, 0x6f, 0xed, 0x91,
-        0x1c, 0xc6, 0x8b, 0x67, 0xc4, 0xce, 0xa4, 0x74, 0x3c, 0xd3, 0x2b, 0x21,
-        0xab, 0x1f, 0x9f, 0x6e, 0x99, 0xab, 0x77, 0xda, 0x21, 0x2b, 0x26, 0x73,
-        0x4d, 0xca, 0x10, 0xff, 0x2b, 0x81, 0x1c, 0x49, 0x2b, 0xc7, 0xf9, 0x1c,
-        0xc7, 0x0d, 0x8c, 0xb7, 0x8f, 0xd1, 0x2e, 0x7a, 0x41, 0x8f, 0x39, 0x2c,
-        0x18, 0xcb, 0x57, 0x92, 0xc6, 0xe7, 0xf8, 0xbf, 0x49, 0xd9, 0x06, 0x32,
-        0x0d, 0x63, 0xae, 0x2e, 0xf9, 0x3a, 0xf6, 0x39, 0x7d, 0xa5, 0x15, 0x19,
-        0xc3, 0xb5, 0xf5, 0x4b, 0xc8, 0x92, 0xfb, 0x86, 0x41, 0x93, 0x2e, 0xb9,
-        0x3a, 0xd7, 0xe2, 0x7d, 0x81, 0xee, 0x8b, 0x7b, 0x75, 0x19, 0x86, 0x7e,
-        0x4d, 0xec, 0xd3, 0x85, 0x39, 0x3d, 0x90, 0x1f, 0x78, 0x3d, 0x87, 0xef,
-        0xe0, 0x5d, 0xb7, 0x74, 0x3c, 0xdf, 0x29, 0x73, 0x29, 0xda, 0x0b, 0xe9,
-        0xdc, 0x85, 0xb5, 0xbb, 0x64, 0xfe, 0x34, 0xe5, 0x01, 0xbb, 0xaa, 0xc4,
-        0xa4, 0x74, 0xc6, 0x34, 0x1c, 0x31, 0x21, 0x1b, 0x1b, 0xf3, 0x3a, 0x25,
-        0x67, 0xb4, 0x5a, 0x13, 0xa9, 0x11, 0xe3, 0x9b, 0xca, 0xce, 0x47, 0x8c,
-        0xa4, 0x26, 0x85, 0x8e, 0xf4, 0x10, 0x64, 0x6b, 0x1e, 0x14, 0xe1, 0xf5,
-        0x0f, 0xc4, 0x9e, 0xa5, 0xff, 0xc4, 0xb8, 0x17, 0xfc, 0xa9, 0x1f, 0xf4,
-        0xd3, 0xe7, 0x06, 0xa0, 0x97, 0xb8, 0xf2, 0x83, 0x89, 0x1d, 0xfd, 0xc0,
-        0x9c, 0xaa, 0x82, 0xdf, 0xe2, 0xb9, 0x30, 0xfd, 0x2f, 0x05, 0x73, 0x93,
-        0x5d, 0x56, 0x14, 0xb6, 0x40, 0x5a, 0xc6, 0xb1, 0x7e, 0xab, 0xf5, 0xd9,
-        0x94, 0x47, 0x53, 0xf1, 0x8c, 0x8d, 0x67, 0xc3, 0x90, 0xbb, 0xf9, 0x70,
-        0x42, 0xed, 0x3f, 0xee, 0xef, 0x6f, 0xc8, 0x1c, 0xe8, 0x2e, 0x56, 0x42,
-        0x92, 0x35, 0xb8, 0xc6, 0x9f, 0x71, 0x3c, 0xe7, 0xad, 0x05, 0xbb, 0x3d,
-        0x35, 0x68, 0xdc, 0x07, 0x5f, 0xa2, 0x8f, 0x15, 0x57, 0x29, 0x63, 0xac,
-        0x33, 0x46, 0x19, 0x1b, 0x8a, 0xc6, 0xcc, 0x19, 0xda, 0x91, 0x0c, 0x84,
-        0x84, 0x76, 0x8e, 0x98, 0x01, 0xbb, 0x2a, 0xf9, 0x76, 0x95, 0x77, 0xa9,
-        0xff, 0xbb, 0x7d, 0xff, 0xd4, 0x65, 0x28, 0x49, 0x7b, 0x7f, 0x5a, 0xb2,
-        0xf0, 0xf1, 0x39, 0xec, 0x54, 0x07, 0x4f, 0xb5, 0xca, 0x20, 0x64, 0x15,
-        0xf8, 0x1d, 0xf4, 0x3b, 0xfa, 0x6e, 0x2b, 0x88, 0x05, 0xc5, 0x0a, 0x7d,
-        0xa6, 0x68, 0xe8, 0x52, 0xc0, 0x07, 0x76, 0x63, 0x99, 0xc3, 0x99, 0x90,
-        0x39, 0x93, 0x03, 0x6d, 0xb0, 0x7b, 0xc9, 0xdc, 0x49, 0x7b, 0xc6, 0x9c,
-        0xa6, 0xec, 0x0f, 0xfc, 0xac, 0xe6, 0x52, 0x4f, 0xdd, 0xd8, 0x37, 0xa0,
-        0x29, 0x8c, 0x31, 0xae, 0x13, 0x85, 0xcd, 0x07, 0x36, 0x43, 0xfb, 0x33,
-        0xed, 0x75, 0xe9, 0x90, 0xe1, 0x24, 0x62, 0xd9, 0x19, 0x1d, 0xfa, 0x1b,
-        0x40, 0x4c, 0x09, 0xcb, 0x11, 0xc8, 0xea, 0x4b, 0x15, 0xd2, 0xe7, 0xc0,
-        0xef, 0x10, 0xdb, 0xce, 0x4c, 0xc2, 0xcf, 0xa6, 0xb4, 0x09, 0xf8, 0xc4,
-        0x67, 0xea, 0xa4, 0xa9, 0x25, 0xf4, 0x4b, 0xe7, 0x5c, 0x4e, 0x9b, 0x6c,
-        0x1e, 0xd4, 0xa6, 0xce, 0xd1, 0x4f, 0xe8, 0x23, 0xa6, 0xf1, 0x80, 0x78,
-        0x3c, 0x14, 0x9b, 0xaf, 0x68, 0xf4, 0xd5, 0xe2, 0xa9, 0x2e, 0xd0, 0xb1,
-        0x0b, 0xf4, 0x18, 0xf0, 0x3d, 0xd8, 0x97, 0x65, 0xce, 0xd0, 0x66, 0x9c,
-        0xa4, 0x95, 0xf8, 0xe7, 0xf2, 0x41, 0x39, 0x4c, 0x6c, 0xca, 0x61, 0x04,
-        0x32, 0xd9, 0x2e, 0x87, 0x85, 0x0f, 0xca, 0xc1, 0x2e, 0x40, 0x0e, 0x0b,
-        0x88, 0x43, 0x0b, 0x4d, 0xf2, 0xdc, 0x12, 0xfd, 0x4e, 0x81, 0x75, 0xca,
-        0xbd, 0x7a, 0x9a, 0x36, 0x4a, 0x3f, 0x49, 0x26, 0x4a, 0x58, 0xa1, 0xe1,
-        0xf6, 0x28, 0xdf, 0x98, 0x54, 0xb2, 0xf8, 0x30, 0x7e, 0xc9, 0xdf, 0x16,
-        0xcf, 0x53, 0x75, 0xc6, 0x1b, 0xd8, 0x79, 0xd2, 0x32, 0xbe, 0x20, 0x5b,
-        0x7c, 0xdf, 0xb7, 0xc5, 0x37, 0xf6, 0x09, 0x62, 0x10, 0x79, 0x0e, 0xe2,
-        0x31, 0x6d, 0xe5, 0xa5, 0x56, 0xc8, 0xb2, 0xa0, 0x03, 0xda, 0x0b, 0x69,
-        0x30, 0x8d, 0xcf, 0x0a, 0xfe, 0x23, 0x2e, 0xd0, 0x97, 0x72, 0x6a, 0x5e,
-        0x87, 0xe4, 0xf6, 0x7a, 0xf3, 0xe7, 0x2a, 0xad, 0x5f, 0xe8, 0xe9, 0xf7,
-        0x5b, 0x99, 0x31, 0xcb, 0xf7, 0xf1, 0xa8, 0x7c, 0xb9, 0x6e, 0xe6, 0x12,
-        0x5a, 0x8f, 0x14, 0x6e, 0x40, 0x5c, 0xa9, 0xd0, 0x3f, 0xfa, 0xaf, 0x11,
-        0xcb, 0x06, 0xfc, 0x58, 0xf6, 0x13, 0xc8, 0x9e, 0xb9, 0xe7, 0xf0, 0xfb,
-        0xeb, 0x31, 0xfe, 0x4f, 0x1a, 0x33, 0xf2, 0x05, 0xe6, 0x9b, 0x3d, 0xba,
-        0x8a, 0xdf, 0x16, 0x73, 0x41, 0x21, 0x9c, 0xee, 0x96, 0xc2, 0x5e, 0x29,
-        0x84, 0xd2, 0xf4, 0x23, 0xfa, 0x46, 0x87, 0x4f, 0x77, 0x90, 0x3b, 0xf8,
-        0x77, 0x4c, 0x17, 0x8b, 0x73, 0x90, 0x27, 0x2a, 0xe4, 0xe3, 0xbd, 0x40,
-        0x27, 0x78, 0x46, 0x22, 0x9e, 0xcd, 0x4d, 0x23, 0x66, 0x52, 0xa6, 0xed,
-        0xf6, 0xc2, 0x58, 0x2a, 0x09, 0xdd, 0x62, 0x2c, 0x15, 0x23, 0x94, 0x7e,
-        0x50, 0xb3, 0xeb, 0x5f, 0xd4, 0x6c, 0xc8, 0xce, 0x86, 0xec, 0x6c, 0xc8,
-        0x2e, 0x03, 0xd9, 0x65, 0x9b, 0xa4, 0x87, 0xb4, 0x78, 0xeb, 0x3b, 0xde,
-        0xfa, 0xa0, 0xb3, 0x5f, 0xf2, 0xca, 0xc7, 0xc9, 0x2f, 0x62, 0xb2, 0x8a,
-        0x07, 0x93, 0x9a, 0x17, 0x0f, 0xb8, 0xde, 0x14, 0x9e, 0xbf, 0x1b, 0x79,
-        0xce, 0xd6, 0x75, 0x6b, 0x4b, 0x26, 0x0b, 0x6d, 0x32, 0x29, 0xb9, 0x94,
-        0x11, 0xe7, 0xd3, 0x97, 0x5d, 0xe8, 0x3d, 0x90, 0xcb, 0x34, 0x68, 0xe8,
-        0x24, 0xef, 0x3e, 0x1f, 0x5c, 0xbf, 0xcf, 0x5f, 0xff, 0xd3, 0x58, 0x93,
-        0xbe, 0xbb, 0xd3, 0xbe, 0xdc, 0x93, 0xb9, 0xf4, 0xd7, 0xf1, 0x83, 0x5a,
-        0x02, 0x31, 0xfa, 0x45, 0xf8, 0xda, 0xc5, 0x50, 0x5c, 0xbe, 0x7f, 0xeb,
-        0x6b, 0xa8, 0x2f, 0xa4, 0x70, 0x63, 0xba, 0x95, 0x08, 0xa7, 0xdf, 0x6b,
-        0x2d, 0x8c, 0x21, 0x7e, 0xa6, 0xcd, 0x78, 0x26, 0x34, 0x2a, 0x2f, 0x35,
-        0x87, 0xe5, 0x3b, 0x4d, 0x4b, 0xfe, 0xa8, 0x99, 0x90, 0x3f, 0x6c, 0x0e,
-        0xc8, 0xb7, 0x9b, 0x71, 0xf9, 0x56, 0x33, 0xa8, 0x45, 0xe2, 0xb4, 0xa5,
-        0x5e, 0xa7, 0xb9, 0x53, 0x3d, 0x04, 0x3b, 0xc7, 0x5a, 0x99, 0xb1, 0x70,
-        0x2e, 0x94, 0x56, 0x35, 0xc2, 0xcc, 0xd1, 0xf2, 0xe3, 0x2d, 0xdd, 0xb2,
-        0x0a, 0xba, 0xde, 0x33, 0x6e, 0xdc, 0x25, 0x39, 0x3d, 0x8d, 0x31, 0x77,
-        0x3c, 0xec, 0x94, 0xbb, 0x90, 0x5f, 0xa2, 0xa8, 0x65, 0x06, 0xa4, 0x80,
-        0x75, 0x0b, 0xcd, 0x56, 0x6b, 0x29, 0xf5, 0x0f, 0x3f, 0x65, 0xfc, 0x8d,
-        0x7f, 0xd9, 0x29, 0xbd, 0xdf, 0x5e, 0x37, 0x86, 0xfe, 0xbb, 0x5f, 0x0f,
-        0xa1, 0xc6, 0xea, 0x57, 0x8b, 0xe7, 0xb4, 0xf4, 0xa8, 0x93, 0x70, 0x37,
-        0x70, 0x5f, 0xa2, 0xfd, 0xd6, 0xcf, 0x51, 0x85, 0xc8, 0xee, 0x98, 0xc5,
-        0x9a, 0x6b, 0x26, 0xfb, 0x79, 0xfc, 0xff, 0x58, 0x5a, 0xf6, 0xf4, 0xe1,
-        0xff, 0xde, 0x34, 0x4c, 0x2a, 0xcd, 0x98, 0xac, 0xb5, 0xc5, 0x64, 0xd1,
-        0x1c, 0xe4, 0xdf, 0x05, 0xf0, 0xe4, 0x40, 0x1e, 0xbf, 0xd3, 0x8c, 0x6a,
-        0xd9, 0xd3, 0xfd, 0x52, 0xaa, 0x33, 0xaf, 0x71, 0x5e, 0xd4, 0xaf, 0x7b,
-        0x78, 0xdd, 0x81, 0x6b, 0x41, 0xae, 0xf9, 0x94, 0x48, 0xaf, 0xf9, 0xa3,
-        0xcf, 0x4b, 0xdd, 0xaf, 0x5b, 0x22, 0xb2, 0xac, 0x6c, 0x8c, 0xe3, 0xaf,
-        0x65, 0xbf, 0x36, 0xb4, 0x35, 0xfe, 0xec, 0xe6, 0xf8, 0x3b, 0xd9, 0x4f,
-        0x6f, 0x8e, 0x77, 0x87, 0x3d, 0x1e, 0xc6, 0xb5, 0x99, 0x66, 0xc1, 0x1f,
-        0xbb, 0x0c, 0xb9, 0xb7, 0x5a, 0x0b, 0xc8, 0x3d, 0x45, 0xeb, 0x32, 0xea,
-        0x24, 0xc6, 0x9f, 0xeb, 0x89, 0x37, 0xdb, 0x62, 0x8d, 0x91, 0x09, 0x51,
-        0x9f, 0x51, 0xf1, 0xd6, 0xe4, 0xfd, 0x4e, 0xc4, 0x9d, 0xcb, 0xf8, 0xce,
-        0x3c, 0x17, 0xc4, 0x3c, 0xce, 0xe1, 0xf3, 0x6f, 0x5f, 0x43, 0xe7, 0x31,
-        0xe8, 0xfc, 0xff, 0x1b, 0xdd, 0xe2, 0x4f, 0xe9, 0x56, 0xc5, 0x9d, 0x97,
-        0xb6, 0xd9, 0x2c, 0xe9, 0xef, 0xf6, 0x69, 0x96, 0x68, 0x38, 0x6d, 0x38,
-        0x0b, 0xd6, 0x8d, 0x12, 0x41, 0x0d, 0x4b, 0x9b, 0x2d, 0x35, 0xbf, 0x8b,
-        0xe7, 0x99, 0x27, 0x25, 0x1a, 0x49, 0xd3, 0x2e, 0xd6, 0x07, 0x32, 0xd6,
-        0x31, 0xa7, 0xe6, 0x1e, 0x73, 0xce, 0x2a, 0x3b, 0x59, 0xbf, 0xc9, 0xab,
-        0xcd, 0x7f, 0x74, 0x13, 0x6a, 0x73, 0x3c, 0xcf, 0x98, 0xcb, 0xf1, 0x46,
-        0x4f, 0xc6, 0x62, 0x0e, 0x5a, 0x72, 0x8a, 0xf8, 0x2c, 0xa8, 0xb9, 0xaf,
-        0x0e, 0x70, 0x6e, 0x67, 0x3a, 0x76, 0xd3, 0x8f, 0xf1, 0xbf, 0x23, 0xfd,
-        0xce, 0x4d, 0x17, 0x2c, 0xae, 0x3b, 0x75, 0xd3, 0x59, 0xb5, 0x46, 0x18,
-        0xf1, 0x8c, 0xf3, 0x2e, 0xdf, 0xc4, 0x67, 0x9f, 0x44, 0x1c, 0x3f, 0xe1,
-        0x42, 0x97, 0xee, 0x8b, 0x4e, 0x1e, 0x9f, 0x39, 0xd2, 0x54, 0xe1, 0x7d,
-        0xe3, 0xe6, 0x8c, 0x15, 0x56, 0xf9, 0xf6, 0x4b, 0x98, 0x73, 0x04, 0x73,
-        0x0e, 0xbb, 0x01, 0x3f, 0xea, 0xbe, 0x93, 0xc5, 0xfd, 0xc3, 0x65, 0xc3,
-        0x71, 0xca, 0xe6, 0x38, 0x6a, 0x8e, 0xf8, 0x71, 0xe4, 0xe3, 0x1c, 0x72,
-        0xa0, 0x2d, 0xe6, 0x70, 0x41, 0xd2, 0x5d, 0x93, 0xa8, 0xe5, 0x56, 0x90,
-        0x4f, 0x50, 0x87, 0xa4, 0xaa, 0x32, 0xd8, 0x95, 0x39, 0xad, 0xc3, 0x3e,
-        0xef, 0x80, 0xbd, 0x1a, 0x8e, 0x9e, 0x44, 0x5c, 0x47, 0xdc, 0x5c, 0xa8,
-        0x58, 0x5a, 0xb6, 0x3c, 0x68, 0x94, 0xe4, 0x56, 0x59, 0x37, 0xcc, 0xf8,
-        0xa4, 0xec, 0x92, 0x6c, 0x18, 0xf3, 0x86, 0x3f, 0x2e, 0xb9, 0xb8, 0x86,
-        0xd8, 0x70, 0x03, 0xe2, 0x16, 0xeb, 0xe4, 0xf6, 0x18, 0xfa, 0x0b, 0x11,
-        0xeb, 0x8b, 0x21, 0xc6, 0x9e, 0x4e, 0x8b, 0x75, 0x3f, 0xe7, 0xed, 0x92,
-        0x8d, 0x0f, 0xcc, 0x7b, 0xb7, 0x6d, 0x5e, 0xfb, 0xf8, 0x7b, 0x18, 0xdf,
-        0x25, 0x17, 0x41, 0x47, 0x38, 0x39, 0x26, 0x25, 0xf0, 0x10, 0x39, 0xd5,
-        0x6a, 0x5d, 0x00, 0x3f, 0x3a, 0xf8, 0x2f, 0x56, 0x59, 0x0b, 0x84, 0xa4,
-        0x6a, 0xe0, 0x9e, 0xdb, 0x6a, 0xd5, 0x10, 0x46, 0xf5, 0x55, 0xd2, 0x1c,
-        0x95, 0x49, 0x77, 0x48, 0xec, 0x06, 0xe5, 0x60, 0xc2, 0xeb, 0xfe, 0xac,
-        0x2b, 0x7b, 0x86, 0x39, 0x13, 0x16, 0xb1, 0xfa, 0xe7, 0x5d, 0x19, 0xe4,
-        0x3e, 0x7d, 0xf5, 0x62, 0x57, 0x16, 0x7a, 0x0f, 0xad, 0xfe, 0xe7, 0x2e,
-        0xe7, 0x34, 0xe9, 0x0a, 0x21, 0xf7, 0xdd, 0x22, 0x45, 0xa3, 0x25, 0xdf,
-        0x44, 0x8d, 0x50, 0x1c, 0x46, 0x2e, 0x83, 0x17, 0xe8, 0xa0, 0xbb, 0x60,
-        0x48, 0xb4, 0x3b, 0xfd, 0x7d, 0xd0, 0x37, 0x06, 0xd9, 0xec, 0xc2, 0x9c,
-        0x10, 0xc6, 0x87, 0xf0, 0xbf, 0x7d, 0xfc, 0x8d, 0x2e, 0xe4, 0x05, 0xc4,
-        0x60, 0x89, 0x66, 0xc6, 0x7a, 0xb0, 0xfe, 0xf7, 0x30, 0x8e, 0x09, 0xc9,
-        0xcd, 0xf1, 0x27, 0xbc, 0xf1, 0xb7, 0x41, 0x0b, 0x9f, 0x63, 0x8d, 0x22,
-        0xd1, 0xb9, 0x31, 0x03, 0x34, 0x70, 0x6e, 0x4c, 0xcd, 0x75, 0xce, 0xd0,
-        0x06, 0x0c, 0xa7, 0x66, 0xdd, 0x2c, 0xd9, 0xe5, 0x7e, 0x99, 0x5c, 0xee,
-        0x93, 0x03, 0xcb, 0xe6, 0x4c, 0x95, 0xd8, 0x0f, 0x3c, 0x0b, 0xea, 0x30,
-        0x7d, 0x55, 0x20, 0x01, 0x33, 0x7e, 0x44, 0x06, 0xe3, 0x5f, 0x92, 0x5f,
-        0xb6, 0x90, 0xef, 0x91, 0xeb, 0x7b, 0x24, 0xac, 0xd6, 0x89, 0x07, 0x7b,
-        0xd2, 0x46, 0xb7, 0xed, 0xeb, 0x9c, 0xb9, 0xd6, 0xba, 0x70, 0xfe, 0xd5,
-        0xf8, 0x55, 0xeb, 0xfe, 0x85, 0xbf, 0xae, 0x81, 0x75, 0x07, 0xb0, 0x26,
-        0x79, 0x34, 0xbb, 0x26, 0x4e, 0x8b, 0xdd, 0x09, 0xfa, 0x9c, 0xe4, 0x8d,
-        0xc0, 0x86, 0xfd, 0x72, 0x62, 0x99, 0xf1, 0x42, 0xfa, 0xf1, 0x19, 0x8d,
-        0x48, 0x72, 0xf8, 0x1c, 0xea, 0xae, 0x09, 0xb5, 0x86, 0x57, 0x93, 0xe9,
-        0xab, 0x29, 0xd4, 0xc4, 0x3f, 0x05, 0x3d, 0xac, 0x15, 0xc8, 0x73, 0x18,
-        0xfc, 0xa6, 0x50, 0x8b, 0x11, 0x47, 0xb5, 0x1e, 0xcf, 0xa4, 0xf0, 0xfd,
-        0x5c, 0xa2, 0x2b, 0x8b, 0x98, 0x08, 0xff, 0xbe, 0x39, 0xa4, 0x72, 0x18,
-        0xf5, 0x32, 0xda, 0x45, 0x3c, 0x83, 0xe7, 0xa1, 0x27, 0xca, 0x68, 0xbc,
-        0xcb, 0xa9, 0x50, 0x46, 0x02, 0x7a, 0x2c, 0xd8, 0x64, 0x58, 0x61, 0x29,
-        0x7d, 0xd5, 0xc6, 0xbc, 0xb7, 0x42, 0xac, 0x77, 0x33, 0x16, 0xbf, 0x23,
-        0xe6, 0xac, 0x4e, 0x61, 0x2e, 0xbf, 0xdf, 0x85, 0x75, 0x07, 0x87, 0x8b,
-        0xd2, 0x31, 0x7c, 0x18, 0xf1, 0x4e, 0x1f, 0x1b, 0x01, 0x6d, 0xb4, 0xf3,
-        0x16, 0xb0, 0xc0, 0x6f, 0x81, 0x1f, 0xf8, 0x46, 0xd2, 0x92, 0xf9, 0x25,
-        0xca, 0x55, 0x3e, 0x0e, 0x1e, 0xc0, 0x7f, 0x12, 0x71, 0x8d, 0x3c, 0x70,
-        0x6f, 0x41, 0x8e, 0xbe, 0x5b, 0xf2, 0x4b, 0x51, 0x55, 0xeb, 0xdb, 0x06,
-        0xf7, 0xd7, 0x34, 0x3d, 0xdd, 0x0d, 0x1d, 0x93, 0xb7, 0x1c, 0x68, 0x7b,
-        0x0c, 0x79, 0x80, 0xbc, 0x91, 0x2f, 0xfa, 0xca, 0x28, 0xfc, 0x84, 0xf4,
-        0xfb, 0xb6, 0xa7, 0xad, 0x23, 0xa6, 0xa8, 0x38, 0x98, 0xca, 0x20, 0xb0,
-        0xbd, 0xd4, 0x1c, 0x97, 0x3f, 0x6e, 0x8e, 0xc9, 0x77, 0x9b, 0x29, 0xe4,
-        0xc0, 0x51, 0xe4, 0xc0, 0x61, 0xe4, 0x40, 0x0b, 0x39, 0x30, 0x81, 0x1c,
-        0x38, 0x80, 0x1c, 0x18, 0x47, 0x9c, 0x14, 0x39, 0xa1, 0xf2, 0x6d, 0x2c,
-        0x0a, 0xcc, 0x1d, 0xb5, 0x9b, 0x0e, 0x78, 0x99, 0xc1, 0x5e, 0xb3, 0xe0,
-        0xeb, 0x50, 0xd7, 0x44, 0x65, 0x1c, 0x31, 0xd7, 0x42, 0x3c, 0x4a, 0x20,
-        0xdf, 0x8c, 0x01, 0x6b, 0x89, 0x6c, 0x2c, 0x25, 0x10, 0x13, 0x5b, 0xe2,
-        0x00, 0x13, 0x97, 0x8c, 0x14, 0x9e, 0xdd, 0xab, 0xec, 0x33, 0x94, 0xbe,
-        0x3b, 0x2c, 0xdd, 0xa3, 0x92, 0x2f, 0x9f, 0xc4, 0x58, 0x1c, 0xeb, 0x75,
-        0x21, 0x2f, 0x31, 0x2e, 0x30, 0x06, 0x2c, 0x39, 0xbf, 0x6b, 0xd1, 0xd7,
-        0xba, 0xb5, 0xcc, 0xe9, 0x82, 0x30, 0x96, 0x23, 0x0f, 0xc0, 0x1e, 0x38,
-        0x36, 0x89, 0xe7, 0xf8, 0xfd, 0x2f, 0xfd, 0x98, 0xf9, 0xb1, 0x4e, 0x81,
-        0xd1, 0xbe, 0xc4, 0x9c, 0x67, 0x61, 0x3d, 0xb7, 0xdd, 0x4f, 0x9f, 0x47,
-        0xad, 0x14, 0xdc, 0x27, 0xae, 0x66, 0x3f, 0xe1, 0x24, 0x68, 0x1e, 0x04,
-        0xbe, 0x47, 0x6d, 0x75, 0xb0, 0x8a, 0xef, 0xed, 0xf3, 0x5d, 0xcc, 0x57,
-        0x63, 0x51, 0x23, 0x6d, 0xb1, 0x9e, 0x43, 0xac, 0x3c, 0x86, 0xb8, 0x68,
-        0x3b, 0xfa, 0x5a, 0x03, 0x7c, 0x42, 0x8e, 0x65, 0xdb, 0x09, 0x0f, 0xbd,
-        0xd6, 0x7a, 0xd6, 0x1a, 0x96, 0x89, 0xb5, 0x31, 0xc9, 0xae, 0x0d, 0xc6,
-        0xcf, 0x4b, 0xd7, 0x65, 0x5b, 0x5e, 0x6b, 0x95, 0x5c, 0xf3, 0xa4, 0x0d,
-        0xbb, 0xdc, 0xb7, 0xdf, 0x90, 0x1a, 0x30, 0xdc, 0xbe, 0xfd, 0x9d, 0xac,
-        0xe9, 0x5f, 0x14, 0x3d, 0x21, 0x99, 0x45, 0x5b, 0xc6, 0xf6, 0x07, 0xb5,
-        0xe7, 0x2f, 0x3b, 0xa4, 0x1b, 0x63, 0x6b, 0x09, 0xcc, 0x61, 0xdd, 0xaf,
-        0xfa, 0x27, 0xe0, 0x59, 0xf3, 0x9e, 0x51, 0x39, 0x8f, 0x98, 0x19, 0xbc,
-        0x37, 0x6d, 0xe7, 0xfc, 0x22, 0x70, 0x0d, 0xe4, 0x99, 0x59, 0x24, 0xee,
-        0xda, 0x05, 0x39, 0x45, 0x60, 0x23, 0xd4, 0xfd, 0x20, 0x9e, 0x6d, 0xc9,
-        0x57, 0x53, 0xb4, 0x87, 0xc7, 0x20, 0x4b, 0xac, 0x15, 0x0e, 0xf8, 0xf9,
-        0x9a, 0xcc, 0x2d, 0x51, 0x7e, 0x71, 0xd4, 0x96, 0xdc, 0x5b, 0xa2, 0x5d,
-        0xe9, 0xab, 0xeb, 0x46, 0xdb, 0xd9, 0x58, 0xc4, 0xfa, 0x43, 0xc4, 0xd8,
-        0x88, 0xd5, 0x65, 0xf6, 0x06, 0x58, 0x53, 0x1d, 0x80, 0x4e, 0xa6, 0x15,
-        0xe6, 0xce, 0xd4, 0x53, 0x62, 0x9d, 0x62, 0xac, 0x92, 0x44, 0xc8, 0x22,
-        0xbe, 0x17, 0x43, 0x4f, 0xcf, 0xe2, 0x1e, 0xe5, 0xc9, 0x5a, 0x1f, 0xf7,
-        0x57, 0xff, 0xa3, 0xd2, 0x49, 0x08, 0xba, 0xcb, 0xef, 0x67, 0x11, 0x22,
-        0x4b, 0xa1, 0x34, 0x62, 0xe0, 0x18, 0x79, 0x50, 0x7b, 0xa3, 0x9e, 0xa4,
-        0xdf, 0x81, 0x67, 0xd8, 0x46, 0x5b, 0x5d, 0xa9, 0xfe, 0x4a, 0x95, 0x08,
-        0x6c, 0x59, 0x0a, 0x91, 0x34, 0x78, 0x1a, 0xc3, 0x77, 0x38, 0xff, 0x09,
-        0xe8, 0xf3, 0x2c, 0x9e, 0x5f, 0x00, 0x5f, 0x1b, 0x65, 0xd2, 0x9d, 0x4c,
-        0x1c, 0x57, 0xbe, 0x8b, 0x6b, 0x97, 0xb5, 0xcc, 0xd7, 0xe4, 0xbc, 0xe2,
-        0xef, 0x13, 0xac, 0x9d, 0xa1, 0xa7, 0xeb, 0xe1, 0x6f, 0xf2, 0x3a, 0xf9,
-        0xf3, 0xd6, 0x67, 0xce, 0xca, 0x58, 0x09, 0xc9, 0x96, 0x5f, 0x6a, 0x85,
-        0x2d, 0x2b, 0x3e, 0xef, 0xeb, 0x31, 0xeb, 0x46, 0x41, 0x07, 0xfb, 0x00,
-        0xfb, 0x95, 0x2e, 0x41, 0x07, 0x6d, 0xa7, 0x10, 0x4d, 0x3f, 0x2e, 0x2b,
-        0x4b, 0xff, 0x54, 0x6a, 0x4b, 0x05, 0xa9, 0x2f, 0xfd, 0x23, 0x39, 0xb7,
-        0xd4, 0x92, 0x0b, 0x29, 0x15, 0x93, 0xac, 0x0e, 0xe5, 0xcf, 0x72, 0xa3,
-        0x87, 0x07, 0x93, 0xe3, 0x97, 0x20, 0xc0, 0x95, 0xaa, 0x47, 0xfb, 0x54,
-        0x1b, 0xed, 0x17, 0x60, 0x6b, 0xaf, 0x58, 0xa4, 0x7f, 0x4c, 0x6a, 0x65,
-        0xd2, 0xfe, 0xa0, 0xa2, 0xfd, 0xc0, 0x26, 0xed, 0x92, 0x0b, 0x59, 0xa4,
-        0x7f, 0x27, 0xda, 0x81, 0xf3, 0xfb, 0x49, 0x7f, 0x02, 0xcf, 0x7e, 0xd0,
-        0xfe, 0x6a, 0xee, 0x6b, 0xad, 0x8d, 0x72, 0x44, 0xd1, 0x1c, 0x4a, 0x8f,
-        0x41, 0x3e, 0xaf, 0xb5, 0xd6, 0x5d, 0xfa, 0x11, 0xbe, 0xbb, 0xf7, 0x20,
-        0x46, 0xf5, 0x61, 0xaf, 0x5e, 0xc9, 0xcf, 0x46, 0x11, 0x27, 0xc7, 0xa1,
-        0xdb, 0x2e, 0xe5, 0x87, 0x08, 0x17, 0xd0, 0xd9, 0x34, 0xe6, 0x1f, 0xa2,
-        0xbf, 0x29, 0xb9, 0x38, 0x90, 0x4b, 0xb1, 0x9c, 0x8e, 0xa0, 0xfe, 0xc7,
-        0x3e, 0x86, 0x93, 0x73, 0xf9, 0xcc, 0x00, 0x62, 0x1a, 0xff, 0x7f, 0x64,
-        0x7b, 0x28, 0x20, 0xd6, 0x42, 0xe7, 0x3d, 0x90, 0x1f, 0xe8, 0x18, 0x9b,
-        0x41, 0x6e, 0x4d, 0x0e, 0xd7, 0x54, 0x7f, 0x91, 0x71, 0xe5, 0x28, 0xf2,
-        0xe9, 0x21, 0x7c, 0xbc, 0xfd, 0x26, 0x9a, 0xdc, 0x73, 0x3b, 0x4f, 0x45,
-        0x77, 0x7d, 0x2f, 0x01, 0x52, 0xa6, 0xc9, 0x7d, 0x0b, 0x12, 0x4a, 0x87,
-        0xb0, 0x2f, 0xc7, 0x7a, 0x10, 0x63, 0x06, 0xa2, 0xd9, 0xe6, 0xcf, 0x31,
-        0x4e, 0x5f, 0x66, 0x7c, 0x0f, 0x68, 0x1f, 0xc5, 0x9a, 0x8c, 0xbb, 0x63,
-        0xe0, 0x99, 0x35, 0x26, 0xe3, 0x26, 0xf2, 0x48, 0xe3, 0x47, 0xcc, 0x2d,
-        0xf8, 0x3e, 0xe0, 0x7f, 0xe7, 0x7d, 0x89, 0xde, 0x9c, 0x36, 0xab, 0x05,
-        0x31, 0xb1, 0x27, 0x74, 0x6e, 0xc5, 0xa5, 0xd8, 0x30, 0x5f, 0x20, 0x66,
-        0xd4, 0x29, 0x83, 0x35, 0xca, 0x89, 0xfd, 0x27, 0xd4, 0x7f, 0xb5, 0xe7,
-        0x21, 0x8f, 0xa8, 0xec, 0xb5, 0x0e, 0x22, 0xa6, 0x80, 0xfe, 0xca, 0x18,
-        0x78, 0x63, 0x8f, 0x66, 0x10, 0xf9, 0x2b, 0x04, 0x21, 0xa0, 0x96, 0x5a,
-        0x0b, 0xc9, 0xbd, 0xe1, 0x11, 0xa3, 0x28, 0x8f, 0x46, 0x58, 0x36, 0x17,
-        0xd6, 0x98, 0x07, 0xc2, 0xb2, 0xb0, 0x26, 0x72, 0x69, 0x91, 0x71, 0x45,
-        0xfd, 0x41, 0xe6, 0x86, 0x33, 0x8f, 0x3c, 0x5b, 0x5a, 0x62, 0x8c, 0x61,
-        0x9c, 0xb8, 0x01, 0xba, 0x48, 0x7e, 0xe3, 0xab, 0xc8, 0x49, 0xa5, 0xf2,
-        0x20, 0x62, 0xa6, 0xac, 0xeb, 0x90, 0x29, 0x72, 0x19, 0x6b, 0xd4, 0x1d,
-        0xfa, 0x32, 0x41, 0x4f, 0x26, 0x2a, 0xc5, 0x45, 0xf6, 0x63, 0xa2, 0xa0,
-        0x85, 0x35, 0x76, 0x48, 0xd5, 0x3f, 0x37, 0xa8, 0xd8, 0xca, 0xff, 0xe1,
-        0xb6, 0x7d, 0x93, 0x27, 0xf7, 0xe9, 0x8c, 0x63, 0x37, 0x8b, 0x3d, 0x63,
-        0x77, 0x1d, 0xa8, 0x74, 0x48, 0xb5, 0x8f, 0x76, 0x49, 0xfd, 0xbf, 0xa0,
-        0x62, 0xed, 0x02, 0x78, 0x2a, 0x2e, 0x12, 0xe3, 0x86, 0x31, 0x2f, 0xe6,
-        0xcf, 0xa3, 0x5c, 0xff, 0x89, 0xcc, 0xed, 0x7f, 0x17, 0x74, 0x79, 0x71,
-        0x2d, 0xbf, 0x1f, 0xf1, 0x76, 0x46, 0x97, 0x3b, 0xef, 0x1a, 0xc7, 0xb3,
-        0xcc, 0x81, 0xef, 0xf8, 0x78, 0x92, 0x63, 0xec, 0x61, 0x81, 0xbe, 0x15,
-        0x03, 0xff, 0xfb, 0xa4, 0xb0, 0x12, 0x85, 0x1c, 0x90, 0x4b, 0x6b, 0xde,
-        0x5a, 0xac, 0x77, 0x4f, 0x42, 0x47, 0xfa, 0xa9, 0xa8, 0x44, 0x4e, 0xf5,
-        0x49, 0xf8, 0xeb, 0xdd, 0xd2, 0xf1, 0xf5, 0x21, 0x09, 0x7d, 0xdd, 0x64,
-        0x4e, 0x4f, 0x9c, 0x80, 0xbe, 0xe6, 0x65, 0x5c, 0x9e, 0x44, 0xde, 0x62,
-        0x5e, 0x57, 0x76, 0x6a, 0xf4, 0x4b, 0x08, 0x05, 0xab, 0xfe, 0x8c, 0x2d,
-        0x8f, 0xee, 0xff, 0x85, 0xea, 0x33, 0x01, 0xc3, 0x8b, 0xfe, 0xfc, 0x94,
-        0xd8, 0xcd, 0x77, 0x21, 0x6b, 0xc3, 0x79, 0xed, 0xd6, 0xa0, 0xa6, 0x1c,
-        0x56, 0xfd, 0xc2, 0x47, 0xf7, 0x7b, 0x35, 0x25, 0xf0, 0xb8, 0xe6, 0xa8,
-        0x9a, 0x12, 0xf1, 0x35, 0xcc, 0x79, 0xfd, 0xa2, 0x63, 0xaf, 0xbc, 0x0c,
-        0x42, 0x4f, 0xb7, 0x88, 0x7d, 0x08, 0x7e, 0xf1, 0x9c, 0x2c, 0xe9, 0x69,
-        0x4d, 0xad, 0x19, 0x7a, 0x86, 0x71, 0x8a, 0xf1, 0x8b, 0x36, 0x9e, 0x4c,
-        0x14, 0x61, 0x7f, 0xa1, 0xe7, 0x19, 0xa3, 0x3c, 0xdb, 0x9e, 0x68, 0x8b,
-        0x75, 0x0b, 0x95, 0x7b, 0xa0, 0x43, 0xd4, 0xf2, 0x16, 0xe2, 0x9c, 0x81,
-        0x5c, 0x6e, 0xf1, 0xda, 0xeb, 0xe1, 0xe5, 0x63, 0x31, 0x75, 0x5d, 0xac,
-        0x7a, 0x18, 0xdc, 0x5b, 0x9f, 0x75, 0x07, 0x62, 0x4c, 0x93, 0x74, 0x70,
-        0xdf, 0x01, 0x09, 0x3d, 0x17, 0x93, 0xf0, 0x73, 0xb4, 0x3f, 0x33, 0xe1,
-        0x40, 0x7e, 0x0b, 0x16, 0x31, 0xd0, 0x0a, 0xb0, 0xc5, 0xcd, 0xa2, 0xaf,
-        0x0c, 0xc0, 0x77, 0xcc, 0x78, 0x55, 0x92, 0x12, 0xaa, 0x45, 0xe5, 0xad,
-        0x45, 0x33, 0x41, 0x7b, 0x39, 0x6b, 0x61, 0xbc, 0xd9, 0x75, 0x79, 0x5d,
-        0x51, 0xc1, 0xb1, 0x2f, 0x87, 0x80, 0x19, 0x86, 0x6d, 0xbd, 0x47, 0x5e,
-        0x87, 0xbe, 0x73, 0x6a, 0xec, 0x66, 0xac, 0x0b, 0x1a, 0x9e, 0x33, 0xc1,
-        0x03, 0xd7, 0xfd, 0x1e, 0xd6, 0x54, 0xf8, 0xca, 0xd9, 0x60, 0x4d, 0xba,
-        0x48, 0xdb, 0xed, 0x83, 0xdd, 0xe1, 0xba, 0xd9, 0x21, 0xb9, 0xd9, 0x84,
-        0xe8, 0x8b, 0x9f, 0x91, 0xc1, 0xfd, 0xba, 0xc7, 0x8f, 0xe2, 0x91, 0x63,
-        0xec, 0xc7, 0xdd, 0xae, 0xfc, 0x51, 0x5f, 0x83, 0xcd, 0x3c, 0x48, 0x1d,
-        0x23, 0xf7, 0x23, 0x8f, 0x31, 0x8e, 0x85, 0x90, 0xc7, 0xb2, 0x4d, 0x4f,
-        0xef, 0xd5, 0x07, 0xfb, 0xe5, 0xc9, 0xe7, 0x68, 0x4f, 0xb8, 0xb7, 0x69,
-        0x53, 0x41, 0x0f, 0x98, 0xf7, 0x2c, 0x39, 0xf9, 0x6c, 0x50, 0x73, 0xb0,
-        0xbe, 0x32, 0xe3, 0x07, 0xc0, 0x8f, 0x7e, 0x27, 0xe3, 0x81, 0xae, 0x6c,
-        0x37, 0x6f, 0x59, 0x5e, 0xdd, 0x51, 0x49, 0xb0, 0x2f, 0x6e, 0xb0, 0x4e,
-        0xb3, 0xe3, 0x9e, 0xbc, 0x8b, 0x18, 0x2b, 0x35, 0x67, 0x11, 0xa3, 0x23,
-        0x72, 0x71, 0xd6, 0x86, 0xee, 0x3f, 0x0b, 0xba, 0x0e, 0x75, 0x11, 0x23,
-        0x5f, 0x9c, 0x75, 0x70, 0x7d, 0x48, 0xd5, 0x66, 0xa1, 0x3b, 0x61, 0xc7,
-        0xcd, 0x7e, 0xfa, 0x91, 0xaf, 0xa7, 0x84, 0x56, 0x5c, 0x32, 0xb5, 0x12,
-        0x62, 0xf6, 0x64, 0x8a, 0x39, 0xbe, 0x53, 0xf5, 0x4d, 0xd9, 0xaf, 0xc9,
-        0x2b, 0xbc, 0xb0, 0x4f, 0x2b, 0x56, 0x19, 0xe7, 0x0b, 0xf1, 0x0e, 0x21,
-        0x0e, 0x11, 0xad, 0x66, 0x51, 0x27, 0x9a, 0x9c, 0x57, 0xbd, 0x58, 0x11,
-        0xc7, 0x3d, 0x42, 0x19, 0x68, 0xf5, 0xea, 0x3e, 0xad, 0x50, 0x0d, 0xc9,
-        0xc5, 0x18, 0xe9, 0x4e, 0xa8, 0xfa, 0x7d, 0xbf, 0xb2, 0xb5, 0x1e, 0xe4,
-        0x12, 0xd8, 0x4c, 0xea, 0x93, 0xd8, 0x57, 0x8d, 0xc1, 0xa6, 0xa8, 0x7b,
-        0xea, 0x5d, 0xc5, 0x48, 0x5f, 0xf7, 0x3b, 0xe5, 0x4c, 0xd0, 0x51, 0x26,
-        0x7e, 0xef, 0xf4, 0xf1, 0xfb, 0xa2, 0x5f, 0x0f, 0x3d, 0x26, 0xac, 0x53,
-        0x16, 0x2a, 0xa4, 0x05, 0xf1, 0xd6, 0xdd, 0xc9, 0x96, 0x28, 0x47, 0x2f,
-        0xa6, 0x1c, 0x45, 0x1d, 0xa3, 0xaf, 0x19, 0xbe, 0x0d, 0xf0, 0x6f, 0x14,
-        0xf7, 0xbc, 0x5a, 0xaa, 0xd8, 0x8c, 0xc0, 0xdf, 0xa7, 0x21, 0x23, 0xea,
-        0x06, 0xfa, 0x5b, 0xe3, 0x99, 0x0a, 0xf4, 0xb7, 0xf6, 0xf2, 0xfb, 0x76,
-        0x1f, 0x63, 0xde, 0xb0, 0x3c, 0x89, 0xf1, 0x13, 0x67, 0x48, 0xcf, 0xb8,
-        0x8f, 0xc7, 0x12, 0x90, 0x09, 0x63, 0xfc, 0xa8, 0xbc, 0xd5, 0x70, 0x14,
-        0xfe, 0xdb, 0xb7, 0x7f, 0x46, 0xe6, 0xdd, 0x59, 0xe0, 0x3f, 0xc8, 0xdf,
-        0x48, 0xc0, 0x3f, 0xe3, 0x2a, 0x3e, 0x1e, 0xfe, 0x68, 0x35, 0x49, 0xd8,
-        0xcb, 0xd9, 0xf7, 0x5e, 0x67, 0xce, 0xde, 0x0d, 0xfc, 0xf5, 0x91, 0xd6,
-        0x0f, 0x79, 0xeb, 0xff, 0x17, 0xe8, 0xea, 0x73, 0xd8, 0x23, 0x0a, 0xfa,
-        0xfa, 0x29, 0xd3, 0x0f, 0x7b, 0x4e, 0xf7, 0x9e, 0xbb, 0xff, 0x3a, 0xe9,
-        0x32, 0xa4, 0x01, 0x8c, 0x50, 0x50, 0x79, 0x94, 0xb5, 0x62, 0xc4, 0xd7,
-        0xdf, 0x31, 0x60, 0x67, 0xae, 0x1b, 0xc4, 0xde, 0x4e, 0x29, 0xf4, 0x05,
-        0xf5, 0x27, 0x62, 0xf6, 0xe6, 0x78, 0x50, 0xcf, 0xf2, 0xf9, 0x94, 0x93,
-        0x2f, 0xb3, 0x4f, 0xc8, 0x5c, 0xc0, 0x31, 0x65, 0x87, 0x1f, 0x42, 0xb7,
-        0x09, 0xcf, 0x20, 0xdd, 0xf7, 0x29, 0xba, 0x1d, 0x45, 0x37, 0xfd, 0x8b,
-        0x67, 0x3a, 0xec, 0xa3, 0x05, 0x7d, 0x33, 0xae, 0x07, 0x4c, 0x00, 0x7d,
-        0x7f, 0x17, 0x3a, 0xfe, 0x4e, 0x05, 0x98, 0xa0, 0x02, 0x4c, 0x80, 0x3d,
-        0xbe, 0x0d, 0x1d, 0x7f, 0xab, 0x02, 0x4c, 0x50, 0x89, 0xfb, 0x3d, 0x0a,
-        0x9b, 0x98, 0xfe, 0x23, 0xda, 0x6e, 0xd0, 0x93, 0xb9, 0xda, 0x2e, 0x39,
-        0xce, 0xf9, 0x01, 0x36, 0x8e, 0xc2, 0x8e, 0x78, 0x6e, 0x11, 0xf4, 0x3b,
-        0xfc, 0x1c, 0xd1, 0xe0, 0xb9, 0x00, 0x72, 0x44, 0x83, 0xe7, 0x18, 0x23,
-        0xf1, 0x10, 0x30, 0x61, 0x48, 0xe2, 0xc2, 0x5e, 0xef, 0xdc, 0x18, 0xd6,
-        0x1a, 0x1d, 0x84, 0x27, 0x75, 0xa8, 0xbe, 0xd6, 0x71, 0xd5, 0x6f, 0x40,
-        0x5c, 0xa8, 0x06, 0xb5, 0x5b, 0x52, 0x26, 0x96, 0x88, 0x33, 0x65, 0xaf,
-        0x9e, 0x86, 0x0e, 0x5c, 0x62, 0xc3, 0xcd, 0xbe, 0xf4, 0x70, 0x1d, 0x7b,
-        0x16, 0x2d, 0x8f, 0xbe, 0xe3, 0xee, 0xd6, 0x33, 0x07, 0x10, 0x9f, 0xa7,
-        0xca, 0x09, 0x99, 0x2c, 0x7b, 0x98, 0x00, 0xf5, 0xcf, 0x55, 0xfd, 0x51,
-        0x9b, 0x7a, 0x80, 0xfe, 0x36, 0x6d, 0x23, 0x71, 0x3e, 0x45, 0x19, 0x53,
-        0xff, 0xd3, 0xaa, 0x67, 0x7d, 0xa0, 0xee, 0xf5, 0xe5, 0x27, 0x95, 0x2d,
-        0x84, 0x19, 0x67, 0xa8, 0x3f, 0xcf, 0x87, 0x61, 0x17, 0x79, 0x37, 0x90,
-        0x4b, 0x3b, 0x1e, 0xf9, 0xbc, 0x26, 0xd6, 0x4e, 0xe3, 0xb9, 0xb6, 0xf1,
-        0xcd, 0xfb, 0x3e, 0xbd, 0x88, 0x7d, 0x9b, 0x3d, 0x06, 0xc6, 0xa9, 0xad,
-        0xf1, 0x10, 0xea, 0x87, 0xb0, 0xba, 0x8f, 0x18, 0xde, 0x88, 0x49, 0xb6,
-        0x61, 0x89, 0x53, 0xe5, 0x3c, 0xf6, 0x2d, 0x18, 0x8f, 0x9e, 0x90, 0xec,
-        0x52, 0xaf, 0xe4, 0x62, 0x66, 0xca, 0x96, 0xbf, 0x27, 0x1b, 0xcb, 0x85,
-        0x04, 0xcf, 0x0d, 0x0b, 0x33, 0x1a, 0x9e, 0x7b, 0x18, 0xd7, 0xa4, 0xd9,
-        0x92, 0xc3, 0x65, 0xe6, 0x9d, 0x91, 0x78, 0x03, 0xf7, 0x72, 0xb3, 0xec,
-        0xd5, 0x54, 0x61, 0x93, 0x66, 0xa2, 0x8a, 0x78, 0xf0, 0x72, 0x99, 0xfb,
-        0x01, 0x1b, 0x95, 0xd9, 0xcf, 0x09, 0xee, 0x3f, 0x01, 0x1c, 0x88, 0x58,
-        0x1d, 0xf3, 0xe7, 0x28, 0x5e, 0x6d, 0x23, 0x2c, 0x81, 0xae, 0x3b, 0x65,
-        0xdd, 0x8f, 0xbb, 0xb5, 0xb2, 0xd7, 0x47, 0x39, 0x4b, 0x7a, 0xdc, 0xff,
-        0xd5, 0x5a, 0x8f, 0xa1, 0x16, 0xda, 0xe4, 0xf5, 0x8f, 0xb9, 0x8f, 0x81,
-        0xb0, 0x2b, 0x27, 0xdc, 0x40, 0x26, 0xbc, 0xcf, 0x31, 0x9e, 0x8d, 0xb6,
-        0x5a, 0x67, 0xad, 0xf6, 0x9e, 0xdf, 0xf5, 0xf4, 0xcc, 0xde, 0xb8, 0x2d,
-        0x63, 0xbd, 0xe6, 0xa0, 0x26, 0xf6, 0x7b, 0x66, 0x87, 0x46, 0xbc, 0x9e,
-        0xd9, 0xfc, 0xc8, 0xf6, 0x9e, 0xd9, 0xcf, 0x6f, 0xf3, 0x7a, 0x66, 0x17,
-        0x9d, 0x22, 0x3e, 0x5e, 0xcf, 0x6c, 0xf8, 0x76, 0xaf, 0x67, 0xf6, 0xf0,
-        0xed, 0x5e, 0xcf, 0xec, 0x91, 0x11, 0xaf, 0x67, 0xf6, 0xfb, 0xb7, 0x6f,
-        0xef, 0x99, 0x3d, 0x36, 0xb2, 0xbd, 0x67, 0x26, 0x13, 0xc8, 0x77, 0x13,
-        0x5b, 0x3d, 0xb3, 0xf2, 0xc8, 0xb5, 0x7b, 0x66, 0xaf, 0x06, 0x78, 0x1d,
-        0xfc, 0x8c, 0x81, 0x87, 0x14, 0xf0, 0xfa, 0x28, 0xf0, 0xfa, 0xaf, 0xeb,
-        0x59, 0x87, 0xc1, 0xe7, 0xcd, 0x7e, 0x5e, 0xb8, 0x1e, 0xdc, 0x7e, 0xbb,
-        0xff, 0x8c, 0xa0, 0xde, 0x4d, 0xf8, 0xb5, 0x0a, 0xb1, 0xfb, 0x1e, 0xbf,
-        0x66, 0xfb, 0x6b, 0xd1, 0xad, 0xf3, 0xec, 0xf6, 0xff, 0x37, 0xa0, 0xf4,
-        0x0e, 0xf0, 0x3c, 0xf9, 0x79, 0x0d, 0xb5, 0x1f, 0xf9, 0x47, 0xa2, 0xef,
-        0xbe, 0xe8, 0x7c, 0xd5, 0x22, 0xc6, 0x7f, 0x1c, 0xbe, 0x6a, 0xef, 0x0d,
-        0xc9, 0x3a, 0xfc, 0x96, 0x39, 0xea, 0xa4, 0x64, 0x31, 0x3f, 0xab, 0xe6,
-        0x27, 0x26, 0xb6, 0xe6, 0xa7, 0x26, 0xbe, 0xaa, 0x6a, 0x52, 0xf3, 0x5f,
-        0xe3, 0xf3, 0x0d, 0x65, 0xdf, 0x96, 0x87, 0xe1, 0x9d, 0x4a, 0x80, 0xb7,
-        0xc2, 0x3e, 0x76, 0x36, 0x1c, 0xdb, 0x9d, 0xc0, 0x33, 0xe6, 0x8b, 0xb6,
-        0x34, 0x14, 0x7e, 0x0f, 0xa5, 0xcd, 0x17, 0x73, 0xaa, 0x5e, 0x33, 0x9c,
-        0xbc, 0x1b, 0xd4, 0xdf, 0xa8, 0xa1, 0x86, 0x06, 0xd5, 0xf9, 0x9b, 0xbe,
-        0x36, 0x8c, 0x3c, 0xd6, 0x5e, 0x63, 0xb3, 0xae, 0xd6, 0xfd, 0xba, 0xda,
-        0x90, 0xbb, 0xf7, 0xb7, 0x63, 0x73, 0x99, 0xf8, 0x5b, 0x0a, 0x9b, 0xef,
-        0x42, 0x6d, 0x4e, 0xec, 0x4d, 0x1c, 0x43, 0x0c, 0x41, 0x7c, 0xce, 0x7e,
-        0x01, 0xeb, 0x19, 0xe6, 0x46, 0xd6, 0x37, 0x31, 0x7c, 0xf8, 0xbe, 0x41,
-        0x80, 0xd1, 0x3b, 0xfc, 0xf8, 0xce, 0xba, 0x28, 0xc0, 0x2a, 0x77, 0x75,
-        0x7b, 0xb5, 0xd1, 0x2e, 0xcd, 0xab, 0x3f, 0x13, 0xfe, 0x9c, 0xf0, 0x26,
-        0x16, 0x0e, 0x6f, 0x62, 0xe1, 0x6d, 0xe7, 0x30, 0xa2, 0xde, 0x6d, 0x50,
-        0xe7, 0x39, 0x3c, 0xdf, 0x11, 0x4d, 0x4f, 0xf3, 0x8c, 0x07, 0x38, 0xc7,
-        0xe2, 0x99, 0x0f, 0x7d, 0xe9, 0x41, 0x2d, 0x5b, 0x37, 0x10, 0xef, 0x99,
-        0x7f, 0x90, 0x6b, 0xcb, 0xc1, 0xd9, 0x62, 0xa0, 0x27, 0xca, 0x8e, 0x63,
-        0x7f, 0xaa, 0xa1, 0xe6, 0x4d, 0x45, 0xac, 0x43, 0xa0, 0x65, 0x0a, 0xff,
-        0x03, 0x99, 0xde, 0xa3, 0x72, 0x5f, 0x27, 0x6c, 0xf6, 0x78, 0x85, 0xd8,
-        0xf5, 0x71, 0x69, 0xf8, 0xf8, 0x75, 0x65, 0xc9, 0xc3, 0xae, 0xe1, 0xed,
-        0xd8, 0x35, 0xb5, 0x21, 0x1e, 0x8d, 0x07, 0x76, 0xa4, 0xd1, 0x70, 0x5e,
-        0x19, 0x22, 0x66, 0x25, 0x9d, 0xcc, 0x3d, 0xd3, 0x88, 0x81, 0xcc, 0x39,
-        0xcc, 0x37, 0xc4, 0xa5, 0xd7, 0xa2, 0x4f, 0x8d, 0x1d, 0xed, 0xb0, 0xa2,
-        0xf8, 0xcc, 0x83, 0x8e, 0x19, 0x3c, 0x93, 0x96, 0x85, 0xd3, 0x5f, 0xd1,
-        0x9c, 0xfa, 0x3c, 0xe8, 0x99, 0x42, 0xae, 0xa3, 0x2d, 0x15, 0x0c, 0xcf,
-        0x8e, 0xd6, 0x11, 0xf7, 0x5d, 0xc6, 0x02, 0xd4, 0xae, 0xa8, 0x47, 0xca,
-        0x8c, 0xbd, 0x3c, 0xeb, 0x0a, 0x62, 0x2e, 0xfb, 0x26, 0xa8, 0x59, 0x59,
-        0xbb, 0x2e, 0x72, 0xdf, 0xed, 0xba, 0xa8, 0xb9, 0xc4, 0x5d, 0x86, 0xb3,
-        0xbe, 0x46, 0xdc, 0xf8, 0x51, 0x31, 0xa4, 0xe1, 0xbc, 0x3c, 0x44, 0x1c,
-        0x79, 0x3d, 0xf8, 0xd1, 0x84, 0x34, 0xcd, 0x17, 0xd6, 0xf5, 0x76, 0xfc,
-        0xe8, 0x61, 0xc7, 0xcc, 0xda, 0x41, 0xac, 0xc9, 0xda, 0x8c, 0x38, 0xd1,
-        0x44, 0x98, 0x1b, 0xc4, 0xb3, 0x83, 0xe0, 0xc7, 0xc3, 0x8a, 0x59, 0x60,
-        0xc5, 0xbf, 0x03, 0xac, 0x58, 0x92, 0xf7, 0xa2, 0xc4, 0x8a, 0xb6, 0x8f,
-        0x15, 0x1d, 0xd8, 0x71, 0x7e, 0x9b, 0x1d, 0x6b, 0xaa, 0x07, 0xc5, 0x7b,
-        0x79, 0x60, 0xbd, 0xec, 0xa2, 0x79, 0x1d, 0xf8, 0x50, 0x93, 0x98, 0x3a,
-        0xaf, 0x0f, 0xb7, 0xad, 0x19, 0xe0, 0xc0, 0x7d, 0x0a, 0xdf, 0xdd, 0x57,
-        0xd9, 0x85, 0xda, 0x44, 0xe1, 0x3d, 0xff, 0x9c, 0x2f, 0x7c, 0xd5, 0xd9,
-        0x67, 0xb8, 0xed, 0xec, 0x73, 0x0b, 0x17, 0xe2, 0x39, 0xbf, 0xc7, 0x17,
-        0x81, 0xde, 0xfe, 0x07, 0x69, 0x82, 0x5f, 0xd1, 0x07, 0x34, 0xcf, 0x4f,
-        0xb6, 0xe1, 0xc3, 0xff, 0x7a, 0x15, 0x3e, 0x44, 0xce, 0x5a, 0x89, 0x49,
-        0x06, 0xd8, 0xd0, 0x5e, 0xe3, 0x5a, 0xf4, 0xe5, 0x51, 0xe9, 0x00, 0x7f,
-        0x9d, 0x8b, 0x7d, 0xc0, 0x44, 0xdd, 0x12, 0x05, 0x36, 0x8a, 0x28, 0x6c,
-        0x34, 0x44, 0x0c, 0x33, 0x7c, 0x18, 0x98, 0xa6, 0xb1, 0x89, 0x8f, 0xcc,
-        0xd4, 0x0f, 0xa0, 0x97, 0x87, 0x95, 0xad, 0x8c, 0xcb, 0x53, 0x88, 0x9d,
-        0x1d, 0x6b, 0xc0, 0x75, 0x2b, 0x1e, 0x6e, 0x8a, 0x5c, 0x85, 0x9b, 0x8e,
-        0xec, 0x88, 0x9b, 0x54, 0xbf, 0x7e, 0x9c, 0x32, 0x79, 0xdd, 0xf5, 0xfa,
-        0xf5, 0x97, 0x5c, 0xaf, 0x5f, 0xff, 0xba, 0xdb, 0xde, 0xaf, 0xbf, 0x49,
-        0x8a, 0x86, 0x69, 0x5f, 0x94, 0xab, 0xfa, 0xf5, 0x33, 0xec, 0x7f, 0x57,
-        0xbb, 0xbc, 0xbe, 0x7c, 0xb7, 0xdf, 0xaf, 0x37, 0xa5, 0xb8, 0x6d, 0xdc,
-        0x90, 0xb7, 0xad, 0xa0, 0x5f, 0xff, 0x2f, 0x30, 0xd6, 0x83, 0x3d, 0xb6,
-        0xf7, 0xea, 0x2f, 0xb9, 0xec, 0xd5, 0xc7, 0x38, 0xcf, 0xef, 0xd5, 0x73,
-        0x1e, 0x6a, 0x78, 0x97, 0x7d, 0xfa, 0x9b, 0x21, 0x8b, 0x7e, 0xc8, 0xa1,
-        0x4f, 0x3a, 0x9e, 0x8b, 0x73, 0x8e, 0xea, 0xcf, 0x5f, 0x74, 0x63, 0x78,
-        0xce, 0xeb, 0xa3, 0x1f, 0x86, 0x5d, 0x1d, 0xd9, 0xec, 0xcf, 0x7b, 0x7b,
-        0xbc, 0xe1, 0x6e, 0x5f, 0x7f, 0xfb, 0x3a, 0x03, 0xfe, 0x3a, 0x31, 0xac,
-        0x13, 0xbf, 0x6a, 0x9d, 0xad, 0x7e, 0xfc, 0x1b, 0xae, 0xd7, 0x8b, 0x77,
-        0x4e, 0x8b, 0xdd, 0x81, 0x98, 0xfc, 0xe2, 0xd0, 0x8d, 0xfe, 0x1a, 0x9b,
-        0xbd, 0x78, 0xc6, 0x0e, 0xe0, 0x75, 0xc6, 0x0f, 0x3e, 0xff, 0xff, 0xbe,
-        0x17, 0xcf, 0x3e, 0xbc, 0x77, 0x9e, 0x42, 0xff, 0x04, 0x2e, 0x7f, 0xd6,
-        0xeb, 0xc1, 0x4f, 0x54, 0x82, 0xde, 0x3a, 0xeb, 0xc6, 0xe0, 0xbd, 0x8c,
-        0xc1, 0xc4, 0x71, 0xa1, 0xad, 0x90, 0x3e, 0xae, 0xdb, 0x23, 0x73, 0x0a,
-        0x17, 0xc1, 0xa6, 0x92, 0xd7, 0xc6, 0xc6, 0xb5, 0xc5, 0x00, 0x1b, 0xc7,
-        0x14, 0x36, 0xae, 0xad, 0x05, 0xd8, 0x38, 0x73, 0x0d, 0x6c, 0xfc, 0xdf,
-        0xba, 0xbc, 0xf8, 0x1f, 0x95, 0x82, 0xc2, 0xc6, 0xd7, 0x7a, 0xc7, 0x86,
-        0xf7, 0xba, 0x89, 0x03, 0xc4, 0x3b, 0x17, 0xef, 0xbb, 0x86, 0xaf, 0x05,
-        0x78, 0x99, 0xb9, 0xbe, 0x5f, 0x66, 0x9e, 0xdb, 0xc2, 0xcb, 0x1e, 0x26,
-        0x36, 0x13, 0x47, 0x55, 0x2e, 0x04, 0x3e, 0x68, 0xb2, 0xef, 0x7d, 0x48,
-        0xd9, 0x6e, 0xa9, 0x32, 0xab, 0x70, 0x59, 0x1e, 0xb5, 0x6d, 0x51, 0xe1,
-        0x60, 0x62, 0xe0, 0x2e, 0x91, 0xbe, 0x20, 0x17, 0x05, 0x18, 0x33, 0xec,
-        0xc7, 0x67, 0x9e, 0x29, 0xbc, 0x1d, 0xca, 0x10, 0x03, 0xbb, 0x41, 0x8d,
-        0x40, 0x39, 0x0f, 0x23, 0x76, 0x19, 0xbe, 0xac, 0x3c, 0x9f, 0xdd, 0xb7,
-        0xff, 0x87, 0xef, 0xdb, 0x06, 0xe3, 0x5a, 0x80, 0x11, 0x51, 0x03, 0x55,
-        0xc6, 0xd5, 0xbb, 0x0e, 0x1e, 0x46, 0xf4, 0xf0, 0x61, 0xd6, 0x9d, 0x01,
-        0x4e, 0x9e, 0x95, 0x09, 0xe0, 0xf3, 0xf5, 0xdf, 0x65, 0xef, 0x29, 0xc0,
-        0x44, 0x36, 0xfe, 0xb7, 0xf7, 0xa2, 0x78, 0xdd, 0xa1, 0xce, 0xfe, 0xce,
-        0x0f, 0x45, 0xdb, 0xc6, 0xff, 0x3e, 0xe2, 0x37, 0xea, 0xa1, 0x0a, 0x73,
-        0x1d, 0xb1, 0xd0, 0x6f, 0x40, 0x07, 0x63, 0xd7, 0xc0, 0x42, 0x57, 0xe7,
-        0x26, 0xe6, 0xcb, 0xad, 0xbc, 0xe4, 0x6c, 0xe6, 0x25, 0xee, 0xf1, 0xeb,
-        0x72, 0x27, 0xc7, 0x6c, 0x23, 0x62, 0x4d, 0xe1, 0x33, 0x8f, 0x7c, 0xbd,
-        0x3d, 0x37, 0xcd, 0x5d, 0x47, 0x6e, 0x9a, 0x50, 0xb9, 0x89, 0xf4, 0xa2,
-        0x9e, 0x83, 0x4c, 0xbe, 0x0b, 0x59, 0x7e, 0x07, 0xb4, 0xff, 0x11, 0xf8,
-        0xf9, 0x43, 0x60, 0xac, 0x6f, 0x03, 0x63, 0x7d, 0xab, 0xd2, 0xfe, 0x0e,
-        0xc3, 0xb8, 0xb0, 0x0e, 0xf4, 0xea, 0x66, 0x0f, 0xc3, 0x1f, 0x86, 0x57,
-        0x35, 0xca, 0x86, 0x33, 0x57, 0x1e, 0x31, 0xe6, 0xbd, 0xf3, 0xd2, 0x44,
-        0x4e, 0xd2, 0x88, 0x11, 0xcc, 0x15, 0xea, 0x3a, 0xce, 0x7e, 0x25, 0xb1,
-        0x42, 0x5d, 0xd5, 0x93, 0x43, 0x52, 0x6d, 0x78, 0xf8, 0x6a, 0xe1, 0x8c,
-        0xb7, 0xc6, 0x9c, 0x8f, 0xaf, 0xf2, 0x3e, 0xbe, 0xca, 0x35, 0x36, 0x12,
-        0xac, 0xcf, 0x17, 0x52, 0xdb, 0x31, 0xd5, 0x61, 0x1f, 0x53, 0xcd, 0xff,
-        0x15, 0x31, 0x15, 0xf7, 0xca, 0xe3, 0x99, 0xc9, 0xa5, 0x84, 0x1c, 0x80,
-        0x7c, 0x27, 0xca, 0xd4, 0x93, 0x69, 0xc3, 0x6e, 0x3e, 0x44, 0x57, 0x8e,
-        0xd2, 0x4b, 0x28, 0xe9, 0xe9, 0x69, 0x12, 0x7a, 0x9a, 0xf8, 0xb5, 0xf5,
-        0x8d, 0x1a, 0x33, 0xde, 0x1c, 0x8b, 0xe2, 0xf3, 0x7f, 0xaa, 0x23, 0xd2,
-        0x4f, 0x3d, 0x5d, 0x8d, 0xb9, 0xae, 0x07, 0x7b, 0x6d, 0xc7, 0x5d, 0xb6,
-        0xc2, 0x5d, 0x1d, 0xfe, 0x9c, 0x99, 0x89, 0x49, 0xe8, 0xf0, 0xdf, 0x63,
-        0xce, 0x9f, 0xc0, 0xb7, 0x7e, 0x88, 0x78, 0xfd, 0xef, 0xa0, 0x8b, 0x7f,
-        0x8b, 0xda, 0xe0, 0x55, 0xe4, 0x9f, 0x1f, 0x60, 0x6c, 0x0b, 0xc7, 0xa8,
-        0x33, 0xfa, 0xd1, 0x8c, 0x95, 0x98, 0x28, 0xba, 0x89, 0x09, 0x0f, 0x7f,
-        0xfc, 0xea, 0x6f, 0x66, 0xac, 0x29, 0xbe, 0xc3, 0x00, 0xf9, 0xfe, 0xf9,
-        0xdd, 0x73, 0x0a, 0x7b, 0x04, 0x98, 0x23, 0x67, 0x73, 0xff, 0x92, 0x9b,
-        0x9a, 0xa8, 0xe1, 0xe3, 0x61, 0x9b, 0xef, 0xd9, 0x1e, 0xb6, 0x59, 0xfa,
-        0xeb, 0xd4, 0xbb, 0x87, 0x6b, 0x1e, 0x4e, 0xd3, 0xaf, 0xeb, 0xc0, 0x1c,
-        0x35, 0xf8, 0x64, 0xa1, 0x69, 0xab, 0xcf, 0xf1, 0x8a, 0x6d, 0x46, 0x20,
-        0x1f, 0xf6, 0x58, 0x4f, 0xd1, 0x0b, 0x5d, 0xd3, 0x28, 0x13, 0x81, 0xba,
-        0x66, 0xfc, 0x9f, 0xf9, 0xd7, 0x4f, 0xfb, 0xd7, 0x4f, 0xf9, 0xd7, 0x27,
-        0x91, 0x77, 0x9f, 0x54, 0xb9, 0x93, 0xe3, 0x1c, 0x83, 0x72, 0x5d, 0xac,
-        0x85, 0xf5, 0xce, 0x8e, 0xfe, 0xb4, 0x55, 0x8d, 0x79, 0xfe, 0x5c, 0x68,
-        0x3a, 0xf8, 0xfc, 0x63, 0x7c, 0x0e, 0xe2, 0x33, 0x8d, 0xcf, 0x63, 0xf8,
-        0x6c, 0xca, 0x54, 0xcb, 0x56, 0xa8, 0xa3, 0x61, 0xc9, 0x62, 0xbc, 0x88,
-        0x3a, 0x34, 0x93, 0x7a, 0x44, 0x8a, 0xf5, 0x92, 0x94, 0x96, 0x34, 0xe9,
-        0xb6, 0xd2, 0x52, 0xaa, 0x1f, 0x93, 0xe3, 0x4b, 0xde, 0xb9, 0x61, 0x57,
-        0xda, 0xc6, 0xdc, 0x96, 0x3c, 0x9c, 0x7a, 0x5c, 0xf4, 0x3b, 0x8f, 0x61,
-        0x9e, 0xe8, 0xc5, 0xd1, 0xdb, 0xd4, 0xf9, 0x58, 0x3d, 0xe5, 0xc9, 0xf8,
-        0x80, 0x65, 0x9b, 0xc8, 0x5b, 0xc3, 0x4f, 0x62, 0xed, 0x8c, 0x7a, 0x3f,
-        0x30, 0x2d, 0x27, 0x4e, 0x6f, 0xec, 0xf5, 0x62, 0xa9, 0x69, 0xbc, 0x81,
-        0x4d, 0xeb, 0xe0, 0xc3, 0x46, 0xec, 0x9b, 0x82, 0x9d, 0x1f, 0x71, 0xc3,
-        0xda, 0x04, 0x62, 0xe0, 0x84, 0xab, 0x6a, 0x3d, 0xc4, 0x2a, 0xc3, 0x49,
-        0x9e, 0x8a, 0xe1, 0x9a, 0xef, 0xd0, 0x20, 0x0f, 0x2a, 0x5b, 0xd9, 0x00,
-        0x8e, 0xd1, 0x54, 0xbf, 0xaf, 0xb4, 0x79, 0x0e, 0xa4, 0xfa, 0xff, 0x4e,
-        0x32, 0xa9, 0x4b, 0x7e, 0x8c, 0x38, 0xd6, 0x56, 0xb9, 0xa8, 0x51, 0xb6,
-        0x3f, 0xc1, 0xda, 0xf0, 0x75, 0x61, 0x5e, 0xbb, 0x07, 0xf3, 0x06, 0x10,
-        0x7f, 0x71, 0xaf, 0x09, 0x5e, 0x4e, 0x93, 0x57, 0x3e, 0x83, 0xda, 0xb6,
-        0xfa, 0x49, 0xbd, 0xb8, 0xe4, 0xd7, 0x44, 0xaa, 0x76, 0x48, 0x48, 0x7d,
-        0xf3, 0xcc, 0xc9, 0xeb, 0x93, 0xd4, 0xdd, 0x00, 0x3b, 0xf4, 0x60, 0x0e,
-        0xeb, 0x08, 0xc8, 0xc8, 0x3b, 0x27, 0x53, 0x67, 0x64, 0x45, 0xf7, 0x93,
-        0x7a, 0x69, 0x29, 0x83, 0x71, 0xf6, 0xa4, 0xf1, 0xbd, 0xaa, 0x2b, 0xec,
-        0x7f, 0x31, 0x74, 0x58, 0x1a, 0xd5, 0x16, 0xe8, 0x45, 0x8e, 0xdd, 0x7b,
-        0x58, 0x6a, 0xd5, 0x79, 0x79, 0xa1, 0xba, 0xb1, 0x0b, 0xd8, 0x09, 0x32,
-        0x25, 0xfd, 0x3d, 0x3e, 0xfd, 0x54, 0x41, 0x30, 0x0e, 0x79, 0x9e, 0x2e,
-        0xc4, 0xbd, 0xba, 0x96, 0xb8, 0xed, 0x24, 0xdf, 0x1b, 0x8c, 0xf3, 0x3d,
-        0xbe, 0x23, 0xcb, 0xb4, 0xc9, 0x8b, 0xf7, 0x2e, 0x58, 0x9f, 0x92, 0x0b,
-        0xa9, 0x3d, 0xb2, 0x91, 0x52, 0xf5, 0x2f, 0xf1, 0x01, 0x7c, 0xdb, 0x34,
-        0xd6, 0xe5, 0x6e, 0x39, 0x01, 0x3f, 0xbd, 0x90, 0xca, 0xa9, 0xf3, 0x9b,
-        0xe3, 0x4d, 0x62, 0xfb, 0x79, 0xd6, 0x54, 0xb2, 0xae, 0x7a, 0x60, 0xad,
-        0xd6, 0x64, 0x8a, 0xb1, 0xa7, 0x43, 0x36, 0x14, 0xd6, 0xf2, 0x7a, 0xe3,
-        0x1b, 0xb3, 0x9e, 0x6f, 0x84, 0x94, 0xbd, 0xff, 0x1b, 0xd0, 0x71, 0x0c,
-        0x36, 0x1b, 0x51, 0x73, 0x42, 0xe9, 0x4e, 0x7f, 0x8e, 0xc2, 0x66, 0x6d,
-        0x73, 0xc6, 0xc7, 0x33, 0x96, 0xf1, 0xa9, 0x8c, 0x35, 0x36, 0xe1, 0xf5,
-        0x53, 0x4c, 0xc3, 0xd6, 0x2e, 0xb6, 0x82, 0xf7, 0x4d, 0xa6, 0xe0, 0x4f,
-        0x2f, 0x6d, 0x62, 0x63, 0x18, 0xe7, 0xf3, 0x0b, 0xd0, 0x6b, 0x58, 0x3a,
-        0x4e, 0xb5, 0xee, 0x99, 0x4b, 0x8d, 0x24, 0x8e, 0x08, 0xdf, 0x30, 0x62,
-        0xfd, 0x6c, 0x82, 0xda, 0x05, 0xe4, 0xc3, 0x2b, 0xc4, 0x08, 0xc3, 0xe7,
-        0xe5, 0xca, 0x3d, 0x99, 0xd4, 0x7e, 0xad, 0x36, 0x8b, 0xea, 0xe4, 0xf9,
-        0x29, 0xe6, 0xd3, 0xa3, 0xec, 0x7d, 0x86, 0x4e, 0xbd, 0xad, 0x39, 0x65,
-        0xf5, 0x8e, 0x39, 0xf4, 0xd2, 0xd2, 0xe6, 0x21, 0x37, 0x3c, 0x3f, 0xc3,
-        0x04, 0xa8, 0x5b, 0x83, 0x09, 0x47, 0x72, 0xec, 0x71, 0x49, 0x7e, 0x59,
-        0xf6, 0x65, 0x10, 0x47, 0xed, 0x99, 0x0e, 0x99, 0x6f, 0x18, 0xce, 0xe0,
-        0xe2, 0x51, 0xac, 0x31, 0x87, 0xb5, 0xa6, 0x51, 0x83, 0xcc, 0x22, 0x27,
-        0x53, 0xae, 0x8c, 0xd5, 0x0f, 0x43, 0x46, 0x37, 0xf1, 0xcc, 0x78, 0x3c,
-        0x27, 0xe6, 0x4c, 0x41, 0xad, 0xfb, 0x9e, 0x96, 0x1f, 0xfd, 0x18, 0x72,
-        0x5a, 0x58, 0x0e, 0x24, 0x45, 0x9f, 0x4e, 0x86, 0xdf, 0x9f, 0xb3, 0x38,
-        0x16, 0xe5, 0x98, 0x8e, 0xb1, 0xf0, 0xe7, 0x92, 0x51, 0x3d, 0x93, 0x34,
-        0xc7, 0xd9, 0xef, 0x0d, 0x59, 0x73, 0x12, 0x7a, 0xbe, 0xb7, 0x47, 0xba,
-        0xa7, 0xa5, 0x77, 0xd5, 0x1c, 0x7f, 0x1d, 0xb4, 0x84, 0x55, 0x6c, 0x9f,
-        0x13, 0xdd, 0x1f, 0xef, 0xd9, 0x1c, 0x0f, 0xfb, 0xe3, 0xd3, 0xd2, 0xbd,
-        0x3a, 0x62, 0xbc, 0x29, 0x87, 0xb1, 0x66, 0x48, 0x2e, 0xa1, 0xa6, 0xb1,
-        0x86, 0xe6, 0xe0, 0x73, 0x0f, 0x91, 0x96, 0x83, 0xc0, 0x14, 0xf0, 0x09,
-        0xd4, 0xd9, 0xd6, 0x27, 0xe5, 0x4b, 0x46, 0x97, 0xe4, 0x55, 0x4d, 0x1b,
-        0xf6, 0x7a, 0xa5, 0xb0, 0xf3, 0x5b, 0x87, 0xa6, 0x77, 0x7b, 0xfd, 0x00,
-        0x9e, 0x67, 0x8c, 0x62, 0xec, 0x4a, 0x6b, 0xc5, 0xe2, 0x18, 0xef, 0x5d,
-        0x69, 0xd5, 0xad, 0x11, 0x23, 0xab, 0x45, 0xfd, 0x73, 0xed, 0x79, 0xc5,
-        0x7b, 0xa1, 0x3a, 0x68, 0xd4, 0xe4, 0x16, 0x2d, 0x7b, 0x03, 0xf2, 0x83,
-        0xfb, 0x19, 0xcc, 0xbd, 0xd2, 0xca, 0x58, 0xf3, 0xaa, 0x7f, 0x5f, 0x93,
-        0xe0, 0x9a, 0xeb, 0x8c, 0x18, 0x93, 0xea, 0xd9, 0x11, 0xe3, 0x84, 0xd6,
-        0xfe, 0xac, 0xa1, 0x4d, 0x6e, 0x7b, 0xb6, 0x5b, 0xc9, 0x28, 0x64, 0x79,
-        0x73, 0x4a, 0xd5, 0x69, 0x79, 0xda, 0xe5, 0xbc, 0x2b, 0xad, 0xac, 0x15,
-        0xd1, 0x4e, 0xdc, 0xc0, 0x18, 0xc8, 0xb9, 0x97, 0xaf, 0xda, 0x87, 0xd7,
-        0xd7, 0xda, 0xe3, 0x5d, 0xd9, 0xbe, 0xc7, 0x2e, 0x35, 0xe7, 0x82, 0x9a,
-        0x13, 0x56, 0xb2, 0xde, 0xbe, 0xcf, 0xcf, 0x64, 0xfb, 0x3e, 0xdd, 0x9b,
-        0x3c, 0x97, 0xb0, 0xe6, 0x93, 0x98, 0x5b, 0x76, 0x07, 0xe3, 0x75, 0xb9,
-        0xdc, 0xca, 0x5b, 0x17, 0xe5, 0xc2, 0xe6, 0xda, 0xbf, 0xc2, 0x75, 0x3b,
-        0x4d, 0xbf, 0xf2, 0x69, 0xe4, 0x77, 0x8e, 0x3d, 0xaa, 0xe4, 0xbd, 0xdb,
-        0x1a, 0x3c, 0x58, 0xd3, 0xcc, 0xf1, 0x9f, 0x09, 0x75, 0x75, 0x44, 0xc5,
-        0x98, 0xdb, 0xa0, 0xa7, 0x7d, 0xcf, 0xc0, 0x67, 0x47, 0x6d, 0x35, 0xe7,
-        0x92, 0x35, 0x2d, 0xfb, 0x4e, 0x0d, 0x1a, 0x97, 0x10, 0xdb, 0x9c, 0x18,
-        0xaf, 0x51, 0x2b, 0x59, 0x7c, 0x27, 0xfe, 0x4e, 0xd6, 0x01, 0xd0, 0xe5,
-        0xe0, 0xf0, 0xcf, 0xe4, 0xa8, 0x9c, 0xa8, 0x1c, 0x43, 0x2e, 0x9c, 0x93,
-        0xe1, 0x67, 0x90, 0x37, 0x2a, 0x05, 0x3c, 0x49, 0x9f, 0xf5, 0x72, 0xe0,
-        0x9c, 0x7a, 0xcf, 0xfc, 0x24, 0xea, 0x64, 0xd8, 0x6e, 0x79, 0x70, 0x78,
-        0x05, 0xcf, 0xbc, 0xa0, 0x70, 0xa8, 0x2b, 0x0d, 0xf8, 0x40, 0xe2, 0xf9,
-        0x3d, 0xb2, 0xfb, 0x01, 0xda, 0x22, 0x32, 0xfd, 0x6d, 0x11, 0xf5, 0xee,
-        0xbd, 0x6e, 0x75, 0x8a, 0xec, 0xa5, 0xdd, 0x34, 0x61, 0x63, 0x73, 0xde,
-        0x99, 0xd6, 0xb6, 0x6b, 0x73, 0xe6, 0xa2, 0xac, 0x2a, 0xfb, 0xbb, 0x7d,
-        0xd5, 0xfb, 0x3f, 0xba, 0x8a, 0x72, 0x38, 0x39, 0x2d, 0x77, 0xac, 0x7a,
-        0xf6, 0x56, 0x5a, 0x3a, 0xaa, 0xe4, 0x3a, 0xa7, 0xe4, 0xda, 0x92, 0xc3,
-        0x29, 0xca, 0x9c, 0xbc, 0xf0, 0xbd, 0x40, 0x4f, 0x16, 0xf7, 0xfb, 0xf6,
-        0x33, 0xf8, 0x0c, 0x7f, 0x57, 0x42, 0xd9, 0xb0, 0xee, 0xbe, 0x7f, 0x37,
-        0xcf, 0x59, 0xf7, 0xad, 0x92, 0xcf, 0x1b, 0xb7, 0xf1, 0xf9, 0x14, 0x62,
-        0xea, 0xd0, 0x90, 0xc7, 0xeb, 0xab, 0x4b, 0x1f, 0xce, 0xeb, 0x37, 0x37,
-        0x79, 0x0d, 0x49, 0x43, 0xd5, 0xaf, 0x5d, 0xbd, 0xd2, 0x8d, 0xa8, 0x07,
-        0x7b, 0xf8, 0x09, 0xf6, 0x9a, 0x12, 0xd2, 0xe0, 0xed, 0xb7, 0xe1, 0x92,
-        0x96, 0x80, 0x76, 0xd2, 0x73, 0x9f, 0xaf, 0x2f, 0xee, 0x7f, 0x74, 0xc7,
-        0x7b, 0x97, 0xc4, 0x70, 0x86, 0x31, 0xa6, 0x2b, 0x9d, 0x65, 0x7d, 0xff,
-        0x9a, 0x16, 0x5d, 0xe9, 0xcc, 0xde, 0xd4, 0xd9, 0xeb, 0xd0, 0x59, 0x5d,
-        0x7e, 0x13, 0xbc, 0xc0, 0x9f, 0x9f, 0x19, 0x31, 0x0e, 0x13, 0x5b, 0x18,
-        0x5c, 0x0f, 0x31, 0xd4, 0xd7, 0x5d, 0xc7, 0x47, 0xd0, 0xdd, 0x9b, 0xa2,
-        0xf4, 0x07, 0x7e, 0x90, 0x7f, 0xd4, 0xf3, 0x8c, 0x61, 0xe4, 0xa9, 0x43,
-        0xf9, 0x3e, 0x69, 0x53, 0x67, 0xfc, 0x33, 0x9e, 0x3e, 0x95, 0x6f, 0xfb,
-        0xfa, 0xcc, 0xcd, 0x50, 0x67, 0xe6, 0x6e, 0x4f, 0x7f, 0x9d, 0x6a, 0xce,
-        0x62, 0x32, 0xa1, 0xfc, 0xda, 0x1a, 0xba, 0x65, 0x37, 0x75, 0xf8, 0xb4,
-        0xeb, 0xfd, 0x2f, 0xbb, 0xd3, 0xb2, 0xe8, 0x7e, 0x98, 0x1e, 0x3d, 0x1d,
-        0x4e, 0x88, 0xe7, 0x3f, 0x57, 0xeb, 0x4f, 0x5f, 0x0d, 0x2b, 0x5b, 0x9d,
-        0x80, 0xec, 0x4e, 0x56, 0x3e, 0xe6, 0xdb, 0xb7, 0xc7, 0xeb, 0xd0, 0x87,
-        0xf0, 0x7a, 0xb8, 0x3c, 0x68, 0xbc, 0x8d, 0xb5, 0x26, 0x15, 0x86, 0x8b,
-        0x88, 0xe3, 0xf3, 0x9a, 0xd8, 0xe4, 0x35, 0xa0, 0xcd, 0x9b, 0x97, 0x65,
-        0x5d, 0xea, 0x32, 0x3e, 0x3d, 0xaa, 0xde, 0xbf, 0x7f, 0xa3, 0xcc, 0xb8,
-        0x0c, 0xcc, 0x13, 0xeb, 0x93, 0x4b, 0x8d, 0x84, 0x5c, 0x22, 0x96, 0x18,
-        0xc3, 0x7f, 0xf7, 0x98, 0x9f, 0x9b, 0xa3, 0xf2, 0x66, 0xb9, 0xbd, 0x56,
-        0x1c, 0x95, 0xd7, 0xcb, 0x41, 0xbd, 0x48, 0x2c, 0xcb, 0xfc, 0x3f, 0x27,
-        0x6f, 0x2d, 0x0d, 0xca, 0xfa, 0x0c, 0xf2, 0xf8, 0x10, 0x65, 0x30, 0x62,
-        0x7c, 0x46, 0xfd, 0xbe, 0xe2, 0x4a, 0xeb, 0xbc, 0x85, 0x75, 0x97, 0x5b,
-        0x72, 0x84, 0xe7, 0xd0, 0xfc, 0xde, 0xf8, 0x04, 0x56, 0xe1, 0xbc, 0x3e,
-        0xa9, 0x2d, 0xa3, 0x2e, 0x2f, 0x73, 0x5d, 0xca, 0x69, 0x5a, 0x7d, 0x9f,
-        0xc4, 0x3e, 0xf7, 0xf3, 0xbd, 0xf4, 0x18, 0x75, 0x71, 0xa5, 0xb5, 0x61,
-        0xf1, 0x1c, 0x72, 0x4e, 0x1a, 0xd0, 0xd7, 0x97, 0x93, 0x3c, 0x27, 0xcf,
-        0x0b, 0x7f, 0x9f, 0x52, 0x6b, 0xcc, 0xa0, 0x16, 0xb8, 0xd2, 0x5a, 0xb0,
-        0x9e, 0x52, 0x7a, 0x6a, 0x54, 0x1f, 0xf0, 0xc7, 0x79, 0xcd, 0x7b, 0x86,
-        0xb3, 0x6f, 0x88, 0xf5, 0xe7, 0x03, 0xc8, 0xff, 0xac, 0x3d, 0x89, 0xb7,
-        0x28, 0x8b, 0x04, 0x6a, 0x5c, 0xae, 0xc5, 0xdf, 0x04, 0x25, 0x87, 0xf3,
-        0x32, 0x09, 0x7a, 0x80, 0xcb, 0x5c, 0xc6, 0xfd, 0x5b, 0x65, 0x23, 0xe6,
-        0xc5, 0x77, 0xbe, 0xaf, 0xb5, 0x81, 0x98, 0xbf, 0xb1, 0x19, 0xf3, 0xfb,
-        0x71, 0x6d, 0x38, 0xa9, 0xa1, 0xff, 0x84, 0xf5, 0xd9, 0x77, 0x61, 0xcc,
-        0x1f, 0xc7, 0x7c, 0x8e, 0xf5, 0x49, 0x69, 0x59, 0x6c, 0xf6, 0x99, 0x6a,
-        0xc2, 0x77, 0x31, 0x72, 0xb2, 0xd8, 0x18, 0x8c, 0x9f, 0xd7, 0x1c, 0xf5,
-        0xce, 0x46, 0x72, 0x88, 0x7d, 0xb7, 0x3e, 0x69, 0x2c, 0x4b, 0x22, 0x94,
-        0x7e, 0x48, 0xdc, 0x86, 0x87, 0xb9, 0x17, 0x34, 0xf6, 0xdf, 0x6c, 0x69,
-        0x6c, 0x9f, 0x63, 0x84, 0xd2, 0x87, 0xe4, 0x0f, 0xfc, 0x39, 0x8e, 0x9a,
-        0xf3, 0x1f, 0x76, 0xf3, 0xec, 0xab, 0xe1, 0xf6, 0x82, 0x06, 0xd2, 0x76,
-        0x63, 0xfb, 0xbe, 0x89, 0xad, 0x7d, 0xb9, 0x27, 0x6a, 0x98, 0xbd, 0x36,
-        0xf6, 0x7d, 0x15, 0xcf, 0x3c, 0x04, 0x3a, 0xae, 0x84, 0x74, 0xeb, 0x21,
-        0x29, 0x36, 0xae, 0xde, 0xa3, 0x9d, 0x06, 0x3e, 0xc3, 0xf5, 0xb9, 0xcf,
-        0x21, 0xd0, 0x77, 0x45, 0xd3, 0xad, 0x43, 0x90, 0xa5, 0xb7, 0x47, 0xe8,
-        0x39, 0xd3, 0xf8, 0xa1, 0x0c, 0x89, 0xbe, 0xa2, 0x29, 0xf9, 0xeb, 0xb5,
-        0x51, 0x38, 0xc4, 0x94, 0x74, 0xaf, 0xcd, 0x4a, 0x68, 0x8d, 0x3d, 0x00,
-        0xda, 0x22, 0xf5, 0xb8, 0x0b, 0x7e, 0x2c, 0x76, 0xd8, 0x22, 0xde, 0x67,
-        0x1f, 0x77, 0xb5, 0x57, 0x7a, 0x89, 0xf7, 0x59, 0x0f, 0x1c, 0xc4, 0x7f,
-        0xd6, 0x04, 0x2f, 0xb5, 0x32, 0xa9, 0x77, 0x54, 0xde, 0xcc, 0x37, 0x78,
-        0xdf, 0x4c, 0x88, 0xf0, 0x1e, 0xe3, 0x43, 0x9f, 0x44, 0xbe, 0x3e, 0x8c,
-        0x98, 0x90, 0x03, 0x76, 0xc6, 0xba, 0xa7, 0x86, 0x24, 0xec, 0xbd, 0xeb,
-        0xa0, 0xfa, 0x25, 0x6f, 0x2d, 0x9b, 0xfe, 0xef, 0x53, 0x64, 0xdf, 0xf9,
-        0x14, 0x7b, 0x9a, 0x03, 0xb0, 0x53, 0xd6, 0x23, 0xa2, 0x6f, 0xa0, 0xde,
-        0xbc, 0xd4, 0x88, 0xf6, 0xf2, 0x7d, 0xcb, 0xd7, 0x5d, 0x5c, 0x13, 0xbb,
-        0xc7, 0x14, 0x56, 0xf4, 0xef, 0xf1, 0x3b, 0xea, 0xa0, 0x6d, 0x98, 0x32,
-        0x01, 0x4c, 0xc9, 0x3a, 0x69, 0xca, 0x7f, 0xe7, 0xcd, 0x70, 0x4e, 0x6c,
-        0xab, 0x95, 0x86, 0x65, 0x03, 0x38, 0x6b, 0xdd, 0xb5, 0x10, 0x07, 0xdf,
-        0xd6, 0xea, 0x65, 0xf5, 0xbb, 0x34, 0xed, 0x01, 0x60, 0xac, 0x44, 0x9f,
-        0xaa, 0x75, 0x4e, 0x3e, 0x20, 0x9e, 0xbd, 0xc3, 0xca, 0x54, 0xcc, 0x5a,
-        0xaf, 0x7a, 0xb5, 0xc5, 0x46, 0x75, 0x4a, 0xfe, 0xd4, 0x5d, 0x50, 0xbd,
-        0xd2, 0x25, 0xd4, 0x1b, 0xe1, 0x45, 0x55, 0x6b, 0xb5, 0xe1, 0x54, 0xc4,
-        0xb7, 0x67, 0x8f, 0xc0, 0x07, 0x4d, 0xf5, 0x6e, 0x81, 0xbe, 0xd2, 0x6a,
-        0x65, 0x11, 0x2f, 0x74, 0xcb, 0x32, 0x8a, 0xc8, 0x73, 0x59, 0xf5, 0x7e,
-        0x0a, 0xfd, 0xf7, 0xf7, 0x54, 0x1c, 0x96, 0x1a, 0x64, 0xf3, 0x5c, 0x02,
-        0xeb, 0x68, 0xca, 0x3e, 0x43, 0x4a, 0x0f, 0x0f, 0x28, 0xec, 0x1a, 0x5a,
-        0x41, 0x80, 0x5a, 0x1b, 0x12, 0x59, 0x81, 0xbf, 0xc2, 0x77, 0xc3, 0x6b,
-        0xd4, 0x01, 0x65, 0x3b, 0x2b, 0x11, 0xc8, 0x9e, 0x58, 0x22, 0xb4, 0x48,
-        0x19, 0xc7, 0x61, 0x17, 0x5c, 0x07, 0x32, 0xe6, 0xbb, 0x2c, 0xcb, 0x1d,
-        0xf2, 0x4c, 0xc3, 0xf4, 0xdf, 0x3d, 0x7f, 0x89, 0xef, 0xa3, 0xeb, 0x73,
-        0x63, 0x03, 0xc4, 0x4f, 0x52, 0x6a, 0x00, 0x63, 0x9c, 0x66, 0x0d, 0xce,
-        0x18, 0x50, 0x88, 0x47, 0x94, 0xaf, 0xb3, 0x06, 0xf6, 0x7c, 0x9f, 0xf8,
-        0x3a, 0x62, 0x11, 0xdb, 0x8e, 0x62, 0x8f, 0x9d, 0xe4, 0xea, 0xd5, 0x9e,
-        0x93, 0xa0, 0xf3, 0xfc, 0x92, 0x39, 0x55, 0x90, 0x14, 0xdf, 0x71, 0x9e,
-        0xb1, 0xc1, 0xf7, 0x06, 0xe2, 0xe4, 0x42, 0x85, 0xef, 0x33, 0x17, 0xe1,
-        0x59, 0x53, 0x72, 0xbe, 0xcc, 0x1a, 0xf0, 0x76, 0xe8, 0x8b, 0xd7, 0xc5,
-        0xf1, 0x10, 0xfc, 0xff, 0xa2, 0xc1, 0xdf, 0x91, 0xf1, 0x77, 0x41, 0x66,
-        0x2a, 0xa1, 0x1d, 0x84, 0x8e, 0x0b, 0x46, 0xc4, 0xb7, 0x03, 0xa7, 0x4c,
-        0x8c, 0x35, 0x62, 0x9c, 0xc3, 0xf7, 0x97, 0xdd, 0xcb, 0x2d, 0xd6, 0x3f,
-        0x17, 0x10, 0xe7, 0xa6, 0x92, 0x53, 0xb0, 0x9d, 0x42, 0xbc, 0x13, 0xb4,
-        0xfe, 0x5d, 0xdc, 0xcb, 0xbb, 0xdc, 0xc7, 0x4c, 0x5d, 0x94, 0x22, 0x30,
-        0xfd, 0x48, 0xe2, 0x65, 0xd9, 0x83, 0x3a, 0x55, 0x93, 0x37, 0x2d, 0x73,
-        0x5c, 0x34, 0xb5, 0xde, 0xf0, 0x7d, 0xb0, 0xbd, 0x37, 0x10, 0xdf, 0x3a,
-        0xfc, 0xda, 0x3d, 0x5b, 0x26, 0x16, 0x3a, 0xaa, 0xde, 0x05, 0xb8, 0x60,
-        0xb1, 0x7f, 0xc7, 0xdf, 0x44, 0xfe, 0xa5, 0xda, 0x63, 0xeb, 0x8c, 0x8d,
-        0xfd, 0x63, 0xd2, 0xe7, 0xf1, 0x78, 0xc0, 0xf2, 0x68, 0xe4, 0x3a, 0x91,
-        0xb6, 0x75, 0xce, 0xfb, 0xeb, 0x9c, 0xf5, 0xd7, 0xa9, 0xf9, 0xeb, 0x5c,
-        0xd8, 0x5c, 0xe7, 0x6e, 0xe8, 0xbf, 0xd5, 0x7a, 0x0a, 0xf8, 0x21, 0x93,
-        0x6a, 0xb5, 0x1c, 0xd4, 0x59, 0xa5, 0xd1, 0x79, 0x75, 0x46, 0xaa, 0xa7,
-        0xbf, 0x71, 0x6f, 0xc6, 0x2a, 0xc4, 0xc3, 0x0a, 0x7b, 0xa0, 0x92, 0x82,
-        0x1d, 0x16, 0xc4, 0xc3, 0xdc, 0x3c, 0xb7, 0xf3, 0xce, 0xf5, 0xba, 0xa1,
-        0xc3, 0x1c, 0x72, 0x86, 0x91, 0x39, 0x67, 0x49, 0x61, 0xdf, 0x6f, 0xea,
-        0xb0, 0xf3, 0x5e, 0xe4, 0x87, 0x9f, 0xc0, 0x66, 0x8c, 0x4c, 0xbd, 0x91,
-        0x43, 0xbd, 0xc3, 0xf9, 0x77, 0x40, 0x8f, 0x85, 0x4c, 0xad, 0x51, 0xc8,
-        0x9c, 0xe5, 0x79, 0x0e, 0xe6, 0xd5, 0x1a, 0x3d, 0x90, 0x7b, 0x8f, 0xea,
-        0x8b, 0xbc, 0x5c, 0x8e, 0x31, 0x06, 0xc1, 0xd6, 0x63, 0x18, 0x8b, 0xab,
-        0xdf, 0x68, 0xd5, 0xdd, 0x65, 0xf8, 0x74, 0x02, 0xe3, 0xd5, 0xae, 0x49,
-        0x85, 0x47, 0x2d, 0x59, 0x71, 0x7f, 0xa5, 0x15, 0xcb, 0x97, 0xb5, 0x52,
-        0x79, 0x18, 0x73, 0x46, 0xf9, 0x5b, 0x9f, 0x3d, 0xc0, 0x49, 0x53, 0xd5,
-        0x1d, 0x69, 0x4a, 0x80, 0x26, 0xbd, 0x8d, 0xa6, 0x04, 0xe8, 0x41, 0xcc,
-        0x3c, 0xc5, 0xde, 0xf1, 0xa8, 0x9c, 0x28, 0xf3, 0x9d, 0x26, 0xfe, 0x46,
-        0xd5, 0x90, 0x30, 0xb0, 0x65, 0xe4, 0x94, 0x19, 0x5f, 0x57, 0xbd, 0x1a,
-        0x73, 0xb8, 0x2e, 0x23, 0xa9, 0xba, 0xa8, 0xfc, 0x92, 0x38, 0x81, 0x7c,
-        0xf5, 0x86, 0xdb, 0x23, 0x6f, 0xfa, 0x7b, 0x5d, 0x14, 0x9e, 0x33, 0x6e,
-        0xdf, 0xeb, 0xc9, 0x4a, 0x2a, 0xf3, 0x8a, 0x15, 0xf2, 0xf9, 0xea, 0xc3,
-        0x5e, 0x7b, 0x30, 0x37, 0x95, 0x39, 0xdf, 0xd8, 0x69, 0xae, 0x83, 0xb9,
-        0x91, 0xb6, 0xb9, 0x0e, 0xe6, 0xf5, 0x20, 0xef, 0xf5, 0x28, 0x9e, 0x4a,
-        0xa0, 0xeb, 0x52, 0x99, 0x3c, 0xf1, 0x0c, 0x82, 0x7b, 0x1a, 0xc4, 0xc6,
-        0x53, 0xe2, 0x9f, 0xd9, 0xf2, 0xf7, 0x7a, 0x57, 0xf5, 0x6b, 0x94, 0x0d,
-        0x4c, 0x58, 0x3c, 0x9b, 0x99, 0xd1, 0xb2, 0xf5, 0x3c, 0x72, 0xd5, 0x8d,
-        0xc4, 0x43, 0x29, 0x1b, 0xb9, 0x92, 0xe7, 0x3c, 0x8d, 0x72, 0x81, 0xef,
-        0x3d, 0xc3, 0x2e, 0xde, 0x21, 0x5e, 0xbe, 0x31, 0xa4, 0xde, 0x43, 0x70,
-        0xfc, 0x73, 0x20, 0x31, 0x32, 0x63, 0x7c, 0xf7, 0xe0, 0x6e, 0xa9, 0x2f,
-        0x7f, 0x11, 0x63, 0x19, 0xe4, 0xc5, 0x43, 0x5a, 0xe6, 0xdc, 0x24, 0xae,
-        0x1f, 0xc2, 0x35, 0xe2, 0xf0, 0x72, 0x0e, 0xf7, 0x1f, 0xc2, 0xf5, 0xbc,
-        0x96, 0x6d, 0xe6, 0x70, 0xfd, 0x30, 0xae, 0x27, 0x48, 0x9b, 0xf3, 0x8a,
-        0x35, 0xa5, 0xd9, 0x58, 0xcb, 0x3e, 0x37, 0x89, 0x4f, 0xfb, 0x7a, 0xbc,
-        0x07, 0x3d, 0x95, 0x79, 0x3e, 0x96, 0x04, 0x4d, 0x0f, 0x6a, 0x4e, 0xbd,
-        0x1b, 0x6b, 0x0c, 0xe1, 0x79, 0xda, 0x54, 0xfb, 0x39, 0xd4, 0x6d, 0xaa,
-        0x67, 0x14, 0x4a, 0xa7, 0x81, 0x77, 0x1f, 0x41, 0xde, 0xd7, 0xc4, 0xb1,
-        0x1e, 0x97, 0x62, 0x2a, 0x2d, 0x0b, 0xf5, 0x90, 0x64, 0x63, 0x05, 0x7c,
-        0x2f, 0x48, 0x66, 0x1c, 0xf7, 0xeb, 0xb4, 0x05, 0xce, 0x2b, 0x49, 0xb1,
-        0x4a, 0xfc, 0xce, 0x7e, 0xd1, 0x57, 0xc0, 0x37, 0xfb, 0x44, 0x79, 0xc8,
-        0x20, 0x46, 0xfb, 0xdd, 0xa1, 0xa7, 0xe5, 0xbd, 0xd3, 0x8c, 0x7c, 0xac,
-        0x65, 0xea, 0xfe, 0x59, 0x9d, 0xc5, 0xdf, 0x2b, 0xb1, 0x47, 0x25, 0xc5,
-        0x50, 0x9a, 0x7d, 0x0e, 0xd5, 0x17, 0x4f, 0x79, 0x67, 0x7a, 0xed, 0xef,
-        0x90, 0x04, 0xfe, 0xc2, 0x7d, 0xbf, 0x82, 0xe7, 0xbd, 0xbe, 0x54, 0xb6,
-        0xf9, 0x41, 0x5d, 0xf0, 0x5d, 0xfd, 0x15, 0xe8, 0xe2, 0xfc, 0x87, 0xf6,
-        0xb9, 0xd8, 0xe3, 0x9a, 0x47, 0x2c, 0x62, 0x7f, 0x2c, 0x90, 0xdf, 0xd5,
-        0x34, 0x92, 0xbe, 0xc3, 0x58, 0x4b, 0x52, 0x8c, 0xb3, 0xb9, 0x58, 0x42,
-        0xd5, 0xbe, 0x1b, 0x4b, 0xf2, 0xc4, 0x16, 0xbd, 0xa4, 0x95, 0x72, 0x78,
-        0x04, 0xf5, 0x1a, 0x7f, 0xff, 0xf0, 0xb8, 0xe4, 0x53, 0xec, 0xd1, 0x84,
-        0x90, 0x0b, 0x0b, 0xf8, 0xbe, 0x25, 0xb7, 0x92, 0x2f, 0xb7, 0x7c, 0xf5,
-        0x5b, 0x4a, 0x77, 0x35, 0x8b, 0xfb, 0x05, 0xbd, 0x8b, 0x69, 0xa5, 0xb3,
-        0x9a, 0x7a, 0xcf, 0x36, 0xe0, 0x3d, 0xe8, 0xbf, 0xed, 0x6c, 0x73, 0x93,
-        0x16, 0x69, 0xfb, 0x38, 0xdf, 0x5b, 0x18, 0xb6, 0x85, 0xf4, 0x93, 0x0f,
-        0xe6, 0xac, 0xe0, 0x5c, 0x34, 0xe0, 0x21, 0xe0, 0xf3, 0xa3, 0xca, 0x85,
-        0x74, 0xee, 0x31, 0xa4, 0x7b, 0xca, 0x08, 0x59, 0xcc, 0x01, 0x9f, 0xf6,
-        0xfb, 0xf8, 0xff, 0x37, 0xe5, 0xea, 0xf1, 0x1e, 0x86, 0xa8, 0xfc, 0xdf,
-        0x8b, 0xee, 0xa0, 0xf7, 0xab, 0xcf, 0x80, 0x0d, 0xe7, 0xac, 0xb5, 0xc5,
-        0x67, 0x6d, 0x07, 0x3e, 0x6b, 0x3e, 0x9f, 0x1f, 0x7e, 0x4e, 0xea, 0xd1,
-        0x59, 0x5b, 0xb2, 0xc1, 0x23, 0x6d, 0x6a, 0x27, 0x7b, 0xe3, 0x6f, 0x9c,
-        0xd4, 0xef, 0xad, 0xa2, 0xb6, 0x7b, 0xad, 0x5e, 0x27, 0xeb, 0x64, 0xcf,
-        0xee, 0xce, 0x22, 0xd7, 0x55, 0xab, 0x5e, 0xcd, 0x5c, 0x75, 0xd9, 0x6b,
-        0xde, 0x69, 0x6f, 0x0d, 0x34, 0xff, 0x8e, 0x7a, 0xef, 0xa4, 0xe4, 0x7a,
-        0x7d, 0xa9, 0x6a, 0xb5, 0x3d, 0x57, 0xde, 0xc0, 0x3c, 0x39, 0x5c, 0x90,
-        0x19, 0xe8, 0x31, 0x89, 0xeb, 0x9b, 0xe5, 0xe5, 0x65, 0x75, 0x86, 0xe4,
-        0x9f, 0xd5, 0xf0, 0x0c, 0x46, 0x9d, 0x43, 0x23, 0x5e, 0xcd, 0xaa, 0x78,
-        0xbd, 0xb1, 0xac, 0xee, 0xa9, 0xdf, 0x3c, 0xd4, 0xdd, 0x19, 0xc4, 0x73,
-        0xd4, 0x06, 0xd6, 0x6e, 0x29, 0xa2, 0x86, 0x3e, 0x6b, 0xcd, 0x18, 0xc4,
-        0x29, 0x5c, 0x6b, 0x03, 0x6b, 0x9d, 0x5f, 0x96, 0xbd, 0x7c, 0xa7, 0xa3,
-        0xaa, 0xce, 0xbd, 0xbc, 0x7e, 0xf5, 0xbc, 0x04, 0xbf, 0xd7, 0x8d, 0xfa,
-        0x39, 0x8e, 0xef, 0x95, 0xf0, 0xb7, 0xa7, 0x8c, 0x01, 0xa8, 0x6b, 0x66,
-        0x0a, 0x58, 0xaf, 0xd5, 0xf2, 0xfa, 0xd9, 0x2d, 0xd8, 0x7d, 0x84, 0xbf,
-        0x65, 0xc0, 0xdf, 0x23, 0xb0, 0x13, 0xf8, 0xc1, 0xe6, 0x38, 0xaf, 0x59,
-        0x4b, 0x04, 0xd7, 0x4c, 0x58, 0xff, 0x1b, 0xed, 0xcc, 0xfa, 0xa1, 0x98,
-        0x41, 0x00, 0x00, 0x00 };
-static u32 bnx2_TXP_b09FwData[(0xd0/4) + 1] = {
+        0x1f, 0x8b, 0x08, 0x00, 0x0e, 0x34, 0xe7, 0x45, 0x00, 0x03, 0xcd, 0x7c,
+        0x6f, 0x70, 0x5b, 0xd7, 0x95, 0xdf, 0x79, 0xef, 0x81, 0x24, 0x48, 0xd1,
+        0xd4, 0x13, 0x17, 0x56, 0x60, 0x87, 0x71, 0x00, 0xf1, 0x81, 0x66, 0x42,
+        0xae, 0x04, 0x2b, 0x4c, 0xc2, 0x6d, 0xd1, 0xf8, 0x05, 0x00, 0x29, 0x48,
+        0xd1, 0x6c, 0x68, 0x95, 0x49, 0x94, 0x54, 0xe3, 0x62, 0x41, 0x52, 0xf1,
+        0xb6, 0xce, 0x54, 0x9b, 0x78, 0x5a, 0x4d, 0xeb, 0xad, 0x11, 0x90, 0xfa,
+        0xe7, 0x85, 0x04, 0xda, 0x62, 0x44, 0x7f, 0xc8, 0x07, 0x18, 0x80, 0x24,
+        0x6f, 0xf2, 0x44, 0x28, 0x9b, 0x7f, 0xfd, 0xd0, 0xac, 0x50, 0x4a, 0xd6,
+        0xba, 0x9b, 0xb4, 0xa3, 0xed, 0x66, 0x67, 0x3b, 0xd3, 0x2f, 0x1c, 0x49,
+        0xf6, 0x7a, 0x77, 0x67, 0x36, 0xda, 0x6e, 0xb6, 0xab, 0xb6, 0xb2, 0xd1,
+        0xdf, 0xef, 0xbe, 0xf7, 0x28, 0x90, 0xa6, 0x6c, 0xcb, 0xb3, 0xed, 0x94,
+        0x33, 0x18, 0xe0, 0xdd, 0x77, 0xdf, 0xb9, 0xe7, 0x9e, 0x73, 0xee, 0x39,
+        0xe7, 0x77, 0xee, 0x7d, 0x0c, 0x8b, 0x74, 0x89, 0xf7, 0xf7, 0x00, 0x3e,
+        0x91, 0x43, 0x87, 0x9f, 0xd9, 0x3e, 0xb2, 0xfd, 0x13, 0xf8, 0xf9, 0x09,
+        0x31, 0x02, 0x06, 0x6f, 0xbe, 0x69, 0x88, 0x64, 0xff, 0x42, 0x3e, 0xf0,
+        0x1f, 0x1e, 0x37, 0x7d, 0xfa, 0xfc, 0x48, 0x50, 0x4f, 0x4c, 0xec, 0x4a,
+        0x5a, 0x12, 0x34, 0x12, 0xb2, 0x6f, 0xca, 0x12, 0xb1, 0x9d, 0xa1, 0x48,
+        0x4a, 0xde, 0x6a, 0xe6, 0x43, 0x01, 0x61, 0xfb, 0x47, 0x12, 0x77, 0x9e,
+        0xfb, 0xc9, 0xa7, 0xa3, 0xb7, 0xca, 0x86, 0x04, 0xcd, 0x44, 0x56, 0xcc,
+        0x01, 0x09, 0xf6, 0xe1, 0x99, 0x6f, 0x3f, 0x6a, 0x18, 0xd2, 0xb3, 0xca,
+        0xab, 0xcc, 0x95, 0x56, 0x9a, 0x3f, 0x79, 0x34, 0x2c, 0xbf, 0x57, 0x0f,
+        0xc9, 0xf7, 0xea, 0xa6, 0x5c, 0xac, 0x07, 0xb4, 0xf1, 0x92, 0x29, 0xb3,
+        0xa5, 0x69, 0xfd, 0x48, 0x31, 0x2f, 0xa9, 0x7a, 0x56, 0x2f, 0x2c, 0x98,
+        0x3d, 0xc9, 0xf3, 0x39, 0x7d, 0x76, 0xa1, 0xb7, 0x27, 0x75, 0x7e, 0x5a,
+        0x2f, 0x14, 0xc3, 0x3d, 0xc9, 0xba, 0xd9, 0x93, 0x5a, 0x0c, 0xe1, 0xba,
+        0xb7, 0x27, 0xb9, 0x18, 0x9d, 0x17, 0xd9, 0x8a, 0x3e, 0xe1, 0x9e, 0x54,
+        0x29, 0x9a, 0x15, 0xe9, 0x8f, 0xbf, 0x2a, 0x7d, 0x3d, 0xa9, 0xfa, 0x3f,
+        0xd1, 0x1b, 0xa6, 0x26, 0x85, 0x5f, 0x15, 0x33, 0x9c, 0xb8, 0xd5, 0x7c,
+        0xc8, 0xd2, 0xc4, 0xb4, 0x6e, 0x37, 0xb7, 0x58, 0x41, 0xc9, 0x9d, 0xee,
+        0x14, 0x5b, 0xcd, 0xc9, 0x94, 0xdc, 0xe2, 0x90, 0xb9, 0x2c, 0x6d, 0x62,
+        0x87, 0xfc, 0xeb, 0x66, 0x33, 0x19, 0xff, 0x32, 0xe5, 0x8a, 0x71, 0xa4,
+        0x67, 0xbc, 0x2e, 0x92, 0x2c, 0x05, 0x25, 0x19, 0x7f, 0xab, 0xe9, 0x3e,
+        0x13, 0xc4, 0x98, 0x81, 0x9e, 0xb1, 0x52, 0xb3, 0x99, 0x8e, 0x83, 0x7e,
+        0xdc, 0x7f, 0xb6, 0x4d, 0xca, 0x21, 0xbb, 0x3c, 0x1b, 0xff, 0x6f, 0xba,
+        0xab, 0x13, 0xce, 0x91, 0xd7, 0xb6, 0xe8, 0x56, 0x5e, 0x72, 0x21, 0x29,
+        0x17, 0xe2, 0x9f, 0x92, 0x13, 0xf1, 0x30, 0xe6, 0x17, 0x94, 0x63, 0x71,
+        0xc8, 0xd1, 0x3a, 0xac, 0x25, 0xeb, 0xd1, 0x48, 0x56, 0x9e, 0x97, 0xe4,
+        0x62, 0xbf, 0x99, 0x16, 0x8c, 0x6d, 0x35, 0x3f, 0x9a, 0x8c, 0x63, 0xbc,
+        0xe1, 0xff, 0xd5, 0xb4, 0x43, 0xd1, 0x6c, 0x59, 0x06, 0xa5, 0x50, 0xea,
+        0x8f, 0xff, 0x4c, 0x34, 0x09, 0x5a, 0x62, 0x4f, 0x59, 0x26, 0xe4, 0x16,
+        0x1d, 0x4c, 0x19, 0x4d, 0xd9, 0x83, 0xf1, 0x93, 0x16, 0xee, 0xd7, 0x65,
+        0xb3, 0x6e, 0xb5, 0x4b, 0xc1, 0x94, 0x50, 0x97, 0x3c, 0x22, 0x85, 0xd3,
+        0x68, 0x8f, 0xdb, 0xbd, 0x3a, 0x9e, 0xc9, 0x8c, 0xb0, 0x4d, 0x34, 0x23,
+        0x11, 0x33, 0x53, 0xe0, 0xa8, 0xe2, 0x0c, 0x62, 0xfc, 0x98, 0xdd, 0xa9,
+        0x99, 0xb2, 0x62, 0x06, 0xa4, 0xea, 0xc4, 0xec, 0xb0, 0xd6, 0x2e, 0xc7,
+        0x62, 0x5d, 0x90, 0x69, 0x18, 0xb4, 0xe5, 0x9b, 0x7a, 0x22, 0x16, 0xce,
+        0x41, 0x51, 0x3a, 0x64, 0x35, 0x07, 0x7e, 0xe6, 0xe2, 0x59, 0x2d, 0x55,
+        0xff, 0x8a, 0x96, 0x3c, 0xbf, 0x5f, 0xdb, 0x75, 0x1e, 0x7d, 0xea, 0xe7,
+        0x3c, 0xbb, 0x0b, 0x83, 0x37, 0x1d, 0xcf, 0xb2, 0x1d, 0x3c, 0x2b, 0xde,
+        0xd1, 0x06, 0x5d, 0x36, 0x26, 0x43, 0x3d, 0x49, 0xa5, 0x4b, 0xf2, 0xa6,
+        0x4b, 0x6e, 0x42, 0x93, 0x5e, 0xcb, 0x96, 0xe0, 0x27, 0xa1, 0xcf, 0x45,
+        0xe8, 0x72, 0x31, 0x22, 0x47, 0x4a, 0x12, 0xd2, 0x85, 0x63, 0x65, 0xf5,
+        0xaa, 0x43, 0x7b, 0x80, 0x6e, 0xa1, 0xfb, 0x82, 0xc3, 0x67, 0xa1, 0xc3,
+        0x52, 0x1a, 0xf2, 0xc9, 0x60, 0xec, 0x7d, 0xda, 0x9e, 0xea, 0xa4, 0x96,
+        0x81, 0x9d, 0x14, 0x4e, 0x0f, 0x41, 0x77, 0xd1, 0xc8, 0x8a, 0x6c, 0x96,
+        0x82, 0x65, 0x45, 0xbe, 0x2c, 0xdd, 0x72, 0x6c, 0xd1, 0x92, 0x23, 0x8b,
+        0x21, 0xc9, 0x9b, 0x51, 0xb3, 0x26, 0x7d, 0xd9, 0x4d, 0x89, 0x1e, 0x79,
+        0xfe, 0x74, 0x34, 0x53, 0x96, 0x7e, 0xfb, 0x75, 0xdc, 0xcf, 0x9d, 0xa4,
+        0x4e, 0x25, 0x9f, 0x8a, 0x1b, 0x92, 0x85, 0x4d, 0x18, 0xd6, 0x1f, 0x81,
+        0xff, 0xe6, 0x73, 0xc9, 0x78, 0x34, 0x2c, 0xa2, 0x4b, 0xea, 0x0b, 0xfd,
+        0xe6, 0x6e, 0x89, 0x9a, 0x19, 0xca, 0x3f, 0x3e, 0x04, 0x3d, 0xfc, 0x77,
+        0xca, 0x1e, 0xb4, 0xa8, 0xe3, 0xa1, 0xf0, 0x31, 0xe8, 0x32, 0xab, 0x74,
+        0xdc, 0x83, 0xf1, 0x03, 0x9e, 0xed, 0xf4, 0x48, 0xbe, 0x7a, 0xc3, 0x93,
+        0x43, 0x8f, 0xcc, 0x57, 0xbb, 0xa5, 0x00, 0x1d, 0x16, 0xc4, 0x92, 0xc2,
+        0xf9, 0x3f, 0xf7, 0xda, 0x2d, 0x99, 0x3b, 0xff, 0x32, 0xec, 0xe1, 0xb0,
+        0xb6, 0xbf, 0xfe, 0x0b, 0xcd, 0xb3, 0x1f, 0xd8, 0x5f, 0x50, 0xec, 0x89,
+        0xa0, 0x9c, 0xab, 0xbb, 0xf6, 0x57, 0xc1, 0x1a, 0xb3, 0x4d, 0x1b, 0xb6,
+        0xf4, 0xc6, 0x6a, 0x9f, 0x73, 0xf5, 0x3e, 0x3c, 0x1b, 0x94, 0x23, 0x75,
+        0xf6, 0xcf, 0xc3, 0xc6, 0x82, 0xb2, 0xf4, 0x68, 0xb7, 0x64, 0xd1, 0x5e,
+        0x58, 0x14, 0x3b, 0x19, 0xd7, 0xf1, 0x4c, 0x0f, 0xe6, 0xb2, 0x15, 0x9f,
+        0x2e, 0x99, 0xaa, 0x76, 0xd8, 0x86, 0x15, 0x92, 0xa9, 0x3a, 0xf5, 0x8f,
+        0xef, 0x92, 0x6f, 0x03, 0x94, 0x2f, 0xdb, 0xf9, 0x1c, 0xdb, 0x4d, 0xb4,
+        0xb7, 0xb6, 0xd1, 0xb6, 0x37, 0x53, 0xa6, 0x83, 0x82, 0xb6, 0x5c, 0x29,
+        0x66, 0xee, 0xe7, 0x77, 0x9d, 0xf6, 0xd0, 0x6a, 0x0b, 0x01, 0xf4, 0x87,
+        0x1e, 0xab, 0x18, 0xeb, 0xf4, 0x9d, 0x66, 0xdb, 0x08, 0xae, 0x2d, 0x2c,
+        0xaa, 0x2e, 0x8e, 0x1d, 0x00, 0x5f, 0xba, 0x64, 0xab, 0x8a, 0xb7, 0x08,
+        0x6d, 0xc0, 0x9d, 0x47, 0x9f, 0xcc, 0x2e, 0x76, 0xf7, 0xa4, 0x17, 0xd9,
+        0x9e, 0x0c, 0x1b, 0x98, 0xe7, 0x54, 0x5c, 0x1a, 0x73, 0x71, 0xbd, 0x3f,
+        0x00, 0xbe, 0xa6, 0xb1, 0xe0, 0x30, 0x0f, 0x8f, 0xc7, 0x06, 0xee, 0xf7,
+        0xca, 0xd4, 0x79, 0xf6, 0xe5, 0x18, 0x85, 0x2d, 0xba, 0x24, 0xc0, 0x1b,
+        0x3e, 0x56, 0x14, 0xf7, 0x3b, 0x31, 0x4e, 0x37, 0x6c, 0x27, 0x83, 0x31,
+        0x9b, 0x8f, 0x27, 0xe3, 0xbd, 0x92, 0x5d, 0xed, 0x2b, 0xb0, 0x3b, 0xf6,
+        0x1f, 0x5c, 0xd7, 0x17, 0xf2, 0x3d, 0x0f, 0x9a, 0x8b, 0x9d, 0x90, 0x21,
+        0xdb, 0x75, 0xf0, 0xdc, 0x01, 0x1e, 0x82, 0x98, 0x4f, 0x3f, 0xd6, 0x43,
+        0x07, 0xe8, 0x6f, 0xc2, 0x9c, 0x3a, 0x65, 0xfa, 0x74, 0x2f, 0x74, 0x61,
+        0xa2, 0x6f, 0x50, 0x9e, 0x2f, 0x45, 0x61, 0x03, 0xec, 0x0f, 0x1d, 0x2c,
+        0x46, 0xc3, 0x55, 0xb1, 0x65, 0x2e, 0xde, 0x01, 0xfb, 0x6a, 0x36, 0x67,
+        0x60, 0x1f, 0xdf, 0x51, 0xfe, 0x62, 0xc8, 0x1c, 0xd3, 0x24, 0xdf, 0x91,
+        0x38, 0x0c, 0x7e, 0xa2, 0x4f, 0x89, 0xf0, 0x7a, 0x87, 0xc6, 0x35, 0x0b,
+        0x39, 0x72, 0x6c, 0xf8, 0xa4, 0xad, 0x90, 0x21, 0xfd, 0x56, 0x1f, 0xec,
+        0x39, 0xac, 0xfc, 0xc9, 0xd8, 0x86, 0xfe, 0x24, 0x3a, 0x51, 0xc6, 0x58,
+        0x85, 0xf3, 0x01, 0xfa, 0xb0, 0x51, 0x2c, 0x57, 0x79, 0x00, 0x6b, 0x6f,
+        0x56, 0xd9, 0xc7, 0x09, 0xce, 0xb7, 0xf9, 0xf9, 0x38, 0xf9, 0xe2, 0x7c,
+        0x6d, 0x3c, 0x4b, 0x1b, 0x8c, 0x1e, 0xb6, 0xd5, 0xf8, 0x27, 0xbc, 0xf1,
+        0x5d, 0xde, 0x0b, 0xa5, 0x1e, 0x2d, 0xa5, 0x78, 0xf0, 0xe9, 0x88, 0x2c,
+        0x9f, 0xec, 0x37, 0xf7, 0xc0, 0x86, 0xe9, 0xa7, 0x96, 0x2f, 0x50, 0xc7,
+        0xa0, 0x31, 0x42, 0x1d, 0x9b, 0x8a, 0xbf, 0xe4, 0x22, 0xd7, 0x9e, 0xf4,
+        0x19, 0x42, 0x1f, 0x01, 0x9f, 0x8b, 0xb5, 0x38, 0xeb, 0xad, 0xc5, 0x9c,
+        0x43, 0xfb, 0x7b, 0x06, 0xcf, 0xea, 0x32, 0x16, 0xa3, 0x7f, 0x78, 0x5e,
+        0x52, 0xf0, 0x91, 0xd0, 0xa3, 0x54, 0x31, 0x97, 0x4a, 0xa9, 0xd5, 0x6f,
+        0xc1, 0xb6, 0x86, 0xff, 0xae, 0xe9, 0xfa, 0x43, 0xfa, 0x06, 0xfa, 0x9a,
+        0x82, 0xa9, 0x43, 0x72, 0x3a, 0x9c, 0x21, 0x74, 0x13, 0x4f, 0x1a, 0xd1,
+        0x4c, 0x16, 0x7c, 0x4d, 0x59, 0x4d, 0xb1, 0x1e, 0x13, 0x44, 0x0c, 0xf4,
+        0xa9, 0xcb, 0x4e, 0xdf, 0x3f, 0x2d, 0x3b, 0xbe, 0x2e, 0xa8, 0x57, 0xea,
+        0xc1, 0xf7, 0x11, 0x01, 0xb9, 0x0c, 0xdf, 0x35, 0x57, 0xea, 0x96, 0x06,
+        0x78, 0xba, 0xe2, 0xf8, 0xb6, 0x66, 0x78, 0xb6, 0xc6, 0x67, 0xba, 0xf1,
+        0x7c, 0x00, 0x7e, 0x4d, 0xf2, 0x46, 0x02, 0xbf, 0x8b, 0xa4, 0xc9, 0x36,
+        0xdf, 0xce, 0xb9, 0x66, 0xa2, 0x76, 0x59, 0xda, 0x25, 0x13, 0x43, 0xfc,
+        0x58, 0xd4, 0x31, 0x56, 0x1f, 0x7c, 0x79, 0x40, 0x0e, 0x96, 0x42, 0xf2,
+        0xd5, 0x12, 0xe7, 0x95, 0xd6, 0x52, 0xd0, 0x5b, 0x72, 0xb1, 0x09, 0x9d,
+        0x8f, 0xc3, 0xe7, 0x65, 0xb4, 0x31, 0xf8, 0x9f, 0xdd, 0xd5, 0xaf, 0x68,
+        0xe9, 0xf3, 0x59, 0x6d, 0xbc, 0xbe, 0x5f, 0xcb, 0x9c, 0x9f, 0xd4, 0x76,
+        0xb5, 0xf8, 0x22, 0xd1, 0xde, 0xdd, 0x17, 0x9d, 0x38, 0xcd, 0x31, 0xfb,
+        0xe3, 0x1b, 0xfb, 0xa2, 0x5f, 0x6a, 0xad, 0xbe, 0xa8, 0x1f, 0xbe, 0x28,
+        0x03, 0x5f, 0x34, 0x7e, 0xdf, 0xbe, 0xa8, 0x5d, 0xdf, 0xd8, 0x17, 0x75,
+        0xeb, 0x77, 0x7d, 0x11, 0x63, 0xcf, 0xbf, 0xc6, 0xb5, 0x29, 0xdb, 0x76,
+        0xfa, 0x72, 0x0e, 0xc3, 0x0f, 0x6f, 0x82, 0xac, 0xbb, 0xb8, 0x76, 0x22,
+        0x05, 0xd8, 0xfd, 0x34, 0xc6, 0xfa, 0x4d, 0xd8, 0xfb, 0xb6, 0x98, 0x65,
+        0x3e, 0xa1, 0xc6, 0x7d, 0xa7, 0xce, 0xc7, 0x56, 0x75, 0x4e, 0x1e, 0xdf,
+        0x53, 0xe7, 0xb6, 0xab, 0x73, 0xea, 0xba, 0x53, 0x66, 0xd4, 0xb8, 0x4d,
+        0x09, 0x3c, 0x26, 0xf0, 0x2a, 0xf2, 0x59, 0x23, 0x11, 0x05, 0x3d, 0x1d,
+        0xe3, 0x53, 0x5f, 0x31, 0xf0, 0x20, 0xd0, 0x6f, 0xb7, 0xf2, 0x45, 0xbb,
+        0xa0, 0xf7, 0x65, 0xe7, 0xfe, 0x74, 0x95, 0x69, 0xd1, 0xd5, 0x9e, 0x35,
+        0xba, 0xea, 0x90, 0xe1, 0x98, 0xaf, 0xa3, 0xcd, 0x92, 0x8c, 0x51, 0x67,
+        0xf7, 0xa3, 0xab, 0x7f, 0xaa, 0xff, 0xfd, 0xe8, 0xea, 0xb7, 0xee, 0xa1,
+        0xab, 0x7f, 0xb5, 0x4e, 0x57, 0x96, 0xf9, 0x82, 0x46, 0xda, 0x8c, 0x1f,
+        0xf4, 0x47, 0xcd, 0x8f, 0x4e, 0x31, 0x7f, 0xa8, 0x73, 0x4d, 0xfb, 0x79,
+        0x07, 0xd7, 0xf3, 0xa5, 0xa6, 0x61, 0x59, 0x90, 0x1d, 0xd7, 0x34, 0xe5,
+        0x16, 0x35, 0x3f, 0x4f, 0xfe, 0x11, 0x3b, 0xa6, 0x10, 0x6b, 0x5c, 0x1e,
+        0xda, 0xa5, 0xbc, 0xc5, 0xed, 0x3f, 0x55, 0x6a, 0xfe, 0x42, 0x4f, 0xbc,
+        0xdd, 0x4c, 0x8e, 0x58, 0x5e, 0x1c, 0x08, 0xca, 0xd7, 0xaa, 0xd1, 0xac,
+        0xad, 0x75, 0x4b, 0xfe, 0x41, 0xc4, 0x9e, 0x12, 0xfd, 0xd7, 0xd6, 0x7b,
+        0xc4, 0xe8, 0x3e, 0x2f, 0x46, 0x57, 0xc1, 0x2b, 0xf3, 0xab, 0xef, 0xbe,
+        0xd5, 0x08, 0xf1, 0x3b, 0x66, 0xee, 0x93, 0x2f, 0x73, 0x8e, 0x88, 0xf7,
+        0x8c, 0xfb, 0x16, 0x73, 0x9e, 0x7c, 0x20, 0xd1, 0x25, 0xf9, 0x2d, 0x5c,
+        0x8f, 0xf4, 0x73, 0xf4, 0x5d, 0xed, 0x1e, 0xdf, 0x7e, 0x8e, 0xa4, 0x78,
+        0x33, 0x30, 0x65, 0xf4, 0x41, 0x3e, 0x54, 0xe2, 0x3c, 0xde, 0xf2, 0xec,
+        0x89, 0xb9, 0x82, 0xb4, 0xb9, 0xbe, 0x61, 0x2f, 0x72, 0x01, 0xda, 0x81,
+        0xaf, 0x73, 0xea, 0x9b, 0x39, 0x82, 0x44, 0x74, 0x8b, 0x39, 0x82, 0x98,
+        0x46, 0x62, 0x9f, 0x66, 0x43, 0xf7, 0x36, 0x74, 0x6f, 0x43, 0xf7, 0x36,
+        0x74, 0x9f, 0xac, 0x1f, 0xc6, 0x3d, 0x95, 0x87, 0x80, 0x17, 0x97, 0x7e,
+        0xda, 0xa5, 0x0f, 0x3e, 0xb7, 0x4a, 0x4e, 0xe9, 0x84, 0xf3, 0x45, 0xae,
+        0xa1, 0xfc, 0xf5, 0xb8, 0xe6, 0xfa, 0x6b, 0xd2, 0xcb, 0xe0, 0xf9, 0xdb,
+        0x98, 0xa7, 0xad, 0xeb, 0xd6, 0x5d, 0x99, 0xcc, 0xb5, 0xc8, 0x64, 0xd6,
+        0xa1, 0x8c, 0xd8, 0x9f, 0x3e, 0x77, 0x5a, 0xaf, 0xac, 0xca, 0x65, 0x2f,
+        0x78, 0xe8, 0xe0, 0xdc, 0xbd, 0x79, 0x90, 0x7e, 0xaf, 0x47, 0xff, 0x6f,
+        0xd1, 0x87, 0xfe, 0x75, 0xa3, 0x71, 0x39, 0x26, 0x73, 0xc6, 0x77, 0x9b,
+        0x0f, 0x72, 0x66, 0xac, 0x81, 0xef, 0x21, 0x96, 0x5f, 0x44, 0x2c, 0x59,
+        0x31, 0x22, 0xf2, 0x93, 0x47, 0xaf, 0x21, 0x97, 0x96, 0xfc, 0xc3, 0x89,
+        0x66, 0x24, 0x90, 0x78, 0xab, 0x39, 0x37, 0x82, 0x18, 0x97, 0x88, 0x86,
+        0x93, 0xc6, 0xb0, 0x5c, 0xaa, 0x0f, 0xca, 0x8f, 0xea, 0x96, 0xfc, 0xb0,
+        0x1e, 0x91, 0x1f, 0x20, 0xe6, 0x7f, 0xbf, 0xde, 0x9a, 0x73, 0x47, 0x68,
+        0x4f, 0x3d, 0xe9, 0xfa, 0x46, 0xb9, 0x7f, 0x13, 0x34, 0xde, 0x82, 0x9d,
+        0x04, 0xb2, 0xc8, 0xf5, 0x19, 0xbf, 0x26, 0x0e, 0x15, 0x9f, 0x6b, 0x82,
+        0xb7, 0x6c, 0x5b, 0xc2, 0xca, 0xeb, 0x7a, 0xf7, 0xa8, 0xf9, 0x29, 0xb4,
+        0x39, 0xa3, 0x81, 0x6a, 0xb1, 0x53, 0xe5, 0x8b, 0xd0, 0x91, 0xd8, 0xf5,
+        0x60, 0xb0, 0x56, 0xbc, 0x85, 0x7e, 0xcd, 0xe6, 0xa1, 0xf8, 0x6f, 0xed,
+        0x30, 0xff, 0x81, 0x85, 0x35, 0xdd, 0xf9, 0x25, 0x23, 0xb1, 0x49, 0x66,
+        0x43, 0xdf, 0x6f, 0x98, 0x03, 0x7d, 0x59, 0x3d, 0x11, 0x94, 0x74, 0x91,
+        0x6b, 0x2a, 0x24, 0xb3, 0x55, 0x28, 0xff, 0x3c, 0xd7, 0x85, 0x3c, 0x3b,
+        0x17, 0xef, 0x86, 0xed, 0xff, 0x9a, 0xe1, 0xae, 0x03, 0x18, 0x50, 0x75,
+        0x50, 0xf2, 0xe0, 0x37, 0x5f, 0x7f, 0xcb, 0xc3, 0x0e, 0xf0, 0x2a, 0x5b,
+        0x21, 0xf8, 0xc4, 0x70, 0xda, 0x76, 0xfe, 0x30, 0x88, 0xb6, 0xe0, 0x56,
+        0xeb, 0xce, 0x26, 0x7c, 0x3f, 0x10, 0xb2, 0x88, 0x4d, 0x24, 0xf3, 0x05,
+        0x7c, 0xff, 0x4a, 0x42, 0x36, 0xf7, 0xe2, 0x7b, 0x4b, 0x02, 0x26, 0x99,
+        0x60, 0xcc, 0xd5, 0x5a, 0x62, 0xae, 0x68, 0x69, 0xc8, 0x6e, 0x0e, 0x73,
+        0x4f, 0x43, 0x9e, 0x5f, 0xac, 0x07, 0xb5, 0xd4, 0xe9, 0x47, 0xc0, 0x87,
+        0x9f, 0x3b, 0x23, 0x3f, 0x33, 0x97, 0xb7, 0x04, 0xe4, 0x16, 0x7c, 0x5c,
+        0x12, 0x7e, 0xcc, 0x46, 0x6e, 0xb1, 0x03, 0xcb, 0x35, 0xfa, 0x5f, 0xbf,
+        0x20, 0x5f, 0xf3, 0x78, 0x6b, 0x93, 0x05, 0x65, 0xa3, 0x6c, 0xcf, 0x67,
+        0xfe, 0xcd, 0xc0, 0xdd, 0xf6, 0x17, 0x57, 0xdb, 0xcb, 0x99, 0x7f, 0xb8,
+        0xda, 0xde, 0xdb, 0xe6, 0xf2, 0x3f, 0xaa, 0x4d, 0xd4, 0xf7, 0x78, 0x6d,
+        0xb7, 0xa1, 0xb3, 0x66, 0x93, 0xb9, 0x45, 0x01, 0xd8, 0x24, 0x1d, 0xa7,
+        0x2f, 0xbe, 0x1f, 0x5f, 0xbb, 0xc6, 0xcf, 0x9a, 0x49, 0x83, 0xb6, 0x10,
+        0x14, 0x97, 0x26, 0xef, 0x77, 0x20, 0x7f, 0xbf, 0x8d, 0xdf, 0x8c, 0xa3,
+        0x7e, 0x6e, 0xce, 0x3e, 0x7c, 0xfe, 0xcd, 0x7b, 0xd8, 0x4b, 0x08, 0xf6,
+        0xf2, 0xff, 0xab, 0x5d, 0x5c, 0xba, 0x1f, 0xbb, 0xc0, 0x9f, 0xb2, 0x0b,
+        0xd5, 0xff, 0xd2, 0xea, 0x5a, 0x09, 0x43, 0x3e, 0x8c, 0x07, 0x83, 0xd0,
+        0xf1, 0x66, 0x99, 0xb5, 0xc8, 0x8f, 0x15, 0xc9, 0xc1, 0x5f, 0x9e, 0x58,
+        0x17, 0xbb, 0xbb, 0x10, 0x0f, 0x8e, 0x9f, 0x8e, 0x8e, 0x32, 0x1e, 0xc4,
+        0xe0, 0x1b, 0x93, 0xef, 0x88, 0x07, 0x37, 0x8c, 0xd6, 0x78, 0x60, 0x20,
+        0x1e, 0xec, 0x7a, 0x97, 0x78, 0x70, 0xe2, 0x1d, 0xf1, 0x40, 0x83, 0x6c,
+        0x38, 0xbf, 0xbf, 0x35, 0xfc, 0x78, 0x50, 0x58, 0x13, 0x0f, 0x7c, 0x5d,
+        0x59, 0x0a, 0x0b, 0xdc, 0xd5, 0x5b, 0x97, 0xa7, 0x2b, 0x09, 0x06, 0x12,
+        0x8d, 0xcc, 0x9c, 0xf5, 0xb0, 0xb4, 0xc1, 0xe7, 0x5e, 0xaa, 0x8f, 0x40,
+        0x67, 0x97, 0x30, 0xf7, 0x68, 0x9c, 0x89, 0x65, 0x5b, 0x82, 0xeb, 0xe1,
+        0xcd, 0x08, 0x30, 0xe2, 0x6e, 0xe0, 0xbe, 0xdd, 0x67, 0xd5, 0xfa, 0x78,
+        0x33, 0xea, 0x61, 0xf7, 0x6d, 0xc0, 0xee, 0x78, 0x3e, 0x00, 0x4c, 0xc8,
+        0xf6, 0x2b, 0x66, 0x12, 0x7a, 0xaa, 0x3a, 0xf6, 0xee, 0x02, 0x3e, 0x73,
+        0xaa, 0xef, 0xad, 0x08, 0xfb, 0x76, 0x24, 0x12, 0xd1, 0x3f, 0xc3, 0x77,
+        0x7b, 0x22, 0xbc, 0xed, 0xaa, 0x45, 0xba, 0x87, 0xa2, 0x67, 0x15, 0x8d,
+        0x80, 0x14, 0xd4, 0xb3, 0x91, 0x6d, 0x7c, 0xf6, 0x18, 0x62, 0xf6, 0x51,
+        0xc7, 0x94, 0x23, 0x4e, 0x76, 0x77, 0x0e, 0x1f, 0x62, 0xd5, 0x4b, 0x25,
+        0xde, 0x1f, 0xc5, 0xfd, 0x80, 0x30, 0x97, 0xfc, 0x2a, 0xfa, 0x1c, 0x44,
+        0x9f, 0x19, 0xc7, 0xd7, 0x05, 0xef, 0x37, 0x32, 0x29, 0xdc, 0x9f, 0x29,
+        0x36, 0x32, 0xe9, 0x22, 0xf3, 0xd6, 0xa1, 0xf0, 0x11, 0xc8, 0x33, 0x8b,
+        0x5c, 0xcd, 0x96, 0xe8, 0x60, 0x5e, 0x9e, 0xee, 0x1c, 0x07, 0x4e, 0x3a,
+        0x87, 0x1c, 0xc2, 0x9e, 0x8c, 0xc6, 0xcb, 0xf2, 0xe1, 0xce, 0xe4, 0x69,
+        0xe4, 0x0b, 0xf1, 0xed, 0x90, 0x61, 0x23, 0xa3, 0xc7, 0x04, 0xb6, 0x1e,
+        0x87, 0x5f, 0x1e, 0xd1, 0x53, 0xc5, 0x7e, 0x73, 0x56, 0x1e, 0x95, 0x86,
+        0x19, 0x0d, 0x8f, 0xcb, 0x26, 0x49, 0x05, 0xd0, 0x6f, 0xf0, 0x43, 0x92,
+        0x0d, 0x53, 0xd6, 0x0f, 0xc2, 0xdf, 0x6b, 0xd2, 0x61, 0xb5, 0xc6, 0x9e,
+        0x5b, 0x10, 0x6f, 0x2e, 0x40, 0x9f, 0xdd, 0x61, 0x75, 0x7a, 0x3a, 0xd9,
+        0x24, 0xcb, 0xef, 0xe8, 0x77, 0xbb, 0xa5, 0x5f, 0x6b, 0xfb, 0xdb, 0x68,
+        0xdf, 0x84, 0x9c, 0xb3, 0x91, 0x09, 0xc4, 0x20, 0x7f, 0xcc, 0xa1, 0x0d,
+        0x76, 0x72, 0x15, 0xf3, 0x61, 0x1c, 0x2c, 0x94, 0x99, 0xf7, 0x18, 0x52,
+        0x36, 0x71, 0xcf, 0x69, 0x36, 0x2b, 0x16, 0xf8, 0xbd, 0x40, 0x9e, 0x83,
+        0x32, 0xee, 0x0c, 0x88, 0x5d, 0xa3, 0x1c, 0xa2, 0xf0, 0x4a, 0x0f, 0x77,
+        0xa5, 0x16, 0xa3, 0x76, 0x1e, 0x14, 0x8d, 0x0b, 0x7d, 0x5d, 0x49, 0xe4,
+        0x39, 0xfa, 0x85, 0x48, 0x57, 0x0a, 0x36, 0x6b, 0x5c, 0x78, 0xa8, 0x2b,
+        0x7d, 0x9a, 0x7c, 0x19, 0xc8, 0x73, 0x3e, 0x0a, 0x9c, 0xdf, 0x94, 0xdf,
+        0x45, 0x2e, 0x5b, 0x18, 0x44, 0x0e, 0x80, 0xd5, 0xaf, 0x83, 0xef, 0xbc,
+        0x29, 0xc1, 0xae, 0xc4, 0xab, 0xe0, 0x6f, 0x18, 0xb2, 0xd9, 0x84, 0x3e,
+        0x06, 0xda, 0x07, 0x58, 0x13, 0x68, 0x69, 0xb7, 0xba, 0x10, 0x4f, 0x11,
+        0xbb, 0x24, 0x98, 0x1c, 0xe9, 0x06, 0xfd, 0x2b, 0x01, 0xe6, 0x82, 0xc1,
+        0xd8, 0x6a, 0xfb, 0x37, 0xdd, 0xf6, 0x41, 0xf0, 0xc2, 0xe7, 0x88, 0x09,
+        0x24, 0x38, 0x35, 0x62, 0x82, 0x07, 0xf6, 0x0d, 0xa9, 0xbe, 0xe9, 0x45,
+        0xda, 0x40, 0x23, 0x53, 0xb1, 0x1e, 0x91, 0xd4, 0xc2, 0x56, 0x19, 0x5f,
+        0xe8, 0x95, 0x5d, 0x0b, 0xc4, 0x30, 0xac, 0x69, 0x60, 0x2a, 0xc0, 0x18,
+        0xfa, 0x05, 0xe6, 0x76, 0xd1, 0xf0, 0x41, 0xe9, 0x0f, 0x7f, 0x15, 0xeb,
+        0x60, 0xca, 0x8a, 0x45, 0x66, 0xb1, 0xc6, 0x02, 0x8a, 0x4e, 0xd8, 0x1f,
+        0x93, 0x36, 0xba, 0x66, 0xdc, 0xf4, 0xe2, 0xbd, 0xe8, 0x62, 0xe1, 0x5c,
+        0x08, 0xaf, 0xa3, 0xfb, 0x57, 0x1e, 0x5d, 0x13, 0x74, 0xfb, 0x40, 0x93,
+        0x73, 0x7c, 0xa8, 0x73, 0xec, 0xb4, 0xd8, 0x1d, 0xe0, 0x2f, 0x1d, 0x7b,
+        0x58, 0x66, 0x41, 0xe7, 0xe8, 0x02, 0xfd, 0xa4, 0x6c, 0xc5, 0x67, 0xb8,
+        0x4d, 0x62, 0x83, 0xe7, 0x81, 0x73, 0xc6, 0x14, 0x0d, 0x17, 0x73, 0xe8,
+        0x17, 0x12, 0xc0, 0xa9, 0x1f, 0x07, 0x3f, 0xcc, 0xb1, 0x38, 0xe7, 0x00,
+        0xe6, 0x9b, 0xc0, 0x3a, 0x64, 0x7d, 0x85, 0xeb, 0x1b, 0xbf, 0xcf, 0x87,
+        0x3b, 0x53, 0xa7, 0xdb, 0xb1, 0xee, 0xe4, 0x11, 0x43, 0xc5, 0x7e, 0xea,
+        0xc5, 0xea, 0x4c, 0x96, 0x14, 0xdf, 0x9d, 0xa9, 0x12, 0x65, 0x14, 0xef,
+        0x4c, 0x97, 0x28, 0x23, 0x01, 0x3f, 0x71, 0xd8, 0x64, 0x40, 0x22, 0x5b,
+        0xa8, 0xc7, 0x43, 0xe8, 0xf7, 0x57, 0x01, 0xe2, 0xb8, 0xa4, 0xc5, 0xdf,
+        0xf0, 0xb5, 0x17, 0x0e, 0xa3, 0x2f, 0x7f, 0x6f, 0x07, 0xdd, 0xfe, 0xc1,
+        0x82, 0xb4, 0x0f, 0xce, 0xc0, 0x4f, 0xe8, 0x23, 0xc0, 0x91, 0xca, 0xce,
+        0x9b, 0xc0, 0xd8, 0x3b, 0x30, 0x1f, 0xac, 0x8d, 0x98, 0x25, 0xd3, 0xf3,
+        0x94, 0xab, 0x7c, 0x08, 0x73, 0xc0, 0xfc, 0x63, 0xf0, 0x2d, 0x9c, 0x03,
+        0xc7, 0x16, 0xe4, 0x36, 0x4b, 0x92, 0x9b, 0x0f, 0x2a, 0x2c, 0x6b, 0x9b,
+        0x1c, 0x5f, 0xd3, 0xf4, 0x44, 0x17, 0x74, 0xcc, 0xb9, 0xcd, 0x81, 0xb7,
+        0x67, 0x10, 0xff, 0xa2, 0x0a, 0x43, 0x19, 0x17, 0xb8, 0x56, 0x46, 0xb1,
+        0x4e, 0xc8, 0xbf, 0x67, 0x7b, 0x5a, 0x03, 0x3e, 0x45, 0xf9, 0x7f, 0xe4,
+        0xea, 0x09, 0xf8, 0x91, 0x51, 0xf9, 0x7d, 0xf8, 0x92, 0x1f, 0xd7, 0xe3,
+        0xc8, 0x1b, 0x86, 0x91, 0x37, 0x0c, 0x22, 0x6f, 0xb0, 0x90, 0x37, 0x44,
+        0x90, 0x37, 0xf4, 0x21, 0x6f, 0x08, 0x23, 0x3e, 0x88, 0x1c, 0xad, 0xe7,
+        0x61, 0x63, 0x0d, 0xf8, 0x41, 0x33, 0x68, 0xd7, 0x43, 0xc1, 0x64, 0x3d,
+        0x1c, 0x4c, 0xd5, 0x03, 0x98, 0xd3, 0x01, 0x8e, 0x89, 0xf9, 0xe5, 0x3b,
+        0xc7, 0x4a, 0xc3, 0x88, 0x39, 0x36, 0xfc, 0x52, 0x1a, 0xf1, 0x36, 0x2e,
+        0x47, 0xf0, 0xcc, 0xf2, 0x7c, 0x04, 0xcf, 0x34, 0x25, 0x1d, 0x6f, 0x93,
+        0x59, 0x33, 0x0e, 0x1a, 0x5b, 0x94, 0x9d, 0x22, 0xdf, 0x6a, 0x83, 0x9d,
+        0x4a, 0xae, 0xc8, 0x7c, 0xab, 0x0f, 0xf4, 0x3a, 0x11, 0x97, 0xe9, 0x1f,
+        0xe8, 0x0b, 0xec, 0xdd, 0x5f, 0xb2, 0xb8, 0xe6, 0xba, 0xb4, 0xe4, 0xe9,
+        0xbc, 0x10, 0x6b, 0x22, 0x0e, 0xc2, 0x2e, 0xd8, 0x36, 0x81, 0xe7, 0xf8,
+        0xfb, 0x6d, 0xcf, 0xef, 0x7f, 0x24, 0x28, 0x30, 0xde, 0x4b, 0x8c, 0xf9,
+        0x16, 0xe8, 0x39, 0xad, 0xeb, 0xb5, 0xa6, 0x8b, 0xe5, 0xdf, 0x67, 0xfd,
+        0x8d, 0x35, 0xc7, 0xd7, 0xc0, 0x73, 0xbf, 0xb9, 0x8c, 0x1c, 0xd9, 0xde,
+        0xbf, 0x82, 0xdf, 0xad, 0xfd, 0xeb, 0xe8, 0xaf, 0xda, 0x82, 0x66, 0x22,
+        0xce, 0x7c, 0x18, 0x3e, 0x73, 0x10, 0xfe, 0xf1, 0x56, 0x46, 0x5f, 0xba,
+        0x89, 0x79, 0x42, 0x9e, 0xc5, 0x5b, 0x99, 0xc0, 0xc0, 0xb5, 0xe6, 0x8b,
+        0xc0, 0x37, 0x63, 0x4b, 0x23, 0x92, 0x5a, 0xea, 0x0f, 0x5f, 0x96, 0xce,
+        0xdb, 0xb6, 0x5c, 0x6b, 0xce, 0x3a, 0xd1, 0xe3, 0xb6, 0x10, 0x6f, 0x99,
+        0x52, 0x01, 0xa9, 0x6d, 0x3b, 0x3b, 0x88, 0x19, 0x2f, 0x8a, 0x1e, 0x91,
+        0xe4, 0x29, 0x5b, 0x46, 0x76, 0xfa, 0xb9, 0xfb, 0x9d, 0x0e, 0xe9, 0x42,
+        0xdb, 0x52, 0x04, 0x7d, 0x88, 0x53, 0x39, 0xef, 0x2c, 0xe6, 0xac, 0xb9,
+        0xcf, 0x78, 0xf5, 0xc9, 0x42, 0x09, 0x73, 0xaf, 0xdf, 0xca, 0x5c, 0x3e,
+        0x05, 0xec, 0x0e, 0x1d, 0x25, 0x4f, 0xb1, 0xae, 0xb0, 0x09, 0x72, 0x1a,
+        0x83, 0xad, 0xd0, 0x06, 0xfa, 0xf1, 0x6c, 0x53, 0xbe, 0x11, 0xa7, 0x5d,
+        0xbc, 0x04, 0x59, 0x82, 0x56, 0xc0, 0x9f, 0x0f, 0x70, 0xde, 0x3c, 0xe5,
+        0x17, 0x46, 0x6e, 0xce, 0xb1, 0x25, 0xd8, 0x99, 0x58, 0x9f, 0x77, 0xdf,
+        0xca, 0x2c, 0x9f, 0x02, 0xfd, 0x01, 0xd6, 0xde, 0xe0, 0xb3, 0x8b, 0xac,
+        0x1d, 0x32, 0x27, 0xdd, 0x05, 0x3d, 0xed, 0x55, 0xb5, 0xb8, 0x64, 0x35,
+        0x2e, 0xd6, 0x49, 0xfa, 0x2c, 0x89, 0x18, 0xd6, 0x7e, 0xe4, 0xaf, 0x62,
+        0xea, 0x89, 0x49, 0xdc, 0xa3, 0x3c, 0x35, 0xe4, 0x1c, 0xb8, 0x7f, 0x61,
+        0x45, 0xe9, 0xc4, 0x80, 0xee, 0x72, 0x3b, 0x99, 0x84, 0xc9, 0xbc, 0x91,
+        0x80, 0x2f, 0x1c, 0xe1, 0x1c, 0xd4, 0xd8, 0xc8, 0xc7, 0xb9, 0xfe, 0x30,
+        0x67, 0xd8, 0x55, 0x4b, 0x5e, 0xae, 0xfe, 0x66, 0x4b, 0x47, 0x60, 0xd3,
+        0x92, 0x6f, 0x43, 0x3e, 0x90, 0x1c, 0xc1, 0x6f, 0x38, 0x81, 0xa3, 0xd0,
+        0xe7, 0xd9, 0x11, 0xd6, 0x3f, 0x5f, 0x02, 0xb6, 0x27, 0xdf, 0xb1, 0xc8,
+        0x11, 0xb5, 0x86, 0x71, 0xed, 0x30, 0x97, 0xdb, 0x24, 0x97, 0xd5, 0xfc,
+        0x1e, 0x22, 0xf6, 0x80, 0x9e, 0xee, 0x67, 0x7e, 0xe3, 0xf7, 0x39, 0x3f,
+        0x97, 0x3e, 0x63, 0x57, 0xd2, 0x8a, 0x48, 0xaa, 0x78, 0xa9, 0x19, 0xb0,
+        0x2c, 0x60, 0x67, 0x57, 0x8f, 0x29, 0x27, 0x08, 0x3e, 0x58, 0x6b, 0xdb,
+        0xa9, 0x74, 0x09, 0x3e, 0x68, 0x3b, 0xf9, 0x60, 0x62, 0xb3, 0x9c, 0x9b,
+        0xef, 0x91, 0xca, 0xfc, 0xcf, 0xa5, 0x3a, 0xdf, 0x25, 0xe7, 0xe7, 0x9b,
+        0x72, 0x35, 0xae, 0x7c, 0x93, 0xd5, 0xae, 0xd6, 0xb5, 0x3c, 0xec, 0xd6,
+        0x61, 0x62, 0xa3, 0xd7, 0xe5, 0x79, 0x39, 0x57, 0x76, 0x79, 0xcf, 0xb4,
+        0xf0, 0x7e, 0x15, 0xb6, 0xf6, 0xaa, 0x45, 0xfe, 0x47, 0xa4, 0x52, 0x24,
+        0xef, 0xfb, 0x14, 0xef, 0xbb, 0x56, 0x79, 0x97, 0xac, 0x61, 0x91, 0xff,
+        0x8d, 0x78, 0xef, 0x90, 0xec, 0x56, 0xf2, 0x1f, 0xc1, 0xb3, 0xef, 0xb4,
+        0xbf, 0x8a, 0x73, 0xad, 0xb9, 0x5c, 0x6c, 0x53, 0x3c, 0x1b, 0x89, 0x11,
+        0xc8, 0xe7, 0x5a, 0xb3, 0xe1, 0x70, 0x1d, 0xe1, 0xb7, 0xf3, 0x2f, 0xe0,
+        0xab, 0x7a, 0x55, 0xce, 0x92, 0x9b, 0xec, 0xee, 0x4c, 0x2e, 0x8e, 0x42,
+        0xb7, 0x9d, 0x6a, 0x1d, 0xc2, 0x6d, 0x40, 0x67, 0xff, 0x1e, 0xfd, 0xbf,
+        0xcd, 0xf5, 0xa6, 0xe4, 0x92, 0x86, 0x5c, 0x0a, 0xc5, 0xf1, 0x76, 0xe0,
+        0x27, 0x8c, 0xd3, 0xc8, 0x64, 0x1d, 0x3e, 0xd3, 0x07, 0xdf, 0xc6, 0xef,
+        0xf7, 0x6d, 0x0f, 0x79, 0xf8, 0x5c, 0xe8, 0x1c, 0x79, 0x05, 0xd7, 0xf3,
+        0x48, 0x03, 0x31, 0x36, 0x36, 0x58, 0x51, 0xfb, 0x10, 0x71, 0x85, 0x85,
+        0x67, 0x9d, 0x6f, 0xe3, 0xe3, 0x8e, 0x37, 0x56, 0xe7, 0x98, 0x6b, 0xe7,
+        0x54, 0x70, 0x1a, 0xc8, 0xdf, 0x2d, 0xd0, 0xe5, 0xb8, 0x79, 0x31, 0x12,
+        0x06, 0xc6, 0x65, 0x5b, 0x37, 0x7c, 0x4c, 0x04, 0x3e, 0x6b, 0x18, 0xbe,
+        0x9f, 0x6b, 0x99, 0x7e, 0xde, 0xe7, 0x7d, 0x18, 0x34, 0xe9, 0x7f, 0x87,
+        0x31, 0x67, 0xe6, 0xd8, 0xf4, 0x9f, 0x88, 0x27, 0xb5, 0x70, 0x57, 0xf2,
+        0xb4, 0x5b, 0x1b, 0x74, 0x7f, 0xf3, 0xbe, 0x04, 0x1f, 0x49, 0x44, 0xcb,
+        0x79, 0xe4, 0x7e, 0x29, 0xac, 0xd1, 0xa4, 0x85, 0x3c, 0xbb, 0x16, 0x7d,
+        0x85, 0x98, 0x5b, 0xa7, 0x0c, 0x96, 0x28, 0x27, 0xd6, 0xa9, 0x4c, 0xc9,
+        0x57, 0xbe, 0x0b, 0x79, 0x04, 0x65, 0x8b, 0x95, 0x85, 0x4f, 0x01, 0xff,
+        0x98, 0xfb, 0x5c, 0x89, 0xb5, 0xc8, 0x7e, 0xc4, 0x31, 0x03, 0x42, 0x40,
+        0x4e, 0xb5, 0x64, 0xc8, 0x67, 0x03, 0x43, 0xc8, 0x01, 0x9f, 0x45, 0xdf,
+        0x80, 0xe4, 0x97, 0x18, 0x0f, 0x02, 0x32, 0xb7, 0x24, 0x72, 0xfd, 0x14,
+        0xfd, 0x8a, 0xfa, 0x83, 0xcc, 0x1b, 0x99, 0x69, 0x62, 0xed, 0x79, 0xfa,
+        0x18, 0xfa, 0x89, 0x07, 0xa1, 0x8b, 0xd8, 0x4b, 0xdf, 0x40, 0x6c, 0x9a,
+        0x2d, 0xf6, 0xc3, 0x67, 0x4a, 0x43, 0x87, 0x4c, 0x11, 0xd3, 0x98, 0xa3,
+        0x6f, 0x50, 0x77, 0xf4, 0x6b, 0x8e, 0x41, 0x29, 0x9c, 0x62, 0xbd, 0x31,
+        0x08, 0x5e, 0x98, 0xb7, 0x1a, 0x2a, 0x0f, 0x7a, 0x50, 0xf9, 0x56, 0x7e,
+        0x07, 0x5a, 0xc6, 0x8d, 0x1d, 0xdf, 0xa6, 0xd3, 0x8f, 0x3d, 0x22, 0xf6,
+        0xc4, 0xa1, 0xce, 0x5d, 0xa5, 0x76, 0x29, 0xf7, 0xd2, 0x2e, 0xa9, 0xff,
+        0xac, 0x4e, 0x5f, 0x8b, 0x3c, 0x0c, 0xf4, 0x58, 0x23, 0x08, 0xa0, 0x5f,
+        0xc8, 0xeb, 0x47, 0xb9, 0xfe, 0xb6, 0x4c, 0xed, 0xfc, 0x3b, 0xf0, 0xe5,
+        0xfa, 0xb5, 0xdc, 0x4e, 0xf8, 0xdb, 0x09, 0x5d, 0x1e, 0xfb, 0x54, 0x1a,
+        0xcf, 0x32, 0x16, 0xde, 0xf2, 0xf0, 0x38, 0xdb, 0x58, 0xa3, 0x45, 0x9e,
+        0x7e, 0xce, 0xc4, 0x77, 0xaf, 0xe4, 0xcf, 0x05, 0x21, 0x07, 0xe4, 0xc4,
+        0x15, 0x97, 0x16, 0xf3, 0xde, 0xe3, 0xd0, 0x91, 0x7e, 0x32, 0x28, 0x6d,
+        0x27, 0x7b, 0x25, 0xf0, 0xad, 0x2e, 0x69, 0xff, 0xd6, 0x80, 0x18, 0xdf,
+        0x62, 0x2d, 0x29, 0x1a, 0x39, 0xaa, 0xea, 0x58, 0x69, 0x39, 0x86, 0xf8,
+        0xa5, 0x23, 0x16, 0x2b, 0x3b, 0x35, 0xb7, 0x8a, 0x81, 0xc4, 0x55, 0x7f,
+        0xc1, 0x96, 0xaf, 0xef, 0xfc, 0x85, 0xaa, 0xa3, 0x26, 0x47, 0x70, 0xfd,
+        0x72, 0x06, 0xd8, 0x44, 0x83, 0xad, 0x34, 0x32, 0xd7, 0x1e, 0xf5, 0x73,
+        0xcb, 0x41, 0x55, 0x93, 0xff, 0xfa, 0x4e, 0x37, 0xb7, 0x9c, 0x45, 0x6e,
+        0x99, 0x56, 0xb9, 0x25, 0xfc, 0x6b, 0x80, 0xfd, 0xb6, 0x8a, 0x8e, 0xb1,
+        0x72, 0xc2, 0x5c, 0xfd, 0xa3, 0x62, 0x1f, 0xc0, 0xba, 0x38, 0x23, 0xf3,
+        0x7a, 0x42, 0x53, 0x34, 0x8d, 0x17, 0xe8, 0xa7, 0xe8, 0xbf, 0x68, 0xe3,
+        0xac, 0x69, 0xa1, 0xed, 0x65, 0xfa, 0x28, 0xd7, 0xb6, 0xc7, 0x5a, 0x7c,
+        0xdd, 0x5c, 0xa9, 0x0e, 0x1d, 0x22, 0xa7, 0xb7, 0xda, 0x30, 0x7f, 0xc4,
+        0x74, 0x8b, 0xd7, 0x9c, 0x3f, 0x7c, 0x67, 0x28, 0xa4, 0xae, 0x0b, 0x65,
+        0xb7, 0x86, 0xe1, 0xd2, 0x67, 0xfe, 0x01, 0x1f, 0x53, 0x27, 0x1f, 0x1c,
+        0xb7, 0x4f, 0x8c, 0x33, 0x21, 0x09, 0x9c, 0xa1, 0xfd, 0x45, 0x23, 0x69,
+        0xc8, 0x6f, 0xce, 0x22, 0x06, 0x3c, 0x04, 0x6c, 0xf4, 0x88, 0xe8, 0xe7,
+        0x06, 0xb1, 0x76, 0xa2, 0xe1, 0xb2, 0xc4, 0xc4, 0xa8, 0x04, 0xe5, 0x8d,
+        0x53, 0xd1, 0x08, 0xed, 0xe5, 0x2c, 0xe2, 0xd5, 0x91, 0x7a, 0xe7, 0xed,
+        0x86, 0xe2, 0x82, 0x6d, 0xdf, 0x08, 0x00, 0x3b, 0x0c, 0xda, 0x7a, 0xb7,
+        0xdc, 0x80, 0xbe, 0xb3, 0xaa, 0xed, 0x11, 0xd0, 0x05, 0x0f, 0x67, 0x58,
+        0x1b, 0x24, 0xdd, 0xa3, 0xa0, 0x49, 0xda, 0x8d, 0xcc, 0x32, 0x73, 0xd3,
+        0x53, 0xb4, 0xdd, 0x5e, 0xd8, 0x1d, 0xae, 0xeb, 0xed, 0x92, 0x9d, 0x8c,
+        0x88, 0x7e, 0x6a, 0x8f, 0xf4, 0xef, 0xd4, 0xdd, 0xf9, 0xa8, 0x39, 0xb2,
+        0x8d, 0x35, 0xe7, 0x11, 0xb5, 0x1e, 0xf5, 0x25, 0xd8, 0xcc, 0x3e, 0xea,
+        0x18, 0xb1, 0x1f, 0x71, 0x8c, 0x7e, 0xcc, 0x40, 0x1c, 0x4b, 0xd5, 0x5d,
+        0xbd, 0x97, 0xf7, 0x6d, 0x95, 0x63, 0x67, 0x68, 0x4f, 0xb8, 0xb7, 0x6a,
+        0x53, 0xfe, 0xde, 0x10, 0xef, 0x59, 0x72, 0xfc, 0x45, 0xe6, 0x1e, 0xcc,
+        0x39, 0x98, 0x67, 0x45, 0xc3, 0xbb, 0x30, 0x1f, 0xfd, 0x31, 0xfa, 0x03,
+        0x5d, 0xd9, 0x6e, 0x0e, 0x3e, 0xba, 0x50, 0xa7, 0xde, 0x86, 0xb9, 0x7f,
+        0x66, 0x32, 0x5f, 0xb3, 0xc3, 0xae, 0xbc, 0x0b, 0x68, 0x9b, 0x85, 0xef,
+        0x4f, 0x39, 0x6d, 0xb2, 0x32, 0x69, 0x43, 0xf7, 0x5f, 0x02, 0x5f, 0x07,
+        0x3a, 0x59, 0x23, 0x58, 0x99, 0x4c, 0xe3, 0xfa, 0x80, 0xca, 0xd1, 0x8c,
+        0xc7, 0x6c, 0xd0, 0xd8, 0xca, 0x75, 0xe4, 0xe9, 0x29, 0xae, 0x17, 0xe6,
+        0x1f, 0xd3, 0x67, 0xe1, 0xb3, 0xc7, 0xe3, 0x8c, 0xf1, 0xdc, 0x4b, 0xe8,
+        0x00, 0x1f, 0xdd, 0x0a, 0x57, 0xe8, 0xd6, 0x4e, 0xbd, 0x50, 0xa6, 0x9f,
+        0xcf, 0x87, 0xdb, 0x85, 0x78, 0xc4, 0xd4, 0x2b, 0x16, 0x75, 0xa2, 0xc9,
+        0x65, 0xb5, 0xef, 0x20, 0x92, 0x76, 0x0e, 0x61, 0xac, 0xb8, 0x5e, 0x2d,
+        0xef, 0xd4, 0xf3, 0x65, 0x43, 0x56, 0x42, 0xe4, 0x3b, 0xa2, 0xf2, 0xf8,
+        0x9d, 0xca, 0xd6, 0x8a, 0x88, 0x25, 0xb0, 0x99, 0xf8, 0x87, 0x31, 0xae,
+        0x6a, 0x83, 0x4d, 0x51, 0xf7, 0xd4, 0xbb, 0xf2, 0x91, 0x9e, 0xee, 0x37,
+        0x8a, 0x99, 0x45, 0xf8, 0x5f, 0xd6, 0x2f, 0x3a, 0xbc, 0x5a, 0xe3, 0x4b,
+        0x5e, 0x3e, 0xf4, 0x8c, 0x30, 0x4f, 0x99, 0x2b, 0x91, 0x97, 0x22, 0xfc,
+        0xe1, 0x46, 0xb6, 0x44, 0x39, 0xba, 0x3e, 0xe5, 0x10, 0xec, 0x42, 0x5f,
+        0x32, 0x3d, 0x1b, 0xe0, 0xdf, 0x28, 0xee, 0x31, 0x06, 0xe0, 0xbb, 0xde,
+        0x86, 0xf5, 0xbe, 0x17, 0x32, 0xa2, 0x6e, 0xa0, 0xbf, 0x25, 0xee, 0xbb,
+        0x42, 0x7f, 0x4b, 0x57, 0xde, 0xb6, 0x7b, 0xe9, 0xf3, 0x46, 0xe4, 0x18,
+        0xfc, 0xe8, 0xd1, 0x45, 0xf2, 0x93, 0xf6, 0x70, 0xd9, 0x30, 0x64, 0x42,
+        0x1f, 0x3f, 0x2c, 0x6f, 0xd4, 0x7e, 0xa0, 0x70, 0xe0, 0xb6, 0x9d, 0x0d,
+        0x99, 0x86, 0x7f, 0x98, 0x71, 0x20, 0x7f, 0x33, 0x82, 0xf5, 0x19, 0x56,
+        0xfe, 0x71, 0xe6, 0xfd, 0xe5, 0x24, 0x01, 0x37, 0x66, 0x7f, 0xf6, 0x3e,
+        0x63, 0xf6, 0x03, 0xc0, 0x61, 0xef, 0x8b, 0xbe, 0xe1, 0xd2, 0xff, 0x33,
+        0xe8, 0xea, 0xd7, 0x55, 0xfd, 0x22, 0xb7, 0x73, 0x2b, 0x65, 0xfa, 0x5e,
+        0xcf, 0xe9, 0xee, 0x73, 0x9f, 0xbb, 0x4f, 0xbe, 0x4c, 0xa9, 0x01, 0x2b,
+        0xe4, 0x55, 0x1c, 0x65, 0xae, 0xd8, 0xe6, 0xe9, 0x6f, 0x10, 0x18, 0x9a,
+        0x74, 0x7d, 0xdf, 0xdb, 0x21, 0xf9, 0x5e, 0x3f, 0xff, 0x84, 0xcf, 0x5e,
+        0x6d, 0xf7, 0xf3, 0x59, 0x3e, 0xbf, 0x92, 0x41, 0xfe, 0x0c, 0x1b, 0x60,
+        0x2c, 0x60, 0x5b, 0x5c, 0xf9, 0xa1, 0x77, 0xe7, 0x9b, 0xf5, 0x0b, 0xf2,
+        0xbd, 0x5b, 0xf1, 0x9d, 0x56, 0x7c, 0xb3, 0x06, 0xb9, 0x5f, 0x4b, 0x9d,
+        0x67, 0x1d, 0xd2, 0xaf, 0x3b, 0x92, 0x1e, 0xb0, 0x01, 0xf4, 0xfd, 0x63,
+        0xd0, 0xfd, 0x11, 0xf4, 0xfa, 0xc3, 0x12, 0xb0, 0x41, 0x09, 0xd8, 0xa0,
+        0x04, 0x6c, 0x50, 0x02, 0x36, 0x28, 0x85, 0xbd, 0x3a, 0x8b, 0x4d, 0x6c,
+        0xff, 0x3e, 0x6d, 0xd7, 0xaf, 0x6d, 0xac, 0xb7, 0x4b, 0xb7, 0xb6, 0x99,
+        0xaa, 0xfb, 0x18, 0x39, 0xc8, 0x5a, 0x2b, 0xb0, 0x9a, 0x5f, 0xf7, 0xf0,
+        0x62, 0x44, 0x8d, 0xfb, 0x5e, 0x88, 0x11, 0x35, 0x1b, 0xeb, 0x66, 0x28,
+        0x6c, 0x00, 0x1b, 0x1a, 0x12, 0xc6, 0x6f, 0x13, 0xbe, 0x17, 0xb4, 0x86,
+        0xfb, 0xb1, 0x92, 0xda, 0x55, 0x5d, 0xef, 0x88, 0xaa, 0x3b, 0x58, 0x32,
+        0x5b, 0xf6, 0x73, 0xb7, 0x98, 0x8c, 0xcd, 0x13, 0x6f, 0xca, 0x16, 0x3d,
+        0x01, 0x1d, 0x38, 0xc4, 0x88, 0xdc, 0x27, 0xe4, 0xf8, 0xb1, 0xc1, 0x2a,
+        0xc6, 0x2c, 0x58, 0x2e, 0x7f, 0x47, 0x9c, 0xbb, 0xcf, 0xec, 0x82, 0x7f,
+        0xce, 0x14, 0x23, 0x32, 0x5e, 0x74, 0x31, 0x01, 0xf2, 0x9f, 0x75, 0xf5,
+        0xe5, 0x5b, 0xd0, 0xc3, 0xad, 0xcc, 0x94, 0xb5, 0x6a, 0x1b, 0x91, 0xcb,
+        0x71, 0xca, 0x98, 0xfa, 0xdf, 0xab, 0xf6, 0x29, 0x76, 0x55, 0xdd, 0xbd,
+        0xa4, 0x71, 0x65, 0x0b, 0x01, 0xfa, 0x19, 0xd0, 0x89, 0xbb, 0x6b, 0x18,
+        0x76, 0x91, 0x73, 0x7c, 0xb9, 0xb4, 0xe2, 0x91, 0x2f, 0x6a, 0x62, 0x6d,
+        0xd4, 0xfe, 0x1b, 0x2d, 0xed, 0xab, 0xf7, 0x3d, 0x7e, 0xe1, 0xfb, 0x56,
+        0x6b, 0x0d, 0xf4, 0x53, 0x77, 0xdb, 0x81, 0xdd, 0x24, 0xa0, 0xee, 0xc3,
+        0x87, 0xd7, 0x42, 0x92, 0xaa, 0x59, 0x92, 0x2e, 0xb3, 0x1f, 0xeb, 0x17,
+        0xf4, 0x47, 0x7f, 0x22, 0x29, 0xe4, 0xab, 0xd9, 0x50, 0x34, 0x6e, 0xcb,
+        0x7f, 0x96, 0xe5, 0x85, 0x7c, 0x84, 0xe7, 0x0a, 0xf2, 0x13, 0x1a, 0x9e,
+        0xfb, 0x19, 0xae, 0xc9, 0xb3, 0x25, 0x33, 0x45, 0xc6, 0x9d, 0xa1, 0x70,
+        0x0d, 0xf7, 0xb2, 0x93, 0xac, 0xd9, 0x7c, 0x07, 0x36, 0x19, 0x8d, 0x94,
+        0xa1, 0xef, 0x2b, 0x45, 0x8e, 0x07, 0x6c, 0x54, 0x64, 0x5d, 0xc7, 0xbf,
+        0xff, 0x27, 0xc0, 0x81, 0xf0, 0xd5, 0x21, 0xaf, 0x8f, 0x9a, 0xab, 0x6d,
+        0x06, 0x60, 0xe3, 0x0d, 0xcf, 0xdf, 0x56, 0x8a, 0x6e, 0x1d, 0xe5, 0x2c,
+        0xf9, 0x70, 0xfe, 0x77, 0xb3, 0x11, 0x42, 0x0e, 0xb4, 0x3a, 0xc7, 0xab,
+        0xa4, 0x6f, 0xc2, 0xdd, 0xca, 0x51, 0xc7, 0x97, 0x05, 0xef, 0xb3, 0x8d,
+        0x67, 0x27, 0x9a, 0xcd, 0xb3, 0xd6, 0x07, 0xad, 0x99, 0xf5, 0x6d, 0x4f,
+        0x5a, 0xf9, 0xdd, 0x15, 0x27, 0xef, 0xd5, 0xcc, 0xbe, 0xbd, 0xc3, 0xad,
+        0x99, 0xd5, 0x76, 0xac, 0xad, 0x99, 0x59, 0xdb, 0xdd, 0x9a, 0xd9, 0xfc,
+        0xee, 0x02, 0x3e, 0x6e, 0xcd, 0x2c, 0xbb, 0xdd, 0xad, 0x99, 0x95, 0xb7,
+        0xbb, 0x35, 0x33, 0x67, 0x87, 0x5b, 0x33, 0xfb, 0xf9, 0xf6, 0xb5, 0x35,
+        0xb3, 0x1f, 0xec, 0x58, 0x5b, 0x33, 0xbb, 0xb8, 0x3b, 0x87, 0xcf, 0xdd,
+        0x9a, 0xd9, 0xcf, 0x76, 0xdc, 0xbb, 0x66, 0xf6, 0x9a, 0x8f, 0xd7, 0x31,
+        0x9f, 0x11, 0xcc, 0x21, 0x0e, 0xbc, 0x3e, 0x0c, 0xbc, 0xfe, 0x6e, 0x75,
+        0xfe, 0x00, 0xe6, 0x39, 0xe8, 0xc5, 0x83, 0x0f, 0x82, 0xdb, 0x47, 0xbc,
+        0x67, 0x6d, 0xe4, 0xbb, 0x11, 0x2f, 0x57, 0x21, 0x76, 0xdf, 0xec, 0xe5,
+        0x6c, 0xff, 0xa8, 0xf3, 0xee, 0xb9, 0x97, 0xd6, 0xef, 0x0f, 0x21, 0xf5,
+        0xf6, 0xf1, 0x3c, 0xe7, 0x95, 0x47, 0xee, 0x47, 0x39, 0xd8, 0xe8, 0x3f,
+        0xbf, 0xfb, 0x1b, 0x16, 0x31, 0xfe, 0x73, 0x58, 0xab, 0xf6, 0x16, 0x43,
+        0x9d, 0x01, 0x60, 0x8c, 0x3a, 0x2e, 0x29, 0xf4, 0x4f, 0xa9, 0xfe, 0xd7,
+        0x5a, 0xfa, 0xaf, 0xa0, 0x3f, 0xe9, 0x46, 0xff, 0x1d, 0x3e, 0x2f, 0x29,
+        0xfb, 0xb6, 0x5c, 0x0c, 0x9f, 0x2e, 0xf9, 0x78, 0x2b, 0xe0, 0x61, 0xe7,
+        0x46, 0xc6, 0x76, 0x3e, 0x8f, 0x67, 0xa2, 0x17, 0x6d, 0xb9, 0xa9, 0xf0,
+        0xbb, 0x91, 0x88, 0x5e, 0xcc, 0xaa, 0x7c, 0xad, 0x91, 0xc9, 0x39, 0x7e,
+        0xfe, 0x8d, 0x1c, 0x6a, 0x80, 0x39, 0x0c, 0xec, 0x7d, 0x69, 0x10, 0x71,
+        0xac, 0x35, 0xc7, 0x66, 0x5e, 0xad, 0x7b, 0x79, 0xb5, 0x29, 0x9f, 0xd9,
+        0xd9, 0x8a, 0xcd, 0x2f, 0xee, 0xfe, 0xc7, 0x0a, 0x9b, 0x6f, 0x42, 0x6e,
+        0x4e, 0xec, 0x4d, 0x1c, 0x43, 0x0c, 0x41, 0x7c, 0xce, 0x7a, 0x01, 0xf3,
+        0x19, 0xc6, 0x46, 0xe6, 0x37, 0x21, 0x7c, 0x78, 0x26, 0xc9, 0xc7, 0xe8,
+        0xed, 0x9e, 0x7f, 0x67, 0x5e, 0xe4, 0x63, 0x95, 0xe4, 0x26, 0x37, 0x37,
+        0xda, 0xa4, 0xb9, 0xf9, 0x67, 0xc4, 0xeb, 0x13, 0x58, 0xc5, 0xc2, 0x81,
+        0x55, 0x2c, 0xbc, 0x66, 0x1f, 0x4b, 0xd4, 0xf9, 0x27, 0xb5, 0x1f, 0xc6,
+        0xfd, 0xb1, 0x46, 0xe6, 0xca, 0x80, 0x68, 0x7a, 0x82, 0xfb, 0x64, 0xc0,
+        0x3a, 0x16, 0xf7, 0xcd, 0xe8, 0x3b, 0xf7, 0x69, 0xa9, 0x2a, 0xe3, 0x0f,
+        0xf1, 0x91, 0xbf, 0x17, 0xee, 0xeb, 0x89, 0xb2, 0x63, 0xdb, 0x1f, 0x6b,
+        0xc8, 0x79, 0xe3, 0xed, 0xd6, 0x53, 0xe0, 0x25, 0x83, 0x6f, 0x5f, 0xa6,
+        0x9f, 0x55, 0xb1, 0xaf, 0x03, 0xb6, 0x7b, 0xa4, 0x44, 0xec, 0xba, 0x59,
+        0x6a, 0x1e, 0x7e, 0x3d, 0x37, 0xef, 0x62, 0xd7, 0xc0, 0x5a, 0xec, 0x1a,
+        0x5f, 0x16, 0x97, 0xc7, 0x5d, 0x1b, 0xf2, 0x48, 0xbc, 0x4a, 0xfe, 0x18,
+        0x77, 0xf6, 0xc2, 0xff, 0x35, 0x80, 0x69, 0x19, 0x73, 0x18, 0x6f, 0x22,
+        0xc0, 0xf6, 0xf7, 0xe2, 0x4f, 0xb5, 0x1d, 0xea, 0xb0, 0x82, 0xf8, 0x4c,
+        0xc3, 0x7f, 0x4c, 0xe0, 0x99, 0x8c, 0xcc, 0x9e, 0xfe, 0x1a, 0xe6, 0x36,
+        0x2d, 0x57, 0xe6, 0x27, 0xc1, 0xdf, 0x73, 0x32, 0x17, 0xcf, 0xc3, 0x8f,
+        0x70, 0xcf, 0x83, 0xb8, 0xad, 0xdf, 0xfb, 0x9e, 0xd6, 0xcf, 0x5a, 0x51,
+        0xe2, 0x46, 0xa9, 0x16, 0xe9, 0x83, 0xb9, 0x67, 0xc8, 0xbd, 0x61, 0xda,
+        0x0f, 0xeb, 0x27, 0xc8, 0x5d, 0x99, 0xc3, 0x9e, 0xe2, 0xf8, 0x6b, 0x75,
+        0xb2, 0xec, 0x10, 0x7f, 0x35, 0x32, 0x8d, 0x25, 0xe2, 0xc7, 0xf7, 0x8b,
+        0x25, 0xa9, 0x07, 0xe2, 0xc9, 0xfb, 0xc1, 0x91, 0xd1, 0x79, 0x60, 0xc8,
+        0x57, 0x1a, 0x7a, 0x2b, 0x8e, 0x74, 0x31, 0x64, 0x72, 0x29, 0x0b, 0x9a,
+        0x71, 0x85, 0x95, 0x91, 0xc7, 0xc1, 0xed, 0xf5, 0xe3, 0xd9, 0x7e, 0xe4,
+        0xe4, 0x2e, 0x66, 0x4c, 0x01, 0x33, 0xfe, 0x06, 0x30, 0xe3, 0xac, 0x74,
+        0x76, 0x11, 0x33, 0xda, 0x1e, 0x66, 0x4c, 0xc3, 0x9e, 0x73, 0x6b, 0xec,
+        0x59, 0x53, 0xb5, 0x28, 0xde, 0xcb, 0x01, 0xf3, 0xa5, 0x4e, 0x45, 0xef,
+        0x03, 0x27, 0x6a, 0x12, 0x52, 0xe7, 0x52, 0x02, 0x2d, 0x34, 0x7d, 0x3c,
+        0xb8, 0x4d, 0xe1, 0xbc, 0xdd, 0xa5, 0x4d, 0xc8, 0x51, 0x14, 0xee, 0xf3,
+        0xf6, 0x4b, 0x03, 0xeb, 0xf6, 0x90, 0x03, 0x2d, 0x7b, 0xc8, 0x77, 0xf1,
+        0x21, 0x9e, 0xf3, 0x6a, 0x7d, 0x6d, 0xf0, 0x05, 0xff, 0x13, 0x3c, 0x71,
+        0x7d, 0x71, 0x2d, 0x68, 0xee, 0x7a, 0x59, 0x83, 0x13, 0xff, 0x7a, 0x1d,
+        0x4e, 0x44, 0xec, 0x3a, 0x17, 0x92, 0x24, 0x30, 0xa2, 0xbd, 0x44, 0x5a,
+        0x5c, 0xd3, 0xc3, 0xd2, 0x8e, 0xf9, 0x75, 0x9c, 0xea, 0x05, 0x36, 0xea,
+        0x92, 0x20, 0x30, 0x52, 0x9b, 0xc2, 0x48, 0x03, 0xc4, 0x32, 0x83, 0x33,
+        0xc0, 0x36, 0xb5, 0x55, 0x9c, 0x14, 0x8d, 0xff, 0x01, 0xf4, 0xf2, 0x94,
+        0xf2, 0x3d, 0x69, 0x39, 0x01, 0x5f, 0xda, 0xbe, 0x04, 0x7c, 0x77, 0xce,
+        0xc5, 0x4f, 0x6d, 0xeb, 0xf0, 0xd3, 0xc1, 0x0d, 0xf1, 0x93, 0xaa, 0xdf,
+        0x8f, 0x52, 0x26, 0x37, 0x1c, 0xb7, 0x7e, 0x7f, 0xdd, 0x71, 0xeb, 0xf7,
+        0x37, 0x9c, 0xd6, 0xfa, 0xfd, 0x47, 0xa4, 0x60, 0x46, 0xed, 0x15, 0x59,
+        0x57, 0xbf, 0x9f, 0x60, 0x3d, 0xdc, 0xe9, 0x72, 0xeb, 0xf4, 0x5d, 0x5e,
+        0xfd, 0x3e, 0x2a, 0x85, 0x35, 0xed, 0xa6, 0xbc, 0x69, 0xf9, 0xf5, 0xfb,
+        0xef, 0xa2, 0xad, 0x1b, 0x63, 0xac, 0xad, 0xdd, 0x5f, 0x77, 0x58, 0xbb,
+        0x0f, 0xb1, 0x9f, 0x57, 0xbb, 0x67, 0x3f, 0xe4, 0xf2, 0x0e, 0xeb, 0xf6,
+        0x8f, 0x40, 0x16, 0x5b, 0x21, 0x87, 0x5e, 0x69, 0x3f, 0x13, 0x66, 0x1f,
+        0x55, 0xaf, 0x5f, 0x71, 0x42, 0x78, 0xce, 0xad, 0xab, 0xcf, 0xc0, 0xae,
+        0x0e, 0xae, 0xd6, 0xeb, 0xdd, 0x31, 0x6e, 0x3a, 0x6b, 0xe9, 0xaf, 0xa5,
+        0xd3, 0xe7, 0xd1, 0x09, 0x81, 0x4e, 0x78, 0x1d, 0x9d, 0xbb, 0xf5, 0xf9,
+        0x9b, 0x8e, 0x5b, 0x9b, 0x4f, 0x9f, 0x16, 0xbb, 0x1d, 0xbe, 0xf9, 0xe2,
+        0xc0, 0xc3, 0x1e, 0x8d, 0xd5, 0xda, 0x3c, 0x7d, 0x08, 0x70, 0x7b, 0x4c,
+        0x9d, 0xbd, 0x9a, 0xf9, 0x7f, 0x50, 0x9b, 0x67, 0x5d, 0xde, 0xdd, 0x5f,
+        0xe1, 0xfa, 0x04, 0x3e, 0x7f, 0xd1, 0xad, 0xc9, 0x8f, 0x95, 0xfc, 0x5a,
+        0x3b, 0xf3, 0x47, 0xff, 0x5c, 0x54, 0x7f, 0xe4, 0x88, 0xd0, 0x56, 0xc8,
+        0x1f, 0xe9, 0x76, 0xcb, 0x94, 0xc2, 0x47, 0xb0, 0xa9, 0xd8, 0xbd, 0x31,
+        0x72, 0xe5, 0x94, 0x8f, 0x91, 0x43, 0x0a, 0x23, 0x57, 0x96, 0x7c, 0x8c,
+        0x9c, 0xbc, 0x07, 0x46, 0x6e, 0x76, 0xb9, 0x71, 0x20, 0x28, 0x79, 0x85,
+        0x91, 0xef, 0x75, 0x96, 0x8c, 0xf7, 0xba, 0x88, 0x07, 0xc4, 0x3d, 0x5f,
+        0xd0, 0x7b, 0x8f, 0xb5, 0xe6, 0xe3, 0x66, 0xc6, 0xfe, 0xad, 0x32, 0x71,
+        0xe6, 0x2e, 0x6e, 0x76, 0xb1, 0x71, 0x34, 0x72, 0x48, 0xc5, 0x44, 0xe0,
+        0x84, 0x3a, 0xeb, 0xdf, 0xc4, 0xbe, 0x8c, 0x39, 0x01, 0x85, 0xcf, 0x72,
+        0x45, 0xe6, 0x01, 0x6c, 0x23, 0x16, 0xee, 0xe4, 0x31, 0x2b, 0x2f, 0x26,
+        0xf9, 0x58, 0xd3, 0x3f, 0xd7, 0xc2, 0x3d, 0x86, 0x37, 0x8d, 0xa4, 0x85,
+        0x76, 0xc7, 0xcf, 0x15, 0xe2, 0xea, 0x3c, 0x50, 0x12, 0x58, 0x72, 0x6a,
+        0x15, 0x4b, 0xd2, 0x57, 0xfc, 0xf4, 0x6d, 0xdb, 0xa4, 0x5f, 0xf3, 0xb1,
+        0x22, 0x72, 0xa2, 0x12, 0xd7, 0xb6, 0x8f, 0x15, 0x5d, 0x9c, 0x98, 0x72,
+        0x1a, 0xc0, 0xcb, 0x01, 0x19, 0x03, 0x4e, 0x6f, 0x7c, 0x89, 0x35, 0x28,
+        0x1f, 0x1b, 0xd9, 0xf8, 0x6e, 0xad, 0x49, 0xf1, 0xba, 0x5d, 0xed, 0x05,
+        0x5e, 0x1e, 0x08, 0xb6, 0xb4, 0x3f, 0x0b, 0xff, 0x8d, 0xfc, 0x08, 0xd8,
+        0xc4, 0xc5, 0x44, 0x3b, 0xa0, 0x83, 0x91, 0x7b, 0x60, 0xa2, 0xf5, 0x31,
+        0x8a, 0x31, 0xf3, 0x6e, 0x8c, 0x4a, 0xd7, 0xe9, 0xcf, 0xef, 0xc6, 0xa8,
+        0x7b, 0xc7, 0x50, 0xb6, 0x61, 0x76, 0x56, 0x06, 0x9f, 0x69, 0x29, 0xac,
+        0x8b, 0x51, 0x73, 0x1f, 0x20, 0x46, 0xb9, 0xf8, 0xc0, 0xe5, 0xfb, 0xf7,
+        0x21, 0x9b, 0x1f, 0x43, 0xa6, 0x3f, 0x02, 0xe6, 0xfa, 0x21, 0xe6, 0xf5,
+        0x03, 0xe0, 0xa1, 0xef, 0x97, 0xd6, 0x9f, 0x07, 0x19, 0x15, 0xe6, 0x87,
+        0x2e, 0x66, 0x72, 0x31, 0xfd, 0x0c, 0x56, 0x57, 0xad, 0xd8, 0xc8, 0x4c,
+        0x15, 0x87, 0xcc, 0x69, 0x77, 0x1f, 0x35, 0x92, 0x95, 0xa7, 0x3b, 0x53,
+        0x8b, 0x8c, 0x19, 0xea, 0x3a, 0xcc, 0xfa, 0x25, 0xb1, 0x43, 0x55, 0xe5,
+        0x99, 0x03, 0x52, 0xae, 0xb9, 0x78, 0x6b, 0x6e, 0xd1, 0xa5, 0x31, 0xe5,
+        0xe1, 0xad, 0x9c, 0x87, 0xb7, 0xb2, 0xb5, 0xe5, 0x48, 0x00, 0xfd, 0xe7,
+        0xe2, 0x6b, 0x31, 0xd6, 0x8c, 0x87, 0xb1, 0xa6, 0x3f, 0x20, 0xc6, 0xe2,
+        0x58, 0x39, 0x3c, 0x33, 0x3e, 0x1f, 0x91, 0x5d, 0x90, 0xf3, 0x58, 0x91,
+        0xfa, 0xe2, 0x19, 0xb2, 0xf7, 0xd2, 0x19, 0xf5, 0xe5, 0xea, 0x2a, 0x10,
+        0xdb, 0xa7, 0x8d, 0x43, 0x57, 0x63, 0xef, 0xa9, 0x2b, 0x31, 0xdf, 0x18,
+        0x09, 0xe2, 0xf3, 0xf7, 0xa5, 0x2b, 0xce, 0x83, 0xfa, 0x5a, 0x8f, 0xc5,
+        0xee, 0x07, 0x93, 0xad, 0xc5, 0x63, 0xb6, 0xc2, 0x63, 0xed, 0x5e, 0x1f,
+        0xd9, 0x33, 0x0e, 0x5d, 0xfe, 0x27, 0xf4, 0xf9, 0x99, 0xd5, 0x2d, 0x3f,
+        0x85, 0xff, 0xfe, 0x43, 0xe8, 0xe4, 0x3f, 0x22, 0x57, 0x78, 0xcd, 0xea,
+        0x93, 0x3f, 0x40, 0xdb, 0x5d, 0x9c, 0xc3, 0xfe, 0xc1, 0xc7, 0x92, 0xd6,
+        0x35, 0xe0, 0x93, 0x6b, 0x1e, 0x3e, 0x79, 0x3a, 0x99, 0xb4, 0x26, 0x59,
+        0x37, 0x87, 0x9c, 0x0f, 0xa4, 0xa6, 0x14, 0x36, 0xf1, 0x31, 0xc9, 0xed,
+        0x34, 0xc7, 0x9f, 0x75, 0x56, 0x80, 0x7d, 0x56, 0x3c, 0xec, 0x73, 0x60,
+        0xcc, 0xc5, 0x3e, 0xc1, 0xcf, 0x50, 0xff, 0x2e, 0xee, 0x59, 0xb1, 0x93,
+        0x18, 0xa7, 0x0a, 0x4c, 0x52, 0x71, 0x0e, 0x48, 0xbe, 0xbe, 0x57, 0x7d,
+        0x8e, 0x94, 0xec, 0x68, 0x1b, 0xe4, 0xc4, 0xda, 0xeb, 0x49, 0xae, 0x4a,
+        0x27, 0x6a, 0x16, 0xf1, 0x9d, 0x75, 0xa2, 0xe1, 0xdf, 0xf1, 0xae, 0x9f,
+        0xf7, 0xae, 0x4f, 0x78, 0xd7, 0xc7, 0x11, 0x87, 0x8f, 0xa9, 0x58, 0xca,
+        0x76, 0xb6, 0x41, 0xc9, 0x0e, 0x68, 0x01, 0x7b, 0x9c, 0x1d, 0xfe, 0x8b,
+        0x66, 0x59, 0xe9, 0x98, 0xf4, 0x27, 0xf0, 0x39, 0x8e, 0xcf, 0x34, 0x3e,
+        0xfb, 0xf1, 0xc9, 0xe3, 0xb3, 0x2a, 0x53, 0x2d, 0x55, 0x9a, 0x84, 0x8d,
+        0x0c, 0x4a, 0xaa, 0xfe, 0x12, 0xf4, 0xf8, 0x1c, 0x74, 0x7b, 0x58, 0x0a,
+        0xd5, 0x3f, 0x95, 0xd9, 0x79, 0x4d, 0xba, 0x2c, 0xe8, 0xb4, 0x0a, 0x5b,
+        0x9e, 0x77, 0xf7, 0x13, 0x3b, 0x13, 0x7b, 0xd1, 0xb7, 0x29, 0x4f, 0xc5,
+        0x9f, 0x13, 0xfd, 0xb1, 0x39, 0xf4, 0x13, 0xbd, 0x30, 0xfc, 0x31, 0xb5,
+        0x6f, 0x56, 0x8d, 0xbb, 0x32, 0xde, 0x65, 0xd9, 0x51, 0xe8, 0x7c, 0xf0,
+        0x18, 0x68, 0x27, 0xd5, 0xd9, 0xd8, 0x8c, 0x1c, 0x3d, 0xbd, 0xbc, 0xc5,
+        0xf5, 0xad, 0x51, 0xf3, 0x26, 0xf5, 0x8e, 0x79, 0xd8, 0xf0, 0x85, 0x19,
+        0xd8, 0xfb, 0x41, 0x27, 0xa0, 0x8d, 0x21, 0xde, 0x8c, 0x39, 0x37, 0x55,
+        0xbc, 0x81, 0xef, 0xca, 0xc4, 0x4e, 0x86, 0x70, 0xcd, 0xb3, 0x45, 0x88,
+        0x8b, 0xea, 0x6c, 0xe5, 0x32, 0xf0, 0x8d, 0xa6, 0xea, 0x80, 0xb3, 0xab,
+        0xfb, 0x43, 0x86, 0xf2, 0x5b, 0xb1, 0x98, 0x2e, 0xb9, 0x11, 0xe2, 0xdc,
+        0xbd, 0x2a, 0x36, 0xd5, 0x8a, 0xf6, 0x43, 0xcc, 0x15, 0x6f, 0x08, 0xe3,
+        0xdc, 0xe3, 0xe8, 0xd7, 0x07, 0x7f, 0x8c, 0x7b, 0x75, 0xda, 0x27, 0xe7,
+        0xca, 0x67, 0xa6, 0xa5, 0x5a, 0x1e, 0xc5, 0x7c, 0xbd, 0x1c, 0x49, 0xe5,
+        0x12, 0x11, 0xd8, 0xa3, 0xbf, 0x17, 0xe5, 0xd6, 0x4f, 0xaa, 0x8e, 0x8f,
+        0x29, 0xba, 0xd1, 0x87, 0x79, 0x05, 0x64, 0xe4, 0xee, 0x9f, 0xa9, 0xbd,
+        0xb3, 0x82, 0x33, 0x0a, 0x39, 0x25, 0xd1, 0xce, 0x5a, 0x35, 0x7e, 0x97,
+        0x75, 0x55, 0x13, 0x58, 0x31, 0x66, 0xa4, 0x56, 0x6e, 0x82, 0x5f, 0xc4,
+        0xdc, 0x2d, 0x33, 0x52, 0x29, 0x4f, 0xcb, 0x2b, 0xe5, 0x9f, 0x77, 0x03,
+        0x53, 0x41, 0xa6, 0xe4, 0xbf, 0x5b, 0xee, 0x9e, 0xbf, 0xf5, 0xdb, 0x21,
+        0xcf, 0xd3, 0xf9, 0xb0, 0x9b, 0xe7, 0xe6, 0x55, 0x2d, 0xc6, 0xfd, 0xb6,
+        0xf5, 0x29, 0x2b, 0x1a, 0x9e, 0x45, 0xcf, 0x83, 0x0b, 0xb4, 0xcd, 0xfc,
+        0xf8, 0x9c, 0xb5, 0x43, 0xae, 0xc6, 0x37, 0xcb, 0x72, 0x5c, 0xe5, 0xc5,
+        0xc4, 0x0f, 0x58, 0xeb, 0x51, 0xb3, 0x21, 0x7b, 0xe4, 0x28, 0xd6, 0xed,
+        0xd5, 0xf8, 0xd3, 0xb0, 0xd3, 0x67, 0x61, 0x0b, 0xac, 0x01, 0x1c, 0x62,
+        0xae, 0x25, 0x0d, 0x55, 0x23, 0x6b, 0x36, 0xc7, 0xd5, 0x19, 0xee, 0x76,
+        0x59, 0x56, 0x58, 0xcc, 0xad, 0x9d, 0x2f, 0x4f, 0xba, 0x6b, 0xc4, 0x50,
+        0x76, 0xff, 0xc7, 0xe0, 0xc7, 0x84, 0xed, 0xb6, 0xa9, 0x3e, 0x46, 0xa2,
+        0xc3, 0xeb, 0xa3, 0xf4, 0xdb, 0xd2, 0xe7, 0x95, 0x44, 0xd2, 0xda, 0xff,
+        0x89, 0xa4, 0x75, 0x73, 0xb7, 0x5b, 0x6f, 0x89, 0x9a, 0xb6, 0xc6, 0xf7,
+        0x52, 0xdc, 0xf5, 0x98, 0xc1, 0xba, 0xba, 0xb4, 0x8a, 0xa1, 0x61, 0xa4,
+        0x2f, 0x5f, 0x81, 0x7e, 0x03, 0xd2, 0x7e, 0xb2, 0xf9, 0xf8, 0x54, 0x7c,
+        0x28, 0x72, 0x50, 0x78, 0x02, 0x8b, 0x79, 0x75, 0x34, 0x9e, 0x95, 0x2b,
+        0x88, 0x93, 0x77, 0x88, 0x1d, 0x06, 0x2f, 0xcb, 0x9d, 0xc7, 0x93, 0xf1,
+        0x51, 0xad, 0x32, 0x89, 0xac, 0xe5, 0xe5, 0x49, 0xc6, 0xd9, 0x43, 0x22,
+        0xc0, 0x97, 0x27, 0x47, 0x24, 0x5d, 0x54, 0xef, 0xa9, 0xf0, 0x9c, 0xad,
+        0x36, 0x0d, 0xf9, 0xe1, 0xf9, 0x09, 0x06, 0x46, 0xdd, 0xea, 0x8f, 0xa4,
+        0xe5, 0x69, 0xd6, 0xc0, 0x24, 0xb7, 0x20, 0xdb, 0x92, 0xf0, 0xab, 0xf6,
+        0x44, 0xbb, 0x4c, 0xd7, 0x1a, 0x99, 0xfe, 0x53, 0xcf, 0x82, 0xc6, 0x14,
+        0x68, 0xed, 0x45, 0x6e, 0x92, 0x45, 0xac, 0xa6, 0x7c, 0xe9, 0xbb, 0x9f,
+        0x81, 0x8c, 0x3e, 0xc2, 0x3d, 0xe5, 0xd1, 0xac, 0x44, 0x27, 0xf2, 0x8a,
+        0xee, 0x5b, 0x5a, 0x6e, 0xf8, 0x57, 0x10, 0xeb, 0x02, 0xb2, 0x2b, 0x26,
+        0xfa, 0xde, 0x58, 0xe0, 0xed, 0x29, 0x8b, 0x6d, 0x41, 0xb6, 0xe9, 0x68,
+        0x0b, 0xfc, 0x7a, 0x2c, 0xa8, 0x27, 0x63, 0xd1, 0x51, 0x9e, 0x8f, 0x36,
+        0xac, 0x29, 0xee, 0x4d, 0x3c, 0x20, 0x5d, 0x7b, 0xa5, 0xe7, 0x42, 0x74,
+        0xf4, 0x06, 0x78, 0x09, 0x28, 0x5f, 0x3f, 0x25, 0xba, 0xd7, 0xde, 0xbd,
+        0xda, 0x1e, 0xf0, 0xda, 0xf7, 0x4a, 0xd7, 0x85, 0x21, 0xf3, 0x75, 0x99,
+        0x01, 0x4d, 0x43, 0xae, 0x23, 0xd7, 0xb1, 0x06, 0xa6, 0x60, 0x8b, 0x4f,
+        0x92, 0x97, 0xfd, 0xc0, 0x1a, 0x58, 0x1b, 0xc8, 0xbf, 0xad, 0x0f, 0xcb,
+        0x57, 0xcd, 0x4e, 0xc9, 0xa9, 0x5c, 0x37, 0xe0, 0xd6, 0x52, 0x61, 0xef,
+        0x8f, 0x0e, 0x1c, 0xec, 0x71, 0xeb, 0x05, 0xdc, 0xef, 0x18, 0x46, 0xdb,
+        0x9d, 0xe6, 0x39, 0x8b, 0x6d, 0xbc, 0x77, 0xa7, 0x59, 0xb5, 0x86, 0xcc,
+        0x94, 0x16, 0xf4, 0xf6, 0xbd, 0x0f, 0xa9, 0xb9, 0xe7, 0xcb, 0xfd, 0x66,
+        0x45, 0x1e, 0xd5, 0x52, 0x0f, 0x22, 0x5e, 0x38, 0xd3, 0xe8, 0x7b, 0x87,
+        0xe7, 0x29, 0x54, 0x7d, 0xbf, 0x22, 0xfe, 0x35, 0xe9, 0x0c, 0x99, 0xe3,
+        0xea, 0xd9, 0x21, 0xf3, 0xa8, 0xd6, 0xfa, 0x6c, 0x58, 0x1b, 0x5f, 0xf3,
+        0x6c, 0x97, 0x92, 0x91, 0x61, 0xb9, 0x7d, 0x66, 0xcb, 0x7b, 0xe5, 0x79,
+        0x87, 0xfd, 0xee, 0x34, 0x53, 0xd6, 0x03, 0xda, 0xd1, 0x07, 0xe9, 0x0b,
+        0xd9, 0xf7, 0xf6, 0xba, 0x71, 0x78, 0x7d, 0xaf, 0x31, 0x9a, 0xb2, 0x76,
+        0x8c, 0x4d, 0xaa, 0xcf, 0x55, 0xd5, 0x27, 0xa0, 0x64, 0xbd, 0x76, 0x9c,
+        0xbf, 0x91, 0xb5, 0xe3, 0x74, 0xad, 0xce, 0x79, 0x16, 0x34, 0x8f, 0xa1,
+        0x6f, 0xd1, 0xe9, 0x0f, 0x57, 0xe5, 0x76, 0x33, 0x67, 0xbd, 0x29, 0x57,
+        0x57, 0x69, 0xff, 0x12, 0xd7, 0xad, 0x3c, 0xfd, 0xd2, 0xe3, 0x91, 0xbf,
+        0xd9, 0xf6, 0x2f, 0x95, 0xbc, 0x1f, 0xb0, 0xfa, 0xf7, 0x57, 0xb4, 0xe8,
+        0xe8, 0x5f, 0x0a, 0x75, 0xf5, 0xcf, 0x94, 0xaf, 0xf9, 0x18, 0xf4, 0xb4,
+        0xed, 0x05, 0xac, 0xdd, 0xe1, 0xa4, 0xea, 0x73, 0xdd, 0xda, 0x2b, 0xdb,
+        0x4e, 0xf6, 0x9b, 0xd7, 0xe5, 0x33, 0x92, 0x0e, 0xf1, 0x1a, 0x39, 0x94,
+        0xc5, 0xf7, 0x52, 0x3e, 0xc1, 0xbc, 0x00, 0xba, 0xec, 0x1f, 0xfc, 0x4b,
+        0x79, 0x56, 0x8e, 0x96, 0xe6, 0xe0, 0x7b, 0xa6, 0x64, 0xf0, 0x05, 0xfa,
+        0x9f, 0xbc, 0xe9, 0xd6, 0x6a, 0xdc, 0x98, 0x98, 0xf2, 0x62, 0xe2, 0x9c,
+        0xf2, 0x73, 0xaf, 0x79, 0xe7, 0x22, 0xfa, 0x07, 0xcf, 0xe1, 0xd9, 0x57,
+        0x94, 0x0f, 0xf8, 0x3d, 0xa9, 0x62, 0x2d, 0x44, 0x5e, 0xde, 0x2c, 0x0f,
+        0x3c, 0x41, 0x9b, 0x44, 0x06, 0xf0, 0xb1, 0x36, 0xf5, 0x1e, 0x8c, 0x6e,
+        0x75, 0x88, 0x6c, 0xa1, 0xfd, 0x5c, 0x86, 0xad, 0x4d, 0xb9, 0x7b, 0x5f,
+        0x6b, 0xae, 0xa3, 0x13, 0x2b, 0xf2, 0x1f, 0x94, 0x1d, 0x7e, 0xfc, 0x82,
+        0xfb, 0x3d, 0x7c, 0x01, 0xe9, 0x72, 0x6c, 0xaf, 0x6c, 0xbf, 0xe0, 0xda,
+        0xdd, 0xec, 0xfc, 0xb3, 0x4a, 0xbe, 0x53, 0x4a, 0xbe, 0x4d, 0x99, 0x89,
+        0x53, 0xf6, 0x9c, 0x13, 0xcf, 0x4f, 0xba, 0x32, 0xf9, 0x9c, 0x67, 0x47,
+        0xfd, 0x2f, 0xf0, 0x3d, 0x35, 0xca, 0x88, 0x7c, 0xcf, 0xf4, 0x70, 0x3f,
+        0x76, 0xdb, 0x05, 0xce, 0xb7, 0x6f, 0xcd, 0x7c, 0x4f, 0xc0, 0xc7, 0x0e,
+        0x0c, 0xb8, 0x73, 0x7e, 0x6d, 0xfe, 0xfd, 0xcf, 0xf9, 0x77, 0x57, 0xe7,
+        0x6c, 0x48, 0x55, 0xe5, 0xb9, 0xb1, 0xcd, 0xd2, 0x95, 0x93, 0x06, 0xec,
+        0xe3, 0xcf, 0x85, 0x67, 0xc6, 0xc9, 0x8b, 0x3b, 0xee, 0xb2, 0x43, 0x9e,
+        0xfc, 0x39, 0x90, 0xaf, 0x29, 0x4f, 0x7f, 0xe4, 0xe3, 0xd9, 0x0d, 0xef,
+        0x5d, 0x97, 0x46, 0x66, 0x10, 0x6d, 0xba, 0xd2, 0xe1, 0x98, 0xb7, 0xde,
+        0xf6, 0x8a, 0xae, 0x74, 0x98, 0x5c, 0xd5, 0xe1, 0x0d, 0xe8, 0xb0, 0x2a,
+        0x9f, 0xc6, 0x9c, 0xb0, 0xbe, 0x5f, 0x18, 0x32, 0x67, 0x64, 0xab, 0xd2,
+        0xbf, 0x35, 0x00, 0x9f, 0xea, 0xe9, 0xb2, 0xfd, 0x3e, 0x74, 0xf9, 0xba,
+        0x28, 0x7d, 0xaa, 0x73, 0x44, 0x55, 0x45, 0x87, 0xbe, 0x8d, 0x73, 0x6b,
+        0x57, 0x3e, 0x81, 0x3c, 0xaa, 0xb3, 0x01, 0x13, 0xae, 0x7e, 0xd5, 0x9a,
+        0xf7, 0xf4, 0x9b, 0x9d, 0xa0, 0x0e, 0x7f, 0xad, 0xc7, 0xd5, 0x67, 0x87,
+        0xea, 0x73, 0x2a, 0x36, 0xaa, 0xd6, 0xbb, 0x35, 0xf0, 0xe9, 0x1e, 0xea,
+        0xf4, 0x79, 0xc7, 0xfd, 0x2e, 0x22, 0xce, 0x9d, 0x72, 0xde, 0x4b, 0xaf,
+        0xae, 0x4e, 0xc7, 0xc4, 0x5d, 0x57, 0xeb, 0xf5, 0xa9, 0x5f, 0x08, 0x28,
+        0x1b, 0x1e, 0x83, 0x0c, 0x8f, 0x97, 0x1e, 0xf4, 0xec, 0xde, 0x9d, 0xf3,
+        0xc0, 0xfb, 0x9c, 0xf3, 0x91, 0x62, 0xbf, 0xf9, 0x26, 0xee, 0x8d, 0x63,
+        0xce, 0x33, 0xd2, 0x26, 0x29, 0x6f, 0xce, 0x91, 0xd5, 0x39, 0xfb, 0x3c,
+        0xba, 0xfd, 0x52, 0xcc, 0x63, 0x1d, 0xfa, 0xaf, 0x7f, 0xab, 0xde, 0x37,
+        0xb9, 0x59, 0xa4, 0xdf, 0x06, 0x56, 0x0a, 0xf5, 0xca, 0xf5, 0x5a, 0x44,
+        0xae, 0x13, 0x83, 0x8c, 0xe0, 0xdb, 0x99, 0xf3, 0x62, 0x78, 0x50, 0x5e,
+        0x2f, 0x6e, 0xc4, 0xc7, 0xb0, 0xdc, 0x28, 0xfa, 0xbc, 0x10, 0x0b, 0x33,
+        0x5f, 0x98, 0x92, 0x37, 0xe6, 0xfb, 0xa5, 0x31, 0x81, 0xb8, 0x3f, 0x40,
+        0x99, 0x0c, 0x99, 0x7b, 0xd4, 0x7b, 0x48, 0x77, 0x9a, 0x97, 0x2d, 0xd0,
+        0x5f, 0x68, 0xca, 0x41, 0xee, 0x67, 0xf3, 0x77, 0xed, 0x21, 0x69, 0x30,
+        0xa7, 0x18, 0xe8, 0x95, 0xca, 0x02, 0xf2, 0xf9, 0x22, 0xe9, 0x53, 0x6e,
+        0x7b, 0xd5, 0xef, 0x71, 0x8c, 0xf7, 0x39, 0xbe, 0x1f, 0x10, 0xa2, 0x6e,
+        0xee, 0x34, 0x97, 0x2d, 0xee, 0x67, 0x4e, 0x49, 0x0d, 0xfa, 0xfb, 0xe7,
+        0x31, 0xee, 0xb7, 0xe7, 0xd4, 0xf9, 0xdb, 0x4a, 0x6d, 0x02, 0xb9, 0xc3,
+        0x9d, 0xe6, 0x9c, 0x75, 0x56, 0xe9, 0xad, 0x56, 0x7e, 0xc2, 0x6b, 0xe7,
+        0x35, 0xef, 0x35, 0x32, 0xdb, 0x06, 0x98, 0xaf, 0x3e, 0x81, 0x7c, 0x81,
+        0xb9, 0xea, 0x04, 0xf0, 0x1a, 0x65, 0x12, 0x91, 0xd9, 0x22, 0x69, 0x49,
+        0x68, 0x13, 0xf2, 0xfb, 0x9c, 0x8c, 0x83, 0x9f, 0x08, 0x72, 0x7b, 0xc6,
+        0x87, 0x47, 0x65, 0x39, 0xe4, 0xc6, 0x01, 0x9e, 0xfb, 0x5a, 0x46, 0x6c,
+        0x58, 0x5e, 0x8d, 0x0d, 0x5b, 0x71, 0xdd, 0xc8, 0xc4, 0x07, 0xfe, 0x06,
+        0xf4, 0x59, 0xb7, 0x61, 0x6c, 0x18, 0x45, 0x7f, 0xb6, 0xf5, 0xca, 0xec,
+        0x02, 0x92, 0x08, 0xe4, 0x2c, 0x15, 0xe1, 0x99, 0x8e, 0xac, 0x9c, 0xaa,
+        0xf5, 0x87, 0x2f, 0x6b, 0x69, 0x75, 0xf6, 0x23, 0x36, 0xc0, 0xf3, 0x2c,
+        0xbd, 0x52, 0x5b, 0x90, 0x88, 0x91, 0x78, 0x52, 0x9c, 0x9a, 0x8b, 0xd9,
+        0xe7, 0x34, 0x9e, 0x69, 0xb1, 0xa5, 0xb6, 0xb6, 0x8f, 0x89, 0xdc, 0x57,
+        0xbe, 0xe3, 0xf5, 0x49, 0xab, 0x3e, 0x7f, 0xdd, 0xc3, 0x3d, 0xb4, 0x9a,
+        0xd3, 0x03, 0x1e, 0xc8, 0xdb, 0xc3, 0xad, 0xe3, 0x46, 0xee, 0x8e, 0xcb,
+        0x31, 0x91, 0xcd, 0x6c, 0xb1, 0x31, 0xee, 0x4d, 0x3c, 0xf3, 0x24, 0xf8,
+        0xb8, 0x63, 0xe8, 0xd6, 0x93, 0x52, 0xa8, 0xad, 0x1f, 0xa3, 0x95, 0x07,
+        0x3e, 0x43, 0xfa, 0x1c, 0xe7, 0x00, 0xf8, 0xbb, 0xa3, 0xe9, 0xd6, 0x01,
+        0xc8, 0xd2, 0x1d, 0xc3, 0x38, 0x13, 0x35, 0x7f, 0x2a, 0x03, 0xa2, 0x9f,
+        0xd3, 0x94, 0xfc, 0xf5, 0xca, 0x30, 0x16, 0x48, 0x46, 0xba, 0x96, 0x26,
+        0xc5, 0x58, 0x62, 0x0d, 0xe1, 0xb5, 0xce, 0xb4, 0xda, 0xbf, 0xdd, 0x84,
+        0xf5, 0x2d, 0x76, 0xc0, 0x62, 0xbd, 0x80, 0xf5, 0xe0, 0x9f, 0x6e, 0x96,
+        0x1e, 0xd6, 0x0b, 0x98, 0x37, 0xec, 0xc7, 0x37, 0x73, 0x87, 0x4b, 0x4d,
+        0xe4, 0x7a, 0x9b, 0x19, 0x5f, 0x73, 0x35, 0xde, 0x8f, 0x46, 0x44, 0x78,
+        0x8f, 0x7e, 0xa3, 0x57, 0xda, 0xbe, 0x35, 0x08, 0x5f, 0xf1, 0x34, 0xb0,
+        0x37, 0xe8, 0x9e, 0x1c, 0x90, 0x80, 0x7b, 0x66, 0x42, 0xd5, 0x5b, 0xde,
+        0x58, 0x88, 0x7a, 0xef, 0x73, 0xc9, 0xb6, 0xcb, 0x71, 0xd6, 0x44, 0xfb,
+        0x58, 0xf3, 0x41, 0x3f, 0xd1, 0x97, 0x91, 0x9f, 0x5e, 0xaf, 0x59, 0x9b,
+        0x79, 0x7e, 0xf3, 0x86, 0x83, 0x6b, 0x62, 0xff, 0x90, 0xc2, 0x98, 0xde,
+        0x3d, 0xfe, 0x46, 0xbe, 0xf4, 0x8e, 0x77, 0x13, 0x98, 0x4f, 0x4d, 0x7a,
+        0x67, 0xe7, 0x1a, 0x99, 0xa3, 0x6b, 0x72, 0xaa, 0x41, 0x55, 0xef, 0x6d,
+        0x38, 0x16, 0xfc, 0xe3, 0x08, 0xec, 0x93, 0x6b, 0xa0, 0xa9, 0x3d, 0x01,
+        0x6c, 0x16, 0xe9, 0x55, 0x39, 0xd1, 0xf1, 0x27, 0xc4, 0xb5, 0x77, 0x58,
+        0x99, 0xf2, 0x65, 0x8d, 0xb2, 0x9b, 0x83, 0x2c, 0x97, 0x33, 0xf2, 0x47,
+        0xce, 0x15, 0x55, 0x6b, 0x9d, 0x47, 0x5e, 0x12, 0x38, 0xa5, 0x72, 0xb2,
+        0x16, 0x7c, 0x0b, 0xbf, 0xf7, 0xe2, 0xd7, 0xb1, 0x16, 0xa3, 0xea, 0x8c,
+        0x82, 0x7e, 0xae, 0xd9, 0x4c, 0xc1, 0x7f, 0xe8, 0x96, 0x65, 0x16, 0x10,
+        0x0f, 0x53, 0xea, 0x9c, 0x0b, 0xd7, 0xf1, 0x6f, 0x2b, 0xff, 0x2c, 0x15,
+        0xc8, 0xe6, 0x4c, 0x04, 0x74, 0x34, 0x65, 0x9f, 0x86, 0xd2, 0xc3, 0x13,
+        0x0a, 0xf3, 0x1a, 0xe7, 0xe0, 0xb0, 0x96, 0x06, 0x44, 0xce, 0x65, 0x64,
+        0x0e, 0x6b, 0x38, 0xb0, 0x44, 0x1d, 0x50, 0xb6, 0x93, 0xd2, 0x06, 0xd9,
+        0x1f, 0x01, 0xf6, 0x30, 0x4e, 0x51, 0xc6, 0x61, 0xac, 0x8b, 0x5e, 0x09,
+        0x9c, 0x81, 0x8c, 0x4f, 0x01, 0x23, 0x2c, 0xb4, 0xcb, 0xf7, 0x6a, 0xbe,
+        0x4c, 0x2f, 0xf1, 0x5c, 0xbf, 0x3e, 0x35, 0xd2, 0x47, 0x1c, 0x25, 0xd5,
+        0xda, 0x9c, 0xcc, 0x9d, 0x66, 0xce, 0x3e, 0xa9, 0xce, 0x0c, 0x04, 0xd4,
+        0x99, 0x15, 0x37, 0x67, 0x76, 0xbf, 0x5d, 0x8c, 0x59, 0x15, 0xee, 0xb5,
+        0x09, 0x6c, 0x67, 0x18, 0xe3, 0x6e, 0x24, 0x5f, 0x37, 0x57, 0x1d, 0x07,
+        0xbf, 0x97, 0xe7, 0xa3, 0x99, 0xbc, 0xc4, 0x79, 0x76, 0x7a, 0xc2, 0xc6,
+        0xfc, 0x97, 0xe1, 0x3f, 0xe7, 0x4a, 0x3c, 0x27, 0x5d, 0xc0, 0x0a, 0xcb,
+        0xc8, 0xe5, 0x22, 0x73, 0xc6, 0x8f, 0x43, 0x6f, 0xbc, 0x2e, 0x8c, 0x1a,
+        0xf0, 0x03, 0x2b, 0xea, 0xdd, 0xcf, 0xa8, 0xdd, 0x40, 0x0e, 0x1b, 0xd1,
+        0xf6, 0x43, 0xd7, 0x79, 0xb3, 0xcd, 0xb3, 0x07, 0x9e, 0xc5, 0x3f, 0x0b,
+        0x3f, 0x7a, 0x5e, 0xf8, 0x4e, 0xd6, 0xed, 0x26, 0xf3, 0xa5, 0xab, 0xf0,
+        0x7b, 0x99, 0x58, 0x06, 0x36, 0x94, 0x0f, 0x77, 0x80, 0xe7, 0xdf, 0xc4,
+        0xbd, 0x9c, 0xc3, 0x71, 0xa2, 0xf1, 0x15, 0x29, 0x44, 0x02, 0x32, 0x14,
+        0xb9, 0x22, 0x9b, 0xe1, 0xc9, 0x34, 0x79, 0xdd, 0x8a, 0x8e, 0x8a, 0xa6,
+        0xe8, 0x0d, 0xee, 0x86, 0x0d, 0xde, 0x84, 0xbf, 0x6b, 0xf7, 0x72, 0xfd,
+        0x54, 0x91, 0x18, 0xea, 0x59, 0x75, 0xb6, 0xe0, 0xaa, 0xc5, 0x3a, 0x20,
+        0xdf, 0xc5, 0xfe, 0x1f, 0x6a, 0x8c, 0xbb, 0x7b, 0x77, 0xac, 0x43, 0x93,
+        0x3f, 0x77, 0x8e, 0xbb, 0x2c, 0x97, 0x47, 0xd2, 0x69, 0x6b, 0xa1, 0x73,
+        0xd9, 0xa3, 0x73, 0xd6, 0xa3, 0x53, 0xf1, 0xe8, 0x5c, 0x5d, 0xa5, 0xb3,
+        0x07, 0x76, 0xd0, 0x6c, 0x9e, 0x00, 0xde, 0x48, 0xc6, 0x9b, 0xcd, 0x34,
+        0xf2, 0xb2, 0xd9, 0xe1, 0x69, 0xb5, 0xe7, 0xaa, 0x27, 0x46, 0xc7, 0x93,
+        0x96, 0x2b, 0x7f, 0x58, 0x81, 0x4c, 0xc3, 0x1e, 0xf3, 0xe2, 0x62, 0x75,
+        0xee, 0x07, 0xba, 0xfb, 0x85, 0x5d, 0xf0, 0x03, 0x4f, 0x23, 0x96, 0x5c,
+        0x1c, 0x3f, 0x6f, 0x49, 0x7e, 0xdb, 0x27, 0x75, 0xd8, 0x7b, 0x0f, 0xdf,
+        0x27, 0x35, 0xa5, 0xeb, 0xe2, 0x78, 0xb5, 0xf6, 0x34, 0xf2, 0x23, 0xf6,
+        0xdf, 0x4e, 0x0c, 0xb6, 0xab, 0x52, 0x8b, 0xec, 0x3a, 0xcb, 0xfd, 0x21,
+        0xf4, 0xab, 0xd4, 0xba, 0x21, 0xf7, 0x6e, 0x55, 0x57, 0xb9, 0x52, 0x0c,
+        0x41, 0x8f, 0x26, 0x6c, 0x3e, 0x84, 0xb6, 0x30, 0xec, 0xa0, 0x0f, 0xed,
+        0x3f, 0xc7, 0xda, 0x8e, 0xa0, 0x7d, 0xa5, 0x73, 0x5c, 0xe1, 0x58, 0x4b,
+        0xce, 0x39, 0x37, 0x11, 0x73, 0xdf, 0x84, 0x1f, 0x1d, 0x44, 0x9f, 0x61,
+        0xf4, 0xf9, 0x14, 0xc6, 0xe1, 0x3b, 0xcd, 0x1b, 0xf1, 0xd4, 0x00, 0x4f,
+        0x7a, 0x0b, 0x4f, 0x0d, 0xf0, 0x03, 0xdf, 0x79, 0x92, 0x35, 0xe8, 0x61,
+        0x39, 0x5a, 0xe4, 0x19, 0x29, 0xbe, 0x17, 0x6f, 0x4a, 0x00, 0x98, 0xb4,
+        0xed, 0x64, 0x34, 0xdc, 0x50, 0xb5, 0x1e, 0xda, 0xd6, 0x50, 0xbc, 0x2a,
+        0x2a, 0xce, 0x44, 0x8e, 0x22, 0x7e, 0xdd, 0x74, 0xba, 0xe5, 0x75, 0x6f,
+        0xac, 0x15, 0xe1, 0xfe, 0xe5, 0xda, 0xb1, 0x8e, 0x95, 0xae, 0x8d, 0xbf,
+        0x6a, 0x19, 0xde, 0xbc, 0x7a, 0x31, 0xd6, 0xaf, 0xa2, 0xef, 0xb5, 0xf1,
+        0xcb, 0xb5, 0x8d, 0xfa, 0xde, 0x44, 0xdf, 0xb6, 0x96, 0xbe, 0x37, 0xd1,
+        0xaf, 0x1b, 0x71, 0xb0, 0x5b, 0xcd, 0x69, 0x16, 0x7c, 0x5d, 0x2f, 0xaa,
+        0xf7, 0xb4, 0x21, 0x77, 0x8e, 0x69, 0x12, 0x53, 0x67, 0xdc, 0x5a, 0x49,
+        0xd4, 0x8c, 0x68, 0xef, 0xa8, 0xf7, 0x28, 0x1b, 0x18, 0xb3, 0x80, 0x7b,
+        0xe7, 0x27, 0xb4, 0x54, 0x35, 0x87, 0x98, 0xf5, 0x30, 0xf1, 0x53, 0xdc,
+        0x46, 0xcc, 0xac, 0x80, 0x5e, 0xad, 0xd8, 0xe0, 0x79, 0x6a, 0xd8, 0xc5,
+        0x2d, 0xe2, 0xec, 0x87, 0x0d, 0x75, 0xae, 0x21, 0xad, 0x6a, 0x76, 0x95,
+        0xa2, 0x98, 0xc9, 0x11, 0x9e, 0x65, 0xf8, 0x0c, 0xd6, 0xe5, 0x57, 0xd0,
+        0x96, 0x44, 0x7c, 0x3c, 0xa0, 0x25, 0xcf, 0x8f, 0xe3, 0xfa, 0x49, 0x5c,
+        0xc3, 0x1f, 0x2f, 0x64, 0x71, 0xff, 0x49, 0x5c, 0x4f, 0x6b, 0xa9, 0x7a,
+        0x16, 0xd7, 0x4f, 0xe1, 0x7a, 0xca, 0x64, 0x9e, 0xf2, 0xaa, 0x95, 0xd1,
+        0x6c, 0xd0, 0xb2, 0xcf, 0x8f, 0xe3, 0xd3, 0x4a, 0x8f, 0xf7, 0xa0, 0xa7,
+        0x22, 0xf7, 0xda, 0x62, 0xe0, 0x69, 0x9f, 0x96, 0xae, 0x76, 0x81, 0xc6,
+        0x00, 0x9e, 0xa7, 0x4d, 0xed, 0xf7, 0xc6, 0x67, 0xcd, 0xe9, 0x63, 0xaa,
+        0xe6, 0x64, 0x24, 0x32, 0xc0, 0xc9, 0x87, 0x91, 0x07, 0x68, 0x92, 0xb6,
+        0x9e, 0x93, 0x42, 0x1c, 0x7e, 0xa5, 0x6a, 0x48, 0x2a, 0x94, 0xc7, 0xef,
+        0xbc, 0x24, 0x47, 0x71, 0xbf, 0x4a, 0x5b, 0x60, 0xbf, 0x3f, 0x95, 0x42,
+        0x99, 0xb8, 0x9f, 0x75, 0x26, 0xd6, 0xa6, 0x58, 0x5f, 0xca, 0x41, 0x06,
+        0x21, 0xda, 0xef, 0x06, 0x35, 0x31, 0xf7, 0x8c, 0x34, 0xe2, 0xb2, 0x96,
+        0xac, 0x72, 0xdf, 0xaf, 0x91, 0xb9, 0x6c, 0xf1, 0xfd, 0xb1, 0x69, 0xee,
+        0x23, 0x16, 0x8c, 0x04, 0xeb, 0x23, 0xaa, 0xbe, 0x1e, 0x77, 0xf7, 0x07,
+        0x5b, 0xcf, 0xa4, 0xf8, 0xeb, 0x85, 0xe3, 0x7e, 0x0d, 0xcf, 0xbb, 0xf5,
+        0xac, 0x54, 0xfd, 0x9d, 0xba, 0xe0, 0x3b, 0x00, 0xe7, 0xa0, 0x8b, 0xcb,
+        0x2a, 0x37, 0xe6, 0x1e, 0xee, 0xbb, 0xe5, 0x54, 0xc8, 0x61, 0x8a, 0xac,
+        0x91, 0xf9, 0xfb, 0x76, 0xbe, 0x1c, 0xd7, 0xf3, 0x4a, 0x3e, 0x67, 0x40,
+        0x53, 0xe2, 0xf4, 0xbb, 0xd9, 0x10, 0xf7, 0xdf, 0xf8, 0x8c, 0x7c, 0xf3,
+        0x2e, 0xdf, 0xe4, 0x99, 0xf2, 0x38, 0x0c, 0xff, 0xc9, 0xf7, 0x2b, 0x9e,
+        0x93, 0x5c, 0x9c, 0x35, 0x1e, 0x03, 0xb1, 0x31, 0x8f, 0xdf, 0x77, 0xe5,
+        0x37, 0xeb, 0xc9, 0x2f, 0x57, 0xfe, 0x2f, 0x4a, 0x87, 0x15, 0x8b, 0xe3,
+        0xf9, 0xb5, 0x8f, 0xbd, 0x4a, 0x77, 0x15, 0x75, 0x7e, 0xd7, 0x97, 0x81,
+        0x5f, 0xbf, 0xdb, 0xd8, 0xf6, 0xc6, 0x2d, 0xf2, 0xf6, 0x10, 0xcf, 0x43,
+        0x0c, 0xda, 0x42, 0xfe, 0x39, 0x0f, 0xc6, 0x30, 0x7f, 0xaf, 0xd5, 0x9f,
+        0x83, 0x3f, 0xcf, 0xfb, 0x95, 0x0f, 0xf9, 0xfd, 0xe4, 0x16, 0xe9, 0xca,
+        0x98, 0x86, 0xc5, 0xd8, 0xf0, 0xb8, 0xb7, 0x3f, 0xf0, 0x7f, 0x43, 0xce,
+        0xae, 0x2c, 0x02, 0x09, 0x99, 0xf5, 0xde, 0xbf, 0xde, 0xc0, 0x1e, 0xd6,
+        0xef, 0x35, 0x37, 0x32, 0x67, 0xad, 0xbb, 0xf3, 0xae, 0x6c, 0x30, 0xef,
+        0x8a, 0x37, 0xef, 0xea, 0x7d, 0xf2, 0x5b, 0x99, 0xb7, 0x31, 0x67, 0xda,
+        0xdc, 0x46, 0xf6, 0x28, 0xea, 0xdd, 0xb0, 0x15, 0x23, 0x18, 0xb4, 0x9d,
+        0x7b, 0xd5, 0x50, 0x99, 0x57, 0xbb, 0x76, 0x79, 0x16, 0xb1, 0xb0, 0x5c,
+        0x76, 0x73, 0xec, 0xb2, 0xc3, 0x5a, 0xf6, 0xbb, 0xf1, 0xc0, 0x77, 0xb9,
+        0xbe, 0xa8, 0xce, 0xbb, 0xcc, 0x3a, 0x6e, 0xdd, 0xab, 0x5c, 0x6e, 0x8d,
+        0xa9, 0x0f, 0x32, 0x9e, 0x0e, 0xe6, 0x65, 0x82, 0xef, 0x94, 0xe3, 0xfa,
+        0x11, 0xb9, 0xb2, 0xa0, 0xf6, 0xac, 0xbc, 0xbd, 0x21, 0xee, 0xf9, 0xa8,
+        0xfd, 0x6f, 0xf8, 0xb5, 0x49, 0xe5, 0xd7, 0x97, 0x17, 0xd4, 0x3d, 0x17,
+        0x2b, 0x39, 0x13, 0xf0, 0xfb, 0xc8, 0x25, 0xac, 0x07, 0xa4, 0x80, 0x9c,
+        0xfb, 0xac, 0x75, 0x78, 0x0b, 0x71, 0x0e, 0x69, 0x2d, 0x83, 0xd6, 0xe5,
+        0x05, 0xd9, 0xc2, 0x33, 0x25, 0x65, 0xb5, 0xcf, 0xe6, 0xd6, 0xc5, 0xa7,
+        0xc5, 0xff, 0x7f, 0x1d, 0x41, 0x2f, 0x16, 0xf2, 0x5c, 0x0b, 0xdf, 0x73,
+        0xa6, 0xaf, 0x40, 0x1e, 0x34, 0xc1, 0x7d, 0x9c, 0x66, 0xd3, 0xad, 0x9b,
+        0x37, 0xb1, 0x2e, 0xda, 0xf8, 0x0e, 0x05, 0xfe, 0x0e, 0xc3, 0x7e, 0xb0,
+        0x4e, 0x56, 0xdb, 0x79, 0xcd, 0xdc, 0xc3, 0xbf, 0x66, 0x60, 0xfb, 0x3f,
+        0xe8, 0xf3, 0x49, 0x14, 0x38, 0x46, 0x00, 0x00, 0x00 };
+
+static const u32 bnx2_TXP_b09FwData[(0xd0/4) + 1] = {
         0x00000000, 0x00000014, 0x00000014, 0x00000014, 0x00000014, 0x00000010,
         0x00000030, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x00000010,
         0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00008002, 0x00000000,
@@ -4043,42 +4051,42 @@ static u32 bnx2_TXP_b09FwData[(0xd0/4) + 1] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
         0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
-static u32 bnx2_TXP_b09FwRodata[(0x30/4) + 1] = {
-        0x08003be8, 0x08003c14, 0x08003c5c, 0x08003c5c, 0x08003ae8, 0x08003b14,
-        0x08003b14, 0x08003c5c, 0x08003c5c, 0x08003c5c, 0x08003b7c, 0x00000000,
+static const u32 bnx2_TXP_b09FwRodata[(0x30/4) + 1] = {
+        0x08004060, 0x0800408c, 0x080040d4, 0x080040d4, 0x08003f60, 0x08003f8c,
+        0x08003f8c, 0x080040d4, 0x080040d4, 0x080040d4, 0x08003ff4, 0x00000000,
         0x00000000 };
-static u32 bnx2_TXP_b09FwBss[(0xa20/4) + 1] = { 0x0 };
-static u32 bnx2_TXP_b09FwSbss[(0x80/4) + 1] = { 0x0 };
+static const u32 bnx2_TXP_b09FwBss[(0xa20/4) + 1] = { 0x0 };
+static const u32 bnx2_TXP_b09FwSbss[(0x8c/4) + 1] = { 0x0 };
 
 static struct fw_info bnx2_txp_fw_09 = {
-        .ver_major                      = 0x1,
-        .ver_minor                      = 0x0,
-        .ver_fix                        = 0x0,
+        .ver_major                      = 0x3,
+        .ver_minor                      = 0x4,
+        .ver_fix                        = 0x3,
 
         .start_addr                     = 0x08000060,
 
         .text_addr                      = 0x08000000,
-        .text_len                       = 0x4194,
+        .text_len                       = 0x4634,
         .text_index                     = 0x0,
         .gz_text                        = bnx2_TXP_b09FwText,
         .gz_text_len                    = sizeof(bnx2_TXP_b09FwText),
 
-        .data_addr                      = 0x080041e0,
+        .data_addr                      = 0x08004680,
         .data_len                       = 0xd0,
         .data_index                     = 0x0,
         .data                           = bnx2_TXP_b09FwData,
 
-        .sbss_addr                      = 0x080042b0,
-        .sbss_len                       = 0x80,
+        .sbss_addr                      = 0x08004750,
+        .sbss_len                       = 0x8c,
         .sbss_index                     = 0x0,
         .sbss                           = bnx2_TXP_b09FwSbss,
 
-        .bss_addr                       = 0x08004330,
+        .bss_addr                       = 0x080047e0,
         .bss_len                        = 0xa20,
         .bss_index                      = 0x0,
         .bss                            = bnx2_TXP_b09FwBss,
 
-        .rodata_addr                    = 0x08004198,
+        .rodata_addr                    = 0x08004638,
         .rodata_len                     = 0x30,
         .rodata_index                   = 0x0,
         .rodata                         = bnx2_TXP_b09FwRodata,
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 042e27e291cd..b112317f033e 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -38,7 +38,7 @@
 #define DRV_VERSION "1.0-ko"
 
 /* Firmware version */
-#define FW_VERSION_MAJOR 3
-#define FW_VERSION_MINOR 3
+#define FW_VERSION_MAJOR 4
+#define FW_VERSION_MINOR 0
 #define FW_VERSION_MICRO 0
 #endif                          /* __CHELSIO_VERSION_H */
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index e824d5d231af..88efe9731bab 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index e79700abf7b6..b3fa0d6a159c 100644
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index e2ddd617493a..a4a2a0ea43d3 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -24,7 +24,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 8545e84fc9a0..5603121132cd 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index cdcfb96f360f..04b4f80a1cde 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 65925b5a224f..d0f28981b55a 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index f91447837fd4..d3840108ffbd 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 235b177fb9ac..0a563a83016f 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 3d82d46f4998..50035ebd4f52 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -27,7 +27,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index fb196fd91855..55ff0fbe525a 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -134,7 +134,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         DCSR(si->rxdma) &= ~DCSR_RUN;
                         /* disable FICP */
                         ICCR0 = 0;
-                        pxa_set_cken(CKEN13_FICP, 0);
+                        pxa_set_cken(CKEN_FICP, 0);
 
                         /* set board transceiver to SIR mode */
                         si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
@@ -144,7 +144,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         pxa_gpio_mode(GPIO47_STTXD_MD);
 
                         /* enable the STUART clock */
-                        pxa_set_cken(CKEN5_STUART, 1);
+                        pxa_set_cken(CKEN_STUART, 1);
                 }
 
                 /* disable STUART first */
@@ -169,7 +169,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 /* disable STUART */
                 STIER = 0;
                 STISR = 0;
-                pxa_set_cken(CKEN5_STUART, 0);
+                pxa_set_cken(CKEN_STUART, 0);
 
                 /* disable FICP first */
                 ICCR0 = 0;
@@ -182,7 +182,7 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 pxa_gpio_mode(GPIO47_ICPTXD_MD);
 
                 /* enable the FICP clock */
-                pxa_set_cken(CKEN13_FICP, 1);
+                pxa_set_cken(CKEN_FICP, 1);
 
                 si->speed = speed;
                 pxa_irda_fir_dma_rx_start(si);
@@ -593,7 +593,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         /* disable STUART SIR mode */
         STISR = 0;
         /* disable the STUART clock */
-        pxa_set_cken(CKEN5_STUART, 0);
+        pxa_set_cken(CKEN_STUART, 0);
 
         /* disable DMA */
         DCSR(si->txdma) &= ~DCSR_RUN;
@@ -601,7 +601,7 @@ static void pxa_irda_shutdown(struct pxa_irda *si)
         /* disable FICP */
         ICCR0 = 0;
         /* disable the FICP clock */
-        pxa_set_cken(CKEN13_FICP, 0);
+        pxa_set_cken(CKEN_FICP, 0);
 
         DRCMR17 = 0;
         DRCMR18 = 0;
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index 8434d752fd81..9e04a6b3ae0d 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -34,7 +34,6 @@
 #define _IXGB_OSDEP_H_
 
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index d34afb52ea7f..75f6f441e876 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -88,6 +88,23 @@ static unsigned short known_revisions[] =
         0xffff                  /* end of list */
 };
 
+static int jazzsonic_open(struct net_device* dev)
+{
+        if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
+                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
+                return -EAGAIN;
+        }
+        return sonic_open(dev);
+}
+
+static int jazzsonic_close(struct net_device* dev)
+{
+        int err;
+        err = sonic_close(dev);
+        free_irq(dev->irq, dev);
+        return err;
+}
+
 static int __init sonic_probe1(struct net_device *dev)
 {
         static unsigned version_printed;
@@ -169,8 +186,8 @@ static int __init sonic_probe1(struct net_device *dev)
         lp->rra_laddr = lp->rda_laddr + (SIZEOF_SONIC_RD * SONIC_NUM_RDS
                              * SONIC_BUS_SCALE(lp->dma_bitmode));
 
-        dev->open = sonic_open;
-        dev->stop = sonic_close;
+        dev->open = jazzsonic_open;
+        dev->stop = jazzsonic_close;
         dev->hard_start_xmit = sonic_send_packet;
         dev->get_stats = sonic_get_stats;
         dev->set_multicast_list = &sonic_multicast_list;
@@ -260,8 +277,6 @@ MODULE_DESCRIPTION("Jazz SONIC ethernet driver");
 module_param(sonic_debug, int, 0);
 MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
 
-#define SONIC_IRQ_FLAG IRQF_DISABLED
-
 #include "sonic.c"
 
 static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
@@ -269,11 +284,11 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
         struct sonic_local* lp = netdev_priv(dev);
 
-        unregister_netdev (dev);
+        unregister_netdev(dev);
         dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                           lp->descriptors, lp->descriptors_laddr);
         release_region (dev->base_addr, SONIC_MEM_SIZE);
-        free_netdev (dev);
+        free_netdev(dev);
 
         return 0;
 }
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 0edcd125fd61..6b49fc4bd1a1 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -81,7 +81,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index a12bb64e3694..90b0c3ed4bb6 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -14,6 +14,8 @@
 /* 2001-05-15: support for Cabletron ported from old daynaport driver
  * and fixed access to Sonic Sys card which masquerades as a Farallon
  * by rayk@knightsmanor.org */
+/* 2002-12-30: Try to support more cards, some clues from NetBSD driver */
+/* 2003-12-26: Make sure Asante cards always work. */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -61,25 +63,21 @@ static char version[] =
 #define DAYNA_8390_BASE         0x80000
 #define DAYNA_8390_MEM          0x00000
 
-#define KINETICS_8390_BASE      0x80000
-#define KINETICS_8390_MEM       0x00000
-
 #define CABLETRON_8390_BASE     0x90000
 #define CABLETRON_8390_MEM      0x00000
 
+#define INTERLAN_8390_BASE      0xE0000
+#define INTERLAN_8390_MEM       0xD0000
+
 enum mac8390_type {
         MAC8390_NONE = -1,
         MAC8390_APPLE,
         MAC8390_ASANTE,
-        MAC8390_FARALLON,  /* Apple, Asante, and Farallon are all compatible */
+        MAC8390_FARALLON,
         MAC8390_CABLETRON,
         MAC8390_DAYNA,
         MAC8390_INTERLAN,
         MAC8390_KINETICS,
-        MAC8390_FOCUS,
-        MAC8390_SONICSYS,
-        MAC8390_DAYNA2,
-        MAC8390_DAYNA3,
 };
 
 static const char * cardname[] = {
@@ -90,10 +88,6 @@ static const char * cardname[] = {
         "dayna",
         "interlan",
         "kinetics",
-        "focus",
-        "sonic systems",
-        "dayna2",
-        "dayna_lc",
 };
 
 static int word16[] = {
@@ -104,10 +98,6 @@ static int word16[] = {
         0, /* dayna */
         1, /* interlan */
         0, /* kinetics */
-        1, /* focus (??) */
-        1, /* sonic systems  */
-        1, /* dayna2 */
-        1, /* dayna-lc */
 };
 
 /* on which cards do we use NuBus resources? */
@@ -119,10 +109,12 @@ static int useresources[] = {
         0, /* dayna */
         0, /* interlan */
         0, /* kinetics */
-        0, /* focus (??) */
-        1, /* sonic systems */
-        1, /* dayna2 */
-        1, /* dayna-lc */
+};
+
+enum mac8390_access {
+        ACCESS_UNKNOWN = 0,
+        ACCESS_32,
+        ACCESS_16,
 };
 
 extern enum mac8390_type mac8390_ident(struct nubus_dev * dev);
@@ -134,8 +126,9 @@ static int mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
 static int mac8390_open(struct net_device * dev);
 static int mac8390_close(struct net_device * dev);
 static void mac8390_no_reset(struct net_device *dev);
+static void interlan_reset(struct net_device *dev);
 
-/* Sane (32-bit chunk memory read/write) - Apple/Asante/Farallon do this*/
+/* Sane (32-bit chunk memory read/write) - Some Farallon and Apple do this*/
 static void sane_get_8390_hdr(struct net_device *dev,
                               struct e8390_pkt_hdr *hdr, int ring_page);
 static void sane_block_input(struct net_device * dev, int count,
@@ -172,23 +165,93 @@ static void word_memcpy_fromcard(void *tp, const void *fp, int count);
 
 enum mac8390_type __init mac8390_ident(struct nubus_dev * dev)
 {
-        if (dev->dr_sw == NUBUS_DRSW_ASANTE)
-                return MAC8390_ASANTE;
-        if (dev->dr_sw == NUBUS_DRSW_FARALLON)
-                return MAC8390_FARALLON;
-        if (dev->dr_sw == NUBUS_DRSW_KINETICS)
-                return MAC8390_KINETICS;
-        if (dev->dr_sw == NUBUS_DRSW_DAYNA)
-                return MAC8390_DAYNA;
-        if (dev->dr_sw == NUBUS_DRSW_DAYNA2)
-                return MAC8390_DAYNA2;
-        if (dev->dr_sw == NUBUS_DRSW_DAYNA_LC)
-                return MAC8390_DAYNA3;
-        if (dev->dr_hw == NUBUS_DRHW_CABLETRON)
-                return MAC8390_CABLETRON;
+        switch (dev->dr_sw) {
+                case NUBUS_DRSW_3COM:
+                        switch (dev->dr_hw) {
+                                case NUBUS_DRHW_APPLE_SONIC_NB:
+                                case NUBUS_DRHW_APPLE_SONIC_LC:
+                                case NUBUS_DRHW_SONNET:
+                                        return MAC8390_NONE;
+                                        break;
+                                default:
+                                        return MAC8390_APPLE;
+                                        break;
+                        }
+                        break;
+
+                case NUBUS_DRSW_APPLE:
+                        switch (dev->dr_hw) {
+                                case NUBUS_DRHW_ASANTE_LC:
+                                        return MAC8390_NONE;
+                                        break;
+                                case NUBUS_DRHW_CABLETRON:
+                                        return MAC8390_CABLETRON;
+                                        break;
+                                default:
+                                        return MAC8390_APPLE;
+                                        break;
+                        }
+                        break;
+
+                case NUBUS_DRSW_ASANTE:
+                        return MAC8390_ASANTE;
+                        break;
+
+                case NUBUS_DRSW_TECHWORKS:
+                case NUBUS_DRSW_DAYNA2:
+                case NUBUS_DRSW_DAYNA_LC:
+                        if (dev->dr_hw == NUBUS_DRHW_CABLETRON)
+                                return MAC8390_CABLETRON;
+                        else
+                                return MAC8390_APPLE;
+                        break;
+
+                case NUBUS_DRSW_FARALLON:
+                        return MAC8390_FARALLON;
+                        break;
+
+                case NUBUS_DRSW_KINETICS:
+                        switch (dev->dr_hw) {
+                                case NUBUS_DRHW_INTERLAN:
+                                        return MAC8390_INTERLAN;
+                                        break;
+                                default:
+                                        return MAC8390_KINETICS;
+                                        break;
+                        }
+                        break;
+
+                case NUBUS_DRSW_DAYNA:
+                        // These correspond to Dayna Sonic cards
+                        // which use the macsonic driver
+                        if (dev->dr_hw == NUBUS_DRHW_SMC9194 ||
+                                dev->dr_hw == NUBUS_DRHW_INTERLAN )
+                                return MAC8390_NONE;
+                        else
+                                return MAC8390_DAYNA;
+                        break;
+        }
         return MAC8390_NONE;
 }
 
+enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
+{
+        unsigned long outdata = 0xA5A0B5B0;
+        unsigned long indata =  0x00000000;
+        /* Try writing 32 bits */
+        memcpy((char *)membase, (char *)&outdata, 4);
+        /* Now compare them */
+        if (memcmp((char *)&outdata, (char *)membase, 4) == 0)
+                return ACCESS_32;
+        /* Write 16 bit output */
+        word_memcpy_tocard((char *)membase, (char *)&outdata, 4);
+        /* Now read it back */
+        word_memcpy_fromcard((char *)&indata, (char *)membase, 4);
+        if (outdata == indata)
+                return ACCESS_16;
+        return ACCESS_UNKNOWN;
+}
+
 int __init mac8390_memsize(unsigned long membase)
 {
         unsigned long flags;
@@ -287,14 +350,6 @@ struct net_device * __init mac8390_probe(int unit)
                         continue;
                 } else {
                         nubus_get_rsrc_mem(dev->dev_addr, &ent, 6);
-                        /* Some Sonic Sys cards masquerade as Farallon */
-                        if (cardtype == MAC8390_FARALLON &&
-                                        dev->dev_addr[0] == 0x0 &&
-                                        dev->dev_addr[1] == 0x40 &&
-                                        dev->dev_addr[2] == 0x10) {
-                                /* This is really Sonic Sys card */
-                                cardtype = MAC8390_SONICSYS;
-                        }
                 }
 
                 if (useresources[cardtype] == 1) {
@@ -334,6 +389,17 @@ struct net_device * __init mac8390_probe(int unit)
                                                 dev->mem_start +
                                                 mac8390_memsize(dev->mem_start);
                                         break;
+                                case MAC8390_INTERLAN:
+                                        dev->base_addr =
+                                                (int)(ndev->board->slot_addr +
+                                                INTERLAN_8390_BASE);
+                                        dev->mem_start =
+                                                (int)(ndev->board->slot_addr +
+                                                INTERLAN_8390_MEM);
+                                        dev->mem_end =
+                                                dev->mem_start +
+                                                mac8390_memsize(dev->mem_start);
+                                        break;
                                 case MAC8390_CABLETRON:
                                         dev->base_addr =
                                                 (int)(ndev->board->slot_addr +
@@ -356,8 +422,8 @@ struct net_device * __init mac8390_probe(int unit)
 
                                 default:
                                         printk(KERN_ERR "Card type %s is"
-                                                        " unsupported, sorry\n",
-                                               cardname[cardtype]);
+                                               " unsupported, sorry\n",
+                                               ndev->board->name);
                                         continue;
                         }
                 }
@@ -438,7 +504,7 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
                 24,    26,     28,     30
         };
 
-        int access_bitmode;
+        int access_bitmode = 0;
 
         /* Now fill in our stuff */
         dev->open = &mac8390_open;
@@ -468,29 +534,47 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
 
         /* Fill in model-specific information and functions */
         switch(type) {
-        case MAC8390_SONICSYS:
-                /* 16 bit card, register map is reversed */
-                ei_status.reset_8390 = &mac8390_no_reset;
-                ei_status.block_input = &slow_sane_block_input;
-                ei_status.block_output = &slow_sane_block_output;
-                ei_status.get_8390_hdr = &slow_sane_get_8390_hdr;
-                ei_status.reg_offset = back4_offsets;
-                access_bitmode = 0;
-                break;
         case MAC8390_FARALLON:
         case MAC8390_APPLE:
+                switch(mac8390_testio(dev->mem_start)) {
+                        case ACCESS_UNKNOWN:
+                                printk("Don't know how to access card memory!\n");
+                                return -ENODEV;
+                                break;
+
+                        case ACCESS_16:
+                                /* 16 bit card, register map is reversed */
+                                ei_status.reset_8390 = &mac8390_no_reset;
+                                ei_status.block_input = &slow_sane_block_input;
+                                ei_status.block_output = &slow_sane_block_output;
+                                ei_status.get_8390_hdr = &slow_sane_get_8390_hdr;
+                                ei_status.reg_offset = back4_offsets;
+                                break;
+
+                        case ACCESS_32:
+                                /* 32 bit card, register map is reversed */
+                                ei_status.reset_8390 = &mac8390_no_reset;
+                                ei_status.block_input = &sane_block_input;
+                                ei_status.block_output = &sane_block_output;
+                                ei_status.get_8390_hdr = &sane_get_8390_hdr;
+                                ei_status.reg_offset = back4_offsets;
+                                access_bitmode = 1;
+                                break;
+                }
+                break;
+
         case MAC8390_ASANTE:
-        case MAC8390_DAYNA2:
-        case MAC8390_DAYNA3:
-                /* 32 bit card, register map is reversed */
-                /* sane */
+                /* Some Asante cards pass the 32 bit test
+                 * but overwrite system memory when run at 32 bit.
+                 * so we run them all at 16 bit.
+                 */
                 ei_status.reset_8390 = &mac8390_no_reset;
-                ei_status.block_input = &sane_block_input;
-                ei_status.block_output = &sane_block_output;
-                ei_status.get_8390_hdr = &sane_get_8390_hdr;
+                ei_status.block_input = &slow_sane_block_input;
+                ei_status.block_output = &slow_sane_block_output;
+                ei_status.get_8390_hdr = &slow_sane_get_8390_hdr;
                 ei_status.reg_offset = back4_offsets;
-                access_bitmode = 1;
                 break;
+
         case MAC8390_CABLETRON:
                 /* 16 bit card, register map is short forward */
                 ei_status.reset_8390 = &mac8390_no_reset;
@@ -498,21 +582,30 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
                 ei_status.block_output = &slow_sane_block_output;
                 ei_status.get_8390_hdr = &slow_sane_get_8390_hdr;
                 ei_status.reg_offset = fwrd2_offsets;
-                access_bitmode = 0;
                 break;
+
         case MAC8390_DAYNA:
         case MAC8390_KINETICS:
-                /* 16 bit memory */
+                /* 16 bit memory, register map is forward */
                 /* dayna and similar */
                 ei_status.reset_8390 = &mac8390_no_reset;
                 ei_status.block_input = &dayna_block_input;
                 ei_status.block_output = &dayna_block_output;
                 ei_status.get_8390_hdr = &dayna_get_8390_hdr;
                 ei_status.reg_offset = fwrd4_offsets;
-                access_bitmode = 0;
                 break;
+
+        case MAC8390_INTERLAN:
+                /* 16 bit memory, register map is forward */
+                ei_status.reset_8390 = &interlan_reset;
+                ei_status.block_input = &slow_sane_block_input;
+                ei_status.block_output = &slow_sane_block_output;
+                ei_status.get_8390_hdr = &slow_sane_get_8390_hdr;
+                ei_status.reg_offset = fwrd4_offsets;
+                break;
+
         default:
-                printk(KERN_ERR "Card type %s is unsupported, sorry\n", cardname[type]);
+                printk(KERN_ERR "Card type %s is unsupported, sorry\n", ndev->board->name);
                 return -ENODEV;
         }
 
@@ -530,9 +623,9 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
                                 printk(":");
                 }
         }
-        printk(" IRQ %d, shared memory at %#lx-%#lx,  %d-bit access.\n",
-                   dev->irq, dev->mem_start, dev->mem_end-1,
-                   access_bitmode?32:16);
+        printk(" IRQ %d, %d KB shared memory at %#lx,  %d-bit access.\n",
+                   dev->irq, (int)((dev->mem_end - dev->mem_start)/0x1000) * 4,
+                   dev->mem_start, access_bitmode?32:16);
         return 0;
 }
 
@@ -561,6 +654,18 @@ static void mac8390_no_reset(struct net_device *dev)
         return;
 }
 
+static void interlan_reset(struct net_device *dev)
+{
+        unsigned char *target=nubus_slot_addr(IRQ2SLOT(dev->irq));
+        if (ei_debug > 1)
+                printk("Need to reset the NS8390 t=%lu...", jiffies);
+        ei_status.txing = 0;
+        target[0xC0000] = 0;
+        if (ei_debug > 1)
+                printk("reset complete\n");
+        return;
+}
+
 /* dayna_memcpy_fromio/dayna_memcpy_toio */
 /* directly from daynaport.c by Alan Cox */
 static void dayna_memcpy_fromcard(struct net_device *dev, void *to, int from, int count)
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 90e695d53266..26a3b45a4a34 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -128,7 +128,7 @@ struct net_local {
 extern void reset_chip(struct net_device *dev);
 #endif
 static int net_open(struct net_device *dev);
-static int      net_send_packet(struct sk_buff *skb, 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);
 static void set_multicast_list(struct net_device *dev);
 static void net_rx(struct net_device *dev);
@@ -374,56 +374,39 @@ net_open(struct net_device *dev)
 static int
 net_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
-        if (dev->tbusy) {
-                /* If we get here, some higher level has decided we are broken.
-                   There should really be a "kick me" function call instead. */
-                int tickssofar = jiffies - dev->trans_start;
-                if (tickssofar < 5)
-                        return 1;
-                if (net_debug > 0) printk("%s: transmit timed out, %s?\n", dev->name,
-                           tx_done(dev) ? "IRQ conflict" : "network cable problem");
-                /* Try to restart the adaptor. */
-                dev->tbusy=0;
-                dev->trans_start = jiffies;
-        }
-
-        /* Block a timer-based transmit from overlapping.  This could better be
-           done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
-        if (test_and_set_bit(0, (void*)&dev->tbusy) != 0)
-                printk("%s: Transmitter access conflict.\n", dev->name);
-        else {
-                struct net_local *lp = netdev_priv(dev);
-                unsigned long flags;
-
-                if (net_debug > 3)
-                        printk("%s: sent %d byte packet of type %x\n",
-                               dev->name, skb->len,
-                               (skb->data[ETH_ALEN+ETH_ALEN] << 8)
-                               | skb->data[ETH_ALEN+ETH_ALEN+1]);
-
-                /* keep the upload from being interrupted, since we
-                   ask the chip to start transmitting before the
-                   whole packet has been completely uploaded. */
-                local_irq_save(flags);
+        struct net_local *lp = netdev_priv(dev);
+        unsigned long flags;
 
-                /* initiate a transmit sequence */
-                writereg(dev, PP_TxCMD, lp->send_cmd);
-                writereg(dev, PP_TxLength, skb->len);
+        if (net_debug > 3)
+                printk("%s: sent %d byte packet of type %x\n",
+                       dev->name, skb->len,
+                       (skb->data[ETH_ALEN+ETH_ALEN] << 8)
+                       | skb->data[ETH_ALEN+ETH_ALEN+1]);
 
-                /* Test to see if the chip has allocated memory for the packet */
-                if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
-                        /* Gasp!  It hasn't.  But that shouldn't happen since
-                           we're waiting for TxOk, so return 1 and requeue this packet. */
-                        local_irq_restore(flags);
-                        return 1;
-                }
+        /* keep the upload from being interrupted, since we
+           ask the chip to start transmitting before the
+           whole packet has been completely uploaded. */
+        local_irq_save(flags);
+        netif_stop_queue(dev);
 
-                /* Write the contents of the packet */
-                memcpy_toio(dev->mem_start + PP_TxFrame, skb->data, skb->len+1);
+        /* initiate a transmit sequence */
+        writereg(dev, PP_TxCMD, lp->send_cmd);
+        writereg(dev, PP_TxLength, skb->len);
 
+        /* Test to see if the chip has allocated memory for the packet */
+        if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
+                /* Gasp!  It hasn't.  But that shouldn't happen since
+                   we're waiting for TxOk, so return 1 and requeue this packet. */
                 local_irq_restore(flags);
-                dev->trans_start = jiffies;
+                return 1;
         }
+
+        /* Write the contents of the packet */
+        skb_copy_from_linear_data(skb, (void *)(dev->mem_start + PP_TxFrame),
+                                  skb->len+1);
+
+        local_irq_restore(flags);
+        dev->trans_start = jiffies;
         dev_kfree_skb (skb);
 
         return 0;
@@ -441,9 +424,6 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                 printk ("net_interrupt(): irq %d for unknown device.\n", irq);
                 return IRQ_NONE;
         }
-        if (dev->interrupt)
-                printk("%s: Re-entering the interrupt handler.\n", dev->name);
-        dev->interrupt = 1;
 
         ioaddr = dev->base_addr;
         lp = netdev_priv(dev);
@@ -464,8 +444,7 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                         break;
                 case ISQ_TRANSMITTER_EVENT:
                         lp->stats.tx_packets++;
-                        dev->tbusy = 0;
-                        mark_bh(NET_BH);        /* Inform upper layers. */
+                        netif_wake_queue(dev);
                         if ((status & TX_OK) == 0) lp->stats.tx_errors++;
                         if (status & TX_LOST_CRS) lp->stats.tx_carrier_errors++;
                         if (status & TX_SQE_ERROR) lp->stats.tx_heartbeat_errors++;
@@ -479,8 +458,7 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                                    That shouldn't happen since we only ever
                                    load one packet.  Shrug.  Do the right
                                    thing anyway. */
-                                dev->tbusy = 0;
-                                mark_bh(NET_BH);        /* Inform upper layers. */
+                                netif_wake_queue(dev);
                         }
                         if (status & TX_UNDERRUN) {
                                 if (net_debug > 0) printk("%s: transmit underrun\n", dev->name);
@@ -497,7 +475,6 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                         break;
                 }
         }
-        dev->interrupt = 0;
         return IRQ_HANDLED;
 }
 
@@ -531,7 +508,8 @@ net_rx(struct net_device *dev)
         }
         skb_put(skb, length);
 
-        memcpy_fromio(skb->data, dev->mem_start + PP_RxFrame, length);
+        skb_copy_to_linear_data(skb, (void *)(dev->mem_start + PP_RxFrame),
+                                length);
 
         if (net_debug > 3)printk("%s: received %d byte packet of type %x\n",
                                  dev->name, length,
@@ -610,8 +588,6 @@ static void set_multicast_list(struct net_device *dev)
 static int set_mac_address(struct net_device *dev, void *addr)
 {
         int i;
-        if (dev->start)
-                return -EBUSY;
         printk("%s: Setting MAC address to ", dev->name);
         for (i = 0; i < 6; i++)
                 printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 27911c07558d..fef3193121f9 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -12,6 +12,11 @@
  *      Copyright (C) 1998 Alan Cox <alan@redhat.com>
  *
  *      Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
+ *
+ *      Copyright (C) 2007 Finn Thain
+ *
+ *      Converted to DMA API, converted to unified driver model,
+ *      sync'd some routines with mace.c and fixed various bugs.
  */
 
 
@@ -23,8 +28,9 @@
 #include <linux/string.h>
 #include <linux/crc32.h>
 #include <linux/bitrev.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
@@ -32,13 +38,20 @@
 #include <asm/page.h>
 #include "mace.h"
 
-#define N_TX_RING       1
-#define N_RX_RING       8
-#define N_RX_PAGES      ((N_RX_RING * 0x0800 + PAGE_SIZE - 1) / PAGE_SIZE)
+static char mac_mace_string[] = "macmace";
+static struct platform_device *mac_mace_device;
+
+#define N_TX_BUFF_ORDER 0
+#define N_TX_RING       (1 << N_TX_BUFF_ORDER)
+#define N_RX_BUFF_ORDER 3
+#define N_RX_RING       (1 << N_RX_BUFF_ORDER)
+
 #define TX_TIMEOUT      HZ
 
-/* Bits in transmit DMA status */
-#define TX_DMA_ERR      0x80
+#define MACE_BUFF_SIZE  0x800
+
+/* Chip rev needs workaround on HW & multicast addr change */
+#define BROKEN_ADDRCHG_REV      0x0941
 
 /* The MACE is simply wired down on a Mac68K box */
 
@@ -47,40 +60,46 @@
 
 struct mace_data {
         volatile struct mace *mace;
-        volatile unsigned char *tx_ring;
-        volatile unsigned char *tx_ring_phys;
-        volatile unsigned char *rx_ring;
-        volatile unsigned char *rx_ring_phys;
+        unsigned char *tx_ring;
+        dma_addr_t tx_ring_phys;
+        unsigned char *rx_ring;
+        dma_addr_t rx_ring_phys;
         int dma_intr;
         struct net_device_stats stats;
         int rx_slot, rx_tail;
         int tx_slot, tx_sloti, tx_count;
+        int chipid;
+        struct device *device;
 };
 
 struct mace_frame {
-        u16     len;
-        u16     status;
-        u16     rntpc;
-        u16     rcvcc;
-        u32     pad1;
-        u32     pad2;
+        u8      rcvcnt;
+        u8      pad1;
+        u8      rcvsts;
+        u8      pad2;
+        u8      rntpc;
+        u8      pad3;
+        u8      rcvcc;
+        u8      pad4;
+        u32     pad5;
+        u32     pad6;
         u8      data[1];
         /* And frame continues.. */
 };
 
 #define PRIV_BYTES      sizeof(struct mace_data)
 
-extern void psc_debug_dump(void);
-
 static int mace_open(struct net_device *dev);
 static int mace_close(struct net_device *dev);
 static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
 static struct net_device_stats *mace_stats(struct net_device *dev);
 static void mace_set_multicast(struct net_device *dev);
 static int mace_set_address(struct net_device *dev, void *addr);
+static void mace_reset(struct net_device *dev);
 static irqreturn_t mace_interrupt(int irq, void *dev_id);
 static irqreturn_t mace_dma_intr(int irq, void *dev_id);
 static void mace_tx_timeout(struct net_device *dev);
+static void __mace_set_address(struct net_device *dev, void *addr);
 
 /*
  * Load a receive DMA channel with a base address and ring length
@@ -88,7 +107,7 @@ static void mace_tx_timeout(struct net_device *dev);
 
 static void mace_load_rxdma_base(struct net_device *dev, int set)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
 
         psc_write_word(PSC_ENETRD_CMD + set, 0x0100);
         psc_write_long(PSC_ENETRD_ADDR + set, (u32) mp->rx_ring_phys);
@@ -103,7 +122,7 @@ static void mace_load_rxdma_base(struct net_device *dev, int set)
 
 static void mace_rxdma_reset(struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mace = mp->mace;
         u8 maccc = mace->maccc;
 
@@ -130,7 +149,7 @@ static void mace_rxdma_reset(struct net_device *dev)
 
 static void mace_txdma_reset(struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mace = mp->mace;
         u8 maccc;
 
@@ -168,7 +187,7 @@ static void mace_dma_off(struct net_device *dev)
  * model of Macintrash has a MACE (AV macintoshes)
  */
 
-struct net_device *mace_probe(int unit)
+static int __devinit mace_probe(struct platform_device *pdev)
 {
         int j;
         struct mace_data *mp;
@@ -179,24 +198,28 @@ struct net_device *mace_probe(int unit)
         int err;
 
         if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
-                return ERR_PTR(-ENODEV);
+                return -ENODEV;
 
         found = 1;      /* prevent 'finding' one on every device probe */
 
         dev = alloc_etherdev(PRIV_BYTES);
         if (!dev)
-                return ERR_PTR(-ENOMEM);
+                return -ENOMEM;
 
-        if (unit >= 0)
-                sprintf(dev->name, "eth%d", unit);
+        mp = netdev_priv(dev);
+
+        mp->device = &pdev->dev;
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        SET_MODULE_OWNER(dev);
 
-        mp = (struct mace_data *) dev->priv;
         dev->base_addr = (u32)MACE_BASE;
         mp->mace = (volatile struct mace *) MACE_BASE;
 
         dev->irq = IRQ_MAC_MACE;
         mp->dma_intr = IRQ_MAC_MACE_DMA;
 
+        mp->chipid = mp->mace->chipid_hi << 8 | mp->mace->chipid_lo;
+
         /*
          * The PROM contains 8 bytes which total 0xFF when XOR'd
          * together. Due to the usual peculiar apple brain damage
@@ -217,7 +240,7 @@ struct net_device *mace_probe(int unit)
 
         if (checksum != 0xFF) {
                 free_netdev(dev);
-                return ERR_PTR(-ENODEV);
+                return -ENODEV;
         }
 
         memset(&mp->stats, 0, sizeof(mp->stats));
@@ -237,22 +260,98 @@ struct net_device *mace_probe(int unit)
 
         err = register_netdev(dev);
         if (!err)
-                return dev;
+                return 0;
 
         free_netdev(dev);
-        return ERR_PTR(err);
+        return err;
+}
+
+/*
+ * Reset the chip.
+ */
+
+static void mace_reset(struct net_device *dev)
+{
+        struct mace_data *mp = netdev_priv(dev);
+        volatile struct mace *mb = mp->mace;
+        int i;
+
+        /* soft-reset the chip */
+        i = 200;
+        while (--i) {
+                mb->biucc = SWRST;
+                if (mb->biucc & SWRST) {
+                        udelay(10);
+                        continue;
+                }
+                break;
+        }
+        if (!i) {
+                printk(KERN_ERR "macmace: cannot reset chip!\n");
+                return;
+        }
+
+        mb->maccc = 0;  /* turn off tx, rx */
+        mb->imr = 0xFF; /* disable all intrs for now */
+        i = mb->ir;
+
+        mb->biucc = XMTSP_64;
+        mb->utr = RTRD;
+        mb->fifocc = XMTFW_8 | RCVFW_64 | XMTFWU | RCVFWU;
+
+        mb->xmtfc = AUTO_PAD_XMIT; /* auto-pad short frames */
+        mb->rcvfc = 0;
+
+        /* load up the hardware address */
+        __mace_set_address(dev, dev->dev_addr);
+
+        /* clear the multicast filter */
+        if (mp->chipid == BROKEN_ADDRCHG_REV)
+                mb->iac = LOGADDR;
+        else {
+                mb->iac = ADDRCHG | LOGADDR;
+                while ((mb->iac & ADDRCHG) != 0)
+                        ;
+        }
+        for (i = 0; i < 8; ++i)
+                mb->ladrf = 0;
+
+        /* done changing address */
+        if (mp->chipid != BROKEN_ADDRCHG_REV)
+                mb->iac = 0;
+
+        mb->plscc = PORTSEL_AUI;
 }
 
 /*
  * Load the address on a mace controller.
  */
 
-static int mace_set_address(struct net_device *dev, void *addr)
+static void __mace_set_address(struct net_device *dev, void *addr)
 {
-        unsigned char *p = addr;
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
+        unsigned char *p = addr;
         int i;
+
+        /* load up the hardware address */
+        if (mp->chipid == BROKEN_ADDRCHG_REV)
+                mb->iac = PHYADDR;
+        else {
+                mb->iac = ADDRCHG | PHYADDR;
+                while ((mb->iac & ADDRCHG) != 0)
+                        ;
+        }
+        for (i = 0; i < 6; ++i)
+                mb->padr = dev->dev_addr[i] = p[i];
+        if (mp->chipid != BROKEN_ADDRCHG_REV)
+                mb->iac = 0;
+}
+
+static int mace_set_address(struct net_device *dev, void *addr)
+{
+        struct mace_data *mp = netdev_priv(dev);
+        volatile struct mace *mb = mp->mace;
         unsigned long flags;
         u8 maccc;
 
@@ -260,15 +359,10 @@ static int mace_set_address(struct net_device *dev, void *addr)
 
         maccc = mb->maccc;
 
-        /* load up the hardware address */
-        mb->iac = ADDRCHG | PHYADDR;
-        while ((mb->iac & ADDRCHG) != 0);
-
-        for (i = 0; i < 6; ++i) {
-                mb->padr = dev->dev_addr[i] = p[i];
-        }
+        __mace_set_address(dev, addr);
 
         mb->maccc = maccc;
+
         local_irq_restore(flags);
 
         return 0;
@@ -281,31 +375,11 @@ static int mace_set_address(struct net_device *dev, void *addr)
 
 static int mace_open(struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
-#if 0
-        int i;
 
-        i = 200;
-        while (--i) {
-                mb->biucc = SWRST;
-                if (mb->biucc & SWRST) {
-                        udelay(10);
-                        continue;
-                }
-                break;
-        }
-        if (!i) {
-                printk(KERN_ERR "%s: software reset failed!!\n", dev->name);
-                return -EAGAIN;
-        }
-#endif
-
-        mb->biucc = XMTSP_64;
-        mb->fifocc = XMTFW_16 | RCVFW_64 | XMTFWU | RCVFWU | XMTBRST | RCVBRST;
-        mb->xmtfc = AUTO_PAD_XMIT;
-        mb->plscc = PORTSEL_AUI;
-        /* mb->utr = RTRD; */
+        /* reset the chip */
+        mace_reset(dev);
 
         if (request_irq(dev->irq, mace_interrupt, 0, dev->name, dev)) {
                 printk(KERN_ERR "%s: can't get irq %d\n", dev->name, dev->irq);
@@ -319,25 +393,21 @@ static int mace_open(struct net_device *dev)
 
         /* Allocate the DMA ring buffers */
 
-        mp->rx_ring = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, N_RX_PAGES);
-        mp->tx_ring = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, 0);
-
-        if (mp->tx_ring==NULL || mp->rx_ring==NULL) {
-                if (mp->rx_ring) free_pages((u32) mp->rx_ring, N_RX_PAGES);
-                if (mp->tx_ring) free_pages((u32) mp->tx_ring, 0);
-                free_irq(dev->irq, dev);
-                free_irq(mp->dma_intr, dev);
-                printk(KERN_ERR "%s: unable to allocate DMA buffers\n", dev->name);
-                return -ENOMEM;
+        mp->tx_ring = dma_alloc_coherent(mp->device,
+                        N_TX_RING * MACE_BUFF_SIZE,
+                        &mp->tx_ring_phys, GFP_KERNEL);
+        if (mp->tx_ring == NULL) {
+                printk(KERN_ERR "%s: unable to allocate DMA tx buffers\n", dev->name);
+                goto out1;
         }
 
-        mp->rx_ring_phys = (unsigned char *) virt_to_bus((void *)mp->rx_ring);
-        mp->tx_ring_phys = (unsigned char *) virt_to_bus((void *)mp->tx_ring);
-
-        /* We want the Rx buffer to be uncached and the Tx buffer to be writethrough */
-
-        kernel_set_cachemode((void *)mp->rx_ring, N_RX_PAGES * PAGE_SIZE, IOMAP_NOCACHE_NONSER);
-        kernel_set_cachemode((void *)mp->tx_ring, PAGE_SIZE, IOMAP_WRITETHROUGH);
+        mp->rx_ring = dma_alloc_coherent(mp->device,
+                        N_RX_RING * MACE_BUFF_SIZE,
+                        &mp->rx_ring_phys, GFP_KERNEL);
+        if (mp->rx_ring == NULL) {
+                printk(KERN_ERR "%s: unable to allocate DMA rx buffers\n", dev->name);
+                goto out2;
+        }
 
         mace_dma_off(dev);
 
@@ -348,34 +418,22 @@ static int mace_open(struct net_device *dev)
         psc_write_word(PSC_ENETWR_CTL, 0x0400);
         psc_write_word(PSC_ENETRD_CTL, 0x0400);
 
-#if 0
-        /* load up the hardware address */
-
-        mb->iac = ADDRCHG | PHYADDR;
-
-        while ((mb->iac & ADDRCHG) != 0);
-
-        for (i = 0; i < 6; ++i)
-                mb->padr = dev->dev_addr[i];
-
-        /* clear the multicast filter */
-        mb->iac = ADDRCHG | LOGADDR;
-
-        while ((mb->iac & ADDRCHG) != 0);
-
-        for (i = 0; i < 8; ++i)
-                mb->ladrf = 0;
-
-        mb->plscc = PORTSEL_GPSI + ENPLSIO;
-
-        mb->maccc = ENXMT | ENRCV;
-        mb->imr = RCVINT;
-#endif
-
         mace_rxdma_reset(dev);
         mace_txdma_reset(dev);
 
+        /* turn it on! */
+        mb->maccc = ENXMT | ENRCV;
+        /* enable all interrupts except receive interrupts */
+        mb->imr = RCVINT;
         return 0;
+
+out2:
+        dma_free_coherent(mp->device, N_TX_RING * MACE_BUFF_SIZE,
+                          mp->tx_ring, mp->tx_ring_phys);
+out1:
+        free_irq(dev->irq, dev);
+        free_irq(mp->dma_intr, dev);
+        return -ENOMEM;
 }
 
 /*
@@ -384,19 +442,13 @@ static int mace_open(struct net_device *dev)
 
 static int mace_close(struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
 
         mb->maccc = 0;          /* disable rx and tx     */
         mb->imr = 0xFF;         /* disable all irqs      */
         mace_dma_off(dev);      /* disable rx and tx dma */
 
-        free_irq(dev->irq, dev);
-        free_irq(IRQ_MAC_MACE_DMA, dev);
-
-        free_pages((u32) mp->rx_ring, N_RX_PAGES);
-        free_pages((u32) mp->tx_ring, 0);
-
         return 0;
 }
 
@@ -406,15 +458,20 @@ static int mace_close(struct net_device *dev)
 
 static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
+        unsigned long flags;
 
-        /* Stop the queue if the buffer is full */
+        /* Stop the queue since there's only the one buffer */
 
+        local_irq_save(flags);
+        netif_stop_queue(dev);
         if (!mp->tx_count) {
-                netif_stop_queue(dev);
-                return 1;
+                printk(KERN_ERR "macmace: tx queue running but no free buffers.\n");
+                local_irq_restore(flags);
+                return NETDEV_TX_BUSY;
         }
         mp->tx_count--;
+        local_irq_restore(flags);
 
         mp->stats.tx_packets++;
         mp->stats.tx_bytes += skb->len;
@@ -432,23 +489,26 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
 
         dev_kfree_skb(skb);
 
-        return 0;
+        dev->trans_start = jiffies;
+        return NETDEV_TX_OK;
 }
 
 static struct net_device_stats *mace_stats(struct net_device *dev)
 {
-        struct mace_data *p = (struct mace_data *) dev->priv;
-        return &p->stats;
+        struct mace_data *mp = netdev_priv(dev);
+        return &mp->stats;
 }
 
 static void mace_set_multicast(struct net_device *dev)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
         int i, j;
         u32 crc;
         u8 maccc;
+        unsigned long flags;
 
+        local_irq_save(flags);
         maccc = mb->maccc;
         mb->maccc &= ~PROM;
 
@@ -473,116 +533,122 @@ static void mace_set_multicast(struct net_device *dev)
                         }
                 }
 
-                mb->iac = ADDRCHG | LOGADDR;
-                while (mb->iac & ADDRCHG);
-
-                for (i = 0; i < 8; ++i) {
-                        mb->ladrf = multicast_filter[i];
+                if (mp->chipid == BROKEN_ADDRCHG_REV)
+                        mb->iac = LOGADDR;
+                else {
+                        mb->iac = ADDRCHG | LOGADDR;
+                        while ((mb->iac & ADDRCHG) != 0)
+                                ;
                 }
+                for (i = 0; i < 8; ++i)
+                        mb->ladrf = multicast_filter[i];
+                if (mp->chipid != BROKEN_ADDRCHG_REV)
+                        mb->iac = 0;
         }
 
         mb->maccc = maccc;
+        local_irq_restore(flags);
 }
 
-/*
- * Miscellaneous interrupts are handled here. We may end up
- * having to bash the chip on the head for bad errors
- */
-
 static void mace_handle_misc_intrs(struct mace_data *mp, int intr)
 {
         volatile struct mace *mb = mp->mace;
         static int mace_babbles, mace_jabbers;
 
-        if (intr & MPCO) {
+        if (intr & MPCO)
                 mp->stats.rx_missed_errors += 256;
-        }
-        mp->stats.rx_missed_errors += mb->mpc;  /* reading clears it */
-
-        if (intr & RNTPCO) {
+        mp->stats.rx_missed_errors += mb->mpc;   /* reading clears it */
+        if (intr & RNTPCO)
                 mp->stats.rx_length_errors += 256;
-        }
-        mp->stats.rx_length_errors += mb->rntpc;        /* reading clears it */
-
-        if (intr & CERR) {
+        mp->stats.rx_length_errors += mb->rntpc; /* reading clears it */
+        if (intr & CERR)
                 ++mp->stats.tx_heartbeat_errors;
-        }
-        if (intr & BABBLE) {
-                if (mace_babbles++ < 4) {
-                        printk(KERN_DEBUG "mace: babbling transmitter\n");
-                }
-        }
-        if (intr & JABBER) {
-                if (mace_jabbers++ < 4) {
-                        printk(KERN_DEBUG "mace: jabbering transceiver\n");
-                }
-        }
+        if (intr & BABBLE)
+                if (mace_babbles++ < 4)
+                        printk(KERN_DEBUG "macmace: babbling transmitter\n");
+        if (intr & JABBER)
+                if (mace_jabbers++ < 4)
+                        printk(KERN_DEBUG "macmace: jabbering transceiver\n");
 }
 
-/*
- *      A transmit error has occurred. (We kick the transmit side from
- *      the DMA completion)
- */
-
-static void mace_xmit_error(struct net_device *dev)
+static irqreturn_t mace_interrupt(int irq, void *dev_id)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct net_device *dev = (struct net_device *) dev_id;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
-        u8 xmtfs, xmtrc;
+        int intr, fs;
+        unsigned int flags;
 
-        xmtfs = mb->xmtfs;
-        xmtrc = mb->xmtrc;
+        /* don't want the dma interrupt handler to fire */
+        local_irq_save(flags);
 
-        if (xmtfs & XMTSV) {
-                if (xmtfs & UFLO) {
-                        printk("%s: DMA underrun.\n", dev->name);
-                        mp->stats.tx_errors++;
-                        mp->stats.tx_fifo_errors++;
-                        mace_txdma_reset(dev);
+        intr = mb->ir; /* read interrupt register */
+        mace_handle_misc_intrs(mp, intr);
+
+        if (intr & XMTINT) {
+                fs = mb->xmtfs;
+                if ((fs & XMTSV) == 0) {
+                        printk(KERN_ERR "macmace: xmtfs not valid! (fs=%x)\n", fs);
+                        mace_reset(dev);
+                        /*
+                         * XXX mace likes to hang the machine after a xmtfs error.
+                         * This is hard to reproduce, reseting *may* help
+                         */
                 }
-                if (xmtfs & RTRY) {
-                        mp->stats.collisions++;
+                /* dma should have finished */
+                if (!mp->tx_count) {
+                        printk(KERN_DEBUG "macmace: tx ring ran out? (fs=%x)\n", fs);
+                }
+                /* Update stats */
+                if (fs & (UFLO|LCOL|LCAR|RTRY)) {
+                        ++mp->stats.tx_errors;
+                        if (fs & LCAR)
+                                ++mp->stats.tx_carrier_errors;
+                        else if (fs & (UFLO|LCOL|RTRY)) {
+                                ++mp->stats.tx_aborted_errors;
+                                if (mb->xmtfs & UFLO) {
+                                        printk(KERN_ERR "%s: DMA underrun.\n", dev->name);
+                                        mp->stats.tx_fifo_errors++;
+                                        mace_txdma_reset(dev);
+                                }
+                        }
                 }
         }
-}
 
-/*
- *      A receive interrupt occurred.
- */
+        if (mp->tx_count)
+                netif_wake_queue(dev);
 
-static void mace_recv_interrupt(struct net_device *dev)
-{
-/*      struct mace_data *mp = (struct mace_data *) dev->priv; */
-//      volatile struct mace *mb = mp->mace;
-}
+        local_irq_restore(flags);
 
-/*
- * Process the chip interrupt
- */
+        return IRQ_HANDLED;
+}
 
-static irqreturn_t mace_interrupt(int irq, void *dev_id)
+static void mace_tx_timeout(struct net_device *dev)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         volatile struct mace *mb = mp->mace;
-        u8 ir;
+        unsigned long flags;
 
-        ir = mb->ir;
-        mace_handle_misc_intrs(mp, ir);
+        local_irq_save(flags);
 
-        if (ir & XMTINT) {
-                mace_xmit_error(dev);
-        }
-        if (ir & RCVINT) {
-                mace_recv_interrupt(dev);
-        }
-        return IRQ_HANDLED;
-}
+        /* turn off both tx and rx and reset the chip */
+        mb->maccc = 0;
+        printk(KERN_ERR "macmace: transmit timeout - resetting\n");
+        mace_txdma_reset(dev);
+        mace_reset(dev);
 
-static void mace_tx_timeout(struct net_device *dev)
-{
-/*      struct mace_data *mp = (struct mace_data *) dev->priv; */
-//      volatile struct mace *mb = mp->mace;
+        /* restart rx dma */
+        mace_rxdma_reset(dev);
+
+        mp->tx_count = N_TX_RING;
+        netif_wake_queue(dev);
+
+        /* turn it on! */
+        mb->maccc = ENXMT | ENRCV;
+        /* enable all interrupts except receive interrupts */
+        mb->imr = RCVINT;
+
+        local_irq_restore(flags);
 }
 
 /*
@@ -591,40 +657,39 @@ static void mace_tx_timeout(struct net_device *dev)
 
 static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
 {
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         struct sk_buff *skb;
+        unsigned int frame_status = mf->rcvsts;
 
-        if (mf->status & RS_OFLO) {
-                printk("%s: fifo overflow.\n", dev->name);
-                mp->stats.rx_errors++;
-                mp->stats.rx_fifo_errors++;
-        }
-        if (mf->status&(RS_CLSN|RS_FRAMERR|RS_FCSERR))
+        if (frame_status & (RS_OFLO | RS_CLSN | RS_FRAMERR | RS_FCSERR)) {
                 mp->stats.rx_errors++;
+                if (frame_status & RS_OFLO) {
+                        printk(KERN_DEBUG "%s: fifo overflow.\n", dev->name);
+                        mp->stats.rx_fifo_errors++;
+                }
+                if (frame_status & RS_CLSN)
+                        mp->stats.collisions++;
+                if (frame_status & RS_FRAMERR)
+                        mp->stats.rx_frame_errors++;
+                if (frame_status & RS_FCSERR)
+                        mp->stats.rx_crc_errors++;
+        } else {
+                unsigned int frame_length = mf->rcvcnt + ((frame_status & 0x0F) << 8 );
 
-        if (mf->status&RS_CLSN) {
-                mp->stats.collisions++;
-        }
-        if (mf->status&RS_FRAMERR) {
-                mp->stats.rx_frame_errors++;
-        }
-        if (mf->status&RS_FCSERR) {
-                mp->stats.rx_crc_errors++;
-        }
-
-        skb = dev_alloc_skb(mf->len+2);
-        if (!skb) {
-                mp->stats.rx_dropped++;
-                return;
+                skb = dev_alloc_skb(frame_length + 2);
+                if (!skb) {
+                        mp->stats.rx_dropped++;
+                        return;
+                }
+                skb_reserve(skb, 2);
+                memcpy(skb_put(skb, frame_length), mf->data, frame_length);
+
+                skb->protocol = eth_type_trans(skb, dev);
+                netif_rx(skb);
+                dev->last_rx = jiffies;
+                mp->stats.rx_packets++;
+                mp->stats.rx_bytes += frame_length;
         }
-        skb_reserve(skb,2);
-        memcpy(skb_put(skb, mf->len), mf->data, mf->len);
-
-        skb->protocol = eth_type_trans(skb, dev);
-        netif_rx(skb);
-        dev->last_rx = jiffies;
-        mp->stats.rx_packets++;
-        mp->stats.rx_bytes += mf->len;
 }
 
 /*
@@ -634,7 +699,7 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
 static irqreturn_t mace_dma_intr(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *) dev_id;
-        struct mace_data *mp = (struct mace_data *) dev->priv;
+        struct mace_data *mp = netdev_priv(dev);
         int left, head;
         u16 status;
         u32 baka;
@@ -661,7 +726,8 @@ static irqreturn_t mace_dma_intr(int irq, void *dev_id)
                 /* Loop through the ring buffer and process new packages */
 
                 while (mp->rx_tail < head) {
-                        mace_dma_rx_frame(dev, (struct mace_frame *) (mp->rx_ring + (mp->rx_tail * 0x0800)));
+                        mace_dma_rx_frame(dev, (struct mace_frame*) (mp->rx_ring
+                                + (mp->rx_tail * MACE_BUFF_SIZE)));
                         mp->rx_tail++;
                 }
 
@@ -688,9 +754,76 @@ static irqreturn_t mace_dma_intr(int irq, void *dev_id)
                 psc_write_word(PSC_ENETWR_CMD + mp->tx_sloti, 0x0100);
                 mp->tx_sloti ^= 0x10;
                 mp->tx_count++;
-                netif_wake_queue(dev);
         }
         return IRQ_HANDLED;
 }
 
 MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Macintosh MACE ethernet driver");
+
+static int __devexit mac_mace_device_remove (struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct mace_data *mp = netdev_priv(dev);
+
+        unregister_netdev(dev);
+
+        free_irq(dev->irq, dev);
+        free_irq(IRQ_MAC_MACE_DMA, dev);
+
+        dma_free_coherent(mp->device, N_RX_RING * MACE_BUFF_SIZE,
+                          mp->rx_ring, mp->rx_ring_phys);
+        dma_free_coherent(mp->device, N_TX_RING * MACE_BUFF_SIZE,
+                          mp->tx_ring, mp->tx_ring_phys);
+
+        free_netdev(dev);
+
+        return 0;
+}
+
+static struct platform_driver mac_mace_driver = {
+        .probe  = mace_probe,
+        .remove = __devexit_p(mac_mace_device_remove),
+        .driver = {
+                .name = mac_mace_string,
+        },
+};
+
+static int __init mac_mace_init_module(void)
+{
+        int err;
+
+        if ((err = platform_driver_register(&mac_mace_driver))) {
+                printk(KERN_ERR "Driver registration failed\n");
+                return err;
+        }
+
+        mac_mace_device = platform_device_alloc(mac_mace_string, 0);
+        if (!mac_mace_device)
+                goto out_unregister;
+
+        if (platform_device_add(mac_mace_device)) {
+                platform_device_put(mac_mace_device);
+                mac_mace_device = NULL;
+        }
+
+        return 0;
+
+out_unregister:
+        platform_driver_unregister(&mac_mace_driver);
+
+        return -ENOMEM;
+}
+
+static void __exit mac_mace_cleanup_module(void)
+{
+        platform_driver_unregister(&mac_mace_driver);
+
+        if (mac_mace_device) {
+                platform_device_unregister(mac_mace_device);
+                mac_mace_device = NULL;
+        }
+}
+
+module_init(mac_mace_init_module);
+module_exit(mac_mace_cleanup_module);
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 8ca57a0a4c11..e9ecdbf352ae 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -130,6 +130,46 @@ static inline void bit_reverse_addr(unsigned char addr[6])
                 addr[i] = bitrev8(addr[i]);
 }
 
+static irqreturn_t macsonic_interrupt(int irq, void *dev_id)
+{
+        irqreturn_t result;
+        unsigned long flags;
+
+        local_irq_save(flags);
+        result = sonic_interrupt(irq, dev_id);
+        local_irq_restore(flags);
+        return result;
+}
+
+static int macsonic_open(struct net_device* dev)
+{
+        if (request_irq(dev->irq, &sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
+                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
+                return -EAGAIN;
+        }
+        /* Under the A/UX interrupt scheme, the onboard SONIC interrupt comes
+         * in at priority level 3. However, we sometimes get the level 2 inter-
+         * rupt as well, which must prevent re-entrance of the sonic handler.
+         */
+        if (dev->irq == IRQ_AUTO_3)
+                if (request_irq(IRQ_NUBUS_9, &macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
+                        printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);
+                        free_irq(dev->irq, dev);
+                        return -EAGAIN;
+                }
+        return sonic_open(dev);
+}
+
+static int macsonic_close(struct net_device* dev)
+{
+        int err;
+        err = sonic_close(dev);
+        free_irq(dev->irq, dev);
+        if (dev->irq == IRQ_AUTO_3)
+                free_irq(IRQ_NUBUS_9, dev);
+        return err;
+}
+
 int __init macsonic_init(struct net_device* dev)
 {
         struct sonic_local* lp = netdev_priv(dev);
@@ -160,8 +200,8 @@ int __init macsonic_init(struct net_device* dev)
         lp->rra_laddr = lp->rda_laddr + (SIZEOF_SONIC_RD * SONIC_NUM_RDS
                              * SONIC_BUS_SCALE(lp->dma_bitmode));
 
-        dev->open = sonic_open;
-        dev->stop = sonic_close;
+        dev->open = macsonic_open;
+        dev->stop = macsonic_close;
         dev->hard_start_xmit = sonic_send_packet;
         dev->get_stats = sonic_get_stats;
         dev->set_multicast_list = &sonic_multicast_list;
@@ -402,7 +442,7 @@ int __init macsonic_ident(struct nubus_dev* ndev)
             ndev->dr_sw == NUBUS_DRSW_DAYNA)
                 return MACSONIC_DAYNA;
 
-        if (ndev->dr_hw == NUBUS_DRHW_SONIC_LC &&
+        if (ndev->dr_hw == NUBUS_DRHW_APPLE_SONIC_LC &&
             ndev->dr_sw == 0) { /* huh? */
                 return MACSONIC_APPLE16;
         }
@@ -522,7 +562,7 @@ int __init mac_nubus_sonic_probe(struct net_device* dev)
         return macsonic_init(dev);
 }
 
-static int __init mac_sonic_probe(struct platform_device *device)
+static int __init mac_sonic_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
         struct sonic_local *lp;
@@ -534,8 +574,8 @@ static int __init mac_sonic_probe(struct platform_device *device)
                 return -ENOMEM;
 
         lp = netdev_priv(dev);
-        lp->device = &device->dev;
-        SET_NETDEV_DEV(dev, &device->dev);
+        lp->device = &pdev->dev;
+        SET_NETDEV_DEV(dev, &pdev->dev);
         SET_MODULE_OWNER(dev);
 
         /* This will catch fatal stuff like -ENOMEM as well as success */
@@ -572,19 +612,17 @@ MODULE_DESCRIPTION("Macintosh SONIC ethernet driver");
 module_param(sonic_debug, int, 0);
 MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
 
-#define SONIC_IRQ_FLAG IRQ_FLG_FAST
-
 #include "sonic.c"
 
-static int __devexit mac_sonic_device_remove (struct platform_device *device)
+static int __devexit mac_sonic_device_remove (struct platform_device *pdev)
 {
-        struct net_device *dev = platform_get_drvdata(device);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sonic_local* lp = netdev_priv(dev);
 
-        unregister_netdev (dev);
+        unregister_netdev(dev);
         dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                           lp->descriptors, lp->descriptors_laddr);
-        free_netdev (dev);
+        free_netdev(dev);
 
         return 0;
 }
@@ -607,9 +645,8 @@ static int __init mac_sonic_init_module(void)
         }
 
         mac_sonic_device = platform_device_alloc(mac_sonic_string, 0);
-        if (!mac_sonic_device) {
+        if (!mac_sonic_device)
                 goto out_unregister;
-        }
 
         if (platform_device_add(mac_sonic_device)) {
                 platform_device_put(mac_sonic_device);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index d2767e6584a9..7053026d6c76 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -55,6 +55,53 @@
 #define SMC_insw(a, r, p, l)    readsw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   writesw((a) + (r), p, l)
 
+#elif defined(CONFIG_BFIN)
+
+#define SMC_IRQ_FLAGS           IRQF_TRIGGER_HIGH
+
+# if defined (CONFIG_BFIN561_EZKIT)
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       1
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+#define SMC_USE_BFIN_DMA        0
+
+
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_inl(a, r)           readl((a) + (r))
+#define SMC_outl(v, a, r)       writel(v, (a) + (r))
+#define SMC_outsl(a, r, p, l)   outsl((unsigned long *)((a) + (r)), p, l)
+#define SMC_insl(a, r, p, l)    insl ((unsigned long *)((a) + (r)), p, l)
+# else
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       0
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+#define SMC_USE_BFIN_DMA        0
+
+
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_outsw(a, r, p, l)   outsw((unsigned long *)((a) + (r)), p, l)
+#define SMC_insw(a, r, p, l)    insw ((unsigned long *)((a) + (r)), p, l)
+# endif
+/* check if the mac in reg is valid */
+#define SMC_GET_MAC_ADDR(addr)                                  \
+        do {                                                    \
+                unsigned int __v;                               \
+                __v = SMC_inw(ioaddr, ADDR0_REG);               \
+                addr[0] = __v; addr[1] = __v >> 8;              \
+                __v = SMC_inw(ioaddr, ADDR1_REG);               \
+                addr[2] = __v; addr[3] = __v >> 8;              \
+                __v = SMC_inw(ioaddr, ADDR2_REG);               \
+                addr[4] = __v; addr[5] = __v >> 8;              \
+                if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {         \
+                        random_ether_addr(addr);                \
+                }                                               \
+        } while (0)
 #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6)
 
 /* We can only do 16-bit reads and writes in the static memory space. */
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index c6320c719931..8069f3e32d83 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -50,29 +50,6 @@ static int sonic_open(struct net_device *dev)
         if (sonic_debug > 2)
                 printk("sonic_open: initializing sonic driver.\n");
 
-        /*
-         * We don't need to deal with auto-irq stuff since we
-         * hardwire the sonic interrupt.
-         */
-/*
- * XXX Horrible work around:  We install sonic_interrupt as fast interrupt.
- * This means that during execution of the handler interrupt are disabled
- * covering another bug otherwise corrupting data.  This doesn't mean
- * this glue works ok under all situations.
- *
- * Note (dhd): this also appears to prevent lockups on the Macintrash
- * when more than one Ethernet card is installed (knock on wood)
- *
- * Note (fthain): whether the above is still true is anyones guess. Certainly
- * the buffer handling algorithms will not tolerate re-entrance without some
- * mutual exclusion added. Anyway, the memcpy has now been eliminated from the
- * rx code to make this a faster "fast interrupt".
- */
-        if (request_irq(dev->irq, &sonic_interrupt, SONIC_IRQ_FLAG, "sonic", dev)) {
-                printk(KERN_ERR "\n%s: unable to get IRQ %d .\n", dev->name, dev->irq);
-                return -EAGAIN;
-        }
-
         for (i = 0; i < SONIC_NUM_RRS; i++) {
                 struct sk_buff *skb = dev_alloc_skb(SONIC_RBSIZE + 2);
                 if (skb == NULL) {
@@ -169,8 +146,6 @@ static int sonic_close(struct net_device *dev)
                 }
         }
 
-        free_irq(dev->irq, dev);        /* release the IRQ */
-
         return 0;
 }
 
@@ -178,8 +153,13 @@ static void sonic_tx_timeout(struct net_device *dev)
 {
         struct sonic_local *lp = netdev_priv(dev);
         int i;
-        /* Stop the interrupts for this */
+        /*
+         * put the Sonic into software-reset mode and
+         * disable all interrupts before releasing DMA buffers
+         */
         SONIC_WRITE(SONIC_IMR, 0);
+        SONIC_WRITE(SONIC_ISR, 0x7fff);
+        SONIC_WRITE(SONIC_CMD, SONIC_CR_RST);
         /* We could resend the original skbs. Easier to re-initialise. */
         for (i = 0; i < SONIC_NUM_TDS; i++) {
                 if(lp->tx_laddr[i]) {
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index 396c3d961f88..a123ea87893b 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -1023,10 +1023,11 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
         {
                 len = skb->len;
                 if (len < ETH_ZLEN) {
-                        memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
+                        memset((void *)p->xmit_cbuffs[p->xmit_count], 0,
+                               ETH_ZLEN);
                         len = ETH_ZLEN;
                 }
-                skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len);
+                skb_copy_from_linear_data(skb, (void *)p->xmit_cbuffs[p->xmit_count], skb->len);
 
 #if (NUM_XMIT_BUFFS == 1)
 #       ifdef NO_NOPCOMMANDS
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 9488f49ea569..e5e901ecd808 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.75"
-#define DRV_MODULE_RELDATE      "March 23, 2007"
+#define DRV_MODULE_VERSION      "3.76"
+#define DRV_MODULE_RELDATE      "May 5, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -1300,9 +1300,11 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                         msleep(1);
                 }
         }
-        tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE |
-                                             WOL_DRV_STATE_SHUTDOWN |
-                                             WOL_DRV_WOL | WOL_SET_MAGIC_PKT);
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+                tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE |
+                                                     WOL_DRV_STATE_SHUTDOWN |
+                                                     WOL_DRV_WOL |
+                                                     WOL_SET_MAGIC_PKT);
 
         pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps);
 
@@ -2593,10 +2595,8 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 {
         int current_link_up = 0;
 
-        if (!(mac_status & MAC_STATUS_PCS_SYNCED)) {
-                tp->tg3_flags &= ~TG3_FLAG_GOT_SERDES_FLOWCTL;
+        if (!(mac_status & MAC_STATUS_PCS_SYNCED))
                 goto out;
-        }
 
         if (tp->link_config.autoneg == AUTONEG_ENABLE) {
                 u32 flags;
@@ -2614,7 +2614,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
 
                         tg3_setup_flow_control(tp, local_adv, remote_adv);
 
-                        tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
                         current_link_up = 1;
                 }
                 for (i = 0; i < 30; i++) {
@@ -2637,7 +2636,6 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
         } else {
                 /* Forcing 1000FD link up. */
                 current_link_up = 1;
-                tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
 
                 tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS));
                 udelay(40);
@@ -3021,6 +3019,16 @@ static int tg3_setup_phy(struct tg3 *tp, int force_reset)
                 }
         }
 
+        if (tp->tg3_flags & TG3_FLAG_ASPM_WORKAROUND) {
+                u32 val = tr32(PCIE_PWR_MGMT_THRESH);
+                if (!netif_carrier_ok(tp->dev))
+                        val = (val & ~PCIE_PWR_MGMT_L1_THRESH_MSK) |
+                              tp->pwrmgmt_thresh;
+                else
+                        val |= PCIE_PWR_MGMT_L1_THRESH_MSK;
+                tw32(PCIE_PWR_MGMT_THRESH, val);
+        }
+
         return err;
 }
 
@@ -3582,8 +3590,12 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id)
          * Writing non-zero to intr-mbox-0 additional tells the
          * NIC to stop sending us irqs, engaging "in-intr-handler"
          * event coalescing.
+         *
+         * Flush the mailbox to de-assert the IRQ immediately to prevent
+         * spurious interrupts.  The flush impacts performance but
+         * excessive spurious interrupts can be worse in some cases.
          */
-        tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
+        tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
         if (tg3_irq_sync(tp))
                 goto out;
         sblk->status &= ~SD_STATUS_UPDATED;
@@ -3627,8 +3639,12 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id)
          * writing non-zero to intr-mbox-0 additional tells the
          * NIC to stop sending us irqs, engaging "in-intr-handler"
          * event coalescing.
+         *
+         * Flush the mailbox to de-assert the IRQ immediately to prevent
+         * spurious interrupts.  The flush impacts performance but
+         * excessive spurious interrupts can be worse in some cases.
          */
-        tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
+        tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
         if (tg3_irq_sync(tp))
                 goto out;
         if (netif_rx_schedule_prep(dev)) {
@@ -3895,8 +3911,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         entry = tp->tx_prod;
         base_flags = 0;
         mss = 0;
-        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->gso_size) != 0) {
+        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
                 int tcp_opt_len, ip_tcp_len;
 
                 if (skb_header_cloned(skb) &&
@@ -4053,8 +4068,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
         mss = 0;
-        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->gso_size) != 0) {
+        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
                 struct iphdr *iph;
                 int tcp_opt_len, ip_tcp_len, hdr_len;
 
@@ -5934,7 +5948,7 @@ static int tg3_load_tso_firmware(struct tg3 *tp)
 
 
 /* tp->lock is held. */
-static void __tg3_set_mac_addr(struct tg3 *tp)
+static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
 {
         u32 addr_high, addr_low;
         int i;
@@ -5946,6 +5960,8 @@ static void __tg3_set_mac_addr(struct tg3 *tp)
                     (tp->dev->dev_addr[4] <<  8) |
                     (tp->dev->dev_addr[5] <<  0));
         for (i = 0; i < 4; i++) {
+                if (i == 1 && skip_mac_1)
+                        continue;
                 tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
                 tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
         }
@@ -5972,7 +5988,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
 {
         struct tg3 *tp = netdev_priv(dev);
         struct sockaddr *addr = p;
-        int err = 0;
+        int err = 0, skip_mac_1 = 0;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EINVAL;
@@ -5983,22 +5999,21 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
                 return 0;
 
         if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-                /* Reset chip so that ASF can re-init any MAC addresses it
-                 * needs.
-                 */
-                tg3_netif_stop(tp);
-                tg3_full_lock(tp, 1);
+                u32 addr0_high, addr0_low, addr1_high, addr1_low;
 
-                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-                err = tg3_restart_hw(tp, 0);
-                if (!err)
-                        tg3_netif_start(tp);
-                tg3_full_unlock(tp);
-        } else {
-                spin_lock_bh(&tp->lock);
-                __tg3_set_mac_addr(tp);
-                spin_unlock_bh(&tp->lock);
+                addr0_high = tr32(MAC_ADDR_0_HIGH);
+                addr0_low = tr32(MAC_ADDR_0_LOW);
+                addr1_high = tr32(MAC_ADDR_1_HIGH);
+                addr1_low = tr32(MAC_ADDR_1_LOW);
+
+                /* Skip MAC addr 1 if ASF is using it. */
+                if ((addr0_high != addr1_high || addr0_low != addr1_low) &&
+                    !(addr1_high == 0 && addr1_low == 0))
+                        skip_mac_1 = 1;
         }
+        spin_lock_bh(&tp->lock);
+        __tg3_set_mac_addr(tp, skip_mac_1);
+        spin_unlock_bh(&tp->lock);
 
         return err;
 }
@@ -6315,7 +6330,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                      tp->rx_jumbo_ptr);
 
         /* Initialize MAC address and backoff seed. */
-        __tg3_set_mac_addr(tp);
+        __tg3_set_mac_addr(tp, 0);
 
         /* MTU + ethernet header + FCS + optional VLAN tag */
         tw32(MAC_RX_MTU_SIZE, tp->dev->mtu + ETH_HLEN + 8);
@@ -6346,8 +6361,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
                 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
-                    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
-                     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
                         rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
                 } else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
                            !(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
@@ -6457,6 +6471,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
                         gpio_mask |= GRC_LCLCTRL_GPIO_UART_SEL;
 
+                tp->grc_local_ctrl &= ~gpio_mask;
                 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
 
                 /* GPIO1 must be driven high for eeprom write protect */
@@ -7036,11 +7051,7 @@ static int tg3_open(struct net_device *dev)
         if (err)
                 return err;
 
-        if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
-            (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_AX) &&
-            (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX) &&
-            !((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) &&
-              (tp->pdev_peer == tp->pdev))) {
+        if (tp->tg3_flags & TG3_FLAG_SUPPORT_MSI) {
                 /* All MSI supporting chips should support tagged
                  * status.  Assert that this is the case.
                  */
@@ -7399,9 +7410,7 @@ static int tg3_close(struct net_device *dev)
 
         tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         tg3_free_rings(tp);
-        tp->tg3_flags &=
-                ~(TG3_FLAG_INIT_COMPLETE |
-                  TG3_FLAG_GOT_SERDES_FLOWCTL);
+        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
 
         tg3_full_unlock(tp);
 
@@ -8036,7 +8045,10 @@ static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct tg3 *tp = netdev_priv(dev);
 
-        wol->supported = WAKE_MAGIC;
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+                wol->supported = WAKE_MAGIC;
+        else
+                wol->supported = 0;
         wol->wolopts = 0;
         if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)
                 wol->wolopts = WAKE_MAGIC;
@@ -8050,8 +8062,7 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EINVAL;
         if ((wol->wolopts & WAKE_MAGIC) &&
-            tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
-            !(tp->tg3_flags & TG3_FLAG_SERDES_WOL_CAP))
+            !(tp->tg3_flags & TG3_FLAG_WOL_CAP))
                 return -EINVAL;
 
         spin_lock_bh(&tp->lock);
@@ -9289,7 +9300,7 @@ static void __devinit tg3_get_nvram_size(struct tg3 *tp)
                         return;
                 }
         }
-        tp->nvram_size = 0x20000;
+        tp->nvram_size = 0x80000;
 }
 
 static void __devinit tg3_get_nvram_info(struct tg3 *tp)
@@ -9408,33 +9419,31 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)
 
 static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
 {
-        u32 nvcfg1;
+        u32 nvcfg1, protect = 0;
 
         nvcfg1 = tr32(NVRAM_CFG1);
 
         /* NVRAM protection for TPM */
-        if (nvcfg1 & (1 << 27))
+        if (nvcfg1 & (1 << 27)) {
                 tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;
+                protect = 1;
+        }
 
-        switch (nvcfg1 & NVRAM_CFG1_5752VENDOR_MASK) {
-                case FLASH_5755VENDOR_ATMEL_EEPROM_64KHZ:
-                case FLASH_5755VENDOR_ATMEL_EEPROM_376KHZ:
-                        tp->nvram_jedecnum = JEDEC_ATMEL;
-                        tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
-                        tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE;
-
-                        nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
-                        tw32(NVRAM_CFG1, nvcfg1);
-                        break;
-                case FLASH_5752VENDOR_ATMEL_FLASH_BUFFERED:
+        nvcfg1 &= NVRAM_CFG1_5752VENDOR_MASK;
+        switch (nvcfg1) {
                 case FLASH_5755VENDOR_ATMEL_FLASH_1:
                 case FLASH_5755VENDOR_ATMEL_FLASH_2:
                 case FLASH_5755VENDOR_ATMEL_FLASH_3:
-                case FLASH_5755VENDOR_ATMEL_FLASH_4:
                         tp->nvram_jedecnum = JEDEC_ATMEL;
                         tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
                         tp->tg3_flags2 |= TG3_FLG2_FLASH;
                         tp->nvram_pagesize = 264;
+                        if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1)
+                                tp->nvram_size = (protect ? 0x3e200 : 0x80000);
+                        else if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_2)
+                                tp->nvram_size = (protect ? 0x1f200 : 0x40000);
+                        else
+                                tp->nvram_size = (protect ? 0x1f200 : 0x20000);
                         break;
                 case FLASH_5752VENDOR_ST_M45PE10:
                 case FLASH_5752VENDOR_ST_M45PE20:
@@ -9443,6 +9452,12 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
                         tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
                         tp->tg3_flags2 |= TG3_FLG2_FLASH;
                         tp->nvram_pagesize = 256;
+                        if (nvcfg1 == FLASH_5752VENDOR_ST_M45PE10)
+                                tp->nvram_size = (protect ? 0x10000 : 0x20000);
+                        else if (nvcfg1 == FLASH_5752VENDOR_ST_M45PE20)
+                                tp->nvram_size = (protect ? 0x10000 : 0x40000);
+                        else
+                                tp->nvram_size = (protect ? 0x20000 : 0x80000);
                         break;
         }
 }
@@ -9518,6 +9533,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 }
                 tg3_enable_nvram_access(tp);
 
+                tp->nvram_size = 0;
+
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
                         tg3_get_5752_nvram_info(tp);
                 else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
@@ -9529,7 +9546,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 else
                         tg3_get_nvram_info(tp);
 
-                tg3_get_nvram_size(tp);
+                if (tp->nvram_size == 0)
+                        tg3_get_nvram_size(tp);
 
                 tg3_disable_nvram_access(tp);
                 tg3_nvram_unlock(tp);
@@ -9996,14 +10014,16 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->phy_id = PHY_ID_INVALID;
         tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
-        /* Assume an onboard device by default.  */
-        tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
+        /* Assume an onboard device and WOL capable by default.  */
+        tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT | TG3_FLAG_WOL_CAP;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
                 if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM)) {
                         tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
                         tp->tg3_flags2 |= TG3_FLG2_IS_NIC;
                 }
+                if (tr32(VCPU_CFGSHDW) & VCPU_CFGSHDW_ASPM_DBNC)
+                        tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;
                 return;
         }
 
@@ -10120,8 +10140,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
                                 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
                 }
-                if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
-                        tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
+                if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
+                    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
+                        tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
 
                 if (cfg2 & (1 << 17))
                         tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
@@ -10130,6 +10151,14 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                 /* bootcode if bit 18 is set */
                 if (cfg2 & (1 << 18))
                         tp->tg3_flags2 |= TG3_FLG2_SERDES_PREEMPHASIS;
+
+                if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
+                        u32 cfg3;
+
+                        tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3);
+                        if (cfg3 & NIC_SRAM_ASPM_DEBOUNCE)
+                                tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;
+                }
         }
 }
 
@@ -10399,6 +10428,8 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
         }
 }
 
+static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
+
 static int __devinit tg3_get_invariants(struct tg3 *tp)
 {
         static struct pci_device_id write_reorder_chipsets[] = {
@@ -10554,6 +10585,10 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         tp->pci_hdr_type     = (cacheline_sz_reg >> 16) & 0xff;
         tp->pci_bist         = (cacheline_sz_reg >> 24) & 0xff;
 
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714))
+                tp->pdev_peer = tg3_find_peer(tp);
+
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
@@ -10567,6 +10602,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags2 |= TG3_FLG2_5705_PLUS;
 
         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
+                tp->tg3_flags |= TG3_FLAG_SUPPORT_MSI;
+                if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX ||
+                    GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX ||
+                    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 &&
+                     tp->pci_chip_rev_id <= CHIPREV_ID_5714_A2 &&
+                     tp->pdev_peer == tp->pdev))
+                        tp->tg3_flags &= ~TG3_FLAG_SUPPORT_MSI;
+
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
@@ -10668,17 +10711,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX)
                 tp->tg3_flags |= TG3_FLAG_TXD_MBOX_HWBUG;
 
-        /* Back to back register writes can cause problems on this chip,
-         * the workaround is to read back all reg writes except those to
-         * mailbox regs.  See tg3_write_indirect_reg32().
-         *
-         * PCI Express 5750_A0 rev chips need this workaround too.
-         */
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
-            ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
-             tp->pci_chip_rev_id == CHIPREV_ID_5750_A0))
-                tp->tg3_flags |= TG3_FLAG_5701_REG_WRITE_BUG;
-
         if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
                 tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
         if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
@@ -10702,8 +10734,19 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         /* Various workaround register access methods */
         if (tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG)
                 tp->write32 = tg3_write_indirect_reg32;
-        else if (tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG)
+        else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
+                 ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
+                  tp->pci_chip_rev_id == CHIPREV_ID_5750_A0)) {
+                /*
+                 * Back to back register writes can cause problems on these
+                 * chips, the workaround is to read back all reg writes
+                 * except those to mailbox regs.
+                 *
+                 * See tg3_write_indirect_reg32().
+                 */
                 tp->write32 = tg3_write_flush_reg32;
+        }
+
 
         if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
             (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
@@ -10983,6 +11026,10 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
          */
         tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;
 
+        if (tp->tg3_flags & TG3_FLAG_ASPM_WORKAROUND)
+                tp->pwrmgmt_thresh = tr32(PCIE_PWR_MGMT_THRESH) &
+                                     PCIE_PWR_MGMT_L1_THRESH_MSK;
+
         return err;
 }
 
@@ -11892,10 +11939,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 tp->rx_pending = 63;
         }
 
-        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714))
-                tp->pdev_peer = tg3_find_peer(tp);
-
         err = tg3_get_device_address(tp);
         if (err) {
                 printk(KERN_ERR PFX "Could not obtain valid ethernet address, "
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d515ed23841b..4d334cf5a243 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -131,6 +131,7 @@
 #define  CHIPREV_ID_5752_A0_HW           0x5000
 #define  CHIPREV_ID_5752_A0              0x6000
 #define  CHIPREV_ID_5752_A1              0x6001
+#define  CHIPREV_ID_5714_A2              0x9002
 #define  CHIPREV_ID_5906_A1              0xc001
 #define  GET_ASIC_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700                  0x07
@@ -1149,6 +1150,9 @@
 #define  VCPU_STATUS_INIT_DONE           0x04000000
 #define  VCPU_STATUS_DRV_RESET           0x08000000
 
+#define VCPU_CFGSHDW                    0x00005104
+#define  VCPU_CFGSHDW_ASPM_DBNC          0x00001000
+
 /* Mailboxes */
 #define GRCMBOX_BASE                    0x00005600
 #define GRCMBOX_INTERRUPT_0             0x00005800 /* 64-bit */
@@ -1506,6 +1510,8 @@
 #define PCIE_TRANS_CFG_1SHOT_MSI         0x20000000
 #define PCIE_TRANS_CFG_LOM               0x00000020
 
+#define PCIE_PWR_MGMT_THRESH            0x00007d28
+#define PCIE_PWR_MGMT_L1_THRESH_MSK      0x0000ff00
 
 #define TG3_EEPROM_MAGIC                0x669955aa
 #define TG3_EEPROM_MAGIC_FW             0xa5000000
@@ -1592,6 +1598,9 @@
 #define  SHASTA_EXT_LED_MAC              0x00010000
 #define  SHASTA_EXT_LED_COMBO            0x00018000
 
+#define NIC_SRAM_DATA_CFG_3             0x00000d3c
+#define  NIC_SRAM_ASPM_DEBOUNCE          0x00000002
+
 #define NIC_SRAM_RX_MINI_BUFFER_DESC    0x00001000
 
 #define NIC_SRAM_DMA_DESC_POOL_BASE     0x00002000
@@ -2199,7 +2208,7 @@ struct tg3 {
 #define TG3_FLAG_USE_LINKCHG_REG        0x00000008
 #define TG3_FLAG_USE_MI_INTERRUPT       0x00000010
 #define TG3_FLAG_ENABLE_ASF             0x00000020
-#define TG3_FLAG_5701_REG_WRITE_BUG     0x00000040
+#define TG3_FLAG_ASPM_WORKAROUND        0x00000040
 #define TG3_FLAG_POLL_SERDES            0x00000080
 #define TG3_FLAG_MBOX_WRITE_REORDER     0x00000100
 #define TG3_FLAG_PCIX_TARGET_HWBUG      0x00000200
@@ -2215,14 +2224,14 @@ struct tg3 {
 #define TG3_FLAG_PCI_32BIT              0x00080000
 #define TG3_FLAG_SRAM_USE_CONFIG        0x00100000
 #define TG3_FLAG_TX_RECOVERY_PENDING    0x00200000
-#define TG3_FLAG_SERDES_WOL_CAP         0x00400000
+#define TG3_FLAG_WOL_CAP                0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000
 #define TG3_FLAG_PAUSE_AUTONEG          0x02000000
 #define TG3_FLAG_IN_RESET_TASK          0x04000000
 #define TG3_FLAG_40BIT_DMA_BUG          0x08000000
 #define TG3_FLAG_BROKEN_CHECKSUMS       0x10000000
-#define TG3_FLAG_GOT_SERDES_FLOWCTL     0x20000000
+#define TG3_FLAG_SUPPORT_MSI            0x20000000
 #define TG3_FLAG_CHIP_RESETTING         0x40000000
 #define TG3_FLAG_INIT_COMPLETE          0x80000000
         u32                             tg3_flags2;
@@ -2288,6 +2297,7 @@ struct tg3 {
         u32                             grc_local_ctrl;
         u32                             dma_rwctrl;
         u32                             coalesce_mode;
+        u32                             pwrmgmt_thresh;
 
         /* PCI block */
         u16                             pci_chip_rev_id;
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index ed274d6909d0..f8f4d74f01f1 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -23,7 +23,6 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
 #include <linux/mca.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 9bbea5c8acf4..58d7e5d452fa 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -41,7 +41,6 @@
 #include <linux/time.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/mca-legacy.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 942b839ccc5b..6c400ccd38b4 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -14,7 +14,6 @@
 
 */
 
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include "tulip.h"
 
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index 85a521e0d052..be82a2effee3 100644
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -15,7 +15,6 @@
 */
 
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/jiffies.h>
 #include "tulip.h"
 
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index c31be0e377a8..4e4a879c3fa5 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -76,7 +76,6 @@
 
 
 
-#include <linux/pci.h>
 #include "tulip.h"
 #include <linux/delay.h>
 
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index df326fe1cc8f..d2c1f42109b0 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -14,7 +14,6 @@
 
 */
 
-#include <linux/pci.h>
 #include "tulip.h"
 
 
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index c840d2e67b23..16f26a8364f0 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -22,6 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index ae01555d24cf..574737b55f39 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -8,7 +8,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 74876c0073e8..31e1799571ad 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -27,7 +27,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 07dbdfbfc15d..e24a7b095dd6 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -38,7 +38,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c4b3dc291a5a..0184614517f9 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -153,8 +153,8 @@ config IPW2100
  
           If you want to compile the driver 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>.  The module
-          will be called ipw2100.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2100.ko.
         
 config IPW2100_MONITOR
         bool "Enable promiscuous mode"
@@ -208,8 +208,8 @@ config IPW2200
  
           If you want to compile the driver 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>.  The module
-          will be called ipw2200.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2200.ko.
 
 config IPW2200_MONITOR
         bool "Enable promiscuous mode"
@@ -517,8 +517,8 @@ config PRISM54
           
           If you want to compile the driver 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>.  The module
-          will be called prism54.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called prism54.ko.
 
 config USB_ZD1201
         tristate "USB ZD1201 based Wireless device support"
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 2a299a0676a6..ef32a5c1e818 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1971,8 +1971,7 @@ static struct net_device *get_strip_dev(struct strip *strip_info)
                       sizeof(zero_address))) {
                 struct net_device *dev;
                 read_lock_bh(&dev_base_lock);
-                dev = dev_base;
-                while (dev) {
+                for_each_netdev(dev) {
                         if (dev->type == strip_info->dev->type &&
                             !memcmp(dev->dev_addr,
                                     &strip_info->true_dev_addr,
@@ -1983,7 +1982,6 @@ static struct net_device *get_strip_dev(struct strip *strip_info)
                                 read_unlock_bh(&dev_base_lock);
                                 return (dev);
                         }
-                        dev = dev->next;
                 }
                 read_unlock_bh(&dev_base_lock);
         }
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 9bb4db552f3c..a68b3b3761a2 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -22,8 +22,6 @@
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
 
-#include <linux/pci.h>
-
 struct hppb_card {
         unsigned long hpa;
         struct resource mmio_region;
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 3df82fe9ce8c..98be2880757d 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -365,7 +365,7 @@ static __inline__ int led_get_net_activity(void)
          * for reading should be OK */
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for (dev = dev_base; dev; dev = dev->next) {
+        for_each_netdev(dev) {
             struct net_device_stats *stats;
             struct in_device *in_dev = __in_dev_get_rcu(dev);
             if (!in_dev || !in_dev->ifa_list)
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index ea1b7a63598e..815e445c3125 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -520,17 +520,17 @@ static struct pdcspath_entry *pdcspath_entries[] = {
 
 /**
  * pdcs_size_read - Stable Storage size output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static ssize_t
-pdcs_size_read(struct subsystem *entry, char *buf)
+pdcs_size_read(struct kset *kset, char *buf)
 {
         char *out = buf;
-        
-        if (!entry || !buf)
+
+        if (!kset || !buf)
                 return -EINVAL;
-                
+
         /* show the size of the stable storage */
         out += sprintf(out, "%ld\n", pdcs_size);
 
@@ -539,17 +539,17 @@ pdcs_size_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_auto_read - Stable Storage autoboot/search flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
  */
 static ssize_t
-pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
+pdcs_auto_read(struct kset *kset, char *buf, int knob)
 {
         char *out = buf;
         struct pdcspath_entry *pathentry;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* Current flags are stored in primary boot path entry */
@@ -565,40 +565,40 @@ pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
 
 /**
  * pdcs_autoboot_read - Stable Storage autoboot flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static inline ssize_t
-pdcs_autoboot_read(struct subsystem *entry, char *buf)
+pdcs_autoboot_read(struct kset *kset, char *buf)
 {
-        return pdcs_auto_read(entry, buf, PF_AUTOBOOT);
+        return pdcs_auto_read(kset, buf, PF_AUTOBOOT);
 }
 
 /**
  * pdcs_autosearch_read - Stable Storage autoboot flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static inline ssize_t
-pdcs_autosearch_read(struct subsystem *entry, char *buf)
+pdcs_autosearch_read(struct kset *kset, char *buf)
 {
-        return pdcs_auto_read(entry, buf, PF_AUTOSEARCH);
+        return pdcs_auto_read(kset, buf, PF_AUTOSEARCH);
 }
 
 /**
  * pdcs_timer_read - Stable Storage timer count output (in seconds).
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * The value of the timer field correponds to a number of seconds in powers of 2.
  */
 static ssize_t
-pdcs_timer_read(struct subsystem *entry, char *buf)
+pdcs_timer_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         struct pdcspath_entry *pathentry;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* Current flags are stored in primary boot path entry */
@@ -615,15 +615,15 @@ pdcs_timer_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osid_read - Stable Storage OS ID register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static ssize_t
-pdcs_osid_read(struct subsystem *entry, char *buf)
+pdcs_osid_read(struct kset *kset, char *buf)
 {
         char *out = buf;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         out += sprintf(out, "%s dependent data (0x%.4x)\n",
@@ -634,18 +634,18 @@ pdcs_osid_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osdep1_read - Stable Storage OS-Dependent data area 1 output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This can hold 16 bytes of OS-Dependent data.
  */
 static ssize_t
-pdcs_osdep1_read(struct subsystem *entry, char *buf)
+pdcs_osdep1_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result[4];
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         if (pdc_stable_read(PDCS_ADDR_OSD1, &result, sizeof(result)) != PDC_OK)
@@ -661,18 +661,18 @@ pdcs_osdep1_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_diagnostic_read - Stable Storage Diagnostic register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * I have NFC how to interpret the content of that register ;-).
  */
 static ssize_t
-pdcs_diagnostic_read(struct subsystem *entry, char *buf)
+pdcs_diagnostic_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* get diagnostic */
@@ -686,18 +686,18 @@ pdcs_diagnostic_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_fastsize_read - Stable Storage FastSize register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This register holds the amount of system RAM to be tested during boot sequence.
  */
 static ssize_t
-pdcs_fastsize_read(struct subsystem *entry, char *buf)
+pdcs_fastsize_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* get fast-size */
@@ -715,13 +715,13 @@ pdcs_fastsize_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osdep2_read - Stable Storage OS-Dependent data area 2 output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This can hold pdcs_size - 224 bytes of OS-Dependent data, when available.
  */
 static ssize_t
-pdcs_osdep2_read(struct subsystem *entry, char *buf)
+pdcs_osdep2_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         unsigned long size;
@@ -733,7 +733,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
 
         size = pdcs_size - 224;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         for (i=0; i<size; i+=4) {
@@ -748,7 +748,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_auto_write - This function handles autoboot/search flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
@@ -758,7 +758,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
  *      \"n\" (n == 0 or 1) to toggle AutoBoot Off or On
  */
 static ssize_t
-pdcs_auto_write(struct subsystem *entry, const char *buf, size_t count, int knob)
+pdcs_auto_write(struct kset *kset, const char *buf, size_t count, int knob)
 {
         struct pdcspath_entry *pathentry;
         unsigned char flags;
@@ -768,7 +768,7 @@ pdcs_auto_write(struct subsystem *entry, const char *buf, size_t count, int knob
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         /* We'll use a local copy of buf */
@@ -823,7 +823,7 @@ parse_error:
 
 /**
  * pdcs_autoboot_write - This function handles autoboot flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -832,14 +832,14 @@ parse_error:
  *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
  */
 static inline ssize_t
-pdcs_autoboot_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_autoboot_write(struct kset *kset, const char *buf, size_t count)
 {
-        return pdcs_auto_write(entry, buf, count, PF_AUTOBOOT);
+        return pdcs_auto_write(kset, buf, count, PF_AUTOBOOT);
 }
 
 /**
  * pdcs_autosearch_write - This function handles autosearch flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -848,14 +848,14 @@ pdcs_autoboot_write(struct subsystem *entry, const char *buf, size_t count)
  *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
  */
 static inline ssize_t
-pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_autosearch_write(struct kset *kset, const char *buf, size_t count)
 {
-        return pdcs_auto_write(entry, buf, count, PF_AUTOSEARCH);
+        return pdcs_auto_write(kset, buf, count, PF_AUTOSEARCH);
 }
 
 /**
  * pdcs_osdep1_write - Stable Storage OS-Dependent data area 1 input.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -864,14 +864,14 @@ pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)
  * its input buffer.
  */
 static ssize_t
-pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_osdep1_write(struct kset *kset, const char *buf, size_t count)
 {
         u8 in[16];
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         if (unlikely(pdcs_osid != OS_ID_LINUX))
@@ -892,7 +892,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
 
 /**
  * pdcs_osdep2_write - Stable Storage OS-Dependent data area 2 input.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -901,7 +901,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
  * constructing its input buffer.
  */
 static ssize_t
-pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_osdep2_write(struct kset *kset, const char *buf, size_t count)
 {
         unsigned long size;
         unsigned short i;
@@ -910,7 +910,7 @@ pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         if (unlikely(pdcs_size <= 224))
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 5ea5bc70cb82..7a1d6d512837 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,10 +1,14 @@
 #
 # PCI configuration
 #
+config ARCH_SUPPORTS_MSI
+        bool
+        default n
+
 config PCI_MSI
         bool "Message Signaled Interrupts (MSI and MSI-X)"
         depends on PCI
-        depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 || SPARC64
+        depends on ARCH_SUPPORTS_MSI
         help
            This allows device drivers to enable MSI (Message Signaled
            Interrupts).  Message Signaled Interrupts enable a device to
@@ -17,31 +21,6 @@ config PCI_MSI
 
            If you don't know what to do here, say N.
 
-config PCI_MULTITHREAD_PROBE
-        bool "PCI Multi-threaded probe (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL && BROKEN
-        help
-          Say Y here if you want the PCI core to spawn a new thread for
-          every PCI device that is probed.  This can cause a huge
-          speedup in boot times on multiprocessor machines, and even a
-          smaller speedup on single processor machines.
-
-          But it can also cause lots of bad things to happen.  A number
-          of PCI drivers cannot properly handle running in this way,
-          some will just not work properly at all, while others might
-          decide to blow up power supplies with a huge load all at once,
-          so use this option at your own risk.
-
-          It is very unwise to use this option if you are not using a
-          boot process that can handle devices being created in any
-          order.  A program that can create persistent block and network
-          device names (like udev) is a good idea if you wish to use
-          this option.
-
-          Again, use this option at your own risk, you have been warned!
-
-          When in doubt, say N.
-
 config PCI_DEBUG
         bool "PCI Debugging"
         depends on PCI && DEBUG_KERNEL
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index aadaa3c8096b..9e5ea074ad20 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -77,7 +77,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
  * This adds a single pci device to the global
  * device list and adds sysfs and procfs entries
  */
-int __devinit pci_bus_add_device(struct pci_dev *dev)
+int pci_bus_add_device(struct pci_dev *dev)
 {
         int retval;
         retval = device_add(&dev->dev);
@@ -105,7 +105,7 @@ int __devinit pci_bus_add_device(struct pci_dev *dev)
  *
  * Call hotplug for each new devices.
  */
-void __devinit pci_bus_add_devices(struct pci_bus *bus)
+void pci_bus_add_devices(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         int retval;
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index be92695a7833..63d62752fb91 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -2,9 +2,7 @@
 # PCI Hotplug support
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
         tristate "Support for PCI Hotplug (EXPERIMENTAL)"
         depends on PCI && EXPERIMENTAL && HOTPLUG
         ---help---
@@ -17,9 +15,10 @@ config HOTPLUG_PCI
 
           When in doubt, say N.
 
+if HOTPLUG_PCI
+
 config HOTPLUG_PCI_FAKE
         tristate "Fake PCI Hotplug driver"
-        depends on HOTPLUG_PCI
         help
           Say Y here if you want to use the fake PCI hotplug driver. It can
           be used to simulate PCI hotplug events if even if your system is
@@ -42,7 +41,7 @@ config HOTPLUG_PCI_FAKE
 
 config HOTPLUG_PCI_COMPAQ
         tristate "Compaq PCI Hotplug driver"
-        depends on HOTPLUG_PCI && X86 && PCI_BIOS
+        depends on X86 && PCI_BIOS
         help
           Say Y here if you have a motherboard with a Compaq PCI Hotplug
           controller.
@@ -64,7 +63,7 @@ config HOTPLUG_PCI_COMPAQ_NVRAM
 
 config HOTPLUG_PCI_IBM
         tristate "IBM PCI Hotplug driver"
-        depends on HOTPLUG_PCI && X86_IO_APIC && X86 && PCI_BIOS
+        depends on X86_IO_APIC && X86 && PCI_BIOS
         help
           Say Y here if you have a motherboard with a IBM PCI Hotplug
           controller.
@@ -76,7 +75,6 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
         tristate "ACPI PCI Hotplug driver"
-        depends on HOTPLUG_PCI
         depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK)
         help
           Say Y here if you have a system that supports PCI Hotplug using
@@ -101,7 +99,6 @@ config HOTPLUG_PCI_ACPI_IBM
 
 config HOTPLUG_PCI_CPCI
         bool "CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI
         help
           Say Y here if you have a CompactPCI system card with CompactPCI
           hotswap support per the PICMG 2.1 specification.
@@ -110,7 +107,7 @@ config HOTPLUG_PCI_CPCI
 
 config HOTPLUG_PCI_CPCI_ZT5550
         tristate "Ziatech ZT5550 CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+        depends on HOTPLUG_PCI_CPCI && X86
         help
           Say Y here if you have an Performance Technologies (formerly Intel,
           formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.
@@ -122,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
 
 config HOTPLUG_PCI_CPCI_GENERIC
         tristate "Generic port I/O CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+        depends on HOTPLUG_PCI_CPCI && X86
         help
           Say Y here if you have a CompactPCI system card that exposes the #ENUM
           hotswap signal as a bit in a system register that can be read through
@@ -135,7 +132,6 @@ config HOTPLUG_PCI_CPCI_GENERIC
 
 config HOTPLUG_PCI_SHPC
         tristate "SHPC PCI Hotplug driver"
-        depends on HOTPLUG_PCI
         help
           Say Y here if you have a motherboard with a SHPC PCI Hotplug
           controller.
@@ -147,7 +143,7 @@ config HOTPLUG_PCI_SHPC
 
 config HOTPLUG_PCI_RPA
         tristate "RPA PCI Hotplug driver"
-        depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
+        depends on PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
         help
           Say Y here if you have a RPA system that supports PCI Hotplug.
 
@@ -170,12 +166,11 @@ config HOTPLUG_PCI_RPA_DLPAR
 
 config HOTPLUG_PCI_SGI
         tristate "SGI PCI Hotplug Support"
-        depends on HOTPLUG_PCI && (IA64_SGI_SN2 || IA64_GENERIC)
+        depends on IA64_SGI_SN2 || IA64_GENERIC
         help
           Say Y here if you want to use the SGI Altix Hotplug
           Driver for PCI devices.
 
           When in doubt, say N.
 
-endmenu
-
+endif # HOTPLUG_PCI
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 7f03881a8b68..e7322c25d377 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -424,7 +424,7 @@ static int __init ibm_acpiphp_init(void)
         int retval = 0;
         acpi_status status;
         struct acpi_device *device;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
 
         dbg("%s\n", __FUNCTION__);
 
@@ -471,7 +471,7 @@ init_return:
 static void __exit ibm_acpiphp_exit(void)
 {
         acpi_status status;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
 
         dbg("%s\n", __FUNCTION__);
 
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 1c12e9171097..41f6a8d79c81 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -296,13 +296,17 @@ static struct pci_driver zt5550_hc_driver = {
 static int __init zt5550_init(void)
 {
         struct resource* r;
+        int rc;
 
         info(DRIVER_DESC " version: " DRIVER_VERSION);
         r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register");
         if(!r)
                 return -EBUSY;
 
-        return pci_register_driver(&zt5550_hc_driver);
+        rc = pci_register_driver(&zt5550_hc_driver);
+        if(rc < 0)
+                release_region(ENUM_PORT, 1);
+        return rc;
 }
 
 static void __exit
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index e27907c91d92..027f6865d7e3 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -238,7 +238,7 @@ static void pci_rescan_bus(const struct pci_bus *bus)
 {
         unsigned int devfn;
         struct pci_dev *dev;
-        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = alloc_pci_dev();
         if (!dev)
                 return;
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index f5d632e72323..63f3bd1eecc4 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -62,7 +62,7 @@ static int debug;
 
 static LIST_HEAD(pci_hotplug_slot_list);
 
-struct subsystem pci_hotplug_slots_subsys;
+struct kset pci_hotplug_slots_subsys;
 
 static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
                 struct attribute *attr, char *buf)
@@ -764,7 +764,7 @@ static int __init pci_hotplug_init (void)
 {
         int result;
 
-        kset_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
+        kobj_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
         result = subsystem_register(&pci_hotplug_slots_subsys);
         if (result) {
                 err("Register subsys with error %d\n", result);
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index d19fcae8a7c0..ccc57627201e 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -43,6 +43,7 @@ extern int pciehp_poll_mode;
 extern int pciehp_poll_time;
 extern int pciehp_debug;
 extern int pciehp_force;
+extern struct workqueue_struct *pciehp_wq;
 
 #define dbg(format, arg...)                                             \
         do {                                                            \
@@ -70,14 +71,16 @@ struct slot {
         struct list_head        slot_list;
         char name[SLOT_NAME_SIZE];
         unsigned long last_emi_toggle;
+        struct delayed_work work;       /* work for button event */
+        struct mutex lock;
 };
 
 struct event_info {
         u32 event_type;
-        u8 hp_slot;
+        struct slot *p_slot;
+        struct work_struct work;
 };
 
-#define MAX_EVENTS              10
 struct controller {
         struct controller *next;
         struct mutex crit_sect;         /* critical section mutex */
@@ -86,11 +89,9 @@ struct controller {
         int slot_num_inc;               /* 1 or -1 */
         struct pci_dev *pci_dev;
         struct list_head slot_list;
-        struct event_info event_queue[MAX_EVENTS];
         struct slot *slot;
         struct hpc_ops *hpc_ops;
         wait_queue_head_t queue;        /* sleep & wake process */
-        u8 next_event;
         u8 bus;
         u8 device;
         u8 function;
@@ -149,21 +150,17 @@ struct controller {
 #define HP_SUPR_RM(cap)         (cap & HP_SUPR_RM_SUP)
 #define EMI(cap)                (cap & EMI_PRSN)
 
-extern int pciehp_event_start_thread(void);
-extern void pciehp_event_stop_thread(void);
-extern int pciehp_enable_slot(struct slot *slot);
-extern int pciehp_disable_slot(struct slot *slot);
+extern int pciehp_sysfs_enable_slot(struct slot *slot);
+extern int pciehp_sysfs_disable_slot(struct slot *slot);
 extern u8 pciehp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
 extern int pciehp_configure_device(struct slot *p_slot);
 extern int pciehp_unconfigure_device(struct slot *p_slot);
+extern void pciehp_queue_pushbutton_work(struct work_struct *work);
 int pcie_init(struct controller *ctrl, struct pcie_device *dev);
 
-/* Global variables */
-extern struct controller *pciehp_ctrl_list;
-
 static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 {
         struct slot *slot;
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index a92eda6e02f6..e5d3f0b4f45a 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -41,7 +41,7 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-struct controller *pciehp_ctrl_list;
+struct workqueue_struct *pciehp_wq;
 
 #define DRIVER_VERSION  "0.4"
 #define DRIVER_AUTHOR   "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -62,7 +62,6 @@ MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing"
 
 #define PCIE_MODULE_NAME "pciehp"
 
-static int pcie_start_thread (void);
 static int set_attention_status (struct hotplug_slot *slot, u8 value);
 static int enable_slot          (struct hotplug_slot *slot);
 static int disable_slot         (struct hotplug_slot *slot);
@@ -229,6 +228,8 @@ static int init_slots(struct controller *ctrl)
                 slot->device = ctrl->slot_device_offset + i;
                 slot->hpc_ops = ctrl->hpc_ops;
                 slot->number = ctrl->first_slot;
+                mutex_init(&slot->lock);
+                INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
 
                 /* register this slot with the hotplug pci core */
                 hotplug_slot->private = slot;
@@ -286,6 +287,9 @@ static void cleanup_slots(struct controller *ctrl)
                 if (EMI(ctrl->ctrlcap))
                         sysfs_remove_file(&slot->hotplug_slot->kobj,
                                 &hotplug_slot_attr_lock.attr);
+                cancel_delayed_work(&slot->work);
+                flush_scheduled_work();
+                flush_workqueue(pciehp_wq);
                 pci_hp_deregister(slot->hotplug_slot);
         }
 }
@@ -314,7 +318,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
-        return pciehp_enable_slot(slot);
+        return pciehp_sysfs_enable_slot(slot);
 }
 
 
@@ -324,7 +328,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
-        return pciehp_disable_slot(slot);
+        return pciehp_sysfs_disable_slot(slot);
 }
 
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
@@ -466,17 +470,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
 
         t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
 
-        /*      Finish setting up the hot plug ctrl device */
-        ctrl->next_event = 0;
-
-        if (!pciehp_ctrl_list) {
-                pciehp_ctrl_list = ctrl;
-                ctrl->next = NULL;
-        } else {
-                ctrl->next = pciehp_ctrl_list;
-                pciehp_ctrl_list = ctrl;
-        }
-
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
         if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
                 rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
@@ -496,48 +489,14 @@ err_out_none:
         return -ENODEV;
 }
 
-
-static int pcie_start_thread(void)
+static void pciehp_remove (struct pcie_device *dev)
 {
-        int retval = 0;
-        
-        dbg("Initialize + Start the notification/polling mechanism \n");
-
-        retval = pciehp_event_start_thread();
-        if (retval) {
-                dbg("pciehp_event_start_thread() failed\n");
-                return retval;
-        }
-
-        return retval;
-}
-
-static void __exit unload_pciehpd(void)
-{
-        struct controller *ctrl;
-        struct controller *tctrl;
-
-        ctrl = pciehp_ctrl_list;
-
-        while (ctrl) {
-                cleanup_slots(ctrl);
+        struct pci_dev *pdev = dev->port;
+        struct controller *ctrl = pci_get_drvdata(pdev);
 
-                ctrl->hpc_ops->release_ctlr(ctrl);
-
-                tctrl = ctrl;
-                ctrl = ctrl->next;
-
-                kfree(tctrl);
-        }
-
-        /* Stop the notification mechanism */
-        pciehp_event_stop_thread();
-
-}
-
-static void pciehp_remove (struct pcie_device *device)
-{
-        /* XXX - Needs to be adapted to device driver model */
+        cleanup_slots(ctrl);
+        ctrl->hpc_ops->release_ctlr(ctrl);
+        kfree(ctrl);
 }
 
 #ifdef CONFIG_PM
@@ -585,31 +544,18 @@ static int __init pcied_init(void)
         pciehp_poll_mode = 1;
 #endif
 
-        retval = pcie_start_thread();
-        if (retval)
-                goto error_hpc_init;
-
         retval = pcie_port_service_register(&hpdriver_portdrv);
         dbg("pcie_port_service_register = %d\n", retval);
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
         if (retval)
                 dbg("%s: Failure to register service\n", __FUNCTION__);
-
-error_hpc_init:
-        if (retval) {
-                pciehp_event_stop_thread();
-        };
-
         return retval;
 }
 
 static void __exit pcied_cleanup(void)
 {
         dbg("unload_pciehpd()\n");
-        unload_pciehpd();
-
         pcie_port_service_unregister(&hpdriver_portdrv);
-
         info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
 }
 
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 4283ef56dbd9..7f22caa70178 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -32,92 +32,61 @@
 #include <linux/types.h>
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
+#include <linux/workqueue.h>
 #include "../pci.h"
 #include "pciehp.h"
 
-static void interrupt_event_handler(struct controller *ctrl);
+static void interrupt_event_handler(struct work_struct *work);
+static int pciehp_enable_slot(struct slot *p_slot);
+static int pciehp_disable_slot(struct slot *p_slot);
 
-static struct semaphore event_semaphore;        /* mutex for process loop (up if something to process) */
-static struct semaphore event_exit;             /* guard ensure thread has exited before calling it quits */
-static int event_finished;
-static unsigned long pushbutton_pending;        /* = 0 */
-static unsigned long surprise_rm_pending;       /* = 0 */
-
-static inline char *slot_name(struct slot *p_slot)
+static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
 {
-        return p_slot->hotplug_slot->name;
+        struct event_info *info;
+
+        info = kmalloc(sizeof(*info), GFP_ATOMIC);
+        if (!info)
+                return -ENOMEM;
+
+        info->event_type = event_type;
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, interrupt_event_handler);
+
+        schedule_work(&info->work);
+
+        return 0;
 }
 
 u8 pciehp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
 {
         struct slot *p_slot;
-        u8 rc = 0;
-        u8 getstatus;
-        struct event_info *taskInfo;
+        u32 event_type;
 
         /* Attention Button Change */
         dbg("pciehp:  Attention button interrupt received.\n");
-        
-        /* This is the structure that tells the worker thread what to do */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-
-        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-        
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
 
-        rc++;
+        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
         /*
          *  Button pressed - See if need to TAKE ACTION!!!
          */
-        info("Button pressed on Slot(%s)\n", slot_name(p_slot));
-        taskInfo->event_type = INT_BUTTON_PRESS;
-
-        if ((p_slot->state == BLINKINGON_STATE)
-            || (p_slot->state == BLINKINGOFF_STATE)) {
-                /* Cancel if we are still blinking; this means that we press the
-                 * attention again before the 5 sec. limit expires to cancel hot-add
-                 * or hot-remove
-                 */
-                taskInfo->event_type = INT_BUTTON_CANCEL;
-                info("Button cancel on Slot(%s)\n", slot_name(p_slot));
-        } else if ((p_slot->state == POWERON_STATE)
-                   || (p_slot->state == POWEROFF_STATE)) {
-                /* Ignore if the slot is on power-on or power-off state; this 
-                 * means that the previous attention button action to hot-add or
-                 * hot-remove is undergoing
-                 */
-                taskInfo->event_type = INT_BUTTON_IGNORE;
-                info("Button ignore on Slot(%s)\n", slot_name(p_slot));
-        }
+        info("Button pressed on Slot(%s)\n", p_slot->name);
+        event_type = INT_BUTTON_PRESS;
 
-        if (rc)
-                up(&event_semaphore);   /* signal event thread that new event is posted */
+        queue_interrupt_event(p_slot, event_type);
 
         return 0;
-
 }
 
 u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
 {
         struct slot *p_slot;
-        u8 rc = 0;
         u8 getstatus;
-        struct event_info *taskInfo;
+        u32 event_type;
 
         /* Switch Change */
         dbg("pciehp:  Switch interrupt received.\n");
 
-        /* This is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-
-        rc++;
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
@@ -125,39 +94,30 @@ u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
                 /*
                  * Switch opened
                  */
-                info("Latch open on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_SWITCH_OPEN;
+                info("Latch open on Slot(%s)\n", p_slot->name);
+                event_type = INT_SWITCH_OPEN;
         } else {
                 /*
                  *  Switch closed
                  */
-                info("Latch close on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_SWITCH_CLOSE;
+                info("Latch close on Slot(%s)\n", p_slot->name);
+                event_type = INT_SWITCH_CLOSE;
         }
 
-        if (rc)
-                up(&event_semaphore);   /* signal event thread that new event is posted */
+        queue_interrupt_event(p_slot, event_type);
 
-        return rc;
+        return 1;
 }
 
 u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
 {
         struct slot *p_slot;
-        u8 presence_save, rc = 0;
-        struct event_info *taskInfo;
+        u32 event_type;
+        u8 presence_save;
 
         /* Presence Change */
         dbg("pciehp:  Presence/Notify input change.\n");
 
-        /* This is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-
-        rc++;
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
         /* Switch is open, assume a presence change
@@ -168,59 +128,49 @@ u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
                 /*
                  * Card Present
                  */
-                info("Card present on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_PRESENCE_ON;
+                info("Card present on Slot(%s)\n", p_slot->name);
+                event_type = INT_PRESENCE_ON;
         } else {
                 /*
                  * Not Present
                  */
-                info("Card not present on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_PRESENCE_OFF;
+                info("Card not present on Slot(%s)\n", p_slot->name);
+                event_type = INT_PRESENCE_OFF;
         }
 
-        if (rc)
-                up(&event_semaphore);   /* signal event thread that new event is posted */
+        queue_interrupt_event(p_slot, event_type);
 
-        return rc;
+        return 1;
 }
 
 u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
 {
         struct slot *p_slot;
-        u8 rc = 0;
-        struct event_info *taskInfo;
+        u32 event_type;
 
         /* power fault */
         dbg("pciehp:  Power fault interrupt received.\n");
 
-        /* this is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-
-        rc++;
         p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
         if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) {
                 /*
                  * power fault Cleared
                  */
-                info("Power fault cleared on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_POWER_FAULT_CLEAR;
+                info("Power fault cleared on Slot(%s)\n", p_slot->name);
+                event_type = INT_POWER_FAULT_CLEAR;
         } else {
                 /*
                  *   power fault
                  */
-                info("Power fault on Slot(%s)\n", slot_name(p_slot));
-                taskInfo->event_type = INT_POWER_FAULT;
+                info("Power fault on Slot(%s)\n", p_slot->name);
+                event_type = INT_POWER_FAULT;
                 info("power fault bit %x set\n", hp_slot);
         }
-        if (rc)
-                up(&event_semaphore);   /* signal event thread that new event is posted */
 
-        return rc;
+        queue_interrupt_event(p_slot, event_type);
+
+        return 1;
 }
 
 /* The following routines constitute the bulk of the 
@@ -357,13 +307,10 @@ static int remove_board(struct slot *p_slot)
         return 0;
 }
 
-
-static void pushbutton_helper_thread(unsigned long data)
-{
-        pushbutton_pending = data;
-
-        up(&event_semaphore);
-}
+struct power_work_info {
+        struct slot *p_slot;
+        struct work_struct work;
+};
 
 /**
  * pciehp_pushbutton_thread
@@ -372,276 +319,214 @@ static void pushbutton_helper_thread(unsigned long data)
  * Handles all pending events and exits.
  *
  */
-static void pciehp_pushbutton_thread(unsigned long slot)
+static void pciehp_power_thread(struct work_struct *work)
 {
-        struct slot *p_slot = (struct slot *) slot;
-        u8 getstatus;
-        
-        pushbutton_pending = 0;
-
-        if (!p_slot) {
-                dbg("%s: Error! slot NULL\n", __FUNCTION__);
-                return;
-        }
-
-        p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
-        if (getstatus) {
-                p_slot->state = POWEROFF_STATE;
-                dbg("%s: disabling bus:device(%x:%x)\n", __FUNCTION__,
-                                p_slot->bus, p_slot->device);
-
+        struct power_work_info *info =
+                container_of(work, struct power_work_info, work);
+        struct slot *p_slot = info->p_slot;
+
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case POWEROFF_STATE:
+                mutex_unlock(&p_slot->lock);
+                dbg("%s: disabling bus:device(%x:%x)\n",
+                    __FUNCTION__, p_slot->bus, p_slot->device);
                 pciehp_disable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
                 p_slot->state = STATIC_STATE;
-        } else {
-                p_slot->state = POWERON_STATE;
-                dbg("%s: adding bus:device(%x:%x)\n", __FUNCTION__,
-                                p_slot->bus, p_slot->device);
-
+                break;
+        case POWERON_STATE:
+                mutex_unlock(&p_slot->lock);
                 if (pciehp_enable_slot(p_slot) &&
                     PWR_LED(p_slot->ctrl->ctrlcap))
                         p_slot->hpc_ops->green_led_off(p_slot);
-
+                mutex_lock(&p_slot->lock);
                 p_slot->state = STATIC_STATE;
+                break;
+        default:
+                break;
         }
+        mutex_unlock(&p_slot->lock);
 
-        return;
+        kfree(info);
 }
 
-/**
- * pciehp_surprise_rm_thread
- *
- * Scheduled procedure to handle blocking stuff for the surprise removal
- * Handles all pending events and exits.
- *
- */
-static void pciehp_surprise_rm_thread(unsigned long slot)
+void pciehp_queue_pushbutton_work(struct work_struct *work)
 {
-        struct slot *p_slot = (struct slot *) slot;
-        u8 getstatus;
-        
-        surprise_rm_pending = 0;
+        struct slot *p_slot = container_of(work, struct slot, work.work);
+        struct power_work_info *info;
 
-        if (!p_slot) {
-                dbg("%s: Error! slot NULL\n", __FUNCTION__);
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                err("%s: Cannot allocate memory\n", __FUNCTION__);
                 return;
         }
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, pciehp_power_thread);
 
-        p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
-        if (!getstatus) {
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case BLINKINGOFF_STATE:
                 p_slot->state = POWEROFF_STATE;
-                dbg("%s: removing bus:device(%x:%x)\n",
-                                __FUNCTION__, p_slot->bus, p_slot->device);
-
-                pciehp_disable_slot(p_slot);
-                p_slot->state = STATIC_STATE;
-        } else {
+                break;
+        case BLINKINGON_STATE:
                 p_slot->state = POWERON_STATE;
-                dbg("%s: adding bus:device(%x:%x)\n",
-                                __FUNCTION__, p_slot->bus, p_slot->device);
-
-                if (pciehp_enable_slot(p_slot) &&
-                    PWR_LED(p_slot->ctrl->ctrlcap))
-                        p_slot->hpc_ops->green_led_off(p_slot);
-
-                p_slot->state = STATIC_STATE;
+                break;
+        default:
+                goto out;
         }
-
-        return;
+        queue_work(pciehp_wq, &info->work);
+ out:
+        mutex_unlock(&p_slot->lock);
 }
 
-
-
-/* this is the main worker thread */
-static int event_thread(void* data)
-{
-        struct controller *ctrl;
-        lock_kernel();
-        daemonize("pciehpd_event");
-
-        unlock_kernel();
-
-        while (1) {
-                dbg("!!!!event_thread sleeping\n");
-                down_interruptible (&event_semaphore);
-                dbg("event_thread woken finished = %d\n", event_finished);
-                if (event_finished || signal_pending(current))
-                        break;
-                /* Do stuff here */
-                if (pushbutton_pending)
-                        pciehp_pushbutton_thread(pushbutton_pending);
-                else if (surprise_rm_pending)
-                        pciehp_surprise_rm_thread(surprise_rm_pending);
-                else
-                        for (ctrl = pciehp_ctrl_list; ctrl; ctrl=ctrl->next)
-                                interrupt_event_handler(ctrl);
-        }
-        dbg("event_thread signals exit\n");
-        up(&event_exit);
-        return 0;
-}
-
-int pciehp_event_start_thread(void)
-{
-        int pid;
-
-        /* initialize our semaphores */
-        init_MUTEX_LOCKED(&event_exit);
-        event_finished=0;
-
-        init_MUTEX_LOCKED(&event_semaphore);
-        pid = kernel_thread(event_thread, NULL, 0);
-
-        if (pid < 0) {
-                err ("Can't start up our event thread\n");
-                return -1;
-        }
-        return 0;
-}
-
-
-void pciehp_event_stop_thread(void)
-{
-        event_finished = 1;
-        up(&event_semaphore);
-        down(&event_exit);
-}
-
-
 static int update_slot_info(struct slot *slot)
 {
         struct hotplug_slot_info *info;
-        /* char buffer[SLOT_NAME_SIZE]; */
         int result;
 
-        info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        /* make_slot_name (&buffer[0], SLOT_NAME_SIZE, slot); */
-
         slot->hpc_ops->get_power_status(slot, &(info->power_status));
         slot->hpc_ops->get_attention_status(slot, &(info->attention_status));
         slot->hpc_ops->get_latch_status(slot, &(info->latch_status));
         slot->hpc_ops->get_adapter_status(slot, &(info->adapter_status));
 
-        /* result = pci_hp_change_slot_info(buffer, info); */
         result = pci_hp_change_slot_info(slot->hotplug_slot, info);
         kfree (info);
         return result;
 }
 
-static void interrupt_event_handler(struct controller *ctrl)
+/*
+ * Note: This function must be called with slot->lock held
+ */
+static void handle_button_press_event(struct slot *p_slot)
 {
-        int loop = 0;
-        int change = 1;
-        u8 hp_slot;
+        struct controller *ctrl = p_slot->ctrl;
         u8 getstatus;
-        struct slot *p_slot;
 
-        while (change) {
-                change = 0;
-
-                for (loop = 0; loop < MAX_EVENTS; loop++) {
-                        if (ctrl->event_queue[loop].event_type != 0) {
-                                hp_slot = ctrl->event_queue[loop].hp_slot;
-
-                                p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-
-                                if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) {
-                                        dbg("button cancel\n");
-                                        del_timer(&p_slot->task_event);
-
-                                        switch (p_slot->state) {
-                                        case BLINKINGOFF_STATE:
-                                                if (PWR_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_on(p_slot);
-
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                                                break;
-                                        case BLINKINGON_STATE:
-                                                if (PWR_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_off(p_slot);
-
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                                                break;
-                                        default:
-                                                warn("Not a valid state\n");
-                                                return;
-                                        }
-                                        info("PCI slot #%s - action canceled due to button press.\n", slot_name(p_slot));
-                                        p_slot->state = STATIC_STATE;
-                                }
-                                /* ***********Button Pressed (No action on 1st press...) */
-                                else if (ctrl->event_queue[loop].event_type == INT_BUTTON_PRESS) {
-                                        
-                                        if (ATTN_BUTTN(ctrl->ctrlcap)) {
-                                                dbg("Button pressed\n");
-                                                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
-                                                if (getstatus) {
-                                                        /* slot is on */
-                                                        dbg("slot is on\n");
-                                                        p_slot->state = BLINKINGOFF_STATE;
-                                                        info("PCI slot #%s - powering off due to button press.\n", slot_name(p_slot));
-                                                } else {
-                                                        /* slot is off */
-                                                        dbg("slot is off\n");
-                                                        p_slot->state = BLINKINGON_STATE;
-                                                        info("PCI slot #%s - powering on due to button press.\n", slot_name(p_slot));
-                                                }
-
-                                                /* blink green LED and turn off amber */
-                                                if (PWR_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_blink(p_slot);
-
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-
-                                                init_timer(&p_slot->task_event);
-                                                p_slot->task_event.expires = jiffies + 5 * HZ;   /* 5 second delay */
-                                                p_slot->task_event.function = (void (*)(unsigned long)) pushbutton_helper_thread;
-                                                p_slot->task_event.data = (unsigned long) p_slot;
-
-                                                add_timer(&p_slot->task_event);
-                                        }
-                                }
-                                /***********POWER FAULT********************/
-                                else if (ctrl->event_queue[loop].event_type == INT_POWER_FAULT) {
-                                        if (POWER_CTRL(ctrl->ctrlcap)) {
-                                                dbg("power fault\n");
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 1);
-
-                                                if (PWR_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_off(p_slot);
-                                        }
-                                }
-                                /***********SURPRISE REMOVAL********************/
-                                else if ((ctrl->event_queue[loop].event_type == INT_PRESENCE_ON) || 
-                                        (ctrl->event_queue[loop].event_type == INT_PRESENCE_OFF)) {
-                                        if (HP_SUPR_RM(ctrl->ctrlcap)) {
-                                                dbg("Surprise Removal\n");
-                                                if (p_slot) {
-                                                        surprise_rm_pending = (unsigned long) p_slot;
-                                                        up(&event_semaphore);
-                                                        update_slot_info(p_slot);
-                                                }
-                                        }
-                                } else {
-                                        /* refresh notification */
-                                        if (p_slot)
-                                                update_slot_info(p_slot);
-                                }
-
-                                ctrl->event_queue[loop].event_type = 0;
-
-                                change = 1;
-                        }
-                }               /* End of FOR loop */
+        switch (p_slot->state) {
+        case STATIC_STATE:
+                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
+                if (getstatus) {
+                        p_slot->state = BLINKINGOFF_STATE;
+                        info("PCI slot #%s - powering off due to button "
+                             "press.\n", p_slot->name);
+                } else {
+                        p_slot->state = BLINKINGON_STATE;
+                        info("PCI slot #%s - powering on due to button "
+                             "press.\n", p_slot->name);
+                }
+                /* blink green LED and turn off amber */
+                if (PWR_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->green_led_blink(p_slot);
+                if (ATTN_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
+
+                schedule_delayed_work(&p_slot->work, 5*HZ);
+                break;
+        case BLINKINGOFF_STATE:
+        case BLINKINGON_STATE:
+                /*
+                 * Cancel if we are still blinking; this means that we
+                 * press the attention again before the 5 sec. limit
+                 * expires to cancel hot-add or hot-remove
+                 */
+                info("Button cancel on Slot(%s)\n", p_slot->name);
+                dbg("%s: button cancel\n", __FUNCTION__);
+                cancel_delayed_work(&p_slot->work);
+                if (p_slot->state == BLINKINGOFF_STATE) {
+                        if (PWR_LED(ctrl->ctrlcap))
+                                p_slot->hpc_ops->green_led_on(p_slot);
+                } else {
+                        if (PWR_LED(ctrl->ctrlcap))
+                                p_slot->hpc_ops->green_led_off(p_slot);
+                }
+                if (ATTN_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
+                info("PCI slot #%s - action canceled due to button press\n",
+                     p_slot->name);
+                p_slot->state = STATIC_STATE;
+                break;
+        case POWEROFF_STATE:
+        case POWERON_STATE:
+                /*
+                 * Ignore if the slot is on power-on or power-off state;
+                 * this means that the previous attention button action
+                 * to hot-add or hot-remove is undergoing
+                 */
+                info("Button ignore on Slot(%s)\n", p_slot->name);
+                update_slot_info(p_slot);
+                break;
+        default:
+                warn("Not a valid state\n");
+                break;
         }
 }
 
+/*
+ * Note: This function must be called with slot->lock held
+ */
+static void handle_surprise_event(struct slot *p_slot)
+{
+        u8 getstatus;
+        struct power_work_info *info;
+
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                err("%s: Cannot allocate memory\n", __FUNCTION__);
+                return;
+        }
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, pciehp_power_thread);
+
+        p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
+        if (!getstatus)
+                p_slot->state = POWEROFF_STATE;
+        else
+                p_slot->state = POWERON_STATE;
+
+        queue_work(pciehp_wq, &info->work);
+}
+
+static void interrupt_event_handler(struct work_struct *work)
+{
+        struct event_info *info = container_of(work, struct event_info, work);
+        struct slot *p_slot = info->p_slot;
+        struct controller *ctrl = p_slot->ctrl;
+
+        mutex_lock(&p_slot->lock);
+        switch (info->event_type) {
+        case INT_BUTTON_PRESS:
+                handle_button_press_event(p_slot);
+                break;
+        case INT_POWER_FAULT:
+                if (!POWER_CTRL(ctrl->ctrlcap))
+                        break;
+                if (ATTN_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->set_attention_status(p_slot, 1);
+                if (PWR_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->green_led_off(p_slot);
+                break;
+        case INT_PRESENCE_ON:
+        case INT_PRESENCE_OFF:
+                if (!HP_SUPR_RM(ctrl->ctrlcap))
+                        break;
+                dbg("Surprise Removal\n");
+                update_slot_info(p_slot);
+                handle_surprise_event(p_slot);
+                break;
+        default:
+                update_slot_info(p_slot);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+
+        kfree(info);
+}
+
 int pciehp_enable_slot(struct slot *p_slot)
 {
         u8 getstatus = 0;
@@ -653,7 +538,7 @@ int pciehp_enable_slot(struct slot *p_slot)
         rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (rc || !getstatus) {
                 info("%s: no adapter on slot(%s)\n", __FUNCTION__,
-                     slot_name(p_slot));
+                     p_slot->name);
                 mutex_unlock(&p_slot->ctrl->crit_sect);
                 return -ENODEV;
         }
@@ -661,7 +546,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                 rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (rc || getstatus) {
                         info("%s: latch open on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -671,7 +556,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                 rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (rc || getstatus) {
                         info("%s: already enabled on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
@@ -706,7 +591,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
                         info("%s: no adapter on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -716,7 +601,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (ret || getstatus) {
                         info("%s: latch open on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -726,7 +611,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
                         info("%s: already disabled slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
@@ -739,3 +624,66 @@ int pciehp_disable_slot(struct slot *p_slot)
         return ret;
 }
 
+int pciehp_sysfs_enable_slot(struct slot *p_slot)
+{
+        int retval = -ENODEV;
+
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case BLINKINGON_STATE:
+                cancel_delayed_work(&p_slot->work);
+        case STATIC_STATE:
+                p_slot->state = POWERON_STATE;
+                mutex_unlock(&p_slot->lock);
+                retval = pciehp_enable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
+                p_slot->state = STATIC_STATE;
+                break;
+        case POWERON_STATE:
+                info("Slot %s is already in powering on state\n",
+                     p_slot->name);
+                break;
+        case BLINKINGOFF_STATE:
+        case POWEROFF_STATE:
+                info("Already enabled on slot %s\n", p_slot->name);
+                break;
+        default:
+                err("Not a valid state on slot %s\n", p_slot->name);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+
+        return retval;
+}
+
+int pciehp_sysfs_disable_slot(struct slot *p_slot)
+{
+        int retval = -ENODEV;
+
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case BLINKINGOFF_STATE:
+                cancel_delayed_work(&p_slot->work);
+        case STATIC_STATE:
+                p_slot->state = POWEROFF_STATE;
+                mutex_unlock(&p_slot->lock);
+                retval = pciehp_disable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
+                p_slot->state = STATIC_STATE;
+                break;
+        case POWEROFF_STATE:
+                info("Slot %s is already in powering off state\n",
+                     p_slot->name);
+                break;
+        case BLINKINGON_STATE:
+        case POWERON_STATE:
+                info("Already disabled on slot %s\n", p_slot->name);
+                break;
+        default:
+                err("Not a valid state on slot %s\n", p_slot->name);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+
+        return retval;
+}
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index fbc64aa2dd68..9aac6a87eb53 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -71,6 +71,8 @@
 #define DBG_LEAVE_ROUTINE
 #endif                          /* DEBUG */
 
+static atomic_t pciehp_num_controllers = ATOMIC_INIT(0);
+
 struct ctrl_reg {
         u8 cap_id;
         u8 nxt_ptr;
@@ -219,10 +221,7 @@ static inline int pciehp_writel(struct controller *ctrl, int reg, u32 value)
 #define EMI_STATE               0x0080
 #define EMI_STATUS_BIT          7
 
-static spinlock_t hpc_event_lock;
-
 DEFINE_DBG_BUFFER               /* Debug string buffer for entire HPC defined here */
-static int ctlr_seq_num = 0;    /* Controller sequence # */
 
 static irqreturn_t pcie_isr(int irq, void *dev_id);
 static void start_int_poll_timer(struct controller *ctrl, int sec);
@@ -656,6 +655,13 @@ static void hpc_release_ctlr(struct controller *ctrl)
         else
                 free_irq(ctrl->pci_dev->irq, ctrl);
 
+        /*
+         * If this is the last controller to be released, destroy the
+         * pciehp work queue
+         */
+        if (atomic_dec_and_test(&pciehp_num_controllers))
+                destroy_workqueue(pciehp_wq);
+
         DBG_LEAVE_ROUTINE
 }
 
@@ -1152,7 +1158,6 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)
 int pcie_init(struct controller * ctrl, struct pcie_device *dev)
 {
         int rc;
-        static int first = 1;
         u16 temp_word;
         u16 cap_reg;
         u16 intr_enable = 0;
@@ -1221,11 +1226,6 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
         dbg("%s: SLOTCTRL offset %x slot_ctrl %x\n",
             __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_ctrl);
 
-        if (first) {
-                spin_lock_init(&hpc_event_lock);
-                first = 0;
-        }
-
         for ( rc = 0; rc < DEVICE_COUNT_RESOURCE; rc++)
                 if (pci_resource_len(pdev, rc) > 0)
                         dbg("pci resource[%d] start=0x%llx(len=0x%llx)\n", rc,
@@ -1286,7 +1286,8 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
                 rc = request_irq(ctrl->pci_dev->irq, pcie_isr, IRQF_SHARED,
                                  MY_NAME, (void *)ctrl);
                 dbg("%s: request_irq %d for hpc%d (returns %d)\n",
-                    __FUNCTION__, ctrl->pci_dev->irq, ctlr_seq_num, rc);
+                    __FUNCTION__, ctrl->pci_dev->irq,
+                    atomic_read(&pciehp_num_controllers), rc);
                 if (rc) {
                         err("Can't get irq %d for the hotplug controller\n",
                             ctrl->pci_dev->irq);
@@ -1296,6 +1297,18 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
         dbg("pciehp ctrl b:d:f:irq=0x%x:%x:%x:%x\n", pdev->bus->number,
                 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), dev->irq);
 
+        /*
+         * If this is the first controller to be initialized,
+         * initialize the pciehp work queue
+         */
+        if (atomic_add_return(1, &pciehp_num_controllers) == 1) {
+                pciehp_wq = create_singlethread_workqueue("pciehpd");
+                if (!pciehp_wq) {
+                        rc = -ENOMEM;
+                        goto abort_free_irq;
+                }
+        }
+
         rc = pciehp_readw(ctrl, SLOTCTRL, &temp_word);
         if (rc) {
                 err("%s: Cannot read SLOTCTRL register\n", __FUNCTION__);
@@ -1349,7 +1362,6 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
                         goto abort_disable_intr;
         }
 
-        ctlr_seq_num++;
         ctrl->hpc_ops = &pciehp_hpc_ops;
 
         DBG_LEAVE_ROUTINE
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 72383467a0d5..bb3c101c2c5a 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -98,7 +98,15 @@ static struct device_node *find_dlpar_node(char *drc_name, int *node_type)
         return NULL;
 }
 
-static struct slot *find_slot(struct device_node *dn)
+/**
+ * find_php_slot - return hotplug slot structure for device node
+ *
+ * This routine will return the hotplug slot structure
+ * for a given device node. Note that built-in PCI slots
+ * may be dlpar-able, but not hot-pluggable, so this routine
+ * will return NULL for built-in PCI slots.
+ */
+static struct slot *find_php_slot(struct device_node *dn)
 {
         struct list_head *tmp, *n;
         struct slot *slot;
@@ -224,9 +232,9 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
         if (!pcibios_find_pci_bus(dn))
                 return -EINVAL;
 
-        slot = find_slot(dn);
+        /* If pci slot is hotplugable, use hotplug to remove it */
+        slot = find_php_slot(dn);
         if (slot) {
-                /* Remove hotplug slot */
                 if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
@@ -370,22 +378,17 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         if (!bus)
                 return -EINVAL;
 
-        slot = find_slot(dn);
+        /* If pci slot is hotplugable, use hotplug to remove it */
+        slot = find_php_slot(dn);
         if (slot) {
-                /* Remove hotplug slot */
                 if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
                                 __FUNCTION__, drc_name);
                         return -EIO;
                 }
-        } else {
-                struct pci_dev *dev, *tmp;
-                list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
-                        eeh_remove_bus_device(dev);
-                        pci_remove_bus_device(dev);
-                }
-        }
+        } else
+                pcibios_remove_pci_devices(bus);
 
         if (unmap_bus_range(bus)) {
                 printk(KERN_ERR "%s: failed to unmap bus range\n",
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 2e7accf0f734..c822a779653f 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -83,19 +83,15 @@ struct slot {
 
 extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
 extern struct list_head rpaphp_slot_head;
-extern int num_slots;
 
 /* function prototypes */
 
 /* rpaphp_pci.c */
-extern int rpaphp_enable_pci_slot(struct slot *slot);
-extern int rpaphp_register_pci_slot(struct slot *slot);
-extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
+extern int rpaphp_enable_slot(struct slot *slot);
 extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
 
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
-extern int rpaphp_remove_slot(struct slot *slot);
 extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
                 char **drc_name, char **drc_type, int *drc_power_domain);
 
@@ -104,7 +100,5 @@ extern void dealloc_slot_struct(struct slot *slot);
 extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
 extern int rpaphp_register_slot(struct slot *slot);
 extern int rpaphp_deregister_slot(struct slot *slot);
-extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
-extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
         
 #endif                          /* _PPC64PHP_H */
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 353da5b296ef..899eed002748 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -39,9 +39,7 @@
 #include "rpaphp.h"
 
 int debug;
-static struct semaphore rpaphp_sem;
 LIST_HEAD(rpaphp_slot_head);
-int num_slots;
 
 #define DRIVER_VERSION  "0.1"
 #define DRIVER_AUTHOR   "Linda Xie <lxie@us.ibm.com>"
@@ -55,11 +53,6 @@ MODULE_LICENSE("GPL");
 
 module_param(debug, bool, 0644);
 
-static int rpaphp_get_attention_status(struct slot *slot)
-{
-        return slot->hotplug_slot->info->attention_status;
-}
-
 /**
  * set_attention_status - set attention LED
  * echo 0 > attention -- set LED OFF
@@ -69,79 +62,75 @@ static int rpaphp_get_attention_status(struct slot *slot)
  */
 static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 {
-        int retval = 0;
+        int rc;
         struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        down(&rpaphp_sem);
         switch (value) {
         case 0:
-                retval = rpaphp_set_attention_status(slot, LED_OFF);
-                hotplug_slot->info->attention_status = 0;
-                break;
         case 1:
-        default:
-                retval = rpaphp_set_attention_status(slot, LED_ON);
-                hotplug_slot->info->attention_status = 1;
-                break;
         case 2:
-                retval = rpaphp_set_attention_status(slot, LED_ID);
-                hotplug_slot->info->attention_status = 2;
+                break;
+        default:
+                value = 1;
                 break;
         }
-        up(&rpaphp_sem);
-        return retval;
+
+        rc = rtas_set_indicator(DR_INDICATOR, slot->index, value);
+        if (!rc)
+                hotplug_slot->info->attention_status = value;
+
+        return rc;
 }
 
 /**
  * get_power_status - get power status of a slot
  * @hotplug_slot: slot to get status
  * @value: pointer to store status
- *
- *
  */
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
-        int retval;
+        int retval, level;
         struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        down(&rpaphp_sem);
-        retval = rpaphp_get_power_status(slot, value);
-        up(&rpaphp_sem);
+        retval = rtas_get_power_level (slot->power_domain, &level);
+        if (!retval)
+                *value = level;
         return retval;
 }
 
 /**
  * get_attention_status - get attention LED status
- *
- *
  */
 static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
-        int retval = 0;
         struct slot *slot = (struct slot *)hotplug_slot->private;
-
-        down(&rpaphp_sem);
-        *value = rpaphp_get_attention_status(slot);
-        up(&rpaphp_sem);
-        return retval;
+        *value = slot->hotplug_slot->info->attention_status;
+        return 0;
 }
 
 static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
         struct slot *slot = (struct slot *)hotplug_slot->private;
-        int retval = 0;
+        int rc, state;
 
-        down(&rpaphp_sem);
-        retval = rpaphp_get_pci_adapter_status(slot, 0, value);
-        up(&rpaphp_sem);
-        return retval;
+        rc = rpaphp_get_sensor_state(slot, &state);
+
+        *value = NOT_VALID;
+        if (rc)
+                return rc;
+
+        if (state == EMPTY)
+                *value = EMPTY;
+        else if (state == PRESENT)
+                *value = slot->state;
+
+        return 0;
 }
 
 static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
         struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        down(&rpaphp_sem);
         switch (slot->type) {
         case 1:
         case 2:
@@ -172,7 +161,6 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
                 break;
 
         }
-        up(&rpaphp_sem);
         return 0;
 }
 
@@ -265,6 +253,14 @@ static int is_php_type(char *drc_type)
         return 1;
 }
 
+/**
+ * is_php_dn() - return 1 if this is a hotpluggable pci slot, else 0
+ *
+ * This routine will return true only if the device node is
+ * a hotpluggable slot. This routine will return false
+ * for built-in pci slots (even when the built-in slots are
+ * dlparable.)
+ */
 static int is_php_dn(struct device_node *dn, const int **indexes,
                 const int **names, const int **types, const int **power_domains)
 {
@@ -272,24 +268,31 @@ static int is_php_dn(struct device_node *dn, const int **indexes,
         int rc;
 
         rc = get_children_props(dn, indexes, names, &drc_types, power_domains);
-        if (rc >= 0) {
-                if (is_php_type((char *) &drc_types[1])) {
-                        *types = drc_types;
-                        return 1;
-                }
-        }
+        if (rc < 0)
+                return 0;
 
-        return 0;
+        if (!is_php_type((char *) &drc_types[1]))
+                return 0;
+
+        *types = drc_types;
+        return 1;
 }
 
 /**
- * rpaphp_add_slot -- add hotplug or dlpar slot
+ * rpaphp_add_slot -- declare a hotplug slot to the hotplug subsystem.
+ * @dn device node of slot
+ *
+ * This subroutine will register a hotplugable slot with the
+ * PCI hotplug infrastructure. This routine is typicaly called
+ * during boot time, if the hotplug slots are present at boot time,
+ * or is called later, by the dlpar add code, if the slot is
+ * being dynamically added during runtime.
+ *
+ * If the device node points at an embedded (built-in) slot, this
+ * routine will just return without doing anything, since embedded
+ * slots cannot be hotplugged.
  *
- *      rpaphp not only registers PCI hotplug slots(HOTPLUG), 
- *      but also logical DR slots(EMBEDDED).
- *      HOTPLUG slot: An adapter can be physically added/removed. 
- *      EMBEDDED slot: An adapter can be logically removed/added
- *                from/to a partition with the slot.
+ * To remove a slot, it suffices to call rpaphp_deregister_slot()
  */
 int rpaphp_add_slot(struct device_node *dn)
 {
@@ -299,34 +302,42 @@ int rpaphp_add_slot(struct device_node *dn)
         const int *indexes, *names, *types, *power_domains;
         char *name, *type;
 
+        if (!dn->name || strcmp(dn->name, "pci"))
+                return 0;
+
+        /* If this is not a hotplug slot, return without doing anything. */
+        if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
+                return 0;
+
         dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name);
 
         /* register PCI devices */
-        if (dn->name != 0 && strcmp(dn->name, "pci") == 0) {
-                if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
-                        goto exit;
-
-                name = (char *) &names[1];
-                type = (char *) &types[1];
-                for (i = 0; i < indexes[0]; i++,
-                        name += (strlen(name) + 1), type += (strlen(type) + 1))                 {
-
-                        if (!(slot = alloc_slot_struct(dn, indexes[i + 1], name,
-                                       power_domains[i + 1]))) {
-                                retval = -ENOMEM;
-                                goto exit;
-                        }
-                        slot->type = simple_strtoul(type, NULL, 10);
+        name = (char *) &names[1];
+        type = (char *) &types[1];
+        for (i = 0; i < indexes[0]; i++) {
+
+                slot = alloc_slot_struct(dn, indexes[i + 1], name, power_domains[i + 1]);
+                if (!slot)
+                        return -ENOMEM;
+
+                slot->type = simple_strtoul(type, NULL, 10);
                                 
-                        dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
-                                        indexes[i + 1], name, type);
+                dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
+                                indexes[i + 1], name, type);
 
-                        retval = rpaphp_register_pci_slot(slot);
-                }
+                retval = rpaphp_enable_slot(slot);
+                if (!retval)
+                        retval = rpaphp_register_slot(slot);
+
+                if (retval)
+                        dealloc_slot_struct(slot);
+
+                name += strlen(name) + 1;
+                type += strlen(type) + 1;
         }
-exit:
-        dbg("%s - Exit: num_slots=%d rc[%d]\n",
-            __FUNCTION__, num_slots, retval);
+        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
+        /* XXX FIXME: reports a failure only if last entry in loop failed */
         return retval;
 }
 
@@ -354,7 +365,6 @@ static int __init rpaphp_init(void)
         struct device_node *dn = NULL;
 
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-        init_MUTEX(&rpaphp_sem);
 
         while ((dn = of_find_node_by_name(dn, "pci")))
                 rpaphp_add_slot(dn);
@@ -367,8 +377,9 @@ static void __exit rpaphp_exit(void)
         cleanup_slots();
 }
 
-static int __enable_slot(struct slot *slot)
+static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
+        struct slot *slot = (struct slot *)hotplug_slot->private;
         int state;
         int retval;
 
@@ -392,46 +403,17 @@ static int __enable_slot(struct slot *slot)
         return 0;
 }
 
-static int enable_slot(struct hotplug_slot *hotplug_slot)
+static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
-        int retval;
         struct slot *slot = (struct slot *)hotplug_slot->private;
-
-        down(&rpaphp_sem);
-        retval = __enable_slot(slot);
-        up(&rpaphp_sem);
-
-        return retval;
-}
-
-static int __disable_slot(struct slot *slot)
-{
-        struct pci_dev *dev, *tmp;
-
         if (slot->state == NOT_CONFIGURED)
                 return -EINVAL;
 
-        list_for_each_entry_safe(dev, tmp, &slot->bus->devices, bus_list) {
-                eeh_remove_bus_device(dev);
-                pci_remove_bus_device(dev);
-        }
-
+        pcibios_remove_pci_devices(slot->bus);
         slot->state = NOT_CONFIGURED;
         return 0;
 }
 
-static int disable_slot(struct hotplug_slot *hotplug_slot)
-{
-        struct slot *slot = (struct slot *)hotplug_slot->private;
-        int retval;
-
-        down(&rpaphp_sem);
-        retval = __disable_slot (slot);
-        up(&rpaphp_sem);
-
-        return retval;
-}
-
 struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
         .owner = THIS_MODULE,
         .enable_slot = enable_slot,
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 6f6cbede5135..54ca8650d511 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -64,75 +64,6 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state)
         return rc;
 }
 
-/**
- * get_pci_adapter_status - get the status of a slot
- * 
- * 0-- slot is empty
- * 1-- adapter is configured
- * 2-- adapter is not configured
- * 3-- not valid
- */
-int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value)
-{
-        struct pci_bus *bus;
-        int state, rc;
-
-        *value = NOT_VALID;
-        rc = rpaphp_get_sensor_state(slot, &state);
-        if (rc)
-                goto exit;
-
-        if (state == EMPTY)
-                *value = EMPTY;
-        else if (state == PRESENT) {
-                if (!is_init) {
-                        /* at run-time slot->state can be changed by */
-                        /* config/unconfig adapter */
-                        *value = slot->state;
-                } else {
-                        bus = pcibios_find_pci_bus(slot->dn);
-                        if (bus && !list_empty(&bus->devices))
-                                *value = CONFIGURED;
-                        else
-                                *value = NOT_CONFIGURED;
-                }
-        }
-exit:
-        return rc;
-}
-
-static void print_slot_pci_funcs(struct pci_bus *bus)
-{
-        struct device_node *dn;
-        struct pci_dev *dev;
-
-        dn = pci_bus_to_OF_node(bus);
-        if (!dn)
-                return;
-
-        dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, dn->full_name);
-        list_for_each_entry (dev, &bus->devices, bus_list)
-                dbg("\t%s\n", pci_name(dev));
-        return;
-}
-
-static int setup_pci_hotplug_slot_info(struct slot *slot)
-{
-        struct hotplug_slot_info *hotplug_slot_info = slot->hotplug_slot->info;
-
-        dbg("%s Initilize the PCI slot's hotplug->info structure ...\n",
-            __FUNCTION__);
-        rpaphp_get_power_status(slot, &hotplug_slot_info->power_status);
-        rpaphp_get_pci_adapter_status(slot, 1,
-                                      &hotplug_slot_info->adapter_status);
-        if (hotplug_slot_info->adapter_status == NOT_VALID) {
-                err("%s: NOT_VALID: skip dn->full_name=%s\n",
-                    __FUNCTION__, slot->dn->full_name);
-                return -EINVAL;
-        }
-        return 0;
-}
-
 static void set_slot_name(struct slot *slot)
 {
         struct pci_bus *bus = slot->bus;
@@ -146,69 +77,73 @@ static void set_slot_name(struct slot *slot)
                         bus->number);
 }
 
-static int setup_pci_slot(struct slot *slot)
+/**
+ * rpaphp_enable_slot - record slot state, config pci device
+ *
+ * Initialize values in the slot, and the hotplug_slot info
+ * structures to indicate if there is a pci card plugged into
+ * the slot. If the slot is not empty, run the pcibios routine
+ * to get pcibios stuff correctly set up.
+ */
+int rpaphp_enable_slot(struct slot *slot)
 {
-        struct device_node *dn = slot->dn;
+        int rc, level, state;
         struct pci_bus *bus;
+        struct hotplug_slot_info *info = slot->hotplug_slot->info;
+
+        info->adapter_status = NOT_VALID;
+        slot->state = EMPTY;
+
+        /* Find out if the power is turned on for the slot */
+        rc = rtas_get_power_level(slot->power_domain, &level);
+        if (rc)
+                return rc;
+        info->power_status = level;
+
+        /* Figure out if there is an adapter in the slot */
+        rc = rpaphp_get_sensor_state(slot, &state);
+        if (rc)
+                return rc;
 
-        BUG_ON(!dn);
-        bus = pcibios_find_pci_bus(dn);
+        bus = pcibios_find_pci_bus(slot->dn);
         if (!bus) {
-                err("%s: no pci_bus for dn %s\n", __FUNCTION__, dn->full_name);
-                goto exit_rc;
+                err("%s: no pci_bus for dn %s\n", __FUNCTION__, slot->dn->full_name);
+                return -EINVAL;
         }
 
+        info->adapter_status = EMPTY;
         slot->bus = bus;
         slot->pci_devs = &bus->devices;
         set_slot_name(slot);
 
-        /* find slot's pci_dev if it's not empty */
-        if (slot->hotplug_slot->info->adapter_status == EMPTY) {
-                slot->state = EMPTY;    /* slot is empty */
-        } else {
-                /* slot is occupied */
-                if (!dn->child) {
-                        /* non-empty slot has to have child */
-                        err("%s: slot[%s]'s device_node doesn't have child for adapter\n", 
-                                __FUNCTION__, slot->name);
-                        goto exit_rc;
+        /* if there's an adapter in the slot, go add the pci devices */
+        if (state == PRESENT) {
+                info->adapter_status = NOT_CONFIGURED;
+                slot->state = NOT_CONFIGURED;
+
+                /* non-empty slot has to have child */
+                if (!slot->dn->child) {
+                        err("%s: slot[%s]'s device_node doesn't have child for adapter\n",
+                            __FUNCTION__, slot->name);
+                        return -EINVAL;
                 }
 
-                if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
-                        dbg("%s CONFIGURING pci adapter in slot[%s]\n",  
-                                __FUNCTION__, slot->name);
-                        pcibios_add_pci_devices(slot->bus);
+                if (list_empty(&bus->devices))
+                        pcibios_add_pci_devices(bus);
 
-                } else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
-                        err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
-                                __FUNCTION__, slot->name);
-                        goto exit_rc;
-                }
-                print_slot_pci_funcs(slot->bus);
-                if (!list_empty(slot->pci_devs)) {
+                if (!list_empty(&bus->devices)) {
+                        info->adapter_status = CONFIGURED;
                         slot->state = CONFIGURED;
-                } else {
-                        /* DLPAR add as opposed to 
-                         * boot time */
-                        slot->state = NOT_CONFIGURED;
+                }
+
+                if (debug) {
+                        struct pci_dev *dev;
+                        dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, slot->dn->full_name);
+                        list_for_each_entry (dev, &bus->devices, bus_list)
+                                dbg("\t%s\n", pci_name(dev));
                 }
         }
-        return 0;
-exit_rc:
-        dealloc_slot_struct(slot);
-        return -EINVAL;
-}
 
-int rpaphp_register_pci_slot(struct slot *slot)
-{
-        int rc = -EINVAL;
-
-        if (setup_pci_hotplug_slot_info(slot))
-                goto exit_rc;
-        if (setup_pci_slot(slot))
-                goto exit_rc;
-        rc = rpaphp_register_slot(slot);
-exit_rc:
-        return rc;
+        return 0;
 }
 
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 3009193f0058..d4ee8723fcb3 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = {
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = (struct slot *) hotplug_slot->private;
-
         dealloc_slot_struct(slot);
 }
 
@@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot)
         kfree(slot->hotplug_slot->info);
         kfree(slot->hotplug_slot->name);
         kfree(slot->hotplug_slot);
+        kfree(slot->location);
         kfree(slot);
-        return;
 }
 
-struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name,
-                  int power_domain)
+struct slot *alloc_slot_struct(struct device_node *dn,
+                       int drc_index, char *drc_name, int power_domain)
 {
         struct slot *slot;
         
@@ -115,7 +114,7 @@ error_nomem:
 
 static int is_registered(struct slot *slot)
 {
-        struct slot             *tmp_slot;
+        struct slot *tmp_slot;
 
         list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) {
                 if (!strcmp(tmp_slot->name, slot->name))
@@ -140,8 +139,6 @@ int rpaphp_deregister_slot(struct slot *slot)
         retval = pci_hp_deregister(php_slot);
         if (retval)
                 err("Problem unregistering a slot %s\n", slot->name);
-        else
-                num_slots--;
 
         dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
         return retval;
@@ -160,14 +157,13 @@ int rpaphp_register_slot(struct slot *slot)
         /* should not try to register the same slot twice */
         if (is_registered(slot)) {
                 err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-                retval = -EAGAIN;
-                goto register_fail;
+                return -EAGAIN;
         }       
 
         retval = pci_hp_register(php_slot);
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
-                goto register_fail;
+                return retval;
         }
 
         /* create "phy_location" file */
@@ -181,43 +177,10 @@ int rpaphp_register_slot(struct slot *slot)
         list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
         info("Slot [%s](PCI location=%s) registered\n", slot->name,
                         slot->location);
-        num_slots++;
         return 0;
 
 sysfs_fail:
         pci_hp_deregister(php_slot);
-register_fail:
-        rpaphp_release_slot(php_slot);
         return retval;
 }
 
-int rpaphp_get_power_status(struct slot *slot, u8 * value)
-{
-        int rc = 0, level;
-        
-        rc = rtas_get_power_level(slot->power_domain, &level);
-        if (rc < 0) {
-                err("failed to get power-level for slot(%s), rc=0x%x\n",
-                        slot->location, rc);
-                return rc;
-        }
-
-        dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
-                __FUNCTION__, slot->name, slot->power_domain, level);
-        *value = level;
-
-        return rc;
-}
-
-int rpaphp_set_attention_status(struct slot *slot, u8 status)
-{
-        int rc;
-
-        /* status: LED_OFF or LED_ON */
-        rc = rtas_set_indicator(DR_INDICATOR, slot->index, status);
-        if (rc < 0)
-                err("slot(name=%s location=%s index=0x%x) set attention-status(%d) failed! rc=0x%x\n",
-                    slot->name, slot->location, slot->index, status, rc);
-
-        return rc;
-}
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 01d31a1f697c..37ed0884b972 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -166,7 +166,7 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
 extern int shpchp_configure_device(struct slot *p_slot);
 extern int shpchp_unconfigure_device(struct slot *p_slot);
 extern void cleanup_slots(struct controller *ctrl);
-extern void queue_pushbutton_work(struct work_struct *work);
+extern void shpchp_queue_pushbutton_work(struct work_struct *work);
 extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
 
 #ifdef CONFIG_ACPI
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 5f4bc08a633a..80dec9796b31 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -136,7 +136,7 @@ static int init_slots(struct controller *ctrl)
                 slot->hpc_ops = ctrl->hpc_ops;
                 slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
                 mutex_init(&slot->lock);
-                INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);
+                INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work);
 
                 /* register this slot with the hotplug pci core */
                 hotplug_slot->private = slot;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index b746bd265bc6..2c94d44279a3 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -433,7 +433,7 @@ static void shpchp_pushbutton_thread(struct work_struct *work)
         kfree(info);
 }
 
-void queue_pushbutton_work(struct work_struct *work)
+void shpchp_queue_pushbutton_work(struct work_struct *work)
 {
         struct slot *p_slot = container_of(work, struct slot, work.work);
         struct pushbutton_work_info *info;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 435c1958a7b7..9e1321d0d5e6 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -24,20 +24,8 @@
 #include "pci.h"
 #include "msi.h"
 
-static struct kmem_cache* msi_cachep;
-
 static int pci_msi_enable = 1;
 
-static int msi_cache_init(void)
-{
-        msi_cachep = kmem_cache_create("msi_cache", sizeof(struct msi_desc),
-                                        0, SLAB_HWCACHE_ALIGN, NULL, NULL);
-        if (!msi_cachep)
-                return -ENOMEM;
-
-        return 0;
-}
-
 static void msi_set_enable(struct pci_dev *dev, int enable)
 {
         int pos;
@@ -68,6 +56,29 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
         }
 }
 
+static void msix_flush_writes(unsigned int irq)
+{
+        struct msi_desc *entry;
+
+        entry = get_irq_msi(irq);
+        BUG_ON(!entry || !entry->dev);
+        switch (entry->msi_attrib.type) {
+        case PCI_CAP_ID_MSI:
+                /* nothing to do */
+                break;
+        case PCI_CAP_ID_MSIX:
+        {
+                int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
+                readl(entry->mask_base + offset);
+                break;
+        }
+        default:
+                BUG();
+                break;
+        }
+}
+
 static void msi_set_mask_bit(unsigned int irq, int flag)
 {
         struct msi_desc *entry;
@@ -187,41 +198,28 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
 void mask_msi_irq(unsigned int irq)
 {
         msi_set_mask_bit(irq, 1);
+        msix_flush_writes(irq);
 }
 
 void unmask_msi_irq(unsigned int irq)
 {
         msi_set_mask_bit(irq, 0);
+        msix_flush_writes(irq);
 }
 
-static int msi_free_irq(struct pci_dev* dev, int irq);
-
-static int msi_init(void)
-{
-        static int status = -ENOMEM;
-
-        if (!status)
-                return status;
+static int msi_free_irqs(struct pci_dev* dev);
 
-        status = msi_cache_init();
-        if (status < 0) {
-                pci_msi_enable = 0;
-                printk(KERN_WARNING "PCI: MSI cache init failed\n");
-                return status;
-        }
-
-        return status;
-}
 
 static struct msi_desc* alloc_msi_entry(void)
 {
         struct msi_desc *entry;
 
-        entry = kmem_cache_zalloc(msi_cachep, GFP_KERNEL);
+        entry = kzalloc(sizeof(struct msi_desc), GFP_KERNEL);
         if (!entry)
                 return NULL;
 
-        entry->link.tail = entry->link.head = 0;        /* single message */
+        INIT_LIST_HEAD(&entry->list);
+        entry->irq = 0;
         entry->dev = NULL;
 
         return entry;
@@ -256,7 +254,6 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
 static void __pci_restore_msix_state(struct pci_dev *dev)
 {
         int pos;
-        int irq, head, tail = 0;
         struct msi_desc *entry;
         u16 control;
 
@@ -266,18 +263,15 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
         /* route the table */
         pci_intx(dev, 0);               /* disable intx */
         msix_set_enable(dev, 0);
-        irq = head = dev->first_msi_irq;
-        entry = get_irq_msi(irq);
-        pos = entry->msi_attrib.pos;
-        while (head != tail) {
-                entry = get_irq_msi(irq);
-                write_msi_msg(irq, &entry->msg);
-                msi_set_mask_bit(irq, entry->msi_attrib.masked);
 
-                tail = entry->link.tail;
-                irq = tail;
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                write_msi_msg(entry->irq, &entry->msg);
+                msi_set_mask_bit(entry->irq, entry->msi_attrib.masked);
         }
 
+        BUG_ON(list_empty(&dev->msi_list));
+        entry = list_entry(dev->msi_list.next, struct msi_desc, list);
+        pos = entry->msi_attrib.pos;
         pci_read_config_word(dev, pos + PCI_MSIX_FLAGS, &control);
         control &= ~PCI_MSIX_FLAGS_MASKALL;
         control |= PCI_MSIX_FLAGS_ENABLE;
@@ -303,7 +297,7 @@ void pci_restore_msi_state(struct pci_dev *dev)
 static int msi_capability_init(struct pci_dev *dev)
 {
         struct msi_desc *entry;
-        int pos, irq;
+        int pos, ret;
         u16 control;
 
         msi_set_enable(dev, 0); /* Ensure msi is disabled as I set it up */
@@ -340,23 +334,21 @@ static int msi_capability_init(struct pci_dev *dev)
                         msi_mask_bits_reg(pos, is_64bit_address(control)),
                         maskbits);
         }
+        list_add(&entry->list, &dev->msi_list);
+
         /* Configure MSI capability structure */
-        irq = arch_setup_msi_irq(dev, entry);
-        if (irq < 0) {
-                kmem_cache_free(msi_cachep, entry);
-                return irq;
+        ret = arch_setup_msi_irqs(dev, 1, PCI_CAP_ID_MSI);
+        if (ret) {
+                msi_free_irqs(dev);
+                return ret;
         }
-        entry->link.head = irq;
-        entry->link.tail = irq;
-        dev->first_msi_irq = irq;
-        set_irq_msi(irq, entry);
 
         /* Set MSI enabled bits  */
         pci_intx(dev, 0);               /* disable intx */
         msi_set_enable(dev, 1);
         dev->msi_enabled = 1;
 
-        dev->irq = irq;
+        dev->irq = entry->irq;
         return 0;
 }
 
@@ -373,8 +365,8 @@ static int msi_capability_init(struct pci_dev *dev)
 static int msix_capability_init(struct pci_dev *dev,
                                 struct msix_entry *entries, int nvec)
 {
-        struct msi_desc *head = NULL, *tail = NULL, *entry = NULL;
-        int irq, pos, i, j, nr_entries, temp = 0;
+        struct msi_desc *entry;
+        int pos, i, j, nr_entries, ret;
         unsigned long phys_addr;
         u32 table_offset;
         u16 control;
@@ -413,44 +405,34 @@ static int msix_capability_init(struct pci_dev *dev,
                 entry->dev = dev;
                 entry->mask_base = base;
 
-                /* Configure MSI-X capability structure */
-                irq = arch_setup_msi_irq(dev, entry);
-                if (irq < 0) {
-                        kmem_cache_free(msi_cachep, entry);
-                        break;
-                }
-                entries[i].vector = irq;
-                if (!head) {
-                        entry->link.head = irq;
-                        entry->link.tail = irq;
-                        head = entry;
-                } else {
-                        entry->link.head = temp;
-                        entry->link.tail = tail->link.tail;
-                        tail->link.tail = irq;
-                        head->link.head = irq;
-                }
-                temp = irq;
-                tail = entry;
-
-                set_irq_msi(irq, entry);
+                list_add(&entry->list, &dev->msi_list);
         }
-        if (i != nvec) {
-                int avail = i - 1;
-                i--;
-                for (; i >= 0; i--) {
-                        irq = (entries + i)->vector;
-                        msi_free_irq(dev, irq);
-                        (entries + i)->vector = 0;
+
+        ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
+        if (ret) {
+                int avail = 0;
+                list_for_each_entry(entry, &dev->msi_list, list) {
+                        if (entry->irq != 0) {
+                                avail++;
+                        }
                 }
+
+                msi_free_irqs(dev);
+
                 /* If we had some success report the number of irqs
                  * we succeeded in setting up.
                  */
-                if (avail <= 0)
-                        avail = -EBUSY;
+                if (avail == 0)
+                        avail = ret;
                 return avail;
         }
-        dev->first_msi_irq = entries[0].vector;
+
+        i = 0;
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                entries[i].vector = entry->irq;
+                set_irq_msi(entry->irq, entry);
+                i++;
+        }
         /* Set MSI-X enabled bits */
         pci_intx(dev, 0);               /* disable intx */
         msix_set_enable(dev, 1);
@@ -460,21 +442,32 @@ static int msix_capability_init(struct pci_dev *dev,
 }
 
 /**
- * pci_msi_supported - check whether MSI may be enabled on device
+ * pci_msi_check_device - check whether MSI may be enabled on a device
  * @dev: pointer to the pci_dev data structure of MSI device function
+ * @nvec: how many MSIs have been requested ?
+ * @type: are we checking for MSI or MSI-X ?
  *
  * Look at global flags, the device itself, and its parent busses
- * to return 0 if MSI are supported for the device.
+ * to determine if MSI/-X are supported for the device. If MSI/-X is
+ * supported return 0, else return an error code.
  **/
-static
-int pci_msi_supported(struct pci_dev * dev)
+static int pci_msi_check_device(struct pci_dev* dev, int nvec, int type)
 {
         struct pci_bus *bus;
+        int ret;
 
         /* MSI must be globally enabled and supported by the device */
         if (!pci_msi_enable || !dev || dev->no_msi)
                 return -EINVAL;
 
+        /*
+         * You can't ask to have 0 or less MSIs configured.
+         *  a) it's stupid ..
+         *  b) the list manipulation code assumes nvec >= 1.
+         */
+        if (nvec < 1)
+                return -ERANGE;
+
         /* Any bridge which does NOT route MSI transactions from it's
          * secondary bus to it's primary bus must set NO_MSI flag on
          * the secondary pci_bus.
@@ -485,6 +478,13 @@ int pci_msi_supported(struct pci_dev * dev)
                 if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
                         return -EINVAL;
 
+        ret = arch_msi_check_device(dev, nvec, type);
+        if (ret)
+                return ret;
+
+        if (!pci_find_capability(dev, type))
+                return -EINVAL;
+
         return 0;
 }
 
@@ -500,19 +500,12 @@ int pci_msi_supported(struct pci_dev * dev)
  **/
 int pci_enable_msi(struct pci_dev* dev)
 {
-        int pos, status;
-
-        if (pci_msi_supported(dev) < 0)
-                return -EINVAL;
+        int status;
 
-        status = msi_init();
-        if (status < 0)
+        status = pci_msi_check_device(dev, 1, PCI_CAP_ID_MSI);
+        if (status)
                 return status;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
-        if (!pos)
-                return -EINVAL;
-
         WARN_ON(!!dev->msi_enabled);
 
         /* Check whether driver already requested for MSI-X irqs */
@@ -525,69 +518,54 @@ int pci_enable_msi(struct pci_dev* dev)
         status = msi_capability_init(dev);
         return status;
 }
+EXPORT_SYMBOL(pci_enable_msi);
 
 void pci_disable_msi(struct pci_dev* dev)
 {
         struct msi_desc *entry;
         int default_irq;
 
-        if (!pci_msi_enable)
-                return;
-        if (!dev)
-                return;
-
-        if (!dev->msi_enabled)
+        if (!pci_msi_enable || !dev || !dev->msi_enabled)
                 return;
 
         msi_set_enable(dev, 0);
         pci_intx(dev, 1);               /* enable intx */
         dev->msi_enabled = 0;
 
-        entry = get_irq_msi(dev->first_msi_irq);
-        if (!entry || !entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
+        BUG_ON(list_empty(&dev->msi_list));
+        entry = list_entry(dev->msi_list.next, struct msi_desc, list);
+        if (!entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
                 return;
         }
-        if (irq_has_action(dev->first_msi_irq)) {
-                printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
-                       "free_irq() on MSI irq %d\n",
-                       pci_name(dev), dev->first_msi_irq);
-                BUG_ON(irq_has_action(dev->first_msi_irq));
-        } else {
-                default_irq = entry->msi_attrib.default_irq;
-                msi_free_irq(dev, dev->first_msi_irq);
-
-                /* Restore dev->irq to its default pin-assertion irq */
-                dev->irq = default_irq;
-        }
-        dev->first_msi_irq = 0;
+
+        default_irq = entry->msi_attrib.default_irq;
+        msi_free_irqs(dev);
+
+        /* Restore dev->irq to its default pin-assertion irq */
+        dev->irq = default_irq;
 }
+EXPORT_SYMBOL(pci_disable_msi);
 
-static int msi_free_irq(struct pci_dev* dev, int irq)
+static int msi_free_irqs(struct pci_dev* dev)
 {
-        struct msi_desc *entry;
-        int head, entry_nr, type;
-        void __iomem *base;
+        struct msi_desc *entry, *tmp;
 
-        entry = get_irq_msi(irq);
-        if (!entry || entry->dev != dev) {
-                return -EINVAL;
-        }
-        type = entry->msi_attrib.type;
-        entry_nr = entry->msi_attrib.entry_nr;
-        head = entry->link.head;
-        base = entry->mask_base;
-        get_irq_msi(entry->link.head)->link.tail = entry->link.tail;
-        get_irq_msi(entry->link.tail)->link.head = entry->link.head;
-
-        arch_teardown_msi_irq(irq);
-        kmem_cache_free(msi_cachep, entry);
-
-        if (type == PCI_CAP_ID_MSIX) {
-                writel(1, base + entry_nr * PCI_MSIX_ENTRY_SIZE +
-                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
-
-                if (head == irq)
-                        iounmap(base);
+        list_for_each_entry(entry, &dev->msi_list, list)
+                BUG_ON(irq_has_action(entry->irq));
+
+        arch_teardown_msi_irqs(dev);
+
+        list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) {
+                if (entry->msi_attrib.type == PCI_CAP_ID_MSIX) {
+                        if (list_is_last(&entry->list, &dev->msi_list))
+                                iounmap(entry->mask_base);
+
+                        writel(1, entry->mask_base + entry->msi_attrib.entry_nr
+                                  * PCI_MSIX_ENTRY_SIZE
+                                  + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+                }
+                list_del(&entry->list);
+                kfree(entry);
         }
 
         return 0;
@@ -614,17 +592,14 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
         int i, j;
         u16 control;
 
-        if (!entries || pci_msi_supported(dev) < 0)
+        if (!entries)
                 return -EINVAL;
 
-        status = msi_init();
-        if (status < 0)
+        status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);
+        if (status)
                 return status;
 
         pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
-        if (!pos)
-                return -EINVAL;
-
         pci_read_config_word(dev, msi_control_reg(pos), &control);
         nr_entries = multi_msix_capable(control);
         if (nvec > nr_entries)
@@ -651,41 +626,25 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
         status = msix_capability_init(dev, entries, nvec);
         return status;
 }
+EXPORT_SYMBOL(pci_enable_msix);
 
-void pci_disable_msix(struct pci_dev* dev)
+static void msix_free_all_irqs(struct pci_dev *dev)
 {
-        int irq, head, tail = 0, warning = 0;
-
-        if (!pci_msi_enable)
-                return;
-        if (!dev)
-                return;
+        msi_free_irqs(dev);
+}
 
-        if (!dev->msix_enabled)
+void pci_disable_msix(struct pci_dev* dev)
+{
+        if (!pci_msi_enable || !dev || !dev->msix_enabled)
                 return;
 
         msix_set_enable(dev, 0);
         pci_intx(dev, 1);               /* enable intx */
         dev->msix_enabled = 0;
 
-        irq = head = dev->first_msi_irq;
-        while (head != tail) {
-                tail = get_irq_msi(irq)->link.tail;
-                if (irq_has_action(irq))
-                        warning = 1;
-                else if (irq != head)   /* Release MSI-X irq */
-                        msi_free_irq(dev, irq);
-                irq = tail;
-        }
-        msi_free_irq(dev, irq);
-        if (warning) {
-                printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
-                        "free_irq() on all MSI-X irqs\n",
-                        pci_name(dev));
-                BUG_ON(warning > 0);
-        }
-        dev->first_msi_irq = 0;
+        msix_free_all_irqs(dev);
 }
+EXPORT_SYMBOL(pci_disable_msix);
 
 /**
  * msi_remove_pci_irq_vectors - reclaim MSI(X) irqs to unused state
@@ -701,38 +660,11 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
         if (!pci_msi_enable || !dev)
                 return;
 
-        if (dev->msi_enabled) {
-                if (irq_has_action(dev->first_msi_irq)) {
-                        printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                               "called without free_irq() on MSI irq %d\n",
-                               pci_name(dev), dev->first_msi_irq);
-                        BUG_ON(irq_has_action(dev->first_msi_irq));
-                } else /* Release MSI irq assigned to this device */
-                        msi_free_irq(dev, dev->first_msi_irq);
-        }
-        if (dev->msix_enabled) {
-                int irq, head, tail = 0, warning = 0;
-                void __iomem *base = NULL;
-
-                irq = head = dev->first_msi_irq;
-                while (head != tail) {
-                        tail = get_irq_msi(irq)->link.tail;
-                        base = get_irq_msi(irq)->mask_base;
-                        if (irq_has_action(irq))
-                                warning = 1;
-                        else if (irq != head) /* Release MSI-X irq */
-                                msi_free_irq(dev, irq);
-                        irq = tail;
-                }
-                msi_free_irq(dev, irq);
-                if (warning) {
-                        iounmap(base);
-                        printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                               "called without free_irq() on all MSI-X irqs\n",
-                               pci_name(dev));
-                        BUG_ON(warning > 0);
-                }
-        }
+        if (dev->msi_enabled)
+                msi_free_irqs(dev);
+
+        if (dev->msix_enabled)
+                msix_free_all_irqs(dev);
 }
 
 void pci_no_msi(void)
@@ -740,7 +672,53 @@ void pci_no_msi(void)
         pci_msi_enable = 0;
 }
 
-EXPORT_SYMBOL(pci_enable_msi);
-EXPORT_SYMBOL(pci_disable_msi);
-EXPORT_SYMBOL(pci_enable_msix);
-EXPORT_SYMBOL(pci_disable_msix);
+void pci_msi_init_pci_dev(struct pci_dev *dev)
+{
+        INIT_LIST_HEAD(&dev->msi_list);
+}
+
+
+/* Arch hooks */
+
+int __attribute__ ((weak))
+arch_msi_check_device(struct pci_dev* dev, int nvec, int type)
+{
+        return 0;
+}
+
+int __attribute__ ((weak))
+arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *entry)
+{
+        return 0;
+}
+
+int __attribute__ ((weak))
+arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+{
+        struct msi_desc *entry;
+        int ret;
+
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                ret = arch_setup_msi_irq(dev, entry);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+void __attribute__ ((weak)) arch_teardown_msi_irq(unsigned int irq)
+{
+        return;
+}
+
+void __attribute__ ((weak))
+arch_teardown_msi_irqs(struct pci_dev *dev)
+{
+        struct msi_desc *entry;
+
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                if (entry->irq != 0)
+                        arch_teardown_msi_irq(entry->irq);
+        }
+}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 39e80fcef4b3..3bb7739d26a5 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -14,20 +14,6 @@
 #include "pci.h"
 
 /*
- *  Registration of PCI drivers and handling of hot-pluggable devices.
- */
-
-/* multithreaded probe logic */
-static int pci_multithread_probe =
-#ifdef CONFIG_PCI_MULTITHREAD_PROBE
-        1;
-#else
-        0;
-#endif
-__module_param_call("", pci_multithread_probe, param_set_bool, param_get_bool, &pci_multithread_probe, 0644);
-
-
-/*
  * Dynamic device IDs are disabled for !CONFIG_HOTPLUG
  */
 
@@ -52,7 +38,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
 {
         struct pci_dynid *dynid;
         struct pci_driver *pdrv = to_pci_driver(driver);
-        __u32 vendor=PCI_ANY_ID, device=PCI_ANY_ID, subvendor=PCI_ANY_ID,
+        __u32 vendor, device, subvendor=PCI_ANY_ID,
                 subdevice=PCI_ANY_ID, class=0, class_mask=0;
         unsigned long driver_data=0;
         int fields=0;
@@ -61,7 +47,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
         fields = sscanf(buf, "%x %x %x %x %x %x %lux",
                         &vendor, &device, &subvendor, &subdevice,
                         &class, &class_mask, &driver_data);
-        if (fields < 0)
+        if (fields < 2)
                 return -EINVAL;
 
         dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
@@ -569,7 +555,6 @@ struct bus_type pci_bus_type = {
 
 static int __init pci_driver_init(void)
 {
-        pci_bus_type.multithread_probe = pci_multithread_probe;
         return bus_register(&pci_bus_type);
 }
 
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index cd913a2a416f..284e83a527f9 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -620,7 +620,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                 goto err_bin_file;
 
         /* If the device has a ROM, try to expose it in sysfs. */
-        if (pci_resource_len(pdev, PCI_ROM_RESOURCE)) {
+        if (pci_resource_len(pdev, PCI_ROM_RESOURCE) ||
+            (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
                 rom_attr = kzalloc(sizeof(*rom_attr), GFP_ATOMIC);
                 if (rom_attr) {
                         pdev->rom_attr = rom_attr;
@@ -635,7 +636,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                                 goto err_rom;
                 } else {
                         retval = -ENOMEM;
-                        goto err_bin_file;
+                        goto err_resource_files;
                 }
         }
         /* add platform-specific attributes */
@@ -645,6 +646,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
 
 err_rom:
         kfree(rom_attr);
+err_resource_files:
+        pci_remove_resource_files(pdev);
 err_bin_file:
         if (pdev->cfg_size < 4096)
                 sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);
@@ -695,4 +698,4 @@ static int __init pci_sysfs_init(void)
         return 0;
 }
 
-__initcall(pci_sysfs_init);
+late_initcall(pci_sysfs_init);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2a458279327a..fd47ac0c4730 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -35,8 +35,7 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE;
  * Given a PCI bus, returns the highest PCI bus number present in the set
  * including the given PCI bus and its list of child PCI buses.
  */
-unsigned char __devinit
-pci_bus_max_busnr(struct pci_bus* bus)
+unsigned char pci_bus_max_busnr(struct pci_bus* bus)
 {
         struct list_head *tmp;
         unsigned char max, n;
@@ -892,6 +891,34 @@ pci_disable_device(struct pci_dev *dev)
 }
 
 /**
+ * pcibios_set_pcie_reset_state - set reset state for device dev
+ * @dev: the PCI-E device reset
+ * @state: Reset state to enter into
+ *
+ *
+ * Sets the PCI-E reset state for the device. This is the default
+ * implementation. Architecture implementations can override this.
+ */
+int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev,
+                                                        enum pcie_reset_state state)
+{
+        return -EINVAL;
+}
+
+/**
+ * pci_set_pcie_reset_state - set reset state for device dev
+ * @dev: the PCI-E device reset
+ * @state: Reset state to enter into
+ *
+ *
+ * Sets the PCI reset state for the device.
+ */
+int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state)
+{
+        return pcibios_set_pcie_reset_state(dev, state);
+}
+
+/**
  * pci_enable_wake - enable PCI device as wakeup event source
  * @dev: PCI device affected
  * @state: PCI state from which device will issue wakeup events
@@ -1295,7 +1322,7 @@ pci_intx(struct pci_dev *pdev, int enable)
 
 /**
  * pci_msi_off - disables any msi or msix capabilities
- * @pdev: the PCI device to operate on
+ * @dev: the PCI device to operate on
  *
  * If you want to use msi see pci_enable_msi and friends.
  * This is a lower level primitive that allows us to disable
@@ -1427,4 +1454,5 @@ EXPORT_SYMBOL(pci_set_power_state);
 EXPORT_SYMBOL(pci_save_state);
 EXPORT_SYMBOL(pci_restore_state);
 EXPORT_SYMBOL(pci_enable_wake);
+EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);
 
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 62ea04c8af64..3fec13d3add7 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -47,8 +47,10 @@ extern unsigned int pci_pm_d3_delay;
 
 #ifdef CONFIG_PCI_MSI
 void pci_no_msi(void);
+extern void pci_msi_init_pci_dev(struct pci_dev *dev);
 #else
 static inline void pci_no_msi(void) { }
+static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
 #endif
 
 #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2fe1d690eb13..e48fcf089621 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -364,7 +364,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
         }
 }
 
-static struct pci_bus * __devinit pci_alloc_bus(void)
+static struct pci_bus * pci_alloc_bus(void)
 {
         struct pci_bus *b;
 
@@ -432,7 +432,7 @@ error_register:
         return NULL;
 }
 
-struct pci_bus * __devinit pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
+struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
 {
         struct pci_bus *child;
 
@@ -461,7 +461,7 @@ static void pci_enable_crs(struct pci_dev *dev)
         pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl);
 }
 
-static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
+static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
 {
         struct pci_bus *parent = child->parent;
 
@@ -477,7 +477,7 @@ static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child,
         }
 }
 
-unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
+unsigned int pci_scan_child_bus(struct pci_bus *bus);
 
 /*
  * If it's a bridge, configure it and scan the bus behind it.
@@ -489,7 +489,7 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
  * them, we proceed to assigning numbers to the remaining buses in
  * order to avoid overlaps between old and new bus numbers.
  */
-int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass)
+int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass)
 {
         struct pci_bus *child;
         int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
@@ -846,6 +846,23 @@ static void pci_release_bus_bridge_dev(struct device *dev)
         kfree(dev);
 }
 
+struct pci_dev *alloc_pci_dev(void)
+{
+        struct pci_dev *dev;
+
+        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        INIT_LIST_HEAD(&dev->global_list);
+        INIT_LIST_HEAD(&dev->bus_list);
+
+        pci_msi_init_pci_dev(dev);
+
+        return dev;
+}
+EXPORT_SYMBOL(alloc_pci_dev);
+
 /*
  * Read the config data for a PCI device, sanity-check it
  * and fill in the dev structure...
@@ -885,7 +902,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)
         if (pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type))
                 return NULL;
 
-        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = alloc_pci_dev();
         if (!dev)
                 return NULL;
 
@@ -912,7 +929,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)
         return dev;
 }
 
-void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
+void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
         device_initialize(&dev->dev);
         dev->dev.release = pci_release_dev;
@@ -935,8 +952,7 @@ void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
         up_write(&pci_bus_sem);
 }
 
-struct pci_dev * __devinit
-pci_scan_single_device(struct pci_bus *bus, int devfn)
+struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn)
 {
         struct pci_dev *dev;
 
@@ -958,7 +974,7 @@ pci_scan_single_device(struct pci_bus *bus, int devfn)
  * discovered devices to the @bus->devices list.  New devices
  * will have an empty dev->global_list head.
  */
-int __devinit pci_scan_slot(struct pci_bus *bus, int devfn)
+int pci_scan_slot(struct pci_bus *bus, int devfn)
 {
         int func, nr = 0;
         int scan_all_fns;
@@ -991,7 +1007,7 @@ int __devinit pci_scan_slot(struct pci_bus *bus, int devfn)
         return nr;
 }
 
-unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
+unsigned int pci_scan_child_bus(struct pci_bus *bus)
 {
         unsigned int devfn, pass, max = bus->secondary;
         struct pci_dev *dev;
@@ -1041,7 +1057,7 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
         return max;
 }
 
-struct pci_bus * __devinit pci_create_bus(struct device *parent,
+struct pci_bus * pci_create_bus(struct device *parent,
                 int bus, struct pci_ops *ops, void *sysdata)
 {
         int error;
@@ -1119,7 +1135,7 @@ err_out:
 }
 EXPORT_SYMBOL_GPL(pci_create_bus);
 
-struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
+struct pci_bus *pci_scan_bus_parented(struct device *parent,
                 int bus, struct pci_ops *ops, void *sysdata)
 {
         struct pci_bus *b;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 3411483240cd..147d86f8edbf 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1648,6 +1648,8 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_msi);
 
 /* Go through the list of Hypertransport capabilities and
  * return 1 if a HT MSI capability is found and enabled */
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 2dd8681d6b31..b137a27472c7 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -15,8 +15,7 @@
 
 DECLARE_RWSEM(pci_bus_sem);
 
-static struct pci_bus *
-pci_do_find_bus(struct pci_bus* bus, unsigned char busnr)
+static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
 {
         struct pci_bus* child;
         struct list_head *tmp;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3554f3948814..5ec297d7a5b4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -36,8 +36,7 @@
 
 #define ROUND_UP(x, a)          (((x) + (a) - 1) & ~((a) - 1))
 
-static void __devinit
-pbus_assign_resources_sorted(struct pci_bus *bus)
+static void pbus_assign_resources_sorted(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct resource *res;
@@ -220,8 +219,7 @@ pci_setup_bridge(struct pci_bus *bus)
 /* Check whether the bridge supports optional I/O and
    prefetchable memory ranges. If not, the respective
    base/limit registers must be read-only and read as 0. */
-static void __devinit
-pci_bridge_check_ranges(struct pci_bus *bus)
+static void pci_bridge_check_ranges(struct pci_bus *bus)
 {
         u16 io;
         u32 pmem;
@@ -259,8 +257,7 @@ pci_bridge_check_ranges(struct pci_bus *bus)
    bus resource of a given type. Note: we intentionally skip
    the bus resources which have already been assigned (that is,
    have non-NULL parent resource). */
-static struct resource * __devinit
-find_free_bus_resource(struct pci_bus *bus, unsigned long type)
+static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned long type)
 {
         int i;
         struct resource *r;
@@ -281,8 +278,7 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type)
    since these windows have 4K granularity and the IO ranges
    of non-bridge PCI devices are limited to 256 bytes.
    We must be careful with the ISA aliasing though. */
-static void __devinit
-pbus_size_io(struct pci_bus *bus)
+static void pbus_size_io(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
@@ -326,8 +322,7 @@ pbus_size_io(struct pci_bus *bus)
 
 /* Calculate the size of the bus and minimal alignment which
    guarantees that all child resources fit in this size. */
-static int __devinit
-pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
+static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
 {
         struct pci_dev *dev;
         unsigned long min_align, align, size;
@@ -447,8 +442,7 @@ pci_bus_size_cardbus(struct pci_bus *bus)
         }
 }
 
-void __devinit
-pci_bus_size_bridges(struct pci_bus *bus)
+void pci_bus_size_bridges(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         unsigned long mask, prefmask;
@@ -498,8 +492,7 @@ pci_bus_size_bridges(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_size_bridges);
 
-void __devinit
-pci_bus_assign_resources(struct pci_bus *bus)
+void pci_bus_assign_resources(struct pci_bus *bus)
 {
         struct pci_bus *b;
         struct pci_dev *dev;
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index cb4ced3560e9..6dfd86167e39 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -101,8 +101,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
                 new & ~PCI_REGION_FLAG_MASK);
 }
 
-int __devinit
-pci_claim_resource(struct pci_dev *dev, int resource)
+int pci_claim_resource(struct pci_dev *dev, int resource)
 {
         struct resource *res = &dev->resource[resource];
         struct resource *root = NULL;
@@ -212,8 +211,7 @@ EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);
 #endif
 
 /* Sort resources by alignment */
-void __devinit
-pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
+void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 {
         int i;
 
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 99baabc23599..948efc775a78 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -360,7 +360,6 @@ static struct platform_driver at91_cf_driver = {
                 .name           = (char *) driver_name,
                 .owner          = THIS_MODULE,
         },
-        .probe          = at91_cf_probe,
         .remove         = __exit_p(at91_cf_remove),
         .suspend        = at91_cf_suspend,
         .resume         = at91_cf_resume,
@@ -370,7 +369,7 @@ static struct platform_driver at91_cf_driver = {
 
 static int __init at91_cf_init(void)
 {
-        return platform_driver_register(&at91_cf_driver);
+        return platform_driver_probe(&at91_cf_driver, at91_cf_probe);
 }
 module_init(at91_cf_init);
 
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index ac004248324a..50cad3a59a6c 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -26,7 +26,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 18e111e12339..143c6efc478a 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -234,6 +234,89 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 /*======================================================================*/
 
 
+struct pcmcia_dynid {
+        struct list_head                node;
+        struct pcmcia_device_id         id;
+};
+
+/**
+ * pcmcia_store_new_id - add a new PCMCIA device ID to this driver and re-probe devices
+ * @driver: target device driver
+ * @buf: buffer for scanning device ID data
+ * @count: input size
+ *
+ * Adds a new dynamic PCMCIA device ID to this driver,
+ * and causes the driver to probe for all devices again.
+ */
+static ssize_t
+pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
+{
+        struct pcmcia_dynid *dynid;
+        struct pcmcia_driver *pdrv = to_pcmcia_drv(driver);
+        __u16 match_flags, manf_id, card_id;
+        __u8 func_id, function, device_no;
+        __u32 prod_id_hash[4] = {0, 0, 0, 0};
+        int fields=0;
+        int retval = 0;
+
+        fields = sscanf(buf, "%hx %hx %hx %hhx %hhx %hhx %x %x %x %x",
+                        &match_flags, &manf_id, &card_id, &func_id, &function, &device_no,
+                        &prod_id_hash[0], &prod_id_hash[1], &prod_id_hash[2], &prod_id_hash[3]);
+        if (fields < 6)
+                return -EINVAL;
+
+        dynid = kzalloc(sizeof(struct pcmcia_dynid), GFP_KERNEL);
+        if (!dynid)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&dynid->node);
+        dynid->id.match_flags = match_flags;
+        dynid->id.manf_id = manf_id;
+        dynid->id.card_id = card_id;
+        dynid->id.func_id = func_id;
+        dynid->id.function = function;
+        dynid->id.device_no = device_no;
+        memcpy(dynid->id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);
+
+        spin_lock(&pdrv->dynids.lock);
+        list_add_tail(&pdrv->dynids.list, &dynid->node);
+        spin_unlock(&pdrv->dynids.lock);
+
+        if (get_driver(&pdrv->drv)) {
+                retval = driver_attach(&pdrv->drv);
+                put_driver(&pdrv->drv);
+        }
+
+        if (retval)
+                return retval;
+        return count;
+}
+static DRIVER_ATTR(new_id, S_IWUSR, NULL, pcmcia_store_new_id);
+
+static void
+pcmcia_free_dynids(struct pcmcia_driver *drv)
+{
+        struct pcmcia_dynid *dynid, *n;
+
+        spin_lock(&drv->dynids.lock);
+        list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
+                list_del(&dynid->node);
+                kfree(dynid);
+        }
+        spin_unlock(&drv->dynids.lock);
+}
+
+static int
+pcmcia_create_newid_file(struct pcmcia_driver *drv)
+{
+        int error = 0;
+        if (drv->probe != NULL)
+                error = sysfs_create_file(&drv->drv.kobj,
+                                          &driver_attr_new_id.attr);
+        return error;
+}
+
+
 /**
  * pcmcia_register_driver - register a PCMCIA driver with the bus core
  *
@@ -241,6 +324,8 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
  */
 int pcmcia_register_driver(struct pcmcia_driver *driver)
 {
+        int error;
+
         if (!driver)
                 return -EINVAL;
 
@@ -249,10 +334,20 @@ int pcmcia_register_driver(struct pcmcia_driver *driver)
         /* initialize common fields */
         driver->drv.bus = &pcmcia_bus_type;
         driver->drv.owner = driver->owner;
+        spin_lock_init(&driver->dynids.lock);
+        INIT_LIST_HEAD(&driver->dynids.list);
 
         ds_dbg(3, "registering driver %s\n", driver->drv.name);
 
-        return driver_register(&driver->drv);
+        error = driver_register(&driver->drv);
+        if (error < 0)
+                return error;
+
+        error = pcmcia_create_newid_file(driver);
+        if (error)
+                driver_unregister(&driver->drv);
+
+        return error;
 }
 EXPORT_SYMBOL(pcmcia_register_driver);
 
@@ -263,6 +358,7 @@ void pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
         ds_dbg(3, "unregistering driver %s\n", driver->drv.name);
         driver_unregister(&driver->drv);
+        pcmcia_free_dynids(driver);
 }
 EXPORT_SYMBOL(pcmcia_unregister_driver);
 
@@ -927,6 +1023,21 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
         struct pcmcia_device * p_dev = to_pcmcia_dev(dev);
         struct pcmcia_driver * p_drv = to_pcmcia_drv(drv);
         struct pcmcia_device_id *did = p_drv->id_table;
+        struct pcmcia_dynid *dynid;
+
+        /* match dynamic devices first */
+        spin_lock(&p_drv->dynids.lock);
+        list_for_each_entry(dynid, &p_drv->dynids.list, node) {
+                ds_dbg(3, "trying to match %s to %s\n", dev->bus_id,
+                       drv->name);
+                if (pcmcia_devmatch(p_dev, &dynid->id)) {
+                        ds_dbg(0, "matched %s to %s\n", dev->bus_id,
+                               drv->name);
+                        spin_unlock(&p_drv->dynids.lock);
+                        return 1;
+                }
+        }
+        spin_unlock(&p_drv->dynids.lock);
 
 #ifdef CONFIG_PCMCIA_IOCTL
         /* matching by cardmgr */
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index ea5765c3bdc0..a2bb46526b56 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <asm/system.h>
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index d21e04ccb021..1393e64335f9 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -38,7 +38,24 @@
 static int timeout = 5000;      /* in msec ( 5 sec ) */
 module_param(timeout, int, 0644);
 
-static struct ps3av ps3av;
+static struct ps3av {
+        int available;
+        struct mutex mutex;
+        struct work_struct work;
+        struct completion done;
+        struct workqueue_struct *wq;
+        int open_count;
+        struct ps3_vuart_port_device *dev;
+
+        int region;
+        struct ps3av_pkt_av_get_hw_conf av_hw_conf;
+        u32 av_port[PS3AV_AV_PORT_MAX + PS3AV_OPT_PORT_MAX];
+        u32 opt_port[PS3AV_OPT_PORT_MAX];
+        u32 head[PS3AV_HEAD_MAX];
+        u32 audio_port;
+        int ps3av_mode;
+        int ps3av_mode_old;
+} ps3av;
 
 static struct ps3_vuart_port_device ps3av_dev = {
         .match_id = PS3_MATCH_ID_AV_SETTINGS
@@ -159,7 +176,7 @@ static int ps3av_parse_event_packet(const struct ps3av_reply_hdr *hdr)
                 else
                         printk(KERN_ERR
                                "%s: failed event packet, cid:%08x size:%d\n",
-                               __FUNCTION__, hdr->cid, hdr->size);
+                               __func__, hdr->cid, hdr->size);
                 return 1;       /* receive event packet */
         }
         return 0;
@@ -181,7 +198,7 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
         if (res < 0) {
                 dev_dbg(&ps3av_dev.core,
                         "%s: ps3av_vuart_write() failed (result=%d)\n",
-                        __FUNCTION__, res);
+                        __func__, res);
                 return res;
         }
 
@@ -194,7 +211,7 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
                 if (res != PS3AV_HDR_SIZE) {
                         dev_dbg(&ps3av_dev.core,
                                 "%s: ps3av_vuart_read() failed (result=%d)\n",
-                                __FUNCTION__, res);
+                                __func__, res);
                         return res;
                 }
 
@@ -204,7 +221,7 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
                 if (res < 0) {
                         dev_dbg(&ps3av_dev.core,
                                 "%s: ps3av_vuart_read() failed (result=%d)\n",
-                                __FUNCTION__, res);
+                                __func__, res);
                         return res;
                 }
                 res += PS3AV_HDR_SIZE;  /* total len */
@@ -214,7 +231,7 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf,
 
         if ((cmd | PS3AV_REPLY_BIT) != recv_buf->cid) {
                 dev_dbg(&ps3av_dev.core, "%s: reply err (result=%x)\n",
-                        __FUNCTION__, recv_buf->cid);
+                        __func__, recv_buf->cid);
                 return -EINVAL;
         }
 
@@ -250,7 +267,7 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
                  struct ps3av_send_hdr *buf)
 {
         int res = 0;
-        union {
+        static union {
                 struct ps3av_reply_hdr reply_hdr;
                 u8 raw[PS3AV_BUF_SIZE];
         } recv_buf;
@@ -259,8 +276,7 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
 
         BUG_ON(!ps3av.available);
 
-        if (down_interruptible(&ps3av.sem))
-                return -ERESTARTSYS;
+        mutex_lock(&ps3av.mutex);
 
         table = ps3av_search_cmd_table(cid, PS3AV_CID_MASK);
         BUG_ON(!table);
@@ -277,7 +293,7 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
         if (res < 0) {
                 printk(KERN_ERR
                        "%s: ps3av_send_cmd_pkt() failed (result=%d)\n",
-                       __FUNCTION__, res);
+                       __func__, res);
                 goto err;
         }
 
@@ -286,16 +302,16 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
                                          usr_buf_size);
         if (res < 0) {
                 printk(KERN_ERR "%s: put_return_status() failed (result=%d)\n",
-                       __FUNCTION__, res);
+                       __func__, res);
                 goto err;
         }
 
-        up(&ps3av.sem);
+        mutex_unlock(&ps3av.mutex);
         return 0;
 
       err:
-        up(&ps3av.sem);
-        printk(KERN_ERR "%s: failed cid:%x res:%d\n", __FUNCTION__, cid, res);
+        mutex_unlock(&ps3av.mutex);
+        printk(KERN_ERR "%s: failed cid:%x res:%d\n", __func__, cid, res);
         return res;
 }
 
@@ -440,7 +456,7 @@ static int ps3av_set_videomode(void)
         ps3av_set_av_video_mute(PS3AV_CMD_MUTE_ON);
 
         /* wake up ps3avd to do the actual video mode setting */
-        up(&ps3av.ping);
+        queue_work(ps3av.wq, &ps3av.work);
 
         return 0;
 }
@@ -506,7 +522,7 @@ static void ps3av_set_videomode_cont(u32 id, u32 old_id)
         if (res == PS3AV_STATUS_NO_SYNC_HEAD)
                 printk(KERN_WARNING
                        "%s: Command failed. Please try your request again. \n",
-                       __FUNCTION__);
+                       __func__);
         else if (res)
                 dev_dbg(&ps3av_dev.core, "ps3av_cmd_avb_param failed\n");
 
@@ -515,18 +531,10 @@ static void ps3av_set_videomode_cont(u32 id, u32 old_id)
         ps3av_set_av_video_mute(PS3AV_CMD_MUTE_OFF);
 }
 
-static int ps3avd(void *p)
+static void ps3avd(struct work_struct *work)
 {
-        struct ps3av *info = p;
-
-        daemonize("ps3avd");
-        while (1) {
-                down(&info->ping);
-                ps3av_set_videomode_cont(info->ps3av_mode,
-                                         info->ps3av_mode_old);
-                up(&info->pong);
-        }
-        return 0;
+        ps3av_set_videomode_cont(ps3av.ps3av_mode, ps3av.ps3av_mode_old);
+        complete(&ps3av.done);
 }
 
 static int ps3av_vid2table_id(int vid)
@@ -707,8 +715,7 @@ int ps3av_set_video_mode(u32 id, int boot)
 
         size = ARRAY_SIZE(video_mode_table);
         if ((id & PS3AV_MODE_MASK) > size - 1 || id < 0) {
-                dev_dbg(&ps3av_dev.core, "%s: error id :%d\n", __FUNCTION__,
-                        id);
+                dev_dbg(&ps3av_dev.core, "%s: error id :%d\n", __func__, id);
                 return -EINVAL;
         }
 
@@ -717,15 +724,14 @@ int ps3av_set_video_mode(u32 id, int boot)
         if ((id & PS3AV_MODE_MASK) == 0) {
                 id = ps3av_auto_videomode(&ps3av.av_hw_conf, boot);
                 if (id < 1) {
-                        printk(KERN_ERR "%s: invalid id :%d\n", __FUNCTION__,
-                               id);
+                        printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);
                         return -EINVAL;
                 }
                 id |= option;
         }
 
         /* set videomode */
-        down(&ps3av.pong);
+        wait_for_completion(&ps3av.done);
         ps3av.ps3av_mode_old = ps3av.ps3av_mode;
         ps3av.ps3av_mode = id;
         if (ps3av_set_videomode())
@@ -736,6 +742,13 @@ int ps3av_set_video_mode(u32 id, int boot)
 
 EXPORT_SYMBOL_GPL(ps3av_set_video_mode);
 
+int ps3av_get_auto_mode(int boot)
+{
+        return ps3av_auto_videomode(&ps3av.av_hw_conf, boot);
+}
+
+EXPORT_SYMBOL_GPL(ps3av_get_auto_mode);
+
 int ps3av_set_mode(u32 id, int boot)
 {
         int res;
@@ -771,7 +784,7 @@ int ps3av_get_scanmode(int id)
         id = id & PS3AV_MODE_MASK;
         size = ARRAY_SIZE(video_mode_table);
         if (id > size - 1 || id < 0) {
-                printk(KERN_ERR "%s: invalid mode %d\n", __FUNCTION__, id);
+                printk(KERN_ERR "%s: invalid mode %d\n", __func__, id);
                 return -EINVAL;
         }
         return video_mode_table[id].interlace;
@@ -786,7 +799,7 @@ int ps3av_get_refresh_rate(int id)
         id = id & PS3AV_MODE_MASK;
         size = ARRAY_SIZE(video_mode_table);
         if (id > size - 1 || id < 0) {
-                printk(KERN_ERR "%s: invalid mode %d\n", __FUNCTION__, id);
+                printk(KERN_ERR "%s: invalid mode %d\n", __func__, id);
                 return -EINVAL;
         }
         return video_mode_table[id].freq;
@@ -802,7 +815,7 @@ int ps3av_video_mode2res(u32 id, u32 *xres, u32 *yres)
         id = id & PS3AV_MODE_MASK;
         size = ARRAY_SIZE(video_mode_table);
         if (id > size - 1 || id < 0) {
-                printk(KERN_ERR "%s: invalid mode %d\n", __FUNCTION__, id);
+                printk(KERN_ERR "%s: invalid mode %d\n", __func__, id);
                 return -EINVAL;
         }
         *xres = video_mode_table[id].x;
@@ -838,7 +851,7 @@ int ps3av_dev_open(void)
                 status = lv1_gpu_open(0);
                 if (status) {
                         printk(KERN_ERR "%s: lv1_gpu_open failed %d\n",
-                               __FUNCTION__, status);
+                               __func__, status);
                         ps3av.open_count--;
                 }
         }
@@ -855,13 +868,13 @@ int ps3av_dev_close(void)
 
         mutex_lock(&ps3av.mutex);
         if (ps3av.open_count <= 0) {
-                printk(KERN_ERR "%s: GPU already closed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: GPU already closed\n", __func__);
                 status = -1;
         } else if (!--ps3av.open_count) {
                 status = lv1_gpu_close();
                 if (status)
                         printk(KERN_WARNING "%s: lv1_gpu_close failed %d\n",
-                               __FUNCTION__, status);
+                               __func__, status);
         }
         mutex_unlock(&ps3av.mutex);
 
@@ -880,13 +893,16 @@ static int ps3av_probe(struct ps3_vuart_port_device *dev)
 
         memset(&ps3av, 0, sizeof(ps3av));
 
-        init_MUTEX(&ps3av.sem);
-        init_MUTEX_LOCKED(&ps3av.ping);
-        init_MUTEX(&ps3av.pong);
         mutex_init(&ps3av.mutex);
         ps3av.ps3av_mode = 0;
         ps3av.dev = dev;
-        kernel_thread(ps3avd, &ps3av, CLONE_KERNEL);
+
+        INIT_WORK(&ps3av.work, ps3avd);
+        init_completion(&ps3av.done);
+        complete(&ps3av.done);
+        ps3av.wq = create_singlethread_workqueue("ps3avd");
+        if (!ps3av.wq)
+                return -ENOMEM;
 
         ps3av.available = 1;
         switch (ps3_os_area_get_av_multi_out()) {
@@ -908,7 +924,7 @@ static int ps3av_probe(struct ps3_vuart_port_device *dev)
         /* init avsetting modules */
         res = ps3av_cmd_init();
         if (res < 0)
-                printk(KERN_ERR "%s: ps3av_cmd_init failed %d\n", __FUNCTION__,
+                printk(KERN_ERR "%s: ps3av_cmd_init failed %d\n", __func__,
                        res);
 
         ps3av_get_hw_conf(&ps3av);
@@ -926,6 +942,8 @@ static int ps3av_remove(struct ps3_vuart_port_device *dev)
 {
         if (ps3av.available) {
                 ps3av_cmd_fin();
+                if (ps3av.wq)
+                        destroy_workqueue(ps3av.wq);
                 ps3av.available = 0;
         }
 
@@ -958,7 +976,7 @@ static int ps3av_module_init(void)
         if (error) {
                 printk(KERN_ERR
                        "%s: ps3_vuart_port_driver_register failed %d\n",
-                       __FUNCTION__, error);
+                       __func__, error);
                 return error;
         }
 
@@ -966,7 +984,7 @@ static int ps3av_module_init(void)
         if (error)
                 printk(KERN_ERR
                        "%s: ps3_vuart_port_device_register failed %d\n",
-                       __FUNCTION__, error);
+                       __func__, error);
 
         return error;
 }
diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c
index bc70e81f8cb0..0145ea173c42 100644
--- a/drivers/ps3/ps3av_cmd.c
+++ b/drivers/ps3/ps3av_cmd.c
@@ -395,7 +395,7 @@ u32 ps3av_cmd_set_video_mode(void *p, u32 head, int video_vid, int video_fmt,
         video_mode->video_order = ps3av_video_fmt_table[video_fmt].order;
 
         pr_debug("%s: video_mode:vid:%x width:%d height:%d pitch:%d out_format:%d format:%x order:%x\n",
-                __FUNCTION__, video_vid, video_mode->width, video_mode->height,
+                __func__, video_vid, video_mode->width, video_mode->height,
                 video_mode->pitch, video_mode->video_out_format,
                 video_mode->video_format, video_mode->video_order);
         return sizeof(*video_mode);
@@ -477,7 +477,7 @@ static u8 ps3av_cnv_mclk(u32 fs)
                 if (ps3av_cnv_mclk_table[i].fs == fs)
                         return ps3av_cnv_mclk_table[i].mclk;
 
-        printk(KERN_ERR "%s failed, fs:%x\n", __FUNCTION__, fs);
+        printk(KERN_ERR "%s failed, fs:%x\n", __func__, fs);
         return 0;
 }
 
@@ -526,13 +526,12 @@ static void ps3av_cnv_ns(u8 *ns, u32 fs, u32 video_vid)
                 d = 4;
                 break;
         default:
-                printk(KERN_ERR "%s failed, vid:%x\n", __FUNCTION__,
-                       video_vid);
+                printk(KERN_ERR "%s failed, vid:%x\n", __func__, video_vid);
                 break;
         }
 
         if (fs < PS3AV_CMD_AUDIO_FS_44K || fs > PS3AV_CMD_AUDIO_FS_192K)
-                printk(KERN_ERR "%s failed, fs:%x\n", __FUNCTION__, fs);
+                printk(KERN_ERR "%s failed, fs:%x\n", __func__, fs);
         else
                 ns_val = ps3av_ns_table[PS3AV_CMD_AUDIO_FS_44K-BASE][d];
 
@@ -555,8 +554,7 @@ static u8 ps3av_cnv_enable(u32 source, const u8 *enable)
                 ret = ((p[0] << 4) + (p[1] << 5) + (p[2] << 6) + (p[3] << 7)) |
                       0x01;
         } else
-                printk(KERN_ERR "%s failed, source:%x\n", __FUNCTION__,
-                       source);
+                printk(KERN_ERR "%s failed, source:%x\n", __func__, source);
         return ret;
 }
 
@@ -585,7 +583,7 @@ static u8 ps3av_cnv_inputlen(u32 word_bits)
                 ret = PS3AV_CMD_AV_INPUTLEN_24;
                 break;
         default:
-                printk(KERN_ERR "%s failed, word_bits:%x\n", __FUNCTION__,
+                printk(KERN_ERR "%s failed, word_bits:%x\n", __func__,
                        word_bits);
                 break;
         }
@@ -595,7 +593,7 @@ static u8 ps3av_cnv_inputlen(u32 word_bits)
 static u8 ps3av_cnv_layout(u32 num_of_ch)
 {
         if (num_of_ch > PS3AV_CMD_AUDIO_NUM_OF_CH_8) {
-                printk(KERN_ERR "%s failed, num_of_ch:%x\n", __FUNCTION__,
+                printk(KERN_ERR "%s failed, num_of_ch:%x\n", __func__,
                        num_of_ch);
                 return 0;
         }
@@ -864,7 +862,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len)
 
         res = get_status(avb);
         if (res)
-                pr_debug("%s: PS3AV_CID_AVB_PARAM: failed %x\n", __FUNCTION__,
+                pr_debug("%s: PS3AV_CID_AVB_PARAM: failed %x\n", __func__,
                          res);
 
       out:
@@ -1013,7 +1011,7 @@ int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,
                         return size;
                 if (error != -EAGAIN) {
                         printk(KERN_ERR "%s: ps3_vuart_read failed %d\n",
-                               __FUNCTION__, error);
+                               __func__, error);
                         return error;
                 }
                 msleep(POLLING_INTERVAL);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 95826b92ca4b..ef1eae98ba44 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -354,4 +354,14 @@ config RTC_DRV_V3020
           This driver can also be built as a module. If so, the module
           will be called rtc-v3020.
 
+config RTC_DRV_BFIN
+        tristate "Blackfin On-Chip RTC"
+        depends on RTC_CLASS && BFIN
+        help
+          If you say yes here you will get support for the
+          Blackfin On-Chip Real Time Clock.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-bfin.
+
 endmenu
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 92bfe1b3a5fa..9218cf28d6ed 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -38,3 +38,4 @@ obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o
 obj-$(CONFIG_RTC_DRV_V3020)     += rtc-v3020.o
 obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
 obj-$(CONFIG_RTC_DRV_SH)        += rtc-sh.o
+obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
new file mode 100644
index 000000000000..260ead959918
--- /dev/null
+++ b/drivers/rtc/rtc-bfin.c
@@ -0,0 +1,445 @@
+/*
+ * Blackfin On-Chip Real Time Clock Driver
+ *  Supports BF531/BF532/BF533/BF534/BF536/BF537
+ *
+ * Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+/* The biggest issue we deal with in this driver is that register writes are
+ * synced to the RTC frequency of 1Hz.  So if you write to a register and
+ * attempt to write again before the first write has completed, the new write
+ * is simply discarded.  This can easily be troublesome if userspace disables
+ * one event (say periodic) and then right after enables an event (say alarm).
+ * Since all events are maintained in the same interrupt mask register, if
+ * we wrote to it to disable the first event and then wrote to it again to
+ * enable the second event, that second event would not be enabled as the
+ * write would be discarded and things quickly fall apart.
+ *
+ * To keep this delay from significantly degrading performance (we, in theory,
+ * would have to sleep for up to 1 second everytime we wanted to write a
+ * register), we only check the write pending status before we start to issue
+ * a new write.  We bank on the idea that it doesnt matter when the sync
+ * happens so long as we don't attempt another write before it does.  The only
+ * time userspace would take this penalty is when they try and do multiple
+ * operations right after another ... but in this case, they need to take the
+ * sync penalty, so we should be OK.
+ *
+ * Also note that the RTC_ISTAT register does not suffer this penalty; its
+ * writes to clear status registers complete immediately.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/seq_file.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+
+#include <asm/blackfin.h>
+
+#define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __FUNCTION__, __LINE__, ## args)
+#define stampit() stamp("here i am")
+
+struct bfin_rtc {
+        struct rtc_device *rtc_dev;
+        struct rtc_time rtc_alarm;
+        spinlock_t lock;
+};
+
+/* Bit values for the ISTAT / ICTL registers */
+#define RTC_ISTAT_WRITE_COMPLETE  0x8000
+#define RTC_ISTAT_WRITE_PENDING   0x4000
+#define RTC_ISTAT_ALARM_DAY       0x0040
+#define RTC_ISTAT_24HR            0x0020
+#define RTC_ISTAT_HOUR            0x0010
+#define RTC_ISTAT_MIN             0x0008
+#define RTC_ISTAT_SEC             0x0004
+#define RTC_ISTAT_ALARM           0x0002
+#define RTC_ISTAT_STOPWATCH       0x0001
+
+/* Shift values for RTC_STAT register */
+#define DAY_BITS_OFF    17
+#define HOUR_BITS_OFF   12
+#define MIN_BITS_OFF    6
+#define SEC_BITS_OFF    0
+
+/* Some helper functions to convert between the common RTC notion of time
+ * and the internal Blackfin notion that is stored in 32bits.
+ */
+static inline u32 rtc_time_to_bfin(unsigned long now)
+{
+        u32 sec  = (now % 60);
+        u32 min  = (now % (60 * 60)) / 60;
+        u32 hour = (now % (60 * 60 * 24)) / (60 * 60);
+        u32 days = (now / (60 * 60 * 24));
+        return (sec  << SEC_BITS_OFF) +
+               (min  << MIN_BITS_OFF) +
+               (hour << HOUR_BITS_OFF) +
+               (days << DAY_BITS_OFF);
+}
+static inline unsigned long rtc_bfin_to_time(u32 rtc_bfin)
+{
+        return (((rtc_bfin >> SEC_BITS_OFF)  & 0x003F)) +
+               (((rtc_bfin >> MIN_BITS_OFF)  & 0x003F) * 60) +
+               (((rtc_bfin >> HOUR_BITS_OFF) & 0x001F) * 60 * 60) +
+               (((rtc_bfin >> DAY_BITS_OFF)  & 0x7FFF) * 60 * 60 * 24);
+}
+static inline void rtc_bfin_to_tm(u32 rtc_bfin, struct rtc_time *tm)
+{
+        rtc_time_to_tm(rtc_bfin_to_time(rtc_bfin), tm);
+}
+
+/* Wait for the previous write to a RTC register to complete.
+ * Unfortunately, we can't sleep here as that introduces a race condition when
+ * turning on interrupt events.  Consider this:
+ *  - process sets alarm
+ *  - process enables alarm
+ *  - process sleeps while waiting for rtc write to sync
+ *  - interrupt fires while process is sleeping
+ *  - interrupt acks the event by writing to ISTAT
+ *  - interrupt sets the WRITE PENDING bit
+ *  - interrupt handler finishes
+ *  - process wakes up, sees WRITE PENDING bit set, goes to sleep
+ *  - interrupt fires while process is sleeping
+ * If anyone can point out the obvious solution here, i'm listening :).  This
+ * shouldn't be an issue on an SMP or preempt system as this function should
+ * only be called with the rtc lock held.
+ */
+static void rtc_bfin_sync_pending(void)
+{
+        stampit();
+        while (!(bfin_read_RTC_ISTAT() & RTC_ISTAT_WRITE_COMPLETE)) {
+                if (!(bfin_read_RTC_ISTAT() & RTC_ISTAT_WRITE_PENDING))
+                        break;
+        }
+        bfin_write_RTC_ISTAT(RTC_ISTAT_WRITE_COMPLETE);
+}
+
+static void rtc_bfin_reset(struct bfin_rtc *rtc)
+{
+        /* Initialize the RTC. Enable pre-scaler to scale RTC clock
+         * to 1Hz and clear interrupt/status registers. */
+        spin_lock_irq(&rtc->lock);
+        rtc_bfin_sync_pending();
+        bfin_write_RTC_PREN(0x1);
+        bfin_write_RTC_ICTL(0);
+        bfin_write_RTC_SWCNT(0);
+        bfin_write_RTC_ALARM(0);
+        bfin_write_RTC_ISTAT(0xFFFF);
+        spin_unlock_irq(&rtc->lock);
+}
+
+static irqreturn_t bfin_rtc_interrupt(int irq, void *dev_id)
+{
+        struct platform_device *pdev = to_platform_device(dev_id);
+        struct bfin_rtc *rtc = platform_get_drvdata(pdev);
+        unsigned long events = 0;
+        u16 rtc_istat;
+
+        stampit();
+
+        spin_lock_irq(&rtc->lock);
+
+        rtc_istat = bfin_read_RTC_ISTAT();
+
+        if (rtc_istat & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY)) {
+                bfin_write_RTC_ISTAT(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY);
+                events |= RTC_AF | RTC_IRQF;
+        }
+
+        if (rtc_istat & RTC_ISTAT_STOPWATCH) {
+                bfin_write_RTC_ISTAT(RTC_ISTAT_STOPWATCH);
+                events |= RTC_PF | RTC_IRQF;
+                bfin_write_RTC_SWCNT(rtc->rtc_dev->irq_freq);
+        }
+
+        if (rtc_istat & RTC_ISTAT_SEC) {
+                bfin_write_RTC_ISTAT(RTC_ISTAT_SEC);
+                events |= RTC_UF | RTC_IRQF;
+        }
+
+        rtc_update_irq(rtc->rtc_dev, 1, events);
+
+        spin_unlock_irq(&rtc->lock);
+
+        return IRQ_HANDLED;
+}
+
+static int bfin_rtc_open(struct device *dev)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        int ret;
+
+        stampit();
+
+        ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_DISABLED, "rtc-bfin", dev);
+        if (unlikely(ret)) {
+                dev_err(dev, "request RTC IRQ failed with %d\n", ret);
+                return ret;
+        }
+
+        rtc_bfin_reset(rtc);
+
+        return ret;
+}
+
+static void bfin_rtc_release(struct device *dev)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        stampit();
+        rtc_bfin_reset(rtc);
+        free_irq(IRQ_RTC, dev);
+}
+
+static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+
+        stampit();
+
+        switch (cmd) {
+        case RTC_PIE_ON:
+                stampit();
+                spin_lock_irq(&rtc->lock);
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_ISTAT(RTC_ISTAT_STOPWATCH);
+                bfin_write_RTC_SWCNT(rtc->rtc_dev->irq_freq);
+                bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() | RTC_ISTAT_STOPWATCH);
+                spin_unlock_irq(&rtc->lock);
+                return 0;
+        case RTC_PIE_OFF:
+                stampit();
+                spin_lock_irq(&rtc->lock);
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_SWCNT(0);
+                bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() & ~RTC_ISTAT_STOPWATCH);
+                spin_unlock_irq(&rtc->lock);
+                return 0;
+
+        case RTC_UIE_ON:
+                stampit();
+                spin_lock_irq(&rtc->lock);
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_ISTAT(RTC_ISTAT_SEC);
+                bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() | RTC_ISTAT_SEC);
+                spin_unlock_irq(&rtc->lock);
+                return 0;
+        case RTC_UIE_OFF:
+                stampit();
+                spin_lock_irq(&rtc->lock);
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() & ~RTC_ISTAT_SEC);
+                spin_unlock_irq(&rtc->lock);
+                return 0;
+
+        case RTC_AIE_ON: {
+                unsigned long rtc_alarm;
+                u16 which_alarm;
+                int ret = 0;
+
+                stampit();
+
+                spin_lock_irq(&rtc->lock);
+
+                rtc_bfin_sync_pending();
+                if (rtc->rtc_alarm.tm_yday == -1) {
+                        struct rtc_time now;
+                        rtc_bfin_to_tm(bfin_read_RTC_STAT(), &now);
+                        now.tm_sec = rtc->rtc_alarm.tm_sec;
+                        now.tm_min = rtc->rtc_alarm.tm_min;
+                        now.tm_hour = rtc->rtc_alarm.tm_hour;
+                        ret = rtc_tm_to_time(&now, &rtc_alarm);
+                        which_alarm = RTC_ISTAT_ALARM;
+                } else {
+                        ret = rtc_tm_to_time(&rtc->rtc_alarm, &rtc_alarm);
+                        which_alarm = RTC_ISTAT_ALARM_DAY;
+                }
+                if (ret == 0) {
+                        bfin_write_RTC_ISTAT(which_alarm);
+                        bfin_write_RTC_ALARM(rtc_time_to_bfin(rtc_alarm));
+                        bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() | which_alarm);
+                }
+
+                spin_unlock_irq(&rtc->lock);
+
+                return ret;
+        }
+        case RTC_AIE_OFF:
+                stampit();
+                spin_lock_irq(&rtc->lock);
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() & ~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));
+                spin_unlock_irq(&rtc->lock);
+                return 0;
+        }
+
+        return -ENOIOCTLCMD;
+}
+
+static int bfin_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+
+        stampit();
+
+        spin_lock_irq(&rtc->lock);
+        rtc_bfin_sync_pending();
+        rtc_bfin_to_tm(bfin_read_RTC_STAT(), tm);
+        spin_unlock_irq(&rtc->lock);
+
+        return 0;
+}
+
+static int bfin_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        int ret;
+        unsigned long now;
+
+        stampit();
+
+        spin_lock_irq(&rtc->lock);
+
+        ret = rtc_tm_to_time(tm, &now);
+        if (ret == 0) {
+                rtc_bfin_sync_pending();
+                bfin_write_RTC_STAT(rtc_time_to_bfin(now));
+        }
+
+        spin_unlock_irq(&rtc->lock);
+
+        return ret;
+}
+
+static int bfin_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        stampit();
+        memcpy(&alrm->time, &rtc->rtc_alarm, sizeof(struct rtc_time));
+        alrm->pending = !!(bfin_read_RTC_ICTL() & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));
+        return 0;
+}
+
+static int bfin_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        stampit();
+        memcpy(&rtc->rtc_alarm, &alrm->time, sizeof(struct rtc_time));
+        return 0;
+}
+
+static int bfin_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+#define yesno(x) (x ? "yes" : "no")
+        u16 ictl = bfin_read_RTC_ICTL();
+        stampit();
+        seq_printf(seq, "alarm_IRQ\t: %s\n", yesno(ictl & RTC_ISTAT_ALARM));
+        seq_printf(seq, "wkalarm_IRQ\t: %s\n", yesno(ictl & RTC_ISTAT_ALARM_DAY));
+        seq_printf(seq, "seconds_IRQ\t: %s\n", yesno(ictl & RTC_ISTAT_SEC));
+        seq_printf(seq, "periodic_IRQ\t: %s\n", yesno(ictl & RTC_ISTAT_STOPWATCH));
+#ifdef DEBUG
+        seq_printf(seq, "RTC_STAT\t: 0x%08X\n", bfin_read_RTC_STAT());
+        seq_printf(seq, "RTC_ICTL\t: 0x%04X\n", bfin_read_RTC_ICTL());
+        seq_printf(seq, "RTC_ISTAT\t: 0x%04X\n", bfin_read_RTC_ISTAT());
+        seq_printf(seq, "RTC_SWCNT\t: 0x%04X\n", bfin_read_RTC_SWCNT());
+        seq_printf(seq, "RTC_ALARM\t: 0x%08X\n", bfin_read_RTC_ALARM());
+        seq_printf(seq, "RTC_PREN\t: 0x%04X\n", bfin_read_RTC_PREN());
+#endif
+        return 0;
+}
+
+static int bfin_irq_set_freq(struct device *dev, int freq)
+{
+        struct bfin_rtc *rtc = dev_get_drvdata(dev);
+        stampit();
+        rtc->rtc_dev->irq_freq = freq;
+        return 0;
+}
+
+static struct rtc_class_ops bfin_rtc_ops = {
+        .open          = bfin_rtc_open,
+        .release       = bfin_rtc_release,
+        .ioctl         = bfin_rtc_ioctl,
+        .read_time     = bfin_rtc_read_time,
+        .set_time      = bfin_rtc_set_time,
+        .read_alarm    = bfin_rtc_read_alarm,
+        .set_alarm     = bfin_rtc_set_alarm,
+        .proc          = bfin_rtc_proc,
+        .irq_set_freq  = bfin_irq_set_freq,
+};
+
+static int __devinit bfin_rtc_probe(struct platform_device *pdev)
+{
+        struct bfin_rtc *rtc;
+        int ret = 0;
+
+        stampit();
+
+        rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+        if (unlikely(!rtc))
+                return -ENOMEM;
+
+        spin_lock_init(&rtc->lock);
+
+        rtc->rtc_dev = rtc_device_register(pdev->name, &pdev->dev, &bfin_rtc_ops, THIS_MODULE);
+        if (unlikely(IS_ERR(rtc))) {
+                ret = PTR_ERR(rtc->rtc_dev);
+                goto err;
+        }
+        rtc->rtc_dev->irq_freq = 0;
+        rtc->rtc_dev->max_user_freq = (2 << 16); /* stopwatch is an unsigned 16 bit reg */
+
+        platform_set_drvdata(pdev, rtc);
+
+        return 0;
+
+err:
+        kfree(rtc);
+        return ret;
+}
+
+static int __devexit bfin_rtc_remove(struct platform_device *pdev)
+{
+        struct bfin_rtc *rtc = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(rtc->rtc_dev);
+        platform_set_drvdata(pdev, NULL);
+        kfree(rtc);
+
+        return 0;
+}
+
+static struct platform_driver bfin_rtc_driver = {
+        .driver         = {
+                .name   = "rtc-bfin",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = bfin_rtc_probe,
+        .remove         = __devexit_p(bfin_rtc_remove),
+};
+
+static int __init bfin_rtc_init(void)
+{
+        stampit();
+        return platform_driver_register(&bfin_rtc_driver);
+}
+
+static void __exit bfin_rtc_exit(void)
+{
+        platform_driver_unregister(&bfin_rtc_driver);
+}
+
+module_init(bfin_rtc_init);
+module_exit(bfin_rtc_exit);
+
+MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver");
+MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e71929db8b06..977521013fe8 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2174,6 +2174,51 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
         return ret;
 }
 
+struct dasd_ccw_req * dasd_generic_build_rdc(struct dasd_device *device,
+                                             void *rdc_buffer,
+                                             int rdc_buffer_size, char *magic)
+{
+        struct dasd_ccw_req *cqr;
+        struct ccw1 *ccw;
+
+        cqr = dasd_smalloc_request(magic, 1 /* RDC */, rdc_buffer_size, device);
+
+        if (IS_ERR(cqr)) {
+                DEV_MESSAGE(KERN_WARNING, device, "%s",
+                            "Could not allocate RDC request");
+                return cqr;
+        }
+
+        ccw = cqr->cpaddr;
+        ccw->cmd_code = CCW_CMD_RDC;
+        ccw->cda = (__u32)(addr_t)rdc_buffer;
+        ccw->count = rdc_buffer_size;
+
+        cqr->device = device;
+        cqr->expires = 10*HZ;
+        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+        cqr->retries = 2;
+        cqr->buildclk = get_clock();
+        cqr->status = DASD_CQR_FILLED;
+        return cqr;
+}
+
+
+int dasd_generic_read_dev_chars(struct dasd_device *device, char *magic,
+                                void **rdc_buffer, int rdc_buffer_size)
+{
+        int ret;
+        struct dasd_ccw_req *cqr;
+
+        cqr = dasd_generic_build_rdc(device, *rdc_buffer, rdc_buffer_size,
+                                     magic);
+        if (IS_ERR(cqr))
+                return PTR_ERR(cqr);
+
+        ret = dasd_sleep_on(cqr);
+        dasd_sfree_request(cqr, cqr->device);
+        return ret;
+}
 
 static int __init
 dasd_init(void)
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index cecab2274a6e..c9583fbc2a7d 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -450,6 +450,81 @@ dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid)
         return 0;
 }
 
+struct dasd_ccw_req * dasd_eckd_build_rcd_lpm(struct dasd_device *device,
+                                              void *rcd_buffer,
+                                              struct ciw *ciw, __u8 lpm)
+{
+        struct dasd_ccw_req *cqr;
+        struct ccw1 *ccw;
+
+        cqr = dasd_smalloc_request("ECKD", 1 /* RCD */, ciw->count, device);
+
+        if (IS_ERR(cqr)) {
+                DEV_MESSAGE(KERN_WARNING, device, "%s",
+                            "Could not allocate RCD request");
+                return cqr;
+        }
+
+        ccw = cqr->cpaddr;
+        ccw->cmd_code = ciw->cmd;
+        ccw->cda = (__u32)(addr_t)rcd_buffer;
+        ccw->count = ciw->count;
+
+        cqr->device = device;
+        cqr->expires = 10*HZ;
+        cqr->lpm = lpm;
+        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+        cqr->retries = 2;
+        cqr->buildclk = get_clock();
+        cqr->status = DASD_CQR_FILLED;
+        return cqr;
+}
+
+static int dasd_eckd_read_conf_lpm(struct dasd_device *device,
+                                   void **rcd_buffer,
+                                   int *rcd_buffer_size, __u8 lpm)
+{
+        struct ciw *ciw;
+        char *rcd_buf = NULL;
+        int ret;
+        struct dasd_ccw_req *cqr;
+
+        /*
+         * scan for RCD command in extended SenseID data
+         */
+        ciw = ccw_device_get_ciw(device->cdev, CIW_TYPE_RCD);
+        if (!ciw || ciw->cmd == 0) {
+                ret = -EOPNOTSUPP;
+                goto out_error;
+        }
+        rcd_buf = kzalloc(ciw->count, GFP_KERNEL | GFP_DMA);
+        if (!rcd_buf) {
+                ret = -ENOMEM;
+                goto out_error;
+        }
+        cqr = dasd_eckd_build_rcd_lpm(device, rcd_buf, ciw, lpm);
+        if (IS_ERR(cqr)) {
+                ret =  PTR_ERR(cqr);
+                goto out_error;
+        }
+        ret = dasd_sleep_on(cqr);
+        /*
+         * on success we update the user input parms
+         */
+        dasd_sfree_request(cqr, cqr->device);
+        if (ret)
+                goto out_error;
+
+        *rcd_buffer_size = ciw->count;
+        *rcd_buffer = rcd_buf;
+        return 0;
+out_error:
+        kfree(rcd_buf);
+        *rcd_buffer = NULL;
+        *rcd_buffer_size = 0;
+        return ret;
+}
+
 static int
 dasd_eckd_read_conf(struct dasd_device *device)
 {
@@ -469,8 +544,8 @@ dasd_eckd_read_conf(struct dasd_device *device)
         /* get configuration data per operational path */
         for (lpm = 0x80; lpm; lpm>>= 1) {
                 if (lpm & path_data->opm){
-                        rc = read_conf_data_lpm(device->cdev, &conf_data,
-                                                &conf_len, lpm);
+                        rc = dasd_eckd_read_conf_lpm(device, &conf_data,
+                                                     &conf_len, lpm);
                         if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
                                 MESSAGE(KERN_WARNING,
                                         "Read configuration data returned "
@@ -639,7 +714,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         /* Read Device Characteristics */
         rdc_data = (void *) &(private->rdc_data);
         memset(rdc_data, 0, sizeof(rdc_data));
-        rc = read_dev_chars(device->cdev, &rdc_data, 64);
+        rc = dasd_generic_read_dev_chars(device, "ECKD", &rdc_data, 64);
         if (rc)
                 DEV_MESSAGE(KERN_WARNING, device,
                             "Read device characteristics returned "
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index be0909e39226..da16ead8aff2 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -135,7 +135,7 @@ dasd_fba_check_characteristics(struct dasd_device *device)
         }
         /* Read Device Characteristics */
         rdc_data = (void *) &(private->rdc_data);
-        rc = read_dev_chars(device->cdev, &rdc_data, 32);
+        rc = dasd_generic_read_dev_chars(device, "FBA ", &rdc_data, 32);
         if (rc) {
                 DEV_MESSAGE(KERN_WARNING, device,
                             "Read device characteristics returned error %d",
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index a2cc69e11410..241294cba415 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -509,6 +509,8 @@ int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *);
 int dasd_generic_set_offline (struct ccw_device *cdev);
 int dasd_generic_notify(struct ccw_device *, int);
 
+int dasd_generic_read_dev_chars(struct dasd_device *, char *, void **, int);
+
 /* externals in dasd_devmap.c */
 extern int dasd_max_devindex;
 extern int dasd_probeonly;
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index bb4ff537729d..3b52f5c1dbef 100644
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -103,6 +103,7 @@ enum tape_op {
         TO_CRYPT_OFF,   /* Disable encrpytion */
         TO_KEKL_SET,    /* Set KEK label */
         TO_KEKL_QUERY,  /* Query KEK label */
+        TO_RDC,         /* Read device characteristics */
         TO_SIZE,        /* #entries in tape_op_t */
 };
 
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 50f5edab83d7..7e2b2ab49264 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -788,6 +788,7 @@ tape_3590_done(struct tape_device *device, struct tape_request *request)
         case TO_SIZE:
         case TO_KEKL_SET:
         case TO_KEKL_QUERY:
+        case TO_RDC:
                 break;
         }
         return TAPE_IO_SUCCESS;
@@ -1549,6 +1550,26 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
         return TAPE_IO_STOP;
 }
 
+
+static int tape_3590_read_dev_chars(struct tape_device *device,
+                                    struct tape_3590_rdc_data *rdc_data)
+{
+        int rc;
+        struct tape_request *request;
+
+        request = tape_alloc_request(1, sizeof(*rdc_data));
+        if (IS_ERR(request))
+                return PTR_ERR(request);
+        request->op = TO_RDC;
+        tape_ccw_end(request->cpaddr, CCW_CMD_RDC, sizeof(*rdc_data),
+                     request->cpdata);
+        rc = tape_do_io(device, request);
+        if (rc == 0)
+                memcpy(rdc_data, request->cpdata, sizeof(*rdc_data));
+        tape_free_request(request);
+        return rc;
+}
+
 /*
  * Setup device function
  */
@@ -1557,7 +1578,7 @@ tape_3590_setup_device(struct tape_device *device)
 {
         int rc;
         struct tape_3590_disc_data *data;
-        char *rdc_data;
+        struct tape_3590_rdc_data *rdc_data;
 
         DBF_EVENT(6, "3590 device setup\n");
         data = kzalloc(sizeof(struct tape_3590_disc_data), GFP_KERNEL | GFP_DMA);
@@ -1566,12 +1587,12 @@ tape_3590_setup_device(struct tape_device *device)
         data->read_back_op = READ_PREVIOUS;
         device->discdata = data;
 
-        rdc_data = kmalloc(64, GFP_KERNEL | GFP_DMA);
+        rdc_data = kmalloc(sizeof(*rdc_data), GFP_KERNEL | GFP_DMA);
         if (!rdc_data) {
                 rc = -ENOMEM;
                 goto fail_kmalloc;
         }
-        rc = read_dev_chars(device->cdev, (void**)&rdc_data, 64);
+        rc = tape_3590_read_dev_chars(device, rdc_data);
         if (rc) {
                 DBF_LH(3, "Read device characteristics failed!\n");
                 goto fail_kmalloc;
@@ -1579,7 +1600,7 @@ tape_3590_setup_device(struct tape_device *device)
         rc = tape_std_assign(device);
         if (rc)
                 goto fail_rdc_data;
-        if (rdc_data[31] == 0x13) {
+        if (rdc_data->data[31] == 0x13) {
                 PRINT_INFO("Device has crypto support\n");
                 data->crypt_info.capability |= TAPE390_CRYPT_SUPPORTED_MASK;
                 tape_3592_disable_crypt(device);
diff --git a/drivers/s390/char/tape_3590.h b/drivers/s390/char/tape_3590.h
index aa5138807af1..4534055f1376 100644
--- a/drivers/s390/char/tape_3590.h
+++ b/drivers/s390/char/tape_3590.h
@@ -129,6 +129,10 @@ struct tape_3590_med_sense {
         char pad2[116];
 } __attribute__ ((packed));
 
+struct tape_3590_rdc_data {
+        char data[64];
+} __attribute__ ((packed));
+
 /* Datastructures for 3592 encryption support */
 
 struct tape3592_kekl {
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index e2a8a1a04bab..2fae6338ee1c 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -73,7 +73,7 @@ const char *tape_op_verbose[TO_SIZE] =
         [TO_DIS] = "DIS",       [TO_ASSIGN] = "ASS",
         [TO_UNASSIGN] = "UAS",  [TO_CRYPT_ON] = "CON",
         [TO_CRYPT_OFF] = "COF", [TO_KEKL_SET] = "KLS",
-        [TO_KEKL_QUERY] = "KLQ",
+        [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
 };
 
 static int
@@ -911,6 +911,7 @@ __tape_start_request(struct tape_device *device, struct tape_request *request)
                 case TO_ASSIGN:
                 case TO_UNASSIGN:
                 case TO_READ_ATTMSG:
+                case TO_RDC:
                         if (device->tape_state == TS_INIT)
                                 break;
                         if (device->tape_state == TS_UNUSED)
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 05fac0733f3d..cba64e4cfcd4 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -69,7 +69,6 @@ static const char version[] = "QDIO base support version 2";
 
 static int qdio_performance_stats = 0;
 static int proc_perf_file_registration;
-static unsigned long i_p_c, i_p_nc, o_p_c, o_p_nc, ii_p_c, ii_p_nc;
 static struct qdio_perf_stats perf_stats;
 
 static int hydra_thinints;
@@ -111,6 +110,31 @@ qdio_min(int a,int b)
 }
 
 /***************** SCRUBBER HELPER ROUTINES **********************/
+#ifdef CONFIG_64BIT
+static inline void qdio_perf_stat_inc(atomic64_t *count)
+{
+        if (qdio_performance_stats)
+                atomic64_inc(count);
+}
+
+static inline void qdio_perf_stat_dec(atomic64_t *count)
+{
+        if (qdio_performance_stats)
+                atomic64_dec(count);
+}
+#else /* CONFIG_64BIT */
+static inline void qdio_perf_stat_inc(atomic_t *count)
+{
+        if (qdio_performance_stats)
+                atomic_inc(count);
+}
+
+static inline void qdio_perf_stat_dec(atomic_t *count)
+{
+        if (qdio_performance_stats)
+                atomic_dec(count);
+}
+#endif /* CONFIG_64BIT */
 
 static inline __u64 
 qdio_get_micros(void)
@@ -277,8 +301,7 @@ qdio_siga_sync(struct qdio_q *q, unsigned int gpr2,
         QDIO_DBF_TEXT4(0,trace,"sigasync");
         QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
 
-        if (qdio_performance_stats)
-                perf_stats.siga_syncs++;
+        qdio_perf_stat_inc(&perf_stats.siga_syncs);
 
         cc = do_siga_sync(q->schid, gpr2, gpr3);
         if (cc)
@@ -323,8 +346,7 @@ qdio_siga_output(struct qdio_q *q)
         __u32 busy_bit;
         __u64 start_time=0;
 
-        if (qdio_performance_stats)
-                perf_stats.siga_outs++;
+        qdio_perf_stat_inc(&perf_stats.siga_outs);
 
         QDIO_DBF_TEXT4(0,trace,"sigaout");
         QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
@@ -358,8 +380,7 @@ qdio_siga_input(struct qdio_q *q)
         QDIO_DBF_TEXT4(0,trace,"sigain");
         QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
 
-        if (qdio_performance_stats)
-                perf_stats.siga_ins++;
+        qdio_perf_stat_inc(&perf_stats.siga_ins);
 
         cc = do_siga_input(q->schid, q->mask);
         
@@ -953,8 +974,7 @@ __qdio_outbound_processing(struct qdio_q *q)
 
         if (unlikely(qdio_reserve_q(q))) {
                 qdio_release_q(q);
-                if (qdio_performance_stats)
-                        o_p_c++;
+                qdio_perf_stat_inc(&perf_stats.outbound_tl_runs_resched);
                 /* as we're sissies, we'll check next time */
                 if (likely(!atomic_read(&q->is_in_shutdown))) {
                         qdio_mark_q(q);
@@ -962,10 +982,8 @@ __qdio_outbound_processing(struct qdio_q *q)
                 }
                 return;
         }
-        if (qdio_performance_stats) {
-                o_p_nc++;
-                perf_stats.tl_runs++;
-        }
+        qdio_perf_stat_inc(&perf_stats.outbound_tl_runs);
+        qdio_perf_stat_inc(&perf_stats.tl_runs);
 
         /* see comment in qdio_kick_outbound_q */
         siga_attempts=atomic_read(&q->busy_siga_counter);
@@ -1139,17 +1157,6 @@ qdio_has_inbound_q_moved(struct qdio_q *q)
 {
         int i;
 
-        static int old_pcis=0;
-        static int old_thinints=0;
-
-        if (qdio_performance_stats) {
-                if ((old_pcis==perf_stats.pcis)&&
-                    (old_thinints==perf_stats.thinints))
-                        perf_stats.start_time_inbound=NOW;
-                else
-                        old_pcis=perf_stats.pcis;
-        }
-
         i=qdio_get_inbound_buffer_frontier(q);
         if ( (i!=GET_SAVED_FRONTIER(q)) ||
              (q->error_status_flags&QDIO_STATUS_LOOK_FOR_ERROR) ) {
@@ -1337,10 +1344,7 @@ qdio_kick_inbound_handler(struct qdio_q *q)
         q->siga_error=0;
         q->error_status_flags=0;
 
-        if (qdio_performance_stats) {
-                perf_stats.inbound_time+=NOW-perf_stats.start_time_inbound;
-                perf_stats.inbound_cnt++;
-        }
+        qdio_perf_stat_inc(&perf_stats.inbound_cnt);
 }
 
 static void
@@ -1360,8 +1364,7 @@ __tiqdio_inbound_processing(struct qdio_q *q, int spare_ind_was_set)
          */
         if (unlikely(qdio_reserve_q(q))) {
                 qdio_release_q(q);
-                if (qdio_performance_stats)
-                        ii_p_c++;
+                qdio_perf_stat_inc(&perf_stats.inbound_thin_tl_runs_resched);
                 /* 
                  * as we might just be about to stop polling, we make
                  * sure that we check again at least once more 
@@ -1369,8 +1372,7 @@ __tiqdio_inbound_processing(struct qdio_q *q, int spare_ind_was_set)
                 tiqdio_sched_tl();
                 return;
         }
-        if (qdio_performance_stats)
-                ii_p_nc++;
+        qdio_perf_stat_inc(&perf_stats.inbound_thin_tl_runs);
         if (unlikely(atomic_read(&q->is_in_shutdown))) {
                 qdio_unmark_q(q);
                 goto out;
@@ -1412,8 +1414,7 @@ __tiqdio_inbound_processing(struct qdio_q *q, int spare_ind_was_set)
                 for (i=0;i<irq_ptr->no_output_qs;i++) {
                         oq = irq_ptr->output_qs[i];
                         if (!qdio_is_outbound_q_done(oq)) {
-                                if (qdio_performance_stats)
-                                        perf_stats.tl_runs--;
+                                qdio_perf_stat_dec(&perf_stats.tl_runs);
                                 __qdio_outbound_processing(oq);
                         }
                 }
@@ -1452,8 +1453,7 @@ __qdio_inbound_processing(struct qdio_q *q)
 
         if (unlikely(qdio_reserve_q(q))) {
                 qdio_release_q(q);
-                if (qdio_performance_stats)
-                        i_p_c++;
+                qdio_perf_stat_inc(&perf_stats.inbound_tl_runs_resched);
                 /* as we're sissies, we'll check next time */
                 if (likely(!atomic_read(&q->is_in_shutdown))) {
                         qdio_mark_q(q);
@@ -1461,10 +1461,8 @@ __qdio_inbound_processing(struct qdio_q *q)
                 }
                 return;
         }
-        if (qdio_performance_stats) {
-                i_p_nc++;
-                perf_stats.tl_runs++;
-        }
+        qdio_perf_stat_inc(&perf_stats.inbound_tl_runs);
+        qdio_perf_stat_inc(&perf_stats.tl_runs);
 
 again:
         if (qdio_has_inbound_q_moved(q)) {
@@ -1510,8 +1508,7 @@ tiqdio_reset_processing_state(struct qdio_q *q, int q_laps)
 
         if (unlikely(qdio_reserve_q(q))) {
                 qdio_release_q(q);
-                if (qdio_performance_stats)
-                        ii_p_c++;
+                qdio_perf_stat_inc(&perf_stats.inbound_thin_tl_runs_resched);
                 /* 
                  * as we might just be about to stop polling, we make
                  * sure that we check again at least once more 
@@ -1602,8 +1599,7 @@ tiqdio_tl(unsigned long data)
 {
         QDIO_DBF_TEXT4(0,trace,"iqdio_tl");
 
-        if (qdio_performance_stats)
-                perf_stats.tl_runs++;
+        qdio_perf_stat_inc(&perf_stats.tl_runs);
 
         tiqdio_inbound_checks();
 }
@@ -1914,10 +1910,7 @@ tiqdio_thinint_handler(void)
 {
         QDIO_DBF_TEXT4(0,trace,"thin_int");
 
-        if (qdio_performance_stats) {
-                perf_stats.thinints++;
-                perf_stats.start_time_inbound=NOW;
-        }
+        qdio_perf_stat_inc(&perf_stats.thinints);
 
         /* SVS only when needed:
          * issue SVS to benefit from iqdio interrupt avoidance
@@ -1972,17 +1965,12 @@ qdio_handle_pci(struct qdio_irq *irq_ptr)
         int i;
         struct qdio_q *q;
 
-        if (qdio_performance_stats) {
-                perf_stats.pcis++;
-                perf_stats.start_time_inbound=NOW;
-        }
+        qdio_perf_stat_inc(&perf_stats.pcis);
         for (i=0;i<irq_ptr->no_input_qs;i++) {
                 q=irq_ptr->input_qs[i];
                 if (q->is_input_q&QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT)
                         qdio_mark_q(q);
                 else {
-                        if (qdio_performance_stats)
-                                perf_stats.tl_runs--;
                         __qdio_inbound_processing(q);
                 }
         }
@@ -1992,8 +1980,7 @@ qdio_handle_pci(struct qdio_irq *irq_ptr)
                 q=irq_ptr->output_qs[i];
                 if (qdio_is_outbound_q_done(q))
                         continue;
-                if (qdio_performance_stats)
-                        perf_stats.tl_runs--;
+                qdio_perf_stat_dec(&perf_stats.tl_runs);
                 if (!irq_ptr->sync_done_on_outb_pcis)
                         SYNC_MEMORY;
                 __qdio_outbound_processing(q);
@@ -3463,18 +3450,12 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
         struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
 
         /* This is the outbound handling of queues */
-        if (qdio_performance_stats)
-                perf_stats.start_time_outbound=NOW;
-
         qdio_do_qdio_fill_output(q,qidx,count,buffers);
 
         used_elements=atomic_add_return(count, &q->number_of_buffers_used) - count;
 
         if (callflags&QDIO_FLAG_DONT_SIGA) {
-                if (qdio_performance_stats) {
-                        perf_stats.outbound_time+=NOW-perf_stats.start_time_outbound;
-                        perf_stats.outbound_cnt++;
-                }
+                qdio_perf_stat_inc(&perf_stats.outbound_cnt);
                 return;
         }
         if (q->is_iqdio_q) {
@@ -3504,8 +3485,7 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
                                 qdio_kick_outbound_q(q);
                         } else {
                                 QDIO_DBF_TEXT3(0,trace, "fast-req");
-                                if (qdio_performance_stats)
-                                        perf_stats.fast_reqs++;
+                                qdio_perf_stat_inc(&perf_stats.fast_reqs);
                         }
                 }
                 /* 
@@ -3516,10 +3496,7 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
                 __qdio_outbound_processing(q);
         }
 
-        if (qdio_performance_stats) {
-                perf_stats.outbound_time+=NOW-perf_stats.start_time_outbound;
-                perf_stats.outbound_cnt++;
-        }
+        qdio_perf_stat_inc(&perf_stats.outbound_cnt);
 }
 
 /* count must be 1 in iqdio */
@@ -3589,33 +3566,67 @@ qdio_perf_procfile_read(char *buffer, char **buffer_location, off_t offset,
                 return 0;
 
 #define _OUTP_IT(x...) c+=sprintf(buffer+c,x)
-        _OUTP_IT("i_p_nc/c=%lu/%lu\n",i_p_nc,i_p_c);
-        _OUTP_IT("ii_p_nc/c=%lu/%lu\n",ii_p_nc,ii_p_c);
-        _OUTP_IT("o_p_nc/c=%lu/%lu\n",o_p_nc,o_p_c);
-        _OUTP_IT("Number of tasklet runs (total)                  : %lu\n",
-                 perf_stats.tl_runs);
+#ifdef CONFIG_64BIT
+        _OUTP_IT("Number of tasklet runs (total)                  : %li\n",
+                 (long)atomic64_read(&perf_stats.tl_runs));
+        _OUTP_IT("Inbound tasklet runs      tried/retried         : %li/%li\n",
+                 (long)atomic64_read(&perf_stats.inbound_tl_runs),
+                 (long)atomic64_read(&perf_stats.inbound_tl_runs_resched));
+        _OUTP_IT("Inbound-thin tasklet runs tried/retried         : %li/%li\n",
+                 (long)atomic64_read(&perf_stats.inbound_thin_tl_runs),
+                 (long)atomic64_read(&perf_stats.inbound_thin_tl_runs_resched));
+        _OUTP_IT("Outbound tasklet runs     tried/retried         : %li/%li\n",
+                 (long)atomic64_read(&perf_stats.outbound_tl_runs),
+                 (long)atomic64_read(&perf_stats.outbound_tl_runs_resched));
         _OUTP_IT("\n");
-        _OUTP_IT("Number of SIGA sync's issued                    : %lu\n",
-                 perf_stats.siga_syncs);
-        _OUTP_IT("Number of SIGA in's issued                      : %lu\n",
-                 perf_stats.siga_ins);
-        _OUTP_IT("Number of SIGA out's issued                     : %lu\n",
-                 perf_stats.siga_outs);
-        _OUTP_IT("Number of PCIs caught                           : %lu\n",
-                 perf_stats.pcis);
-        _OUTP_IT("Number of adapter interrupts caught             : %lu\n",
-                 perf_stats.thinints);
-        _OUTP_IT("Number of fast requeues (outg. SBALs w/o SIGA)  : %lu\n",
-                 perf_stats.fast_reqs);
+        _OUTP_IT("Number of SIGA sync's issued                    : %li\n",
+                 (long)atomic64_read(&perf_stats.siga_syncs));
+        _OUTP_IT("Number of SIGA in's issued                      : %li\n",
+                 (long)atomic64_read(&perf_stats.siga_ins));
+        _OUTP_IT("Number of SIGA out's issued                     : %li\n",
+                 (long)atomic64_read(&perf_stats.siga_outs));
+        _OUTP_IT("Number of PCIs caught                           : %li\n",
+                 (long)atomic64_read(&perf_stats.pcis));
+        _OUTP_IT("Number of adapter interrupts caught             : %li\n",
+                 (long)atomic64_read(&perf_stats.thinints));
+        _OUTP_IT("Number of fast requeues (outg. SBALs w/o SIGA)  : %li\n",
+                 (long)atomic64_read(&perf_stats.fast_reqs));
         _OUTP_IT("\n");
-        _OUTP_IT("Total time of all inbound actions (us) incl. UL : %lu\n",
-                 perf_stats.inbound_time);
-        _OUTP_IT("Number of inbound transfers                     : %lu\n",
-                 perf_stats.inbound_cnt);
-        _OUTP_IT("Total time of all outbound do_QDIOs (us)        : %lu\n",
-                 perf_stats.outbound_time);
-        _OUTP_IT("Number of do_QDIOs outbound                     : %lu\n",
-                 perf_stats.outbound_cnt);
+        _OUTP_IT("Number of inbound transfers                     : %li\n",
+                 (long)atomic64_read(&perf_stats.inbound_cnt));
+        _OUTP_IT("Number of do_QDIOs outbound                     : %li\n",
+                 (long)atomic64_read(&perf_stats.outbound_cnt));
+#else /* CONFIG_64BIT */
+        _OUTP_IT("Number of tasklet runs (total)                  : %i\n",
+                 atomic_read(&perf_stats.tl_runs));
+        _OUTP_IT("Inbound tasklet runs      tried/retried         : %i/%i\n",
+                 atomic_read(&perf_stats.inbound_tl_runs),
+                 atomic_read(&perf_stats.inbound_tl_runs_resched));
+        _OUTP_IT("Inbound-thin tasklet runs tried/retried         : %i/%i\n",
+                 atomic_read(&perf_stats.inbound_thin_tl_runs),
+                 atomic_read(&perf_stats.inbound_thin_tl_runs_resched));
+        _OUTP_IT("Outbound tasklet runs     tried/retried         : %i/%i\n",
+                 atomic_read(&perf_stats.outbound_tl_runs),
+                 atomic_read(&perf_stats.outbound_tl_runs_resched));
+        _OUTP_IT("\n");
+        _OUTP_IT("Number of SIGA sync's issued                    : %i\n",
+                 atomic_read(&perf_stats.siga_syncs));
+        _OUTP_IT("Number of SIGA in's issued                      : %i\n",
+                 atomic_read(&perf_stats.siga_ins));
+        _OUTP_IT("Number of SIGA out's issued                     : %i\n",
+                 atomic_read(&perf_stats.siga_outs));
+        _OUTP_IT("Number of PCIs caught                           : %i\n",
+                 atomic_read(&perf_stats.pcis));
+        _OUTP_IT("Number of adapter interrupts caught             : %i\n",
+                 atomic_read(&perf_stats.thinints));
+        _OUTP_IT("Number of fast requeues (outg. SBALs w/o SIGA)  : %i\n",
+                 atomic_read(&perf_stats.fast_reqs));
+        _OUTP_IT("\n");
+        _OUTP_IT("Number of inbound transfers                     : %i\n",
+                 atomic_read(&perf_stats.inbound_cnt));
+        _OUTP_IT("Number of do_QDIOs outbound                     : %i\n",
+                 atomic_read(&perf_stats.outbound_cnt));
+#endif /* CONFIG_64BIT */
         _OUTP_IT("\n");
 
         return c;
@@ -3642,8 +3653,6 @@ qdio_add_procfs_entry(void)
 static void
 qdio_remove_procfs_entry(void)
 {
-        perf_stats.tl_runs=0;
-
         if (!proc_perf_file_registration) /* means if it went ok earlier */
                 remove_proc_entry(QDIO_PERF,&proc_root);
 }
@@ -3671,13 +3680,38 @@ qdio_performance_stats_store(struct bus_type *bus, const char *buf, size_t count
                 qdio_performance_stats = i;
                 if (i==0) {
                         /* reset perf. stat. info */
-                        i_p_nc = 0;
-                        i_p_c = 0;
-                        ii_p_nc = 0;
-                        ii_p_c = 0;
-                        o_p_nc = 0;
-                        o_p_c = 0;
-                        memset(&perf_stats, 0, sizeof(struct qdio_perf_stats));
+#ifdef CONFIG_64BIT
+                        atomic64_set(&perf_stats.tl_runs, 0);
+                        atomic64_set(&perf_stats.outbound_tl_runs, 0);
+                        atomic64_set(&perf_stats.inbound_tl_runs, 0);
+                        atomic64_set(&perf_stats.inbound_tl_runs_resched, 0);
+                        atomic64_set(&perf_stats.inbound_thin_tl_runs, 0);
+                        atomic64_set(&perf_stats.inbound_thin_tl_runs_resched,
+                                     0);
+                        atomic64_set(&perf_stats.siga_outs, 0);
+                        atomic64_set(&perf_stats.siga_ins, 0);
+                        atomic64_set(&perf_stats.siga_syncs, 0);
+                        atomic64_set(&perf_stats.pcis, 0);
+                        atomic64_set(&perf_stats.thinints, 0);
+                        atomic64_set(&perf_stats.fast_reqs, 0);
+                        atomic64_set(&perf_stats.outbound_cnt, 0);
+                        atomic64_set(&perf_stats.inbound_cnt, 0);
+#else /* CONFIG_64BIT */
+                        atomic_set(&perf_stats.tl_runs, 0);
+                        atomic_set(&perf_stats.outbound_tl_runs, 0);
+                        atomic_set(&perf_stats.inbound_tl_runs, 0);
+                        atomic_set(&perf_stats.inbound_tl_runs_resched, 0);
+                        atomic_set(&perf_stats.inbound_thin_tl_runs, 0);
+                        atomic_set(&perf_stats.inbound_thin_tl_runs_resched, 0);
+                        atomic_set(&perf_stats.siga_outs, 0);
+                        atomic_set(&perf_stats.siga_ins, 0);
+                        atomic_set(&perf_stats.siga_syncs, 0);
+                        atomic_set(&perf_stats.pcis, 0);
+                        atomic_set(&perf_stats.thinints, 0);
+                        atomic_set(&perf_stats.fast_reqs, 0);
+                        atomic_set(&perf_stats.outbound_cnt, 0);
+                        atomic_set(&perf_stats.inbound_cnt, 0);
+#endif /* CONFIG_64BIT */
                 }
         } else {
                 QDIO_PRINT_WARN("QDIO performance_stats: write 0 or 1 to this file!\n");
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index ec9af72b2afc..2895392eaae4 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -406,21 +406,43 @@ do_clear_global_summary(void)
 #define CHSC_FLAG_SIGA_SYNC_DONE_ON_OUTB_PCIS 0x04
 
 struct qdio_perf_stats {
-        unsigned long tl_runs;
-
-        unsigned long siga_outs;
-        unsigned long siga_ins;
-        unsigned long siga_syncs;
-        unsigned long pcis;
-        unsigned long thinints;
-        unsigned long fast_reqs;
-
-        __u64 start_time_outbound;
-        unsigned long outbound_cnt;
-        unsigned long outbound_time;
-        __u64 start_time_inbound;
-        unsigned long inbound_cnt;
-        unsigned long inbound_time;
+#ifdef CONFIG_64BIT
+        atomic64_t tl_runs;
+        atomic64_t outbound_tl_runs;
+        atomic64_t outbound_tl_runs_resched;
+        atomic64_t inbound_tl_runs;
+        atomic64_t inbound_tl_runs_resched;
+        atomic64_t inbound_thin_tl_runs;
+        atomic64_t inbound_thin_tl_runs_resched;
+
+        atomic64_t siga_outs;
+        atomic64_t siga_ins;
+        atomic64_t siga_syncs;
+        atomic64_t pcis;
+        atomic64_t thinints;
+        atomic64_t fast_reqs;
+
+        atomic64_t outbound_cnt;
+        atomic64_t inbound_cnt;
+#else /* CONFIG_64BIT */
+        atomic_t tl_runs;
+        atomic_t outbound_tl_runs;
+        atomic_t outbound_tl_runs_resched;
+        atomic_t inbound_tl_runs;
+        atomic_t inbound_tl_runs_resched;
+        atomic_t inbound_thin_tl_runs;
+        atomic_t inbound_thin_tl_runs_resched;
+
+        atomic_t siga_outs;
+        atomic_t siga_ins;
+        atomic_t siga_syncs;
+        atomic_t pcis;
+        atomic_t thinints;
+        atomic_t fast_reqs;
+
+        atomic_t outbound_cnt;
+        atomic_t inbound_cnt;
+#endif /* CONFIG_64BIT */
 };
 
 /* unlikely as the later the better */
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 84b108d7c7fd..b34eb82edd98 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -288,6 +288,7 @@ qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, enum qeth_ipa_funcs func)
  */
 #define IF_NAME_LEN             16
 #define QETH_TX_TIMEOUT         100 * HZ
+#define QETH_RCD_TIMEOUT        60 * HZ
 #define QETH_HEADER_SIZE        32
 #define MAX_PORTNO              15
 #define QETH_FAKE_LL_LEN_ETH    ETH_HLEN
@@ -582,6 +583,8 @@ enum qeth_channel_states {
         CH_STATE_ACTIVATING,
         CH_STATE_HALTED,
         CH_STATE_STOPPED,
+        CH_STATE_RCD,
+        CH_STATE_RCD_DONE,
 };
 /**
  * card state machine
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index ad7792dc1a04..6fd8870551d3 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -315,7 +315,8 @@ qeth_alloc_card(void)
 }
 
 static long
-__qeth_check_irb_error(struct ccw_device *cdev, struct irb *irb)
+__qeth_check_irb_error(struct ccw_device *cdev, unsigned long intparm,
+                       struct irb *irb)
 {
         if (!IS_ERR(irb))
                 return 0;
@@ -330,6 +331,14 @@ __qeth_check_irb_error(struct ccw_device *cdev, struct irb *irb)
                 PRINT_WARN("timeout on device %s\n", cdev->dev.bus_id);
                 QETH_DBF_TEXT(trace, 2, "ckirberr");
                 QETH_DBF_TEXT_(trace, 2, "  rc%d", -ETIMEDOUT);
+                if (intparm == QETH_RCD_PARM) {
+                        struct qeth_card *card = CARD_FROM_CDEV(cdev);
+
+                        if (card && (card->data.ccwdev == cdev)) {
+                                card->data.state = CH_STATE_DOWN;
+                                wake_up(&card->wait_q);
+                        }
+                }
                 break;
         default:
                 PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),
@@ -401,7 +410,7 @@ qeth_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
         QETH_DBF_TEXT(trace,5,"irq");
 
-        if (__qeth_check_irb_error(cdev, irb))
+        if (__qeth_check_irb_error(cdev, intparm, irb))
                 return;
         cstat = irb->scsw.cstat;
         dstat = irb->scsw.dstat;
@@ -429,7 +438,8 @@ qeth_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 channel->state = CH_STATE_HALTED;
 
         /*let's wake up immediately on data channel*/
-        if ((channel == &card->data) && (intparm != 0))
+        if ((channel == &card->data) && (intparm != 0) &&
+            (intparm != QETH_RCD_PARM))
                 goto out;
 
         if (intparm == QETH_CLEAR_CHANNEL_PARM) {
@@ -453,6 +463,10 @@ qeth_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         HEXDUMP16(WARN,"irb: ",irb);
                         HEXDUMP16(WARN,"sense data: ",irb->ecw);
                 }
+                if (intparm == QETH_RCD_PARM) {
+                        channel->state = CH_STATE_DOWN;
+                        goto out;
+                }
                 rc = qeth_get_problem(cdev,irb);
                 if (rc) {
                         qeth_schedule_recovery(card);
@@ -460,6 +474,10 @@ qeth_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 }
         }
 
+        if (intparm == QETH_RCD_PARM) {
+                channel->state = CH_STATE_RCD_DONE;
+                goto out;
+        }
         if (intparm) {
                 buffer = (struct qeth_cmd_buffer *) __va((addr_t)intparm);
                 buffer->state = BUF_STATE_PROCESSED;
@@ -1204,6 +1222,54 @@ qeth_probe_device(struct ccwgroup_device *gdev)
 }
 
 
+static int qeth_read_conf_data(struct qeth_card *card, void **buffer,
+                               int *length)
+{
+        struct ciw *ciw;
+        char *rcd_buf;
+        int ret;
+        struct qeth_channel *channel = &card->data;
+        unsigned long flags;
+
+        /*
+         * scan for RCD command in extended SenseID data
+         */
+        ciw = ccw_device_get_ciw(channel->ccwdev, CIW_TYPE_RCD);
+        if (!ciw || ciw->cmd == 0)
+                return -EOPNOTSUPP;
+        rcd_buf = kzalloc(ciw->count, GFP_KERNEL | GFP_DMA);
+        if (!rcd_buf)
+                return -ENOMEM;
+
+        channel->ccw.cmd_code = ciw->cmd;
+        channel->ccw.cda = (__u32) __pa (rcd_buf);
+        channel->ccw.count = ciw->count;
+        channel->ccw.flags = CCW_FLAG_SLI;
+        channel->state = CH_STATE_RCD;
+        spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
+        ret = ccw_device_start_timeout(channel->ccwdev, &channel->ccw,
+                                       QETH_RCD_PARM, LPM_ANYPATH, 0,
+                                       QETH_RCD_TIMEOUT);
+        spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
+        if (!ret)
+                wait_event(card->wait_q,
+                           (channel->state == CH_STATE_RCD_DONE ||
+                            channel->state == CH_STATE_DOWN));
+        if (channel->state == CH_STATE_DOWN)
+                ret = -EIO;
+        else
+                channel->state = CH_STATE_DOWN;
+        if (ret) {
+                kfree(rcd_buf);
+                *buffer = NULL;
+                *length = 0;
+        } else {
+                *length = ciw->count;
+                *buffer = rcd_buf;
+        }
+        return ret;
+}
+
 static int
 qeth_get_unitaddr(struct qeth_card *card)
 {
@@ -1212,9 +1278,9 @@ qeth_get_unitaddr(struct qeth_card *card)
         int rc;
 
         QETH_DBF_TEXT(setup, 2, "getunit");
-        rc = read_conf_data(CARD_DDEV(card), (void **) &prcd, &length);
+        rc = qeth_read_conf_data(card, (void **) &prcd, &length);
         if (rc) {
-                PRINT_ERR("read_conf_data for device %s returned %i\n",
+                PRINT_ERR("qeth_read_conf_data for device %s returned %i\n",
                           CARD_DDEV_ID(card), rc);
                 return rc;
         }
@@ -1223,6 +1289,7 @@ qeth_get_unitaddr(struct qeth_card *card)
         card->info.cula = prcd[63];
         card->info.guestlan = ((prcd[0x10] == _ascebc['V']) &&
                                (prcd[0x11] == _ascebc['M']));
+        kfree(prcd);
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 0477c47471c5..d74bc43da72a 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -37,6 +37,7 @@ extern unsigned char IPA_PDU_HEADER[];
 
 #define QETH_CLEAR_CHANNEL_PARM -10
 #define QETH_HALT_CHANNEL_PARM  -11
+#define QETH_RCD_PARM -12
 
 /*****************************************************************************/
 /* IP Assist related definitions                                             */
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 421da1e7c0ea..c1f2d4b14c2b 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -186,7 +186,7 @@ void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout)
 {
         fsf_req->timer.function = zfcp_fsf_request_timeout_handler;
         fsf_req->timer.data = (unsigned long) fsf_req->adapter;
-        fsf_req->timer.expires = timeout;
+        fsf_req->timer.expires = jiffies + timeout;
         add_timer(&fsf_req->timer);
 }
 
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index ef16f7ca4bb1..4c0a59afd5c8 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -299,9 +299,10 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
         }
 
         /* log additional information provided by FSF (if any) */
-        if (unlikely(qtcb->header.log_length)) {
+        if (likely(qtcb->header.log_length)) {
                 /* do not trust them ;-) */
-                if (qtcb->header.log_start > sizeof(struct fsf_qtcb)) {
+                if (unlikely(qtcb->header.log_start >
+                             sizeof(struct fsf_qtcb))) {
                         ZFCP_LOG_NORMAL
                             ("bug: ULP (FSF logging) log data starts "
                              "beyond end of packet header. Ignored. "
@@ -310,8 +311,9 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                              sizeof(struct fsf_qtcb));
                         goto forget_log;
                 }
-                if ((size_t) (qtcb->header.log_start + qtcb->header.log_length)
-                    > sizeof(struct fsf_qtcb)) {
+                if (unlikely((size_t) (qtcb->header.log_start +
+                                       qtcb->header.log_length) >
+                             sizeof(struct fsf_qtcb))) {
                         ZFCP_LOG_NORMAL("bug: ULP (FSF logging) log data ends "
                                         "beyond end of packet header. Ignored. "
                                         "(start=%i, length=%i, size=%li)\n",
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index eee590a51d8a..002643392d42 100644
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 
 #include <asm/system.h>
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index e874b8944875..96f4cab07614 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -579,17 +579,17 @@ static void __init BusLogic_InitializeProbeInfoListISA(struct BusLogic_HostAdapt
         /*
            Append the list of standard BusLogic MultiMaster ISA I/O Addresses.
          */
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe330 : check_region(0x330, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe330)
                 BusLogic_AppendProbeAddressISA(0x330);
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe334 : check_region(0x334, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe334)
                 BusLogic_AppendProbeAddressISA(0x334);
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe230 : check_region(0x230, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe230)
                 BusLogic_AppendProbeAddressISA(0x230);
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe234 : check_region(0x234, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe234)
                 BusLogic_AppendProbeAddressISA(0x234);
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe130 : check_region(0x130, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe130)
                 BusLogic_AppendProbeAddressISA(0x130);
-        if (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe134 : check_region(0x134, BusLogic_MultiMasterAddressCount) == 0)
+        if (!BusLogic_ProbeOptions.LimitedProbeISA || BusLogic_ProbeOptions.Probe134)
                 BusLogic_AppendProbeAddressISA(0x134);
 }
 
@@ -795,7 +795,9 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
            host adapters are probed.
          */
         if (!BusLogic_ProbeOptions.NoProbeISA)
-                if (PrimaryProbeInfo->IO_Address == 0 && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe330 : check_region(0x330, BusLogic_MultiMasterAddressCount) == 0)) {
+                if (PrimaryProbeInfo->IO_Address == 0 &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe330)) {
                         PrimaryProbeInfo->HostAdapterType = BusLogic_MultiMaster;
                         PrimaryProbeInfo->HostAdapterBusType = BusLogic_ISA_Bus;
                         PrimaryProbeInfo->IO_Address = 0x330;
@@ -805,15 +807,25 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
            omitting the Primary I/O Address which has already been handled.
          */
         if (!BusLogic_ProbeOptions.NoProbeISA) {
-                if (!StandardAddressSeen[1] && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe334 : check_region(0x334, BusLogic_MultiMasterAddressCount) == 0))
+                if (!StandardAddressSeen[1] &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe334))
                         BusLogic_AppendProbeAddressISA(0x334);
-                if (!StandardAddressSeen[2] && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe230 : check_region(0x230, BusLogic_MultiMasterAddressCount) == 0))
+                if (!StandardAddressSeen[2] &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe230))
                         BusLogic_AppendProbeAddressISA(0x230);
-                if (!StandardAddressSeen[3] && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe234 : check_region(0x234, BusLogic_MultiMasterAddressCount) == 0))
+                if (!StandardAddressSeen[3] &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe234))
                         BusLogic_AppendProbeAddressISA(0x234);
-                if (!StandardAddressSeen[4] && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe130 : check_region(0x130, BusLogic_MultiMasterAddressCount) == 0))
+                if (!StandardAddressSeen[4] &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe130))
                         BusLogic_AppendProbeAddressISA(0x130);
-                if (!StandardAddressSeen[5] && (BusLogic_ProbeOptions.LimitedProbeISA ? BusLogic_ProbeOptions.Probe134 : check_region(0x134, BusLogic_MultiMasterAddressCount) == 0))
+                if (!StandardAddressSeen[5] &&
+                                (!BusLogic_ProbeOptions.LimitedProbeISA ||
+                                 BusLogic_ProbeOptions.Probe134))
                         BusLogic_AppendProbeAddressISA(0x134);
         }
         /*
@@ -2220,22 +2232,35 @@ static int __init BusLogic_init(void)
                 HostAdapter->PCI_Device = ProbeInfo->PCI_Device;
                 HostAdapter->IRQ_Channel = ProbeInfo->IRQ_Channel;
                 HostAdapter->AddressCount = BusLogic_HostAdapterAddressCount[HostAdapter->HostAdapterType];
+
+                /*
+                   Make sure region is free prior to probing.
+                 */
+                if (!request_region(HostAdapter->IO_Address, HostAdapter->AddressCount,
+                                        "BusLogic"))
+                        continue;
                 /*
                    Probe the Host Adapter.  If unsuccessful, abort further initialization.
                  */
-                if (!BusLogic_ProbeHostAdapter(HostAdapter))
+                if (!BusLogic_ProbeHostAdapter(HostAdapter)) {
+                        release_region(HostAdapter->IO_Address, HostAdapter->AddressCount);
                         continue;
+                }
                 /*
                    Hard Reset the Host Adapter.  If unsuccessful, abort further
                    initialization.
                  */
-                if (!BusLogic_HardwareResetHostAdapter(HostAdapter, true))
+                if (!BusLogic_HardwareResetHostAdapter(HostAdapter, true)) {
+                        release_region(HostAdapter->IO_Address, HostAdapter->AddressCount);
                         continue;
+                }
                 /*
                    Check the Host Adapter.  If unsuccessful, abort further initialization.
                  */
-                if (!BusLogic_CheckHostAdapter(HostAdapter))
+                if (!BusLogic_CheckHostAdapter(HostAdapter)) {
+                        release_region(HostAdapter->IO_Address, HostAdapter->AddressCount);
                         continue;
+                }
                 /*
                    Initialize the Driver Options field if provided.
                  */
@@ -2247,16 +2272,6 @@ static int __init BusLogic_init(void)
                  */
                 BusLogic_AnnounceDriver(HostAdapter);
                 /*
-                   Register usage of the I/O Address range.  From this point onward, any
-                   failure will be assumed to be due to a problem with the Host Adapter,
-                   rather than due to having mistakenly identified this port as belonging
-                   to a BusLogic Host Adapter.  The I/O Address range will not be
-                   released, thereby preventing it from being incorrectly identified as
-                   any other type of Host Adapter.
-                 */
-                if (!request_region(HostAdapter->IO_Address, HostAdapter->AddressCount, "BusLogic"))
-                        continue;
-                /*
                    Register the SCSI Host structure.
                  */
 
@@ -2280,6 +2295,12 @@ static int __init BusLogic_init(void)
                    Acquire the System Resources necessary to use the Host Adapter, then
                    Create the Initial CCBs, Initialize the Host Adapter, and finally
                    perform Target Device Inquiry.
+
+                   From this point onward, any failure will be assumed to be due to a
+                   problem with the Host Adapter, rather than due to having mistakenly
+                   identified this port as belonging to a BusLogic Host Adapter.  The
+                   I/O Address range will not be released, thereby preventing it from
+                   being incorrectly identified as any other type of Host Adapter.
                  */
                 if (BusLogic_ReadHostAdapterConfiguration(HostAdapter) &&
                     BusLogic_ReportHostAdapterConfiguration(HostAdapter) &&
@@ -3598,6 +3619,7 @@ static void __exit BusLogic_exit(void)
 
 __setup("BusLogic=", BusLogic_Setup);
 
+#ifdef MODULE
 static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
         { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -3607,6 +3629,7 @@ static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         { }
 };
+#endif
 MODULE_DEVICE_TABLE(pci, BusLogic_pci_tbl);
 
 module_init(BusLogic_init);
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index fcc4cb6c7f46..e62d23f65180 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -170,7 +170,7 @@ config CHR_DEV_SCH
         
           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
+          say M here and read <file:Documentation/kbuild/modules.txt> and
           <file:Documentation/scsi.txt>. The module will be called ch.o.
           If unsure, say N.
         
@@ -241,6 +241,12 @@ config SCSI_SCAN_ASYNC
           You can override this choice by specifying "scsi_mod.scan=sync"
           or async on the kernel's command line.
 
+config SCSI_WAIT_SCAN
+        tristate
+        default m
+        depends on SCSI
+        depends on MODULES
+
 menu "SCSI Transports"
         depends on SCSI
 
@@ -1194,17 +1200,6 @@ config SCSI_NCR53C8XX_SYNC
           There is no safe option other than using good cabling, right
           terminations and SCSI conformant devices.
 
-config SCSI_NCR53C8XX_PROFILE
-        bool "enable profiling"
-        depends on SCSI_ZALON || SCSI_NCR_Q720
-        help
-          This option allows you to enable profiling information gathering.
-          These statistics are not very accurate due to the low frequency
-          of the kernel clock (100 Hz on i386) and have performance impact
-          on systems that use very fast devices.
-
-          The normal answer therefore is N.
-
 config SCSI_NCR53C8XX_NO_DISCONNECT
         bool "not allow targets to disconnect"
         depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
@@ -1334,11 +1329,6 @@ config SCSI_SIM710
 
           It currently supports Compaq EISA cards and NCR MCA cards
 
-config 53C700_IO_MAPPED
-        bool
-        depends on SCSI_SIM710
-        default y
-
 config SCSI_SYM53C416
         tristate "Symbios 53c416 SCSI support"
         depends on ISA && SCSI
@@ -1649,7 +1639,7 @@ config OKTAGON_SCSI
 
 config ATARI_SCSI
         tristate "Atari native SCSI support"
-        depends on ATARI && SCSI && BROKEN
+        depends on ATARI && SCSI
         select SCSI_SPI_ATTRS
         ---help---
           If you have an Atari with built-in NCR5380 SCSI controller (TT,
@@ -1793,7 +1783,7 @@ config ZFCP
 
           This driver is also available as a module. This module will be
           called zfcp. If you want to compile it as a module, say M here
-          and read <file:Documentation/modules.txt>.
+          and read <file:Documentation/kbuild/modules.txt>.
 
 config SCSI_SRP
         tristate "SCSI RDMA Protocol helper library"
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 70cff4c599d7..51e884fa10b0 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -146,7 +146,7 @@ obj-$(CONFIG_CHR_DEV_SCH)	+= ch.o
 # This goes last, so that "real" scsi devices probe earlier
 obj-$(CONFIG_SCSI_DEBUG)        += scsi_debug.o
 
-obj-$(CONFIG_SCSI)              += scsi_wait_scan.o
+obj-$(CONFIG_SCSI_WAIT_SCAN)    += scsi_wait_scan.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/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index d789e61bdc49..1e82c69b36b0 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -172,6 +172,30 @@ MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size.
 int expose_physicals = -1;
 module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(expose_physicals, "Expose physical components of the arrays. -1=protect 0=off, 1=on");
+
+
+static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
+                struct fib *fibptr) {
+        struct scsi_device *device;
+
+        if (unlikely(!scsicmd || !scsicmd->scsi_done )) {
+                dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"))
+;
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
+                return 0;
+        }
+        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
+        device = scsicmd->device;
+        if (unlikely(!device || !scsi_device_online(device))) {
+                dprintk((KERN_WARNING "aac_valid_context: scsi device corrupt\n"));
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
+                return 0;
+        }
+        return 1;
+}
+
 /**
  *      aac_get_config_status   -       check the adapter configuration
  *      @common: adapter to query
@@ -258,13 +282,10 @@ int aac_get_containers(struct aac_dev *dev)
         u32 index; 
         int status = 0;
         struct fib * fibptr;
-        unsigned instance;
         struct aac_get_container_count *dinfo;
         struct aac_get_container_count_resp *dresp;
         int maximum_num_containers = MAXIMUM_NUM_CONTAINERS;
 
-        instance = dev->scsi_host_ptr->unique_id;
-
         if (!(fibptr = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
@@ -284,88 +305,35 @@ int aac_get_containers(struct aac_dev *dev)
                 maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);
                 aac_fib_complete(fibptr);
         }
+        aac_fib_free(fibptr);
 
         if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS)
                 maximum_num_containers = MAXIMUM_NUM_CONTAINERS;
-        fsa_dev_ptr = kmalloc(
-          sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL);
-        if (!fsa_dev_ptr) {
-                aac_fib_free(fibptr);
+        fsa_dev_ptr =  kmalloc(sizeof(*fsa_dev_ptr) * maximum_num_containers,
+                        GFP_KERNEL);
+        if (!fsa_dev_ptr)
                 return -ENOMEM;
-        }
         memset(fsa_dev_ptr, 0, sizeof(*fsa_dev_ptr) * maximum_num_containers);
 
         dev->fsa_dev = fsa_dev_ptr;
         dev->maximum_num_containers = maximum_num_containers;
 
-        for (index = 0; index < dev->maximum_num_containers; index++) {
-                struct aac_query_mount *dinfo;
-                struct aac_mount *dresp;
-
+        for (index = 0; index < dev->maximum_num_containers; ) {
                 fsa_dev_ptr[index].devname[0] = '\0';
 
-                aac_fib_init(fibptr);
-                dinfo = (struct aac_query_mount *) fib_data(fibptr);
-
-                dinfo->command = cpu_to_le32(VM_NameServe);
-                dinfo->count = cpu_to_le32(index);
-                dinfo->type = cpu_to_le32(FT_FILESYS);
+                status = aac_probe_container(dev, index);
 
-                status = aac_fib_send(ContainerCommand,
-                                    fibptr,
-                                    sizeof (struct aac_query_mount),
-                                    FsaNormal,
-                                    1, 1,
-                                    NULL, NULL);
-                if (status < 0 ) {
+                if (status < 0) {
                         printk(KERN_WARNING "aac_get_containers: SendFIB failed.\n");
                         break;
                 }
-                dresp = (struct aac_mount *)fib_data(fibptr);
 
-                if ((le32_to_cpu(dresp->status) == ST_OK) &&
-                    (le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
-                        dinfo->command = cpu_to_le32(VM_NameServe64);
-                        dinfo->count = cpu_to_le32(index);
-                        dinfo->type = cpu_to_le32(FT_FILESYS);
-
-                        if (aac_fib_send(ContainerCommand,
-                                    fibptr,
-                                    sizeof(struct aac_query_mount),
-                                    FsaNormal,
-                                    1, 1,
-                                    NULL, NULL) < 0)
-                                continue;
-                } else
-                        dresp->mnt[0].capacityhigh = 0;
-
-                dprintk ((KERN_DEBUG
-                  "VM_NameServe cid=%d status=%d vol=%d state=%d cap=%llu\n",
-                  (int)index, (int)le32_to_cpu(dresp->status),
-                  (int)le32_to_cpu(dresp->mnt[0].vol),
-                  (int)le32_to_cpu(dresp->mnt[0].state),
-                  ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
-                    (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32)));
-                if ((le32_to_cpu(dresp->status) == ST_OK) &&
-                    (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
-                    (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
-                        fsa_dev_ptr[index].valid = 1;
-                        fsa_dev_ptr[index].type = le32_to_cpu(dresp->mnt[0].vol);
-                        fsa_dev_ptr[index].size
-                          = ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
-                            (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
-                        if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
-                                    fsa_dev_ptr[index].ro = 1;
-                }
-                aac_fib_complete(fibptr);
                 /*
                  *      If there are no more containers, then stop asking.
                  */
-                if ((index + 1) >= le32_to_cpu(dresp->count)){
+                if (++index >= status)
                         break;
-                }
         }
-        aac_fib_free(fibptr);
         return status;
 }
 
@@ -382,8 +350,9 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigne
                 buf = scsicmd->request_buffer;
                 transfer_len = min(scsicmd->request_bufflen, len + offset);
         }
-
-        memcpy(buf + offset, data, transfer_len - offset);
+        transfer_len -= offset;
+        if (buf && transfer_len)
+                memcpy(buf + offset, data, transfer_len);
 
         if (scsicmd->use_sg) 
                 kunmap_atomic(buf - sg->offset, KM_IRQ0);
@@ -396,7 +365,9 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         struct scsi_cmnd * scsicmd;
 
         scsicmd = (struct scsi_cmnd *) context;
-        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
+
+        if (!aac_valid_context(scsicmd, fibptr))
+                return;
 
         dprintk((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n", smp_processor_id(), jiffies));
         BUG_ON(fibptr == NULL);
@@ -431,7 +402,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
 /**
  *      aac_get_container_name  -       get container name, none blocking.
  */
-static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
+static int aac_get_container_name(struct scsi_cmnd * scsicmd)
 {
         int status;
         struct aac_get_name *dinfo;
@@ -448,7 +419,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
 
         dinfo->command = cpu_to_le32(VM_ContainerConfig);
         dinfo->type = cpu_to_le32(CT_READ_NAME);
-        dinfo->cid = cpu_to_le32(cid);
+        dinfo->cid = cpu_to_le32(scmd_id(scsicmd));
         dinfo->count = cpu_to_le32(sizeof(((struct aac_get_name_resp *)NULL)->data));
 
         status = aac_fib_send(ContainerCommand,
@@ -473,85 +444,192 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
         return -1;
 }
 
-/**
- *      aac_probe_container             -       query a logical volume
- *      @dev: device to query
- *      @cid: container identifier
- *
- *      Queries the controller about the given volume. The volume information
- *      is updated in the struct fsa_dev_info structure rather than returned.
- */
- 
-int aac_probe_container(struct aac_dev *dev, int cid)
+static int aac_probe_container_callback2(struct scsi_cmnd * scsicmd)
+{
+        struct fsa_dev_info *fsa_dev_ptr = ((struct aac_dev *)(scsicmd->device->host->hostdata))->fsa_dev;
+
+        if (fsa_dev_ptr[scmd_id(scsicmd)].valid)
+                return aac_scsi_cmd(scsicmd);
+
+        scsicmd->result = DID_NO_CONNECT << 16;
+        scsicmd->scsi_done(scsicmd);
+        return 0;
+}
+
+static int _aac_probe_container2(void * context, struct fib * fibptr)
 {
         struct fsa_dev_info *fsa_dev_ptr;
-        int status;
+        int (*callback)(struct scsi_cmnd *);
+        struct scsi_cmnd * scsicmd = (struct scsi_cmnd *)context;
+
+        if (!aac_valid_context(scsicmd, fibptr))
+                return 0;
+
+        fsa_dev_ptr = ((struct aac_dev *)(scsicmd->device->host->hostdata))->fsa_dev;
+
+        scsicmd->SCp.Status = 0;
+        if (fsa_dev_ptr) {
+                struct aac_mount * dresp = (struct aac_mount *) fib_data(fibptr);
+                fsa_dev_ptr += scmd_id(scsicmd);
+
+                if ((le32_to_cpu(dresp->status) == ST_OK) &&
+                    (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
+                    (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
+                        fsa_dev_ptr->valid = 1;
+                        fsa_dev_ptr->type = le32_to_cpu(dresp->mnt[0].vol);
+                        fsa_dev_ptr->size
+                          = ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
+                            (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
+                        fsa_dev_ptr->ro = ((le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY) != 0);
+                }
+                if ((fsa_dev_ptr->valid & 1) == 0)
+                        fsa_dev_ptr->valid = 0;
+                scsicmd->SCp.Status = le32_to_cpu(dresp->count);
+        }
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
+        callback = (int (*)(struct scsi_cmnd *))(scsicmd->SCp.ptr);
+        scsicmd->SCp.ptr = NULL;
+        return (*callback)(scsicmd);
+}
+
+static int _aac_probe_container1(void * context, struct fib * fibptr)
+{
+        struct scsi_cmnd * scsicmd;
+        struct aac_mount * dresp;
         struct aac_query_mount *dinfo;
-        struct aac_mount *dresp;
-        struct fib * fibptr;
-        unsigned instance;
+        int status;
 
-        fsa_dev_ptr = dev->fsa_dev;
-        if (!fsa_dev_ptr)
-                return -ENOMEM;
-        instance = dev->scsi_host_ptr->unique_id;
+        dresp = (struct aac_mount *) fib_data(fibptr);
+        dresp->mnt[0].capacityhigh = 0;
+        if ((le32_to_cpu(dresp->status) != ST_OK) ||
+            (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE))
+                return _aac_probe_container2(context, fibptr);
+        scsicmd = (struct scsi_cmnd *) context;
+        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
 
-        if (!(fibptr = aac_fib_alloc(dev)))
-                return -ENOMEM;
+        if (!aac_valid_context(scsicmd, fibptr))
+                return 0;
 
         aac_fib_init(fibptr);
 
         dinfo = (struct aac_query_mount *)fib_data(fibptr);
 
-        dinfo->command = cpu_to_le32(VM_NameServe);
-        dinfo->count = cpu_to_le32(cid);
+        dinfo->command = cpu_to_le32(VM_NameServe64);
+        dinfo->count = cpu_to_le32(scmd_id(scsicmd));
         dinfo->type = cpu_to_le32(FT_FILESYS);
 
         status = aac_fib_send(ContainerCommand,
-                            fibptr,
-                            sizeof(struct aac_query_mount),
-                            FsaNormal,
-                            1, 1,
-                            NULL, NULL);
+                          fibptr,
+                          sizeof(struct aac_query_mount),
+                          FsaNormal,
+                          0, 1,
+                          (fib_callback) _aac_probe_container2,
+                          (void *) scsicmd);
+        /*
+         *      Check that the command queued to the controller
+         */
+        if (status == -EINPROGRESS) {
+                scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
+                return 0;
+        }
         if (status < 0) {
-                printk(KERN_WARNING "aacraid: aac_probe_container query failed.\n");
-                goto error;
+                /* Inherit results from VM_NameServe, if any */
+                dresp->status = cpu_to_le32(ST_OK);
+                return _aac_probe_container2(context, fibptr);
         }
+        return 0;
+}
 
-        dresp = (struct aac_mount *) fib_data(fibptr);
+static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(struct scsi_cmnd *))
+{
+        struct fib * fibptr;
+        int status = -ENOMEM;
 
-        if ((le32_to_cpu(dresp->status) == ST_OK) &&
-            (le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
-                dinfo->command = cpu_to_le32(VM_NameServe64);
-                dinfo->count = cpu_to_le32(cid);
-                dinfo->type = cpu_to_le32(FT_FILESYS);
+        if ((fibptr = aac_fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata))) {
+                struct aac_query_mount *dinfo;
 
-                if (aac_fib_send(ContainerCommand,
-                            fibptr,
-                            sizeof(struct aac_query_mount),
-                            FsaNormal,
-                            1, 1,
-                            NULL, NULL) < 0)
-                        goto error;
-        } else
-                dresp->mnt[0].capacityhigh = 0;
+                aac_fib_init(fibptr);
+
+                dinfo = (struct aac_query_mount *)fib_data(fibptr);
+
+                dinfo->command = cpu_to_le32(VM_NameServe);
+                dinfo->count = cpu_to_le32(scmd_id(scsicmd));
+                dinfo->type = cpu_to_le32(FT_FILESYS);
+                scsicmd->SCp.ptr = (char *)callback;
 
-        if ((le32_to_cpu(dresp->status) == ST_OK) &&
-            (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
-            (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
-                fsa_dev_ptr[cid].valid = 1;
-                fsa_dev_ptr[cid].type = le32_to_cpu(dresp->mnt[0].vol);
-                fsa_dev_ptr[cid].size
-                  = ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
-                    (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
-                if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
-                        fsa_dev_ptr[cid].ro = 1;
+                status = aac_fib_send(ContainerCommand,
+                          fibptr,
+                          sizeof(struct aac_query_mount),
+                          FsaNormal,
+                          0, 1,
+                          (fib_callback) _aac_probe_container1,
+                          (void *) scsicmd);
+                /*
+                 *      Check that the command queued to the controller
+                 */
+                if (status == -EINPROGRESS) {
+                        scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
+                        return 0;
+                }
+                if (status < 0) {
+                        scsicmd->SCp.ptr = NULL;
+                        aac_fib_complete(fibptr);
+                        aac_fib_free(fibptr);
+                }
         }
+        if (status < 0) {
+                struct fsa_dev_info *fsa_dev_ptr = ((struct aac_dev *)(scsicmd->device->host->hostdata))->fsa_dev;
+                if (fsa_dev_ptr) {
+                        fsa_dev_ptr += scmd_id(scsicmd);
+                        if ((fsa_dev_ptr->valid & 1) == 0) {
+                                fsa_dev_ptr->valid = 0;
+                                return (*callback)(scsicmd);
+                        }
+                }
+        }
+        return status;
+}
 
-error:
-        aac_fib_complete(fibptr);
-        aac_fib_free(fibptr);
+/**
+ *      aac_probe_container             -       query a logical volume
+ *      @dev: device to query
+ *      @cid: container identifier
+ *
+ *      Queries the controller about the given volume. The volume information
+ *      is updated in the struct fsa_dev_info structure rather than returned.
+ */
+static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
+{
+        scsicmd->device = NULL;
+        return 0;
+}
+
+int aac_probe_container(struct aac_dev *dev, int cid)
+{
+        struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
+        struct scsi_device *scsidev = kmalloc(sizeof(*scsidev), GFP_KERNEL);
+        int status;
 
+        if (!scsicmd || !scsidev) {
+                kfree(scsicmd);
+                kfree(scsidev);
+                return -ENOMEM;
+        }
+        scsicmd->list.next = NULL;
+        scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))_aac_probe_container1;
+
+        scsicmd->device = scsidev;
+        scsidev->sdev_state = 0;
+        scsidev->id = cid;
+        scsidev->host = dev->scsi_host_ptr;
+
+        if (_aac_probe_container(scsicmd, aac_probe_container_callback1) == 0)
+                while (scsicmd->device == scsidev)
+                        schedule();
+        kfree(scsidev);
+        status = scsicmd->SCp.Status;
+        kfree(scsicmd);
         return status;
 }
 
@@ -1115,6 +1193,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         printk(KERN_INFO "%s%d: serial %x\n",
                                 dev->name, dev->id,
                                 le32_to_cpu(dev->adapter_info.serial[0]));
+                if (dev->supplement_adapter_info.VpdInfo.Tsid[0]) {
+                        printk(KERN_INFO "%s%d: TSID %.*s\n",
+                          dev->name, dev->id,
+                          (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
+                          dev->supplement_adapter_info.VpdInfo.Tsid);
+                }
         }
 
         dev->nondasd_support = 0;
@@ -1241,7 +1325,9 @@ static void io_callback(void *context, struct fib * fibptr)
         u32 cid;
 
         scsicmd = (struct scsi_cmnd *) context;
-        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
+
+        if (!aac_valid_context(scsicmd, fibptr))
+                return;
 
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
         cid = scmd_id(scsicmd);
@@ -1317,7 +1403,7 @@ static void io_callback(void *context, struct fib * fibptr)
         scsicmd->scsi_done(scsicmd);
 }
 
-static int aac_read(struct scsi_cmnd * scsicmd, int cid)
+static int aac_read(struct scsi_cmnd * scsicmd)
 {
         u64 lba;
         u32 count;
@@ -1331,7 +1417,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
          */
         switch (scsicmd->cmnd[0]) {
         case READ_6:
-                dprintk((KERN_DEBUG "aachba: received a read(6) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a read(6) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | 
                         (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
@@ -1341,7 +1427,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                         count = 256;
                 break;
         case READ_16:
-                dprintk((KERN_DEBUG "aachba: received a read(16) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a read(16) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba =   ((u64)scsicmd->cmnd[2] << 56) |
                         ((u64)scsicmd->cmnd[3] << 48) |
@@ -1355,7 +1441,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                         (scsicmd->cmnd[12] << 8) | scsicmd->cmnd[13];
                 break;
         case READ_12:
-                dprintk((KERN_DEBUG "aachba: received a read(12) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a read(12) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba = ((u64)scsicmd->cmnd[2] << 24) | 
                         (scsicmd->cmnd[3] << 16) |
@@ -1365,7 +1451,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                         (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
                 break;
         default:
-                dprintk((KERN_DEBUG "aachba: received a read(10) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a read(10) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba = ((u64)scsicmd->cmnd[2] << 24) | 
                         (scsicmd->cmnd[3] << 16) | 
@@ -1405,7 +1491,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
         return 0;
 }
 
-static int aac_write(struct scsi_cmnd * scsicmd, int cid)
+static int aac_write(struct scsi_cmnd * scsicmd)
 {
         u64 lba;
         u32 count;
@@ -1424,7 +1510,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 if (count == 0)
                         count = 256;
         } else if (scsicmd->cmnd[0] == WRITE_16) { /* 16 byte command */
-                dprintk((KERN_DEBUG "aachba: received a write(16) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a write(16) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba =   ((u64)scsicmd->cmnd[2] << 56) |
                         ((u64)scsicmd->cmnd[3] << 48) |
@@ -1436,14 +1522,14 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 count = (scsicmd->cmnd[10] << 24) | (scsicmd->cmnd[11] << 16) |
                         (scsicmd->cmnd[12] << 8) | scsicmd->cmnd[13];
         } else if (scsicmd->cmnd[0] == WRITE_12) { /* 12 byte command */
-                dprintk((KERN_DEBUG "aachba: received a write(12) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a write(12) command on id %d.\n", scmd_id(scsicmd)));
 
                 lba = ((u64)scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16)
                     | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                 count = (scsicmd->cmnd[6] << 24) | (scsicmd->cmnd[7] << 16)
                       | (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
         } else {
-                dprintk((KERN_DEBUG "aachba: received a write(10) command on id %d.\n", cid));
+                dprintk((KERN_DEBUG "aachba: received a write(10) command on id %d.\n", scmd_id(scsicmd)));
                 lba = ((u64)scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                 count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
         }
@@ -1488,7 +1574,9 @@ static void synchronize_callback(void *context, struct fib *fibptr)
         struct scsi_cmnd *cmd;
 
         cmd = context;
-        cmd->SCp.phase = AAC_OWNER_MIDLEVEL;
+
+        if (!aac_valid_context(cmd, fibptr))
+                return;
 
         dprintk((KERN_DEBUG "synchronize_callback[cpu %d]: t = %ld.\n", 
                                 smp_processor_id(), jiffies));
@@ -1523,7 +1611,7 @@ static void synchronize_callback(void *context, struct fib *fibptr)
         cmd->scsi_done(cmd);
 }
 
-static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
+static int aac_synchronize(struct scsi_cmnd *scsicmd)
 {
         int status;
         struct fib *cmd_fibcontext;
@@ -1568,7 +1656,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
         synchronizecmd = fib_data(cmd_fibcontext);
         synchronizecmd->command = cpu_to_le32(VM_ContainerConfig);
         synchronizecmd->type = cpu_to_le32(CT_FLUSH_CACHE);
-        synchronizecmd->cid = cpu_to_le32(cid);
+        synchronizecmd->cid = cpu_to_le32(scmd_id(scsicmd));
         synchronizecmd->count = 
              cpu_to_le32(sizeof(((struct aac_synchronize_reply *)NULL)->data));
 
@@ -1646,29 +1734,12 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 case TEST_UNIT_READY:
                                         if (dev->in_reset)
                                                 return -1;
-                                        spin_unlock_irq(host->host_lock);
-                                        aac_probe_container(dev, cid);
-                                        if ((fsa_dev_ptr[cid].valid & 1) == 0)
-                                                fsa_dev_ptr[cid].valid = 0;
-                                        spin_lock_irq(host->host_lock);
-                                        if (fsa_dev_ptr[cid].valid == 0) {
-                                                scsicmd->result = DID_NO_CONNECT << 16;
-                                                scsicmd->scsi_done(scsicmd);
-                                                return 0;
-                                        }
+                                        return _aac_probe_container(scsicmd,
+                                                        aac_probe_container_callback2);
                                 default:
                                         break;
                                 }
                         }
-                        /*
-                         *      If the target container still doesn't exist, 
-                         *      return failure
-                         */
-                        if (fsa_dev_ptr[cid].valid == 0) {
-                                scsicmd->result = DID_BAD_TARGET << 16;
-                                scsicmd->scsi_done(scsicmd);
-                                return 0;
-                        }
                 } else {  /* check for physical non-dasd devices */
                         if ((dev->nondasd_support == 1) || expose_physicals) {
                                 if (dev->in_reset)
@@ -1733,7 +1804,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 setinqstr(dev, (void *) (inq_data.inqd_vid), fsa_dev_ptr[cid].type);
                 inq_data.inqd_pdt = INQD_PDT_DA;        /* Direct/random access device */
                 aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
-                return aac_get_container_name(scsicmd, cid);
+                return aac_get_container_name(scsicmd);
         }
         case SERVICE_ACTION_IN:
                 if (!(dev->raw_io_interface) ||
@@ -1899,7 +1970,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 min(sizeof(fsa_dev_ptr[cid].devname),
                                 sizeof(scsicmd->request->rq_disk->disk_name) + 1));
 
-                        return aac_read(scsicmd, cid);
+                        return aac_read(scsicmd);
 
                 case WRITE_6:
                 case WRITE_10:
@@ -1907,11 +1978,11 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 case WRITE_16:
                         if (dev->in_reset)
                                 return -1;
-                        return aac_write(scsicmd, cid);
+                        return aac_write(scsicmd);
 
                 case SYNCHRONIZE_CACHE:
                         /* Issue FIB to tell Firmware to flush it's cache */
-                        return aac_synchronize(scsicmd, cid);
+                        return aac_synchronize(scsicmd);
                         
                 default:
                         /*
@@ -2058,7 +2129,10 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
         struct scsi_cmnd *scsicmd;
 
         scsicmd = (struct scsi_cmnd *) context;
-        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
+
+        if (!aac_valid_context(scsicmd, fibptr))
+                return;
+
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
         BUG_ON(fibptr == NULL);
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 39ecd0d22eb0..45ca3e801619 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,8 +12,8 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 2423
-# define AAC_DRIVER_BRANCH "-mh3"
+# define AAC_DRIVER_BUILD 2437
+# define AAC_DRIVER_BRANCH "-mh4"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
 
@@ -48,49 +48,13 @@ struct diskparm
 
 
 /*
- *      DON'T CHANGE THE ORDER, this is set by the firmware
+ *      Firmware constants
  */
  
 #define         CT_NONE                 0
-#define         CT_VOLUME               1
-#define         CT_MIRROR               2
-#define         CT_STRIPE               3
-#define         CT_RAID5                4
-#define         CT_SSRW                 5
-#define         CT_SSRO                 6
-#define         CT_MORPH                7
-#define         CT_PASSTHRU             8
-#define         CT_RAID4                9
-#define         CT_RAID10               10      /* stripe of mirror */
-#define         CT_RAID00               11      /* stripe of stripe */
-#define         CT_VOLUME_OF_MIRRORS    12      /* volume of mirror */
-#define         CT_PSEUDO_RAID          13      /* really raid4 */
-#define         CT_LAST_VOLUME_TYPE     14
 #define         CT_OK                   218
-
-/*
- *      Types of objects addressable in some fashion by the client.
- *      This is a superset of those objects handled just by the filesystem
- *      and includes "raw" objects that an administrator would use to
- *      configure containers and filesystems.
- */
-
-#define         FT_REG          1       /* regular file */
-#define         FT_DIR          2       /* directory */
-#define         FT_BLK          3       /* "block" device - reserved */
-#define         FT_CHR          4       /* "character special" device - reserved */
-#define         FT_LNK          5       /* symbolic link */
-#define         FT_SOCK         6       /* socket */
-#define         FT_FIFO         7       /* fifo */
 #define         FT_FILESYS      8       /* ADAPTEC's "FSA"(tm) filesystem */
 #define         FT_DRIVE        9       /* physical disk - addressable in scsi by bus/id/lun */
-#define         FT_SLICE        10      /* virtual disk - raw volume - slice */
-#define         FT_PARTITION    11      /* FSA partition - carved out of a slice - building block for containers */
-#define         FT_VOLUME       12      /* Container - Volume Set */
-#define         FT_STRIPE       13      /* Container - Stripe Set */
-#define         FT_MIRROR       14      /* Container - Mirror Set */
-#define         FT_RAID5        15      /* Container - Raid 5 Set */
-#define         FT_DATABASE     16      /* Storage object with "foreign" content manager */
 
 /*
  *      Host side memory scatter gather list
@@ -497,6 +461,7 @@ struct adapter_ops
         void (*adapter_enable_int)(struct aac_dev *dev);
         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);
+        int  (*adapter_restart)(struct aac_dev *dev, int bled);
         /* Transport operations */
         int  (*adapter_ioremap)(struct aac_dev * dev, u32 size);
         irqreturn_t (*adapter_intr)(int irq, void *dev_id);
@@ -833,7 +798,7 @@ struct fib {
          */
         struct list_head        fiblink;
         void                    *data;
-        struct hw_fib           *hw_fib;                /* Actual shared object */
+        struct hw_fib           *hw_fib_va;             /* Actual shared object */
         dma_addr_t              hw_fib_pa;              /* physical address of hw_fib*/
 };
 
@@ -878,10 +843,25 @@ struct aac_supplement_adapter_info
         __le32  Version;
         __le32  FeatureBits;
         u8      SlotNumber;
-        u8      ReservedPad0[0];
+        u8      ReservedPad0[3];
         u8      BuildDate[12];
         __le32  CurrentNumberPorts;
-        __le32  ReservedGrowth[24];
+        struct {
+                u8      AssemblyPn[8];
+                u8      FruPn[8];
+                u8      BatteryFruPn[8];
+                u8      EcVersionString[8];
+                u8      Tsid[12];
+        }       VpdInfo;
+        __le32  FlashFirmwareRevision;
+        __le32  FlashFirmwareBuild;
+        __le32  RaidTypeMorphOptions;
+        __le32  FlashFirmwareBootRevision;
+        __le32  FlashFirmwareBootBuild;
+        u8      MfgPcbaSerialNo[12];
+        u8      MfgWWNName[8];
+        __le32  MoreFeatureBits;
+        __le32  ReservedGrowth[1];
 };
 #define AAC_FEATURE_FALCON      0x00000010
 #define AAC_SIS_VERSION_V3      3
@@ -970,7 +950,6 @@ struct aac_dev
         struct fib              *fibs;
 
         struct fib              *free_fib;
-        struct fib              *timeout_fib;
         spinlock_t              fib_lock;
         
         struct aac_queue_block *queues;
@@ -1060,6 +1039,9 @@ struct aac_dev
 #define aac_adapter_check_health(dev) \
         (dev)->a_ops.adapter_check_health(dev)
 
+#define aac_adapter_restart(dev,bled) \
+        (dev)->a_ops.adapter_restart(dev,bled)
+
 #define aac_adapter_ioremap(dev, size) \
         (dev)->a_ops.adapter_ioremap(dev, size)
 
@@ -1516,8 +1498,7 @@ struct aac_mntent {
         struct creation_info    create_info;    /* if applicable */
         __le32                  capacity;
         __le32                  vol;            /* substrate structure */
-        __le32                  obj;            /* FT_FILESYS, 
-                                                   FT_DATABASE, etc. */
+        __le32                  obj;            /* FT_FILESYS, etc. */
         __le32                  state;          /* unready for mounting, 
                                                    readonly, etc. */
         union aac_contentinfo   fileinfo;       /* Info specific to content 
@@ -1817,7 +1798,7 @@ int aac_fib_send(u16 command, struct fib * context, unsigned long size, int prio
 int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry);
 void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum);
 int aac_fib_complete(struct fib * context);
-#define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data)
+#define fib_data(fibctx) ((void *)(fibctx)->hw_fib_va->data)
 struct aac_dev *aac_init_adapter(struct aac_dev *dev);
 int aac_get_config_status(struct aac_dev *dev, int commit_flag);
 int aac_get_containers(struct aac_dev *dev);
@@ -1840,8 +1821,11 @@ 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);
 int aac_probe_container(struct aac_dev *dev, int cid);
+int _aac_rx_init(struct aac_dev *dev);
+int aac_rx_select_comm(struct aac_dev *dev, int comm);
 extern int numacb;
 extern int acbsize;
 extern char aac_driver_version[];
 extern int startup_timeout;
 extern int aif_timeout;
+extern int expose_physicals;
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index e21070f4eac1..72b0393b4596 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -64,12 +64,15 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
         unsigned size;
         int retval;
 
+        if (dev->in_reset) {
+                return -EBUSY;
+        }
         fibptr = aac_fib_alloc(dev);
         if(fibptr == NULL) {
                 return -ENOMEM;
         }
                 
-        kfib = fibptr->hw_fib;
+        kfib = fibptr->hw_fib_va;
         /*
          *      First copy in the header so that we can check the size field.
          */
@@ -91,9 +94,9 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
                         goto cleanup;
                 }
                 /* Highjack the hw_fib */
-                hw_fib = fibptr->hw_fib;
+                hw_fib = fibptr->hw_fib_va;
                 hw_fib_pa = fibptr->hw_fib_pa;
-                fibptr->hw_fib = kfib = pci_alloc_consistent(dev->pdev, size, &fibptr->hw_fib_pa);
+                fibptr->hw_fib_va = 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);
         }
@@ -137,7 +140,7 @@ 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;
+                fibptr->hw_fib_va = hw_fib;
         }
         if (retval != -EINTR)
                 aac_fib_free(fibptr);
@@ -282,15 +285,15 @@ return_fib:
                 fib = list_entry(entry, struct fib, fiblink);
                 fibctx->count--;
                 spin_unlock_irqrestore(&dev->fib_lock, flags);
-                if (copy_to_user(f.fib, fib->hw_fib, sizeof(struct hw_fib))) {
-                        kfree(fib->hw_fib);
+                if (copy_to_user(f.fib, fib->hw_fib_va, sizeof(struct hw_fib))) {
+                        kfree(fib->hw_fib_va);
                         kfree(fib);
                         return -EFAULT;
                 }       
                 /*
                  *      Free the space occupied by this copy of the fib.
                  */
-                kfree(fib->hw_fib);
+                kfree(fib->hw_fib_va);
                 kfree(fib);
                 status = 0;
         } else {
@@ -340,7 +343,7 @@ int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context * fibctx)
                 /*
                  *      Free the space occupied by this copy of the fib.
                  */
-                kfree(fib->hw_fib);
+                kfree(fib->hw_fib_va);
                 kfree(fib);
         }
         /*
@@ -388,10 +391,8 @@ static int close_getadapter_fib(struct aac_dev * dev, void __user *arg)
                 /*
                  *      Extract the fibctx from the input parameters
                  */
-                if (fibctx->unique == (u32)(unsigned long)arg) {   
-                        /* We found a winner */
+                if (fibctx->unique == (u32)(ptrdiff_t)arg) /* We found a winner */
                         break;
-                }
                 entry = entry->next;
                 fibctx = NULL;
         }
@@ -465,16 +466,20 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         void *sg_list[32];
         u32   sg_indx = 0;
         u32 byte_count = 0;
-        u32 actual_fibsize = 0;
+        u32 actual_fibsize64, actual_fibsize = 0;
         int i;
 
 
+        if (dev->in_reset) {
+                dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
+                return -EBUSY;
+        }
         if (!capable(CAP_SYS_ADMIN)){
                 dprintk((KERN_DEBUG"aacraid: No permission to send raw srb\n")); 
                 return -EPERM;
         }
         /*
-         *      Allocate and initialize a Fib then setup a BlockWrite command
+         *      Allocate and initialize a Fib then setup a SRB command
          */
         if (!(srbfib = aac_fib_alloc(dev))) {
                 return -ENOMEM;
@@ -541,129 +546,183 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                 rcode = -EINVAL;
                 goto cleanup;
         }
-        if (dev->dac_support == 1) {
+        actual_fibsize = sizeof(struct aac_srb) - sizeof(struct sgentry) +
+                ((user_srbcmd->sg.count & 0xff) * sizeof(struct sgentry));
+        actual_fibsize64 = actual_fibsize + (user_srbcmd->sg.count & 0xff) *
+          (sizeof(struct sgentry64) - sizeof(struct sgentry));
+        /* User made a mistake - should not continue */
+        if ((actual_fibsize != fibsize) && (actual_fibsize64 != fibsize)) {
+                dprintk((KERN_DEBUG"aacraid: Bad Size specified in "
+                  "Raw SRB command calculated fibsize=%lu;%lu "
+                  "user_srbcmd->sg.count=%d aac_srb=%lu sgentry=%lu;%lu "
+                  "issued fibsize=%d\n",
+                  actual_fibsize, actual_fibsize64, user_srbcmd->sg.count,
+                  sizeof(struct aac_srb), sizeof(struct sgentry),
+                  sizeof(struct sgentry64), fibsize));
+                rcode = -EINVAL;
+                goto cleanup;
+        }
+        if ((data_dir == DMA_NONE) && user_srbcmd->sg.count) {
+                dprintk((KERN_DEBUG"aacraid: SG with no direction specified in Raw SRB command\n"));
+                rcode = -EINVAL;
+                goto cleanup;
+        }
+        byte_count = 0;
+        if (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64) {
                 struct user_sgmap64* upsg = (struct user_sgmap64*)&user_srbcmd->sg;
                 struct sgmap64* psg = (struct sgmap64*)&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) +
-                        ((upsg->count & 0xff) * 
-                        sizeof(struct sgentry));
-                if(actual_fibsize != fibsize){ // User made a mistake - should not continue
-                        dprintk((KERN_DEBUG"aacraid: Bad Size specified in Raw SRB command\n"));
-                        rcode = -EINVAL;
-                        goto cleanup;
-                }
-                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;
-                }
+                if (actual_fibsize64 == fibsize) {
+                        actual_fibsize = actual_fibsize64;
+                        for (i = 0; i < upsg->count; i++) {
+                                u64 addr;
+                                void* p;
+                                /* Does this really need to be GFP_DMA? */
+                                p = kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA);
+                                if(p == 0) {
+                                        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;
+                                }
+                                addr = (u64)upsg->sg[i].addr[0];
+                                addr += ((u64)upsg->sg[i].addr[1]) << 32;
+                                sg_user[i] = (void __user *)(ptrdiff_t)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],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, upsg->sg[i].count, data_dir);
 
-                for (i = 0; i < usg->count; i++) {
-                        u64 addr;
-                        void* p;
-                        /* Does this really need to be GFP_DMA? */
-                        p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
-                        if(p == 0) {
-                                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));
+                                psg->sg[i].addr[0] = cpu_to_le32(addr & 0xffffffff);
+                                psg->sg[i].addr[1] = cpu_to_le32(addr>>32);
+                                byte_count += upsg->sg[i].count;
+                                psg->sg[i].count = cpu_to_le32(upsg->sg[i].count);
+                        }
+                } else {
+                        struct user_sgmap* usg;
+                        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;
                         }
-                        sg_user[i] = (void __user *)(long)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],upsg->sg[i].count)){
+                        memcpy (usg, upsg, actual_fibsize - sizeof(struct aac_srb)
+                          + sizeof(struct sgmap));
+                        actual_fibsize = actual_fibsize64;
+
+                        for (i = 0; i < usg->count; i++) {
+                                u64 addr;
+                                void* p;
+                                /* Does this really need to be GFP_DMA? */
+                                p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
+                                if(p == 0) {
                                         kfree (usg);
-                                        dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); 
-                                        rcode = -EFAULT;
+                                        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;
                                 }
-                        }
-                        addr = pci_map_single(dev->pdev, p, usg->sg[i].count, data_dir);
+                                sg_user[i] = (void __user *)(ptrdiff_t)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],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, usg->sg[i].count, data_dir);
 
-                        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;
+                                psg->sg[i].addr[0] = cpu_to_le32(addr & 0xffffffff);
+                                psg->sg[i].addr[1] = cpu_to_le32(addr>>32);
+                                byte_count += usg->sg[i].count;
+                                psg->sg[i].count = cpu_to_le32(usg->sg[i].count);
+                        }
+                        kfree (usg);
                 }
-                kfree (usg);
-
                 srbcmd->count = cpu_to_le32(byte_count);
                 psg->count = cpu_to_le32(sg_indx+1);
                 status = aac_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) + (((user_srbcmd->sg.count & 0xff) - 1) * sizeof (struct sgentry));
-                if(actual_fibsize != fibsize){ // User made a mistake - should not continue
-                        dprintk((KERN_DEBUG"aacraid: Bad Size specified in "
-                          "Raw SRB command calculated fibsize=%d "
-                          "user_srbcmd->sg.count=%d aac_srb=%d sgentry=%d "
-                          "issued fibsize=%d\n",
-                          actual_fibsize, user_srbcmd->sg.count,
-                          sizeof(struct aac_srb), sizeof(struct sgentry),
-                          fibsize));
-                        rcode = -EINVAL;
-                        goto cleanup;
-                }
-                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 < upsg->count; i++) {
-                        dma_addr_t addr; 
-                        void* p;
-                        p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
-                        if(p == 0) {
-                                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 *)(long)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],
-                                                upsg->sg[i].count)) {
-                                        dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); 
-                                        rcode = -EFAULT;
+
+                if (actual_fibsize64 == fibsize) {
+                        struct user_sgmap64* usg = (struct user_sgmap64 *)upsg;
+                        for (i = 0; i < upsg->count; i++) {
+                                u64 addr;
+                                void* p;
+                                /* Does this really need to be GFP_DMA? */
+                                p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
+                                if(p == 0) {
+                                        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;
                                 }
+                                addr = (u64)usg->sg[i].addr[0];
+                                addr += ((u64)usg->sg[i].addr[1]) << 32;
+                                sg_user[i] = (void __user *)(ptrdiff_t)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],usg->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, usg->sg[i].count, data_dir);
+
+                                psg->sg[i].addr = cpu_to_le32(addr & 0xffffffff);
+                                byte_count += usg->sg[i].count;
+                                psg->sg[i].count = cpu_to_le32(usg->sg[i].count);
                         }
-                        addr = pci_map_single(dev->pdev, p,
-                                upsg->sg[i].count, data_dir);
+                } else {
+                        for (i = 0; i < upsg->count; i++) {
+                                dma_addr_t addr;
+                                void* p;
+                                p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
+                                if(p == 0) {
+                                        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 *)(ptrdiff_t)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],
+                                                        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,
+                                        upsg->sg[i].count, data_dir);
 
-                        psg->sg[i].addr = cpu_to_le32(addr);
-                        psg->sg[i].count = cpu_to_le32(upsg->sg[i].count);  
-                        byte_count += upsg->sg[i].count;
+                                psg->sg[i].addr = cpu_to_le32(addr);
+                                byte_count += upsg->sg[i].count;
+                                psg->sg[i].count = cpu_to_le32(upsg->sg[i].count);
+                        }
                 }
                 srbcmd->count = cpu_to_le32(byte_count);
                 psg->count = cpu_to_le32(sg_indx+1);
@@ -682,7 +741,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
 
         if( flags & SRB_DataIn ) {
                 for(i = 0 ; i <= sg_indx; i++){
-                        byte_count = le32_to_cpu((dev->dac_support == 1)
+                        byte_count = le32_to_cpu(
+                          (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64)
                               ? ((struct sgmap64*)&srbcmd->sg)->sg[i].count
                               : srbcmd->sg.sg[i].count);
                         if(copy_to_user(sg_user[i], sg_list[i], byte_count)){
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index ae34768987a4..33682ce96a5d 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -110,7 +110,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         /*
          *      Align the beginning of Headers to commalign
          */
-        align = (commalign - ((unsigned long)(base) & (commalign - 1)));
+        align = (commalign - ((ptrdiff_t)(base) & (commalign - 1)));
         base = base + align;
         phys = phys + align;
         /*
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1b97f60652ba..5824a757a753 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -94,7 +94,7 @@ void aac_fib_map_free(struct aac_dev *dev)
 int aac_fib_setup(struct aac_dev * dev)
 {
         struct fib *fibptr;
-        struct hw_fib *hw_fib_va;
+        struct hw_fib *hw_fib;
         dma_addr_t hw_fib_pa;
         int i;
 
@@ -106,24 +106,24 @@ int aac_fib_setup(struct aac_dev * dev)
         if (i<0)
                 return -ENOMEM;
                 
-        hw_fib_va = dev->hw_fib_va;
+        hw_fib = dev->hw_fib_va;
         hw_fib_pa = dev->hw_fib_pa;
-        memset(hw_fib_va, 0, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB));
+        memset(hw_fib, 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 < (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); i++, fibptr++) 
         {
                 fibptr->dev = dev;
-                fibptr->hw_fib = hw_fib_va;
-                fibptr->data = (void *) fibptr->hw_fib->data;
+                fibptr->hw_fib_va = hw_fib;
+                fibptr->data = (void *) fibptr->hw_fib_va->data;
                 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 = cpu_to_le32(0xffffffff);
-                hw_fib_va->header.SenderSize = cpu_to_le16(dev->max_fib_size);
+                hw_fib->header.XferState = cpu_to_le32(0xffffffff);
+                hw_fib->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 + dev->max_fib_size);
+                hw_fib = (struct hw_fib *)((unsigned char *)hw_fib + dev->max_fib_size);
                 hw_fib_pa = hw_fib_pa + dev->max_fib_size;
         }
         /*
@@ -166,7 +166,7 @@ struct fib *aac_fib_alloc(struct aac_dev *dev)
          *      Null out fields that depend on being zero at the start of
          *      each I/O
          */
-        fibptr->hw_fib->header.XferState = 0;
+        fibptr->hw_fib_va->header.XferState = 0;
         fibptr->callback = NULL;
         fibptr->callback_data = NULL;
 
@@ -178,7 +178,6 @@ struct fib *aac_fib_alloc(struct aac_dev *dev)
  *      @fibptr: fib to free up
  *
  *      Frees up a fib and places it on the appropriate queue
- *      (either free or timed out)
  */
  
 void aac_fib_free(struct fib *fibptr)
@@ -186,19 +185,15 @@ void aac_fib_free(struct fib *fibptr)
         unsigned long flags;
 
         spin_lock_irqsave(&fibptr->dev->fib_lock, flags);
-        if (fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT) {
+        if (unlikely(fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
                 aac_config.fib_timeouts++;
-                fibptr->next = fibptr->dev->timeout_fib;
-                fibptr->dev->timeout_fib = fibptr;
-        } else {
-                if (fibptr->hw_fib->header.XferState != 0) {
-                        printk(KERN_WARNING "aac_fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n",
-                                 (void*)fibptr, 
-                                 le32_to_cpu(fibptr->hw_fib->header.XferState));
-                }
-                fibptr->next = fibptr->dev->free_fib;
-                fibptr->dev->free_fib = fibptr;
-        }       
+        if (fibptr->hw_fib_va->header.XferState != 0) {
+                printk(KERN_WARNING "aac_fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n",
+                         (void*)fibptr,
+                         le32_to_cpu(fibptr->hw_fib_va->header.XferState));
+        }
+        fibptr->next = fibptr->dev->free_fib;
+        fibptr->dev->free_fib = fibptr;
         spin_unlock_irqrestore(&fibptr->dev->fib_lock, flags);
 }
 
@@ -211,7 +206,7 @@ void aac_fib_free(struct fib *fibptr)
  
 void aac_fib_init(struct fib *fibptr)
 {
-        struct hw_fib *hw_fib = fibptr->hw_fib;
+        struct hw_fib *hw_fib = fibptr->hw_fib_va;
 
         hw_fib->header.StructType = FIB_MAGIC;
         hw_fib->header.Size = cpu_to_le16(fibptr->dev->max_fib_size);
@@ -231,7 +226,7 @@ void aac_fib_init(struct fib *fibptr)
  
 static void fib_dealloc(struct fib * fibptr)
 {
-        struct hw_fib *hw_fib = fibptr->hw_fib;
+        struct hw_fib *hw_fib = fibptr->hw_fib_va;
         BUG_ON(hw_fib->header.StructType != FIB_MAGIC);
         hw_fib->header.XferState = 0;        
 }
@@ -386,7 +381,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                 void *callback_data)
 {
         struct aac_dev * dev = fibptr->dev;
-        struct hw_fib * hw_fib = fibptr->hw_fib;
+        struct hw_fib * hw_fib = fibptr->hw_fib_va;
         unsigned long flags = 0;
         unsigned long qflags;
 
@@ -430,7 +425,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
          */
         hw_fib->header.Command = cpu_to_le16(command);
         hw_fib->header.XferState |= cpu_to_le32(SentFromHost);
-        fibptr->hw_fib->header.Flags = 0;       /* 0 the flags field - internal only*/
+        fibptr->hw_fib_va->header.Flags = 0;    /* 0 the flags field - internal only*/
         /*
          *      Set the size of the Fib we want to send to the adapter
          */
@@ -462,7 +457,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         dprintk((KERN_DEBUG "  Command =               %d.\n", le32_to_cpu(hw_fib->header.Command)));
         dprintk((KERN_DEBUG "  SubCommand =            %d.\n", le32_to_cpu(((struct aac_query_mount *)fib_data(fibptr))->command)));
         dprintk((KERN_DEBUG "  XferState  =            %x.\n", le32_to_cpu(hw_fib->header.XferState)));
-        dprintk((KERN_DEBUG "  hw_fib va being sent=%p\n",fibptr->hw_fib));
+        dprintk((KERN_DEBUG "  hw_fib va being sent=%p\n",fibptr->hw_fib_va));
         dprintk((KERN_DEBUG "  hw_fib pa being sent=%lx\n",(ulong)fibptr->hw_fib_pa));
         dprintk((KERN_DEBUG "  fib being sent=%p\n",fibptr));
 
@@ -513,22 +508,20 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                                 }
                                 udelay(5);
                         }
-                } else if (down_interruptible(&fibptr->event_wait)) {
-                        spin_lock_irqsave(&fibptr->event_lock, flags);
-                        if (fibptr->done == 0) {
-                                fibptr->done = 2; /* Tell interrupt we aborted */
-                                spin_unlock_irqrestore(&fibptr->event_lock, flags);
-                                return -EINTR;
-                        }
+                } else
+                        (void)down_interruptible(&fibptr->event_wait);
+                spin_lock_irqsave(&fibptr->event_lock, flags);
+                if (fibptr->done == 0) {
+                        fibptr->done = 2; /* Tell interrupt we aborted */
                         spin_unlock_irqrestore(&fibptr->event_lock, flags);
+                        return -EINTR;
                 }
+                spin_unlock_irqrestore(&fibptr->event_lock, flags);
                 BUG_ON(fibptr->done == 0);
                         
-                if((fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT)){
+                if(unlikely(fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
                         return -ETIMEDOUT;
-                } else {
-                        return 0;
-                }
+                return 0;
         }
         /*
          *      If the user does not want a response than return success otherwise
@@ -624,7 +617,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid)
 
 int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
 {
-        struct hw_fib * hw_fib = fibptr->hw_fib;
+        struct hw_fib * hw_fib = fibptr->hw_fib_va;
         struct aac_dev * dev = fibptr->dev;
         struct aac_queue * q;
         unsigned long nointr = 0;
@@ -688,7 +681,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
  
 int aac_fib_complete(struct fib *fibptr)
 {
-        struct hw_fib * hw_fib = fibptr->hw_fib;
+        struct hw_fib * hw_fib = fibptr->hw_fib_va;
 
         /*
          *      Check for a fib which has already been completed
@@ -774,9 +767,8 @@ void aac_printf(struct aac_dev *dev, u32 val)
 #define AIF_SNIFF_TIMEOUT       (30*HZ)
 static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 {
-        struct hw_fib * hw_fib = fibptr->hw_fib;
+        struct hw_fib * hw_fib = fibptr->hw_fib_va;
         struct aac_aifcmd * aifcmd = (struct aac_aifcmd *)hw_fib->data;
-        int busy;
         u32 container;
         struct scsi_device *device;
         enum {
@@ -988,9 +980,6 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
          * behind you.
          */
 
-        busy = 0;
-
-
         /*
          *      Find the scsi_device associated with the SCSI address,
          * and mark it as changed, invalidating the cache. This deals
@@ -1035,7 +1024,6 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 static int _aac_reset_adapter(struct aac_dev *aac)
 {
         int index, quirks;
-        u32 ret;
         int retval;
         struct Scsi_Host *host;
         struct scsi_device *dev;
@@ -1059,35 +1047,29 @@ static int _aac_reset_adapter(struct aac_dev *aac)
          *      If a positive health, means in a known DEAD PANIC
          * state and the adapter could be reset to `try again'.
          */
-        retval = aac_adapter_check_health(aac);
-        if (retval == 0)
-                retval = aac_adapter_sync_cmd(aac, IOP_RESET_ALWAYS,
-                  0, 0, 0, 0, 0, 0, &ret, NULL, NULL, NULL, NULL);
-        if (retval)
-                retval = aac_adapter_sync_cmd(aac, IOP_RESET,
-                  0, 0, 0, 0, 0, 0, &ret, NULL, NULL, NULL, NULL);
+        retval = aac_adapter_restart(aac, aac_adapter_check_health(aac));
 
         if (retval)
                 goto out;
-        if (ret != 0x00000001) {
-                retval = -ENODEV;
-                goto out;
-        }
 
         /*
          *      Loop through the fibs, close the synchronous FIBS
          */
-        for (index = 0; index < (aac->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); index++) {
+        for (retval = 1, index = 0; index < (aac->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); index++) {
                 struct fib *fib = &aac->fibs[index];
-                if (!(fib->hw_fib->header.XferState & cpu_to_le32(NoResponseExpected | Async)) &&
-                  (fib->hw_fib->header.XferState & cpu_to_le32(ResponseExpected))) {
+                if (!(fib->hw_fib_va->header.XferState & cpu_to_le32(NoResponseExpected | Async)) &&
+                  (fib->hw_fib_va->header.XferState & cpu_to_le32(ResponseExpected))) {
                         unsigned long flagv;
                         spin_lock_irqsave(&fib->event_lock, flagv);
                         up(&fib->event_wait);
                         spin_unlock_irqrestore(&fib->event_lock, flagv);
                         schedule();
+                        retval = 0;
                 }
         }
+        /* Give some extra time for ioctls to complete. */
+        if (retval == 0)
+                ssleep(2);
         index = aac->cardtype;
 
         /*
@@ -1248,7 +1230,7 @@ int aac_check_health(struct aac_dev * aac)
 
                         memset(hw_fib, 0, sizeof(struct hw_fib));
                         memset(fib, 0, sizeof(struct fib));
-                        fib->hw_fib = hw_fib;
+                        fib->hw_fib_va = hw_fib;
                         fib->dev = aac;
                         aac_fib_init(fib);
                         fib->type = FSAFS_NTC_FIB_CONTEXT;
@@ -1354,11 +1336,11 @@ int aac_command_thread(void *data)
                          *      do anything at this point since we don't have
                          *      anything defined for this thread to do.
                          */
-                        hw_fib = fib->hw_fib;
+                        hw_fib = fib->hw_fib_va;
                         memset(fib, 0, sizeof(struct fib));
                         fib->type = FSAFS_NTC_FIB_CONTEXT;
                         fib->size = sizeof( struct fib );
-                        fib->hw_fib = hw_fib;
+                        fib->hw_fib_va = hw_fib;
                         fib->data = hw_fib->data;
                         fib->dev = dev;
                         /*
@@ -1485,7 +1467,7 @@ int aac_command_thread(void *data)
                                                  */
                                                 memcpy(hw_newfib, hw_fib, sizeof(struct hw_fib));
                                                 memcpy(newfib, fib, sizeof(struct fib));
-                                                newfib->hw_fib = hw_newfib;
+                                                newfib->hw_fib_va = hw_newfib;
                                                 /*
                                                  * Put the FIB onto the
                                                  * fibctx's fibs
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index d38b628be1ad..42c7dcda6d9b 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -32,7 +32,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
@@ -73,7 +72,7 @@ unsigned int aac_response_normal(struct aac_queue * q)
                 u32 index = le32_to_cpu(entry->addr);
                 fast = index & 0x01;
                 fib = &dev->fibs[index >> 2];
-                hwfib = fib->hw_fib;
+                hwfib = fib->hw_fib_va;
                 
                 aac_consumer_free(dev, q, HostNormRespQueue);
                 /*
@@ -84,11 +83,13 @@ unsigned int aac_response_normal(struct aac_queue * q)
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
-                        dev->queues->queue[AdapNormCmdQueue].numpending--;
-                else {
-                        printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
-                        printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
+                dev->queues->queue[AdapNormCmdQueue].numpending--;
+
+                if (unlikely(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
+                        spin_unlock_irqrestore(q->lock, flags);
+                        aac_fib_complete(fib);
+                        aac_fib_free(fib);
+                        spin_lock_irqsave(q->lock, flags);
                         continue;
                 }
                 spin_unlock_irqrestore(q->lock, flags);
@@ -193,7 +194,7 @@ unsigned int aac_command_normal(struct aac_queue *q)
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
-                fib->hw_fib = hw_fib;
+                fib->hw_fib_va = hw_fib;
                 fib->data = hw_fib->data;
                 fib->dev = dev;
                 
@@ -254,12 +255,13 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                         return 1;
                 }
                 memset(hw_fib, 0, sizeof(struct hw_fib));
-                memcpy(hw_fib, (struct hw_fib *)(((unsigned long)(dev->regs.sa)) + (index & ~0x00000002L)), sizeof(struct hw_fib));
+                memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) +
+                  (index & ~0x00000002L)), sizeof(struct hw_fib));
                 memset(fib, 0, sizeof(struct fib));
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
-                fib->hw_fib = hw_fib;
+                fib->hw_fib_va = hw_fib;
                 fib->data = hw_fib->data;
                 fib->dev = dev;
         
@@ -271,7 +273,7 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
         } else {
                 int fast = index & 0x01;
                 struct fib * fib = &dev->fibs[index >> 2];
-                struct hw_fib * hwfib = fib->hw_fib;
+                struct hw_fib * hwfib = fib->hw_fib_va;
 
                 /*
                  *      Remove this fib from the Outstanding I/O queue.
@@ -281,14 +283,14 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                if ((fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
-                        printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
-                        printk(KERN_DEBUG"aacraid: hwfib=%p index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
+                dev->queues->queue[AdapNormCmdQueue].numpending--;
+
+                if (unlikely(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
+                        aac_fib_complete(fib);
+                        aac_fib_free(fib);
                         return 0;
                 }
 
-                dev->queues->queue[AdapNormCmdQueue].numpending--;
-
                 if (fast) {
                         /*
                          *      Doctor the fib
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 0f948c2fb609..350ea7feb61d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -82,8 +82,6 @@ static LIST_HEAD(aac_devices);
 static int aac_cfg_major = -1;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
-extern int expose_physicals;
-
 /*
  * Because of the way Linux names scsi devices, the order in this table has
  * become important.  Check for on-board Raid first, add-in cards second.
@@ -247,7 +245,19 @@ static struct aac_driver_ident aac_drivers[] = {
 
 static int aac_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 {
+        struct Scsi_Host *host = cmd->device->host;
+        struct aac_dev *dev = (struct aac_dev *)host->hostdata;
+        u32 count = 0;
         cmd->scsi_done = done;
+        for (; count < (host->can_queue + AAC_NUM_MGT_FIB); ++count) {
+                struct fib * fib = &dev->fibs[count];
+                struct scsi_cmnd * command;
+                if (fib->hw_fib_va->header.XferState &&
+                    ((command = fib->callback_data)) &&
+                    (command == cmd) &&
+                    (cmd->SCp.phase == AAC_OWNER_FIRMWARE))
+                        return 0; /* Already owned by Adapter */
+        }
         cmd->SCp.phase = AAC_OWNER_LOWLEVEL;
         return (aac_scsi_cmd(cmd) ? FAILED : 0);
 } 
@@ -446,6 +456,40 @@ static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg)
         return aac_do_ioctl(dev, cmd, arg);
 }
 
+static int aac_eh_abort(struct scsi_cmnd* cmd)
+{
+        struct scsi_device * dev = cmd->device;
+        struct Scsi_Host * host = dev->host;
+        struct aac_dev * aac = (struct aac_dev *)host->hostdata;
+        int count;
+        int ret = FAILED;
+
+        printk(KERN_ERR "%s: Host adapter abort request (%d,%d,%d,%d)\n",
+                AAC_DRIVERNAME,
+                host->host_no, sdev_channel(dev), sdev_id(dev), dev->lun);
+        switch (cmd->cmnd[0]) {
+        case SERVICE_ACTION_IN:
+                if (!(aac->raw_io_interface) ||
+                    !(aac->raw_io_64) ||
+                    ((cmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
+                        break;
+        case INQUIRY:
+        case READ_CAPACITY:
+        case TEST_UNIT_READY:
+                /* Mark associated FIB to not complete, eh handler does this */
+                for (count = 0; count < (host->can_queue + AAC_NUM_MGT_FIB); ++count) {
+                        struct fib * fib = &aac->fibs[count];
+                        if (fib->hw_fib_va->header.XferState &&
+                          (fib->callback_data == cmd)) {
+                                fib->flags |= FIB_CONTEXT_FLAG_TIMED_OUT;
+                                cmd->SCp.phase = AAC_OWNER_ERROR_HANDLER;
+                                ret = SUCCESS;
+                        }
+                }
+        }
+        return ret;
+}
+
 /*
  *      aac_eh_reset    - Reset command handling
  *      @scsi_cmd:      SCSI command block causing the reset
@@ -457,12 +501,20 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
         struct Scsi_Host * host = dev->host;
         struct scsi_cmnd * command;
         int count;
-        struct aac_dev * aac;
+        struct aac_dev * aac = (struct aac_dev *)host->hostdata;
         unsigned long flags;
 
+        /* Mark the associated FIB to not complete, eh handler does this */
+        for (count = 0; count < (host->can_queue + AAC_NUM_MGT_FIB); ++count) {
+                struct fib * fib = &aac->fibs[count];
+                if (fib->hw_fib_va->header.XferState &&
+                  (fib->callback_data == cmd)) {
+                        fib->flags |= FIB_CONTEXT_FLAG_TIMED_OUT;
+                        cmd->SCp.phase = AAC_OWNER_ERROR_HANDLER;
+                }
+        }
         printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", 
                                         AAC_DRIVERNAME);
-        aac = (struct aac_dev *)host->hostdata;
 
         if ((count = aac_check_health(aac)))
                 return count;
@@ -496,7 +548,7 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 ssleep(1);
         }
         printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);
-        return -ETIMEDOUT;
+        return SUCCESS; /* Cause an immediate retry of the command with a ten second delay after successful tur */
 }
 
 /**
@@ -796,6 +848,7 @@ static struct scsi_host_template aac_driver_template = {
         .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                        = MAXIMUM_NUM_CONTAINERS,
diff --git a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c
index c76b611b6afb..a8ace5677813 100644
--- a/drivers/scsi/aacraid/nark.c
+++ b/drivers/scsi/aacraid/nark.c
@@ -74,9 +74,6 @@ static int aac_nark_ioremap(struct aac_dev * dev, u32 size)
 
 int aac_nark_init(struct aac_dev * dev)
 {
-        extern int _aac_rx_init(struct aac_dev *dev);
-        extern int aac_rx_select_comm(struct aac_dev *dev, int comm);
-
         /*
          *      Fill in the function dispatch table.
          */
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index d953c3fe998a..9c5fcfb398c2 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -45,7 +45,6 @@
 static int aac_rkt_select_comm(struct aac_dev *dev, int comm)
 {
         int retval;
-        extern int aac_rx_select_comm(struct aac_dev *dev, int comm);
         retval = aac_rx_select_comm(dev, comm);
         if (comm == AAC_COMM_MESSAGE) {
                 /*
@@ -97,8 +96,6 @@ static int aac_rkt_ioremap(struct aac_dev * dev, u32 size)
 
 int aac_rkt_init(struct aac_dev *dev)
 {
-        extern int _aac_rx_init(struct aac_dev *dev);
-
         /*
          *      Fill in the function dispatch table.
          */
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index d242e2611d67..0c71315cbf1a 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.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
@@ -57,25 +57,25 @@ static irqreturn_t aac_rx_intr_producer(int irq, void *dev_id)
          *      been enabled.
          *      Check to see if this is our interrupt.  If it isn't just return
          */
-        if (intstat & ~(dev->OIMR)) {
+        if (likely(intstat & ~(dev->OIMR))) {
                 bellbits = rx_readl(dev, OutboundDoorbellReg);
-                if (bellbits & DoorBellPrintfReady) {
+                if (unlikely(bellbits & DoorBellPrintfReady)) {
                         aac_printf(dev, readl (&dev->IndexRegs->Mailbox[5]));
                         rx_writel(dev, MUnit.ODR,DoorBellPrintfReady);
                         rx_writel(dev, InboundDoorbellReg,DoorBellPrintfDone);
                 }
-                else if (bellbits & DoorBellAdapterNormCmdReady) {
+                else if (unlikely(bellbits & DoorBellAdapterNormCmdReady)) {
                         rx_writel(dev, MUnit.ODR, DoorBellAdapterNormCmdReady);
                         aac_command_normal(&dev->queues->queue[HostNormCmdQueue]);
                 }
-                else if (bellbits & DoorBellAdapterNormRespReady) {
+                else if (likely(bellbits & DoorBellAdapterNormRespReady)) {
                         rx_writel(dev, MUnit.ODR,DoorBellAdapterNormRespReady);
                         aac_response_normal(&dev->queues->queue[HostNormRespQueue]);
                 }
-                else if (bellbits & DoorBellAdapterNormCmdNotFull) {
+                else if (unlikely(bellbits & DoorBellAdapterNormCmdNotFull)) {
                         rx_writel(dev, MUnit.ODR, DoorBellAdapterNormCmdNotFull);
                 }
-                else if (bellbits & DoorBellAdapterNormRespNotFull) {
+                else if (unlikely(bellbits & DoorBellAdapterNormRespNotFull)) {
                         rx_writel(dev, MUnit.ODR, DoorBellAdapterNormCmdNotFull);
                         rx_writel(dev, MUnit.ODR, DoorBellAdapterNormRespNotFull);
                 }
@@ -88,11 +88,11 @@ static irqreturn_t aac_rx_intr_message(int irq, void *dev_id)
 {
         struct aac_dev *dev = dev_id;
         u32 Index = rx_readl(dev, MUnit.OutboundQueue);
-        if (Index == 0xFFFFFFFFL)
+        if (unlikely(Index == 0xFFFFFFFFL))
                 Index = rx_readl(dev, MUnit.OutboundQueue);
-        if (Index != 0xFFFFFFFFL) {
+        if (likely(Index != 0xFFFFFFFFL)) {
                 do {
-                        if (aac_intr_normal(dev, Index)) {
+                        if (unlikely(aac_intr_normal(dev, Index))) {
                                 rx_writel(dev, MUnit.OutboundQueue, Index);
                                 rx_writel(dev, MUnit.ODR, DoorBellAdapterNormRespReady);
                         }
@@ -204,7 +204,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command,
                  */
                 msleep(1);
         }
-        if (ok != 1) {
+        if (unlikely(ok != 1)) {
                 /*
                  *      Restore interrupt mask even though we timed out
                  */
@@ -294,7 +294,7 @@ static void aac_rx_notify_adapter(struct aac_dev *dev, u32 event)
  *      Start up processing on an i960 based AAC adapter
  */
 
-void aac_rx_start_adapter(struct aac_dev *dev)
+static void aac_rx_start_adapter(struct aac_dev *dev)
 {
         struct aac_init *init;
 
@@ -319,12 +319,12 @@ static int aac_rx_check_health(struct aac_dev *dev)
         /*
          *      Check to see if the board failed any self tests.
          */
-        if (status & SELF_TEST_FAILED)
+        if (unlikely(status & SELF_TEST_FAILED))
                 return -1;
         /*
          *      Check to see if the board panic'd.
          */
-        if (status & KERNEL_PANIC) {
+        if (unlikely(status & KERNEL_PANIC)) {
                 char * buffer;
                 struct POSTSTATUS {
                         __le32 Post_Command;
@@ -333,15 +333,15 @@ static int aac_rx_check_health(struct aac_dev *dev)
                 dma_addr_t paddr, baddr;
                 int ret;
 
-                if ((status & 0xFF000000L) == 0xBC000000L)
+                if (likely((status & 0xFF000000L) == 0xBC000000L))
                         return (status >> 16) & 0xFF;
                 buffer = pci_alloc_consistent(dev->pdev, 512, &baddr);
                 ret = -2;
-                if (buffer == NULL)
+                if (unlikely(buffer == NULL))
                         return ret;
                 post = pci_alloc_consistent(dev->pdev,
                   sizeof(struct POSTSTATUS), &paddr);
-                if (post == NULL) {
+                if (unlikely(post == NULL)) {
                         pci_free_consistent(dev->pdev, 512, buffer, baddr);
                         return ret;
                 }
@@ -353,7 +353,7 @@ static int aac_rx_check_health(struct aac_dev *dev)
                   NULL, NULL, NULL, NULL, NULL);
                 pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                   post, paddr);
-                if ((buffer[0] == '0') && ((buffer[1] == 'x') || (buffer[1] == 'X'))) {
+                if (likely((buffer[0] == '0') && ((buffer[1] == 'x') || (buffer[1] == 'X')))) {
                         ret = (buffer[2] <= '9') ? (buffer[2] - '0') : (buffer[2] - 'A' + 10);
                         ret <<= 4;
                         ret += (buffer[3] <= '9') ? (buffer[3] - '0') : (buffer[3] - 'A' + 10);
@@ -364,7 +364,7 @@ static int aac_rx_check_health(struct aac_dev *dev)
         /*
          *      Wait for the adapter to be up and running.
          */
-        if (!(status & KERNEL_UP_AND_RUNNING))
+        if (unlikely(!(status & KERNEL_UP_AND_RUNNING)))
                 return -3;
         /*
          *      Everything is OK
@@ -387,7 +387,7 @@ static int aac_rx_deliver_producer(struct fib * fib)
         unsigned long nointr = 0;
 
         spin_lock_irqsave(q->lock, qflags);
-        aac_queue_get( dev, &Index, AdapNormCmdQueue, fib->hw_fib, 1, fib, &nointr);
+        aac_queue_get( dev, &Index, AdapNormCmdQueue, fib->hw_fib_va, 1, fib, &nointr);
 
         q->numpending++;
         *(q->headers.producer) = cpu_to_le32(Index + 1);
@@ -419,9 +419,9 @@ static int aac_rx_deliver_message(struct fib * fib)
         spin_unlock_irqrestore(q->lock, qflags);
         for(;;) {
                 Index = rx_readl(dev, MUnit.InboundQueue);
-                if (Index == 0xFFFFFFFFL)
+                if (unlikely(Index == 0xFFFFFFFFL))
                         Index = rx_readl(dev, MUnit.InboundQueue);
-                if (Index != 0xFFFFFFFFL)
+                if (likely(Index != 0xFFFFFFFFL))
                         break;
                 if (--count == 0) {
                         spin_lock_irqsave(q->lock, qflags);
@@ -437,7 +437,7 @@ static int aac_rx_deliver_message(struct fib * fib)
         device += sizeof(u32);
         writel((u32)(addr >> 32), device);
         device += sizeof(u32);
-        writel(le16_to_cpu(fib->hw_fib->header.Size), device);
+        writel(le16_to_cpu(fib->hw_fib_va->header.Size), device);
         rx_writel(dev, MUnit.InboundQueue, Index);
         return 0;
 }
@@ -460,22 +460,34 @@ static int aac_rx_ioremap(struct aac_dev * dev, u32 size)
         return 0;
 }
 
-static int aac_rx_restart_adapter(struct aac_dev *dev)
+static int aac_rx_restart_adapter(struct aac_dev *dev, int bled)
 {
         u32 var;
 
-        printk(KERN_ERR "%s%d: adapter kernel panic'd.\n",
-                        dev->name, dev->id);
-
-        if (aac_rx_check_health(dev) <= 0)
-                return 1;
-        if (rx_sync_cmd(dev, IOP_RESET, 0, 0, 0, 0, 0, 0,
-                        &var, NULL, NULL, NULL, NULL))
-                return 1;
+        if (bled)
+                printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",
+                        dev->name, dev->id, bled);
+        else {
+                bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
+                  0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
+                if (!bled && (var != 0x00000001))
+                        bled = -EINVAL;
+        }
+        if (bled && (bled != -ETIMEDOUT))
+                bled = aac_adapter_sync_cmd(dev, IOP_RESET,
+                  0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
+
+        if (bled && (bled != -ETIMEDOUT))
+                return -EINVAL;
+        if (bled || (var == 0x3803000F)) { /* USE_OTHER_METHOD */
+                rx_writel(dev, MUnit.reserved2, 3);
+                msleep(5000); /* Delay 5 seconds */
+                var = 0x00000001;
+        }
         if (var != 0x00000001)
-                 return 1;
+                return -EINVAL;
         if (rx_readl(dev, MUnit.OMRx[0]) & KERNEL_PANIC)
-                return 1;
+                return -ENODEV;
         return 0;
 }
 
@@ -517,24 +529,29 @@ int _aac_rx_init(struct aac_dev *dev)
 {
         unsigned long start;
         unsigned long status;
-        int instance;
-        const char * name;
-
-        instance = dev->id;
-        name     = dev->name;
+        int restart = 0;
+        int instance = dev->id;
+        const char * name = dev->name;
 
         if (aac_adapter_ioremap(dev, dev->base_size)) {
                 printk(KERN_WARNING "%s: unable to map adapter.\n", name);
                 goto error_iounmap;
         }
 
+        /* Failure to reset here is an option ... */
+        dev->OIMR = status = rx_readb (dev, MUnit.OIMR);
+        if ((((status & 0xff) != 0xff) || reset_devices) &&
+          !aac_rx_restart_adapter(dev, 0))
+                ++restart;
         /*
          *      Check to see if the board panic'd while booting.
          */
         status = rx_readl(dev, MUnit.OMRx[0]);
-        if (status & KERNEL_PANIC)
-                if (aac_rx_restart_adapter(dev))
+        if (status & KERNEL_PANIC) {
+                if (aac_rx_restart_adapter(dev, aac_rx_check_health(dev)))
                         goto error_iounmap;
+                ++restart;
+        }
         /*
          *      Check to see if the board failed any self tests.
          */
@@ -556,12 +573,23 @@ int _aac_rx_init(struct aac_dev *dev)
          */
         while (!((status = rx_readl(dev, MUnit.OMRx[0])) & KERNEL_UP_AND_RUNNING))
         {
-                if(time_after(jiffies, start+startup_timeout*HZ))
-                {
+                if ((restart &&
+                  (status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC))) ||
+                  time_after(jiffies, start+HZ*startup_timeout)) {
                         printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", 
                                         dev->name, instance, status);
                         goto error_iounmap;
                 }
+                if (!restart &&
+                  ((status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC)) ||
+                  time_after(jiffies, start + HZ *
+                  ((startup_timeout > 60)
+                    ? (startup_timeout - 60)
+                    : (startup_timeout / 2))))) {
+                        if (likely(!aac_rx_restart_adapter(dev, aac_rx_check_health(dev))))
+                                start = jiffies;
+                        ++restart;
+                }
                 msleep(1);
         }
         /*
@@ -572,6 +600,7 @@ int _aac_rx_init(struct aac_dev *dev)
         dev->a_ops.adapter_notify = aac_rx_notify_adapter;
         dev->a_ops.adapter_sync_cmd = rx_sync_cmd;
         dev->a_ops.adapter_check_health = aac_rx_check_health;
+        dev->a_ops.adapter_restart = aac_rx_restart_adapter;
 
         /*
          *      First clear out all interrupts.  Then enable the one's that we
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 6f1a1780efce..f4b5e9742ab0 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 1d239f6c0103..cbbfbc9f3e0f 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -35,7 +35,6 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/pci.h>
 #include <linux/isapnp.h>
 #include <linux/blkdev.h>
 #include <linux/mca.h>
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 911ea1756e55..5e6620f8dabc 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -57,18 +57,6 @@ config AIC79XX_BUILD_FIRMWARE
         or modify the assembler Makefile or the files it includes if your
         build environment is different than that of the author.
 
-config AIC79XX_ENABLE_RD_STRM
-        bool "Enable Read Streaming for All Targets"
-        depends on SCSI_AIC79XX
-        default n
-        help
-        Read Streaming is a U320 protocol option that should enhance
-        performance.  Early U320 drive firmware actually performs slower
-        with read streaming enabled so it is disabled by default.  Read
-        Streaming can be configured in much the same way as tagged queueing
-        using the "rd_strm" command line option.  See
-        drivers/scsi/aic7xxx/README.aic79xx for details.
-
 config AIC79XX_DEBUG_ENABLE
         bool "Compile in Debugging Code"
         depends on SCSI_AIC79XX
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index cd93f9a8611f..88da670a7915 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -50,16 +50,6 @@ config AIC7XXX_RESET_DELAY_MS
 
         Default: 5000 (5 seconds)
 
-config AIC7XXX_PROBE_EISA_VL
-        bool "Probe for EISA and VL AIC7XXX Adapters"
-        depends on SCSI_AIC7XXX && EISA
-        help
-        Probe for EISA and VLB Aic7xxx controllers.  In many newer systems,
-        the invasive probes necessary to detect these controllers can cause
-        other devices to fail.  For this reason, the non-PCI probe code is
-        disabled by default.  The current value of this option can be "toggled"
-        via the no_probe kernel command line option.
-
 config AIC7XXX_BUILD_FIRMWARE
         bool "Build Adapter Firmware with Kernel Build"
         depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2be03e975d97..6054881f21f1 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -363,6 +363,8 @@ static int ahd_linux_run_command(struct ahd_softc*,
                                  struct scsi_cmnd *);
 static void ahd_linux_setup_tag_info_global(char *p);
 static int  aic79xx_setup(char *c);
+static void ahd_freeze_simq(struct ahd_softc *ahd);
+static void ahd_release_simq(struct ahd_softc *ahd);
 
 static int ahd_linux_unit;
 
@@ -2016,13 +2018,13 @@ ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
         cmd->scsi_done(cmd);
 }
 
-void
+static void
 ahd_freeze_simq(struct ahd_softc *ahd)
 {
         scsi_block_requests(ahd->platform_data->host);
 }
 
-void
+static void
 ahd_release_simq(struct ahd_softc *ahd)
 {
         scsi_unblock_requests(ahd->platform_data->host);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 147c83c456a5..9218f29314fa 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -837,8 +837,6 @@ int	ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg);
 void    ahd_platform_free(struct ahd_softc *ahd);
 void    ahd_platform_init(struct ahd_softc *ahd);
 void    ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb);
-void    ahd_freeze_simq(struct ahd_softc *ahd);
-void    ahd_release_simq(struct ahd_softc *ahd);
 
 static __inline void
 ahd_freeze_scb(struct scb *scb)
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 954c7c24501d..e1bd57b9f23d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -1278,11 +1278,6 @@ typedef enum {
         AHC_QUEUE_TAGGED
 } ahc_queue_alg;
 
-void                    ahc_set_tags(struct ahc_softc *ahc,
-                                     struct scsi_cmnd *cmd,
-                                     struct ahc_devinfo *devinfo,
-                                     ahc_queue_alg alg);
-
 /**************************** Target Mode *************************************/
 #ifdef AHC_TARGET_MODE
 void            ahc_send_lstate_events(struct ahc_softc *,
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 50ef785224de..75733b09f27a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2073,7 +2073,7 @@ ahc_set_width(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 /*
  * Update the current state of tagged queuing for a given target.
  */
-void
+static void
 ahc_set_tags(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
              struct ahc_devinfo *devinfo, ahc_queue_alg alg)
 {
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 8f43ff772f23..db6ab1a3b81e 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <linux/pci.h>
 #include <scsi/scsi_host.h>
 
 #include "aic94xx.h"
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 12497da5529d..03bfed61bffc 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -49,7 +49,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 0f920c84ac0f..eff846ae0aff 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -1,19 +1,19 @@
-/* 
+/*
  * NCR 5380 generic driver routines.  These should make it *trivial*
- *      to implement 5380 SCSI drivers under Linux with a non-trantor
+ *      to implement 5380 SCSI drivers under Linux with a non-trantor
  *      architecture.
  *
  *      Note that these routines also work with NR53c400 family chips.
  *
  * Copyright 1993, Drew Eckhardt
- *      Visionary Computing 
+ *      Visionary Computing
  *      (Unix and Linux consulting and custom programming)
- *      drew@colorado.edu
+ *      drew@colorado.edu
  *      +1 (303) 666-5836
  *
- * DISTRIBUTION RELEASE 6. 
+ * DISTRIBUTION RELEASE 6.
  *
- * For more information, please consult 
+ * For more information, please consult
  *
  * NCR 5380 Family
  * SCSI Protocol Controller
@@ -57,7 +57,7 @@
  * - I've deleted all the stuff for AUTOPROBE_IRQ, REAL_DMA_POLL, PSEUDO_DMA
  *    and USLEEP, because these were messing up readability and will never be
  *    needed for Atari SCSI.
- * 
+ *
  * - I've revised the NCR5380_main() calling scheme (relax the 'main_running'
  *   stuff), and 'main' is executed in a bottom half if awoken by an
  *   interrupt.
@@ -69,21 +69,29 @@
  */
 
 /*
- * Further development / testing that should be done : 
- * 1.  Test linked command handling code after Eric is ready with 
+ * Further development / testing that should be done :
+ * 1.  Test linked command handling code after Eric is ready with
  *     the high level code.
  */
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_transport_spi.h>
 
 #if (NDEBUG & NDEBUG_LISTS)
-#define LIST(x,y) \
-  { printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); \
-    if ((x)==(y)) udelay(5); }
-#define REMOVE(w,x,y,z) \
-  { printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, \
-           (void*)(w), (void*)(x), (void*)(y), (void*)(z)); \
-    if ((x)==(y)) udelay(5); }
+#define LIST(x, y)                                              \
+        do {                                                    \
+                printk("LINE:%d   Adding %p to %p\n",           \
+                       __LINE__, (void*)(x), (void*)(y));       \
+                if ((x) == (y))                                 \
+                        udelay(5);                              \
+        } while (0)
+#define REMOVE(w, x, y, z)                                      \
+        do {                                                    \
+                printk("LINE:%d   Removing: %p->%p  %p->%p \n", \
+                       __LINE__, (void*)(w), (void*)(x),        \
+                       (void*)(y), (void*)(z));                 \
+                if ((x) == (y))                                 \
+                        udelay(5);                              \
+        } while (0)
 #else
 #define LIST(x,y)
 #define REMOVE(w,x,y,z)
@@ -103,62 +111,62 @@
  * more difficult than it has to be.
  *
  * Also, many of the SCSI drivers were written before the command queuing
- * routines were implemented, meaning their implementations of queued 
+ * routines were implemented, meaning their implementations of queued
  * commands were hacked on rather than designed in from the start.
  *
- * When I designed the Linux SCSI drivers I figured that 
+ * When I designed the Linux SCSI drivers I figured that
  * while having two different SCSI boards in a system might be useful
  * for debugging things, two of the same type wouldn't be used.
  * Well, I was wrong and a number of users have mailed me about running
  * multiple high-performance SCSI boards in a server.
  *
- * Finally, when I get questions from users, I have no idea what 
+ * Finally, when I get questions from users, I have no idea what
  * revision of my driver they are running.
  *
  * This driver attempts to address these problems :
- * This is a generic 5380 driver.  To use it on a different platform, 
+ * This is a generic 5380 driver.  To use it on a different platform,
  * one simply writes appropriate system specific macros (ie, data
- * transfer - some PC's will use the I/O bus, 68K's must use 
+ * transfer - some PC's will use the I/O bus, 68K's must use
  * memory mapped) and drops this file in their 'C' wrapper.
  *
- * As far as command queueing, two queues are maintained for 
+ * As far as command queueing, two queues are maintained for
  * each 5380 in the system - commands that haven't been issued yet,
- * and commands that are currently executing.  This means that an 
- * unlimited number of commands may be queued, letting 
- * more commands propagate from the higher driver levels giving higher 
- * throughput.  Note that both I_T_L and I_T_L_Q nexuses are supported, 
- * allowing multiple commands to propagate all the way to a SCSI-II device 
+ * and commands that are currently executing.  This means that an
+ * unlimited number of commands may be queued, letting
+ * more commands propagate from the higher driver levels giving higher
+ * throughput.  Note that both I_T_L and I_T_L_Q nexuses are supported,
+ * allowing multiple commands to propagate all the way to a SCSI-II device
  * while a command is already executing.
  *
- * To solve the multiple-boards-in-the-same-system problem, 
+ * To solve the multiple-boards-in-the-same-system problem,
  * there is a separate instance structure for each instance
  * of a 5380 in the system.  So, multiple NCR5380 drivers will
  * be able to coexist with appropriate changes to the high level
- * SCSI code.  
+ * SCSI code.
  *
  * A NCR5380_PUBLIC_REVISION macro is provided, with the release
- * number (updated for each public release) printed by the 
- * NCR5380_print_options command, which should be called from the 
+ * number (updated for each public release) printed by the
+ * NCR5380_print_options command, which should be called from the
  * wrapper detect function, so that I know what release of the driver
  * users are using.
  *
- * Issues specific to the NCR5380 : 
+ * Issues specific to the NCR5380 :
  *
- * When used in a PIO or pseudo-dma mode, the NCR5380 is a braindead 
- * piece of hardware that requires you to sit in a loop polling for 
- * the REQ signal as long as you are connected.  Some devices are 
- * brain dead (ie, many TEXEL CD ROM drives) and won't disconnect 
+ * When used in a PIO or pseudo-dma mode, the NCR5380 is a braindead
+ * piece of hardware that requires you to sit in a loop polling for
+ * the REQ signal as long as you are connected.  Some devices are
+ * brain dead (ie, many TEXEL CD ROM drives) and won't disconnect
  * while doing long seek operations.
- * 
+ *
  * The workaround for this is to keep track of devices that have
  * disconnected.  If the device hasn't disconnected, for commands that
- * should disconnect, we do something like 
+ * should disconnect, we do something like
  *
  * while (!REQ is asserted) { sleep for N usecs; poll for M usecs }
- * 
- * Some tweaking of N and M needs to be done.  An algorithm based 
+ *
+ * Some tweaking of N and M needs to be done.  An algorithm based
  * on "time to data" would give the best results as long as short time
- * to datas (ie, on the same track) were considered, however these 
+ * to datas (ie, on the same track) were considered, however these
  * broken devices are the exception rather than the rule and I'd rather
  * spend my time optimizing for the normal case.
  *
@@ -167,9 +175,9 @@
  * At the heart of the design is a coroutine, NCR5380_main,
  * which is started when not running by the interrupt handler,
  * timer, and queue command function.  It attempts to establish
- * I_T_L or I_T_L_Q nexuses by removing the commands from the 
- * issue queue and calling NCR5380_select() if a nexus 
- * is not established. 
+ * I_T_L or I_T_L_Q nexuses by removing the commands from the
+ * issue queue and calling NCR5380_select() if a nexus
+ * is not established.
  *
  * Once a nexus is established, the NCR5380_information_transfer()
  * phase goes through the various phases as instructed by the target.
@@ -183,10 +191,10 @@
  * calling NCR5380_intr()  which will in turn call NCR5380_reselect
  * to reestablish a nexus.  This will run main if necessary.
  *
- * On command termination, the done function will be called as 
+ * On command termination, the done function will be called as
  * appropriate.
  *
- * SCSI pointers are maintained in the SCp field of SCSI command 
+ * SCSI pointers are maintained in the SCp field of SCSI command
  * structures, being initialized after the command is connected
  * in NCR5380_select, and set as appropriate in NCR5380_information_transfer.
  * Note that in violation of the standard, an implicit SAVE POINTERS operation
@@ -196,12 +204,12 @@
 /*
  * Using this file :
  * This file a skeleton Linux SCSI driver for the NCR 5380 series
- * of chips.  To use it, you write an architecture specific functions 
+ * of chips.  To use it, you write an architecture specific functions
  * and macros and include this file in your driver.
  *
- * These macros control options : 
+ * These macros control options :
  * AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
- *      for commands that return with a CHECK CONDITION status. 
+ *      for commands that return with a CHECK CONDITION status.
  *
  * LINKED - if defined, linked commands are supported.
  *
@@ -210,18 +218,18 @@
  * SUPPORT_TAGS - if defined, SCSI-2 tagged queuing is used where possible
  *
  * These macros MUST be defined :
- * 
+ *
  * NCR5380_read(register)  - read from the specified register
  *
- * NCR5380_write(register, value) - write to the specific register 
+ * NCR5380_write(register, value) - write to the specific register
  *
  * Either real DMA *or* pseudo DMA may be implemented
- * REAL functions : 
+ * REAL functions :
  * NCR5380_REAL_DMA should be defined if real DMA is to be used.
- * Note that the DMA setup functions should return the number of bytes 
+ * Note that the DMA setup functions should return the number of bytes
  *      that they were able to program the controller for.
  *
- * Also note that generic i386/PC versions of these macros are 
+ * Also note that generic i386/PC versions of these macros are
  *      available as NCR5380_i386_dma_write_setup,
  *      NCR5380_i386_dma_read_setup, and NCR5380_i386_dma_residual.
  *
@@ -234,14 +242,14 @@
  * NCR5380_pread(instance, dst, count);
  *
  * If nothing specific to this implementation needs doing (ie, with external
- * hardware), you must also define 
- *  
+ * hardware), you must also define
+ *
  * NCR5380_queue_command
  * NCR5380_reset
  * NCR5380_abort
  * NCR5380_proc_info
  *
- * to be the global entry points into the specific driver, ie 
+ * to be the global entry points into the specific driver, ie
  * #define NCR5380_queue_command t128_queue_command.
  *
  * If this is not done, the routines will be defined as static functions
@@ -249,7 +257,7 @@
  * accessible wrapper function.
  *
  * The generic driver is initialized by calling NCR5380_init(instance),
- * after setting the appropriate host specific fields and ID.  If the 
+ * after setting the appropriate host specific fields and ID.  If the
  * driver wishes to autoprobe for an IRQ line, the NCR5380_probe_irq(instance,
  * possible) function may be used.  Before the specific driver initialization
  * code finishes, NCR5380_print_options should be called.
@@ -264,8 +272,9 @@ static struct scsi_host_template *the_template = NULL;
         (struct NCR5380_hostdata *)(in)->hostdata
 #define HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata)
 
-#define NEXT(cmd)       ((Scsi_Cmnd *)((cmd)->host_scribble))
-#define NEXTADDR(cmd)   ((Scsi_Cmnd **)&((cmd)->host_scribble))
+#define NEXT(cmd)               ((Scsi_Cmnd *)(cmd)->host_scribble)
+#define SET_NEXT(cmd,next)      ((cmd)->host_scribble = (void *)(next))
+#define NEXTADDR(cmd)           ((Scsi_Cmnd **)&(cmd)->host_scribble)
 
 #define HOSTNO          instance->host_no
 #define H_NO(cmd)       (cmd)->device->host->host_no
@@ -312,34 +321,34 @@ static struct scsi_host_template *the_template = NULL;
 #define TAG_NONE 0xff
 
 typedef struct {
-    DECLARE_BITMAP(allocated, MAX_TAGS);
-    int         nr_allocated;
-    int         queue_size;
+        DECLARE_BITMAP(allocated, MAX_TAGS);
+        int nr_allocated;
+        int queue_size;
 } TAG_ALLOC;
 
-static TAG_ALLOC TagAlloc[8][8]; /* 8 targets and 8 LUNs */
+static TAG_ALLOC TagAlloc[8][8];        /* 8 targets and 8 LUNs */
 
 
-static void __init init_tags( void )
+static void __init init_tags(void)
 {
-    int target, lun;
-    TAG_ALLOC *ta;
-    
-    if (!setup_use_tagged_queuing)
-        return;
-    
-    for( target = 0; target < 8; ++target ) {
-        for( lun = 0; lun < 8; ++lun ) {
-            ta = &TagAlloc[target][lun];
-            bitmap_zero(ta->allocated, MAX_TAGS);
-            ta->nr_allocated = 0;
-            /* At the beginning, assume the maximum queue size we could
-             * support (MAX_TAGS). This value will be decreased if the target
-             * returns QUEUE_FULL status.
-             */
-            ta->queue_size = MAX_TAGS;
+        int target, lun;
+        TAG_ALLOC *ta;
+
+        if (!setup_use_tagged_queuing)
+                return;
+
+        for (target = 0; target < 8; ++target) {
+                for (lun = 0; lun < 8; ++lun) {
+                        ta = &TagAlloc[target][lun];
+                        bitmap_zero(ta->allocated, MAX_TAGS);
+                        ta->nr_allocated = 0;
+                        /* At the beginning, assume the maximum queue size we could
+                         * support (MAX_TAGS). This value will be decreased if the target
+                         * returns QUEUE_FULL status.
+                         */
+                        ta->queue_size = MAX_TAGS;
+                }
         }
-    }
 }
 
 
@@ -348,24 +357,24 @@ static void __init init_tags( void )
  * check that there is a free tag and the target's queue won't overflow. This
  * function should be called with interrupts disabled to avoid race
  * conditions.
- */ 
+ */
 
-static int is_lun_busy( Scsi_Cmnd *cmd, int should_be_tagged )
+static int is_lun_busy(Scsi_Cmnd *cmd, int should_be_tagged)
 {
-    SETUP_HOSTDATA(cmd->device->host);
-
-    if (hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))
-        return( 1 );
-    if (!should_be_tagged ||
-        !setup_use_tagged_queuing || !cmd->device->tagged_supported)
-        return( 0 );
-    if (TagAlloc[cmd->device->id][cmd->device->lun].nr_allocated >=
-        TagAlloc[cmd->device->id][cmd->device->lun].queue_size ) {
-        TAG_PRINTK( "scsi%d: target %d lun %d: no free tags\n",
-                    H_NO(cmd), cmd->device->id, cmd->device->lun );
-        return( 1 );
-    }
-    return( 0 );
+        SETUP_HOSTDATA(cmd->device->host);
+
+        if (hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))
+                return 1;
+        if (!should_be_tagged ||
+            !setup_use_tagged_queuing || !cmd->device->tagged_supported)
+                return 0;
+        if (TagAlloc[cmd->device->id][cmd->device->lun].nr_allocated >=
+            TagAlloc[cmd->device->id][cmd->device->lun].queue_size) {
+                TAG_PRINTK("scsi%d: target %d lun %d: no free tags\n",
+                           H_NO(cmd), cmd->device->id, cmd->device->lun);
+                return 1;
+        }
+        return 0;
 }
 
 
@@ -374,31 +383,30 @@ static int is_lun_busy( Scsi_Cmnd *cmd, int should_be_tagged )
  * untagged.
  */
 
-static void cmd_get_tag( Scsi_Cmnd *cmd, int should_be_tagged )
+static void cmd_get_tag(Scsi_Cmnd *cmd, int should_be_tagged)
 {
-    SETUP_HOSTDATA(cmd->device->host);
-
-    /* If we or the target don't support tagged queuing, allocate the LUN for
-     * an untagged command.
-     */
-    if (!should_be_tagged ||
-        !setup_use_tagged_queuing || !cmd->device->tagged_supported) {
-        cmd->tag = TAG_NONE;
-        hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
-        TAG_PRINTK( "scsi%d: target %d lun %d now allocated by untagged "
-                    "command\n", H_NO(cmd), cmd->device->id, cmd->device->lun );
-    }
-    else {
-        TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
-
-        cmd->tag = find_first_zero_bit( ta->allocated, MAX_TAGS );
-        set_bit( cmd->tag, ta->allocated );
-        ta->nr_allocated++;
-        TAG_PRINTK( "scsi%d: using tag %d for target %d lun %d "
-                    "(now %d tags in use)\n",
-                    H_NO(cmd), cmd->tag, cmd->device->id, cmd->device->lun,
-                    ta->nr_allocated );
-    }
+        SETUP_HOSTDATA(cmd->device->host);
+
+        /* If we or the target don't support tagged queuing, allocate the LUN for
+         * an untagged command.
+         */
+        if (!should_be_tagged ||
+            !setup_use_tagged_queuing || !cmd->device->tagged_supported) {
+                cmd->tag = TAG_NONE;
+                hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
+                TAG_PRINTK("scsi%d: target %d lun %d now allocated by untagged "
+                           "command\n", H_NO(cmd), cmd->device->id, cmd->device->lun);
+        } else {
+                TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
+
+                cmd->tag = find_first_zero_bit(ta->allocated, MAX_TAGS);
+                set_bit(cmd->tag, ta->allocated);
+                ta->nr_allocated++;
+                TAG_PRINTK("scsi%d: using tag %d for target %d lun %d "
+                           "(now %d tags in use)\n",
+                           H_NO(cmd), cmd->tag, cmd->device->id,
+                           cmd->device->lun, ta->nr_allocated);
+        }
 }
 
 
@@ -406,44 +414,42 @@ static void cmd_get_tag( Scsi_Cmnd *cmd, int should_be_tagged )
  * unlock the LUN.
  */
 
-static void cmd_free_tag( Scsi_Cmnd *cmd )
+static void cmd_free_tag(Scsi_Cmnd *cmd)
 {
-    SETUP_HOSTDATA(cmd->device->host);
-
-    if (cmd->tag == TAG_NONE) {
-        hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
-        TAG_PRINTK( "scsi%d: target %d lun %d untagged cmd finished\n",
-                    H_NO(cmd), cmd->device->id, cmd->device->lun );
-    }
-    else if (cmd->tag >= MAX_TAGS) {
-        printk(KERN_NOTICE "scsi%d: trying to free bad tag %d!\n",
-                H_NO(cmd), cmd->tag );
-    }
-    else {
-        TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
-        clear_bit( cmd->tag, ta->allocated );
-        ta->nr_allocated--;
-        TAG_PRINTK( "scsi%d: freed tag %d for target %d lun %d\n",
-                    H_NO(cmd), cmd->tag, cmd->device->id, cmd->device->lun );
-    }
+        SETUP_HOSTDATA(cmd->device->host);
+
+        if (cmd->tag == TAG_NONE) {
+                hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+                TAG_PRINTK("scsi%d: target %d lun %d untagged cmd finished\n",
+                           H_NO(cmd), cmd->device->id, cmd->device->lun);
+        } else if (cmd->tag >= MAX_TAGS) {
+                printk(KERN_NOTICE "scsi%d: trying to free bad tag %d!\n",
+                       H_NO(cmd), cmd->tag);
+        } else {
+                TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
+                clear_bit(cmd->tag, ta->allocated);
+                ta->nr_allocated--;
+                TAG_PRINTK("scsi%d: freed tag %d for target %d lun %d\n",
+                           H_NO(cmd), cmd->tag, cmd->device->id, cmd->device->lun);
+        }
 }
 
 
-static void free_all_tags( void )
+static void free_all_tags(void)
 {
-    int target, lun;
-    TAG_ALLOC *ta;
-
-    if (!setup_use_tagged_queuing)
-        return;
-    
-    for( target = 0; target < 8; ++target ) {
-        for( lun = 0; lun < 8; ++lun ) {
-            ta = &TagAlloc[target][lun];
-            bitmap_zero(ta->allocated, MAX_TAGS);
-            ta->nr_allocated = 0;
+        int target, lun;
+        TAG_ALLOC *ta;
+
+        if (!setup_use_tagged_queuing)
+                return;
+
+        for (target = 0; target < 8; ++target) {
+                for (lun = 0; lun < 8; ++lun) {
+                        ta = &TagAlloc[target][lun];
+                        bitmap_zero(ta->allocated, MAX_TAGS);
+                        ta->nr_allocated = 0;
+                }
         }
-    }
 }
 
 #endif /* SUPPORT_TAGS */
@@ -461,89 +467,94 @@ static void free_all_tags( void )
  *    assumed to be already transfered into ptr/this_residual.
  */
 
-static void merge_contiguous_buffers( Scsi_Cmnd *cmd )
+static void merge_contiguous_buffers(Scsi_Cmnd *cmd)
 {
-    unsigned long endaddr;
+        unsigned long endaddr;
 #if (NDEBUG & NDEBUG_MERGING)
-    unsigned long oldlen = cmd->SCp.this_residual;
-    int           cnt = 1;
+        unsigned long oldlen = cmd->SCp.this_residual;
+        int cnt = 1;
 #endif
 
-    for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;
-         cmd->SCp.buffers_residual &&
-         virt_to_phys(page_address(cmd->SCp.buffer[1].page)+
-                      cmd->SCp.buffer[1].offset) == endaddr; ) {
-        MER_PRINTK("VTOP(%p) == %08lx -> merging\n",
-                   cmd->SCp.buffer[1].address, endaddr);
+        for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;
+             cmd->SCp.buffers_residual &&
+             virt_to_phys(page_address(cmd->SCp.buffer[1].page) +
+                          cmd->SCp.buffer[1].offset) == endaddr;) {
+                MER_PRINTK("VTOP(%p) == %08lx -> merging\n",
+                           page_address(cmd->SCp.buffer[1].page), endaddr);
 #if (NDEBUG & NDEBUG_MERGING)
-        ++cnt;
+                ++cnt;
 #endif
-        ++cmd->SCp.buffer;
-        --cmd->SCp.buffers_residual;
-        cmd->SCp.this_residual += cmd->SCp.buffer->length;
-        endaddr += cmd->SCp.buffer->length;
-    }
+                ++cmd->SCp.buffer;
+                --cmd->SCp.buffers_residual;
+                cmd->SCp.this_residual += cmd->SCp.buffer->length;
+                endaddr += cmd->SCp.buffer->length;
+        }
 #if (NDEBUG & NDEBUG_MERGING)
-    if (oldlen != cmd->SCp.this_residual)
-        MER_PRINTK("merged %d buffers from %p, new length %08x\n",
-                   cnt, cmd->SCp.ptr, cmd->SCp.this_residual);
+        if (oldlen != cmd->SCp.this_residual)
+                MER_PRINTK("merged %d buffers from %p, new length %08x\n",
+                           cnt, cmd->SCp.ptr, cmd->SCp.this_residual);
 #endif
 }
 
 /*
  * Function : void initialize_SCp(Scsi_Cmnd *cmd)
  *
- * Purpose : initialize the saved data pointers for cmd to point to the 
+ * Purpose : initialize the saved data pointers for cmd to point to the
  *      start of the buffer.
  *
  * Inputs : cmd - Scsi_Cmnd structure to have pointers reset.
  */
 
-static __inline__ void initialize_SCp(Scsi_Cmnd *cmd)
+static inline void initialize_SCp(Scsi_Cmnd *cmd)
 {
-    /* 
-     * Initialize the Scsi Pointer field so that all of the commands in the 
-     * various queues are valid.
-     */
-
-    if (cmd->use_sg) {
-        cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
-        cmd->SCp.buffers_residual = cmd->use_sg - 1;
-        cmd->SCp.ptr = (char *)page_address(cmd->SCp.buffer->page)+
-                       cmd->SCp.buffer->offset;
-        cmd->SCp.this_residual = cmd->SCp.buffer->length;
-        /* ++roman: Try to merge some scatter-buffers if they are at
-         * contiguous physical addresses.
+        /*
+         * Initialize the Scsi Pointer field so that all of the commands in the
+         * various queues are valid.
          */
-        merge_contiguous_buffers( cmd );
-    } else {
-        cmd->SCp.buffer = NULL;
-        cmd->SCp.buffers_residual = 0;
-        cmd->SCp.ptr = (char *) cmd->request_buffer;
-        cmd->SCp.this_residual = cmd->request_bufflen;
-    }
+
+        if (cmd->use_sg) {
+                cmd->SCp.buffer = (struct scatterlist *)cmd->request_buffer;
+                cmd->SCp.buffers_residual = cmd->use_sg - 1;
+                cmd->SCp.ptr = (char *)page_address(cmd->SCp.buffer->page) +
+                               cmd->SCp.buffer->offset;
+                cmd->SCp.this_residual = cmd->SCp.buffer->length;
+                /* ++roman: Try to merge some scatter-buffers if they are at
+                 * contiguous physical addresses.
+                 */
+                merge_contiguous_buffers(cmd);
+        } else {
+                cmd->SCp.buffer = NULL;
+                cmd->SCp.buffers_residual = 0;
+                cmd->SCp.ptr = (char *)cmd->request_buffer;
+                cmd->SCp.this_residual = cmd->request_bufflen;
+        }
 }
 
 #include <linux/delay.h>
 
 #if NDEBUG
 static struct {
-    unsigned char mask;
-    const char * name;} 
-signals[] = {{ SR_DBP, "PARITY"}, { SR_RST, "RST" }, { SR_BSY, "BSY" }, 
-    { SR_REQ, "REQ" }, { SR_MSG, "MSG" }, { SR_CD,  "CD" }, { SR_IO, "IO" }, 
-    { SR_SEL, "SEL" }, {0, NULL}}, 
-basrs[] = {{BASR_ATN, "ATN"}, {BASR_ACK, "ACK"}, {0, NULL}},
-icrs[] = {{ICR_ASSERT_RST, "ASSERT RST"},{ICR_ASSERT_ACK, "ASSERT ACK"},
-    {ICR_ASSERT_BSY, "ASSERT BSY"}, {ICR_ASSERT_SEL, "ASSERT SEL"}, 
-    {ICR_ASSERT_ATN, "ASSERT ATN"}, {ICR_ASSERT_DATA, "ASSERT DATA"}, 
-    {0, NULL}},
-mrs[] = {{MR_BLOCK_DMA_MODE, "MODE BLOCK DMA"}, {MR_TARGET, "MODE TARGET"}, 
-    {MR_ENABLE_PAR_CHECK, "MODE PARITY CHECK"}, {MR_ENABLE_PAR_INTR, 
-    "MODE PARITY INTR"}, {MR_ENABLE_EOP_INTR,"MODE EOP INTR"},
-    {MR_MONITOR_BSY, "MODE MONITOR BSY"},
-    {MR_DMA_MODE, "MODE DMA"}, {MR_ARBITRATE, "MODE ARBITRATION"}, 
-    {0, NULL}};
+        unsigned char mask;
+        const char *name;
+} signals[] = {
+        { SR_DBP, "PARITY"}, { SR_RST, "RST" }, { SR_BSY, "BSY" },
+        { SR_REQ, "REQ" }, { SR_MSG, "MSG" }, { SR_CD,  "CD" }, { SR_IO, "IO" },
+        { SR_SEL, "SEL" }, {0, NULL}
+}, basrs[] = {
+        {BASR_ATN, "ATN"}, {BASR_ACK, "ACK"}, {0, NULL}
+}, icrs[] = {
+        {ICR_ASSERT_RST, "ASSERT RST"},{ICR_ASSERT_ACK, "ASSERT ACK"},
+        {ICR_ASSERT_BSY, "ASSERT BSY"}, {ICR_ASSERT_SEL, "ASSERT SEL"},
+        {ICR_ASSERT_ATN, "ASSERT ATN"}, {ICR_ASSERT_DATA, "ASSERT DATA"},
+        {0, NULL}
+}, mrs[] = {
+        {MR_BLOCK_DMA_MODE, "MODE BLOCK DMA"}, {MR_TARGET, "MODE TARGET"},
+        {MR_ENABLE_PAR_CHECK, "MODE PARITY CHECK"}, {MR_ENABLE_PAR_INTR,
+        "MODE PARITY INTR"}, {MR_ENABLE_EOP_INTR,"MODE EOP INTR"},
+        {MR_MONITOR_BSY, "MODE MONITOR BSY"},
+        {MR_DMA_MODE, "MODE DMA"}, {MR_ARBITRATE, "MODE ARBITRATION"},
+        {0, NULL}
+};
 
 /*
  * Function : void NCR5380_print(struct Scsi_Host *instance)
@@ -553,45 +564,47 @@ mrs[] = {{MR_BLOCK_DMA_MODE, "MODE BLOCK DMA"}, {MR_TARGET, "MODE TARGET"},
  * Input : instance - which NCR5380
  */
 
-static void NCR5380_print(struct Scsi_Host *instance) {
-    unsigned char status, data, basr, mr, icr, i;
-    unsigned long flags;
-
-    local_irq_save(flags);
-    data = NCR5380_read(CURRENT_SCSI_DATA_REG);
-    status = NCR5380_read(STATUS_REG);
-    mr = NCR5380_read(MODE_REG);
-    icr = NCR5380_read(INITIATOR_COMMAND_REG);
-    basr = NCR5380_read(BUS_AND_STATUS_REG);
-    local_irq_restore(flags);
-    printk("STATUS_REG: %02x ", status);
-    for (i = 0; signals[i].mask ; ++i) 
-        if (status & signals[i].mask)
-            printk(",%s", signals[i].name);
-    printk("\nBASR: %02x ", basr);
-    for (i = 0; basrs[i].mask ; ++i) 
-        if (basr & basrs[i].mask)
-            printk(",%s", basrs[i].name);
-    printk("\nICR: %02x ", icr);
-    for (i = 0; icrs[i].mask; ++i) 
-        if (icr & icrs[i].mask)
-            printk(",%s", icrs[i].name);
-    printk("\nMODE: %02x ", mr);
-    for (i = 0; mrs[i].mask; ++i) 
-        if (mr & mrs[i].mask)
-            printk(",%s", mrs[i].name);
-    printk("\n");
+static void NCR5380_print(struct Scsi_Host *instance)
+{
+        unsigned char status, data, basr, mr, icr, i;
+        unsigned long flags;
+
+        local_irq_save(flags);
+        data = NCR5380_read(CURRENT_SCSI_DATA_REG);
+        status = NCR5380_read(STATUS_REG);
+        mr = NCR5380_read(MODE_REG);
+        icr = NCR5380_read(INITIATOR_COMMAND_REG);
+        basr = NCR5380_read(BUS_AND_STATUS_REG);
+        local_irq_restore(flags);
+        printk("STATUS_REG: %02x ", status);
+        for (i = 0; signals[i].mask; ++i)
+                if (status & signals[i].mask)
+                        printk(",%s", signals[i].name);
+        printk("\nBASR: %02x ", basr);
+        for (i = 0; basrs[i].mask; ++i)
+                if (basr & basrs[i].mask)
+                        printk(",%s", basrs[i].name);
+        printk("\nICR: %02x ", icr);
+        for (i = 0; icrs[i].mask; ++i)
+                if (icr & icrs[i].mask)
+                        printk(",%s", icrs[i].name);
+        printk("\nMODE: %02x ", mr);
+        for (i = 0; mrs[i].mask; ++i)
+                if (mr & mrs[i].mask)
+                        printk(",%s", mrs[i].name);
+        printk("\n");
 }
 
 static struct {
-    unsigned char value;
-    const char *name;
+        unsigned char value;
+        const char *name;
 } phases[] = {
-    {PHASE_DATAOUT, "DATAOUT"}, {PHASE_DATAIN, "DATAIN"}, {PHASE_CMDOUT, "CMDOUT"},
-    {PHASE_STATIN, "STATIN"}, {PHASE_MSGOUT, "MSGOUT"}, {PHASE_MSGIN, "MSGIN"},
-    {PHASE_UNKNOWN, "UNKNOWN"}};
+        {PHASE_DATAOUT, "DATAOUT"}, {PHASE_DATAIN, "DATAIN"}, {PHASE_CMDOUT, "CMDOUT"},
+        {PHASE_STATIN, "STATIN"}, {PHASE_MSGOUT, "MSGOUT"}, {PHASE_MSGIN, "MSGIN"},
+        {PHASE_UNKNOWN, "UNKNOWN"}
+};
 
-/* 
+/*
  * Function : void NCR5380_print_phase(struct Scsi_Host *instance)
  *
  * Purpose : print the current SCSI phase for debugging purposes
@@ -601,30 +614,35 @@ static struct {
 
 static void NCR5380_print_phase(struct Scsi_Host *instance)
 {
-    unsigned char status;
-    int i;
-
-    status = NCR5380_read(STATUS_REG);
-    if (!(status & SR_REQ)) 
-        printk(KERN_DEBUG "scsi%d: REQ not asserted, phase unknown.\n", HOSTNO);
-    else {
-        for (i = 0; (phases[i].value != PHASE_UNKNOWN) && 
-            (phases[i].value != (status & PHASE_MASK)); ++i); 
-        printk(KERN_DEBUG "scsi%d: phase %s\n", HOSTNO, phases[i].name);
-    }
+        unsigned char status;
+        int i;
+
+        status = NCR5380_read(STATUS_REG);
+        if (!(status & SR_REQ))
+                printk(KERN_DEBUG "scsi%d: REQ not asserted, phase unknown.\n", HOSTNO);
+        else {
+                for (i = 0; (phases[i].value != PHASE_UNKNOWN) &&
+                     (phases[i].value != (status & PHASE_MASK)); ++i)
+                        ;
+                printk(KERN_DEBUG "scsi%d: phase %s\n", HOSTNO, phases[i].name);
+        }
 }
 
 #else /* !NDEBUG */
 
 /* dummies... */
-__inline__ void NCR5380_print(struct Scsi_Host *instance) { };
-__inline__ void NCR5380_print_phase(struct Scsi_Host *instance) { };
+static inline void NCR5380_print(struct Scsi_Host *instance)
+{
+};
+static inline void NCR5380_print_phase(struct Scsi_Host *instance)
+{
+};
 
 #endif
 
 /*
  * ++roman: New scheme of calling NCR5380_main()
- * 
+ *
  * If we're not in an interrupt, we can call our main directly, it cannot be
  * already running. Else, we queue it on a task queue, if not 'main_running'
  * tells us that a lower level is already executing it. This way,
@@ -638,33 +656,33 @@ __inline__ void NCR5380_print_phase(struct Scsi_Host *instance) { };
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 
-static volatile int main_running = 0;
-static DECLARE_WORK(NCR5380_tqueue, (void (*)(void*))NCR5380_main, NULL);
+static volatile int main_running;
+static DECLARE_WORK(NCR5380_tqueue, NCR5380_main);
 
-static __inline__ void queue_main(void)
+static inline void queue_main(void)
 {
-    if (!main_running) {
-        /* If in interrupt and NCR5380_main() not already running,
-           queue it on the 'immediate' task queue, to be processed
-           immediately after the current interrupt processing has
-           finished. */
-        schedule_work(&NCR5380_tqueue);
-    }
-    /* else: nothing to do: the running NCR5380_main() will pick up
-       any newly queued command. */
+        if (!main_running) {
+                /* If in interrupt and NCR5380_main() not already running,
+                   queue it on the 'immediate' task queue, to be processed
+                   immediately after the current interrupt processing has
+                   finished. */
+                schedule_work(&NCR5380_tqueue);
+        }
+        /* else: nothing to do: the running NCR5380_main() will pick up
+           any newly queued command. */
 }
 
 
-static inline void NCR5380_all_init (void)
+static inline void NCR5380_all_init(void)
 {
-    static int done = 0;
-    if (!done) {
-        INI_PRINTK("scsi : NCR5380_all_init()\n");
-        done = 1;
-    }
+        static int done = 0;
+        if (!done) {
+                INI_PRINTK("scsi : NCR5380_all_init()\n");
+                done = 1;
+        }
 }
 
- 
+
 /*
  * Function : void NCR58380_print_options (struct Scsi_Host *instance)
  *
@@ -674,23 +692,23 @@ static inline void NCR5380_all_init (void)
  * Inputs : instance, pointer to this instance.  Unused.
  */
 
-static void __init NCR5380_print_options (struct Scsi_Host *instance)
+static void __init NCR5380_print_options(struct Scsi_Host *instance)
 {
-    printk(" generic options"
-#ifdef AUTOSENSE 
-    " AUTOSENSE"
+        printk(" generic options"
+#ifdef AUTOSENSE
+               " AUTOSENSE"
 #endif
 #ifdef REAL_DMA
-    " REAL DMA"
+               " REAL DMA"
 #endif
 #ifdef PARITY
-    " PARITY"
+               " PARITY"
 #endif
 #ifdef SUPPORT_TAGS
-    " SCSI-2 TAGGED QUEUING"
+               " SCSI-2 TAGGED QUEUING"
 #endif
-    );
-    printk(" generic release=%d", NCR5380_PUBLIC_RELEASE);
+               );
+        printk(" generic release=%d", NCR5380_PUBLIC_RELEASE);
 }
 
 /*
@@ -699,27 +717,27 @@ static void __init NCR5380_print_options (struct Scsi_Host *instance)
  * Purpose : print commands in the various queues, called from
  *      NCR5380_abort and NCR5380_debug to aid debugging.
  *
- * Inputs : instance, pointer to this instance.  
+ * Inputs : instance, pointer to this instance.
  */
 
-static void NCR5380_print_status (struct Scsi_Host *instance)
+static void NCR5380_print_status(struct Scsi_Host *instance)
 {
-    char *pr_bfr;
-    char *start;
-    int len;
-
-    NCR_PRINT(NDEBUG_ANY);
-    NCR_PRINT_PHASE(NDEBUG_ANY);
-
-    pr_bfr = (char *) __get_free_page(GFP_ATOMIC);
-    if (!pr_bfr) {
-        printk("NCR5380_print_status: no memory for print buffer\n");
-        return;
-    }
-    len = NCR5380_proc_info(pr_bfr, &start, 0, PAGE_SIZE, HOSTNO, 0);
-    pr_bfr[len] = 0;
-    printk("\n%s\n", pr_bfr);
-    free_page((unsigned long) pr_bfr);
+        char *pr_bfr;
+        char *start;
+        int len;
+
+        NCR_PRINT(NDEBUG_ANY);
+        NCR_PRINT_PHASE(NDEBUG_ANY);
+
+        pr_bfr = (char *)__get_free_page(GFP_ATOMIC);
+        if (!pr_bfr) {
+                printk("NCR5380_print_status: no memory for print buffer\n");
+                return;
+        }
+        len = NCR5380_proc_info(instance, pr_bfr, &start, 0, PAGE_SIZE, 0);
+        pr_bfr[len] = 0;
+        printk("\n%s\n", pr_bfr);
+        free_page((unsigned long)pr_bfr);
 }
 
 
@@ -738,443 +756,478 @@ static void NCR5380_print_status (struct Scsi_Host *instance)
 */
 
 #undef SPRINTF
-#define SPRINTF(fmt,args...) \
-  do { if (pos + strlen(fmt) + 20 /* slop */ < buffer + length) \
-         pos += sprintf(pos, fmt , ## args); } while(0)
-static
-char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length);
-
-static
-int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, off_t offset,
-                       int length, int inout)
+#define SPRINTF(fmt,args...)                                                    \
+        do {                                                                    \
+                if (pos + strlen(fmt) + 20 /* slop */ < buffer + length)        \
+                        pos += sprintf(pos, fmt , ## args);                     \
+        } while(0)
+static char *lprint_Scsi_Cmnd(Scsi_Cmnd *cmd, char *pos, char *buffer, int length);
+
+static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer,
+                             char **start, off_t offset, int length, int inout)
 {
-    char *pos = buffer;
-    struct NCR5380_hostdata *hostdata;
-    Scsi_Cmnd *ptr;
-    unsigned long flags;
-    off_t begin = 0;
-#define check_offset()                          \
-    do {                                        \
-        if (pos - buffer < offset - begin) {    \
-            begin += pos - buffer;              \
-            pos = buffer;                       \
-        }                                       \
-    } while (0)
-
-    hostdata = (struct NCR5380_hostdata *)instance->hostdata;
-
-    if (inout) { /* Has data been written to the file ? */
-        return(-ENOSYS);  /* Currently this is a no-op */
-    }
-    SPRINTF("NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
-    check_offset();
-    local_irq_save(flags);
-    SPRINTF("NCR5380: coroutine is%s running.\n", main_running ? "" : "n't");
-    check_offset();
-    if (!hostdata->connected)
-        SPRINTF("scsi%d: no currently connected command\n", HOSTNO);
-    else
-        pos = lprint_Scsi_Cmnd ((Scsi_Cmnd *) hostdata->connected,
-                                pos, buffer, length);
-    SPRINTF("scsi%d: issue_queue\n", HOSTNO);
-    check_offset();
-    for (ptr = (Scsi_Cmnd *) hostdata->issue_queue; ptr; ptr = NEXT(ptr)) {
-        pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length);
+        char *pos = buffer;
+        struct NCR5380_hostdata *hostdata;
+        Scsi_Cmnd *ptr;
+        unsigned long flags;
+        off_t begin = 0;
+#define check_offset()                                  \
+        do {                                            \
+                if (pos - buffer < offset - begin) {    \
+                        begin += pos - buffer;          \
+                        pos = buffer;                   \
+                }                                       \
+        } while (0)
+
+        hostdata = (struct NCR5380_hostdata *)instance->hostdata;
+
+        if (inout)                      /* Has data been written to the file ? */
+                return -ENOSYS;         /* Currently this is a no-op */
+        SPRINTF("NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
         check_offset();
-    }
+        local_irq_save(flags);
+        SPRINTF("NCR5380: coroutine is%s running.\n",
+                main_running ? "" : "n't");
+        check_offset();
+        if (!hostdata->connected)
+                SPRINTF("scsi%d: no currently connected command\n", HOSTNO);
+        else
+                pos = lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected,
+                                       pos, buffer, length);
+        SPRINTF("scsi%d: issue_queue\n", HOSTNO);
+        check_offset();
+        for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) {
+                pos = lprint_Scsi_Cmnd(ptr, pos, buffer, length);
+                check_offset();
+        }
 
-    SPRINTF("scsi%d: disconnected_queue\n", HOSTNO);
-    check_offset();
-    for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;
-         ptr = NEXT(ptr)) {
-        pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length);
+        SPRINTF("scsi%d: disconnected_queue\n", HOSTNO);
         check_offset();
-    }
+        for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;
+             ptr = NEXT(ptr)) {
+                pos = lprint_Scsi_Cmnd(ptr, pos, buffer, length);
+                check_offset();
+        }
 
-    local_irq_restore(flags);
-    *start = buffer + (offset - begin);
-    if (pos - buffer < offset - begin)
-        return 0;
-    else if (pos - buffer - (offset - begin) < length)
-        return pos - buffer - (offset - begin);
-    return length;
+        local_irq_restore(flags);
+        *start = buffer + (offset - begin);
+        if (pos - buffer < offset - begin)
+                return 0;
+        else if (pos - buffer - (offset - begin) < length)
+                return pos - buffer - (offset - begin);
+        return length;
 }
 
-static char *
-lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length)
+static char *lprint_Scsi_Cmnd(Scsi_Cmnd *cmd, char *pos, char *buffer, int length)
 {
-    int i, s;
-    unsigned char *command;
-    SPRINTF("scsi%d: destination target %d, lun %d\n",
-            H_NO(cmd), cmd->device->id, cmd->device->lun);
-    SPRINTF("        command = ");
-    command = cmd->cmnd;
-    SPRINTF("%2d (0x%02x)", command[0], command[0]);
-    for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)
-        SPRINTF(" %02x", command[i]);
-    SPRINTF("\n");
-    return pos;
+        int i, s;
+        unsigned char *command;
+        SPRINTF("scsi%d: destination target %d, lun %d\n",
+                H_NO(cmd), cmd->device->id, cmd->device->lun);
+        SPRINTF("        command = ");
+        command = cmd->cmnd;
+        SPRINTF("%2d (0x%02x)", command[0], command[0]);
+        for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)
+                SPRINTF(" %02x", command[i]);
+        SPRINTF("\n");
+        return pos;
 }
 
 
-/* 
+/*
  * Function : void NCR5380_init (struct Scsi_Host *instance)
  *
  * Purpose : initializes *instance and corresponding 5380 chip.
  *
- * Inputs : instance - instantiation of the 5380 driver.  
+ * Inputs : instance - instantiation of the 5380 driver.
  *
  * Notes : I assume that the host, hostno, and id bits have been
- *      set correctly.  I don't care about the irq and other fields. 
- * 
+ *      set correctly.  I don't care about the irq and other fields.
+ *
  */
 
-static int NCR5380_init (struct Scsi_Host *instance, int flags)
+static int NCR5380_init(struct Scsi_Host *instance, int flags)
 {
-    int i;
-    SETUP_HOSTDATA(instance);
-
-    NCR5380_all_init();
-
-    hostdata->aborted = 0;
-    hostdata->id_mask = 1 << instance->this_id;
-    hostdata->id_higher_mask = 0;
-    for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
-        if (i > hostdata->id_mask)
-            hostdata->id_higher_mask |= i;
-    for (i = 0; i < 8; ++i)
-        hostdata->busy[i] = 0;
+        int i;
+        SETUP_HOSTDATA(instance);
+
+        NCR5380_all_init();
+
+        hostdata->aborted = 0;
+        hostdata->id_mask = 1 << instance->this_id;
+        hostdata->id_higher_mask = 0;
+        for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
+                if (i > hostdata->id_mask)
+                        hostdata->id_higher_mask |= i;
+        for (i = 0; i < 8; ++i)
+                hostdata->busy[i] = 0;
 #ifdef SUPPORT_TAGS
-    init_tags();
+        init_tags();
 #endif
 #if defined (REAL_DMA)
-    hostdata->dma_len = 0;
+        hostdata->dma_len = 0;
 #endif
-    hostdata->targets_present = 0;
-    hostdata->connected = NULL;
-    hostdata->issue_queue = NULL;
-    hostdata->disconnected_queue = NULL;
-    hostdata->flags = FLAG_CHECK_LAST_BYTE_SENT;
-
-    if (!the_template) {
-        the_template = instance->hostt;
-        first_instance = instance;
-    }
-        
+        hostdata->targets_present = 0;
+        hostdata->connected = NULL;
+        hostdata->issue_queue = NULL;
+        hostdata->disconnected_queue = NULL;
+        hostdata->flags = FLAG_CHECK_LAST_BYTE_SENT;
+
+        if (!the_template) {
+                the_template = instance->hostt;
+                first_instance = instance;
+        }
 
 #ifndef AUTOSENSE
-    if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
-         printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
-                "        without AUTOSENSE option, contingent allegiance conditions may\n"
-                "        be incorrectly cleared.\n", HOSTNO);
+        if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
+                printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
+                       "        without AUTOSENSE option, contingent allegiance conditions may\n"
+                       "        be incorrectly cleared.\n", HOSTNO);
 #endif /* def AUTOSENSE */
 
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-    NCR5380_write(MODE_REG, MR_BASE);
-    NCR5380_write(TARGET_COMMAND_REG, 0);
-    NCR5380_write(SELECT_ENABLE_REG, 0);
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+        NCR5380_write(MODE_REG, MR_BASE);
+        NCR5380_write(TARGET_COMMAND_REG, 0);
+        NCR5380_write(SELECT_ENABLE_REG, 0);
 
-    return 0;
+        return 0;
 }
 
-/* 
- * Function : int NCR5380_queue_command (Scsi_Cmnd *cmd, 
- *      void (*done)(Scsi_Cmnd *)) 
+/*
+ * our own old-style timeout update
+ */
+/*
+ * The strategy is to cause the timer code to call scsi_times_out()
+ * when the soonest timeout is pending.
+ * The arguments are used when we are queueing a new command, because
+ * we do not want to subtract the time used from this time, but when we
+ * set the timer, we want to take this value into account.
+ */
+
+int atari_scsi_update_timeout(Scsi_Cmnd * SCset, int timeout)
+{
+        int rtn;
+
+        /*
+         * We are using the new error handling code to actually register/deregister
+         * timers for timeout.
+         */
+
+        if (!timer_pending(&SCset->eh_timeout))
+                rtn = 0;
+        else
+                rtn = SCset->eh_timeout.expires - jiffies;
+
+        if (timeout == 0) {
+                del_timer(&SCset->eh_timeout);
+                SCset->eh_timeout.data = (unsigned long)NULL;
+                SCset->eh_timeout.expires = 0;
+        } else {
+                if (SCset->eh_timeout.data != (unsigned long)NULL)
+                        del_timer(&SCset->eh_timeout);
+                SCset->eh_timeout.data = (unsigned long)SCset;
+                SCset->eh_timeout.expires = jiffies + timeout;
+                add_timer(&SCset->eh_timeout);
+        }
+        return rtn;
+}
+
+/*
+ * Function : int NCR5380_queue_command (Scsi_Cmnd *cmd,
+ *      void (*done)(Scsi_Cmnd *))
  *
  * Purpose :  enqueues a SCSI command
  *
  * Inputs : cmd - SCSI command, done - function called on completion, with
  *      a pointer to the command descriptor.
- * 
+ *
  * Returns : 0
  *
- * Side effects : 
- *      cmd is added to the per instance issue_queue, with minor 
- *      twiddling done to the host specific fields of cmd.  If the 
+ * Side effects :
+ *      cmd is added to the per instance issue_queue, with minor
+ *      twiddling done to the host specific fields of cmd.  If the
  *      main coroutine is not running, it is restarted.
  *
  */
 
-static
-int NCR5380_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
+static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
 {
-    SETUP_HOSTDATA(cmd->device->host);
-    Scsi_Cmnd *tmp;
-    int oldto;
-    unsigned long flags;
-    extern int update_timeout(Scsi_Cmnd * SCset, int timeout);
+        SETUP_HOSTDATA(cmd->device->host);
+        Scsi_Cmnd *tmp;
+        int oldto;
+        unsigned long flags;
+        // extern int update_timeout(Scsi_Cmnd * SCset, int timeout);
 
 #if (NDEBUG & NDEBUG_NO_WRITE)
-    switch (cmd->cmnd[0]) {
-    case WRITE_6:
-    case WRITE_10:
-        printk(KERN_NOTICE "scsi%d: WRITE attempted with NO_WRITE debugging flag set\n",
-               H_NO(cmd));
-        cmd->result = (DID_ERROR << 16);
-        done(cmd);
-        return 0;
-    }
+        switch (cmd->cmnd[0]) {
+        case WRITE_6:
+        case WRITE_10:
+                printk(KERN_NOTICE "scsi%d: WRITE attempted with NO_WRITE debugging flag set\n",
+                       H_NO(cmd));
+                cmd->result = (DID_ERROR << 16);
+                done(cmd);
+                return 0;
+        }
 #endif /* (NDEBUG & NDEBUG_NO_WRITE) */
 
-
 #ifdef NCR5380_STATS
 # if 0
-    if (!hostdata->connected && !hostdata->issue_queue &&
-        !hostdata->disconnected_queue) {
-        hostdata->timebase = jiffies;
-    }
+        if (!hostdata->connected && !hostdata->issue_queue &&
+            !hostdata->disconnected_queue) {
+                hostdata->timebase = jiffies;
+        }
 # endif
 # ifdef NCR5380_STAT_LIMIT
-    if (cmd->request_bufflen > NCR5380_STAT_LIMIT)
+        if (cmd->request_bufflen > NCR5380_STAT_LIMIT)
 # endif
-        switch (cmd->cmnd[0])
-        {
-            case WRITE:
-            case WRITE_6:
-            case WRITE_10:
-                hostdata->time_write[cmd->device->id] -= (jiffies - hostdata->timebase);
-                hostdata->bytes_write[cmd->device->id] += cmd->request_bufflen;
-                hostdata->pendingw++;
-                break;
-            case READ:
-            case READ_6:
-            case READ_10:
-                hostdata->time_read[cmd->device->id] -= (jiffies - hostdata->timebase);
-                hostdata->bytes_read[cmd->device->id] += cmd->request_bufflen;
-                hostdata->pendingr++;
-                break;
-        }
+                switch (cmd->cmnd[0]) {
+                case WRITE:
+                case WRITE_6:
+                case WRITE_10:
+                        hostdata->time_write[cmd->device->id] -= (jiffies - hostdata->timebase);
+                        hostdata->bytes_write[cmd->device->id] += cmd->request_bufflen;
+                        hostdata->pendingw++;
+                        break;
+                case READ:
+                case READ_6:
+                case READ_10:
+                        hostdata->time_read[cmd->device->id] -= (jiffies - hostdata->timebase);
+                        hostdata->bytes_read[cmd->device->id] += cmd->request_bufflen;
+                        hostdata->pendingr++;
+                        break;
+                }
 #endif
 
-    /* 
-     * We use the host_scribble field as a pointer to the next command  
-     * in a queue 
-     */
-
-    NEXT(cmd) = NULL;
-    cmd->scsi_done = done;
-
-    cmd->result = 0;
-
-
-    /* 
-     * Insert the cmd into the issue queue. Note that REQUEST SENSE 
-     * commands are added to the head of the queue since any command will
-     * clear the contingent allegiance condition that exists and the 
-     * sense data is only guaranteed to be valid while the condition exists.
-     */
-
-    local_irq_save(flags);
-    /* ++guenther: now that the issue queue is being set up, we can lock ST-DMA.
-     * Otherwise a running NCR5380_main may steal the lock.
-     * Lock before actually inserting due to fairness reasons explained in
-     * atari_scsi.c. If we insert first, then it's impossible for this driver
-     * to release the lock.
-     * Stop timer for this command while waiting for the lock, or timeouts
-     * may happen (and they really do), and it's no good if the command doesn't
-     * appear in any of the queues.
-     * ++roman: Just disabling the NCR interrupt isn't sufficient here,
-     * because also a timer int can trigger an abort or reset, which would
-     * alter queues and touch the lock.
-     */
-    if (!IS_A_TT()) {
-        oldto = update_timeout(cmd, 0);
-        falcon_get_lock();
-        update_timeout(cmd, oldto);
-    }
-    if (!(hostdata->issue_queue) || (cmd->cmnd[0] == REQUEST_SENSE)) {
-        LIST(cmd, hostdata->issue_queue);
-        NEXT(cmd) = hostdata->issue_queue;
-        hostdata->issue_queue = cmd;
-    } else {
-        for (tmp = (Scsi_Cmnd *)hostdata->issue_queue;
-             NEXT(tmp); tmp = NEXT(tmp))
-            ;
-        LIST(cmd, tmp);
-        NEXT(tmp) = cmd;
-    }
-    local_irq_restore(flags);
-
-    QU_PRINTK("scsi%d: command added to %s of queue\n", H_NO(cmd),
-              (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail");
-
-    /* If queue_command() is called from an interrupt (real one or bottom
-     * half), we let queue_main() do the job of taking care about main. If it
-     * is already running, this is a no-op, else main will be queued.
-     *
-     * If we're not in an interrupt, we can call NCR5380_main()
-     * unconditionally, because it cannot be already running.
-     */
-    if (in_interrupt() || ((flags >> 8) & 7) >= 6)
-        queue_main();
-    else
-        NCR5380_main(NULL);
-    return 0;
+        /*
+         * We use the host_scribble field as a pointer to the next command
+         * in a queue
+         */
+
+        SET_NEXT(cmd, NULL);
+        cmd->scsi_done = done;
+
+        cmd->result = 0;
+
+        /*
+         * Insert the cmd into the issue queue. Note that REQUEST SENSE
+         * commands are added to the head of the queue since any command will
+         * clear the contingent allegiance condition that exists and the
+         * sense data is only guaranteed to be valid while the condition exists.
+         */
+
+        local_irq_save(flags);
+        /* ++guenther: now that the issue queue is being set up, we can lock ST-DMA.
+         * Otherwise a running NCR5380_main may steal the lock.
+         * Lock before actually inserting due to fairness reasons explained in
+         * atari_scsi.c. If we insert first, then it's impossible for this driver
+         * to release the lock.
+         * Stop timer for this command while waiting for the lock, or timeouts
+         * may happen (and they really do), and it's no good if the command doesn't
+         * appear in any of the queues.
+         * ++roman: Just disabling the NCR interrupt isn't sufficient here,
+         * because also a timer int can trigger an abort or reset, which would
+         * alter queues and touch the lock.
+         */
+        if (!IS_A_TT()) {
+                oldto = atari_scsi_update_timeout(cmd, 0);
+                falcon_get_lock();
+                atari_scsi_update_timeout(cmd, oldto);
+        }
+        if (!(hostdata->issue_queue) || (cmd->cmnd[0] == REQUEST_SENSE)) {
+                LIST(cmd, hostdata->issue_queue);
+                SET_NEXT(cmd, hostdata->issue_queue);
+                hostdata->issue_queue = cmd;
+        } else {
+                for (tmp = (Scsi_Cmnd *)hostdata->issue_queue;
+                     NEXT(tmp); tmp = NEXT(tmp))
+                        ;
+                LIST(cmd, tmp);
+                SET_NEXT(tmp, cmd);
+        }
+        local_irq_restore(flags);
+
+        QU_PRINTK("scsi%d: command added to %s of queue\n", H_NO(cmd),
+                  (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail");
+
+        /* If queue_command() is called from an interrupt (real one or bottom
+         * half), we let queue_main() do the job of taking care about main. If it
+         * is already running, this is a no-op, else main will be queued.
+         *
+         * If we're not in an interrupt, we can call NCR5380_main()
+         * unconditionally, because it cannot be already running.
+         */
+        if (in_interrupt() || ((flags >> 8) & 7) >= 6)
+                queue_main();
+        else
+                NCR5380_main(NULL);
+        return 0;
 }
 
 /*
- * Function : NCR5380_main (void) 
+ * Function : NCR5380_main (void)
  *
- * Purpose : NCR5380_main is a coroutine that runs as long as more work can 
- *      be done on the NCR5380 host adapters in a system.  Both 
- *      NCR5380_queue_command() and NCR5380_intr() will try to start it 
+ * Purpose : NCR5380_main is a coroutine that runs as long as more work can
+ *      be done on the NCR5380 host adapters in a system.  Both
+ *      NCR5380_queue_command() and NCR5380_intr() will try to start it
  *      in case it is not running.
- * 
- * NOTE : NCR5380_main exits with interrupts *disabled*, the caller should 
+ *
+ * NOTE : NCR5380_main exits with interrupts *disabled*, the caller should
  *  reenable them.  This prevents reentrancy and kernel stack overflow.
- */     
-    
-static void NCR5380_main (void *bl)
+ */
+
+static void NCR5380_main(struct work_struct *work)
 {
-    Scsi_Cmnd *tmp, *prev;
-    struct Scsi_Host *instance = first_instance;
-    struct NCR5380_hostdata *hostdata = HOSTDATA(instance);
-    int done;
-    unsigned long flags;
-    
-    /*
-     * We run (with interrupts disabled) until we're sure that none of 
-     * the host adapters have anything that can be done, at which point 
-     * we set main_running to 0 and exit.
-     *
-     * Interrupts are enabled before doing various other internal 
-     * instructions, after we've decided that we need to run through
-     * the loop again.
-     *
-     * this should prevent any race conditions.
-     * 
-     * ++roman: Just disabling the NCR interrupt isn't sufficient here,
-     * because also a timer int can trigger an abort or reset, which can
-     * alter queues and touch the Falcon lock.
-     */
-
-    /* Tell int handlers main() is now already executing.  Note that
-       no races are possible here. If an int comes in before
-       'main_running' is set here, and queues/executes main via the
-       task queue, it doesn't do any harm, just this instance of main
-       won't find any work left to do. */
-    if (main_running)
-        return;
-    main_running = 1;
-
-    local_save_flags(flags);
-    do {
-        local_irq_disable(); /* Freeze request queues */
-        done = 1;
-        
-        if (!hostdata->connected) {
-            MAIN_PRINTK( "scsi%d: not connected\n", HOSTNO );
-            /*
-             * Search through the issue_queue for a command destined
-             * for a target that's not busy.
-             */
+        Scsi_Cmnd *tmp, *prev;
+        struct Scsi_Host *instance = first_instance;
+        struct NCR5380_hostdata *hostdata = HOSTDATA(instance);
+        int done;
+        unsigned long flags;
+
+        /*
+         * We run (with interrupts disabled) until we're sure that none of
+         * the host adapters have anything that can be done, at which point
+         * we set main_running to 0 and exit.
+         *
+         * Interrupts are enabled before doing various other internal
+         * instructions, after we've decided that we need to run through
+         * the loop again.
+         *
+         * this should prevent any race conditions.
+         *
+         * ++roman: Just disabling the NCR interrupt isn't sufficient here,
+         * because also a timer int can trigger an abort or reset, which can
+         * alter queues and touch the Falcon lock.
+         */
+
+        /* Tell int handlers main() is now already executing.  Note that
+           no races are possible here. If an int comes in before
+           'main_running' is set here, and queues/executes main via the
+           task queue, it doesn't do any harm, just this instance of main
+           won't find any work left to do. */
+        if (main_running)
+                return;
+        main_running = 1;
+
+        local_save_flags(flags);
+        do {
+                local_irq_disable();    /* Freeze request queues */
+                done = 1;
+
+                if (!hostdata->connected) {
+                        MAIN_PRINTK("scsi%d: not connected\n", HOSTNO);
+                        /*
+                         * Search through the issue_queue for a command destined
+                         * for a target that's not busy.
+                         */
 #if (NDEBUG & NDEBUG_LISTS)
-            for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL;
-                 tmp && (tmp != prev); prev = tmp, tmp = NEXT(tmp))
-                ;
-                /*printk("%p  ", tmp);*/
-            if ((tmp == prev) && tmp) printk(" LOOP\n");/* else printk("\n");*/
+                        for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL;
+                             tmp && (tmp != prev); prev = tmp, tmp = NEXT(tmp))
+                                ;
+                        /*printk("%p  ", tmp);*/
+                        if ((tmp == prev) && tmp)
+                                printk(" LOOP\n");
+                        /* else printk("\n"); */
 #endif
-            for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, 
-                 prev = NULL; tmp; prev = tmp, tmp = NEXT(tmp) ) {
+                        for (tmp = (Scsi_Cmnd *) hostdata->issue_queue,
+                             prev = NULL; tmp; prev = tmp, tmp = NEXT(tmp)) {
 
 #if (NDEBUG & NDEBUG_LISTS)
-                if (prev != tmp)
-                    printk("MAIN tmp=%p   target=%d   busy=%d lun=%d\n",
-                           tmp, tmp->device->id, hostdata->busy[tmp->device->id],
-                           tmp->device->lun);
+                                if (prev != tmp)
+                                        printk("MAIN tmp=%p   target=%d   busy=%d lun=%d\n",
+                                               tmp, tmp->device->id, hostdata->busy[tmp->device->id],
+                                               tmp->device->lun);
 #endif
-                /*  When we find one, remove it from the issue queue. */
-                /* ++guenther: possible race with Falcon locking */
-                if (
+                                /*  When we find one, remove it from the issue queue. */
+                                /* ++guenther: possible race with Falcon locking */
+                                if (
 #ifdef SUPPORT_TAGS
-                    !is_lun_busy( tmp, tmp->cmnd[0] != REQUEST_SENSE)
+                                    !is_lun_busy( tmp, tmp->cmnd[0] != REQUEST_SENSE)
 #else
-                    !(hostdata->busy[tmp->device->id] & (1 << tmp->device->lun))
+                                    !(hostdata->busy[tmp->device->id] & (1 << tmp->device->lun))
 #endif
-                    ) {
-                    /* ++guenther: just to be sure, this must be atomic */
-                    local_irq_disable();
-                    if (prev) {
-                        REMOVE(prev, NEXT(prev), tmp, NEXT(tmp));
-                        NEXT(prev) = NEXT(tmp);
-                    } else {
-                        REMOVE(-1, hostdata->issue_queue, tmp, NEXT(tmp));
-                        hostdata->issue_queue = NEXT(tmp);
-                    }
-                    NEXT(tmp) = NULL;
-                    falcon_dont_release++;
-                    
-                    /* reenable interrupts after finding one */
-                    local_irq_restore(flags);
-                    
-                    /* 
-                     * Attempt to establish an I_T_L nexus here. 
-                     * On success, instance->hostdata->connected is set.
-                     * On failure, we must add the command back to the
-                     *   issue queue so we can keep trying.     
-                     */
-                    MAIN_PRINTK("scsi%d: main(): command for target %d "
-                                "lun %d removed from issue_queue\n",
-                                HOSTNO, tmp->device->id, tmp->device->lun);
-                    /* 
-                     * REQUEST SENSE commands are issued without tagged
-                     * queueing, even on SCSI-II devices because the 
-                     * contingent allegiance condition exists for the 
-                     * entire unit.
-                     */
-                    /* ++roman: ...and the standard also requires that
-                     * REQUEST SENSE command are untagged.
-                     */
-                    
+                                    ) {
+                                        /* ++guenther: just to be sure, this must be atomic */
+                                        local_irq_disable();
+                                        if (prev) {
+                                                REMOVE(prev, NEXT(prev), tmp, NEXT(tmp));
+                                                SET_NEXT(prev, NEXT(tmp));
+                                        } else {
+                                                REMOVE(-1, hostdata->issue_queue, tmp, NEXT(tmp));
+                                                hostdata->issue_queue = NEXT(tmp);
+                                        }
+                                        SET_NEXT(tmp, NULL);
+                                        falcon_dont_release++;
+
+                                        /* reenable interrupts after finding one */
+                                        local_irq_restore(flags);
+
+                                        /*
+                                         * Attempt to establish an I_T_L nexus here.
+                                         * On success, instance->hostdata->connected is set.
+                                         * On failure, we must add the command back to the
+                                         *   issue queue so we can keep trying.
+                                         */
+                                        MAIN_PRINTK("scsi%d: main(): command for target %d "
+                                                    "lun %d removed from issue_queue\n",
+                                                    HOSTNO, tmp->device->id, tmp->device->lun);
+                                        /*
+                                         * REQUEST SENSE commands are issued without tagged
+                                         * queueing, even on SCSI-II devices because the
+                                         * contingent allegiance condition exists for the
+                                         * entire unit.
+                                         */
+                                        /* ++roman: ...and the standard also requires that
+                                         * REQUEST SENSE command are untagged.
+                                         */
+
 #ifdef SUPPORT_TAGS
-                    cmd_get_tag( tmp, tmp->cmnd[0] != REQUEST_SENSE );
+                                        cmd_get_tag(tmp, tmp->cmnd[0] != REQUEST_SENSE);
 #endif
-                    if (!NCR5380_select(instance, tmp, 
-                            (tmp->cmnd[0] == REQUEST_SENSE) ? TAG_NONE : 
-                            TAG_NEXT)) {
-                        falcon_dont_release--;
-                        /* release if target did not response! */
-                        falcon_release_lock_if_possible( hostdata );
-                        break;
-                    } else {
-                        local_irq_disable();
-                        LIST(tmp, hostdata->issue_queue);
-                        NEXT(tmp) = hostdata->issue_queue;
-                        hostdata->issue_queue = tmp;
+                                        if (!NCR5380_select(instance, tmp,
+                                            (tmp->cmnd[0] == REQUEST_SENSE) ? TAG_NONE :
+                                            TAG_NEXT)) {
+                                                falcon_dont_release--;
+                                                /* release if target did not response! */
+                                                falcon_release_lock_if_possible(hostdata);
+                                                break;
+                                        } else {
+                                                local_irq_disable();
+                                                LIST(tmp, hostdata->issue_queue);
+                                                SET_NEXT(tmp, hostdata->issue_queue);
+                                                hostdata->issue_queue = tmp;
 #ifdef SUPPORT_TAGS
-                        cmd_free_tag( tmp );
+                                                cmd_free_tag(tmp);
 #endif
-                        falcon_dont_release--;
-                        local_irq_restore(flags);
-                        MAIN_PRINTK("scsi%d: main(): select() failed, "
-                                    "returned to issue_queue\n", HOSTNO);
-                        if (hostdata->connected)
-                            break;
-                    }
-                } /* if target/lun/target queue is not busy */
-            } /* for issue_queue */
-        } /* if (!hostdata->connected) */
-                
-        if (hostdata->connected 
+                                                falcon_dont_release--;
+                                                local_irq_restore(flags);
+                                                MAIN_PRINTK("scsi%d: main(): select() failed, "
+                                                            "returned to issue_queue\n", HOSTNO);
+                                                if (hostdata->connected)
+                                                        break;
+                                        }
+                                } /* if target/lun/target queue is not busy */
+                        } /* for issue_queue */
+                } /* if (!hostdata->connected) */
+
+                if (hostdata->connected
 #ifdef REAL_DMA
-            && !hostdata->dma_len
+                    && !hostdata->dma_len
 #endif
-            ) {
-            local_irq_restore(flags);
-            MAIN_PRINTK("scsi%d: main: performing information transfer\n",
-                        HOSTNO);
-            NCR5380_information_transfer(instance);
-            MAIN_PRINTK("scsi%d: main: done set false\n", HOSTNO);
-            done = 0;
-        }
-    } while (!done);
+                    ) {
+                        local_irq_restore(flags);
+                        MAIN_PRINTK("scsi%d: main: performing information transfer\n",
+                                    HOSTNO);
+                        NCR5380_information_transfer(instance);
+                        MAIN_PRINTK("scsi%d: main: done set false\n", HOSTNO);
+                        done = 0;
+                }
+        } while (!done);
 
-    /* Better allow ints _after_ 'main_running' has been cleared, else
-       an interrupt could believe we'll pick up the work it left for
-       us, but we won't see it anymore here... */
-    main_running = 0;
-    local_irq_restore(flags);
+        /* Better allow ints _after_ 'main_running' has been cleared, else
+           an interrupt could believe we'll pick up the work it left for
+           us, but we won't see it anymore here... */
+        main_running = 0;
+        local_irq_restore(flags);
 }
 
 
@@ -1183,1441 +1236,1439 @@ static void NCR5380_main (void *bl)
  * Function : void NCR5380_dma_complete (struct Scsi_Host *instance)
  *
  * Purpose : Called by interrupt handler when DMA finishes or a phase
- *      mismatch occurs (which would finish the DMA transfer).  
+ *      mismatch occurs (which would finish the DMA transfer).
  *
  * Inputs : instance - this instance of the NCR5380.
  *
  */
 
-static void NCR5380_dma_complete( struct Scsi_Host *instance )
+static void NCR5380_dma_complete(struct Scsi_Host *instance)
 {
-    SETUP_HOSTDATA(instance);
-    int           transfered, saved_data = 0, overrun = 0, cnt, toPIO;
-    unsigned char **data, p;
-    volatile int  *count;
-
-    if (!hostdata->connected) {
-        printk(KERN_WARNING "scsi%d: received end of DMA interrupt with "
-               "no connected cmd\n", HOSTNO);
-        return;
-    }
-    
-    if (atari_read_overruns) {
-        p = hostdata->connected->SCp.phase;
-        if (p & SR_IO) {
-            udelay(10);
-            if ((((NCR5380_read(BUS_AND_STATUS_REG)) &
-                  (BASR_PHASE_MATCH|BASR_ACK)) ==
-                 (BASR_PHASE_MATCH|BASR_ACK))) {
-                saved_data = NCR5380_read(INPUT_DATA_REG);
-                overrun = 1;
-                DMA_PRINTK("scsi%d: read overrun handled\n", HOSTNO);
-            }
+        SETUP_HOSTDATA(instance);
+        int transfered, saved_data = 0, overrun = 0, cnt, toPIO;
+        unsigned char **data, p;
+        volatile int *count;
+
+        if (!hostdata->connected) {
+                printk(KERN_WARNING "scsi%d: received end of DMA interrupt with "
+                       "no connected cmd\n", HOSTNO);
+                return;
         }
-    }
-
-    DMA_PRINTK("scsi%d: real DMA transfer complete, basr 0x%X, sr 0x%X\n",
-               HOSTNO, NCR5380_read(BUS_AND_STATUS_REG),
-               NCR5380_read(STATUS_REG));
-
-    (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-    NCR5380_write(MODE_REG, MR_BASE);
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-
-    transfered = hostdata->dma_len - NCR5380_dma_residual(instance);
-    hostdata->dma_len = 0;
-
-    data = (unsigned char **) &(hostdata->connected->SCp.ptr);
-    count = &(hostdata->connected->SCp.this_residual);
-    *data += transfered;
-    *count -= transfered;
-
-    if (atari_read_overruns) {
-        if ((NCR5380_read(STATUS_REG) & PHASE_MASK) == p && (p & SR_IO)) {
-            cnt = toPIO = atari_read_overruns;
-            if (overrun) {
-                DMA_PRINTK("Got an input overrun, using saved byte\n");
-                *(*data)++ = saved_data;
-                (*count)--;
-                cnt--;
-                toPIO--;
-            }
-            DMA_PRINTK("Doing %d-byte PIO to 0x%08lx\n", cnt, (long)*data);
-            NCR5380_transfer_pio(instance, &p, &cnt, data);
-            *count -= toPIO - cnt;
+
+        if (atari_read_overruns) {
+                p = hostdata->connected->SCp.phase;
+                if (p & SR_IO) {
+                        udelay(10);
+                        if ((NCR5380_read(BUS_AND_STATUS_REG) &
+                             (BASR_PHASE_MATCH|BASR_ACK)) ==
+                            (BASR_PHASE_MATCH|BASR_ACK)) {
+                                saved_data = NCR5380_read(INPUT_DATA_REG);
+                                overrun = 1;
+                                DMA_PRINTK("scsi%d: read overrun handled\n", HOSTNO);
+                        }
+                }
+        }
+
+        DMA_PRINTK("scsi%d: real DMA transfer complete, basr 0x%X, sr 0x%X\n",
+                   HOSTNO, NCR5380_read(BUS_AND_STATUS_REG),
+                   NCR5380_read(STATUS_REG));
+
+        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+        NCR5380_write(MODE_REG, MR_BASE);
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+
+        transfered = hostdata->dma_len - NCR5380_dma_residual(instance);
+        hostdata->dma_len = 0;
+
+        data = (unsigned char **)&hostdata->connected->SCp.ptr;
+        count = &hostdata->connected->SCp.this_residual;
+        *data += transfered;
+        *count -= transfered;
+
+        if (atari_read_overruns) {
+                if ((NCR5380_read(STATUS_REG) & PHASE_MASK) == p && (p & SR_IO)) {
+                        cnt = toPIO = atari_read_overruns;
+                        if (overrun) {
+                                DMA_PRINTK("Got an input overrun, using saved byte\n");
+                                *(*data)++ = saved_data;
+                                (*count)--;
+                                cnt--;
+                                toPIO--;
+                        }
+                        DMA_PRINTK("Doing %d-byte PIO to 0x%08lx\n", cnt, (long)*data);
+                        NCR5380_transfer_pio(instance, &p, &cnt, data);
+                        *count -= toPIO - cnt;
+                }
         }
-    }
 }
 #endif /* REAL_DMA */
 
 
 /*
  * Function : void NCR5380_intr (int irq)
- * 
+ *
  * Purpose : handle interrupts, reestablishing I_T_L or I_T_L_Q nexuses
- *      from the disconnected queue, and restarting NCR5380_main() 
+ *      from the disconnected queue, and restarting NCR5380_main()
  *      as required.
  *
  * Inputs : int irq, irq that caused this interrupt.
  *
  */
 
-static irqreturn_t NCR5380_intr (int irq, void *dev_id)
+static irqreturn_t NCR5380_intr(int irq, void *dev_id)
 {
-    struct Scsi_Host *instance = first_instance;
-    int done = 1, handled = 0;
-    unsigned char basr;
-
-    INT_PRINTK("scsi%d: NCR5380 irq triggered\n", HOSTNO);
-
-    /* Look for pending interrupts */
-    basr = NCR5380_read(BUS_AND_STATUS_REG);
-    INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr);
-    /* dispatch to appropriate routine if found and done=0 */
-    if (basr & BASR_IRQ) {
-        NCR_PRINT(NDEBUG_INTR);
-        if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
-            done = 0;
-            ENABLE_IRQ();
-            INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);
-            NCR5380_reselect(instance);
-            (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-        }
-        else if (basr & BASR_PARITY_ERROR) {
-            INT_PRINTK("scsi%d: PARITY interrupt\n", HOSTNO);
-            (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-        }
-        else if ((NCR5380_read(STATUS_REG) & SR_RST) == SR_RST) {
-            INT_PRINTK("scsi%d: RESET interrupt\n", HOSTNO);
-            (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-        }
-        else {
-            /*  
-             * The rest of the interrupt conditions can occur only during a
-             * DMA transfer
-             */
+        struct Scsi_Host *instance = first_instance;
+        int done = 1, handled = 0;
+        unsigned char basr;
+
+        INT_PRINTK("scsi%d: NCR5380 irq triggered\n", HOSTNO);
+
+        /* Look for pending interrupts */
+        basr = NCR5380_read(BUS_AND_STATUS_REG);
+        INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr);
+        /* dispatch to appropriate routine if found and done=0 */
+        if (basr & BASR_IRQ) {
+                NCR_PRINT(NDEBUG_INTR);
+                if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
+                        done = 0;
+                        ENABLE_IRQ();
+                        INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);
+                        NCR5380_reselect(instance);
+                        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+                } else if (basr & BASR_PARITY_ERROR) {
+                        INT_PRINTK("scsi%d: PARITY interrupt\n", HOSTNO);
+                        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+                } else if ((NCR5380_read(STATUS_REG) & SR_RST) == SR_RST) {
+                        INT_PRINTK("scsi%d: RESET interrupt\n", HOSTNO);
+                        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+                } else {
+                        /*
+                         * The rest of the interrupt conditions can occur only during a
+                         * DMA transfer
+                         */
 
 #if defined(REAL_DMA)
-            /*
-             * We should only get PHASE MISMATCH and EOP interrupts if we have
-             * DMA enabled, so do a sanity check based on the current setting
-             * of the MODE register.
-             */
-
-            if ((NCR5380_read(MODE_REG) & MR_DMA_MODE) &&
-                ((basr & BASR_END_DMA_TRANSFER) || 
-                 !(basr & BASR_PHASE_MATCH))) {
-                    
-                INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);
-                NCR5380_dma_complete( instance );
-                done = 0;
-                ENABLE_IRQ();
-            } else
+                        /*
+                         * We should only get PHASE MISMATCH and EOP interrupts if we have
+                         * DMA enabled, so do a sanity check based on the current setting
+                         * of the MODE register.
+                         */
+
+                        if ((NCR5380_read(MODE_REG) & MR_DMA_MODE) &&
+                            ((basr & BASR_END_DMA_TRANSFER) ||
+                             !(basr & BASR_PHASE_MATCH))) {
+
+                                INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);
+                                NCR5380_dma_complete( instance );
+                                done = 0;
+                                ENABLE_IRQ();
+                        } else
 #endif /* REAL_DMA */
-            {
+                        {
 /* MS: Ignore unknown phase mismatch interrupts (caused by EOP interrupt) */
-                if (basr & BASR_PHASE_MATCH)
-                    printk(KERN_NOTICE "scsi%d: unknown interrupt, "
-                           "BASR 0x%x, MR 0x%x, SR 0x%x\n",
-                           HOSTNO, basr, NCR5380_read(MODE_REG),
-                           NCR5380_read(STATUS_REG));
-                (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-            }
-        } /* if !(SELECTION || PARITY) */
-        handled = 1;
-    } /* BASR & IRQ */
-    else {
-        printk(KERN_NOTICE "scsi%d: interrupt without IRQ bit set in BASR, "
-               "BASR 0x%X, MR 0x%X, SR 0x%x\n", HOSTNO, basr,
-               NCR5380_read(MODE_REG), NCR5380_read(STATUS_REG));
-        (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
-    }
-    
-    if (!done) {
-        INT_PRINTK("scsi%d: in int routine, calling main\n", HOSTNO);
-        /* Put a call to NCR5380_main() on the queue... */
-        queue_main();
-    }
-    return IRQ_RETVAL(handled);
+                                if (basr & BASR_PHASE_MATCH)
+                                        printk(KERN_NOTICE "scsi%d: unknown interrupt, "
+                                               "BASR 0x%x, MR 0x%x, SR 0x%x\n",
+                                               HOSTNO, basr, NCR5380_read(MODE_REG),
+                                               NCR5380_read(STATUS_REG));
+                                (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+                        }
+                } /* if !(SELECTION || PARITY) */
+                handled = 1;
+        } /* BASR & IRQ */ else {
+                printk(KERN_NOTICE "scsi%d: interrupt without IRQ bit set in BASR, "
+                       "BASR 0x%X, MR 0x%X, SR 0x%x\n", HOSTNO, basr,
+                       NCR5380_read(MODE_REG), NCR5380_read(STATUS_REG));
+                (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+        }
+
+        if (!done) {
+                INT_PRINTK("scsi%d: in int routine, calling main\n", HOSTNO);
+                /* Put a call to NCR5380_main() on the queue... */
+                queue_main();
+        }
+        return IRQ_RETVAL(handled);
 }
 
 #ifdef NCR5380_STATS
-static void collect_stats(struct NCR5380_hostdata* hostdata, Scsi_Cmnd* cmd)
+static void collect_stats(struct NCR5380_hostdata* hostdata, Scsi_Cmnd *cmd)
 {
 # ifdef NCR5380_STAT_LIMIT
-    if (cmd->request_bufflen > NCR5380_STAT_LIMIT)
+        if (cmd->request_bufflen > NCR5380_STAT_LIMIT)
 # endif
-        switch (cmd->cmnd[0])
-        {
-            case WRITE:
-            case WRITE_6:
-            case WRITE_10:
-                hostdata->time_write[cmd->device->id] += (jiffies - hostdata->timebase);
-                /*hostdata->bytes_write[cmd->device->id] += cmd->request_bufflen;*/
-                hostdata->pendingw--;
-                break;
-            case READ:
-            case READ_6:
-            case READ_10:
-                hostdata->time_read[cmd->device->id] += (jiffies - hostdata->timebase);
-                /*hostdata->bytes_read[cmd->device->id] += cmd->request_bufflen;*/
-                hostdata->pendingr--;
-                break;
-        }
+                switch (cmd->cmnd[0]) {
+                case WRITE:
+                case WRITE_6:
+                case WRITE_10:
+                        hostdata->time_write[cmd->device->id] += (jiffies - hostdata->timebase);
+                        /*hostdata->bytes_write[cmd->device->id] += cmd->request_bufflen;*/
+                        hostdata->pendingw--;
+                        break;
+                case READ:
+                case READ_6:
+                case READ_10:
+                        hostdata->time_read[cmd->device->id] += (jiffies - hostdata->timebase);
+                        /*hostdata->bytes_read[cmd->device->id] += cmd->request_bufflen;*/
+                        hostdata->pendingr--;
+                        break;
+                }
 }
 #endif
 
-/* 
- * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd, 
+/*
+ * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd,
  *      int tag);
  *
  * Purpose : establishes I_T_L or I_T_L_Q nexus for new or existing command,
- *      including ARBITRATION, SELECTION, and initial message out for 
- *      IDENTIFY and queue messages. 
+ *      including ARBITRATION, SELECTION, and initial message out for
+ *      IDENTIFY and queue messages.
  *
- * Inputs : instance - instantiation of the 5380 driver on which this 
- *      target lives, cmd - SCSI command to execute, tag - set to TAG_NEXT for 
- *      new tag, TAG_NONE for untagged queueing, otherwise set to the tag for 
+ * Inputs : instance - instantiation of the 5380 driver on which this
+ *      target lives, cmd - SCSI command to execute, tag - set to TAG_NEXT for
+ *      new tag, TAG_NONE for untagged queueing, otherwise set to the tag for
  *      the command that is presently connected.
- * 
+ *
  * Returns : -1 if selection could not execute for some reason,
- *      0 if selection succeeded or failed because the target 
- *      did not respond.
+ *      0 if selection succeeded or failed because the target
+ *      did not respond.
  *
- * Side effects : 
- *      If bus busy, arbitration failed, etc, NCR5380_select() will exit 
+ * Side effects :
+ *      If bus busy, arbitration failed, etc, NCR5380_select() will exit
  *              with registers as they should have been on entry - ie
  *              SELECT_ENABLE will be set appropriately, the NCR5380
  *              will cease to drive any SCSI bus signals.
  *
- *      If successful : I_T_L or I_T_L_Q nexus will be established, 
- *              instance->connected will be set to cmd.  
- *              SELECT interrupt will be disabled.
+ *      If successful : I_T_L or I_T_L_Q nexus will be established,
+ *              instance->connected will be set to cmd.
+ *              SELECT interrupt will be disabled.
  *
- *      If failed (no target) : cmd->scsi_done() will be called, and the 
+ *      If failed (no target) : cmd->scsi_done() will be called, and the
  *              cmd->result host byte set to DID_BAD_TARGET.
  */
 
-static int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
+static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
 {
-    SETUP_HOSTDATA(instance);
-    unsigned char tmp[3], phase;
-    unsigned char *data;
-    int len;
-    unsigned long timeout;
-    unsigned long flags;
-
-    hostdata->restart_select = 0;
-    NCR_PRINT(NDEBUG_ARBITRATION);
-    ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO,
-               instance->this_id);
-
-    /* 
-     * Set the phase bits to 0, otherwise the NCR5380 won't drive the 
-     * data bus during SELECTION.
-     */
-
-    local_irq_save(flags);
-    if (hostdata->connected) {
+        SETUP_HOSTDATA(instance);
+        unsigned char tmp[3], phase;
+        unsigned char *data;
+        int len;
+        unsigned long timeout;
+        unsigned long flags;
+
+        hostdata->restart_select = 0;
+        NCR_PRINT(NDEBUG_ARBITRATION);
+        ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO,
+                   instance->this_id);
+
+        /*
+         * Set the phase bits to 0, otherwise the NCR5380 won't drive the
+         * data bus during SELECTION.
+         */
+
+        local_irq_save(flags);
+        if (hostdata->connected) {
+                local_irq_restore(flags);
+                return -1;
+        }
+        NCR5380_write(TARGET_COMMAND_REG, 0);
+
+        /*
+         * Start arbitration.
+         */
+
+        NCR5380_write(OUTPUT_DATA_REG, hostdata->id_mask);
+        NCR5380_write(MODE_REG, MR_ARBITRATE);
+
         local_irq_restore(flags);
-        return -1;
-    }
-    NCR5380_write(TARGET_COMMAND_REG, 0);
-
-
-    /* 
-     * Start arbitration.
-     */
-    
-    NCR5380_write(OUTPUT_DATA_REG, hostdata->id_mask);
-    NCR5380_write(MODE_REG, MR_ARBITRATE);
-
-    local_irq_restore(flags);
-
-    /* Wait for arbitration logic to complete */
-#if NCR_TIMEOUT
-    {
-      unsigned long timeout = jiffies + 2*NCR_TIMEOUT;
-
-      while (!(NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_PROGRESS)
-           && time_before(jiffies, timeout) && !hostdata->connected)
-        ;
-      if (time_after_eq(jiffies, timeout))
-      {
-        printk("scsi : arbitration timeout at %d\n", __LINE__);
-        NCR5380_write(MODE_REG, MR_BASE);
-        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-        return -1;
-      }
-    }
+
+        /* Wait for arbitration logic to complete */
+#if defined(NCR_TIMEOUT)
+        {
+                unsigned long timeout = jiffies + 2*NCR_TIMEOUT;
+
+                while (!(NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_PROGRESS) &&
+                       time_before(jiffies, timeout) && !hostdata->connected)
+                        ;
+                if (time_after_eq(jiffies, timeout)) {
+                        printk("scsi : arbitration timeout at %d\n", __LINE__);
+                        NCR5380_write(MODE_REG, MR_BASE);
+                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                        return -1;
+                }
+        }
 #else /* NCR_TIMEOUT */
-    while (!(NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_PROGRESS)
-         && !hostdata->connected);
+        while (!(NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_PROGRESS) &&
+               !hostdata->connected)
+                ;
 #endif
 
-    ARB_PRINTK("scsi%d: arbitration complete\n", HOSTNO);
-
-    if (hostdata->connected) {
-        NCR5380_write(MODE_REG, MR_BASE); 
-        return -1;
-    }
-    /* 
-     * The arbitration delay is 2.2us, but this is a minimum and there is 
-     * no maximum so we can safely sleep for ceil(2.2) usecs to accommodate
-     * the integral nature of udelay().
-     *
-     */
-
-    udelay(3);
-
-    /* Check for lost arbitration */
-    if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
-        (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) ||
-        (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
-        hostdata->connected) {
-        NCR5380_write(MODE_REG, MR_BASE); 
-        ARB_PRINTK("scsi%d: lost arbitration, deasserting MR_ARBITRATE\n",
-                   HOSTNO);
-        return -1;
-    }
-
-     /* after/during arbitration, BSY should be asserted.
-        IBM DPES-31080 Version S31Q works now */
-     /* Tnx to Thomas_Roesch@m2.maus.de for finding this! (Roman) */
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_SEL |
-                                         ICR_ASSERT_BSY ) ;
-    
-    if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
-        hostdata->connected) {
-        NCR5380_write(MODE_REG, MR_BASE);
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-        ARB_PRINTK("scsi%d: lost arbitration, deasserting ICR_ASSERT_SEL\n",
-                   HOSTNO);
-        return -1;
-    }
+        ARB_PRINTK("scsi%d: arbitration complete\n", HOSTNO);
 
-    /* 
-     * Again, bus clear + bus settle time is 1.2us, however, this is 
-     * a minimum so we'll udelay ceil(1.2)
-     */
+        if (hostdata->connected) {
+                NCR5380_write(MODE_REG, MR_BASE);
+                return -1;
+        }
+        /*
+         * The arbitration delay is 2.2us, but this is a minimum and there is
+         * no maximum so we can safely sleep for ceil(2.2) usecs to accommodate
+         * the integral nature of udelay().
+         *
+         */
+
+        udelay(3);
+
+        /* Check for lost arbitration */
+        if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
+            (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) ||
+            (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
+            hostdata->connected) {
+                NCR5380_write(MODE_REG, MR_BASE);
+                ARB_PRINTK("scsi%d: lost arbitration, deasserting MR_ARBITRATE\n",
+                           HOSTNO);
+                return -1;
+        }
+
+        /* after/during arbitration, BSY should be asserted.
+           IBM DPES-31080 Version S31Q works now */
+        /* Tnx to Thomas_Roesch@m2.maus.de for finding this! (Roman) */
+        NCR5380_write(INITIATOR_COMMAND_REG,
+                      ICR_BASE | ICR_ASSERT_SEL | ICR_ASSERT_BSY);
+
+        if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) ||
+            hostdata->connected) {
+                NCR5380_write(MODE_REG, MR_BASE);
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                ARB_PRINTK("scsi%d: lost arbitration, deasserting ICR_ASSERT_SEL\n",
+                           HOSTNO);
+                return -1;
+        }
+
+        /*
+         * Again, bus clear + bus settle time is 1.2us, however, this is
+         * a minimum so we'll udelay ceil(1.2)
+         */
 
 #ifdef CONFIG_ATARI_SCSI_TOSHIBA_DELAY
-    /* ++roman: But some targets (see above :-) seem to need a bit more... */
-    udelay(15);
+        /* ++roman: But some targets (see above :-) seem to need a bit more... */
+        udelay(15);
 #else
-    udelay(2);
+        udelay(2);
 #endif
-    
-    if (hostdata->connected) {
+
+        if (hostdata->connected) {
+                NCR5380_write(MODE_REG, MR_BASE);
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                return -1;
+        }
+
+        ARB_PRINTK("scsi%d: won arbitration\n", HOSTNO);
+
+        /*
+         * Now that we have won arbitration, start Selection process, asserting
+         * the host and target ID's on the SCSI bus.
+         */
+
+        NCR5380_write(OUTPUT_DATA_REG, (hostdata->id_mask | (1 << cmd->device->id)));
+
+        /*
+         * Raise ATN while SEL is true before BSY goes false from arbitration,
+         * since this is the only way to guarantee that we'll get a MESSAGE OUT
+         * phase immediately after selection.
+         */
+
+        NCR5380_write(INITIATOR_COMMAND_REG, (ICR_BASE | ICR_ASSERT_BSY |
+                      ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_SEL ));
         NCR5380_write(MODE_REG, MR_BASE);
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-        return -1;
-    }
 
-    ARB_PRINTK("scsi%d: won arbitration\n", HOSTNO);
+        /*
+         * Reselect interrupts must be turned off prior to the dropping of BSY,
+         * otherwise we will trigger an interrupt.
+         */
+
+        if (hostdata->connected) {
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                return -1;
+        }
 
-    /* 
-     * Now that we have won arbitration, start Selection process, asserting 
-     * the host and target ID's on the SCSI bus.
-     */
+        NCR5380_write(SELECT_ENABLE_REG, 0);
+
+        /*
+         * The initiator shall then wait at least two deskew delays and release
+         * the BSY signal.
+         */
+        udelay(1);        /* wingel -- wait two bus deskew delay >2*45ns */
+
+        /* Reset BSY */
+        NCR5380_write(INITIATOR_COMMAND_REG, (ICR_BASE | ICR_ASSERT_DATA |
+                      ICR_ASSERT_ATN | ICR_ASSERT_SEL));
+
+        /*
+         * Something weird happens when we cease to drive BSY - looks
+         * like the board/chip is letting us do another read before the
+         * appropriate propagation delay has expired, and we're confusing
+         * a BSY signal from ourselves as the target's response to SELECTION.
+         *
+         * A small delay (the 'C++' frontend breaks the pipeline with an
+         * unnecessary jump, making it work on my 386-33/Trantor T128, the
+         * tighter 'C' code breaks and requires this) solves the problem -
+         * the 1 us delay is arbitrary, and only used because this delay will
+         * be the same on other platforms and since it works here, it should
+         * work there.
+         *
+         * wingel suggests that this could be due to failing to wait
+         * one deskew delay.
+         */
 
-    NCR5380_write(OUTPUT_DATA_REG, (hostdata->id_mask | (1 << cmd->device->id)));
+        udelay(1);
 
-    /* 
-     * Raise ATN while SEL is true before BSY goes false from arbitration,
-     * since this is the only way to guarantee that we'll get a MESSAGE OUT
-     * phase immediately after selection.
-     */
+        SEL_PRINTK("scsi%d: selecting target %d\n", HOSTNO, cmd->device->id);
 
-    NCR5380_write(INITIATOR_COMMAND_REG, (ICR_BASE | ICR_ASSERT_BSY | 
-        ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_SEL ));
-    NCR5380_write(MODE_REG, MR_BASE);
+        /*
+         * The SCSI specification calls for a 250 ms timeout for the actual
+         * selection.
+         */
 
-    /* 
-     * Reselect interrupts must be turned off prior to the dropping of BSY,
-     * otherwise we will trigger an interrupt.
-     */
+        timeout = jiffies + 25;
 
-    if (hostdata->connected) {
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-        return -1;
-    }
-
-    NCR5380_write(SELECT_ENABLE_REG, 0);
-
-    /*
-     * The initiator shall then wait at least two deskew delays and release 
-     * the BSY signal.
-     */
-    udelay(1);        /* wingel -- wait two bus deskew delay >2*45ns */
-
-    /* Reset BSY */
-    NCR5380_write(INITIATOR_COMMAND_REG, (ICR_BASE | ICR_ASSERT_DATA | 
-        ICR_ASSERT_ATN | ICR_ASSERT_SEL));
-
-    /* 
-     * Something weird happens when we cease to drive BSY - looks
-     * like the board/chip is letting us do another read before the 
-     * appropriate propagation delay has expired, and we're confusing
-     * a BSY signal from ourselves as the target's response to SELECTION.
-     *
-     * A small delay (the 'C++' frontend breaks the pipeline with an
-     * unnecessary jump, making it work on my 386-33/Trantor T128, the
-     * tighter 'C' code breaks and requires this) solves the problem - 
-     * the 1 us delay is arbitrary, and only used because this delay will 
-     * be the same on other platforms and since it works here, it should 
-     * work there.
-     *
-     * wingel suggests that this could be due to failing to wait
-     * one deskew delay.
-     */
-
-    udelay(1);
-
-    SEL_PRINTK("scsi%d: selecting target %d\n", HOSTNO, cmd->device->id);
-
-    /* 
-     * The SCSI specification calls for a 250 ms timeout for the actual 
-     * selection.
-     */
-
-    timeout = jiffies + 25; 
-
-    /* 
-     * XXX very interesting - we're seeing a bounce where the BSY we 
-     * asserted is being reflected / still asserted (propagation delay?)
-     * and it's detecting as true.  Sigh.
-     */
+        /*
+         * XXX very interesting - we're seeing a bounce where the BSY we
+         * asserted is being reflected / still asserted (propagation delay?)
+         * and it's detecting as true.  Sigh.
+         */
 
 #if 0
-    /* ++roman: If a target conformed to the SCSI standard, it wouldn't assert
-     * IO while SEL is true. But again, there are some disks out the in the
-     * world that do that nevertheless. (Somebody claimed that this announces
-     * reselection capability of the target.) So we better skip that test and
-     * only wait for BSY... (Famous german words: Der Klügere gibt nach :-)
-     */
-
-    while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & 
-        (SR_BSY | SR_IO)));
-
-    if ((NCR5380_read(STATUS_REG) & (SR_SEL | SR_IO)) == 
-            (SR_SEL | SR_IO)) {
-            NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-            NCR5380_reselect(instance);
-            printk (KERN_ERR "scsi%d: reselection after won arbitration?\n",
-                    HOSTNO);
-            NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-            return -1;
-    }
+        /* ++roman: If a target conformed to the SCSI standard, it wouldn't assert
+         * IO while SEL is true. But again, there are some disks out the in the
+         * world that do that nevertheless. (Somebody claimed that this announces
+         * reselection capability of the target.) So we better skip that test and
+         * only wait for BSY... (Famous german words: Der Klügere gibt nach :-)
+         */
+
+        while (time_before(jiffies, timeout) &&
+               !(NCR5380_read(STATUS_REG) & (SR_BSY | SR_IO)))
+                ;
+
+        if ((NCR5380_read(STATUS_REG) & (SR_SEL | SR_IO)) == (SR_SEL | SR_IO)) {
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                NCR5380_reselect(instance);
+                printk(KERN_ERR "scsi%d: reselection after won arbitration?\n",
+                       HOSTNO);
+                NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                return -1;
+        }
 #else
-    while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & SR_BSY));
+        while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & SR_BSY))
+                ;
 #endif
 
-    /* 
-     * No less than two deskew delays after the initiator detects the 
-     * BSY signal is true, it shall release the SEL signal and may 
-     * change the DATA BUS.                                     -wingel
-     */
+        /*
+         * No less than two deskew delays after the initiator detects the
+         * BSY signal is true, it shall release the SEL signal and may
+         * change the DATA BUS.                                     -wingel
+         */
 
-    udelay(1);
+        udelay(1);
 
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
 
-    if (!(NCR5380_read(STATUS_REG) & SR_BSY)) {
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-        if (hostdata->targets_present & (1 << cmd->device->id)) {
-            printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO);
-            if (hostdata->restart_select)
-                printk(KERN_NOTICE "\trestart select\n");
-            NCR_PRINT(NDEBUG_ANY);
-            NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-            return -1;
-        }
-        cmd->result = DID_BAD_TARGET << 16;
+        if (!(NCR5380_read(STATUS_REG) & SR_BSY)) {
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                if (hostdata->targets_present & (1 << cmd->device->id)) {
+                        printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO);
+                        if (hostdata->restart_select)
+                                printk(KERN_NOTICE "\trestart select\n");
+                        NCR_PRINT(NDEBUG_ANY);
+                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                        return -1;
+                }
+                cmd->result = DID_BAD_TARGET << 16;
 #ifdef NCR5380_STATS
-        collect_stats(hostdata, cmd);
+                collect_stats(hostdata, cmd);
 #endif
 #ifdef SUPPORT_TAGS
-        cmd_free_tag( cmd );
+                cmd_free_tag(cmd);
 #endif
-        cmd->scsi_done(cmd);
-        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-        SEL_PRINTK("scsi%d: target did not respond within 250ms\n", HOSTNO);
-        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-        return 0;
-    } 
-
-    hostdata->targets_present |= (1 << cmd->device->id);
-
-    /*
-     * Since we followed the SCSI spec, and raised ATN while SEL 
-     * was true but before BSY was false during selection, the information
-     * transfer phase should be a MESSAGE OUT phase so that we can send the
-     * IDENTIFY message.
-     * 
-     * If SCSI-II tagged queuing is enabled, we also send a SIMPLE_QUEUE_TAG
-     * message (2 bytes) with a tag ID that we increment with every command
-     * until it wraps back to 0.
-     *
-     * XXX - it turns out that there are some broken SCSI-II devices,
-     *       which claim to support tagged queuing but fail when more than
-     *       some number of commands are issued at once.
-     */
-
-    /* Wait for start of REQ/ACK handshake */
-    while (!(NCR5380_read(STATUS_REG) & SR_REQ));
-
-    SEL_PRINTK("scsi%d: target %d selected, going into MESSAGE OUT phase.\n",
-               HOSTNO, cmd->device->id);
-    tmp[0] = IDENTIFY(1, cmd->device->lun);
+                cmd->scsi_done(cmd);
+                NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                SEL_PRINTK("scsi%d: target did not respond within 250ms\n", HOSTNO);
+                NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                return 0;
+        }
+
+        hostdata->targets_present |= (1 << cmd->device->id);
+
+        /*
+         * Since we followed the SCSI spec, and raised ATN while SEL
+         * was true but before BSY was false during selection, the information
+         * transfer phase should be a MESSAGE OUT phase so that we can send the
+         * IDENTIFY message.
+         *
+         * If SCSI-II tagged queuing is enabled, we also send a SIMPLE_QUEUE_TAG
+         * message (2 bytes) with a tag ID that we increment with every command
+         * until it wraps back to 0.
+         *
+         * XXX - it turns out that there are some broken SCSI-II devices,
+         *           which claim to support tagged queuing but fail when more than
+         *           some number of commands are issued at once.
+         */
+
+        /* Wait for start of REQ/ACK handshake */
+        while (!(NCR5380_read(STATUS_REG) & SR_REQ))
+                ;
+
+        SEL_PRINTK("scsi%d: target %d selected, going into MESSAGE OUT phase.\n",
+                   HOSTNO, cmd->device->id);
+        tmp[0] = IDENTIFY(1, cmd->device->lun);
 
 #ifdef SUPPORT_TAGS
-    if (cmd->tag != TAG_NONE) {
-        tmp[1] = hostdata->last_message = SIMPLE_QUEUE_TAG;
-        tmp[2] = cmd->tag;
-        len = 3;
-    } else 
-        len = 1;
+        if (cmd->tag != TAG_NONE) {
+                tmp[1] = hostdata->last_message = SIMPLE_QUEUE_TAG;
+                tmp[2] = cmd->tag;
+                len = 3;
+        } else
+                len = 1;
 #else
-    len = 1;
-    cmd->tag=0;
+        len = 1;
+        cmd->tag = 0;
 #endif /* SUPPORT_TAGS */
 
-    /* Send message(s) */
-    data = tmp;
-    phase = PHASE_MSGOUT;
-    NCR5380_transfer_pio(instance, &phase, &len, &data);
-    SEL_PRINTK("scsi%d: nexus established.\n", HOSTNO);
-    /* XXX need to handle errors here */
-    hostdata->connected = cmd;
+        /* Send message(s) */
+        data = tmp;
+        phase = PHASE_MSGOUT;
+        NCR5380_transfer_pio(instance, &phase, &len, &data);
+        SEL_PRINTK("scsi%d: nexus established.\n", HOSTNO);
+        /* XXX need to handle errors here */
+        hostdata->connected = cmd;
 #ifndef SUPPORT_TAGS
-    hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
-#endif    
-
-    initialize_SCp(cmd);
+        hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
+#endif
 
+        initialize_SCp(cmd);
 
-    return 0;
+        return 0;
 }
 
-/* 
- * Function : int NCR5380_transfer_pio (struct Scsi_Host *instance, 
+/*
+ * Function : int NCR5380_transfer_pio (struct Scsi_Host *instance,
  *      unsigned char *phase, int *count, unsigned char **data)
  *
  * Purpose : transfers data in given phase using polled I/O
  *
- * Inputs : instance - instance of driver, *phase - pointer to 
- *      what phase is expected, *count - pointer to number of 
+ * Inputs : instance - instance of driver, *phase - pointer to
+ *      what phase is expected, *count - pointer to number of
  *      bytes to transfer, **data - pointer to data pointer.
- * 
+ *
  * Returns : -1 when different phase is entered without transferring
  *      maximum number of bytes, 0 if all bytes are transfered or exit
  *      is in same phase.
  *
- *      Also, *phase, *count, *data are modified in place.
+ *      Also, *phase, *count, *data are modified in place.
  *
  * XXX Note : handling for bus free may be useful.
  */
 
 /*
- * Note : this code is not as quick as it could be, however it 
+ * Note : this code is not as quick as it could be, however it
  * IS 100% reliable, and for the actual data transfer where speed
  * counts, we will always do a pseudo DMA or DMA transfer.
  */
 
-static int NCR5380_transfer_pio( struct Scsi_Host *instance, 
-                                 unsigned char *phase, int *count,
-                                 unsigned char **data)
+static int NCR5380_transfer_pio(struct Scsi_Host *instance,
+                                unsigned char *phase, int *count,
+                                unsigned char **data)
 {
-    register unsigned char p = *phase, tmp;
-    register int c = *count;
-    register unsigned char *d = *data;
-
-    /* 
-     * The NCR5380 chip will only drive the SCSI bus when the 
-     * phase specified in the appropriate bits of the TARGET COMMAND
-     * REGISTER match the STATUS REGISTER
-     */
-
-    NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
-
-    do {
-        /* 
-         * Wait for assertion of REQ, after which the phase bits will be 
-         * valid 
+        register unsigned char p = *phase, tmp;
+        register int c = *count;
+        register unsigned char *d = *data;
+
+        /*
+         * The NCR5380 chip will only drive the SCSI bus when the
+         * phase specified in the appropriate bits of the TARGET COMMAND
+         * REGISTER match the STATUS REGISTER
          */
-        while (!((tmp = NCR5380_read(STATUS_REG)) & SR_REQ));
 
-        HSH_PRINTK("scsi%d: REQ detected\n", HOSTNO);
+        NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
 
-        /* Check for phase mismatch */  
-        if ((tmp & PHASE_MASK) != p) {
-            PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO);
-            NCR_PRINT_PHASE(NDEBUG_PIO);
-            break;
-        }
+        do {
+                /*
+                 * Wait for assertion of REQ, after which the phase bits will be
+                 * valid
+                 */
+                while (!((tmp = NCR5380_read(STATUS_REG)) & SR_REQ))
+                        ;
 
-        /* Do actual transfer from SCSI bus to / from memory */
-        if (!(p & SR_IO)) 
-            NCR5380_write(OUTPUT_DATA_REG, *d);
-        else 
-            *d = NCR5380_read(CURRENT_SCSI_DATA_REG);
+                HSH_PRINTK("scsi%d: REQ detected\n", HOSTNO);
 
-        ++d;
+                /* Check for phase mismatch */
+                if ((tmp & PHASE_MASK) != p) {
+                        PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO);
+                        NCR_PRINT_PHASE(NDEBUG_PIO);
+                        break;
+                }
 
-        /* 
-         * The SCSI standard suggests that in MSGOUT phase, the initiator
-         * should drop ATN on the last byte of the message phase
-         * after REQ has been asserted for the handshake but before
-         * the initiator raises ACK.
-         */
+                /* Do actual transfer from SCSI bus to / from memory */
+                if (!(p & SR_IO))
+                        NCR5380_write(OUTPUT_DATA_REG, *d);
+                else
+                        *d = NCR5380_read(CURRENT_SCSI_DATA_REG);
 
-        if (!(p & SR_IO)) {
-            if (!((p & SR_MSG) && c > 1)) {
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                    ICR_ASSERT_DATA);
-                NCR_PRINT(NDEBUG_PIO);
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                        ICR_ASSERT_DATA | ICR_ASSERT_ACK);
-            } else {
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
-                    ICR_ASSERT_DATA | ICR_ASSERT_ATN);
-                NCR_PRINT(NDEBUG_PIO);
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                    ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK);
-            }
-        } else {
-            NCR_PRINT(NDEBUG_PIO);
-            NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK);
-        }
+                ++d;
 
-        while (NCR5380_read(STATUS_REG) & SR_REQ);
+                /*
+                 * The SCSI standard suggests that in MSGOUT phase, the initiator
+                 * should drop ATN on the last byte of the message phase
+                 * after REQ has been asserted for the handshake but before
+                 * the initiator raises ACK.
+                 */
 
-        HSH_PRINTK("scsi%d: req false, handshake complete\n", HOSTNO);
+                if (!(p & SR_IO)) {
+                        if (!((p & SR_MSG) && c > 1)) {
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA);
+                                NCR_PRINT(NDEBUG_PIO);
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
+                                              ICR_ASSERT_DATA | ICR_ASSERT_ACK);
+                        } else {
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
+                                              ICR_ASSERT_DATA | ICR_ASSERT_ATN);
+                                NCR_PRINT(NDEBUG_PIO);
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
+                                              ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK);
+                        }
+                } else {
+                        NCR_PRINT(NDEBUG_PIO);
+                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK);
+                }
 
-/*
- * We have several special cases to consider during REQ/ACK handshaking : 
- * 1.  We were in MSGOUT phase, and we are on the last byte of the 
- *      message.  ATN must be dropped as ACK is dropped.
- *
- * 2.  We are in a MSGIN phase, and we are on the last byte of the  
- *      message.  We must exit with ACK asserted, so that the calling
- *      code may raise ATN before dropping ACK to reject the message.
- *
- * 3.  ACK and ATN are clear and the target may proceed as normal.
- */
-        if (!(p == PHASE_MSGIN && c == 1)) {  
-            if (p == PHASE_MSGOUT && c > 1)
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
-            else
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-        } 
-    } while (--c);
-
-    PIO_PRINTK("scsi%d: residual %d\n", HOSTNO, c);
-
-    *count = c;
-    *data = d;
-    tmp = NCR5380_read(STATUS_REG);
-    /* The phase read from the bus is valid if either REQ is (already)
-     * asserted or if ACK hasn't been released yet. The latter is the case if
-     * we're in MSGIN and all wanted bytes have been received. */
-    if ((tmp & SR_REQ) || (p == PHASE_MSGIN && c == 0))
-        *phase = tmp & PHASE_MASK;
-    else 
-        *phase = PHASE_UNKNOWN;
-
-    if (!c || (*phase == p))
-        return 0;
-    else 
-        return -1;
+                while (NCR5380_read(STATUS_REG) & SR_REQ)
+                        ;
+
+                HSH_PRINTK("scsi%d: req false, handshake complete\n", HOSTNO);
+
+                /*
+                 * We have several special cases to consider during REQ/ACK handshaking :
+                 * 1.  We were in MSGOUT phase, and we are on the last byte of the
+                 *      message.  ATN must be dropped as ACK is dropped.
+                 *
+                 * 2.  We are in a MSGIN phase, and we are on the last byte of the
+                 *      message.  We must exit with ACK asserted, so that the calling
+                 *      code may raise ATN before dropping ACK to reject the message.
+                 *
+                 * 3.  ACK and ATN are clear and the target may proceed as normal.
+                 */
+                if (!(p == PHASE_MSGIN && c == 1)) {
+                        if (p == PHASE_MSGOUT && c > 1)
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
+                        else
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                }
+        } while (--c);
+
+        PIO_PRINTK("scsi%d: residual %d\n", HOSTNO, c);
+
+        *count = c;
+        *data = d;
+        tmp = NCR5380_read(STATUS_REG);
+        /* The phase read from the bus is valid if either REQ is (already)
+         * asserted or if ACK hasn't been released yet. The latter is the case if
+         * we're in MSGIN and all wanted bytes have been received.
+         */
+        if ((tmp & SR_REQ) || (p == PHASE_MSGIN && c == 0))
+                *phase = tmp & PHASE_MASK;
+        else
+                *phase = PHASE_UNKNOWN;
+
+        if (!c || (*phase == p))
+                return 0;
+        else
+                return -1;
 }
 
 /*
  * Function : do_abort (Scsi_Host *host)
- * 
- * Purpose : abort the currently established nexus.  Should only be 
- *      called from a routine which can drop into a 
- * 
+ *
+ * Purpose : abort the currently established nexus.  Should only be
+ *      called from a routine which can drop into a
+ *
  * Returns : 0 on success, -1 on failure.
  */
 
-static int do_abort (struct Scsi_Host *host) 
+static int do_abort(struct Scsi_Host *host)
 {
-    unsigned char tmp, *msgptr, phase;
-    int len;
-
-    /* Request message out phase */
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
-
-    /* 
-     * Wait for the target to indicate a valid phase by asserting 
-     * REQ.  Once this happens, we'll have either a MSGOUT phase 
-     * and can immediately send the ABORT message, or we'll have some 
-     * other phase and will have to source/sink data.
-     * 
-     * We really don't care what value was on the bus or what value
-     * the target sees, so we just handshake.
-     */
-    
-    while (!(tmp = NCR5380_read(STATUS_REG)) & SR_REQ);
-
-    NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp));
-
-    if ((tmp & PHASE_MASK) != PHASE_MSGOUT) {
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN | 
-                      ICR_ASSERT_ACK);
-        while (NCR5380_read(STATUS_REG) & SR_REQ);
+        unsigned char tmp, *msgptr, phase;
+        int len;
+
+        /* Request message out phase */
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
-    }
-   
-    tmp = ABORT;
-    msgptr = &tmp;
-    len = 1;
-    phase = PHASE_MSGOUT;
-    NCR5380_transfer_pio (host, &phase, &len, &msgptr);
-
-    /*
-     * If we got here, and the command completed successfully,
-     * we're about to go into bus free state.
-     */
-
-    return len ? -1 : 0;
+
+        /*
+         * Wait for the target to indicate a valid phase by asserting
+         * REQ.  Once this happens, we'll have either a MSGOUT phase
+         * and can immediately send the ABORT message, or we'll have some
+         * other phase and will have to source/sink data.
+         *
+         * We really don't care what value was on the bus or what value
+         * the target sees, so we just handshake.
+         */
+
+        while (!(tmp = NCR5380_read(STATUS_REG)) & SR_REQ)
+                ;
+
+        NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp));
+
+        if ((tmp & PHASE_MASK) != PHASE_MSGOUT) {
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN |
+                              ICR_ASSERT_ACK);
+                while (NCR5380_read(STATUS_REG) & SR_REQ)
+                        ;
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
+        }
+
+        tmp = ABORT;
+        msgptr = &tmp;
+        len = 1;
+        phase = PHASE_MSGOUT;
+        NCR5380_transfer_pio(host, &phase, &len, &msgptr);
+
+        /*
+         * If we got here, and the command completed successfully,
+         * we're about to go into bus free state.
+         */
+
+        return len ? -1 : 0;
 }
 
 #if defined(REAL_DMA)
-/* 
- * Function : int NCR5380_transfer_dma (struct Scsi_Host *instance, 
+/*
+ * Function : int NCR5380_transfer_dma (struct Scsi_Host *instance,
  *      unsigned char *phase, int *count, unsigned char **data)
  *
  * Purpose : transfers data in given phase using either real
  *      or pseudo DMA.
  *
- * Inputs : instance - instance of driver, *phase - pointer to 
- *      what phase is expected, *count - pointer to number of 
+ * Inputs : instance - instance of driver, *phase - pointer to
+ *      what phase is expected, *count - pointer to number of
  *      bytes to transfer, **data - pointer to data pointer.
- * 
+ *
  * Returns : -1 when different phase is entered without transferring
  *      maximum number of bytes, 0 if all bytes or transfered or exit
  *      is in same phase.
  *
- *      Also, *phase, *count, *data are modified in place.
+ *      Also, *phase, *count, *data are modified in place.
  *
  */
 
 
-static int NCR5380_transfer_dma( struct Scsi_Host *instance, 
-                                 unsigned char *phase, int *count,
-                                 unsigned char **data)
+static int NCR5380_transfer_dma(struct Scsi_Host *instance,
+                                unsigned char *phase, int *count,
+                                unsigned char **data)
 {
-    SETUP_HOSTDATA(instance);
-    register int c = *count;
-    register unsigned char p = *phase;
-    register unsigned char *d = *data;
-    unsigned char tmp;
-    unsigned long flags;
-
-    if ((tmp = (NCR5380_read(STATUS_REG) & PHASE_MASK)) != p) {
-        *phase = tmp;
-        return -1;
-    }
+        SETUP_HOSTDATA(instance);
+        register int c = *count;
+        register unsigned char p = *phase;
+        register unsigned char *d = *data;
+        unsigned char tmp;
+        unsigned long flags;
+
+        if ((tmp = (NCR5380_read(STATUS_REG) & PHASE_MASK)) != p) {
+                *phase = tmp;
+                return -1;
+        }
 
-    if (atari_read_overruns && (p & SR_IO)) {
-        c -= atari_read_overruns;
-    }
+        if (atari_read_overruns && (p & SR_IO))
+                c -= atari_read_overruns;
 
-    DMA_PRINTK("scsi%d: initializing DMA for %s, %d bytes %s %p\n",
-               HOSTNO, (p & SR_IO) ? "reading" : "writing",
-               c, (p & SR_IO) ? "to" : "from", d);
+        DMA_PRINTK("scsi%d: initializing DMA for %s, %d bytes %s %p\n",
+                   HOSTNO, (p & SR_IO) ? "reading" : "writing",
+                   c, (p & SR_IO) ? "to" : "from", d);
 
-    NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
+        NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
 
 #ifdef REAL_DMA
-    NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_ENABLE_EOP_INTR | MR_MONITOR_BSY);
+        NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_ENABLE_EOP_INTR | MR_MONITOR_BSY);
 #endif /* def REAL_DMA  */
 
-    if (IS_A_TT()) {
-        /* On the Medusa, it is a must to initialize the DMA before
-         * starting the NCR. This is also the cleaner way for the TT.
-         */
-        local_irq_save(flags);
-        hostdata->dma_len = (p & SR_IO) ?
-            NCR5380_dma_read_setup(instance, d, c) : 
-            NCR5380_dma_write_setup(instance, d, c);
-        local_irq_restore(flags);
-    }
-    
-    if (p & SR_IO)
-        NCR5380_write(START_DMA_INITIATOR_RECEIVE_REG, 0);
-    else {
-        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA);
-        NCR5380_write(START_DMA_SEND_REG, 0);
-    }
-
-    if (!IS_A_TT()) {
-        /* On the Falcon, the DMA setup must be done after the last */
-        /* NCR access, else the DMA setup gets trashed!
-         */
-        local_irq_save(flags);
-        hostdata->dma_len = (p & SR_IO) ?
-            NCR5380_dma_read_setup(instance, d, c) : 
-            NCR5380_dma_write_setup(instance, d, c);
-        local_irq_restore(flags);
-    }
-    return 0;
+        if (IS_A_TT()) {
+                /* On the Medusa, it is a must to initialize the DMA before
+                 * starting the NCR. This is also the cleaner way for the TT.
+                 */
+                local_irq_save(flags);
+                hostdata->dma_len = (p & SR_IO) ?
+                        NCR5380_dma_read_setup(instance, d, c) :
+                        NCR5380_dma_write_setup(instance, d, c);
+                local_irq_restore(flags);
+        }
+
+        if (p & SR_IO)
+                NCR5380_write(START_DMA_INITIATOR_RECEIVE_REG, 0);
+        else {
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA);
+                NCR5380_write(START_DMA_SEND_REG, 0);
+        }
+
+        if (!IS_A_TT()) {
+                /* On the Falcon, the DMA setup must be done after the last */
+                /* NCR access, else the DMA setup gets trashed!
+                 */
+                local_irq_save(flags);
+                hostdata->dma_len = (p & SR_IO) ?
+                        NCR5380_dma_read_setup(instance, d, c) :
+                        NCR5380_dma_write_setup(instance, d, c);
+                local_irq_restore(flags);
+        }
+        return 0;
 }
 #endif /* defined(REAL_DMA) */
 
 /*
  * Function : NCR5380_information_transfer (struct Scsi_Host *instance)
  *
- * Purpose : run through the various SCSI phases and do as the target 
- *      directs us to.  Operates on the currently connected command, 
+ * Purpose : run through the various SCSI phases and do as the target
+ *      directs us to.  Operates on the currently connected command,
  *      instance->connected.
  *
  * Inputs : instance, instance for which we are doing commands
  *
- * Side effects : SCSI things happen, the disconnected queue will be 
+ * Side effects : SCSI things happen, the disconnected queue will be
  *      modified if a command disconnects, *instance->connected will
  *      change.
  *
- * XXX Note : we need to watch for bus free or a reset condition here 
- *      to recover from an unexpected bus free condition.
+ * XXX Note : we need to watch for bus free or a reset condition here
+ *      to recover from an unexpected bus free condition.
  */
- 
-static void NCR5380_information_transfer (struct Scsi_Host *instance)
+
+static void NCR5380_information_transfer(struct Scsi_Host *instance)
 {
-    SETUP_HOSTDATA(instance);
-    unsigned long flags;
-    unsigned char msgout = NOP;
-    int sink = 0;
-    int len;
+        SETUP_HOSTDATA(instance);
+        unsigned long flags;
+        unsigned char msgout = NOP;
+        int sink = 0;
+        int len;
 #if defined(REAL_DMA)
-    int transfersize;
+        int transfersize;
 #endif
-    unsigned char *data;
-    unsigned char phase, tmp, extended_msg[10], old_phase=0xff;
-    Scsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected;
+        unsigned char *data;
+        unsigned char phase, tmp, extended_msg[10], old_phase = 0xff;
+        Scsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected;
+
+        while (1) {
+                tmp = NCR5380_read(STATUS_REG);
+                /* We only have a valid SCSI phase when REQ is asserted */
+                if (tmp & SR_REQ) {
+                        phase = (tmp & PHASE_MASK);
+                        if (phase != old_phase) {
+                                old_phase = phase;
+                                NCR_PRINT_PHASE(NDEBUG_INFORMATION);
+                        }
 
-    while (1) {
-        tmp = NCR5380_read(STATUS_REG);
-        /* We only have a valid SCSI phase when REQ is asserted */
-        if (tmp & SR_REQ) {
-            phase = (tmp & PHASE_MASK); 
-            if (phase != old_phase) {
-                old_phase = phase;
-                NCR_PRINT_PHASE(NDEBUG_INFORMATION);
-            }
-            
-            if (sink && (phase != PHASE_MSGOUT)) {
-                NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp));
-
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN | 
-                    ICR_ASSERT_ACK);
-                while (NCR5380_read(STATUS_REG) & SR_REQ);
-                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                    ICR_ASSERT_ATN);
-                sink = 0;
-                continue;
-            }
-
-            switch (phase) {
-            case PHASE_DATAOUT:
+                        if (sink && (phase != PHASE_MSGOUT)) {
+                                NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp));
+
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN |
+                                              ICR_ASSERT_ACK);
+                                while (NCR5380_read(STATUS_REG) & SR_REQ)
+                                        ;
+                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
+                                              ICR_ASSERT_ATN);
+                                sink = 0;
+                                continue;
+                        }
+
+                        switch (phase) {
+                        case PHASE_DATAOUT:
 #if (NDEBUG & NDEBUG_NO_DATAOUT)
-                printk("scsi%d: NDEBUG_NO_DATAOUT set, attempted DATAOUT "
-                       "aborted\n", HOSTNO);
-                sink = 1;
-                do_abort(instance);
-                cmd->result = DID_ERROR  << 16;
-                cmd->done(cmd);
-                return;
+                                printk("scsi%d: NDEBUG_NO_DATAOUT set, attempted DATAOUT "
+                                       "aborted\n", HOSTNO);
+                                sink = 1;
+                                do_abort(instance);
+                                cmd->result = DID_ERROR << 16;
+                                cmd->done(cmd);
+                                return;
 #endif
-            case PHASE_DATAIN:
-                /* 
-                 * If there is no room left in the current buffer in the
-                 * scatter-gather list, move onto the next one.
-                 */
-
-                if (!cmd->SCp.this_residual && cmd->SCp.buffers_residual) {
-                    ++cmd->SCp.buffer;
-                    --cmd->SCp.buffers_residual;
-                    cmd->SCp.this_residual = cmd->SCp.buffer->length;
-                    cmd->SCp.ptr = page_address(cmd->SCp.buffer->page)+
-                                   cmd->SCp.buffer->offset;
-                    /* ++roman: Try to merge some scatter-buffers if
-                     * they are at contiguous physical addresses.
-                     */
-                    merge_contiguous_buffers( cmd );
-                    INF_PRINTK("scsi%d: %d bytes and %d buffers left\n",
-                               HOSTNO, cmd->SCp.this_residual,
-                               cmd->SCp.buffers_residual);
-                }
-
-                /*
-                 * The preferred transfer method is going to be 
-                 * PSEUDO-DMA for systems that are strictly PIO,
-                 * since we can let the hardware do the handshaking.
-                 *
-                 * For this to work, we need to know the transfersize
-                 * ahead of time, since the pseudo-DMA code will sit
-                 * in an unconditional loop.
-                 */
-
-/* ++roman: I suggest, this should be
- *   #if def(REAL_DMA)
- * instead of leaving REAL_DMA out.
- */
+                        case PHASE_DATAIN:
+                                /*
+                                 * If there is no room left in the current buffer in the
+                                 * scatter-gather list, move onto the next one.
+                                 */
+
+                                if (!cmd->SCp.this_residual && cmd->SCp.buffers_residual) {
+                                        ++cmd->SCp.buffer;
+                                        --cmd->SCp.buffers_residual;
+                                        cmd->SCp.this_residual = cmd->SCp.buffer->length;
+                                        cmd->SCp.ptr = page_address(cmd->SCp.buffer->page) +
+                                                   cmd->SCp.buffer->offset;
+                                        /* ++roman: Try to merge some scatter-buffers if
+                                         * they are at contiguous physical addresses.
+                                         */
+                                        merge_contiguous_buffers(cmd);
+                                        INF_PRINTK("scsi%d: %d bytes and %d buffers left\n",
+                                                   HOSTNO, cmd->SCp.this_residual,
+                                                   cmd->SCp.buffers_residual);
+                                }
+
+                                /*
+                                 * The preferred transfer method is going to be
+                                 * PSEUDO-DMA for systems that are strictly PIO,
+                                 * since we can let the hardware do the handshaking.
+                                 *
+                                 * For this to work, we need to know the transfersize
+                                 * ahead of time, since the pseudo-DMA code will sit
+                                 * in an unconditional loop.
+                                 */
+
+                                /* ++roman: I suggest, this should be
+                                 *   #if def(REAL_DMA)
+                                 * instead of leaving REAL_DMA out.
+                                 */
 
 #if defined(REAL_DMA)
-                if (!cmd->device->borken &&
-                    (transfersize = NCR5380_dma_xfer_len(instance,cmd,phase)) > 31) {
-                    len = transfersize;
-                    cmd->SCp.phase = phase;
-                    if (NCR5380_transfer_dma(instance, &phase,
-                        &len, (unsigned char **) &cmd->SCp.ptr)) {
-                        /*
-                         * If the watchdog timer fires, all future
-                         * accesses to this device will use the
-                         * polled-IO. */ 
-                        printk(KERN_NOTICE "scsi%d: switching target %d "
-                               "lun %d to slow handshake\n", HOSTNO,
-                               cmd->device->id, cmd->device->lun);
-                        cmd->device->borken = 1;
-                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                            ICR_ASSERT_ATN);
-                        sink = 1;
-                        do_abort(instance);
-                        cmd->result = DID_ERROR  << 16;
-                        cmd->done(cmd);
-                        /* XXX - need to source or sink data here, as appropriate */
-                    } else {
+                                if (!cmd->device->borken &&
+                                    (transfersize = NCR5380_dma_xfer_len(instance,cmd,phase)) > 31) {
+                                        len = transfersize;
+                                        cmd->SCp.phase = phase;
+                                        if (NCR5380_transfer_dma(instance, &phase,
+                                            &len, (unsigned char **)&cmd->SCp.ptr)) {
+                                                /*
+                                                 * If the watchdog timer fires, all future
+                                                 * accesses to this device will use the
+                                                 * polled-IO. */
+                                                printk(KERN_NOTICE "scsi%d: switching target %d "
+                                                           "lun %d to slow handshake\n", HOSTNO,
+                                                           cmd->device->id, cmd->device->lun);
+                                                cmd->device->borken = 1;
+                                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
+                                                        ICR_ASSERT_ATN);
+                                                sink = 1;
+                                                do_abort(instance);
+                                                cmd->result = DID_ERROR << 16;
+                                                cmd->done(cmd);
+                                                /* XXX - need to source or sink data here, as appropriate */
+                                        } else {
 #ifdef REAL_DMA
-                        /* ++roman: When using real DMA,
-                         * information_transfer() should return after
-                         * starting DMA since it has nothing more to
-                         * do.
-                         */
-                        return;
-#else                   
-                        cmd->SCp.this_residual -= transfersize - len;
+                                                /* ++roman: When using real DMA,
+                                                 * information_transfer() should return after
+                                                 * starting DMA since it has nothing more to
+                                                 * do.
+                                                 */
+                                                return;
+#else
+                                                cmd->SCp.this_residual -= transfersize - len;
 #endif
-                    }
-                } else
+                                        }
+                                } else
 #endif /* defined(REAL_DMA) */
-                  NCR5380_transfer_pio(instance, &phase, 
-                    (int *) &cmd->SCp.this_residual, (unsigned char **)
-                    &cmd->SCp.ptr);
-                break;
-            case PHASE_MSGIN:
-                len = 1;
-                data = &tmp;
-                NCR5380_write(SELECT_ENABLE_REG, 0);    /* disable reselects */
-                NCR5380_transfer_pio(instance, &phase, &len, &data);
-                cmd->SCp.Message = tmp;
-
-                switch (tmp) {
-                /*
-                 * Linking lets us reduce the time required to get the 
-                 * next command out to the device, hopefully this will
-                 * mean we don't waste another revolution due to the delays
-                 * required by ARBITRATION and another SELECTION.
-                 *
-                 * In the current implementation proposal, low level drivers
-                 * merely have to start the next command, pointed to by 
-                 * next_link, done() is called as with unlinked commands.
-                 */
+                                        NCR5380_transfer_pio(instance, &phase,
+                                                             (int *)&cmd->SCp.this_residual,
+                                                             (unsigned char **)&cmd->SCp.ptr);
+                                break;
+                        case PHASE_MSGIN:
+                                len = 1;
+                                data = &tmp;
+                                NCR5380_write(SELECT_ENABLE_REG, 0);    /* disable reselects */
+                                NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                cmd->SCp.Message = tmp;
+
+                                switch (tmp) {
+                                /*
+                                 * Linking lets us reduce the time required to get the
+                                 * next command out to the device, hopefully this will
+                                 * mean we don't waste another revolution due to the delays
+                                 * required by ARBITRATION and another SELECTION.
+                                 *
+                                 * In the current implementation proposal, low level drivers
+                                 * merely have to start the next command, pointed to by
+                                 * next_link, done() is called as with unlinked commands.
+                                 */
 #ifdef LINKED
-                case LINKED_CMD_COMPLETE:
-                case LINKED_FLG_CMD_COMPLETE:
-                    /* Accept message by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                    
-                    LNK_PRINTK("scsi%d: target %d lun %d linked command "
-                               "complete.\n", HOSTNO, cmd->device->id, cmd->device->lun);
-
-                    /* Enable reselect interrupts */
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    /*
-                     * Sanity check : A linked command should only terminate
-                     * with one of these messages if there are more linked
-                     * commands available.
-                     */
-
-                    if (!cmd->next_link) {
-                         printk(KERN_NOTICE "scsi%d: target %d lun %d "
-                                "linked command complete, no next_link\n",
-                                HOSTNO, cmd->device->id, cmd->device->lun);
-                            sink = 1;
-                            do_abort (instance);
-                            return;
-                    }
-
-                    initialize_SCp(cmd->next_link);
-                    /* The next command is still part of this process; copy it
-                     * and don't free it! */
-                    cmd->next_link->tag = cmd->tag;
-                    cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); 
-                    LNK_PRINTK("scsi%d: target %d lun %d linked request "
-                               "done, calling scsi_done().\n",
-                               HOSTNO, cmd->device->id, cmd->device->lun);
+                                case LINKED_CMD_COMPLETE:
+                                case LINKED_FLG_CMD_COMPLETE:
+                                        /* Accept message by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+
+                                        LNK_PRINTK("scsi%d: target %d lun %d linked command "
+                                                   "complete.\n", HOSTNO, cmd->device->id, cmd->device->lun);
+
+                                        /* Enable reselect interrupts */
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        /*
+                                         * Sanity check : A linked command should only terminate
+                                         * with one of these messages if there are more linked
+                                         * commands available.
+                                         */
+
+                                        if (!cmd->next_link) {
+                                                 printk(KERN_NOTICE "scsi%d: target %d lun %d "
+                                                        "linked command complete, no next_link\n",
+                                                        HOSTNO, cmd->device->id, cmd->device->lun);
+                                                sink = 1;
+                                                do_abort(instance);
+                                                return;
+                                        }
+
+                                        initialize_SCp(cmd->next_link);
+                                        /* The next command is still part of this process; copy it
+                                         * and don't free it! */
+                                        cmd->next_link->tag = cmd->tag;
+                                        cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
+                                        LNK_PRINTK("scsi%d: target %d lun %d linked request "
+                                                   "done, calling scsi_done().\n",
+                                                   HOSTNO, cmd->device->id, cmd->device->lun);
 #ifdef NCR5380_STATS
-                    collect_stats(hostdata, cmd);
+                                        collect_stats(hostdata, cmd);
 #endif
-                    cmd->scsi_done(cmd);
-                    cmd = hostdata->connected;
-                    break;
+                                        cmd->scsi_done(cmd);
+                                        cmd = hostdata->connected;
+                                        break;
 #endif /* def LINKED */
-                case ABORT:
-                case COMMAND_COMPLETE: 
-                    /* Accept message by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                    /* ++guenther: possible race with Falcon locking */
-                    falcon_dont_release++;
-                    hostdata->connected = NULL;
-                    QU_PRINTK("scsi%d: command for target %d, lun %d "
-                              "completed\n", HOSTNO, cmd->device->id, cmd->device->lun);
+                                case ABORT:
+                                case COMMAND_COMPLETE:
+                                        /* Accept message by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                                        /* ++guenther: possible race with Falcon locking */
+                                        falcon_dont_release++;
+                                        hostdata->connected = NULL;
+                                        QU_PRINTK("scsi%d: command for target %d, lun %d "
+                                                  "completed\n", HOSTNO, cmd->device->id, cmd->device->lun);
 #ifdef SUPPORT_TAGS
-                    cmd_free_tag( cmd );
-                    if (status_byte(cmd->SCp.Status) == QUEUE_FULL) {
-                        /* Turn a QUEUE FULL status into BUSY, I think the
-                         * mid level cannot handle QUEUE FULL :-( (The
-                         * command is retried after BUSY). Also update our
-                         * queue size to the number of currently issued
-                         * commands now.
-                         */
-                        /* ++Andreas: the mid level code knows about
-                           QUEUE_FULL now. */
-                        TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
-                        TAG_PRINTK("scsi%d: target %d lun %d returned "
-                                   "QUEUE_FULL after %d commands\n",
-                                   HOSTNO, cmd->device->id, cmd->device->lun,
-                                   ta->nr_allocated);
-                        if (ta->queue_size > ta->nr_allocated)
-                            ta->nr_allocated = ta->queue_size;
-                    }
+                                        cmd_free_tag(cmd);
+                                        if (status_byte(cmd->SCp.Status) == QUEUE_FULL) {
+                                                /* Turn a QUEUE FULL status into BUSY, I think the
+                                                 * mid level cannot handle QUEUE FULL :-( (The
+                                                 * command is retried after BUSY). Also update our
+                                                 * queue size to the number of currently issued
+                                                 * commands now.
+                                                 */
+                                                /* ++Andreas: the mid level code knows about
+                                                   QUEUE_FULL now. */
+                                                TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
+                                                TAG_PRINTK("scsi%d: target %d lun %d returned "
+                                                           "QUEUE_FULL after %d commands\n",
+                                                           HOSTNO, cmd->device->id, cmd->device->lun,
+                                                           ta->nr_allocated);
+                                                if (ta->queue_size > ta->nr_allocated)
+                                                        ta->nr_allocated = ta->queue_size;
+                                        }
 #else
-                    hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+                                        hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
 #endif
-                    /* Enable reselect interrupts */
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-
-                    /* 
-                     * I'm not sure what the correct thing to do here is : 
-                     * 
-                     * If the command that just executed is NOT a request 
-                     * sense, the obvious thing to do is to set the result
-                     * code to the values of the stored parameters.
-                     * 
-                     * If it was a REQUEST SENSE command, we need some way to
-                     * differentiate between the failure code of the original
-                     * and the failure code of the REQUEST sense - the obvious
-                     * case is success, where we fall through and leave the
-                     * result code unchanged.
-                     * 
-                     * The non-obvious place is where the REQUEST SENSE failed
-                     */
-
-                    if (cmd->cmnd[0] != REQUEST_SENSE) 
-                        cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); 
-                    else if (status_byte(cmd->SCp.Status) != GOOD)
-                        cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
-                    
-#ifdef AUTOSENSE
-                    if ((cmd->cmnd[0] != REQUEST_SENSE) && 
-                        (status_byte(cmd->SCp.Status) == CHECK_CONDITION)) {
-                        ASEN_PRINTK("scsi%d: performing request sense\n",
-                                    HOSTNO);
-                        cmd->cmnd[0] = REQUEST_SENSE;
-                        cmd->cmnd[1] &= 0xe0;
-                        cmd->cmnd[2] = 0;
-                        cmd->cmnd[3] = 0;
-                        cmd->cmnd[4] = sizeof(cmd->sense_buffer);
-                        cmd->cmnd[5] = 0;
-                        cmd->cmd_len = COMMAND_SIZE(cmd->cmnd[0]);
-
-                        cmd->use_sg = 0;
-                        /* this is initialized from initialize_SCp 
-                        cmd->SCp.buffer = NULL;
-                        cmd->SCp.buffers_residual = 0;
-                        */
-                        cmd->request_buffer = (char *) cmd->sense_buffer;
-                        cmd->request_bufflen = sizeof(cmd->sense_buffer);
+                                        /* Enable reselect interrupts */
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+
+                                        /*
+                                         * I'm not sure what the correct thing to do here is :
+                                         *
+                                         * If the command that just executed is NOT a request
+                                         * sense, the obvious thing to do is to set the result
+                                         * code to the values of the stored parameters.
+                                         *
+                                         * If it was a REQUEST SENSE command, we need some way to
+                                         * differentiate between the failure code of the original
+                                         * and the failure code of the REQUEST sense - the obvious
+                                         * case is success, where we fall through and leave the
+                                         * result code unchanged.
+                                         *
+                                         * The non-obvious place is where the REQUEST SENSE failed
+                                         */
+
+                                        if (cmd->cmnd[0] != REQUEST_SENSE)
+                                                cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
+                                        else if (status_byte(cmd->SCp.Status) != GOOD)
+                                                cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
 
-                        local_irq_save(flags);
-                        LIST(cmd,hostdata->issue_queue);
-                        NEXT(cmd) = hostdata->issue_queue;
-                        hostdata->issue_queue = (Scsi_Cmnd *) cmd;
-                        local_irq_restore(flags);
-                        QU_PRINTK("scsi%d: REQUEST SENSE added to head of "
-                                  "issue queue\n", H_NO(cmd));
-                   } else
+#ifdef AUTOSENSE
+                                        if ((cmd->cmnd[0] != REQUEST_SENSE) &&
+                                            (status_byte(cmd->SCp.Status) == CHECK_CONDITION)) {
+                                                ASEN_PRINTK("scsi%d: performing request sense\n", HOSTNO);
+                                                cmd->cmnd[0] = REQUEST_SENSE;
+                                                cmd->cmnd[1] &= 0xe0;
+                                                cmd->cmnd[2] = 0;
+                                                cmd->cmnd[3] = 0;
+                                                cmd->cmnd[4] = sizeof(cmd->sense_buffer);
+                                                cmd->cmnd[5] = 0;
+                                                cmd->cmd_len = COMMAND_SIZE(cmd->cmnd[0]);
+
+                                                cmd->use_sg = 0;
+                                                /* this is initialized from initialize_SCp
+                                                cmd->SCp.buffer = NULL;
+                                                cmd->SCp.buffers_residual = 0;
+                                                */
+                                                cmd->request_buffer = (char *) cmd->sense_buffer;
+                                                cmd->request_bufflen = sizeof(cmd->sense_buffer);
+
+                                                local_irq_save(flags);
+                                                LIST(cmd,hostdata->issue_queue);
+                                                SET_NEXT(cmd, hostdata->issue_queue);
+                                                hostdata->issue_queue = (Scsi_Cmnd *) cmd;
+                                                local_irq_restore(flags);
+                                                QU_PRINTK("scsi%d: REQUEST SENSE added to head of "
+                                                          "issue queue\n", H_NO(cmd));
+                                        } else
 #endif /* def AUTOSENSE */
-                   {
+                                        {
 #ifdef NCR5380_STATS
-                       collect_stats(hostdata, cmd);
+                                                collect_stats(hostdata, cmd);
 #endif
-                       cmd->scsi_done(cmd);
-                    }
-
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    /* 
-                     * Restore phase bits to 0 so an interrupted selection, 
-                     * arbitration can resume.
-                     */
-                    NCR5380_write(TARGET_COMMAND_REG, 0);
-                    
-                    while ((NCR5380_read(STATUS_REG) & SR_BSY) && !hostdata->connected)
-                        barrier();
-
-                    falcon_dont_release--;
-                    /* ++roman: For Falcon SCSI, release the lock on the
-                     * ST-DMA here if no other commands are waiting on the
-                     * disconnected queue.
-                     */
-                    falcon_release_lock_if_possible( hostdata );
-                    return;
-                case MESSAGE_REJECT:
-                    /* Accept message by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                    /* Enable reselect interrupts */
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    switch (hostdata->last_message) {
-                    case HEAD_OF_QUEUE_TAG:
-                    case ORDERED_QUEUE_TAG:
-                    case SIMPLE_QUEUE_TAG:
-                        /* The target obviously doesn't support tagged
-                         * queuing, even though it announced this ability in
-                         * its INQUIRY data ?!? (maybe only this LUN?) Ok,
-                         * clear 'tagged_supported' and lock the LUN, since
-                         * the command is treated as untagged further on.
-                         */
-                        cmd->device->tagged_supported = 0;
-                        hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
-                        cmd->tag = TAG_NONE;
-                        TAG_PRINTK("scsi%d: target %d lun %d rejected "
-                                   "QUEUE_TAG message; tagged queuing "
-                                   "disabled\n",
-                                   HOSTNO, cmd->device->id, cmd->device->lun);
-                        break;
-                    }
-                    break;
-                case DISCONNECT:
-                    /* Accept message by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                    local_irq_save(flags);
-                    cmd->device->disconnect = 1;
-                    LIST(cmd,hostdata->disconnected_queue);
-                    NEXT(cmd) = hostdata->disconnected_queue;
-                    hostdata->connected = NULL;
-                    hostdata->disconnected_queue = cmd;
-                    local_irq_restore(flags);
-                    QU_PRINTK("scsi%d: command for target %d lun %d was "
-                              "moved from connected to the "
-                              "disconnected_queue\n", HOSTNO, 
-                              cmd->device->id, cmd->device->lun);
-                    /* 
-                     * Restore phase bits to 0 so an interrupted selection, 
-                     * arbitration can resume.
-                     */
-                    NCR5380_write(TARGET_COMMAND_REG, 0);
-
-                    /* Enable reselect interrupts */
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    /* Wait for bus free to avoid nasty timeouts */
-                    while ((NCR5380_read(STATUS_REG) & SR_BSY) && !hostdata->connected)
-                        barrier();
-                    return;
-                /* 
-                 * The SCSI data pointer is *IMPLICITLY* saved on a disconnect
-                 * operation, in violation of the SCSI spec so we can safely 
-                 * ignore SAVE/RESTORE pointers calls.
-                 *
-                 * Unfortunately, some disks violate the SCSI spec and 
-                 * don't issue the required SAVE_POINTERS message before
-                 * disconnecting, and we have to break spec to remain 
-                 * compatible.
-                 */
-                case SAVE_POINTERS:
-                case RESTORE_POINTERS:
-                    /* Accept message by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                    /* Enable reselect interrupts */
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    break;
-                case EXTENDED_MESSAGE:
-/* 
- * Extended messages are sent in the following format :
- * Byte         
- * 0            EXTENDED_MESSAGE == 1
- * 1            length (includes one byte for code, doesn't 
- *              include first two bytes)
- * 2            code
- * 3..length+1  arguments
- *
- * Start the extended message buffer with the EXTENDED_MESSAGE
- * byte, since spi_print_msg() wants the whole thing.  
- */
-                    extended_msg[0] = EXTENDED_MESSAGE;
-                    /* Accept first byte by clearing ACK */
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-
-                    EXT_PRINTK("scsi%d: receiving extended message\n", HOSTNO);
-
-                    len = 2;
-                    data = extended_msg + 1;
-                    phase = PHASE_MSGIN;
-                    NCR5380_transfer_pio(instance, &phase, &len, &data);
-                    EXT_PRINTK("scsi%d: length=%d, code=0x%02x\n", HOSTNO,
-                               (int)extended_msg[1], (int)extended_msg[2]);
-
-                    if (!len && extended_msg[1] <= 
-                        (sizeof (extended_msg) - 1)) {
-                        /* Accept third byte by clearing ACK */
-                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                        len = extended_msg[1] - 1;
-                        data = extended_msg + 3;
-                        phase = PHASE_MSGIN;
-
-                        NCR5380_transfer_pio(instance, &phase, &len, &data);
-                        EXT_PRINTK("scsi%d: message received, residual %d\n",
-                                   HOSTNO, len);
-
-                        switch (extended_msg[2]) {
-                        case EXTENDED_SDTR:
-                        case EXTENDED_WDTR:
-                        case EXTENDED_MODIFY_DATA_POINTER:
-                        case EXTENDED_EXTENDED_IDENTIFY:
-                            tmp = 0;
-                        }
-                    } else if (len) {
-                        printk(KERN_NOTICE "scsi%d: error receiving "
-                               "extended message\n", HOSTNO);
-                        tmp = 0;
-                    } else {
-                        printk(KERN_NOTICE "scsi%d: extended message "
-                               "code %02x length %d is too long\n",
-                               HOSTNO, extended_msg[2], extended_msg[1]);
-                        tmp = 0;
-                    }
-                /* Fall through to reject message */
-
-                /* 
-                 * If we get something weird that we aren't expecting, 
-                 * reject it.
-                 */
-                default:
-                    if (!tmp) {
-                        printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
-                        spi_print_msg(extended_msg);
-                        printk("\n");
-                    } else if (tmp != EXTENDED_MESSAGE)
-                        printk(KERN_DEBUG "scsi%d: rejecting unknown "
-                               "message %02x from target %d, lun %d\n",
-                               HOSTNO, tmp, cmd->device->id, cmd->device->lun);
-                    else
-                        printk(KERN_DEBUG "scsi%d: rejecting unknown "
-                               "extended message "
-                               "code %02x, length %d from target %d, lun %d\n",
-                               HOSTNO, extended_msg[1], extended_msg[0],
-                               cmd->device->id, cmd->device->lun);
-   
-
-                    msgout = MESSAGE_REJECT;
-                    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | 
-                        ICR_ASSERT_ATN);
-                    break;
-                } /* switch (tmp) */
-                break;
-            case PHASE_MSGOUT:
-                len = 1;
-                data = &msgout;
-                hostdata->last_message = msgout;
-                NCR5380_transfer_pio(instance, &phase, &len, &data);
-                if (msgout == ABORT) {
+                                                cmd->scsi_done(cmd);
+                                        }
+
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        /*
+                                         * Restore phase bits to 0 so an interrupted selection,
+                                         * arbitration can resume.
+                                         */
+                                        NCR5380_write(TARGET_COMMAND_REG, 0);
+
+                                        while ((NCR5380_read(STATUS_REG) & SR_BSY) && !hostdata->connected)
+                                                barrier();
+
+                                        falcon_dont_release--;
+                                        /* ++roman: For Falcon SCSI, release the lock on the
+                                         * ST-DMA here if no other commands are waiting on the
+                                         * disconnected queue.
+                                         */
+                                        falcon_release_lock_if_possible(hostdata);
+                                        return;
+                                case MESSAGE_REJECT:
+                                        /* Accept message by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                                        /* Enable reselect interrupts */
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        switch (hostdata->last_message) {
+                                        case HEAD_OF_QUEUE_TAG:
+                                        case ORDERED_QUEUE_TAG:
+                                        case SIMPLE_QUEUE_TAG:
+                                                /* The target obviously doesn't support tagged
+                                                 * queuing, even though it announced this ability in
+                                                 * its INQUIRY data ?!? (maybe only this LUN?) Ok,
+                                                 * clear 'tagged_supported' and lock the LUN, since
+                                                 * the command is treated as untagged further on.
+                                                 */
+                                                cmd->device->tagged_supported = 0;
+                                                hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
+                                                cmd->tag = TAG_NONE;
+                                                TAG_PRINTK("scsi%d: target %d lun %d rejected "
+                                                           "QUEUE_TAG message; tagged queuing "
+                                                           "disabled\n",
+                                                           HOSTNO, cmd->device->id, cmd->device->lun);
+                                                break;
+                                        }
+                                        break;
+                                case DISCONNECT:
+                                        /* Accept message by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                                        local_irq_save(flags);
+                                        cmd->device->disconnect = 1;
+                                        LIST(cmd,hostdata->disconnected_queue);
+                                        SET_NEXT(cmd, hostdata->disconnected_queue);
+                                        hostdata->connected = NULL;
+                                        hostdata->disconnected_queue = cmd;
+                                        local_irq_restore(flags);
+                                        QU_PRINTK("scsi%d: command for target %d lun %d was "
+                                                  "moved from connected to the "
+                                                  "disconnected_queue\n", HOSTNO,
+                                                  cmd->device->id, cmd->device->lun);
+                                        /*
+                                         * Restore phase bits to 0 so an interrupted selection,
+                                         * arbitration can resume.
+                                         */
+                                        NCR5380_write(TARGET_COMMAND_REG, 0);
+
+                                        /* Enable reselect interrupts */
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        /* Wait for bus free to avoid nasty timeouts */
+                                        while ((NCR5380_read(STATUS_REG) & SR_BSY) && !hostdata->connected)
+                                                barrier();
+                                        return;
+                                        /*
+                                         * The SCSI data pointer is *IMPLICITLY* saved on a disconnect
+                                         * operation, in violation of the SCSI spec so we can safely
+                                         * ignore SAVE/RESTORE pointers calls.
+                                         *
+                                         * Unfortunately, some disks violate the SCSI spec and
+                                         * don't issue the required SAVE_POINTERS message before
+                                         * disconnecting, and we have to break spec to remain
+                                         * compatible.
+                                         */
+                                case SAVE_POINTERS:
+                                case RESTORE_POINTERS:
+                                        /* Accept message by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                                        /* Enable reselect interrupts */
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        break;
+                                case EXTENDED_MESSAGE:
+                                        /*
+                                         * Extended messages are sent in the following format :
+                                         * Byte
+                                         * 0            EXTENDED_MESSAGE == 1
+                                         * 1            length (includes one byte for code, doesn't
+                                         *              include first two bytes)
+                                         * 2            code
+                                         * 3..length+1  arguments
+                                         *
+                                         * Start the extended message buffer with the EXTENDED_MESSAGE
+                                         * byte, since spi_print_msg() wants the whole thing.
+                                         */
+                                        extended_msg[0] = EXTENDED_MESSAGE;
+                                        /* Accept first byte by clearing ACK */
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+
+                                        EXT_PRINTK("scsi%d: receiving extended message\n", HOSTNO);
+
+                                        len = 2;
+                                        data = extended_msg + 1;
+                                        phase = PHASE_MSGIN;
+                                        NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                        EXT_PRINTK("scsi%d: length=%d, code=0x%02x\n", HOSTNO,
+                                                   (int)extended_msg[1], (int)extended_msg[2]);
+
+                                        if (!len && extended_msg[1] <=
+                                            (sizeof(extended_msg) - 1)) {
+                                                /* Accept third byte by clearing ACK */
+                                                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                                                len = extended_msg[1] - 1;
+                                                data = extended_msg + 3;
+                                                phase = PHASE_MSGIN;
+
+                                                NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                                EXT_PRINTK("scsi%d: message received, residual %d\n",
+                                                           HOSTNO, len);
+
+                                                switch (extended_msg[2]) {
+                                                case EXTENDED_SDTR:
+                                                case EXTENDED_WDTR:
+                                                case EXTENDED_MODIFY_DATA_POINTER:
+                                                case EXTENDED_EXTENDED_IDENTIFY:
+                                                        tmp = 0;
+                                                }
+                                        } else if (len) {
+                                                printk(KERN_NOTICE "scsi%d: error receiving "
+                                                       "extended message\n", HOSTNO);
+                                                tmp = 0;
+                                        } else {
+                                                printk(KERN_NOTICE "scsi%d: extended message "
+                                                           "code %02x length %d is too long\n",
+                                                           HOSTNO, extended_msg[2], extended_msg[1]);
+                                                tmp = 0;
+                                        }
+                                        /* Fall through to reject message */
+
+                                        /*
+                                         * If we get something weird that we aren't expecting,
+                                         * reject it.
+                                         */
+                                default:
+                                        if (!tmp) {
+                                                printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
+                                                spi_print_msg(extended_msg);
+                                                printk("\n");
+                                        } else if (tmp != EXTENDED_MESSAGE)
+                                                printk(KERN_DEBUG "scsi%d: rejecting unknown "
+                                                       "message %02x from target %d, lun %d\n",
+                                                       HOSTNO, tmp, cmd->device->id, cmd->device->lun);
+                                        else
+                                                printk(KERN_DEBUG "scsi%d: rejecting unknown "
+                                                       "extended message "
+                                                       "code %02x, length %d from target %d, lun %d\n",
+                                                       HOSTNO, extended_msg[1], extended_msg[0],
+                                                       cmd->device->id, cmd->device->lun);
+
+
+                                        msgout = MESSAGE_REJECT;
+                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
+                                        break;
+                                } /* switch (tmp) */
+                                break;
+                        case PHASE_MSGOUT:
+                                len = 1;
+                                data = &msgout;
+                                hostdata->last_message = msgout;
+                                NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                if (msgout == ABORT) {
 #ifdef SUPPORT_TAGS
-                    cmd_free_tag( cmd );
+                                        cmd_free_tag(cmd);
 #else
-                    hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+                                        hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
 #endif
-                    hostdata->connected = NULL;
-                    cmd->result = DID_ERROR << 16;
+                                        hostdata->connected = NULL;
+                                        cmd->result = DID_ERROR << 16;
 #ifdef NCR5380_STATS
-                    collect_stats(hostdata, cmd);
+                                        collect_stats(hostdata, cmd);
 #endif
-                    cmd->scsi_done(cmd);
-                    NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                    falcon_release_lock_if_possible( hostdata );
-                    return;
-                }
-                msgout = NOP;
-                break;
-            case PHASE_CMDOUT:
-                len = cmd->cmd_len;
-                data = cmd->cmnd;
-                /* 
-                 * XXX for performance reasons, on machines with a 
-                 * PSEUDO-DMA architecture we should probably 
-                 * use the dma transfer function.  
-                 */
-                NCR5380_transfer_pio(instance, &phase, &len, 
-                    &data);
-                break;
-            case PHASE_STATIN:
-                len = 1;
-                data = &tmp;
-                NCR5380_transfer_pio(instance, &phase, &len, &data);
-                cmd->SCp.Status = tmp;
-                break;
-            default:
-                printk("scsi%d: unknown phase\n", HOSTNO);
-                NCR_PRINT(NDEBUG_ANY);
-            } /* switch(phase) */
-        } /* if (tmp * SR_REQ) */ 
-    } /* while (1) */
+                                        cmd->scsi_done(cmd);
+                                        NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+                                        falcon_release_lock_if_possible(hostdata);
+                                        return;
+                                }
+                                msgout = NOP;
+                                break;
+                        case PHASE_CMDOUT:
+                                len = cmd->cmd_len;
+                                data = cmd->cmnd;
+                                /*
+                                 * XXX for performance reasons, on machines with a
+                                 * PSEUDO-DMA architecture we should probably
+                                 * use the dma transfer function.
+                                 */
+                                NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                break;
+                        case PHASE_STATIN:
+                                len = 1;
+                                data = &tmp;
+                                NCR5380_transfer_pio(instance, &phase, &len, &data);
+                                cmd->SCp.Status = tmp;
+                                break;
+                        default:
+                                printk("scsi%d: unknown phase\n", HOSTNO);
+                                NCR_PRINT(NDEBUG_ANY);
+                        } /* switch(phase) */
+                } /* if (tmp * SR_REQ) */
+        } /* while (1) */
 }
 
 /*
  * Function : void NCR5380_reselect (struct Scsi_Host *instance)
  *
- * Purpose : does reselection, initializing the instance->connected 
- *      field to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q 
+ * Purpose : does reselection, initializing the instance->connected
+ *      field to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q
  *      nexus has been reestablished,
- *      
+ *
  * Inputs : instance - this instance of the NCR5380.
  *
  */
 
 
-static void NCR5380_reselect (struct Scsi_Host *instance)
+static void NCR5380_reselect(struct Scsi_Host *instance)
 {
-    SETUP_HOSTDATA(instance);
-    unsigned char target_mask;
-    unsigned char lun, phase;
-    int len;
+        SETUP_HOSTDATA(instance);
+        unsigned char target_mask;
+        unsigned char lun, phase;
+        int len;
 #ifdef SUPPORT_TAGS
-    unsigned char tag;
+        unsigned char tag;
 #endif
-    unsigned char msg[3];
-    unsigned char *data;
-    Scsi_Cmnd *tmp = NULL, *prev;
-/*    unsigned long flags; */
-
-    /*
-     * Disable arbitration, etc. since the host adapter obviously
-     * lost, and tell an interrupted NCR5380_select() to restart.
-     */
-
-    NCR5380_write(MODE_REG, MR_BASE);
-    hostdata->restart_select = 1;
-
-    target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask);
-
-    RSL_PRINTK("scsi%d: reselect\n", HOSTNO);
-
-    /* 
-     * At this point, we have detected that our SCSI ID is on the bus,
-     * SEL is true and BSY was false for at least one bus settle delay
-     * (400 ns).
-     *
-     * We must assert BSY ourselves, until the target drops the SEL
-     * signal.
-     */
-
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_BSY);
-    
-    while (NCR5380_read(STATUS_REG) & SR_SEL);
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-
-    /*
-     * Wait for target to go into MSGIN.
-     */
-
-    while (!(NCR5380_read(STATUS_REG) & SR_REQ));
-
-    len = 1;
-    data = msg;
-    phase = PHASE_MSGIN;
-    NCR5380_transfer_pio(instance, &phase, &len, &data);
-
-    if (!(msg[0] & 0x80)) {
-        printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
-        spi_print_msg(msg);
-        do_abort(instance);
-        return;
-    }
-    lun = (msg[0] & 0x07);
+        unsigned char msg[3];
+        unsigned char *data;
+        Scsi_Cmnd *tmp = NULL, *prev;
+/*      unsigned long flags; */
+
+        /*
+         * Disable arbitration, etc. since the host adapter obviously
+         * lost, and tell an interrupted NCR5380_select() to restart.
+         */
+
+        NCR5380_write(MODE_REG, MR_BASE);
+        hostdata->restart_select = 1;
+
+        target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask);
+
+        RSL_PRINTK("scsi%d: reselect\n", HOSTNO);
+
+        /*
+         * At this point, we have detected that our SCSI ID is on the bus,
+         * SEL is true and BSY was false for at least one bus settle delay
+         * (400 ns).
+         *
+         * We must assert BSY ourselves, until the target drops the SEL
+         * signal.
+         */
+
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_BSY);
+
+        while (NCR5380_read(STATUS_REG) & SR_SEL)
+                ;
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+
+        /*
+         * Wait for target to go into MSGIN.
+         */
+
+        while (!(NCR5380_read(STATUS_REG) & SR_REQ))
+                ;
+
+        len = 1;
+        data = msg;
+        phase = PHASE_MSGIN;
+        NCR5380_transfer_pio(instance, &phase, &len, &data);
+
+        if (!(msg[0] & 0x80)) {
+                printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
+                spi_print_msg(msg);
+                do_abort(instance);
+                return;
+        }
+        lun = (msg[0] & 0x07);
 
 #ifdef SUPPORT_TAGS
-    /* If the phase is still MSGIN, the target wants to send some more
-     * messages. In case it supports tagged queuing, this is probably a
-     * SIMPLE_QUEUE_TAG for the I_T_L_Q nexus.
-     */
-    tag = TAG_NONE;
-    if (phase == PHASE_MSGIN && setup_use_tagged_queuing) {
-        /* Accept previous IDENTIFY message by clearing ACK */
-        NCR5380_write( INITIATOR_COMMAND_REG, ICR_BASE );
-        len = 2;
-        data = msg+1;
-        if (!NCR5380_transfer_pio(instance, &phase, &len, &data) &&
-            msg[1] == SIMPLE_QUEUE_TAG)
-            tag = msg[2];
-        TAG_PRINTK("scsi%d: target mask %02x, lun %d sent tag %d at "
-                   "reselection\n", HOSTNO, target_mask, lun, tag);
-    }
+        /* If the phase is still MSGIN, the target wants to send some more
+         * messages. In case it supports tagged queuing, this is probably a
+         * SIMPLE_QUEUE_TAG for the I_T_L_Q nexus.
+         */
+        tag = TAG_NONE;
+        if (phase == PHASE_MSGIN && setup_use_tagged_queuing) {
+                /* Accept previous IDENTIFY message by clearing ACK */
+                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+                len = 2;
+                data = msg + 1;
+                if (!NCR5380_transfer_pio(instance, &phase, &len, &data) &&
+                    msg[1] == SIMPLE_QUEUE_TAG)
+                        tag = msg[2];
+                TAG_PRINTK("scsi%d: target mask %02x, lun %d sent tag %d at "
+                           "reselection\n", HOSTNO, target_mask, lun, tag);
+        }
 #endif
-    
-    /* 
-     * Find the command corresponding to the I_T_L or I_T_L_Q  nexus we 
-     * just reestablished, and remove it from the disconnected queue.
-     */
-
-    for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL; 
-         tmp; prev = tmp, tmp = NEXT(tmp) ) {
-        if ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun)
+
+        /*
+         * Find the command corresponding to the I_T_L or I_T_L_Q  nexus we
+         * just reestablished, and remove it from the disconnected queue.
+         */
+
+        for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL;
+             tmp; prev = tmp, tmp = NEXT(tmp)) {
+                if ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun)
 #ifdef SUPPORT_TAGS
-            && (tag == tmp->tag) 
+                    && (tag == tmp->tag)
 #endif
-            ) {
-            /* ++guenther: prevent race with falcon_release_lock */
-            falcon_dont_release++;
-            if (prev) {
-                REMOVE(prev, NEXT(prev), tmp, NEXT(tmp));
-                NEXT(prev) = NEXT(tmp);
-            } else {
-                REMOVE(-1, hostdata->disconnected_queue, tmp, NEXT(tmp));
-                hostdata->disconnected_queue = NEXT(tmp);
-            }
-            NEXT(tmp) = NULL;
-            break;
+                    ) {
+                        /* ++guenther: prevent race with falcon_release_lock */
+                        falcon_dont_release++;
+                        if (prev) {
+                                REMOVE(prev, NEXT(prev), tmp, NEXT(tmp));
+                                SET_NEXT(prev, NEXT(tmp));
+                        } else {
+                                REMOVE(-1, hostdata->disconnected_queue, tmp, NEXT(tmp));
+                                hostdata->disconnected_queue = NEXT(tmp);
+                        }
+                        SET_NEXT(tmp, NULL);
+                        break;
+                }
         }
-    }
-    
-    if (!tmp) {
-        printk(KERN_WARNING "scsi%d: warning: target bitmask %02x lun %d "
+
+        if (!tmp) {
+                printk(KERN_WARNING "scsi%d: warning: target bitmask %02x lun %d "
 #ifdef SUPPORT_TAGS
-                "tag %d "
+                       "tag %d "
 #endif
-                "not in disconnected_queue.\n",
-                HOSTNO, target_mask, lun
+                       "not in disconnected_queue.\n",
+                       HOSTNO, target_mask, lun
 #ifdef SUPPORT_TAGS
-                , tag
+                       , tag
 #endif
-                );
-        /* 
-         * Since we have an established nexus that we can't do anything
-         * with, we must abort it.  
-         */
-        do_abort(instance);
-        return;
-    }
+                        );
+                /*
+                 * Since we have an established nexus that we can't do anything
+                 * with, we must abort it.
+                 */
+                do_abort(instance);
+                return;
+        }
 
-    /* Accept message by clearing ACK */
-    NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+        /* Accept message by clearing ACK */
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
 
-    hostdata->connected = tmp;
-    RSL_PRINTK("scsi%d: nexus established, target = %d, lun = %d, tag = %d\n",
-               HOSTNO, tmp->device->id, tmp->device->lun, tmp->tag);
-    falcon_dont_release--;
+        hostdata->connected = tmp;
+        RSL_PRINTK("scsi%d: nexus established, target = %d, lun = %d, tag = %d\n",
+                   HOSTNO, tmp->device->id, tmp->device->lun, tmp->tag);
+        falcon_dont_release--;
 }
 
 
@@ -2626,362 +2677,361 @@ static void NCR5380_reselect (struct Scsi_Host *instance)
  *
  * Purpose : abort a command
  *
- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the 
- *      host byte of the result field to, if zero DID_ABORTED is 
+ * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the
+ *      host byte of the result field to, if zero DID_ABORTED is
  *      used.
  *
  * Returns : 0 - success, -1 on failure.
  *
- * XXX - there is no way to abort the command that is currently 
- *       connected, you have to wait for it to complete.  If this is 
+ * XXX - there is no way to abort the command that is currently
+ *       connected, you have to wait for it to complete.  If this is
  *       a problem, we could implement longjmp() / setjmp(), setjmp()
- *       called where the loop started in NCR5380_main().
+ *       called where the loop started in NCR5380_main().
  */
 
 static
-int NCR5380_abort (Scsi_Cmnd *cmd)
+int NCR5380_abort(Scsi_Cmnd *cmd)
 {
-    struct Scsi_Host *instance = cmd->device->host;
-    SETUP_HOSTDATA(instance);
-    Scsi_Cmnd *tmp, **prev;
-    unsigned long flags;
+        struct Scsi_Host *instance = cmd->device->host;
+        SETUP_HOSTDATA(instance);
+        Scsi_Cmnd *tmp, **prev;
+        unsigned long flags;
+
+        printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
+        scsi_print_command(cmd);
 
-    printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
-    scsi_print_command(cmd);
+        NCR5380_print_status(instance);
 
-    NCR5380_print_status (instance);
+        local_irq_save(flags);
 
-    local_irq_save(flags);
-    
-    if (!IS_A_TT() && !falcon_got_lock)
-        printk(KERN_ERR "scsi%d: !!BINGO!! Falcon has no lock in NCR5380_abort\n",
-               HOSTNO);
+        if (!IS_A_TT() && !falcon_got_lock)
+                printk(KERN_ERR "scsi%d: !!BINGO!! Falcon has no lock in NCR5380_abort\n",
+                       HOSTNO);
 
-    ABRT_PRINTK("scsi%d: abort called basr 0x%02x, sr 0x%02x\n", HOSTNO,
-                NCR5380_read(BUS_AND_STATUS_REG),
-                NCR5380_read(STATUS_REG));
+        ABRT_PRINTK("scsi%d: abort called basr 0x%02x, sr 0x%02x\n", HOSTNO,
+                    NCR5380_read(BUS_AND_STATUS_REG),
+                    NCR5380_read(STATUS_REG));
 
 #if 1
-/* 
- * Case 1 : If the command is the currently executing command, 
- * we'll set the aborted flag and return control so that 
- * information transfer routine can exit cleanly.
- */
+        /*
+         * Case 1 : If the command is the currently executing command,
+         * we'll set the aborted flag and return control so that
+         * information transfer routine can exit cleanly.
+         */
 
-    if (hostdata->connected == cmd) {
+        if (hostdata->connected == cmd) {
 
-        ABRT_PRINTK("scsi%d: aborting connected command\n", HOSTNO);
-/*
- * We should perform BSY checking, and make sure we haven't slipped
- * into BUS FREE.
- */
+                ABRT_PRINTK("scsi%d: aborting connected command\n", HOSTNO);
+                /*
+                 * We should perform BSY checking, and make sure we haven't slipped
+                 * into BUS FREE.
+                 */
 
-/*      NCR5380_write(INITIATOR_COMMAND_REG, ICR_ASSERT_ATN); */
-/* 
- * Since we can't change phases until we've completed the current 
- * handshake, we have to source or sink a byte of data if the current
- * phase is not MSGOUT.
- */
+                /*      NCR5380_write(INITIATOR_COMMAND_REG, ICR_ASSERT_ATN); */
+                /*
+                 * Since we can't change phases until we've completed the current
+                 * handshake, we have to source or sink a byte of data if the current
+                 * phase is not MSGOUT.
+                 */
 
-/* 
- * Return control to the executing NCR drive so we can clear the
- * aborted flag and get back into our main loop.
- */ 
+                /*
+                 * Return control to the executing NCR drive so we can clear the
+                 * aborted flag and get back into our main loop.
+                 */
 
-        if (do_abort(instance) == 0) {
-          hostdata->aborted = 1;
-          hostdata->connected = NULL;
-          cmd->result = DID_ABORT << 16;
+                if (do_abort(instance) == 0) {
+                        hostdata->aborted = 1;
+                        hostdata->connected = NULL;
+                        cmd->result = DID_ABORT << 16;
 #ifdef SUPPORT_TAGS
-          cmd_free_tag( cmd );
+                        cmd_free_tag(cmd);
 #else
-          hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+                        hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
 #endif
-          local_irq_restore(flags);
-          cmd->scsi_done(cmd);
-          falcon_release_lock_if_possible( hostdata );
-          return SCSI_ABORT_SUCCESS;
-        } else {
-/*        local_irq_restore(flags); */
-          printk("scsi%d: abort of connected command failed!\n", HOSTNO);
-          return SCSI_ABORT_ERROR;
-        } 
-   }
+                        local_irq_restore(flags);
+                        cmd->scsi_done(cmd);
+                        falcon_release_lock_if_possible(hostdata);
+                        return SCSI_ABORT_SUCCESS;
+                } else {
+/*                      local_irq_restore(flags); */
+                        printk("scsi%d: abort of connected command failed!\n", HOSTNO);
+                        return SCSI_ABORT_ERROR;
+                }
+        }
 #endif
 
-/* 
- * Case 2 : If the command hasn't been issued yet, we simply remove it 
- *          from the issue queue.
- */
-    for (prev = (Scsi_Cmnd **) &(hostdata->issue_queue), 
-        tmp = (Scsi_Cmnd *) hostdata->issue_queue;
-        tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp) )
-        if (cmd == tmp) {
-            REMOVE(5, *prev, tmp, NEXT(tmp));
-            (*prev) = NEXT(tmp);
-            NEXT(tmp) = NULL;
-            tmp->result = DID_ABORT << 16;
-            local_irq_restore(flags);
-            ABRT_PRINTK("scsi%d: abort removed command from issue queue.\n",
-                        HOSTNO);
-            /* Tagged queuing note: no tag to free here, hasn't been assigned
-             * yet... */
-            tmp->scsi_done(tmp);
-            falcon_release_lock_if_possible( hostdata );
-            return SCSI_ABORT_SUCCESS;
+        /*
+         * Case 2 : If the command hasn't been issued yet, we simply remove it
+         *          from the issue queue.
+         */
+        for (prev = (Scsi_Cmnd **)&(hostdata->issue_queue),
+             tmp = (Scsi_Cmnd *)hostdata->issue_queue;
+             tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) {
+                if (cmd == tmp) {
+                        REMOVE(5, *prev, tmp, NEXT(tmp));
+                        (*prev) = NEXT(tmp);
+                        SET_NEXT(tmp, NULL);
+                        tmp->result = DID_ABORT << 16;
+                        local_irq_restore(flags);
+                        ABRT_PRINTK("scsi%d: abort removed command from issue queue.\n",
+                                    HOSTNO);
+                        /* Tagged queuing note: no tag to free here, hasn't been assigned
+                         * yet... */
+                        tmp->scsi_done(tmp);
+                        falcon_release_lock_if_possible(hostdata);
+                        return SCSI_ABORT_SUCCESS;
+                }
         }
 
-/* 
- * Case 3 : If any commands are connected, we're going to fail the abort
- *          and let the high level SCSI driver retry at a later time or 
- *          issue a reset.
- *
- *          Timeouts, and therefore aborted commands, will be highly unlikely
- *          and handling them cleanly in this situation would make the common
- *          case of noresets less efficient, and would pollute our code.  So,
- *          we fail.
- */
+        /*
+         * Case 3 : If any commands are connected, we're going to fail the abort
+         *          and let the high level SCSI driver retry at a later time or
+         *          issue a reset.
+         *
+         *          Timeouts, and therefore aborted commands, will be highly unlikely
+         *          and handling them cleanly in this situation would make the common
+         *          case of noresets less efficient, and would pollute our code.  So,
+         *          we fail.
+         */
 
-    if (hostdata->connected) {
-        local_irq_restore(flags);
-        ABRT_PRINTK("scsi%d: abort failed, command connected.\n", HOSTNO);
-        return SCSI_ABORT_SNOOZE;
-    }
+        if (hostdata->connected) {
+                local_irq_restore(flags);
+                ABRT_PRINTK("scsi%d: abort failed, command connected.\n", HOSTNO);
+                return SCSI_ABORT_SNOOZE;
+        }
 
-/*
- * Case 4: If the command is currently disconnected from the bus, and 
- *      there are no connected commands, we reconnect the I_T_L or 
- *      I_T_L_Q nexus associated with it, go into message out, and send 
- *      an abort message.
- *
- * This case is especially ugly. In order to reestablish the nexus, we
- * need to call NCR5380_select().  The easiest way to implement this 
- * function was to abort if the bus was busy, and let the interrupt
- * handler triggered on the SEL for reselect take care of lost arbitrations
- * where necessary, meaning interrupts need to be enabled.
- *
- * When interrupts are enabled, the queues may change - so we 
- * can't remove it from the disconnected queue before selecting it
- * because that could cause a failure in hashing the nexus if that 
- * device reselected.
- * 
- * Since the queues may change, we can't use the pointers from when we
- * first locate it.
- *
- * So, we must first locate the command, and if NCR5380_select()
- * succeeds, then issue the abort, relocate the command and remove
- * it from the disconnected queue.
- */
+        /*
+         * Case 4: If the command is currently disconnected from the bus, and
+         *      there are no connected commands, we reconnect the I_T_L or
+         *      I_T_L_Q nexus associated with it, go into message out, and send
+         *      an abort message.
+         *
+         * This case is especially ugly. In order to reestablish the nexus, we
+         * need to call NCR5380_select().  The easiest way to implement this
+         * function was to abort if the bus was busy, and let the interrupt
+         * handler triggered on the SEL for reselect take care of lost arbitrations
+         * where necessary, meaning interrupts need to be enabled.
+         *
+         * When interrupts are enabled, the queues may change - so we
+         * can't remove it from the disconnected queue before selecting it
+         * because that could cause a failure in hashing the nexus if that
+         * device reselected.
+         *
+         * Since the queues may change, we can't use the pointers from when we
+         * first locate it.
+         *
+         * So, we must first locate the command, and if NCR5380_select()
+         * succeeds, then issue the abort, relocate the command and remove
+         * it from the disconnected queue.
+         */
+
+        for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp;
+             tmp = NEXT(tmp)) {
+                if (cmd == tmp) {
+                        local_irq_restore(flags);
+                        ABRT_PRINTK("scsi%d: aborting disconnected command.\n", HOSTNO);
 
-    for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp;
-         tmp = NEXT(tmp)) 
-        if (cmd == tmp) {
-            local_irq_restore(flags);
-            ABRT_PRINTK("scsi%d: aborting disconnected command.\n", HOSTNO);
-  
-            if (NCR5380_select (instance, cmd, (int) cmd->tag)) 
-                return SCSI_ABORT_BUSY;
-
-            ABRT_PRINTK("scsi%d: nexus reestablished.\n", HOSTNO);
-
-            do_abort (instance);
-
-            local_irq_save(flags);
-            for (prev = (Scsi_Cmnd **) &(hostdata->disconnected_queue), 
-                tmp = (Scsi_Cmnd *) hostdata->disconnected_queue;
-                tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp) )
-                    if (cmd == tmp) {
-                    REMOVE(5, *prev, tmp, NEXT(tmp));
-                    *prev = NEXT(tmp);
-                    NEXT(tmp) = NULL;
-                    tmp->result = DID_ABORT << 16;
-                    /* We must unlock the tag/LUN immediately here, since the
-                     * target goes to BUS FREE and doesn't send us another
-                     * message (COMMAND_COMPLETE or the like)
-                     */
+                        if (NCR5380_select(instance, cmd, (int)cmd->tag))
+                                return SCSI_ABORT_BUSY;
+
+                        ABRT_PRINTK("scsi%d: nexus reestablished.\n", HOSTNO);
+
+                        do_abort(instance);
+
+                        local_irq_save(flags);
+                        for (prev = (Scsi_Cmnd **)&(hostdata->disconnected_queue),
+                             tmp = (Scsi_Cmnd *)hostdata->disconnected_queue;
+                             tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) {
+                                if (cmd == tmp) {
+                                        REMOVE(5, *prev, tmp, NEXT(tmp));
+                                        *prev = NEXT(tmp);
+                                        SET_NEXT(tmp, NULL);
+                                        tmp->result = DID_ABORT << 16;
+                                        /* We must unlock the tag/LUN immediately here, since the
+                                         * target goes to BUS FREE and doesn't send us another
+                                         * message (COMMAND_COMPLETE or the like)
+                                         */
 #ifdef SUPPORT_TAGS
-                    cmd_free_tag( tmp );
+                                        cmd_free_tag(tmp);
 #else
-                    hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+                                        hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
 #endif
-                    local_irq_restore(flags);
-                    tmp->scsi_done(tmp);
-                    falcon_release_lock_if_possible( hostdata );
-                    return SCSI_ABORT_SUCCESS;
+                                        local_irq_restore(flags);
+                                        tmp->scsi_done(tmp);
+                                        falcon_release_lock_if_possible(hostdata);
+                                        return SCSI_ABORT_SUCCESS;
+                                }
+                        }
                 }
         }
 
-/*
- * Case 5 : If we reached this point, the command was not found in any of 
- *          the queues.
- *
- * We probably reached this point because of an unlikely race condition
- * between the command completing successfully and the abortion code,
- * so we won't panic, but we will notify the user in case something really
- * broke.
- */
+        /*
+         * Case 5 : If we reached this point, the command was not found in any of
+         *          the queues.
+         *
+         * We probably reached this point because of an unlikely race condition
+         * between the command completing successfully and the abortion code,
+         * so we won't panic, but we will notify the user in case something really
+         * broke.
+         */
 
-    local_irq_restore(flags);
-    printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully\n"
-           KERN_INFO "        before abortion\n", HOSTNO); 
+        local_irq_restore(flags);
+        printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully\n"
+               KERN_INFO "        before abortion\n", HOSTNO);
 
-/* Maybe it is sufficient just to release the ST-DMA lock... (if
- * possible at all) At least, we should check if the lock could be
- * released after the abort, in case it is kept due to some bug.
- */
-    falcon_release_lock_if_possible( hostdata );
+        /* Maybe it is sufficient just to release the ST-DMA lock... (if
+         * possible at all) At least, we should check if the lock could be
+         * released after the abort, in case it is kept due to some bug.
+         */
+        falcon_release_lock_if_possible(hostdata);
 
-    return SCSI_ABORT_NOT_RUNNING;
+        return SCSI_ABORT_NOT_RUNNING;
 }
 
 
-/* 
+/*
  * Function : int NCR5380_reset (Scsi_Cmnd *cmd)
- * 
+ *
  * Purpose : reset the SCSI bus.
  *
  * Returns : SCSI_RESET_WAKEUP
  *
- */ 
+ */
 
-static int NCR5380_bus_reset( Scsi_Cmnd *cmd)
+static int NCR5380_bus_reset(Scsi_Cmnd *cmd)
 {
-    SETUP_HOSTDATA(cmd->device->host);
-    int           i;
-    unsigned long flags;
+        SETUP_HOSTDATA(cmd->device->host);
+        int i;
+        unsigned long flags;
 #if 1
-    Scsi_Cmnd *connected, *disconnected_queue;
+        Scsi_Cmnd *connected, *disconnected_queue;
 #endif
 
-    if (!IS_A_TT() && !falcon_got_lock)
-        printk(KERN_ERR "scsi%d: !!BINGO!! Falcon has no lock in NCR5380_reset\n",
-               H_NO(cmd) );
-
-    NCR5380_print_status (cmd->device->host);
-
-    /* get in phase */
-    NCR5380_write( TARGET_COMMAND_REG,
-                   PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) ));
-    /* assert RST */
-    NCR5380_write( INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_RST );
-    udelay (40);
-    /* reset NCR registers */
-    NCR5380_write( INITIATOR_COMMAND_REG, ICR_BASE );
-    NCR5380_write( MODE_REG, MR_BASE );
-    NCR5380_write( TARGET_COMMAND_REG, 0 );
-    NCR5380_write( SELECT_ENABLE_REG, 0 );
-    /* ++roman: reset interrupt condition! otherwise no interrupts don't get
-     * through anymore ... */
-    (void)NCR5380_read( RESET_PARITY_INTERRUPT_REG );
-
-#if 1 /* XXX Should now be done by midlevel code, but it's broken XXX */
-      /* XXX see below                                            XXX */
-
-    /* MSch: old-style reset: actually abort all command processing here */
-
-    /* After the reset, there are no more connected or disconnected commands
-     * and no busy units; to avoid problems with re-inserting the commands
-     * into the issue_queue (via scsi_done()), the aborted commands are
-     * remembered in local variables first.
-     */
-    local_irq_save(flags);
-    connected = (Scsi_Cmnd *)hostdata->connected;
-    hostdata->connected = NULL;
-    disconnected_queue = (Scsi_Cmnd *)hostdata->disconnected_queue;
-    hostdata->disconnected_queue = NULL;
+        if (!IS_A_TT() && !falcon_got_lock)
+                printk(KERN_ERR "scsi%d: !!BINGO!! Falcon has no lock in NCR5380_reset\n",
+                       H_NO(cmd));
+
+        NCR5380_print_status(cmd->device->host);
+
+        /* get in phase */
+        NCR5380_write(TARGET_COMMAND_REG,
+                      PHASE_SR_TO_TCR(NCR5380_read(STATUS_REG)));
+        /* assert RST */
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_RST);
+        udelay(40);
+        /* reset NCR registers */
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+        NCR5380_write(MODE_REG, MR_BASE);
+        NCR5380_write(TARGET_COMMAND_REG, 0);
+        NCR5380_write(SELECT_ENABLE_REG, 0);
+        /* ++roman: reset interrupt condition! otherwise no interrupts don't get
+         * through anymore ... */
+        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
+
+#if 1   /* XXX Should now be done by midlevel code, but it's broken XXX */
+        /* XXX see below                                            XXX */
+
+        /* MSch: old-style reset: actually abort all command processing here */
+
+        /* After the reset, there are no more connected or disconnected commands
+         * and no busy units; to avoid problems with re-inserting the commands
+         * into the issue_queue (via scsi_done()), the aborted commands are
+         * remembered in local variables first.
+         */
+        local_irq_save(flags);
+        connected = (Scsi_Cmnd *)hostdata->connected;
+        hostdata->connected = NULL;
+        disconnected_queue = (Scsi_Cmnd *)hostdata->disconnected_queue;
+        hostdata->disconnected_queue = NULL;
 #ifdef SUPPORT_TAGS
-    free_all_tags();
+        free_all_tags();
 #endif
-    for( i = 0; i < 8; ++i )
-        hostdata->busy[i] = 0;
+        for (i = 0; i < 8; ++i)
+                hostdata->busy[i] = 0;
 #ifdef REAL_DMA
-    hostdata->dma_len = 0;
+        hostdata->dma_len = 0;
 #endif
-    local_irq_restore(flags);
-
-    /* In order to tell the mid-level code which commands were aborted, 
-     * set the command status to DID_RESET and call scsi_done() !!!
-     * This ultimately aborts processing of these commands in the mid-level.
-     */
-
-    if ((cmd = connected)) {
-        ABRT_PRINTK("scsi%d: reset aborted a connected command\n", H_NO(cmd));
-        cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
-        cmd->scsi_done( cmd );
-    }
-
-    for (i = 0; (cmd = disconnected_queue); ++i) {
-        disconnected_queue = NEXT(cmd);
-        NEXT(cmd) = NULL;
-        cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
-        cmd->scsi_done( cmd );
-    }
-    if (i > 0)
-        ABRT_PRINTK("scsi: reset aborted %d disconnected command(s)\n", i);
-
-/* The Falcon lock should be released after a reset...
- */
-/* ++guenther: moved to atari_scsi_reset(), to prevent a race between
- * unlocking and enabling dma interrupt.
- */
-/*    falcon_release_lock_if_possible( hostdata );*/
+        local_irq_restore(flags);
+
+        /* In order to tell the mid-level code which commands were aborted,
+         * set the command status to DID_RESET and call scsi_done() !!!
+         * This ultimately aborts processing of these commands in the mid-level.
+         */
+
+        if ((cmd = connected)) {
+                ABRT_PRINTK("scsi%d: reset aborted a connected command\n", H_NO(cmd));
+                cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
+                cmd->scsi_done(cmd);
+        }
 
-    /* since all commands have been explicitly terminated, we need to tell
-     * the midlevel code that the reset was SUCCESSFUL, and there is no 
-     * need to 'wake up' the commands by a request_sense
-     */
-    return SCSI_RESET_SUCCESS | SCSI_RESET_BUS_RESET;
+        for (i = 0; (cmd = disconnected_queue); ++i) {
+                disconnected_queue = NEXT(cmd);
+                SET_NEXT(cmd, NULL);
+                cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
+                cmd->scsi_done(cmd);
+        }
+        if (i > 0)
+                ABRT_PRINTK("scsi: reset aborted %d disconnected command(s)\n", i);
+
+        /* The Falcon lock should be released after a reset...
+         */
+        /* ++guenther: moved to atari_scsi_reset(), to prevent a race between
+         * unlocking and enabling dma interrupt.
+         */
+/*      falcon_release_lock_if_possible( hostdata );*/
+
+        /* since all commands have been explicitly terminated, we need to tell
+         * the midlevel code that the reset was SUCCESSFUL, and there is no
+         * need to 'wake up' the commands by a request_sense
+         */
+        return SCSI_RESET_SUCCESS | SCSI_RESET_BUS_RESET;
 #else /* 1 */
 
-    /* MSch: new-style reset handling: let the mid-level do what it can */
-
-    /* ++guenther: MID-LEVEL IS STILL BROKEN.
-     * Mid-level is supposed to requeue all commands that were active on the
-     * various low-level queues. In fact it does this, but that's not enough
-     * because all these commands are subject to timeout. And if a timeout
-     * happens for any removed command, *_abort() is called but all queues
-     * are now empty. Abort then gives up the falcon lock, which is fatal,
-     * since the mid-level will queue more commands and must have the lock
-     * (it's all happening inside timer interrupt handler!!).
-     * Even worse, abort will return NOT_RUNNING for all those commands not
-     * on any queue, so they won't be retried ...
-     *
-     * Conclusion: either scsi.c disables timeout for all resetted commands
-     * immediately, or we lose!  As of linux-2.0.20 it doesn't.
-     */
-
-    /* After the reset, there are no more connected or disconnected commands
-     * and no busy units; so clear the low-level status here to avoid 
-     * conflicts when the mid-level code tries to wake up the affected 
-     * commands!
-     */
-
-    if (hostdata->issue_queue)
-        ABRT_PRINTK("scsi%d: reset aborted issued command(s)\n", H_NO(cmd));
-    if (hostdata->connected) 
-        ABRT_PRINTK("scsi%d: reset aborted a connected command\n", H_NO(cmd));
-    if (hostdata->disconnected_queue)
-        ABRT_PRINTK("scsi%d: reset aborted disconnected command(s)\n", H_NO(cmd));
-
-    local_irq_save(flags);
-    hostdata->issue_queue = NULL;
-    hostdata->connected = NULL;
-    hostdata->disconnected_queue = NULL;
+        /* MSch: new-style reset handling: let the mid-level do what it can */
+
+        /* ++guenther: MID-LEVEL IS STILL BROKEN.
+         * Mid-level is supposed to requeue all commands that were active on the
+         * various low-level queues. In fact it does this, but that's not enough
+         * because all these commands are subject to timeout. And if a timeout
+         * happens for any removed command, *_abort() is called but all queues
+         * are now empty. Abort then gives up the falcon lock, which is fatal,
+         * since the mid-level will queue more commands and must have the lock
+         * (it's all happening inside timer interrupt handler!!).
+         * Even worse, abort will return NOT_RUNNING for all those commands not
+         * on any queue, so they won't be retried ...
+         *
+         * Conclusion: either scsi.c disables timeout for all resetted commands
+         * immediately, or we lose!  As of linux-2.0.20 it doesn't.
+         */
+
+        /* After the reset, there are no more connected or disconnected commands
+         * and no busy units; so clear the low-level status here to avoid
+         * conflicts when the mid-level code tries to wake up the affected
+         * commands!
+         */
+
+        if (hostdata->issue_queue)
+                ABRT_PRINTK("scsi%d: reset aborted issued command(s)\n", H_NO(cmd));
+        if (hostdata->connected)
+                ABRT_PRINTK("scsi%d: reset aborted a connected command\n", H_NO(cmd));
+        if (hostdata->disconnected_queue)
+                ABRT_PRINTK("scsi%d: reset aborted disconnected command(s)\n", H_NO(cmd));
+
+        local_irq_save(flags);
+        hostdata->issue_queue = NULL;
+        hostdata->connected = NULL;
+        hostdata->disconnected_queue = NULL;
 #ifdef SUPPORT_TAGS
-    free_all_tags();
+        free_all_tags();
 #endif
-    for( i = 0; i < 8; ++i )
-        hostdata->busy[i] = 0;
+        for (i = 0; i < 8; ++i)
+                hostdata->busy[i] = 0;
 #ifdef REAL_DMA
-    hostdata->dma_len = 0;
+        hostdata->dma_len = 0;
 #endif
-    local_irq_restore(flags);
+        local_irq_restore(flags);
 
-    /* we did no complete reset of all commands, so a wakeup is required */
-    return SCSI_RESET_WAKEUP | SCSI_RESET_BUS_RESET;
+        /* we did no complete reset of all commands, so a wakeup is required */
+        return SCSI_RESET_WAKEUP | SCSI_RESET_BUS_RESET;
 #endif /* 1 */
 }
-
-/* Local Variables: */
-/* tab-width: 8     */
-/* End:             */
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 642de7b2b7a2..6f8403b82ba1 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -69,9 +69,9 @@
 
 #define NDEBUG (0)
 
-#define NDEBUG_ABORT    0x800000
-#define NDEBUG_TAGS     0x1000000
-#define NDEBUG_MERGING  0x2000000
+#define NDEBUG_ABORT            0x00100000
+#define NDEBUG_TAGS             0x00200000
+#define NDEBUG_MERGING          0x00400000
 
 #define AUTOSENSE
 /* For the Atari version, use only polled IO or REAL_DMA */
@@ -186,38 +186,37 @@ static inline void DISABLE_IRQ(void)
 /***************************** Prototypes *****************************/
 
 #ifdef REAL_DMA
-static int scsi_dma_is_ignored_buserr( unsigned char dma_stat );
-static void atari_scsi_fetch_restbytes( void );
-static long atari_scsi_dma_residual( struct Scsi_Host *instance );
-static int falcon_classify_cmd( Scsi_Cmnd *cmd );
-static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
-                                         Scsi_Cmnd *cmd, int write_flag );
+static int scsi_dma_is_ignored_buserr(unsigned char dma_stat);
+static void atari_scsi_fetch_restbytes(void);
+static long atari_scsi_dma_residual(struct Scsi_Host *instance);
+static int falcon_classify_cmd(Scsi_Cmnd *cmd);
+static unsigned long atari_dma_xfer_len(unsigned long wanted_len,
+                                        Scsi_Cmnd *cmd, int write_flag);
 #endif
-static irqreturn_t scsi_tt_intr( int irq, void *dummy);
-static irqreturn_t scsi_falcon_intr( int irq, void *dummy);
-static void falcon_release_lock_if_possible( struct NCR5380_hostdata *
-                                             hostdata );
-static void falcon_get_lock( void );
+static irqreturn_t scsi_tt_intr(int irq, void *dummy);
+static irqreturn_t scsi_falcon_intr(int irq, void *dummy);
+static void falcon_release_lock_if_possible(struct NCR5380_hostdata *hostdata);
+static void falcon_get_lock(void);
 #ifdef CONFIG_ATARI_SCSI_RESET_BOOT
-static void atari_scsi_reset_boot( void );
+static void atari_scsi_reset_boot(void);
 #endif
-static unsigned char atari_scsi_tt_reg_read( unsigned char reg );
-static void atari_scsi_tt_reg_write( unsigned char reg, unsigned char value);
-static unsigned char atari_scsi_falcon_reg_read( unsigned char reg );
-static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value );
+static unsigned char atari_scsi_tt_reg_read(unsigned char reg);
+static void atari_scsi_tt_reg_write(unsigned char reg, unsigned char value);
+static unsigned char atari_scsi_falcon_reg_read(unsigned char reg);
+static void atari_scsi_falcon_reg_write(unsigned char reg, unsigned char value);
 
 /************************* End of Prototypes **************************/
 
 
-static struct Scsi_Host *atari_scsi_host = NULL;
-static unsigned char (*atari_scsi_reg_read)( unsigned char reg );
-static void (*atari_scsi_reg_write)( unsigned char reg, unsigned char value );
+static struct Scsi_Host *atari_scsi_host;
+static unsigned char (*atari_scsi_reg_read)(unsigned char reg);
+static void (*atari_scsi_reg_write)(unsigned char reg, unsigned char value);
 
 #ifdef REAL_DMA
 static unsigned long    atari_dma_residual, atari_dma_startaddr;
 static short            atari_dma_active;
 /* pointer to the dribble buffer */
-static char             *atari_dma_buffer = NULL;
+static char             *atari_dma_buffer;
 /* precalculated physical address of the dribble buffer */
 static unsigned long    atari_dma_phys_buffer;
 /* != 0 tells the Falcon int handler to copy data from the dribble buffer */
@@ -233,7 +232,7 @@ static char		*atari_dma_orig_addr;
 static unsigned long    atari_dma_stram_mask;
 #define STRAM_ADDR(a)   (((a) & atari_dma_stram_mask) == 0)
 /* number of bytes to cut from a transfer to handle NCR overruns */
-static int atari_read_overruns = 0;
+static int atari_read_overruns;
 #endif
 
 static int setup_can_queue = -1;
@@ -256,10 +255,10 @@ module_param(setup_hostid, int, 0);
 
 #if defined(REAL_DMA)
 
-static int scsi_dma_is_ignored_buserr( unsigned char dma_stat )
+static int scsi_dma_is_ignored_buserr(unsigned char dma_stat)
 {
         int i;
-        unsigned long   addr = SCSI_DMA_READ_P( dma_addr ), end_addr;
+        unsigned long addr = SCSI_DMA_READ_P(dma_addr), end_addr;
 
         if (dma_stat & 0x01) {
 
@@ -267,15 +266,14 @@ static int scsi_dma_is_ignored_buserr( unsigned char dma_stat )
                  * physical memory chunk (DMA prefetch!), but that doesn't hurt.
                  * Check for this case:
                  */
-                
-                for( i = 0; i < m68k_num_memory; ++i ) {
-                        end_addr = m68k_memory[i].addr +
-                                m68k_memory[i].size;
+
+                for (i = 0; i < m68k_num_memory; ++i) {
+                        end_addr = m68k_memory[i].addr + m68k_memory[i].size;
                         if (end_addr <= addr && addr <= end_addr + 4)
-                                return( 1 );
+                                return 1;
                 }
         }
-        return( 0 );
+        return 0;
 }
 
 
@@ -284,28 +282,27 @@ static int scsi_dma_is_ignored_buserr( unsigned char dma_stat )
  * end-of-DMA, both SCSI ints are triggered simultaneously, so the NCR int has
  * to clear the DMA int pending bit before it allows other level 6 interrupts.
  */
-static void scsi_dma_buserr (int irq, void *dummy)
+static void scsi_dma_buserr(int irq, void *dummy)
 {
-        unsigned char   dma_stat = tt_scsi_dma.dma_ctrl;
+        unsigned char dma_stat = tt_scsi_dma.dma_ctrl;
 
         /* Don't do anything if a NCR interrupt is pending. Probably it's just
          * masked... */
-        if (atari_irq_pending( IRQ_TT_MFP_SCSI ))
+        if (atari_irq_pending(IRQ_TT_MFP_SCSI))
                 return;
-        
+
         printk("Bad SCSI DMA interrupt! dma_addr=0x%08lx dma_stat=%02x dma_cnt=%08lx\n",
                SCSI_DMA_READ_P(dma_addr), dma_stat, SCSI_DMA_READ_P(dma_cnt));
         if (dma_stat & 0x80) {
-                if (!scsi_dma_is_ignored_buserr( dma_stat ))
-                        printk( "SCSI DMA bus error -- bad DMA programming!\n" );
-        }
-        else {
+                if (!scsi_dma_is_ignored_buserr(dma_stat))
+                        printk("SCSI DMA bus error -- bad DMA programming!\n");
+        } else {
                 /* Under normal circumstances we never should get to this point,
                  * since both interrupts are triggered simultaneously and the 5380
                  * int has higher priority. When this irq is handled, that DMA
                  * interrupt is cleared. So a warning message is printed here.
                  */
-                printk( "SCSI DMA intr ?? -- this shouldn't happen!\n" );
+                printk("SCSI DMA intr ?? -- this shouldn't happen!\n");
         }
 }
 #endif
@@ -313,7 +310,7 @@ static void scsi_dma_buserr (int irq, void *dummy)
 #endif
 
 
-static irqreturn_t scsi_tt_intr (int irq, void *dummy)
+static irqreturn_t scsi_tt_intr(int irq, void *dummy)
 {
 #ifdef REAL_DMA
         int dma_stat;
@@ -327,7 +324,7 @@ static irqreturn_t scsi_tt_intr (int irq, void *dummy)
          * is that a bus error occurred...
          */
         if (dma_stat & 0x80) {
-                if (!scsi_dma_is_ignored_buserr( dma_stat )) {
+                if (!scsi_dma_is_ignored_buserr(dma_stat)) {
                         printk(KERN_ERR "SCSI DMA caused bus error near 0x%08lx\n",
                                SCSI_DMA_READ_P(dma_addr));
                         printk(KERN_CRIT "SCSI DMA bus error -- bad DMA programming!");
@@ -344,8 +341,7 @@ static irqreturn_t scsi_tt_intr (int irq, void *dummy)
          * data reg!
          */
         if ((dma_stat & 0x02) && !(dma_stat & 0x40)) {
-                atari_dma_residual = HOSTDATA_DMALEN - (SCSI_DMA_READ_P( dma_addr ) -
-                                                                                                atari_dma_startaddr);
+                atari_dma_residual = HOSTDATA_DMALEN - (SCSI_DMA_READ_P(dma_addr) - atari_dma_startaddr);
 
                 DMA_PRINTK("SCSI DMA: There are %ld residual bytes.\n",
                            atari_dma_residual);
@@ -353,28 +349,30 @@ static irqreturn_t scsi_tt_intr (int irq, void *dummy)
                 if ((signed int)atari_dma_residual < 0)
                         atari_dma_residual = 0;
                 if ((dma_stat & 1) == 0) {
-                        /* After read operations, we maybe have to
-                           transport some rest bytes */
+                        /*
+                         * After read operations, we maybe have to
+                         * transport some rest bytes
+                         */
                         atari_scsi_fetch_restbytes();
-                }
-                else {
-                        /* There seems to be a nasty bug in some SCSI-DMA/NCR
-                           combinations: If a target disconnects while a write
-                           operation is going on, the address register of the
-                           DMA may be a few bytes farer than it actually read.
-                           This is probably due to DMA prefetching and a delay
-                           between DMA and NCR.  Experiments showed that the
-                           dma_addr is 9 bytes to high, but this could vary.
-                           The problem is, that the residual is thus calculated
-                           wrong and the next transfer will start behind where
-                           it should.  So we round up the residual to the next
-                           multiple of a sector size, if it isn't already a
-                           multiple and the originally expected transfer size
-                           was.  The latter condition is there to ensure that
-                           the correction is taken only for "real" data
-                           transfers and not for, e.g., the parameters of some
-                           other command.  These shouldn't disconnect anyway.
-                           */
+                } else {
+                        /*
+                         * There seems to be a nasty bug in some SCSI-DMA/NCR
+                         * combinations: If a target disconnects while a write
+                         * operation is going on, the address register of the
+                         * DMA may be a few bytes farer than it actually read.
+                         * This is probably due to DMA prefetching and a delay
+                         * between DMA and NCR.  Experiments showed that the
+                         * dma_addr is 9 bytes to high, but this could vary.
+                         * The problem is, that the residual is thus calculated
+                         * wrong and the next transfer will start behind where
+                         * it should.  So we round up the residual to the next
+                         * multiple of a sector size, if it isn't already a
+                         * multiple and the originally expected transfer size
+                         * was.  The latter condition is there to ensure that
+                         * the correction is taken only for "real" data
+                         * transfers and not for, e.g., the parameters of some
+                         * other command.  These shouldn't disconnect anyway.
+                         */
                         if (atari_dma_residual & 0x1ff) {
                                 DMA_PRINTK("SCSI DMA: DMA bug corrected, "
                                            "difference %ld bytes\n",
@@ -394,18 +392,18 @@ static irqreturn_t scsi_tt_intr (int irq, void *dummy)
         }
 
 #endif /* REAL_DMA */
-        
-        NCR5380_intr (0, 0, 0);
+
+        NCR5380_intr(0, 0);
 
 #if 0
         /* To be sure the int is not masked */
-        atari_enable_irq( IRQ_TT_MFP_SCSI );
+        atari_enable_irq(IRQ_TT_MFP_SCSI);
 #endif
         return IRQ_HANDLED;
 }
 
 
-static irqreturn_t scsi_falcon_intr (int irq, void *dummy)
+static irqreturn_t scsi_falcon_intr(int irq, void *dummy)
 {
 #ifdef REAL_DMA
         int dma_stat;
@@ -430,7 +428,7 @@ static irqreturn_t scsi_falcon_intr (int irq, void *dummy)
          * bytes are stuck in the ST-DMA fifo (there's no way to reach them!)
          */
         if (atari_dma_active && (dma_stat & 0x02)) {
-                unsigned long   transferred;
+                unsigned long transferred;
 
                 transferred = SCSI_DMA_GETADR() - atari_dma_startaddr;
                 /* The ST-DMA address is incremented in 2-byte steps, but the
@@ -445,8 +443,7 @@ static irqreturn_t scsi_falcon_intr (int irq, void *dummy)
                 atari_dma_residual = HOSTDATA_DMALEN - transferred;
                 DMA_PRINTK("SCSI DMA: There are %ld residual bytes.\n",
                            atari_dma_residual);
-        }
-        else
+        } else
                 atari_dma_residual = 0;
         atari_dma_active = 0;
 
@@ -461,13 +458,13 @@ static irqreturn_t scsi_falcon_intr (int irq, void *dummy)
 
 #endif /* REAL_DMA */
 
-        NCR5380_intr (0, 0, 0);
+        NCR5380_intr(0, 0);
         return IRQ_HANDLED;
 }
 
 
 #ifdef REAL_DMA
-static void atari_scsi_fetch_restbytes( void )
+static void atari_scsi_fetch_restbytes(void)
 {
         int nr;
         char *src, *dst;
@@ -505,19 +502,17 @@ static int falcon_dont_release = 0;
  * again (but others waiting longer more probably will win).
  */
 
-static void
-falcon_release_lock_if_possible( struct NCR5380_hostdata * hostdata )
+static void falcon_release_lock_if_possible(struct NCR5380_hostdata *hostdata)
 {
         unsigned long flags;
-                
-        if (IS_A_TT()) return;
-        
+
+        if (IS_A_TT())
+                return;
+
         local_irq_save(flags);
 
-        if (falcon_got_lock &&
-                !hostdata->disconnected_queue &&
-                !hostdata->issue_queue &&
-                !hostdata->connected) {
+        if (falcon_got_lock && !hostdata->disconnected_queue &&
+            !hostdata->issue_queue && !hostdata->connected) {
 
                 if (falcon_dont_release) {
 #if 0
@@ -528,7 +523,7 @@ falcon_release_lock_if_possible( struct NCR5380_hostdata * hostdata )
                 }
                 falcon_got_lock = 0;
                 stdma_release();
-                wake_up( &falcon_fairness_wait );
+                wake_up(&falcon_fairness_wait);
         }
 
         local_irq_restore(flags);
@@ -549,31 +544,31 @@ falcon_release_lock_if_possible( struct NCR5380_hostdata * hostdata )
  * Complicated, complicated.... Sigh...
  */
 
-static void falcon_get_lock( void )
+static void falcon_get_lock(void)
 {
         unsigned long flags;
 
-        if (IS_A_TT()) return;
+        if (IS_A_TT())
+                return;
 
         local_irq_save(flags);
 
-        while( !in_interrupt() && falcon_got_lock && stdma_others_waiting() )
-                sleep_on( &falcon_fairness_wait );
+        while (!in_irq() && falcon_got_lock && stdma_others_waiting())
+                sleep_on(&falcon_fairness_wait);
 
         while (!falcon_got_lock) {
-                if (in_interrupt())
-                        panic( "Falcon SCSI hasn't ST-DMA lock in interrupt" );
+                if (in_irq())
+                        panic("Falcon SCSI hasn't ST-DMA lock in interrupt");
                 if (!falcon_trying_lock) {
                         falcon_trying_lock = 1;
                         stdma_lock(scsi_falcon_intr, NULL);
                         falcon_got_lock = 1;
                         falcon_trying_lock = 0;
-                        wake_up( &falcon_try_wait );
-                }
-                else {
-                        sleep_on( &falcon_try_wait );
+                        wake_up(&falcon_try_wait);
+                } else {
+                        sleep_on(&falcon_try_wait);
                 }
-        }       
+        }
 
         local_irq_restore(flags);
         if (!falcon_got_lock)
@@ -587,18 +582,18 @@ static void falcon_get_lock( void )
  */
 
 #if 0
-int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
+int atari_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
 {
         /* falcon_get_lock();
          * ++guenther: moved to NCR5380_queue_command() to prevent
          * race condition, see there for an explanation.
          */
-        return( NCR5380_queue_command( cmd, done ) );
+        return NCR5380_queue_command(cmd, done);
 }
 #endif
 
 
-int atari_scsi_detect (struct scsi_host_template *host)
+int atari_scsi_detect(struct scsi_host_template *host)
 {
         static int called = 0;
         struct Scsi_Host *instance;
@@ -606,7 +601,7 @@ int atari_scsi_detect (struct scsi_host_template *host)
         if (!MACH_IS_ATARI ||
             (!ATARIHW_PRESENT(ST_SCSI) && !ATARIHW_PRESENT(TT_SCSI)) ||
             called)
-                return( 0 );
+                return 0;
 
         host->proc_name = "Atari";
 
@@ -655,32 +650,33 @@ int atari_scsi_detect (struct scsi_host_template *host)
             !ATARIHW_PRESENT(EXTD_DMA) && m68k_num_memory > 1) {
                 atari_dma_buffer = atari_stram_alloc(STRAM_BUFFER_SIZE, "SCSI");
                 if (!atari_dma_buffer) {
-                        printk( KERN_ERR "atari_scsi_detect: can't allocate ST-RAM "
-                                        "double buffer\n" );
-                        return( 0 );
+                        printk(KERN_ERR "atari_scsi_detect: can't allocate ST-RAM "
+                                        "double buffer\n");
+                        return 0;
                 }
-                atari_dma_phys_buffer = virt_to_phys( atari_dma_buffer );
+                atari_dma_phys_buffer = virt_to_phys(atari_dma_buffer);
                 atari_dma_orig_addr = 0;
         }
 #endif
-        instance = scsi_register (host, sizeof (struct NCR5380_hostdata));
-        if(instance == NULL)
-        {
+        instance = scsi_register(host, sizeof(struct NCR5380_hostdata));
+        if (instance == NULL) {
                 atari_stram_free(atari_dma_buffer);
                 atari_dma_buffer = 0;
                 return 0;
         }
         atari_scsi_host = instance;
-       /* Set irq to 0, to avoid that the mid-level code disables our interrupt
-        * during queue_command calls. This is completely unnecessary, and even
-        * worse causes bad problems on the Falcon, where the int is shared with
-        * IDE and floppy! */
+        /*
+         * Set irq to 0, to avoid that the mid-level code disables our interrupt
+         * during queue_command calls. This is completely unnecessary, and even
+         * worse causes bad problems on the Falcon, where the int is shared with
+         * IDE and floppy!
+         */
        instance->irq = 0;
 
 #ifdef CONFIG_ATARI_SCSI_RESET_BOOT
         atari_scsi_reset_boot();
 #endif
-        NCR5380_init (instance, 0);
+        NCR5380_init(instance, 0);
 
         if (IS_A_TT()) {
 
@@ -727,11 +723,10 @@ int atari_scsi_detect (struct scsi_host_template *host)
                          * the rest data bug is fixed, this can be lowered to 1.
                          */
                         atari_read_overruns = 4;
-                }               
+                }
 #endif /*REAL_DMA*/
-        }
-        else { /* ! IS_A_TT */
-                
+        } else { /* ! IS_A_TT */
+
                 /* Nothing to do for the interrupt: the ST-DMA is initialized
                  * already by atari_init_INTS()
                  */
@@ -756,23 +751,21 @@ int atari_scsi_detect (struct scsi_host_template *host)
                         setup_use_tagged_queuing ? "yes" : "no",
 #endif
                         instance->hostt->this_id );
-        NCR5380_print_options (instance);
-        printk ("\n");
+        NCR5380_print_options(instance);
+        printk("\n");
 
         called = 1;
-        return( 1 );
+        return 1;
 }
 
-#ifdef MODULE
-int atari_scsi_release (struct Scsi_Host *sh)
+int atari_scsi_release(struct Scsi_Host *sh)
 {
         if (IS_A_TT())
                 free_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr);
         if (atari_dma_buffer)
-                atari_stram_free (atari_dma_buffer);
+                atari_stram_free(atari_dma_buffer);
         return 1;
 }
-#endif
 
 void __init atari_scsi_setup(char *str, int *ints)
 {
@@ -781,9 +774,9 @@ void __init atari_scsi_setup(char *str, int *ints)
          * Defaults depend on TT or Falcon, hostid determined at run time.
          * Negative values mean don't change.
          */
-        
+
         if (ints[0] < 1) {
-                printk( "atari_scsi_setup: no arguments!\n" );
+                printk("atari_scsi_setup: no arguments!\n");
                 return;
         }
 
@@ -809,7 +802,7 @@ void __init atari_scsi_setup(char *str, int *ints)
                 if (ints[4] >= 0 && ints[4] <= 7)
                         setup_hostid = ints[4];
                 else if (ints[4] > 7)
-                        printk( "atari_scsi_setup: invalid host ID %d !\n", ints[4] );
+                        printk("atari_scsi_setup: invalid host ID %d !\n", ints[4]);
         }
 #ifdef SUPPORT_TAGS
         if (ints[0] >= 5) {
@@ -821,7 +814,7 @@ void __init atari_scsi_setup(char *str, int *ints)
 
 int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
 {
-        int             rv;
+        int rv;
         struct NCR5380_hostdata *hostdata =
                 (struct NCR5380_hostdata *)cmd->device->host->hostdata;
 
@@ -831,13 +824,12 @@ int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
          */
         /* And abort a maybe active DMA transfer */
         if (IS_A_TT()) {
-                atari_turnoff_irq( IRQ_TT_MFP_SCSI );
+                atari_turnoff_irq(IRQ_TT_MFP_SCSI);
 #ifdef REAL_DMA
                 tt_scsi_dma.dma_ctrl = 0;
 #endif /* REAL_DMA */
-        }
-        else {
-                atari_turnoff_irq( IRQ_MFP_FSCSI );
+        } else {
+                atari_turnoff_irq(IRQ_MFP_FSCSI);
 #ifdef REAL_DMA
                 st_dma.dma_mode_status = 0x90;
                 atari_dma_active = 0;
@@ -849,52 +841,51 @@ int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
 
         /* Re-enable ints */
         if (IS_A_TT()) {
-                atari_turnon_irq( IRQ_TT_MFP_SCSI );
-        }
-        else {
-                atari_turnon_irq( IRQ_MFP_FSCSI );
+                atari_turnon_irq(IRQ_TT_MFP_SCSI);
+        } else {
+                atari_turnon_irq(IRQ_MFP_FSCSI);
         }
         if ((rv & SCSI_RESET_ACTION) == SCSI_RESET_SUCCESS)
                 falcon_release_lock_if_possible(hostdata);
 
-        return( rv );
+        return rv;
 }
 
-        
+
 #ifdef CONFIG_ATARI_SCSI_RESET_BOOT
 static void __init atari_scsi_reset_boot(void)
 {
         unsigned long end;
-        
+
         /*
          * Do a SCSI reset to clean up the bus during initialization. No messing
          * with the queues, interrupts, or locks necessary here.
          */
 
-        printk( "Atari SCSI: resetting the SCSI bus..." );
+        printk("Atari SCSI: resetting the SCSI bus...");
 
         /* get in phase */
-        NCR5380_write( TARGET_COMMAND_REG,
-                      PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) ));
+        NCR5380_write(TARGET_COMMAND_REG,
+                      PHASE_SR_TO_TCR(NCR5380_read(STATUS_REG)));
 
         /* assert RST */
-        NCR5380_write( INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_RST );
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_RST);
         /* The min. reset hold time is 25us, so 40us should be enough */
-        udelay( 50 );
+        udelay(50);
         /* reset RST and interrupt */
-        NCR5380_write( INITIATOR_COMMAND_REG, ICR_BASE );
-        NCR5380_read( RESET_PARITY_INTERRUPT_REG );
+        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
+        NCR5380_read(RESET_PARITY_INTERRUPT_REG);
 
         end = jiffies + AFTER_RESET_DELAY;
         while (time_before(jiffies, end))
                 barrier();
 
-        printk( " done\n" );
+        printk(" done\n");
 }
 #endif
 
 
-const char * atari_scsi_info (struct Scsi_Host *host)
+const char *atari_scsi_info(struct Scsi_Host *host)
 {
         /* atari_scsi_detect() is verbose enough... */
         static const char string[] = "Atari native SCSI";
@@ -904,10 +895,10 @@ const char * atari_scsi_info (struct Scsi_Host *host)
 
 #if defined(REAL_DMA)
 
-unsigned long atari_scsi_dma_setup( struct Scsi_Host *instance, void *data,
-                                   unsigned long count, int dir )
+unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, void *data,
+                                   unsigned long count, int dir)
 {
-        unsigned long addr = virt_to_phys( data );
+        unsigned long addr = virt_to_phys(data);
 
         DMA_PRINTK("scsi%d: setting up dma, data = %p, phys = %lx, count = %ld, "
                    "dir = %d\n", instance->host_no, data, addr, count, dir);
@@ -919,38 +910,37 @@ unsigned long atari_scsi_dma_setup( struct Scsi_Host *instance, void *data,
                  * wanted address.
                  */
                 if (dir)
-                        memcpy( atari_dma_buffer, data, count );
+                        memcpy(atari_dma_buffer, data, count);
                 else
                         atari_dma_orig_addr = data;
                 addr = atari_dma_phys_buffer;
         }
-        
+
         atari_dma_startaddr = addr;     /* Needed for calculating residual later. */
-  
+
         /* Cache cleanup stuff: On writes, push any dirty cache out before sending
          * it to the peripheral. (Must be done before DMA setup, since at least
          * the ST-DMA begins to fill internal buffers right after setup. For
          * reads, invalidate any cache, may be altered after DMA without CPU
          * knowledge.
-         * 
+         *
          * ++roman: For the Medusa, there's no need at all for that cache stuff,
          * because the hardware does bus snooping (fine!).
          */
-        dma_cache_maintenance( addr, count, dir );
+        dma_cache_maintenance(addr, count, dir);
 
         if (count == 0)
                 printk(KERN_NOTICE "SCSI warning: DMA programmed for 0 bytes !\n");
 
         if (IS_A_TT()) {
                 tt_scsi_dma.dma_ctrl = dir;
-                SCSI_DMA_WRITE_P( dma_addr, addr );
-                SCSI_DMA_WRITE_P( dma_cnt, count );
+                SCSI_DMA_WRITE_P(dma_addr, addr);
+                SCSI_DMA_WRITE_P(dma_cnt, count);
                 tt_scsi_dma.dma_ctrl = dir | 2;
-        }
-        else { /* ! IS_A_TT */
-  
+        } else { /* ! IS_A_TT */
+
                 /* set address */
-                SCSI_DMA_SETADR( addr );
+                SCSI_DMA_SETADR(addr);
 
                 /* toggle direction bit to clear FIFO and set DMA direction */
                 dir <<= 8;
@@ -968,13 +958,13 @@ unsigned long atari_scsi_dma_setup( struct Scsi_Host *instance, void *data,
                 atari_dma_active = 1;
         }
 
-        return( count );
+        return count;
 }
 
 
-static long atari_scsi_dma_residual( struct Scsi_Host *instance )
+static long atari_scsi_dma_residual(struct Scsi_Host *instance)
 {
-        return( atari_dma_residual );
+        return atari_dma_residual;
 }
 
 
@@ -982,13 +972,13 @@ static long atari_scsi_dma_residual( struct Scsi_Host *instance )
 #define CMD_SURELY_BYTE_MODE    1
 #define CMD_MODE_UNKNOWN                2
 
-static int falcon_classify_cmd( Scsi_Cmnd *cmd )
+static int falcon_classify_cmd(Scsi_Cmnd *cmd)
 {
         unsigned char opcode = cmd->cmnd[0];
-        
+
         if (opcode == READ_DEFECT_DATA || opcode == READ_LONG ||
-                opcode == READ_BUFFER)
-                return( CMD_SURELY_BYTE_MODE );
+            opcode == READ_BUFFER)
+                return CMD_SURELY_BYTE_MODE;
         else if (opcode == READ_6 || opcode == READ_10 ||
                  opcode == 0xa8 /* READ_12 */ || opcode == READ_REVERSE ||
                  opcode == RECOVER_BUFFERED_DATA) {
@@ -996,12 +986,11 @@ static int falcon_classify_cmd( Scsi_Cmnd *cmd )
                  * needed here: The transfer is block-mode only if the 'fixed' bit is
                  * set! */
                 if (cmd->device->type == TYPE_TAPE && !(cmd->cmnd[1] & 1))
-                        return( CMD_SURELY_BYTE_MODE );
+                        return CMD_SURELY_BYTE_MODE;
                 else
-                        return( CMD_SURELY_BLOCK_MODE );
-        }
-        else
-                return( CMD_MODE_UNKNOWN );
+                        return CMD_SURELY_BLOCK_MODE;
+        } else
+                return CMD_MODE_UNKNOWN;
 }
 
 
@@ -1014,19 +1003,18 @@ static int falcon_classify_cmd( Scsi_Cmnd *cmd )
  * the overrun problem, so this question is academic :-)
  */
 
-static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
-                                        Scsi_Cmnd *cmd,
-                                        int write_flag )
+static unsigned long atari_dma_xfer_len(unsigned long wanted_len,
+                                        Scsi_Cmnd *cmd, int write_flag)
 {
         unsigned long   possible_len, limit;
 #ifndef CONFIG_TT_DMA_EMUL
         if (MACH_IS_HADES)
                 /* Hades has no SCSI DMA at all :-( Always force use of PIO */
-                return( 0 );
-#endif  
+                return 0;
+#endif
         if (IS_A_TT())
                 /* TT SCSI DMA can transfer arbitrary #bytes */
-                return( wanted_len );
+                return wanted_len;
 
         /* ST DMA chip is stupid -- only multiples of 512 bytes! (and max.
          * 255*512 bytes, but this should be enough)
@@ -1062,8 +1050,7 @@ static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
                  * this).
                  */
                 possible_len = wanted_len;
-        }
-        else {
+        } else {
                 /* Read operations: if the wanted transfer length is not a multiple of
                  * 512, we cannot use DMA, since the ST-DMA cannot split transfers
                  * (no interrupt on DMA finished!)
@@ -1073,15 +1060,15 @@ static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
                 else {
                         /* Now classify the command (see above) and decide whether it is
                          * allowed to do DMA at all */
-                        switch( falcon_classify_cmd( cmd )) {
-                          case CMD_SURELY_BLOCK_MODE:
+                        switch (falcon_classify_cmd(cmd)) {
+                        case CMD_SURELY_BLOCK_MODE:
                                 possible_len = wanted_len;
                                 break;
-                          case CMD_SURELY_BYTE_MODE:
+                        case CMD_SURELY_BYTE_MODE:
                                 possible_len = 0; /* DMA prohibited */
                                 break;
-                          case CMD_MODE_UNKNOWN:
-                          default:
+                        case CMD_MODE_UNKNOWN:
+                        default:
                                 /* For unknown commands assume block transfers if the transfer
                                  * size/allocation length is >= 1024 */
                                 possible_len = (wanted_len < 1024) ? 0 : wanted_len;
@@ -1089,9 +1076,9 @@ static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
                         }
                 }
         }
-        
+
         /* Last step: apply the hard limit on DMA transfers */
-        limit = (atari_dma_buffer && !STRAM_ADDR( virt_to_phys(cmd->SCp.ptr) )) ?
+        limit = (atari_dma_buffer && !STRAM_ADDR(virt_to_phys(cmd->SCp.ptr))) ?
                     STRAM_BUFFER_SIZE : 255*512;
         if (possible_len > limit)
                 possible_len = limit;
@@ -1100,7 +1087,7 @@ static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
                 DMA_PRINTK("Sorry, must cut DMA transfer size to %ld bytes "
                            "instead of %ld\n", possible_len, wanted_len);
 
-        return( possible_len );
+        return possible_len;
 }
 
 
@@ -1114,23 +1101,23 @@ static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
  * NCR5380_write call these functions via function pointers.
  */
 
-static unsigned char atari_scsi_tt_reg_read( unsigned char reg )
+static unsigned char atari_scsi_tt_reg_read(unsigned char reg)
 {
-        return( tt_scsi_regp[reg * 2] );
+        return tt_scsi_regp[reg * 2];
 }
 
-static void atari_scsi_tt_reg_write( unsigned char reg, unsigned char value )
+static void atari_scsi_tt_reg_write(unsigned char reg, unsigned char value)
 {
         tt_scsi_regp[reg * 2] = value;
 }
 
-static unsigned char atari_scsi_falcon_reg_read( unsigned char reg )
+static unsigned char atari_scsi_falcon_reg_read(unsigned char reg)
 {
         dma_wd.dma_mode_status= (u_short)(0x88 + reg);
-        return( (u_char)dma_wd.fdc_acces_seccount );
+        return (u_char)dma_wd.fdc_acces_seccount;
 }
 
-static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value )
+static void atari_scsi_falcon_reg_write(unsigned char reg, unsigned char value)
 {
         dma_wd.dma_mode_status = (u_short)(0x88 + reg);
         dma_wd.fdc_acces_seccount = (u_short)value;
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index f917bdd09b41..efadb8d567c2 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -21,11 +21,7 @@
 int atari_scsi_detect (struct scsi_host_template *);
 const char *atari_scsi_info (struct Scsi_Host *);
 int atari_scsi_reset (Scsi_Cmnd *, unsigned int);
-#ifdef MODULE
 int atari_scsi_release (struct Scsi_Host *);
-#else
-#define atari_scsi_release NULL
-#endif
 
 /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher
  * values should work, too; try it! (but cmd_per_lun costs memory!) */
@@ -63,6 +59,32 @@ int atari_scsi_release (struct Scsi_Host *);
 #define NCR5380_dma_xfer_len(i,cmd,phase) \
         atari_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1)
 
+/* former generic SCSI error handling stuff */
+
+#define SCSI_ABORT_SNOOZE 0
+#define SCSI_ABORT_SUCCESS 1
+#define SCSI_ABORT_PENDING 2
+#define SCSI_ABORT_BUSY 3
+#define SCSI_ABORT_NOT_RUNNING 4
+#define SCSI_ABORT_ERROR 5
+
+#define SCSI_RESET_SNOOZE 0
+#define SCSI_RESET_PUNT 1
+#define SCSI_RESET_SUCCESS 2
+#define SCSI_RESET_PENDING 3
+#define SCSI_RESET_WAKEUP 4
+#define SCSI_RESET_NOT_RUNNING 5
+#define SCSI_RESET_ERROR 6
+
+#define SCSI_RESET_SYNCHRONOUS          0x01
+#define SCSI_RESET_ASYNCHRONOUS         0x02
+#define SCSI_RESET_SUGGEST_BUS_RESET    0x04
+#define SCSI_RESET_SUGGEST_HOST_RESET   0x08
+
+#define SCSI_RESET_BUS_RESET 0x100
+#define SCSI_RESET_HOST_RESET 0x200
+#define SCSI_RESET_ACTION   0xff
+
 /* Debugging printk definitions:
  *
  *  ARB  -> arbitration
@@ -91,144 +113,58 @@ int atari_scsi_release (struct Scsi_Host *);
  *
  */
 
-#if NDEBUG & NDEBUG_ARBITRATION
+#define dprint(flg, format...)                  \
+({                                              \
+        if (NDEBUG & (flg))                     \
+                printk(KERN_DEBUG format);      \
+})
+
 #define ARB_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define ARB_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_AUTOSENSE
+        dprint(NDEBUG_ARBITRATION, format , ## args)
 #define ASEN_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define ASEN_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_DMA
+        dprint(NDEBUG_AUTOSENSE, format , ## args)
 #define DMA_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define DMA_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_HANDSHAKE
+        dprint(NDEBUG_DMA, format , ## args)
 #define HSH_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define HSH_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_INFORMATION
+        dprint(NDEBUG_HANDSHAKE, format , ## args)
 #define INF_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define INF_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_INIT
+        dprint(NDEBUG_INFORMATION, format , ## args)
 #define INI_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define INI_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_INTR
+        dprint(NDEBUG_INIT, format , ## args)
 #define INT_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define INT_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_LINKED
+        dprint(NDEBUG_INTR, format , ## args)
 #define LNK_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define LNK_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_MAIN
+        dprint(NDEBUG_LINKED, format , ## args)
 #define MAIN_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define MAIN_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_NO_DATAOUT
+        dprint(NDEBUG_MAIN, format , ## args)
 #define NDAT_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define NDAT_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_NO_WRITE
+        dprint(NDEBUG_NO_DATAOUT, format , ## args)
 #define NWR_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define NWR_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_PIO
+        dprint(NDEBUG_NO_WRITE, format , ## args)
 #define PIO_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define PIO_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_PSEUDO_DMA
+        dprint(NDEBUG_PIO, format , ## args)
 #define PDMA_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define PDMA_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_QUEUES
+        dprint(NDEBUG_PSEUDO_DMA, format , ## args)
 #define QU_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define QU_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_RESELECTION
+        dprint(NDEBUG_QUEUES, format , ## args)
 #define RSL_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define RSL_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_SELECTION
+        dprint(NDEBUG_RESELECTION, format , ## args)
 #define SEL_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define SEL_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_USLEEP
+        dprint(NDEBUG_SELECTION, format , ## args)
 #define USL_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define USL_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_LAST_BYTE_SENT
+        dprint(NDEBUG_USLEEP, format , ## args)
 #define LBS_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define LBS_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_RESTART_SELECT
+        dprint(NDEBUG_LAST_BYTE_SENT, format , ## args)
 #define RSS_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define RSS_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_EXTENDED
+        dprint(NDEBUG_RESTART_SELECT, format , ## args)
 #define EXT_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define EXT_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_ABORT
+        dprint(NDEBUG_EXTENDED, format , ## args)
 #define ABRT_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define ABRT_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_TAGS
+        dprint(NDEBUG_ABORT, format , ## args)
 #define TAG_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define TAG_PRINTK(format, args...)
-#endif
-#if NDEBUG & NDEBUG_MERGING
+        dprint(NDEBUG_TAGS, format , ## args)
 #define MER_PRINTK(format, args...) \
-        printk(KERN_DEBUG format , ## args)
-#else
-#define MER_PRINTK(format, args...)
-#endif
+        dprint(NDEBUG_MERGING, format , ## args)
 
 /* conditional macros for NCR5380_print_{,phase,status} */
 
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 61f6024b61ba..2a458d66b6ff 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -202,31 +202,29 @@ static const char * get_sa_name(const struct value_name_pair * arr,
 }
 
 /* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
-static void print_opcode_name(unsigned char * cdbp, int cdb_len,
-                              int start_of_line)
+static void print_opcode_name(unsigned char * cdbp, int cdb_len)
 {
         int sa, len, cdb0;
         const char * name;
-        const char * leadin = start_of_line ? KERN_INFO : "";
 
         cdb0 = cdbp[0];
         switch(cdb0) {
         case VARIABLE_LENGTH_CMD:
                 len = cdbp[7] + 8;
                 if (len < 10) {
-                        printk("%sshort variable length command, "
-                               "len=%d ext_len=%d", leadin, len, cdb_len);
+                        printk("short variable length command, "
+                               "len=%d ext_len=%d", len, cdb_len);
                         break;
                 }
                 sa = (cdbp[8] << 8) + cdbp[9];
                 name = get_sa_name(maint_in_arr, MAINT_IN_SZ, sa);
                 if (name) {
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                         if ((cdb_len > 0) && (len != cdb_len))
                                 printk(", in_cdb_len=%d, ext_len=%d",
                                        len, cdb_len);
                 } else {
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                         if ((cdb_len > 0) && (len != cdb_len))
                                 printk(", in_cdb_len=%d, ext_len=%d",
                                        len, cdb_len);
@@ -236,83 +234,80 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len,
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(maint_in_arr, MAINT_IN_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         case MAINTENANCE_OUT:
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(maint_out_arr, MAINT_OUT_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         case SERVICE_ACTION_IN_12:
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(serv_in12_arr, SERV_IN12_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         case SERVICE_ACTION_OUT_12:
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(serv_out12_arr, SERV_OUT12_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         case SERVICE_ACTION_IN_16:
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(serv_in16_arr, SERV_IN16_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         case SERVICE_ACTION_OUT_16:
                 sa = cdbp[1] & 0x1f;
                 name = get_sa_name(serv_out16_arr, SERV_OUT16_SZ, sa);
                 if (name)
-                        printk("%s%s", leadin, name);
+                        printk("%s", name);
                 else
-                        printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         default:
                 if (cdb0 < 0xc0) {
                         name = cdb_byte0_names[cdb0];
                         if (name)
-                                printk("%s%s", leadin, name);
+                                printk("%s", name);
                         else
-                                printk("%scdb[0]=0x%x (reserved)",
-                                       leadin, cdb0);
+                                printk("cdb[0]=0x%x (reserved)", cdb0);
                 } else
-                        printk("%scdb[0]=0x%x (vendor)", leadin, cdb0);
+                        printk("cdb[0]=0x%x (vendor)", cdb0);
                 break;
         }
 }
 
 #else /* ifndef CONFIG_SCSI_CONSTANTS */
 
-static void print_opcode_name(unsigned char * cdbp, int cdb_len,
-                              int start_of_line)
+static void print_opcode_name(unsigned char * cdbp, int cdb_len)
 {
         int sa, len, cdb0;
-        const char * leadin = start_of_line ? KERN_INFO : "";
 
         cdb0 = cdbp[0];
         switch(cdb0) {
         case VARIABLE_LENGTH_CMD:
                 len = cdbp[7] + 8;
                 if (len < 10) {
-                        printk("%sshort opcode=0x%x command, len=%d "
-                               "ext_len=%d", leadin, cdb0, len, cdb_len);
+                        printk("short opcode=0x%x command, len=%d "
+                               "ext_len=%d", cdb0, len, cdb_len);
                         break;
                 }
                 sa = (cdbp[8] << 8) + cdbp[9];
-                printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 if (len != cdb_len)
                         printk(", in_cdb_len=%d, ext_len=%d", len, cdb_len);
                 break;
@@ -323,49 +318,48 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len,
         case SERVICE_ACTION_IN_16:
         case SERVICE_ACTION_OUT_16:
                 sa = cdbp[1] & 0x1f;
-                printk("%scdb[0]=0x%x, sa=0x%x", leadin, cdb0, sa);
+                printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
                 break;
         default:
                 if (cdb0 < 0xc0)
-                        printk("%scdb[0]=0x%x", leadin, cdb0);
+                        printk("cdb[0]=0x%x", cdb0);
                 else
-                        printk("%scdb[0]=0x%x (vendor)", leadin, cdb0);
+                        printk("cdb[0]=0x%x (vendor)", cdb0);
                 break;
         }
 }
 #endif  
 
-void __scsi_print_command(unsigned char *command)
+void __scsi_print_command(unsigned char *cdb)
 {
         int k, len;
 
-        print_opcode_name(command, 0, 1);
-        if (VARIABLE_LENGTH_CMD == command[0])
-                len = command[7] + 8;
+        print_opcode_name(cdb, 0);
+        if (VARIABLE_LENGTH_CMD == cdb[0])
+                len = cdb[7] + 8;
         else
-                len = COMMAND_SIZE(command[0]);
+                len = COMMAND_SIZE(cdb[0]);
         /* print out all bytes in cdb */
         for (k = 0; k < len; ++k) 
-                printk(" %02x", command[k]);
+                printk(" %02x", cdb[k]);
         printk("\n");
 }
 EXPORT_SYMBOL(__scsi_print_command);
 
-/* This function (perhaps with the addition of peripheral device type)
- * is more approriate than __scsi_print_command(). Perhaps that static
- * can be dropped later if it replaces the __scsi_print_command version.
- */
-static void scsi_print_cdb(unsigned char *cdb, int cdb_len, int start_of_line)
+void scsi_print_command(struct scsi_cmnd *cmd)
 {
         int k;
 
-        print_opcode_name(cdb, cdb_len, start_of_line);
+        scmd_printk(KERN_INFO, cmd, "CDB: ");
+        print_opcode_name(cmd->cmnd, cmd->cmd_len);
+
         /* print out all bytes in cdb */
         printk(":");
-        for (k = 0; k < cdb_len; ++k) 
-                printk(" %02x", cdb[k]);
+        for (k = 0; k < cmd->cmd_len; ++k)
+                printk(" %02x", cmd->cmnd[k]);
         printk("\n");
 }
+EXPORT_SYMBOL(scsi_print_command);
 
 /**
  *
@@ -410,7 +404,11 @@ struct error_info {
         const char * text;
 };
 
-static struct error_info additional[] =
+/*
+ * The canonical list of T10 Additional Sense Codes is available at:
+ * http://www.t10.org/lists/asc-num.txt
+ */
+static const struct error_info additional[] =
 {
         {0x0000, "No additional sense information"},
         {0x0001, "Filemark detected"},
@@ -714,6 +712,7 @@ static struct error_info additional[] =
 
         {0x2F00, "Commands cleared by another initiator"},
         {0x2F01, "Commands cleared by power loss notification"},
+        {0x2F02, "Commands cleared by device server"},
 
         {0x3000, "Incompatible medium installed"},
         {0x3001, "Cannot read medium - unknown format"},
@@ -1176,67 +1175,77 @@ scsi_extd_sense_format(unsigned char asc, unsigned char ascq) {
 }
 EXPORT_SYMBOL(scsi_extd_sense_format);
 
-/* Print extended sense information; no leadin, no linefeed */
-static void
+void
 scsi_show_extd_sense(unsigned char asc, unsigned char ascq)
 {
-        const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
+        const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
 
         if (extd_sense_fmt) {
                 if (strstr(extd_sense_fmt, "%x")) {
-                        printk("Additional sense: ");
+                        printk("Add. Sense: ");
                         printk(extd_sense_fmt, ascq);
                 } else
-                        printk("Additional sense: %s", extd_sense_fmt);
+                        printk("Add. Sense: %s", extd_sense_fmt);
         } else {
                 if (asc >= 0x80)
-                        printk("<<vendor>> ASC=0x%x ASCQ=0x%x", asc, ascq);
+                        printk("<<vendor>> ASC=0x%x ASCQ=0x%x", asc,
+                               ascq);
                 if (ascq >= 0x80)
-                        printk("ASC=0x%x <<vendor>> ASCQ=0x%x", asc, ascq);
+                        printk("ASC=0x%x <<vendor>> ASCQ=0x%x", asc,
+                               ascq);
                 else
                         printk("ASC=0x%x ASCQ=0x%x", asc, ascq);
         }
+
+        printk("\n");
 }
+EXPORT_SYMBOL(scsi_show_extd_sense);
 
 void
-scsi_print_sense_hdr(const char *name, struct scsi_sense_hdr *sshdr)
+scsi_show_sense_hdr(struct scsi_sense_hdr *sshdr)
 {
         const char *sense_txt;
-        /* An example of deferred is when an earlier write to disk cache
-         * succeeded, but now the disk discovers that it cannot write the
-         * data to the magnetic media.
-         */
-        const char *error = scsi_sense_is_deferred(sshdr) ? 
-                "<<DEFERRED>>" : "Current";
-        printk(KERN_INFO "%s: %s", name, error);
-        if (sshdr->response_code >= 0x72)
-                printk(" [descriptor]");
 
         sense_txt = scsi_sense_key_string(sshdr->sense_key);
         if (sense_txt)
-                printk(": sense key: %s\n", sense_txt);
+                printk("Sense Key : %s ", sense_txt);
         else
-                printk(": sense key=0x%x\n", sshdr->sense_key);
-        printk(KERN_INFO "    ");
-        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+                printk("Sense Key : 0x%x ", sshdr->sense_key);
+
+        printk("%s", scsi_sense_is_deferred(sshdr) ? "[deferred] " :
+               "[current] ");
+
+        if (sshdr->response_code >= 0x72)
+                printk("[descriptor]");
+
         printk("\n");
 }
+EXPORT_SYMBOL(scsi_show_sense_hdr);
+
+/*
+ * Print normalized SCSI sense header with a prefix.
+ */
+void
+scsi_print_sense_hdr(const char *name, struct scsi_sense_hdr *sshdr)
+{
+        printk(KERN_INFO "%s: ", name);
+        scsi_show_sense_hdr(sshdr);
+        printk(KERN_INFO "%s: ", name);
+        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+}
 EXPORT_SYMBOL(scsi_print_sense_hdr);
 
-/* Print sense information */
 void
-__scsi_print_sense(const char *name, const unsigned char *sense_buffer,
-                   int sense_len)
+scsi_decode_sense_buffer(const unsigned char *sense_buffer, int sense_len,
+                       struct scsi_sense_hdr *sshdr)
 {
         int k, num, res;
-        unsigned int info;
-        struct scsi_sense_hdr ssh;
     
-        res = scsi_normalize_sense(sense_buffer, sense_len, &ssh);
+        res = scsi_normalize_sense(sense_buffer, sense_len, sshdr);
         if (0 == res) {
                 /* this may be SCSI-1 sense data */
                 num = (sense_len < 32) ? sense_len : 32;
-                printk(KERN_INFO "Unrecognized sense data (in hex):");
+                printk("Unrecognized sense data (in hex):");
                 for (k = 0; k < num; ++k) {
                         if (0 == (k % 16)) {
                                 printk("\n");
@@ -1247,11 +1256,20 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
                 printk("\n");
                 return;
         }
-        scsi_print_sense_hdr(name, &ssh);
-        if (ssh.response_code < 0x72) {
+}
+
+void
+scsi_decode_sense_extras(const unsigned char *sense_buffer, int sense_len,
+                         struct scsi_sense_hdr *sshdr)
+{
+        int k, num, res;
+
+        if (sshdr->response_code < 0x72)
+        {
                 /* only decode extras for "fixed" format now */
                 char buff[80];
                 int blen, fixed_valid;
+                unsigned int info;
 
                 fixed_valid = sense_buffer[0] & 0x80;
                 info = ((sense_buffer[3] << 24) | (sense_buffer[4] << 16) |
@@ -1281,13 +1299,13 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
                         res += snprintf(buff + res, blen - res, "ILI");
                 }
                 if (res > 0)
-                        printk(KERN_INFO "%s\n", buff);
-        } else if (ssh.additional_length > 0) {
+                        printk("%s\n", buff);
+        } else if (sshdr->additional_length > 0) {
                 /* descriptor format with sense descriptors */
-                num = 8 + ssh.additional_length;
+                num = 8 + sshdr->additional_length;
                 num = (sense_len < num) ? sense_len : num;
-                printk(KERN_INFO "Descriptor sense data with sense "
-                       "descriptors (in hex):");
+                printk("Descriptor sense data with sense descriptors "
+                       "(in hex):");
                 for (k = 0; k < num; ++k) {
                         if (0 == (k % 16)) {
                                 printk("\n");
@@ -1295,29 +1313,42 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
                         }
                         printk("%02x ", sense_buffer[k]);
                 }
+
                 printk("\n");
         }
+
 }
-EXPORT_SYMBOL(__scsi_print_sense);
 
-void scsi_print_sense(const char *devclass, struct scsi_cmnd *cmd)
+/* Normalize and print sense buffer with name prefix */
+void __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
+                        int sense_len)
 {
-        const char *name = devclass;
-
-        if (cmd->request->rq_disk)
-                name = cmd->request->rq_disk->disk_name;
-        __scsi_print_sense(name, cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE);
+        struct scsi_sense_hdr sshdr;
+
+        printk(KERN_INFO "%s: ", name);
+        scsi_decode_sense_buffer(sense_buffer, sense_len, &sshdr);
+        scsi_show_sense_hdr(&sshdr);
+        scsi_decode_sense_extras(sense_buffer, sense_len, &sshdr);
+        printk(KERN_INFO "%s: ", name);
+        scsi_show_extd_sense(sshdr.asc, sshdr.ascq);
 }
-EXPORT_SYMBOL(scsi_print_sense);
+EXPORT_SYMBOL(__scsi_print_sense);
 
-void scsi_print_command(struct scsi_cmnd *cmd)
+/* Normalize and print sense buffer in SCSI command */
+void scsi_print_sense(char *name, struct scsi_cmnd *cmd)
 {
-        /* Assume appended output (i.e. not at start of line) */
-        sdev_printk("", cmd->device, "\n");
-        printk(KERN_INFO "        command: ");
-        scsi_print_cdb(cmd->cmnd, cmd->cmd_len, 0);
+        struct scsi_sense_hdr sshdr;
+
+        scmd_printk(KERN_INFO, cmd, "");
+        scsi_decode_sense_buffer(cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE,
+                                 &sshdr);
+        scsi_show_sense_hdr(&sshdr);
+        scsi_decode_sense_extras(cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE,
+                                 &sshdr);
+        scmd_printk(KERN_INFO, cmd, "");
+        scsi_show_extd_sense(sshdr.asc, sshdr.ascq);
 }
-EXPORT_SYMBOL(scsi_print_command);
+EXPORT_SYMBOL(scsi_print_sense);
 
 #ifdef CONFIG_SCSI_CONSTANTS
 
@@ -1327,25 +1358,6 @@ static const char * const hostbyte_table[]={
 "DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY"};
 #define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
 
-void scsi_print_hostbyte(int scsiresult)
-{
-        int hb = host_byte(scsiresult);
-
-        printk("Hostbyte=0x%02x", hb);
-        if (hb < NUM_HOSTBYTE_STRS)
-                printk("(%s) ", hostbyte_table[hb]);
-        else
-                printk("is invalid ");
-}
-#else
-void scsi_print_hostbyte(int scsiresult)
-{
-        printk("Hostbyte=0x%02x ", host_byte(scsiresult));
-}
-#endif
-
-#ifdef CONFIG_SCSI_CONSTANTS
-
 static const char * const driverbyte_table[]={
 "DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",
 "DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
@@ -1356,19 +1368,35 @@ static const char * const driversuggest_table[]={"SUGGEST_OK",
 "SUGGEST_5", "SUGGEST_6", "SUGGEST_7", "SUGGEST_SENSE"};
 #define NUM_SUGGEST_STRS ARRAY_SIZE(driversuggest_table)
 
-void scsi_print_driverbyte(int scsiresult)
+void scsi_show_result(int result)
 {
-        int dr = (driver_byte(scsiresult) & DRIVER_MASK);
-        int su = ((driver_byte(scsiresult) & SUGGEST_MASK) >> 4);
+        int hb = host_byte(result);
+        int db = (driver_byte(result) & DRIVER_MASK);
+        int su = ((driver_byte(result) & SUGGEST_MASK) >> 4);
 
-        printk("Driverbyte=0x%02x ", driver_byte(scsiresult));
-        printk("(%s,%s) ",
-               (dr < NUM_DRIVERBYTE_STRS ? driverbyte_table[dr] : "invalid"),
+        printk("Result: hostbyte=%s driverbyte=%s,%s\n",
+               (hb < NUM_HOSTBYTE_STRS ? hostbyte_table[hb]     : "invalid"),
+               (db < NUM_DRIVERBYTE_STRS ? driverbyte_table[db] : "invalid"),
                (su < NUM_SUGGEST_STRS ? driversuggest_table[su] : "invalid"));
 }
+
 #else
-void scsi_print_driverbyte(int scsiresult)
+
+void scsi_show_result(int result)
 {
-        printk("Driverbyte=0x%02x ", driver_byte(scsiresult));
+        printk("Result: hostbyte=0x%02x driverbyte=0x%02x\n",
+               host_byte(result), driver_byte(result));
 }
+
 #endif
+EXPORT_SYMBOL(scsi_show_result);
+
+
+void scsi_print_result(struct scsi_cmnd *cmd)
+{
+        scmd_printk(KERN_INFO, cmd, "");
+        scsi_show_result(cmd->result);
+}
+EXPORT_SYMBOL(scsi_print_result);
+
+
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h
index 5a49216fe4cf..100b49baca7f 100644
--- a/drivers/scsi/dpt/dpti_i2o.h
+++ b/drivers/scsi/dpt/dpti_i2o.h
@@ -31,7 +31,7 @@
  *      Tunable parameters first
  */
 
-/* How many different OSM's are we allowing */ 
+/* How many different OSM's are we allowing */
 #define MAX_I2O_MODULES         64
 
 #define I2O_EVT_CAPABILITY_OTHER                0x01
@@ -63,7 +63,7 @@ struct i2o_message
         u16     size;
         u32     target_tid:12;
         u32     init_tid:12;
-        u32     function:8;     
+        u32     function:8;
         u32     initiator_context;
         /* List follows */
 };
@@ -77,7 +77,7 @@ struct i2o_device
 
         char dev_name[8];               /* linux /dev name if available */
         i2o_lct_entry lct_data;/* Device LCT information */
-        u32 flags;              
+        u32 flags;
         struct proc_dir_entry* proc_entry;      /* /proc dir */
         struct adpt_device *owner;
         struct _adpt_hba *controller;   /* Controlling IOP */
@@ -86,7 +86,7 @@ struct i2o_device
 /*
  *      Each I2O controller has one of these objects
  */
- 
+
 struct i2o_controller
 {
         char name[16];
@@ -111,9 +111,9 @@ struct i2o_sys_tbl_entry
         u32     iop_id:12;
         u32     reserved2:20;
         u16     seg_num:12;
-        u16     i2o_version:4;
-        u8      iop_state;
-        u8      msg_type;
+        u16     i2o_version:4;
+        u8      iop_state;
+        u8      msg_type;
         u16     frame_size;
         u16     reserved3;
         u32     last_changed;
@@ -124,14 +124,14 @@ struct i2o_sys_tbl_entry
 
 struct i2o_sys_tbl
 {
-        u8      num_entries;
-        u8      version;
-        u16     reserved1;
+        u8      num_entries;
+        u8      version;
+        u16     reserved1;
         u32     change_ind;
         u32     reserved2;
         u32     reserved3;
         struct i2o_sys_tbl_entry iops[0];
-};      
+};
 
 /*
  *      I2O classes / subclasses
@@ -146,7 +146,7 @@ struct i2o_sys_tbl
 /*  Class code names
  *  (from v1.5 Table 6-1 Class Code Assignments.)
  */
- 
+
 #define    I2O_CLASS_EXECUTIVE                         0x000
 #define    I2O_CLASS_DDM                               0x001
 #define    I2O_CLASS_RANDOM_BLOCK_STORAGE              0x010
@@ -166,7 +166,7 @@ struct i2o_sys_tbl
 
 /*  Rest of 0x092 - 0x09f reserved for peer-to-peer classes
  */
- 
+
 #define    I2O_CLASS_MATCH_ANYCLASS                    0xffffffff
 
 /*  Subclasses
@@ -175,7 +175,7 @@ struct i2o_sys_tbl
 #define    I2O_SUBCLASS_i960                           0x001
 #define    I2O_SUBCLASS_HDM                            0x020
 #define    I2O_SUBCLASS_ISM                            0x021
- 
+
 /* Operation functions */
 
 #define I2O_PARAMS_FIELD_GET    0x0001
@@ -219,7 +219,7 @@ struct i2o_sys_tbl
 /*
  *      Messaging API values
  */
- 
+
 #define I2O_CMD_ADAPTER_ASSIGN          0xB3
 #define I2O_CMD_ADAPTER_READ            0xB2
 #define I2O_CMD_ADAPTER_RELEASE         0xB5
@@ -284,16 +284,16 @@ struct i2o_sys_tbl
 #define I2O_PRIVATE_MSG                 0xFF
 
 /*
- *      Init Outbound Q status 
+ *      Init Outbound Q status
  */
- 
+
 #define I2O_CMD_OUTBOUND_INIT_IN_PROGRESS       0x01
 #define I2O_CMD_OUTBOUND_INIT_REJECTED          0x02
 #define I2O_CMD_OUTBOUND_INIT_FAILED            0x03
 #define I2O_CMD_OUTBOUND_INIT_COMPLETE          0x04
 
 /*
- *      I2O Get Status State values 
+ *      I2O Get Status State values
  */
 
 #define ADAPTER_STATE_INITIALIZING              0x01
@@ -303,7 +303,7 @@ struct i2o_sys_tbl
 #define ADAPTER_STATE_OPERATIONAL               0x08
 #define ADAPTER_STATE_FAILED                    0x10
 #define ADAPTER_STATE_FAULTED                   0x11
-        
+
 /* I2O API function return values */
 
 #define I2O_RTN_NO_ERROR                        0
@@ -321,9 +321,9 @@ struct i2o_sys_tbl
 
 /* Reply message status defines for all messages */
 
-#define I2O_REPLY_STATUS_SUCCESS                        0x00
-#define I2O_REPLY_STATUS_ABORT_DIRTY                    0x01
-#define I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER         0x02
+#define I2O_REPLY_STATUS_SUCCESS                        0x00
+#define I2O_REPLY_STATUS_ABORT_DIRTY                    0x01
+#define I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER         0x02
 #define I2O_REPLY_STATUS_ABORT_PARTIAL_TRANSFER         0x03
 #define I2O_REPLY_STATUS_ERROR_DIRTY                    0x04
 #define I2O_REPLY_STATUS_ERROR_NO_DATA_TRANSFER         0x05
@@ -338,7 +338,7 @@ struct i2o_sys_tbl
 
 #define I2O_PARAMS_STATUS_SUCCESS               0x00
 #define I2O_PARAMS_STATUS_BAD_KEY_ABORT         0x01
-#define I2O_PARAMS_STATUS_BAD_KEY_CONTINUE      0x02
+#define I2O_PARAMS_STATUS_BAD_KEY_CONTINUE      0x02
 #define I2O_PARAMS_STATUS_BUFFER_FULL           0x03
 #define I2O_PARAMS_STATUS_BUFFER_TOO_SMALL      0x04
 #define I2O_PARAMS_STATUS_FIELD_UNREADABLE      0x05
@@ -390,7 +390,7 @@ struct i2o_sys_tbl
 #define I2O_CLAIM_MANAGEMENT                                    0x02000000
 #define I2O_CLAIM_AUTHORIZED                                    0x03000000
 #define I2O_CLAIM_SECONDARY                                     0x04000000
- 
+
 /* Message header defines for VersionOffset */
 #define I2OVER15        0x0001
 #define I2OVER20        0x0002
diff --git a/drivers/scsi/dpt/dpti_ioctl.h b/drivers/scsi/dpt/dpti_ioctl.h
index 82d24864be0c..cc784e8f6e9d 100644
--- a/drivers/scsi/dpt/dpti_ioctl.h
+++ b/drivers/scsi/dpt/dpti_ioctl.h
@@ -99,7 +99,7 @@ typedef struct {
         uCHAR    eataVersion;      /* EATA Version                    */
         uLONG    cpLength;         /* EATA Command Packet Length      */
         uLONG    spLength;         /* EATA Status Packet Length       */
-        uCHAR    drqNum;           /* DRQ Index (0,5,6,7)             */ 
+        uCHAR    drqNum;           /* DRQ Index (0,5,6,7)             */
         uCHAR    flag1;            /* EATA Flags 1 (Byte 9)           */
         uCHAR    flag2;            /* EATA Flags 2 (Byte 30)          */
 } CtrlInfo;
diff --git a/drivers/scsi/dpt/dptsig.h b/drivers/scsi/dpt/dptsig.h
index 4bf447792129..94bc894d1200 100644
--- a/drivers/scsi/dpt/dptsig.h
+++ b/drivers/scsi/dpt/dptsig.h
@@ -145,8 +145,8 @@ typedef unsigned long sigLONG;
 #define FT_LOGGER       12      /* Event Logger */
 #define FT_INSTALL      13      /* An Install Program */
 #define FT_LIBRARY      14      /* Storage Manager Real-Mode Calls */
-#define FT_RESOURCE     15      /* Storage Manager Resource File */
-#define FT_MODEM_DB     16      /* Storage Manager Modem Database */
+#define FT_RESOURCE     15      /* Storage Manager Resource File */
+#define FT_MODEM_DB     16      /* Storage Manager Modem Database */
 
 /* Filetype flags - sigBYTE dsFiletypeFlags;    FLAG BITS */
 /* ------------------------------------------------------------------ */
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index cd36e81b2d93..f7b9dbd64a96 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -195,8 +195,6 @@ static int adpt_detect(struct scsi_host_template* sht)
                         pci_dev_get(pDev);
                 }
         }
-        if (pDev)
-                pci_dev_put(pDev);
 
         /* In INIT state, Activate IOPs */
         for (pHba = hba_chain; pHba; pHba = pHba->next) {
diff --git a/drivers/scsi/eata_generic.h b/drivers/scsi/eata_generic.h
index 635c14861f86..5016af5cf860 100644
--- a/drivers/scsi/eata_generic.h
+++ b/drivers/scsi/eata_generic.h
@@ -18,13 +18,6 @@
  * Misc. definitions                         *
  *********************************************/
 
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 #define R_LIMIT 0x20000
 
 #define MAXISA     4
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 99ce03331b64..ec71061aef61 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2212,7 +2212,7 @@ static void __devinit esp_init_swstate(struct esp *esp)
 }
 
 /* This places the ESP into a known state at boot time. */
-static void __devinit esp_bootup_reset(struct esp *esp)
+static void esp_bootup_reset(struct esp *esp)
 {
         u8 val;
 
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index fbc1d5c3b0a7..b10eefe735c5 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -85,7 +85,7 @@
 static int max_id = 64;
 static int max_channel = 3;
 static int init_timeout = 5;
-static int max_requests = 50;
+static int max_requests = IBMVSCSI_MAX_REQUESTS_DEFAULT;
 
 #define IBMVSCSI_VERSION "1.5.8"
 
@@ -538,7 +538,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
         int request_status;
         int rc;
 
-        /* If we have exhausted our request limit, just fail this request.
+        /* If we have exhausted our request limit, just fail this request,
+         * unless it is for a reset or abort.
          * Note that there are rare cases involving driver generated requests 
          * (such as task management requests) that the mid layer may think we
          * can handle more requests (can_queue) when we actually can't
@@ -551,9 +552,30 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
                  */
                 if (request_status < -1)
                         goto send_error;
-                /* Otherwise, if we have run out of requests */
-                else if (request_status < 0)
-                        goto send_busy;
+                /* Otherwise, we may have run out of requests. */
+                /* Abort and reset calls should make it through.
+                 * Nothing except abort and reset should use the last two
+                 * slots unless we had two or less to begin with.
+                 */
+                else if (request_status < 2 &&
+                         evt_struct->iu.srp.cmd.opcode != SRP_TSK_MGMT) {
+                        /* In the case that we have less than two requests
+                         * available, check the server limit as a combination
+                         * of the request limit and the number of requests
+                         * in-flight (the size of the send list).  If the
+                         * server limit is greater than 2, return busy so
+                         * that the last two are reserved for reset and abort.
+                         */
+                        int server_limit = request_status;
+                        struct srp_event_struct *tmp_evt;
+
+                        list_for_each_entry(tmp_evt, &hostdata->sent, list) {
+                                server_limit++;
+                        }
+
+                        if (server_limit > 2)
+                                goto send_busy;
+                }
         }
 
         /* Copy the IU into the transfer area */
@@ -572,6 +594,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
 
                 printk(KERN_ERR "ibmvscsi: send error %d\n",
                        rc);
+                atomic_inc(&hostdata->request_limit);
                 goto send_error;
         }
 
@@ -581,7 +604,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
         unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
 
         free_event_struct(&hostdata->pool, evt_struct);
-        return SCSI_MLQUEUE_HOST_BUSY;
+        atomic_inc(&hostdata->request_limit);
+        return SCSI_MLQUEUE_HOST_BUSY;
 
  send_error:
         unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
@@ -831,23 +855,16 @@ static void login_rsp(struct srp_event_struct *evt_struct)
 
         printk(KERN_INFO "ibmvscsi: SRP_LOGIN succeeded\n");
 
-        if (evt_struct->xfer_iu->srp.login_rsp.req_lim_delta >
-            (max_requests - 2))
-                evt_struct->xfer_iu->srp.login_rsp.req_lim_delta =
-                    max_requests - 2;
+        if (evt_struct->xfer_iu->srp.login_rsp.req_lim_delta < 0)
+                printk(KERN_ERR "ibmvscsi: Invalid request_limit.\n");
 
-        /* Now we know what the real request-limit is */
+        /* Now we know what the real request-limit is.
+         * This value is set rather than added to request_limit because
+         * request_limit could have been set to -1 by this client.
+         */
         atomic_set(&hostdata->request_limit,
                    evt_struct->xfer_iu->srp.login_rsp.req_lim_delta);
 
-        hostdata->host->can_queue =
-            evt_struct->xfer_iu->srp.login_rsp.req_lim_delta - 2;
-
-        if (hostdata->host->can_queue < 1) {
-                printk(KERN_ERR "ibmvscsi: Invalid request_limit_delta\n");
-                return;
-        }
-
         /* If we had any pending I/Os, kick them */
         scsi_unblock_requests(hostdata->host);
 
@@ -1337,6 +1354,27 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata,
         return rc;
 }
 
+/**
+ * ibmvscsi_slave_configure: Set the "allow_restart" flag for each disk.
+ * @sdev:       struct scsi_device device to configure
+ *
+ * Enable allow_restart for a device if it is a disk.  Adjust the
+ * queue_depth here also as is required by the documentation for
+ * struct scsi_host_template.
+ */
+static int ibmvscsi_slave_configure(struct scsi_device *sdev)
+{
+        struct Scsi_Host *shost = sdev->host;
+        unsigned long lock_flags = 0;
+
+        spin_lock_irqsave(shost->host_lock, lock_flags);
+        if (sdev->type == TYPE_DISK)
+                sdev->allow_restart = 1;
+        scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
+        spin_unlock_irqrestore(shost->host_lock, lock_flags);
+        return 0;
+}
+
 /* ------------------------------------------------------------
  * sysfs attributes
  */
@@ -1482,8 +1520,9 @@ static struct scsi_host_template driver_template = {
         .queuecommand = ibmvscsi_queuecommand,
         .eh_abort_handler = ibmvscsi_eh_abort_handler,
         .eh_device_reset_handler = ibmvscsi_eh_device_reset_handler,
+        .slave_configure = ibmvscsi_slave_configure,
         .cmd_per_lun = 16,
-        .can_queue = 1,         /* Updated after SRP_LOGIN */
+        .can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT,
         .this_id = -1,
         .sg_tablesize = SG_ALL,
         .use_clustering = ENABLE_CLUSTERING,
@@ -1503,6 +1542,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 
         vdev->dev.driver_data = NULL;
 
+        driver_template.can_queue = max_requests;
         host = scsi_host_alloc(&driver_template, sizeof(*hostdata));
         if (!host) {
                 printk(KERN_ERR "ibmvscsi: couldn't allocate host data\n");
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 5c6d93582929..77cc1d40f5bb 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -44,6 +44,8 @@ struct Scsi_Host;
  */
 #define MAX_INDIRECT_BUFS 10
 
+#define IBMVSCSI_MAX_REQUESTS_DEFAULT 100
+
 /* ------------------------------------------------------------
  * Data Structures
  */
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 140dd9700ff6..8ba7dd09d01d 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -35,7 +35,7 @@
 #include "ibmvscsi.h"
 
 #define INITIAL_SRP_LIMIT       16
-#define DEFAULT_MAX_SECTORS     512
+#define DEFAULT_MAX_SECTORS     256
 
 #define TGT_NAME        "ibmvstgt"
 
@@ -248,8 +248,8 @@ static int ibmvstgt_rdma(struct scsi_cmnd *sc, struct scatterlist *sg, int nsg,
                                                   md[i].va + mdone);
 
                         if (err != H_SUCCESS) {
-                                eprintk("rdma error %d %d\n", dir, slen);
-                                goto out;
+                                eprintk("rdma error %d %d %ld\n", dir, slen, err);
+                                return -EIO;
                         }
 
                         mlen -= slen;
@@ -265,45 +265,35 @@ static int ibmvstgt_rdma(struct scsi_cmnd *sc, struct scatterlist *sg, int nsg,
                                 if (sidx > nsg) {
                                         eprintk("out of sg %p %d %d\n",
                                                 iue, sidx, nsg);
-                                        goto out;
+                                        return -EIO;
                                 }
                         }
                 };
 
                 rest -= mlen;
         }
-out:
-
         return 0;
 }
 
-static int ibmvstgt_transfer_data(struct scsi_cmnd *sc,
-                                  void (*done)(struct scsi_cmnd *))
-{
-        struct iu_entry *iue = (struct iu_entry *) sc->SCp.ptr;
-        int err;
-
-        err = srp_transfer_data(sc, &vio_iu(iue)->srp.cmd, ibmvstgt_rdma, 1, 1);
-
-        done(sc);
-
-        return err;
-}
-
 static int ibmvstgt_cmd_done(struct scsi_cmnd *sc,
                              void (*done)(struct scsi_cmnd *))
 {
         unsigned long flags;
         struct iu_entry *iue = (struct iu_entry *) sc->SCp.ptr;
         struct srp_target *target = iue->target;
+        int err = 0;
 
-        dprintk("%p %p %x\n", iue, target, vio_iu(iue)->srp.cmd.cdb[0]);
+        dprintk("%p %p %x %u\n", iue, target, vio_iu(iue)->srp.cmd.cdb[0],
+                cmd->usg_sg);
+
+        if (sc->use_sg)
+                err = srp_transfer_data(sc, &vio_iu(iue)->srp.cmd, ibmvstgt_rdma, 1, 1);
 
         spin_lock_irqsave(&target->lock, flags);
         list_del(&iue->ilist);
         spin_unlock_irqrestore(&target->lock, flags);
 
-        if (sc->result != SAM_STAT_GOOD) {
+        if (err|| sc->result != SAM_STAT_GOOD) {
                 eprintk("operation failed %p %d %x\n",
                         iue, sc->result, vio_iu(iue)->srp.cmd.cdb[0]);
                 send_rsp(iue, sc, HARDWARE_ERROR, 0x00);
@@ -503,7 +493,8 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
 {
         struct vio_port *vport = target_to_port(target);
         struct iu_entry *iue;
-        long err, done;
+        long err;
+        int done = 1;
 
         iue = srp_iu_get(target);
         if (!iue) {
@@ -518,7 +509,6 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
 
         if (err != H_SUCCESS) {
                 eprintk("%ld transferring data error %p\n", err, iue);
-                done = 1;
                 goto out;
         }
 
@@ -794,7 +784,6 @@ static struct scsi_host_template ibmvstgt_sht = {
         .use_clustering         = DISABLE_CLUSTERING,
         .max_sectors            = DEFAULT_MAX_SECTORS,
         .transfer_response      = ibmvstgt_cmd_done,
-        .transfer_data          = ibmvstgt_transfer_data,
         .eh_abort_handler       = ibmvstgt_eh_abort_handler,
         .tsk_mgmt_response      = ibmvstgt_tsk_mgmt_response,
         .shost_attrs            = ibmvstgt_attrs,
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e9bd29975db4..2c7b77e833f9 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -89,10 +89,9 @@ static unsigned int ipr_log_level = IPR_DEFAULT_LOG_LEVEL;
 static unsigned int ipr_max_speed = 1;
 static int ipr_testmode = 0;
 static unsigned int ipr_fastfail = 0;
-static unsigned int ipr_transop_timeout = IPR_OPERATIONAL_TIMEOUT;
+static unsigned int ipr_transop_timeout = 0;
 static unsigned int ipr_enable_cache = 1;
 static unsigned int ipr_debug = 0;
-static int ipr_auto_create = 1;
 static DEFINE_SPINLOCK(ipr_driver_lock);
 
 /* This table describes the differences between DMA controller chips */
@@ -159,15 +158,13 @@ module_param_named(enable_cache, ipr_enable_cache, int, 0);
 MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");
 module_param_named(debug, ipr_debug, int, 0);
 MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");
-module_param_named(auto_create, ipr_auto_create, int, 0);
-MODULE_PARM_DESC(auto_create, "Auto-create single device RAID 0 arrays when initialized (default: 1)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
 /*  A constant array of IOASCs/URCs/Error Messages */
 static const
 struct ipr_error_table_t ipr_error_table[] = {
-        {0x00000000, 1, 1,
+        {0x00000000, 1, IPR_DEFAULT_LOG_LEVEL,
         "8155: An unknown error was received"},
         {0x00330000, 0, 0,
         "Soft underlength error"},
@@ -175,37 +172,37 @@ struct ipr_error_table_t ipr_error_table[] = {
         "Command to be cancelled not found"},
         {0x00808000, 0, 0,
         "Qualified success"},
-        {0x01080000, 1, 1,
+        {0x01080000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFFE: Soft device bus error recovered by the IOA"},
-        {0x01088100, 0, 1,
+        {0x01088100, 0, IPR_DEFAULT_LOG_LEVEL,
         "4101: Soft device bus fabric error"},
-        {0x01170600, 0, 1,
+        {0x01170600, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF9: Device sector reassign successful"},
-        {0x01170900, 0, 1,
+        {0x01170900, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF7: Media error recovered by device rewrite procedures"},
-        {0x01180200, 0, 1,
+        {0x01180200, 0, IPR_DEFAULT_LOG_LEVEL,
         "7001: IOA sector reassignment successful"},
-        {0x01180500, 0, 1,
+        {0x01180500, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF9: Soft media error. Sector reassignment recommended"},
-        {0x01180600, 0, 1,
+        {0x01180600, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF7: Media error recovered by IOA rewrite procedures"},
-        {0x01418000, 0, 1,
+        {0x01418000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FF3D: Soft PCI bus error recovered by the IOA"},
-        {0x01440000, 1, 1,
+        {0x01440000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFF6: Device hardware error recovered by the IOA"},
-        {0x01448100, 0, 1,
+        {0x01448100, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF6: Device hardware error recovered by the device"},
-        {0x01448200, 1, 1,
+        {0x01448200, 1, IPR_DEFAULT_LOG_LEVEL,
         "FF3D: Soft IOA error recovered by the IOA"},
-        {0x01448300, 0, 1,
+        {0x01448300, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFFA: Undefined device response recovered by the IOA"},
-        {0x014A0000, 1, 1,
+        {0x014A0000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFF6: Device bus error, message or command phase"},
-        {0x014A8000, 0, 1,
+        {0x014A8000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFFE: Task Management Function failed"},
-        {0x015D0000, 0, 1,
+        {0x015D0000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF6: Failure prediction threshold exceeded"},
-        {0x015D9200, 0, 1,
+        {0x015D9200, 0, IPR_DEFAULT_LOG_LEVEL,
         "8009: Impending cache battery pack failure"},
         {0x02040400, 0, 0,
         "34FF: Disk device format in progress"},
@@ -215,85 +212,85 @@ struct ipr_error_table_t ipr_error_table[] = {
         "No ready, IOA shutdown"},
         {0x025A0000, 0, 0,
         "Not ready, IOA has been shutdown"},
-        {0x02670100, 0, 1,
+        {0x02670100, 0, IPR_DEFAULT_LOG_LEVEL,
         "3020: Storage subsystem configuration error"},
         {0x03110B00, 0, 0,
         "FFF5: Medium error, data unreadable, recommend reassign"},
         {0x03110C00, 0, 0,
         "7000: Medium error, data unreadable, do not reassign"},
-        {0x03310000, 0, 1,
+        {0x03310000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF3: Disk media format bad"},
-        {0x04050000, 0, 1,
+        {0x04050000, 0, IPR_DEFAULT_LOG_LEVEL,
         "3002: Addressed device failed to respond to selection"},
-        {0x04080000, 1, 1,
+        {0x04080000, 1, IPR_DEFAULT_LOG_LEVEL,
         "3100: Device bus error"},
-        {0x04080100, 0, 1,
+        {0x04080100, 0, IPR_DEFAULT_LOG_LEVEL,
         "3109: IOA timed out a device command"},
         {0x04088000, 0, 0,
         "3120: SCSI bus is not operational"},
-        {0x04088100, 0, 1,
+        {0x04088100, 0, IPR_DEFAULT_LOG_LEVEL,
         "4100: Hard device bus fabric error"},
-        {0x04118000, 0, 1,
+        {0x04118000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9000: IOA reserved area data check"},
-        {0x04118100, 0, 1,
+        {0x04118100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9001: IOA reserved area invalid data pattern"},
-        {0x04118200, 0, 1,
+        {0x04118200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9002: IOA reserved area LRC error"},
-        {0x04320000, 0, 1,
+        {0x04320000, 0, IPR_DEFAULT_LOG_LEVEL,
         "102E: Out of alternate sectors for disk storage"},
-        {0x04330000, 1, 1,
+        {0x04330000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFF4: Data transfer underlength error"},
-        {0x04338000, 1, 1,
+        {0x04338000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFF4: Data transfer overlength error"},
-        {0x043E0100, 0, 1,
+        {0x043E0100, 0, IPR_DEFAULT_LOG_LEVEL,
         "3400: Logical unit failure"},
-        {0x04408500, 0, 1,
+        {0x04408500, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF4: Device microcode is corrupt"},
-        {0x04418000, 1, 1,
+        {0x04418000, 1, IPR_DEFAULT_LOG_LEVEL,
         "8150: PCI bus error"},
         {0x04430000, 1, 0,
         "Unsupported device bus message received"},
-        {0x04440000, 1, 1,
+        {0x04440000, 1, IPR_DEFAULT_LOG_LEVEL,
         "FFF4: Disk device problem"},
-        {0x04448200, 1, 1,
+        {0x04448200, 1, IPR_DEFAULT_LOG_LEVEL,
         "8150: Permanent IOA failure"},
-        {0x04448300, 0, 1,
+        {0x04448300, 0, IPR_DEFAULT_LOG_LEVEL,
         "3010: Disk device returned wrong response to IOA"},
-        {0x04448400, 0, 1,
+        {0x04448400, 0, IPR_DEFAULT_LOG_LEVEL,
         "8151: IOA microcode error"},
         {0x04448500, 0, 0,
         "Device bus status error"},
-        {0x04448600, 0, 1,
+        {0x04448600, 0, IPR_DEFAULT_LOG_LEVEL,
         "8157: IOA error requiring IOA reset to recover"},
         {0x04448700, 0, 0,
         "ATA device status error"},
         {0x04490000, 0, 0,
         "Message reject received from the device"},
-        {0x04449200, 0, 1,
+        {0x04449200, 0, IPR_DEFAULT_LOG_LEVEL,
         "8008: A permanent cache battery pack failure occurred"},
-        {0x0444A000, 0, 1,
+        {0x0444A000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9090: Disk unit has been modified after the last known status"},
-        {0x0444A200, 0, 1,
+        {0x0444A200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9081: IOA detected device error"},
-        {0x0444A300, 0, 1,
+        {0x0444A300, 0, IPR_DEFAULT_LOG_LEVEL,
         "9082: IOA detected device error"},
-        {0x044A0000, 1, 1,
+        {0x044A0000, 1, IPR_DEFAULT_LOG_LEVEL,
         "3110: Device bus error, message or command phase"},
-        {0x044A8000, 1, 1,
+        {0x044A8000, 1, IPR_DEFAULT_LOG_LEVEL,
         "3110: SAS Command / Task Management Function failed"},
-        {0x04670400, 0, 1,
+        {0x04670400, 0, IPR_DEFAULT_LOG_LEVEL,
         "9091: Incorrect hardware configuration change has been detected"},
-        {0x04678000, 0, 1,
+        {0x04678000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9073: Invalid multi-adapter configuration"},
-        {0x04678100, 0, 1,
+        {0x04678100, 0, IPR_DEFAULT_LOG_LEVEL,
         "4010: Incorrect connection between cascaded expanders"},
-        {0x04678200, 0, 1,
+        {0x04678200, 0, IPR_DEFAULT_LOG_LEVEL,
         "4020: Connections exceed IOA design limits"},
-        {0x04678300, 0, 1,
+        {0x04678300, 0, IPR_DEFAULT_LOG_LEVEL,
         "4030: Incorrect multipath connection"},
-        {0x04679000, 0, 1,
+        {0x04679000, 0, IPR_DEFAULT_LOG_LEVEL,
         "4110: Unsupported enclosure function"},
-        {0x046E0000, 0, 1,
+        {0x046E0000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFF4: Command to logical unit failed"},
         {0x05240000, 1, 0,
         "Illegal request, invalid request type or request packet"},
@@ -313,101 +310,103 @@ struct ipr_error_table_t ipr_error_table[] = {
         "Illegal request, command sequence error"},
         {0x052C8000, 1, 0,
         "Illegal request, dual adapter support not enabled"},
-        {0x06040500, 0, 1,
+        {0x06040500, 0, IPR_DEFAULT_LOG_LEVEL,
         "9031: Array protection temporarily suspended, protection resuming"},
-        {0x06040600, 0, 1,
+        {0x06040600, 0, IPR_DEFAULT_LOG_LEVEL,
         "9040: Array protection temporarily suspended, protection resuming"},
-        {0x06288000, 0, 1,
+        {0x06288000, 0, IPR_DEFAULT_LOG_LEVEL,
         "3140: Device bus not ready to ready transition"},
-        {0x06290000, 0, 1,
+        {0x06290000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFFB: SCSI bus was reset"},
         {0x06290500, 0, 0,
         "FFFE: SCSI bus transition to single ended"},
         {0x06290600, 0, 0,
         "FFFE: SCSI bus transition to LVD"},
-        {0x06298000, 0, 1,
+        {0x06298000, 0, IPR_DEFAULT_LOG_LEVEL,
         "FFFB: SCSI bus was reset by another initiator"},
-        {0x063F0300, 0, 1,
+        {0x063F0300, 0, IPR_DEFAULT_LOG_LEVEL,
         "3029: A device replacement has occurred"},
-        {0x064C8000, 0, 1,
+        {0x064C8000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9051: IOA cache data exists for a missing or failed device"},
-        {0x064C8100, 0, 1,
+        {0x064C8100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9055: Auxiliary cache IOA contains cache data needed by the primary IOA"},
-        {0x06670100, 0, 1,
+        {0x06670100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9025: Disk unit is not supported at its physical location"},
-        {0x06670600, 0, 1,
+        {0x06670600, 0, IPR_DEFAULT_LOG_LEVEL,
         "3020: IOA detected a SCSI bus configuration error"},
-        {0x06678000, 0, 1,
+        {0x06678000, 0, IPR_DEFAULT_LOG_LEVEL,
         "3150: SCSI bus configuration error"},
-        {0x06678100, 0, 1,
+        {0x06678100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9074: Asymmetric advanced function disk configuration"},
-        {0x06678300, 0, 1,
+        {0x06678300, 0, IPR_DEFAULT_LOG_LEVEL,
         "4040: Incomplete multipath connection between IOA and enclosure"},
-        {0x06678400, 0, 1,
+        {0x06678400, 0, IPR_DEFAULT_LOG_LEVEL,
         "4041: Incomplete multipath connection between enclosure and device"},
-        {0x06678500, 0, 1,
+        {0x06678500, 0, IPR_DEFAULT_LOG_LEVEL,
         "9075: Incomplete multipath connection between IOA and remote IOA"},
-        {0x06678600, 0, 1,
+        {0x06678600, 0, IPR_DEFAULT_LOG_LEVEL,
         "9076: Configuration error, missing remote IOA"},
-        {0x06679100, 0, 1,
+        {0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
         "4050: Enclosure does not support a required multipath function"},
-        {0x06690200, 0, 1,
+        {0x06690200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9041: Array protection temporarily suspended"},
-        {0x06698200, 0, 1,
+        {0x06698200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9042: Corrupt array parity detected on specified device"},
-        {0x066B0200, 0, 1,
+        {0x066B0200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9030: Array no longer protected due to missing or failed disk unit"},
-        {0x066B8000, 0, 1,
+        {0x066B8000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9071: Link operational transition"},
-        {0x066B8100, 0, 1,
+        {0x066B8100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9072: Link not operational transition"},
-        {0x066B8200, 0, 1,
+        {0x066B8200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9032: Array exposed but still protected"},
-        {0x066B9100, 0, 1,
+        {0x066B8300, 0, IPR_DEFAULT_LOG_LEVEL + 1,
+        "70DD: Device forced failed by disrupt device command"},
+        {0x066B9100, 0, IPR_DEFAULT_LOG_LEVEL,
         "4061: Multipath redundancy level got better"},
-        {0x066B9200, 0, 1,
+        {0x066B9200, 0, IPR_DEFAULT_LOG_LEVEL,
         "4060: Multipath redundancy level got worse"},
         {0x07270000, 0, 0,
         "Failure due to other device"},
-        {0x07278000, 0, 1,
+        {0x07278000, 0, IPR_DEFAULT_LOG_LEVEL,
         "9008: IOA does not support functions expected by devices"},
-        {0x07278100, 0, 1,
+        {0x07278100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9010: Cache data associated with attached devices cannot be found"},
-        {0x07278200, 0, 1,
+        {0x07278200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9011: Cache data belongs to devices other than those attached"},
-        {0x07278400, 0, 1,
+        {0x07278400, 0, IPR_DEFAULT_LOG_LEVEL,
         "9020: Array missing 2 or more devices with only 1 device present"},
-        {0x07278500, 0, 1,
+        {0x07278500, 0, IPR_DEFAULT_LOG_LEVEL,
         "9021: Array missing 2 or more devices with 2 or more devices present"},
-        {0x07278600, 0, 1,
+        {0x07278600, 0, IPR_DEFAULT_LOG_LEVEL,
         "9022: Exposed array is missing a required device"},
-        {0x07278700, 0, 1,
+        {0x07278700, 0, IPR_DEFAULT_LOG_LEVEL,
         "9023: Array member(s) not at required physical locations"},
-        {0x07278800, 0, 1,
+        {0x07278800, 0, IPR_DEFAULT_LOG_LEVEL,
         "9024: Array not functional due to present hardware configuration"},
-        {0x07278900, 0, 1,
+        {0x07278900, 0, IPR_DEFAULT_LOG_LEVEL,
         "9026: Array not functional due to present hardware configuration"},
-        {0x07278A00, 0, 1,
+        {0x07278A00, 0, IPR_DEFAULT_LOG_LEVEL,
         "9027: Array is missing a device and parity is out of sync"},
-        {0x07278B00, 0, 1,
+        {0x07278B00, 0, IPR_DEFAULT_LOG_LEVEL,
         "9028: Maximum number of arrays already exist"},
-        {0x07278C00, 0, 1,
+        {0x07278C00, 0, IPR_DEFAULT_LOG_LEVEL,
         "9050: Required cache data cannot be located for a disk unit"},
-        {0x07278D00, 0, 1,
+        {0x07278D00, 0, IPR_DEFAULT_LOG_LEVEL,
         "9052: Cache data exists for a device that has been modified"},
-        {0x07278F00, 0, 1,
+        {0x07278F00, 0, IPR_DEFAULT_LOG_LEVEL,
         "9054: IOA resources not available due to previous problems"},
-        {0x07279100, 0, 1,
+        {0x07279100, 0, IPR_DEFAULT_LOG_LEVEL,
         "9092: Disk unit requires initialization before use"},
-        {0x07279200, 0, 1,
+        {0x07279200, 0, IPR_DEFAULT_LOG_LEVEL,
         "9029: Incorrect hardware configuration change has been detected"},
-        {0x07279600, 0, 1,
+        {0x07279600, 0, IPR_DEFAULT_LOG_LEVEL,
         "9060: One or more disk pairs are missing from an array"},
-        {0x07279700, 0, 1,
+        {0x07279700, 0, IPR_DEFAULT_LOG_LEVEL,
         "9061: One or more disks are missing from an array"},
-        {0x07279800, 0, 1,
+        {0x07279800, 0, IPR_DEFAULT_LOG_LEVEL,
         "9062: One or more disks are missing from an array"},
-        {0x07279900, 0, 1,
+        {0x07279900, 0, IPR_DEFAULT_LOG_LEVEL,
         "9063: Maximum number of functional arrays has been exceeded"},
         {0x0B260000, 0, 0,
         "Aborted command, invalid descriptor"},
@@ -481,12 +480,16 @@ static void ipr_reinit_ipr_cmnd(struct ipr_cmnd *ipr_cmd)
 {
         struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
         struct ipr_ioasa *ioasa = &ipr_cmd->ioasa;
+        dma_addr_t dma_addr = be32_to_cpu(ioarcb->ioarcb_host_pci_addr);
 
         memset(&ioarcb->cmd_pkt, 0, sizeof(struct ipr_cmd_pkt));
         ioarcb->write_data_transfer_length = 0;
         ioarcb->read_data_transfer_length = 0;
         ioarcb->write_ioadl_len = 0;
         ioarcb->read_ioadl_len = 0;
+        ioarcb->write_ioadl_addr =
+                cpu_to_be32(dma_addr + offsetof(struct ipr_cmnd, ioadl));
+        ioarcb->read_ioadl_addr = ioarcb->write_ioadl_addr;
         ioasa->ioasc = 0;
         ioasa->residual_data_len = 0;
         ioasa->u.gata.status = 0;
@@ -1610,7 +1613,7 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg,
         /* Set indication we have logged an error */
         ioa_cfg->errors_logged++;
 
-        if (ioa_cfg->log_level < IPR_DEFAULT_LOG_LEVEL)
+        if (ioa_cfg->log_level < ipr_error_table[error_index].log_hcam)
                 return;
         if (be32_to_cpu(hostrcb->hcam.length) > sizeof(hostrcb->hcam.u.raw))
                 hostrcb->hcam.length = cpu_to_be32(sizeof(hostrcb->hcam.u.raw));
@@ -3850,6 +3853,8 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
                 if (ipr_cmd->ioarcb.res_handle == res->cfgte.res_handle) {
                         if (ipr_cmd->scsi_cmd)
                                 ipr_cmd->done = ipr_scsi_eh_done;
+                        if (ipr_cmd->qc)
+                                ipr_cmd->done = ipr_sata_eh_done;
                         if (ipr_cmd->qc && !(ipr_cmd->qc->flags & ATA_QCFLAG_FAILED)) {
                                 ipr_cmd->qc->err_mask |= AC_ERR_TIMEOUT;
                                 ipr_cmd->qc->flags |= ATA_QCFLAG_FAILED;
@@ -4230,6 +4235,14 @@ static int ipr_build_ioadl(struct ipr_ioa_cfg *ioa_cfg,
 
                 sglist = scsi_cmd->request_buffer;
 
+                if (ipr_cmd->dma_use_sg <= ARRAY_SIZE(ioarcb->add_data.u.ioadl)) {
+                        ioadl = ioarcb->add_data.u.ioadl;
+                        ioarcb->write_ioadl_addr =
+                                cpu_to_be32(be32_to_cpu(ioarcb->ioarcb_host_pci_addr) +
+                                            offsetof(struct ipr_ioarcb, add_data));
+                        ioarcb->read_ioadl_addr = ioarcb->write_ioadl_addr;
+                }
+
                 for (i = 0; i < ipr_cmd->dma_use_sg; i++) {
                         ioadl[i].flags_and_data_len =
                                 cpu_to_be32(ioadl_flags | sg_dma_len(&sglist[i]));
@@ -4260,6 +4273,11 @@ static int ipr_build_ioadl(struct ipr_ioa_cfg *ioa_cfg,
                                                      scsi_cmd->sc_data_direction);
 
                 if (likely(!pci_dma_mapping_error(ipr_cmd->dma_handle))) {
+                        ioadl = ioarcb->add_data.u.ioadl;
+                        ioarcb->write_ioadl_addr =
+                                cpu_to_be32(be32_to_cpu(ioarcb->ioarcb_host_pci_addr) +
+                                            offsetof(struct ipr_ioarcb, add_data));
+                        ioarcb->read_ioadl_addr = ioarcb->write_ioadl_addr;
                         ipr_cmd->dma_use_sg = 1;
                         ioadl[0].flags_and_data_len =
                                 cpu_to_be32(ioadl_flags | length | IPR_IOADL_FLAGS_LAST);
@@ -4346,11 +4364,9 @@ static void ipr_erp_done(struct ipr_cmnd *ipr_cmd)
  **/
 static void ipr_reinit_ipr_cmnd_for_erp(struct ipr_cmnd *ipr_cmd)
 {
-        struct ipr_ioarcb *ioarcb;
-        struct ipr_ioasa *ioasa;
-
-        ioarcb = &ipr_cmd->ioarcb;
-        ioasa = &ipr_cmd->ioasa;
+        struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
+        struct ipr_ioasa *ioasa = &ipr_cmd->ioasa;
+        dma_addr_t dma_addr = be32_to_cpu(ioarcb->ioarcb_host_pci_addr);
 
         memset(&ioarcb->cmd_pkt, 0, sizeof(struct ipr_cmd_pkt));
         ioarcb->write_data_transfer_length = 0;
@@ -4359,6 +4375,9 @@ static void ipr_reinit_ipr_cmnd_for_erp(struct ipr_cmnd *ipr_cmd)
         ioarcb->read_ioadl_len = 0;
         ioasa->ioasc = 0;
         ioasa->residual_data_len = 0;
+        ioarcb->write_ioadl_addr =
+                cpu_to_be32(dma_addr + offsetof(struct ipr_cmnd, ioadl));
+        ioarcb->read_ioadl_addr = ioarcb->write_ioadl_addr;
 }
 
 /**
@@ -4457,12 +4476,13 @@ static void ipr_dump_ioasa(struct ipr_ioa_cfg *ioa_cfg,
 {
         int i;
         u16 data_len;
-        u32 ioasc;
+        u32 ioasc, fd_ioasc;
         struct ipr_ioasa *ioasa = &ipr_cmd->ioasa;
         __be32 *ioasa_data = (__be32 *)ioasa;
         int error_index;
 
         ioasc = be32_to_cpu(ioasa->ioasc) & IPR_IOASC_IOASC_MASK;
+        fd_ioasc = be32_to_cpu(ioasa->fd_ioasc) & IPR_IOASC_IOASC_MASK;
 
         if (0 == ioasc)
                 return;
@@ -4470,13 +4490,19 @@ static void ipr_dump_ioasa(struct ipr_ioa_cfg *ioa_cfg,
         if (ioa_cfg->log_level < IPR_DEFAULT_LOG_LEVEL)
                 return;
 
-        error_index = ipr_get_error(ioasc);
+        if (ioasc == IPR_IOASC_BUS_WAS_RESET && fd_ioasc)
+                error_index = ipr_get_error(fd_ioasc);
+        else
+                error_index = ipr_get_error(ioasc);
 
         if (ioa_cfg->log_level < IPR_MAX_LOG_LEVEL) {
                 /* Don't log an error if the IOA already logged one */
                 if (ioasa->ilid != 0)
                         return;
 
+                if (!ipr_is_gscsi(res))
+                        return;
+
                 if (ipr_error_table[error_index].log_ioasa == 0)
                         return;
         }
@@ -4636,11 +4662,11 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
                 return;
         }
 
-        if (ipr_is_gscsi(res))
-                ipr_dump_ioasa(ioa_cfg, ipr_cmd, res);
-        else
+        if (!ipr_is_gscsi(res))
                 ipr_gen_sense(ipr_cmd);
 
+        ipr_dump_ioasa(ioa_cfg, ipr_cmd, res);
+
         switch (ioasc & IPR_IOASC_IOASC_MASK) {
         case IPR_IOASC_ABORTED_CMD_TERM_BY_HOST:
                 if (ipr_is_naca_model(res))
@@ -5121,7 +5147,7 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
         struct ipr_ioarcb_ata_regs *regs;
 
         if (unlikely(!ioa_cfg->allow_cmds || ioa_cfg->ioa_is_dead))
-                return -EIO;
+                return AC_ERR_SYSTEM;
 
         ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg);
         ioarcb = &ipr_cmd->ioarcb;
@@ -5166,7 +5192,7 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
 
         default:
                 WARN_ON(1);
-                return -1;
+                return AC_ERR_INVALID;
         }
 
         mb();
@@ -6188,7 +6214,7 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
         dev_info(&ioa_cfg->pdev->dev, "Initializing IOA.\n");
 
         ipr_cmd->timer.data = (unsigned long) ipr_cmd;
-        ipr_cmd->timer.expires = jiffies + (ipr_transop_timeout * HZ);
+        ipr_cmd->timer.expires = jiffies + (ioa_cfg->transop_timeout * HZ);
         ipr_cmd->timer.function = (void (*)(unsigned long))ipr_oper_timeout;
         ipr_cmd->done = ipr_reset_ioa_job;
         add_timer(&ipr_cmd->timer);
@@ -6385,6 +6411,7 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
         rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START);
 
         if (rc != PCIBIOS_SUCCESSFUL) {
+                pci_unblock_user_cfg_access(ipr_cmd->ioa_cfg->pdev);
                 ipr_cmd->ioasa.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
                 rc = IPR_RC_JOB_CONTINUE;
         } else {
@@ -7117,8 +7144,6 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
         ioa_cfg->pdev = pdev;
         ioa_cfg->log_level = ipr_log_level;
         ioa_cfg->doorbell = IPR_DOORBELL;
-        if (!ipr_auto_create)
-                ioa_cfg->doorbell |= IPR_RUNTIME_RESET;
         sprintf(ioa_cfg->eye_catcher, IPR_EYECATCHER);
         sprintf(ioa_cfg->trace_start, IPR_TRACE_START_LABEL);
         sprintf(ioa_cfg->ipr_free_label, IPR_FREEQ_LABEL);
@@ -7233,6 +7258,13 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
                 goto out_scsi_host_put;
         }
 
+        if (ipr_transop_timeout)
+                ioa_cfg->transop_timeout = ipr_transop_timeout;
+        else if (dev_id->driver_data & IPR_USE_LONG_TRANSOP_TIMEOUT)
+                ioa_cfg->transop_timeout = IPR_LONG_OPERATIONAL_TIMEOUT;
+        else
+                ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
+
         ipr_regs_pci = pci_resource_start(pdev, 0);
 
         rc = pci_request_regions(pdev, IPR_NAME);
@@ -7540,29 +7572,45 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571A, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B, 0, 0, 0 },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B, 0, 0,
+                IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0, 0 },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571E, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F, 0, 0, 0 },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F, 0, 0,
+                IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F, 0, 0, 0 },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F, 0, 0,
+                IPR_USE_LONG_TRANSOP_TIMEOUT },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SCAMP_E,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574D, 0, 0,
+                IPR_USE_LONG_TRANSOP_TIMEOUT },
         { }
 };
 MODULE_DEVICE_TABLE(pci, ipr_pci_table);
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 88f285de97bb..bc53d7cebe0a 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -37,8 +37,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.3.1"
-#define IPR_DRIVER_DATE "(January 23, 2007)"
+#define IPR_DRIVER_VERSION "2.3.2"
+#define IPR_DRIVER_DATE "(March 23, 2007)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -55,6 +55,7 @@
 #define IPR_NUM_BASE_CMD_BLKS                           100
 
 #define PCI_DEVICE_ID_IBM_OBSIDIAN_E    0x0339
+#define PCI_DEVICE_ID_IBM_SCAMP_E               0x034A
 
 #define IPR_SUBS_DEV_ID_2780    0x0264
 #define IPR_SUBS_DEV_ID_5702    0x0266
@@ -69,8 +70,12 @@
 #define IPR_SUBS_DEV_ID_572A    0x02C1
 #define IPR_SUBS_DEV_ID_572B    0x02C2
 #define IPR_SUBS_DEV_ID_572F    0x02C3
+#define IPR_SUBS_DEV_ID_574D    0x030B
+#define IPR_SUBS_DEV_ID_574E    0x030A
 #define IPR_SUBS_DEV_ID_575B    0x030D
 #define IPR_SUBS_DEV_ID_575C    0x0338
+#define IPR_SUBS_DEV_ID_575D    0x033E
+#define IPR_SUBS_DEV_ID_57B3    0x033A
 #define IPR_SUBS_DEV_ID_57B7    0x0360
 #define IPR_SUBS_DEV_ID_57B8    0x02C2
 
@@ -104,6 +109,9 @@
 #define IPR_IOASC_IOA_WAS_RESET                 0x10000001
 #define IPR_IOASC_PCI_ACCESS_ERROR                      0x10000002
 
+/* Driver data flags */
+#define IPR_USE_LONG_TRANSOP_TIMEOUT            0x00000001
+
 #define IPR_DEFAULT_MAX_ERROR_DUMP                      984
 #define IPR_NUM_LOG_HCAMS                               2
 #define IPR_NUM_CFG_CHG_HCAMS                           2
@@ -179,6 +187,7 @@
 #define IPR_SET_SUP_DEVICE_TIMEOUT              (2 * 60 * HZ)
 #define IPR_REQUEST_SENSE_TIMEOUT               (10 * HZ)
 #define IPR_OPERATIONAL_TIMEOUT         (5 * 60)
+#define IPR_LONG_OPERATIONAL_TIMEOUT    (12 * 60)
 #define IPR_WAIT_FOR_RESET_TIMEOUT              (2 * HZ)
 #define IPR_CHECK_FOR_RESET_TIMEOUT             (HZ / 10)
 #define IPR_WAIT_FOR_BIST_TIMEOUT               (2 * HZ)
@@ -413,9 +422,25 @@ struct ipr_ioarcb_ata_regs {
         u8 ctl;
 }__attribute__ ((packed, aligned(4)));
 
+struct ipr_ioadl_desc {
+        __be32 flags_and_data_len;
+#define IPR_IOADL_FLAGS_MASK            0xff000000
+#define IPR_IOADL_GET_FLAGS(x) (be32_to_cpu(x) & IPR_IOADL_FLAGS_MASK)
+#define IPR_IOADL_DATA_LEN_MASK         0x00ffffff
+#define IPR_IOADL_GET_DATA_LEN(x) (be32_to_cpu(x) & IPR_IOADL_DATA_LEN_MASK)
+#define IPR_IOADL_FLAGS_READ            0x48000000
+#define IPR_IOADL_FLAGS_READ_LAST       0x49000000
+#define IPR_IOADL_FLAGS_WRITE           0x68000000
+#define IPR_IOADL_FLAGS_WRITE_LAST      0x69000000
+#define IPR_IOADL_FLAGS_LAST            0x01000000
+
+        __be32 address;
+}__attribute__((packed, aligned (8)));
+
 struct ipr_ioarcb_add_data {
         union {
                 struct ipr_ioarcb_ata_regs regs;
+                struct ipr_ioadl_desc ioadl[5];
                 __be32 add_cmd_parms[10];
         }u;
 }__attribute__ ((packed, aligned(4)));
@@ -447,21 +472,6 @@ struct ipr_ioarcb {
         struct ipr_ioarcb_add_data add_data;
 }__attribute__((packed, aligned (4)));
 
-struct ipr_ioadl_desc {
-        __be32 flags_and_data_len;
-#define IPR_IOADL_FLAGS_MASK            0xff000000
-#define IPR_IOADL_GET_FLAGS(x) (be32_to_cpu(x) & IPR_IOADL_FLAGS_MASK)
-#define IPR_IOADL_DATA_LEN_MASK         0x00ffffff
-#define IPR_IOADL_GET_DATA_LEN(x) (be32_to_cpu(x) & IPR_IOADL_DATA_LEN_MASK)
-#define IPR_IOADL_FLAGS_READ            0x48000000
-#define IPR_IOADL_FLAGS_READ_LAST       0x49000000
-#define IPR_IOADL_FLAGS_WRITE           0x68000000
-#define IPR_IOADL_FLAGS_WRITE_LAST      0x69000000
-#define IPR_IOADL_FLAGS_LAST            0x01000000
-
-        __be32 address;
-}__attribute__((packed, aligned (8)));
-
 struct ipr_ioasa_vset {
         __be32 failing_lba_hi;
         __be32 failing_lba_lo;
@@ -1119,6 +1129,7 @@ struct ipr_ioa_cfg {
 
         struct ipr_bus_attributes bus_attr[IPR_MAX_NUM_BUSES];
 
+        unsigned int transop_timeout;
         const struct ipr_chip_cfg_t *chip_cfg;
 
         void __iomem *hdw_dma_regs;     /* iomapped PCI memory space */
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 8f55e1431433..c9a3abf9e7b6 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -527,12 +527,12 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *conn)
                  * than 8K, but there are no targets that currently do this.
                  * For now we fail until we find a vendor that needs it
                  */
-                if (DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH <
+                if (ISCSI_DEF_MAX_RECV_SEG_LEN <
                     tcp_conn->in.datalen) {
                         printk(KERN_ERR "iscsi_tcp: received buffer of len %u "
                               "but conn buffer is only %u (opcode %0x)\n",
                               tcp_conn->in.datalen,
-                              DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, opcode);
+                              ISCSI_DEF_MAX_RECV_SEG_LEN, opcode);
                         rc = ISCSI_ERR_PROTO;
                         break;
                 }
@@ -1762,7 +1762,7 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
          * due to strange issues with iser these are not set
          * in iscsi_conn_setup
          */
-        conn->max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
+        conn->max_recv_dlength = ISCSI_DEF_MAX_RECV_SEG_LEN;
 
         tcp_conn = kzalloc(sizeof(*tcp_conn), GFP_KERNEL);
         if (!tcp_conn)
@@ -1777,14 +1777,24 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
         tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                   CRYPTO_ALG_ASYNC);
         tcp_conn->tx_hash.flags = 0;
-        if (IS_ERR(tcp_conn->tx_hash.tfm))
+        if (IS_ERR(tcp_conn->tx_hash.tfm)) {
+                printk(KERN_ERR "Could not create connection due to crc32c "
+                       "loading error %ld. Make sure the crc32c module is "
+                       "built as a module or into the kernel\n",
+                        PTR_ERR(tcp_conn->tx_hash.tfm));
                 goto free_tcp_conn;
+        }
 
         tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                   CRYPTO_ALG_ASYNC);
         tcp_conn->rx_hash.flags = 0;
-        if (IS_ERR(tcp_conn->rx_hash.tfm))
+        if (IS_ERR(tcp_conn->rx_hash.tfm)) {
+                printk(KERN_ERR "Could not create connection due to crc32c "
+                       "loading error %ld. Make sure the crc32c module is "
+                       "built as a module or into the kernel\n",
+                        PTR_ERR(tcp_conn->rx_hash.tfm));
                 goto free_tx_tfm;
+        }
 
         return cls_conn;
 
@@ -2138,6 +2148,7 @@ static struct scsi_host_template iscsi_sht = {
         .change_queue_depth     = iscsi_change_queue_depth,
         .can_queue              = ISCSI_XMIT_CMDS_MAX - 1,
         .sg_tablesize           = ISCSI_SG_TABLESIZE,
+        .max_sectors            = 0xFFFF,
         .cmd_per_lun            = ISCSI_DEF_CMD_PER_LUN,
         .eh_abort_handler       = iscsi_eh_abort,
         .eh_host_reset_handler  = iscsi_eh_host_reset,
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 7c75771c77ff..3f5b9b445b29 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -25,6 +25,7 @@
 #include <linux/mutex.h>
 #include <linux/kfifo.h>
 #include <linux/delay.h>
+#include <asm/unaligned.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -269,14 +270,14 @@ invalid_datalen:
                         goto out;
                 }
 
-                senselen = be16_to_cpu(*(__be16 *)data);
+                senselen = be16_to_cpu(get_unaligned((__be16 *) data));
                 if (datalen < senselen)
                         goto invalid_datalen;
 
                 memcpy(sc->sense_buffer, data + 2,
                        min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
                 debug_scsi("copied %d bytes of sense\n",
-                           min(senselen, SCSI_SENSE_BUFFERSIZE));
+                           min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
         }
 
         if (sc->sc_data_direction == DMA_TO_DEVICE)
@@ -577,7 +578,7 @@ void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
 }
 EXPORT_SYMBOL_GPL(iscsi_conn_failure);
 
-static int iscsi_xmit_imm_task(struct iscsi_conn *conn)
+static int iscsi_xmit_mtask(struct iscsi_conn *conn)
 {
         struct iscsi_hdr *hdr = conn->mtask->hdr;
         int rc, was_logout = 0;
@@ -591,6 +592,9 @@ static int iscsi_xmit_imm_task(struct iscsi_conn *conn)
         if (rc)
                 return rc;
 
+        /* done with this in-progress mtask */
+        conn->mtask = NULL;
+
         if (was_logout) {
                 set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
                 return -ENODATA;
@@ -643,11 +647,9 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
                 conn->ctask = NULL;
         }
         if (conn->mtask) {
-                rc = iscsi_xmit_imm_task(conn);
+                rc = iscsi_xmit_mtask(conn);
                 if (rc)
                         goto again;
-                /* done with this in-progress mtask */
-                conn->mtask = NULL;
         }
 
         /* process immediate first */
@@ -658,12 +660,10 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
                         list_add_tail(&conn->mtask->running,
                                       &conn->mgmt_run_list);
                         spin_unlock_bh(&conn->session->lock);
-                        rc = iscsi_xmit_imm_task(conn);
+                        rc = iscsi_xmit_mtask(conn);
                         if (rc)
                                 goto again;
                 }
-                /* done with this mtask */
-                conn->mtask = NULL;
         }
 
         /* process command queue */
@@ -701,12 +701,10 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
                         list_add_tail(&conn->mtask->running,
                                       &conn->mgmt_run_list);
                         spin_unlock_bh(&conn->session->lock);
-                        rc = tt->xmit_mgmt_task(conn, conn->mtask);
-                        if (rc)
+                        rc = iscsi_xmit_mtask(conn);
+                        if (rc)
                                 goto again;
                 }
-                /* done with this mtask */
-                conn->mtask = NULL;
         }
 
         return -ENODATA;
@@ -1523,7 +1521,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
         }
         spin_unlock_bh(&session->lock);
 
-        data = kmalloc(DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, GFP_KERNEL);
+        data = kmalloc(ISCSI_DEF_MAX_RECV_SEG_LEN, GFP_KERNEL);
         if (!data)
                 goto login_mtask_data_alloc_fail;
         conn->login_mtask->data = conn->data = data;
@@ -1597,6 +1595,9 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
                 wake_up(&conn->ehwait);
         }
 
+        /* flush queued up work because we free the connection below */
+        scsi_flush_work(session->host);
+
         spin_lock_bh(&session->lock);
         kfree(conn->data);
         kfree(conn->persistent_address);
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index dc70c180e115..e34442e405e8 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/pci.h>
 #include <linux/scatterlist.h>
 
 #include "sas_internal.h"
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 89403b00e042..5631c199a8eb 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -22,7 +22,6 @@
 #include <linux/kfifo.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
-#include <linux/pci.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_tcq.h>
@@ -225,8 +224,7 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
         struct srp_direct_buf *md = NULL;
         struct scatterlist dummy, *sg = NULL;
         dma_addr_t token = 0;
-        long err;
-        unsigned int done = 0;
+        int err = 0;
         int nmd, nsg = 0, len;
 
         if (dma_map || ext_desc) {
@@ -258,8 +256,8 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
                 sg_dma_address(&dummy) = token;
                 err = rdma_io(sc, &dummy, 1, &id->table_desc, 1, DMA_TO_DEVICE,
                               id->table_desc.len);
-                if (err < 0) {
-                        eprintk("Error copying indirect table %ld\n", err);
+                if (err) {
+                        eprintk("Error copying indirect table %d\n", err);
                         goto free_mem;
                 }
         } else {
@@ -272,6 +270,7 @@ rdma:
                 nsg = dma_map_sg(iue->target->dev, sg, sc->use_sg, DMA_BIDIRECTIONAL);
                 if (!nsg) {
                         eprintk("fail to map %p %d\n", iue, sc->use_sg);
+                        err = -EIO;
                         goto free_mem;
                 }
                 len = min(sc->request_bufflen, id->len);
@@ -287,7 +286,7 @@ free_mem:
         if (token && dma_map)
                 dma_free_coherent(iue->target->dev, id->table_desc.len, md, token);
 
-        return done;
+        return err;
 }
 
 static int data_out_desc_size(struct srp_cmd *cmd)
@@ -352,7 +351,7 @@ int srp_transfer_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
                 break;
         default:
                 eprintk("Unknown format %d %x\n", dir, format);
-                break;
+                err = -EINVAL;
         }
 
         return err;
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 057fd7e0e379..dcf6106f557a 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -671,7 +671,7 @@ static int
 lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd, int len)
 {
         uint8_t lenlo, lenhi;
-        uint32_t Length;
+        int Length;
         int i, j;
         int finished = 0;
         int index = 0;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 0aa3304f6b9b..7fc6e06ea7e1 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2088,7 +2088,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
 static inline int
 make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 {
-        *pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        *pdev = alloc_pci_dev();
 
         if( *pdev == NULL ) return -1;
 
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index a967fadb7439..08060fb478b6 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -87,6 +87,7 @@ MODULE_AUTHOR("Willem Riede");
 MODULE_DESCRIPTION("OnStream {DI-|FW-|SC-|USB}{30|50} Tape Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(OSST_MAJOR);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_TAPE);
 
 module_param(max_dev, int, 0444);
 MODULE_PARM_DESC(max_dev, "Maximum number of OnStream Tape Drives to attach (4)");
diff --git a/drivers/scsi/pci2000.h b/drivers/scsi/pci2000.h
deleted file mode 100644
index 0ebd8ce9e1de..000000000000
--- a/drivers/scsi/pci2000.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2000 device driver for Linux.
- *
- * pci2000.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 _PCI2000_H
-#define _PCI2000_H
-
-#include <linux/types.h>
-
-#ifndef PSI_EIDE_SCSIOP
-#define PSI_EIDE_SCSIOP 1
-
-#define LINUXVERSION(v,p,s)    (((v)<<16) + ((p)<<8) + (s))
-
-/************************************************/
-/*              definition of standard data types               */
-/************************************************/
-#define CHAR    char
-#define UCHAR   unsigned char
-#define SHORT   short
-#define USHORT  unsigned short
-#define BOOL    long
-#define LONG    long
-#define ULONG   unsigned long
-#define VOID    void
-
-typedef CHAR    *PCHAR;
-typedef UCHAR   *PUCHAR;
-typedef SHORT   *PSHORT;
-typedef USHORT  *PUSHORT;
-typedef BOOL    *PBOOL;
-typedef LONG    *PLONG;
-typedef ULONG   *PULONG;
-typedef VOID    *PVOID;
-
-
-/************************************************/
-/*              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])) )
-
-/************************************************/
-/*              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
-
-// 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;
-
-#endif
-
-// function prototypes
-int Pci2000_Detect                      (struct scsi_host_template *tpnt);
-int Pci2000_Command                     (Scsi_Cmnd *SCpnt);
-int Pci2000_QueueCommand        (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));
-int Pci2000_Abort                       (Scsi_Cmnd *SCpnt);
-int Pci2000_Reset                       (Scsi_Cmnd *SCpnt, unsigned int flags);
-int Pci2000_Release                     (struct Scsi_Host *pshost);
-int Pci2000_BiosParam           (struct scsi_device *sdev,
-                                        struct block_device *bdev,
-                                        sector_t capacity, int geom[]);
-
-#endif
diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index eac8e179cfff..7dd787f6ab27 100644
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -3,11 +3,11 @@
 #
 
 menu "PCMCIA SCSI adapter support"
-        depends on SCSI!=n && PCMCIA!=n && MODULES
+        depends on SCSI!=n && PCMCIA!=n
 
 config PCMCIA_AHA152X
         tristate "Adaptec AHA152X PCMCIA support"
-        depends on m && !64BIT
+        depends on !64BIT
         select SCSI_SPI_ATTRS
         help
           Say Y here if you intend to attach this type of PCMCIA SCSI host
@@ -18,7 +18,6 @@ config PCMCIA_AHA152X
 
 config PCMCIA_FDOMAIN
         tristate "Future Domain PCMCIA support"
-        depends on m
         help
           Say Y here if you intend to attach this type of PCMCIA SCSI host
           adapter to your computer.
@@ -28,7 +27,7 @@ config PCMCIA_FDOMAIN
 
 config PCMCIA_NINJA_SCSI
         tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support"
-        depends on m && !64BIT
+        depends on !64BIT
         help
           If you intend to attach this type of PCMCIA SCSI host adapter to
           your computer, say Y here and read
@@ -62,7 +61,6 @@ config PCMCIA_NINJA_SCSI
 
 config PCMCIA_QLOGIC
         tristate "Qlogic PCMCIA support"
-        depends on m
         help
           Say Y here if you intend to attach this type of PCMCIA SCSI host
           adapter to your computer.
@@ -72,7 +70,6 @@ config PCMCIA_QLOGIC
 
 config PCMCIA_SYM53C500
         tristate "Symbios 53c500 PCMCIA support"
-        depends on m
         help
           Say Y here if you have a New Media Bus Toaster or other PCMCIA
           SCSI adapter based on the Symbios 53c500 controller.
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 05f4f2a378eb..e8948b679f5b 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1478,14 +1478,17 @@ typedef union {
         uint32_t b24 : 24;
 
         struct {
-                uint8_t d_id[3];
-                uint8_t rsvd_1;
-        } r;
-
-        struct {
+#ifdef __BIG_ENDIAN
+                uint8_t domain;
+                uint8_t area;
+                uint8_t al_pa;
+#elif __LITTLE_ENDIAN
                 uint8_t al_pa;
                 uint8_t area;
                 uint8_t domain;
+#else
+#error "__BIG_ENDIAN or __LITTLE_ENDIAN must be defined!"
+#endif
                 uint8_t rsvd_1;
         } b;
 } port_id_t;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 98c01cd5e1a8..3e296ab845b6 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -11,6 +11,11 @@
 
 #include "qla_devtbl.h"
 
+#ifdef CONFIG_SPARC
+#include <asm/prom.h>
+#include <asm/pbm.h>
+#endif
+
 /* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */
 #ifndef EXT_IS_LUN_BIT_SET
 #define EXT_IS_LUN_BIT_SET(P,L) \
@@ -88,12 +93,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
 
         qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");
 
-        rval = ha->isp_ops.nvram_config(ha);
-        if (rval) {
-                DEBUG2(printk("scsi(%ld): Unable to verify NVRAM data.\n",
-                    ha->host_no));
-                return rval;
-        }
+        ha->isp_ops.nvram_config(ha);
 
         if (ha->flags.disable_serdes) {
                 /* Mask HBA via NVRAM settings? */
@@ -1393,6 +1393,28 @@ qla2x00_set_model_info(scsi_qla_host_t *ha, uint8_t *model, size_t len, char *de
         }
 }
 
+/* On sparc systems, obtain port and node WWN from firmware
+ * properties.
+ */
+static void qla2xxx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, nvram_t *nv)
+{
+#ifdef CONFIG_SPARC
+        struct pci_dev *pdev = ha->pdev;
+        struct pcidev_cookie *pcp = pdev->sysdata;
+        struct device_node *dp = pcp->prom_node;
+        u8 *val;
+        int len;
+
+        val = of_get_property(dp, "port-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->port_name, val, WWN_SIZE);
+
+        val = of_get_property(dp, "node-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->node_name, val, WWN_SIZE);
+#endif
+}
+
 /*
 * NVRAM configuration for ISP 2xxx
 *
@@ -1409,6 +1431,7 @@ qla2x00_set_model_info(scsi_qla_host_t *ha, uint8_t *model, size_t len, char *de
 int
 qla2x00_nvram_config(scsi_qla_host_t *ha)
 {
+        int             rval;
         uint8_t         chksum = 0;
         uint16_t        cnt;
         uint8_t         *dptr1, *dptr2;
@@ -1417,6 +1440,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         uint8_t         *ptr = (uint8_t *)ha->request_ring;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
+        rval = QLA_SUCCESS;
+
         /* Determine NVRAM starting address. */
         ha->nvram_size = sizeof(nvram_t);
         ha->nvram_base = 0;
@@ -1440,7 +1465,57 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
                 qla_printk(KERN_WARNING, ha, "Inconsistent NVRAM detected: "
                     "checksum=0x%x id=%c version=0x%x.\n", chksum, nv->id[0],
                     nv->nvram_version);
-                return QLA_FUNCTION_FAILED;
+                qla_printk(KERN_WARNING, ha, "Falling back to functioning (yet "
+                    "invalid -- WWPN) defaults.\n");
+
+                /*
+                 * Set default initialization control block.
+                 */
+                memset(nv, 0, ha->nvram_size);
+                nv->parameter_block_version = ICB_VERSION;
+
+                if (IS_QLA23XX(ha)) {
+                        nv->firmware_options[0] = BIT_2 | BIT_1;
+                        nv->firmware_options[1] = BIT_7 | BIT_5;
+                        nv->add_firmware_options[0] = BIT_5;
+                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
+                        nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                        nv->special_options[1] = BIT_7;
+                } else if (IS_QLA2200(ha)) {
+                        nv->firmware_options[0] = BIT_2 | BIT_1;
+                        nv->firmware_options[1] = BIT_7 | BIT_5;
+                        nv->add_firmware_options[0] = BIT_5;
+                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
+                        nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                } else if (IS_QLA2100(ha)) {
+                        nv->firmware_options[0] = BIT_3 | BIT_1;
+                        nv->firmware_options[1] = BIT_5;
+                        nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                }
+
+                nv->max_iocb_allocation = __constant_cpu_to_le16(256);
+                nv->execution_throttle = __constant_cpu_to_le16(16);
+                nv->retry_count = 8;
+                nv->retry_delay = 1;
+
+                nv->port_name[0] = 33;
+                nv->port_name[3] = 224;
+                nv->port_name[4] = 139;
+
+                qla2xxx_nvram_wwn_from_ofw(ha, nv);
+
+                nv->login_timeout = 4;
+
+                /*
+                 * Set default host adapter parameters
+                 */
+                nv->host_p[1] = BIT_2;
+                nv->reset_delay = 5;
+                nv->port_down_retry_count = 8;
+                nv->max_luns_per_target = __constant_cpu_to_le16(8);
+                nv->link_down_timeout = 60;
+
+                rval = 1;
         }
 
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
@@ -1653,7 +1728,11 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
                 }
         }
 
-        return QLA_SUCCESS;
+        if (rval) {
+                DEBUG2_3(printk(KERN_WARNING
+                    "scsi(%ld): NVRAM configuration failed!\n", ha->host_no));
+        }
+        return (rval);
 }
 
 static void
@@ -3071,9 +3150,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
 
                 ha->isp_ops.get_flash_version(ha, ha->request_ring);
 
-                rval = ha->isp_ops.nvram_config(ha);
-                if (rval)
-                        goto isp_abort_retry;
+                ha->isp_ops.nvram_config(ha);
 
                 if (!qla2x00_restart_isp(ha)) {
                         clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
@@ -3103,7 +3180,6 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                                 }
                         }
                 } else {        /* failed the ISP abort */
-isp_abort_retry:
                         ha->flags.online = 1;
                         if (test_bit(ISP_ABORT_RETRY, &ha->dpc_flags)) {
                                 if (ha->isp_abort_cnt == 0) {
@@ -3290,9 +3366,32 @@ qla24xx_reset_adapter(scsi_qla_host_t *ha)
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
+/* On sparc systems, obtain port and node WWN from firmware
+ * properties.
+ */
+static void qla24xx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, struct nvram_24xx *nv)
+{
+#ifdef CONFIG_SPARC
+        struct pci_dev *pdev = ha->pdev;
+        struct pcidev_cookie *pcp = pdev->sysdata;
+        struct device_node *dp = pcp->prom_node;
+        u8 *val;
+        int len;
+
+        val = of_get_property(dp, "port-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->port_name, val, WWN_SIZE);
+
+        val = of_get_property(dp, "node-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->node_name, val, WWN_SIZE);
+#endif
+}
+
 int
 qla24xx_nvram_config(scsi_qla_host_t *ha)
 {
+        int   rval;
         struct init_cb_24xx *icb;
         struct nvram_24xx *nv;
         uint32_t *dptr;
@@ -3300,6 +3399,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
         uint32_t chksum;
         uint16_t cnt;
 
+        rval = QLA_SUCCESS;
         icb = (struct init_cb_24xx *)ha->init_cb;
         nv = (struct nvram_24xx *)ha->request_ring;
 
@@ -3332,7 +3432,52 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 qla_printk(KERN_WARNING, ha, "Inconsistent NVRAM detected: "
                     "checksum=0x%x id=%c version=0x%x.\n", chksum, nv->id[0],
                     le16_to_cpu(nv->nvram_version));
-                return QLA_FUNCTION_FAILED;
+                qla_printk(KERN_WARNING, ha, "Falling back to functioning (yet "
+                    "invalid -- WWPN) defaults.\n");
+
+                /*
+                 * Set default initialization control block.
+                 */
+                memset(nv, 0, ha->nvram_size);
+                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
+                nv->version = __constant_cpu_to_le16(ICB_VERSION);
+                nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
+                nv->exchange_count = __constant_cpu_to_le16(0);
+                nv->hard_address = __constant_cpu_to_le16(124);
+                nv->port_name[0] = 0x21;
+                nv->port_name[1] = 0x00 + PCI_FUNC(ha->pdev->devfn);
+                nv->port_name[2] = 0x00;
+                nv->port_name[3] = 0xe0;
+                nv->port_name[4] = 0x8b;
+                nv->port_name[5] = 0x1c;
+                nv->port_name[6] = 0x55;
+                nv->port_name[7] = 0x86;
+                nv->node_name[0] = 0x20;
+                nv->node_name[1] = 0x00;
+                nv->node_name[2] = 0x00;
+                nv->node_name[3] = 0xe0;
+                nv->node_name[4] = 0x8b;
+                nv->node_name[5] = 0x1c;
+                nv->node_name[6] = 0x55;
+                nv->node_name[7] = 0x86;
+                qla24xx_nvram_wwn_from_ofw(ha, nv);
+                nv->login_retry_count = __constant_cpu_to_le16(8);
+                nv->interrupt_delay_timer = __constant_cpu_to_le16(0);
+                nv->login_timeout = __constant_cpu_to_le16(0);
+                nv->firmware_options_1 =
+                    __constant_cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);
+                nv->firmware_options_2 = __constant_cpu_to_le32(2 << 4);
+                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);
+                nv->firmware_options_3 = __constant_cpu_to_le32(2 << 13);
+                nv->host_p = __constant_cpu_to_le32(BIT_11|BIT_10);
+                nv->efi_parameters = __constant_cpu_to_le32(0);
+                nv->reset_delay = 5;
+                nv->max_luns_per_target = __constant_cpu_to_le16(128);
+                nv->port_down_retry_count = __constant_cpu_to_le16(30);
+                nv->link_down_timeout = __constant_cpu_to_le16(30);
+
+                rval = 1;
         }
 
         /* Reset Initialization control block */
@@ -3479,7 +3624,11 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 ha->flags.process_response_queue = 1;
         }
 
-        return QLA_SUCCESS;
+        if (rval) {
+                DEBUG2_3(printk(KERN_WARNING
+                    "scsi(%ld): NVRAM configuration failed!\n", ha->host_no));
+        }
+        return (rval);
 }
 
 static int
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 83376f6ac3db..71e32a248528 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1280,14 +1280,14 @@ qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,
         } else {
                 if (name != NULL) {
                         /* This function returns name in big endian. */
-                        name[0] = LSB(mcp->mb[2]);
-                        name[1] = MSB(mcp->mb[2]);
-                        name[2] = LSB(mcp->mb[3]);
-                        name[3] = MSB(mcp->mb[3]);
-                        name[4] = LSB(mcp->mb[6]);
-                        name[5] = MSB(mcp->mb[6]);
-                        name[6] = LSB(mcp->mb[7]);
-                        name[7] = MSB(mcp->mb[7]);
+                        name[0] = MSB(mcp->mb[2]);
+                        name[1] = LSB(mcp->mb[2]);
+                        name[2] = MSB(mcp->mb[3]);
+                        name[3] = LSB(mcp->mb[3]);
+                        name[4] = MSB(mcp->mb[6]);
+                        name[5] = LSB(mcp->mb[6]);
+                        name[6] = MSB(mcp->mb[7]);
+                        name[7] = LSB(mcp->mb[7]);
                 }
 
                 DEBUG11(printk("qla2x00_get_port_name(%ld): done.\n",
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 68f5d24b938b..b78919a318e2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(ql2xallocfwdump,
                 "vary by ISP type.  Default is 1 - allocate memory.");
 
 int ql2xextended_error_logging;
-module_param(ql2xextended_error_logging, int, S_IRUGO|S_IRUSR);
+module_param(ql2xextended_error_logging, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xextended_error_logging,
                 "Option to enable extended error logging, "
                 "Default is 0 - no logging. 1 - log errors.");
@@ -157,6 +157,8 @@ static struct scsi_host_template qla24xx_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .scan_finished          = qla2xxx_scan_finished,
+        .scan_start             = qla2xxx_scan_start,
         .change_queue_depth     = qla2x00_change_queue_depth,
         .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
@@ -1705,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
         scsi_host_put(ha->host);
 
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 }
 
@@ -1747,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         if (ha->iobase)
                 iounmap(ha->iobase);
         pci_release_regions(ha->pdev);
-
-        pci_disable_device(ha->pdev);
 }
 
 static inline void
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index ff1dd4175a7f..206bda093da2 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -466,6 +466,7 @@ qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
 
         /* TODO: What happens if we time out? */
@@ -508,6 +509,7 @@ qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
         return rval;
 }
@@ -1255,6 +1257,7 @@ qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data,
                 }
                 udelay(10);
                 barrier();
+                cond_resched();
         }
         return status;
 }
@@ -1403,6 +1406,7 @@ qla2x00_read_flash_data(scsi_qla_host_t *ha, uint8_t *tmp_buf, uint32_t saddr,
                 if (saddr % 100)
                         udelay(10);
                 *tmp_buf = data;
+                cond_resched();
         }
 }
 
@@ -1449,7 +1453,6 @@ uint8_t *
 qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
     uint32_t offset, uint32_t length)
 {
-        unsigned long flags;
         uint32_t addr, midpoint;
         uint8_t *data;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -1458,7 +1461,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         qla2x00_suspend_hba(ha);
 
         /* Go with read. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         midpoint = ha->optrom_size / 2;
 
         qla2x00_flash_enable(ha);
@@ -1473,7 +1475,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
                 *data = qla2x00_read_flash_byte(ha, addr);
         }
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);
@@ -1487,7 +1488,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 {
 
         int rval;
-        unsigned long flags;
         uint8_t man_id, flash_id, sec_number, data;
         uint16_t wd;
         uint32_t addr, liter, sec_mask, rest_addr;
@@ -1500,7 +1500,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         sec_number = 0;
 
         /* Reset ISP chip. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
         pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
@@ -1689,10 +1688,10 @@ update_flash:
                                 rval = QLA_FUNCTION_FAILED;
                                 break;
                         }
+                        cond_resched();
                 }
         } while (0);
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 61347aee55ce..dc85495c337f 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.07-k5"
+#define QLA2XXX_VERSION      "8.01.07-k6"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1c89ee3e69ba..4c1e31334765 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -344,7 +344,6 @@ void scsi_destroy_command_freelist(struct Scsi_Host *shost)
 void scsi_log_send(struct scsi_cmnd *cmd)
 {
         unsigned int level;
-        struct scsi_device *sdev;
 
         /*
          * If ML QUEUE log level is greater than or equal to:
@@ -361,22 +360,17 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                 level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,
                                        SCSI_LOG_MLQUEUE_BITS);
                 if (level > 1) {
-                        sdev = cmd->device;
-                        sdev_printk(KERN_INFO, sdev, "send ");
+                        scmd_printk(KERN_INFO, cmd, "Send: ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
-                        /*
-                         * spaces to match disposition and cmd->result
-                         * output in scsi_log_completion.
-                         */
-                        printk("                 ");
+                        printk("\n");
                         scsi_print_command(cmd);
                         if (level > 3) {
                                 printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
                                        " done = 0x%p, queuecommand 0x%p\n",
                                         cmd->request_buffer, cmd->request_bufflen,
                                         cmd->done,
-                                        sdev->host->hostt->queuecommand);
+                                        cmd->device->host->hostt->queuecommand);
 
                         }
                 }
@@ -386,7 +380,6 @@ void scsi_log_send(struct scsi_cmnd *cmd)
 void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
 {
         unsigned int level;
-        struct scsi_device *sdev;
 
         /*
          * If ML COMPLETE log level is greater than or equal to:
@@ -405,8 +398,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                                        SCSI_LOG_MLCOMPLETE_BITS);
                 if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||
                     (level > 1)) {
-                        sdev = cmd->device;
-                        sdev_printk(KERN_INFO, sdev, "done ");
+                        scmd_printk(KERN_INFO, cmd, "Done: ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
                         /*
@@ -415,40 +407,35 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                          */
                         switch (disposition) {
                         case SUCCESS:
-                                printk("SUCCESS");
+                                printk("SUCCESS\n");
                                 break;
                         case NEEDS_RETRY:
-                                printk("RETRY  ");
+                                printk("RETRY\n");
                                 break;
                         case ADD_TO_MLQUEUE:
-                                printk("MLQUEUE");
+                                printk("MLQUEUE\n");
                                 break;
                         case FAILED:
-                                printk("FAILED ");
+                                printk("FAILED\n");
                                 break;
                         case TIMEOUT_ERROR:
                                 /* 
                                  * If called via scsi_times_out.
                                  */
-                                printk("TIMEOUT");
+                                printk("TIMEOUT\n");
                                 break;
                         default:
-                                printk("UNKNOWN");
+                                printk("UNKNOWN\n");
                         }
-                        printk(" %8x ", cmd->result);
+                        scsi_print_result(cmd);
                         scsi_print_command(cmd);
-                        if (status_byte(cmd->result) & CHECK_CONDITION) {
-                                /*
-                                 * XXX The scsi_print_sense formatting/prefix
-                                 * doesn't match this function.
-                                 */
+                        if (status_byte(cmd->result) & CHECK_CONDITION)
                                 scsi_print_sense("", cmd);
-                        }
-                        if (level > 3) {
-                                printk(KERN_INFO "scsi host busy %d failed %d\n",
-                                       sdev->host->host_busy,
-                                       sdev->host->host_failed);
-                        }
+                        if (level > 3)
+                                scmd_printk(KERN_INFO, cmd,
+                                            "scsi host busy %d failed %d\n",
+                                            cmd->device->host->host_busy,
+                                            cmd->device->host->host_failed);
                 }
         }
 }
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 918bb6019540..3963e7013bd9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -184,10 +184,19 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
  **/
 void scsi_times_out(struct scsi_cmnd *scmd)
 {
+        enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
+
         scsi_log_completion(scmd, TIMEOUT_ERROR);
 
         if (scmd->device->host->transportt->eh_timed_out)
-                switch (scmd->device->host->transportt->eh_timed_out(scmd)) {
+                eh_timed_out = scmd->device->host->transportt->eh_timed_out;
+        else if (scmd->device->host->hostt->eh_timed_out)
+                eh_timed_out = scmd->device->host->hostt->eh_timed_out;
+        else
+                eh_timed_out = NULL;
+
+        if (eh_timed_out)
+                switch (eh_timed_out(scmd)) {
                 case EH_HANDLED:
                         __scsi_done(scmd);
                         return;
@@ -923,10 +932,12 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
         static unsigned char stu_command[6] = {START_STOP, 0, 0, 0, 1, 0};
 
         if (scmd->device->allow_restart) {
-                int rtn;
+                int i, rtn = NEEDS_RETRY;
+
+                for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
+                        rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
+                                                START_UNIT_TIMEOUT, 0);
 
-                rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-                                        START_UNIT_TIMEOUT, 0);
                 if (rtn == SUCCESS)
                         return 0;
         }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 05d79af5ab90..61fbcdcbb009 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -848,8 +848,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                                 memcpy(req->sense, cmd->sense_buffer,  len);
                                 req->sense_len = len;
                         }
-                } else
-                        req->data_len = cmd->resid;
+                }
+                req->data_len = cmd->resid;
         }
 
         /*
@@ -968,9 +968,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
         }
         if (result) {
                 if (!(req->cmd_flags & REQ_QUIET)) {
-                        scmd_printk(KERN_INFO, cmd,
-                                    "SCSI error: return code = 0x%08x\n",
-                                    result);
+                        scsi_print_result(cmd);
                         if (driver_byte(result) & DRIVER_SENSE)
                                 scsi_print_sense("", cmd);
                 }
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 0949145304ea..a67f315244d7 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -181,10 +181,8 @@ int scsi_complete_async_scans(void)
         return 0;
 }
 
-#ifdef MODULE
 /* Only exported for the benefit of scsi_wait_scan */
 EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
-#endif
 
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 939de0de18bc..67a38a1409ba 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -276,8 +276,22 @@ static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
         return (sdp->inq_periph_qual == SCSI_INQ_PQ_CON)? 1: 0;
 }
 
+static int scsi_bus_uevent(struct device *dev, char **envp, int num_envp,
+                           char *buffer, int buffer_size)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        int i = 0;
+        int length = 0;
+
+        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
+                       "MODALIAS=" SCSI_DEVICE_MODALIAS_FMT, sdev->type);
+        envp[i] = NULL;
+        return 0;
+}
+
 static int scsi_bus_suspend(struct device * dev, pm_message_t state)
 {
+        struct device_driver *drv = dev->driver;
         struct scsi_device *sdev = to_scsi_device(dev);
         struct scsi_host_template *sht = sdev->host->hostt;
         int err;
@@ -286,28 +300,51 @@ static int scsi_bus_suspend(struct device * dev, pm_message_t state)
         if (err)
                 return err;
 
-        if (sht->suspend)
+        /* call HLD suspend first */
+        if (drv && drv->suspend) {
+                err = drv->suspend(dev, state);
+                if (err)
+                        return err;
+        }
+
+        /* then, call host suspend */
+        if (sht->suspend) {
                 err = sht->suspend(sdev, state);
+                if (err) {
+                        if (drv && drv->resume)
+                                drv->resume(dev);
+                        return err;
+                }
+        }
 
-        return err;
+        return 0;
 }
 
 static int scsi_bus_resume(struct device * dev)
 {
+        struct device_driver *drv = dev->driver;
         struct scsi_device *sdev = to_scsi_device(dev);
         struct scsi_host_template *sht = sdev->host->hostt;
-        int err = 0;
+        int err = 0, err2 = 0;
 
+        /* call host resume first */
         if (sht->resume)
                 err = sht->resume(sdev);
 
+        /* then, call HLD resume */
+        if (drv && drv->resume)
+                err2 = drv->resume(dev);
+
         scsi_device_resume(sdev);
-        return err;
+
+        /* favor LLD failure */
+        return err ? err : err2;;
 }
 
 struct bus_type scsi_bus_type = {
         .name           = "scsi",
         .match          = scsi_bus_match,
+        .uevent         = scsi_bus_uevent,
         .suspend        = scsi_bus_suspend,
         .resume         = scsi_bus_resume,
 };
@@ -547,6 +584,14 @@ show_sdev_iostat(iorequest_cnt);
 show_sdev_iostat(iodone_cnt);
 show_sdev_iostat(ioerr_cnt);
 
+static ssize_t
+sdev_show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct scsi_device *sdev;
+        sdev = to_scsi_device(dev);
+        return snprintf (buf, 20, SCSI_DEVICE_MODALIAS_FMT "\n", sdev->type);
+}
+static DEVICE_ATTR(modalias, S_IRUGO, sdev_show_modalias, NULL);
 
 /* Default template for device attributes.  May NOT be modified */
 static struct device_attribute *scsi_sysfs_sdev_attrs[] = {
@@ -566,6 +611,7 @@ static struct device_attribute *scsi_sysfs_sdev_attrs[] = {
         &dev_attr_iorequest_cnt,
         &dev_attr_iodone_cnt,
         &dev_attr_ioerr_cnt,
+        &dev_attr_modalias,
         NULL
 };
 
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c
index 0e08817fdecf..ca22ddf81746 100644
--- a/drivers/scsi/scsi_tgt_if.c
+++ b/drivers/scsi/scsi_tgt_if.c
@@ -179,10 +179,12 @@ static int event_recv_msg(struct tgt_event *ev)
         switch (ev->hdr.type) {
         case TGT_UEVENT_CMD_RSP:
                 err = scsi_tgt_kspace_exec(ev->p.cmd_rsp.host_no,
-                                           ev->p.cmd_rsp.tag,
                                            ev->p.cmd_rsp.result,
-                                           ev->p.cmd_rsp.len,
+                                           ev->p.cmd_rsp.tag,
                                            ev->p.cmd_rsp.uaddr,
+                                           ev->p.cmd_rsp.len,
+                                           ev->p.cmd_rsp.sense_uaddr,
+                                           ev->p.cmd_rsp.sense_len,
                                            ev->p.cmd_rsp.rw);
                 break;
         case TGT_UEVENT_TSK_MGMT_RSP:
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index d402aff5f314..2570f48a69c7 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -28,7 +28,6 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tgt.h>
-#include <../drivers/md/dm-bio-list.h>
 
 #include "scsi_tgt_priv.h"
 
@@ -42,16 +41,12 @@ static struct kmem_cache *scsi_tgt_cmd_cache;
 struct scsi_tgt_cmd {
         /* TODO replace work with James b's code */
         struct work_struct work;
-        /* TODO replace the lists with a large bio */
-        struct bio_list xfer_done_list;
-        struct bio_list xfer_list;
+        /* TODO fix limits of some drivers */
+        struct bio *bio;
 
         struct list_head hash_list;
         struct request *rq;
         u64 tag;
-
-        void *buffer;
-        unsigned bufflen;
 };
 
 #define TGT_HASH_ORDER  4
@@ -93,7 +88,12 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
         if (!tcmd)
                 goto put_dev;
 
-        rq = blk_get_request(shost->uspace_req_q, write, gfp_mask);
+        /*
+         * The blk helpers are used to the READ/WRITE requests
+         * transfering data from a initiator point of view. Since
+         * we are in target mode we want the opposite.
+         */
+        rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask);
         if (!rq)
                 goto free_tcmd;
 
@@ -111,8 +111,6 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
         rq->cmd_flags |= REQ_TYPE_BLOCK_PC;
         rq->end_io_data = tcmd;
 
-        bio_list_init(&tcmd->xfer_list);
-        bio_list_init(&tcmd->xfer_done_list);
         tcmd->rq = rq;
 
         return cmd;
@@ -157,22 +155,6 @@ void scsi_host_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd)
 }
 EXPORT_SYMBOL_GPL(scsi_host_put_command);
 
-static void scsi_unmap_user_pages(struct scsi_tgt_cmd *tcmd)
-{
-        struct bio *bio;
-
-        /* must call bio_endio in case bio was bounced */
-        while ((bio = bio_list_pop(&tcmd->xfer_done_list))) {
-                bio_endio(bio, bio->bi_size, 0);
-                bio_unmap_user(bio);
-        }
-
-        while ((bio = bio_list_pop(&tcmd->xfer_list))) {
-                bio_endio(bio, bio->bi_size, 0);
-                bio_unmap_user(bio);
-        }
-}
-
 static void cmd_hashlist_del(struct scsi_cmnd *cmd)
 {
         struct request_queue *q = cmd->request->q;
@@ -185,6 +167,11 @@ static void cmd_hashlist_del(struct scsi_cmnd *cmd)
         spin_unlock_irqrestore(&qdata->cmd_hash_lock, flags);
 }
 
+static void scsi_unmap_user_pages(struct scsi_tgt_cmd *tcmd)
+{
+        blk_rq_unmap_user(tcmd->bio);
+}
+
 static void scsi_tgt_cmd_destroy(struct work_struct *work)
 {
         struct scsi_tgt_cmd *tcmd =
@@ -193,16 +180,6 @@ static void scsi_tgt_cmd_destroy(struct work_struct *work)
 
         dprintk("cmd %p %d %lu\n", cmd, cmd->sc_data_direction,
                 rq_data_dir(cmd->request));
-        /*
-         * We fix rq->cmd_flags here since when we told bio_map_user
-         * to write vm for WRITE commands, blk_rq_bio_prep set
-         * rq_data_dir the flags to READ.
-         */
-        if (cmd->sc_data_direction == DMA_TO_DEVICE)
-                cmd->request->cmd_flags |= REQ_RW;
-        else
-                cmd->request->cmd_flags &= ~REQ_RW;
-
         scsi_unmap_user_pages(tcmd);
         scsi_host_put_command(scsi_tgt_cmd_to_host(cmd), cmd);
 }
@@ -215,6 +192,7 @@ static void init_scsi_tgt_cmd(struct request *rq, struct scsi_tgt_cmd *tcmd,
         struct list_head *head;
 
         tcmd->tag = tag;
+        tcmd->bio = NULL;
         INIT_WORK(&tcmd->work, scsi_tgt_cmd_destroy);
         spin_lock_irqsave(&qdata->cmd_hash_lock, flags);
         head = &qdata->cmd_hash[cmd_hashfn(tag)];
@@ -349,10 +327,14 @@ static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd)
         dprintk("cmd %p %lu\n", cmd, rq_data_dir(cmd->request));
 
         scsi_tgt_uspace_send_status(cmd, tcmd->tag);
+
+        if (cmd->request_buffer)
+                scsi_free_sgtable(cmd->request_buffer, cmd->sglist_len);
+
         queue_work(scsi_tgtd, &tcmd->work);
 }
 
-static int __scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
+static int scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
 {
         struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd);
         int err;
@@ -365,30 +347,12 @@ static int __scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
         case SCSI_MLQUEUE_DEVICE_BUSY:
                 return -EAGAIN;
         }
-
         return 0;
 }
 
-static void scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
-{
-        struct scsi_tgt_cmd *tcmd = cmd->request->end_io_data;
-        int err;
-
-        err = __scsi_tgt_transfer_response(cmd);
-        if (!err)
-                return;
-
-        cmd->result = DID_BUS_BUSY << 16;
-        err = scsi_tgt_uspace_send_status(cmd, tcmd->tag);
-        if (err <= 0)
-                /* the eh will have to pick this up */
-                printk(KERN_ERR "Could not send cmd %p status\n", cmd);
-}
-
 static int scsi_tgt_init_cmd(struct scsi_cmnd *cmd, gfp_t gfp_mask)
 {
         struct request *rq = cmd->request;
-        struct scsi_tgt_cmd *tcmd = rq->end_io_data;
         int count;
 
         cmd->use_sg = rq->nr_phys_segments;
@@ -398,143 +362,54 @@ static int scsi_tgt_init_cmd(struct scsi_cmnd *cmd, gfp_t gfp_mask)
 
         cmd->request_bufflen = rq->data_len;
 
-        dprintk("cmd %p addr %p cnt %d %lu\n", cmd, tcmd->buffer, cmd->use_sg,
-                rq_data_dir(rq));
+        dprintk("cmd %p cnt %d %lu\n", cmd, cmd->use_sg, rq_data_dir(rq));
         count = blk_rq_map_sg(rq->q, rq, cmd->request_buffer);
         if (likely(count <= cmd->use_sg)) {
                 cmd->use_sg = count;
                 return 0;
         }
 
-        eprintk("cmd %p addr %p cnt %d\n", cmd, tcmd->buffer, cmd->use_sg);
+        eprintk("cmd %p cnt %d\n", cmd, cmd->use_sg);
         scsi_free_sgtable(cmd->request_buffer, cmd->sglist_len);
         return -EINVAL;
 }
 
 /* TODO: test this crap and replace bio_map_user with new interface maybe */
 static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
-                               int rw)
+                               unsigned long uaddr, unsigned int len, int rw)
 {
         struct request_queue *q = cmd->request->q;
         struct request *rq = cmd->request;
-        void *uaddr = tcmd->buffer;
-        unsigned int len = tcmd->bufflen;
-        struct bio *bio;
         int err;
 
-        while (len > 0) {
-                dprintk("%lx %u\n", (unsigned long) uaddr, len);
-                bio = bio_map_user(q, NULL, (unsigned long) uaddr, len, rw);
-                if (IS_ERR(bio)) {
-                        err = PTR_ERR(bio);
-                        dprintk("fail to map %lx %u %d %x\n",
-                                (unsigned long) uaddr, len, err, cmd->cmnd[0]);
-                        goto unmap_bios;
-                }
-
-                uaddr += bio->bi_size;
-                len -= bio->bi_size;
-
+        dprintk("%lx %u\n", uaddr, len);
+        err = blk_rq_map_user(q, rq, (void *)uaddr, len);
+        if (err) {
                 /*
-                 * The first bio is added and merged. We could probably
-                 * try to add others using scsi_merge_bio() but for now
-                 * we keep it simple. The first bio should be pretty large
-                 * (either hitting the 1 MB bio pages limit or a queue limit)
-                 * already but for really large IO we may want to try and
-                 * merge these.
+                 * TODO: need to fixup sg_tablesize, max_segment_size,
+                 * max_sectors, etc for modern HW and software drivers
+                 * where this value is bogus.
+                 *
+                 * TODO2: we can alloc a reserve buffer of max size
+                 * we can handle and do the slow copy path for really large
+                 * IO.
                  */
-                if (!rq->bio) {
-                        blk_rq_bio_prep(q, rq, bio);
-                        rq->data_len = bio->bi_size;
-                } else
-                        /* put list of bios to transfer in next go around */
-                        bio_list_add(&tcmd->xfer_list, bio);
+                eprintk("Could not handle request of size %u.\n", len);
+                return err;
         }
 
-        cmd->offset = 0;
+        tcmd->bio = rq->bio;
         err = scsi_tgt_init_cmd(cmd, GFP_KERNEL);
         if (err)
-                goto unmap_bios;
+                goto unmap_rq;
 
         return 0;
 
-unmap_bios:
-        if (rq->bio) {
-                bio_unmap_user(rq->bio);
-                while ((bio = bio_list_pop(&tcmd->xfer_list)))
-                        bio_unmap_user(bio);
-        }
-
+unmap_rq:
+        scsi_unmap_user_pages(tcmd);
         return err;
 }
 
-static int scsi_tgt_transfer_data(struct scsi_cmnd *);
-
-static void scsi_tgt_data_transfer_done(struct scsi_cmnd *cmd)
-{
-        struct scsi_tgt_cmd *tcmd = cmd->request->end_io_data;
-        struct bio *bio;
-        int err;
-
-        /* should we free resources here on error ? */
-        if (cmd->result) {
-send_uspace_err:
-                err = scsi_tgt_uspace_send_status(cmd, tcmd->tag);
-                if (err <= 0)
-                        /* the tgt uspace eh will have to pick this up */
-                        printk(KERN_ERR "Could not send cmd %p status\n", cmd);
-                return;
-        }
-
-        dprintk("cmd %p request_bufflen %u bufflen %u\n",
-                cmd, cmd->request_bufflen, tcmd->bufflen);
-
-        scsi_free_sgtable(cmd->request_buffer, cmd->sglist_len);
-        bio_list_add(&tcmd->xfer_done_list, cmd->request->bio);
-
-        tcmd->buffer += cmd->request_bufflen;
-        cmd->offset += cmd->request_bufflen;
-
-        if (!tcmd->xfer_list.head) {
-                scsi_tgt_transfer_response(cmd);
-                return;
-        }
-
-        dprintk("cmd2 %p request_bufflen %u bufflen %u\n",
-                cmd, cmd->request_bufflen, tcmd->bufflen);
-
-        bio = bio_list_pop(&tcmd->xfer_list);
-        BUG_ON(!bio);
-
-        blk_rq_bio_prep(cmd->request->q, cmd->request, bio);
-        cmd->request->data_len = bio->bi_size;
-        err = scsi_tgt_init_cmd(cmd, GFP_ATOMIC);
-        if (err) {
-                cmd->result = DID_ERROR << 16;
-                goto send_uspace_err;
-        }
-
-        if (scsi_tgt_transfer_data(cmd)) {
-                cmd->result = DID_NO_CONNECT << 16;
-                goto send_uspace_err;
-        }
-}
-
-static int scsi_tgt_transfer_data(struct scsi_cmnd *cmd)
-{
-        int err;
-        struct Scsi_Host *host = scsi_tgt_cmd_to_host(cmd);
-
-        err = host->hostt->transfer_data(cmd, scsi_tgt_data_transfer_done);
-        switch (err) {
-                case SCSI_MLQUEUE_HOST_BUSY:
-                case SCSI_MLQUEUE_DEVICE_BUSY:
-                        return -EAGAIN;
-        default:
-                return 0;
-        }
-}
-
 static int scsi_tgt_copy_sense(struct scsi_cmnd *cmd, unsigned long uaddr,
                                 unsigned len)
 {
@@ -584,8 +459,9 @@ static struct request *tgt_cmd_hash_lookup(struct request_queue *q, u64 tag)
         return rq;
 }
 
-int scsi_tgt_kspace_exec(int host_no, u64 tag, int result, u32 len,
-                         unsigned long uaddr, u8 rw)
+int scsi_tgt_kspace_exec(int host_no, int result, u64 tag,
+                         unsigned long uaddr, u32 len, unsigned long sense_uaddr,
+                         u32 sense_len, u8 rw)
 {
         struct Scsi_Host *shost;
         struct scsi_cmnd *cmd;
@@ -617,8 +493,9 @@ int scsi_tgt_kspace_exec(int host_no, u64 tag, int result, u32 len,
         }
         cmd = rq->special;
 
-        dprintk("cmd %p result %d len %d bufflen %u %lu %x\n", cmd,
-                result, len, cmd->request_bufflen, rq_data_dir(rq), cmd->cmnd[0]);
+        dprintk("cmd %p scb %x result %d len %d bufflen %u %lu %x\n",
+                cmd, cmd->cmnd[0], result, len, cmd->request_bufflen,
+                rq_data_dir(rq), cmd->cmnd[0]);
 
         if (result == TASK_ABORTED) {
                 scsi_tgt_abort_cmd(shost, cmd);
@@ -629,36 +506,36 @@ int scsi_tgt_kspace_exec(int host_no, u64 tag, int result, u32 len,
          * in the request_* values
          */
         tcmd = cmd->request->end_io_data;
-        tcmd->buffer = (void *)uaddr;
-        tcmd->bufflen = len;
         cmd->result = result;
 
-        if (!tcmd->bufflen || cmd->request_buffer) {
-                err = __scsi_tgt_transfer_response(cmd);
-                goto done;
-        }
+        if (cmd->result == SAM_STAT_CHECK_CONDITION)
+                scsi_tgt_copy_sense(cmd, sense_uaddr, sense_len);
 
-        /*
-         * TODO: Do we need to handle case where request does not
-         * align with LLD.
-         */
-        err = scsi_map_user_pages(rq->end_io_data, cmd, rw);
-        if (err) {
-                eprintk("%p %d\n", cmd, err);
-                err = -EAGAIN;
-                goto done;
-        }
+        if (len) {
+                err = scsi_map_user_pages(rq->end_io_data, cmd, uaddr, len, rw);
+                if (err) {
+                        /*
+                         * user-space daemon bugs or OOM
+                         * TODO: we can do better for OOM.
+                         */
+                        struct scsi_tgt_queuedata *qdata;
+                        struct list_head *head;
+                        unsigned long flags;
 
-        /* userspace failure */
-        if (cmd->result) {
-                if (status_byte(cmd->result) == CHECK_CONDITION)
-                        scsi_tgt_copy_sense(cmd, uaddr, len);
-                err = __scsi_tgt_transfer_response(cmd);
-                goto done;
-        }
-        /* ask the target LLD to transfer the data to the buffer */
-        err = scsi_tgt_transfer_data(cmd);
+                        eprintk("cmd %p ret %d uaddr %lx len %d rw %d\n",
+                                cmd, err, uaddr, len, rw);
+
+                        qdata = shost->uspace_req_q->queuedata;
+                        head = &qdata->cmd_hash[cmd_hashfn(tcmd->tag)];
+
+                        spin_lock_irqsave(&qdata->cmd_hash_lock, flags);
+                        list_add(&tcmd->hash_list, head);
+                        spin_unlock_irqrestore(&qdata->cmd_hash_lock, flags);
 
+                        goto done;
+                }
+        }
+        err = scsi_tgt_transfer_response(cmd);
 done:
         scsi_host_put(shost);
         return err;
diff --git a/drivers/scsi/scsi_tgt_priv.h b/drivers/scsi/scsi_tgt_priv.h
index 84488c51ff62..e9e6db1c417f 100644
--- a/drivers/scsi/scsi_tgt_priv.h
+++ b/drivers/scsi/scsi_tgt_priv.h
@@ -18,8 +18,9 @@ extern int scsi_tgt_if_init(void);
 extern int scsi_tgt_uspace_send_cmd(struct scsi_cmnd *cmd, struct scsi_lun *lun,
                                     u64 tag);
 extern int scsi_tgt_uspace_send_status(struct scsi_cmnd *cmd, u64 tag);
-extern int scsi_tgt_kspace_exec(int host_no, u64 tag, int result, u32 len,
-                                unsigned long uaddr, u8 rw);
+extern int scsi_tgt_kspace_exec(int host_no, int result, u64 tag,
+                                unsigned long uaddr, u32 len, unsigned long sense_uaddr,
+                                u32 sense_len, u8 rw);
 extern int scsi_tgt_uspace_send_tsk_mgmt(int host_no, int function, u64 tag,
                                          struct scsi_lun *scsilun, void *data);
 extern int scsi_tgt_kspace_tsk_mgmt(int host_no, u64 mid, int result);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 58afdb401703..14c4f065b2b8 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -200,6 +200,8 @@ static const struct {
         { FC_PORTSPEED_2GBIT,           "2 Gbit" },
         { FC_PORTSPEED_4GBIT,           "4 Gbit" },
         { FC_PORTSPEED_10GBIT,          "10 Gbit" },
+        { FC_PORTSPEED_8GBIT,           "8 Gbit" },
+        { FC_PORTSPEED_16GBIT,          "16 Gbit" },
         { FC_PORTSPEED_NOT_NEGOTIATED,  "Not Negotiated" },
 };
 fc_bitfield_name_search(port_speed, fc_port_speed_names)
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index aabaa0576ab4..caf1836bbeca 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -49,7 +49,7 @@ struct iscsi_internal {
         struct class_device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
 };
 
-static int iscsi_session_nr;    /* sysfs session id for next new session */
+static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
 
 /*
  * list of registered transports and lock that must
@@ -300,7 +300,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
         int err;
 
         ihost = shost->shost_data;
-        session->sid = iscsi_session_nr++;
+        session->sid = atomic_add_return(1, &iscsi_session_nr);
         session->target_id = target_id;
 
         snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u",
@@ -1419,6 +1419,8 @@ static __init int iscsi_transport_init(void)
         printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
                 ISCSI_TRANSPORT_VERSION);
 
+        atomic_set(&iscsi_session_nr, 0);
+
         err = class_register(&iscsi_transport_class);
         if (err)
                 return err;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5a8f55fea5ff..00e46662296f 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -58,16 +58,10 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsicam.h>
+#include <scsi/sd.h>
 
 #include "scsi_logging.h"
 
-/*
- * More than enough for everybody ;)  The huge number of majors
- * is a leftover from 16bit dev_t days, we don't really need that
- * much numberspace.
- */
-#define SD_MAJORS       16
-
 MODULE_AUTHOR("Eric Youngdale");
 MODULE_DESCRIPTION("SCSI disk (sd) driver");
 MODULE_LICENSE("GPL");
@@ -88,45 +82,9 @@ MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_DISK12_MAJOR);
 MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_DISK13_MAJOR);
 MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_DISK14_MAJOR);
 MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_DISK15_MAJOR);
-
-/*
- * This is limited by the naming scheme enforced in sd_probe,
- * add another character to it if you really need more disks.
- */
-#define SD_MAX_DISKS    (((26 * 26) + 26 + 1) * 26)
-
-/*
- * Time out in seconds for disks and Magneto-opticals (which are slower).
- */
-#define SD_TIMEOUT              (30 * HZ)
-#define SD_MOD_TIMEOUT          (75 * HZ)
-
-/*
- * Number of allowed retries
- */
-#define SD_MAX_RETRIES          5
-#define SD_PASSTHROUGH_RETRIES  1
-
-/*
- * Size of the initial data buffer for mode and read capacity data
- */
-#define SD_BUF_SIZE             512
-
-struct scsi_disk {
-        struct scsi_driver *driver;     /* always &sd_template */
-        struct scsi_device *device;
-        struct class_device cdev;
-        struct gendisk  *disk;
-        unsigned int    openers;        /* protected by BKL for now, yuck */
-        sector_t        capacity;       /* size in 512-byte sectors */
-        u32             index;
-        u8              media_present;
-        u8              write_prot;
-        unsigned        WCE : 1;        /* state of disk WCE bit */
-        unsigned        RCD : 1;        /* state of disk RCD bit, unused */
-        unsigned        DPOFUA : 1;     /* state of disk DPOFUA bit */
-};
-#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
+MODULE_ALIAS_SCSI_DEVICE(TYPE_DISK);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
 
 static DEFINE_IDR(sd_index_idr);
 static DEFINE_SPINLOCK(sd_index_lock);
@@ -136,20 +94,6 @@ static DEFINE_SPINLOCK(sd_index_lock);
  * object after last put) */
 static DEFINE_MUTEX(sd_ref_mutex);
 
-static int sd_revalidate_disk(struct gendisk *disk);
-static void sd_rw_intr(struct scsi_cmnd * SCpnt);
-
-static int sd_probe(struct device *);
-static int sd_remove(struct device *);
-static void sd_shutdown(struct device *dev);
-static void sd_rescan(struct device *);
-static int sd_init_command(struct scsi_cmnd *);
-static int sd_issue_flush(struct device *, sector_t *);
-static void sd_prepare_flush(request_queue_t *, struct request *);
-static void sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                             unsigned char *buffer);
-static void scsi_disk_release(struct class_device *cdev);
-
 static const char *sd_cache_types[] = {
         "write through", "none", "write back",
         "write back, no read (daft)"
@@ -199,13 +143,27 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf,
         if (scsi_mode_select(sdp, 1, sp, 8, buffer_data, len, SD_TIMEOUT,
                              SD_MAX_RETRIES, &data, &sshdr)) {
                 if (scsi_sense_valid(&sshdr))
-                        scsi_print_sense_hdr(sdkp->disk->disk_name, &sshdr);
+                        sd_print_sense_hdr(sdkp, &sshdr);
                 return -EINVAL;
         }
         sd_revalidate_disk(sdkp->disk);
         return count;
 }
 
+static ssize_t sd_store_manage_start_stop(struct class_device *cdev,
+                                          const char *buf, size_t count)
+{
+        struct scsi_disk *sdkp = to_scsi_disk(cdev);
+        struct scsi_device *sdp = sdkp->device;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+
+        sdp->manage_start_stop = simple_strtoul(buf, NULL, 10);
+
+        return count;
+}
+
 static ssize_t sd_store_allow_restart(struct class_device *cdev, const char *buf,
                                       size_t count)
 {
@@ -238,6 +196,14 @@ static ssize_t sd_show_fua(struct class_device *cdev, char *buf)
         return snprintf(buf, 20, "%u\n", sdkp->DPOFUA);
 }
 
+static ssize_t sd_show_manage_start_stop(struct class_device *cdev, char *buf)
+{
+        struct scsi_disk *sdkp = to_scsi_disk(cdev);
+        struct scsi_device *sdp = sdkp->device;
+
+        return snprintf(buf, 20, "%u\n", sdp->manage_start_stop);
+}
+
 static ssize_t sd_show_allow_restart(struct class_device *cdev, char *buf)
 {
         struct scsi_disk *sdkp = to_scsi_disk(cdev);
@@ -251,6 +217,8 @@ static struct class_device_attribute sd_disk_attrs[] = {
         __ATTR(FUA, S_IRUGO, sd_show_fua, NULL),
         __ATTR(allow_restart, S_IRUGO|S_IWUSR, sd_show_allow_restart,
                sd_store_allow_restart),
+        __ATTR(manage_start_stop, S_IRUGO|S_IWUSR, sd_show_manage_start_stop,
+               sd_store_manage_start_stop),
         __ATTR_NULL,
 };
 
@@ -267,6 +235,8 @@ static struct scsi_driver sd_template = {
                 .name           = "sd",
                 .probe          = sd_probe,
                 .remove         = sd_remove,
+                .suspend        = sd_suspend,
+                .resume         = sd_resume,
                 .shutdown       = sd_shutdown,
         },
         .rescan                 = sd_rescan,
@@ -371,15 +341,19 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
         unsigned int this_count = SCpnt->request_bufflen >> 9;
         unsigned int timeout = sdp->timeout;
 
-        SCSI_LOG_HLQUEUE(1, printk("sd_init_command: disk=%s, block=%llu, "
-                            "count=%d\n", disk->disk_name,
-                         (unsigned long long)block, this_count));
+        SCSI_LOG_HLQUEUE(1, scmd_printk(KERN_INFO, SCpnt,
+                                        "sd_init_command: block=%llu, "
+                                        "count=%d\n",
+                                        (unsigned long long)block,
+                                        this_count));
 
         if (!sdp || !scsi_device_online(sdp) ||
             block + rq->nr_sectors > get_capacity(disk)) {
-                SCSI_LOG_HLQUEUE(2, printk("Finishing %ld sectors\n", 
-                                 rq->nr_sectors));
-                SCSI_LOG_HLQUEUE(2, printk("Retry with 0x%p\n", SCpnt));
+                SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
+                                                "Finishing %ld sectors\n",
+                                                rq->nr_sectors));
+                SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
+                                                "Retry with 0x%p\n", SCpnt));
                 return 0;
         }
 
@@ -391,8 +365,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
                 /* printk("SCSI disk has been changed. Prohibiting further I/O.\n"); */
                 return 0;
         }
-        SCSI_LOG_HLQUEUE(2, printk("%s : block=%llu\n",
-                                   disk->disk_name, (unsigned long long)block));
+        SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt, "block=%llu\n",
+                                        (unsigned long long)block));
 
         /*
          * If we have a 1K hardware sectorsize, prevent access to single
@@ -407,7 +381,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
          */
         if (sdp->sector_size == 1024) {
                 if ((block & 1) || (rq->nr_sectors & 1)) {
-                        printk(KERN_ERR "sd: Bad block number requested");
+                        scmd_printk(KERN_ERR, SCpnt,
+                                    "Bad block number requested\n");
                         return 0;
                 } else {
                         block = block >> 1;
@@ -416,7 +391,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
         }
         if (sdp->sector_size == 2048) {
                 if ((block & 3) || (rq->nr_sectors & 3)) {
-                        printk(KERN_ERR "sd: Bad block number requested");
+                        scmd_printk(KERN_ERR, SCpnt,
+                                    "Bad block number requested\n");
                         return 0;
                 } else {
                         block = block >> 2;
@@ -425,7 +401,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
         }
         if (sdp->sector_size == 4096) {
                 if ((block & 7) || (rq->nr_sectors & 7)) {
-                        printk(KERN_ERR "sd: Bad block number requested");
+                        scmd_printk(KERN_ERR, SCpnt,
+                                    "Bad block number requested\n");
                         return 0;
                 } else {
                         block = block >> 3;
@@ -442,13 +419,15 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
                 SCpnt->cmnd[0] = READ_6;
                 SCpnt->sc_data_direction = DMA_FROM_DEVICE;
         } else {
-                printk(KERN_ERR "sd: Unknown command %x\n", rq->cmd_flags);
+                scmd_printk(KERN_ERR, SCpnt, "Unknown command %x\n", rq->cmd_flags);
                 return 0;
         }
 
-        SCSI_LOG_HLQUEUE(2, printk("%s : %s %d/%ld 512 byte blocks.\n", 
-                disk->disk_name, (rq_data_dir(rq) == WRITE) ? 
-                "writing" : "reading", this_count, rq->nr_sectors));
+        SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
+                                        "%s %d/%ld 512 byte blocks.\n",
+                                        (rq_data_dir(rq) == WRITE) ?
+                                        "writing" : "reading", this_count,
+                                        rq->nr_sectors));
 
         SCpnt->cmnd[1] = 0;
         
@@ -490,7 +469,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
                          * during operation and thus turned off
                          * use_10_for_rw.
                          */
-                        printk(KERN_ERR "sd: FUA write on READ/WRITE(6) drive\n");
+                        scmd_printk(KERN_ERR, SCpnt,
+                                    "FUA write on READ/WRITE(6) drive\n");
                         return 0;
                 }
 
@@ -549,7 +529,7 @@ static int sd_open(struct inode *inode, struct file *filp)
                 return -ENXIO;
 
 
-        SCSI_LOG_HLQUEUE(3, printk("sd_open: disk=%s\n", disk->disk_name));
+        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_open\n"));
 
         sdev = sdkp->device;
 
@@ -619,7 +599,7 @@ static int sd_release(struct inode *inode, struct file *filp)
         struct scsi_disk *sdkp = scsi_disk(disk);
         struct scsi_device *sdev = sdkp->device;
 
-        SCSI_LOG_HLQUEUE(3, printk("sd_release: disk=%s\n", disk->disk_name));
+        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_release\n"));
 
         if (!--sdkp->openers && sdev->removable) {
                 if (scsi_block_when_processing_errors(sdev))
@@ -732,8 +712,7 @@ static int sd_media_changed(struct gendisk *disk)
         struct scsi_device *sdp = sdkp->device;
         int retval;
 
-        SCSI_LOG_HLQUEUE(3, printk("sd_media_changed: disk=%s\n",
-                                                disk->disk_name));
+        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_media_changed\n"));
 
         if (!sdp->removable)
                 return 0;
@@ -786,9 +765,10 @@ not_present:
         return 1;
 }
 
-static int sd_sync_cache(struct scsi_device *sdp)
+static int sd_sync_cache(struct scsi_disk *sdkp)
 {
         int retries, res;
+        struct scsi_device *sdp = sdkp->device;
         struct scsi_sense_hdr sshdr;
 
         if (!scsi_device_online(sdp))
@@ -809,28 +789,27 @@ static int sd_sync_cache(struct scsi_device *sdp)
                         break;
         }
 
-        if (res) {              printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
-                                    "host = %d, driver = %02x\n  ",
-                                    status_byte(res), msg_byte(res),
-                                    host_byte(res), driver_byte(res));
-                        if (driver_byte(res) & DRIVER_SENSE)
-                                scsi_print_sense_hdr("sd", &sshdr);
+        if (res) {
+                sd_print_result(sdkp, res);
+                if (driver_byte(res) & DRIVER_SENSE)
+                        sd_print_sense_hdr(sdkp, &sshdr);
         }
 
-        return res;
+        if (res)
+                return -EIO;
+        return 0;
 }
 
 static int sd_issue_flush(struct device *dev, sector_t *error_sector)
 {
         int ret = 0;
-        struct scsi_device *sdp = to_scsi_device(dev);
         struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
 
         if (!sdkp)
                return -ENODEV;
 
         if (sdkp->WCE)
-                ret = sd_sync_cache(sdp);
+                ret = sd_sync_cache(sdkp);
         scsi_disk_put(sdkp);
         return ret;
 }
@@ -928,12 +907,14 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt)
                         sense_deferred = scsi_sense_is_deferred(&sshdr);
         }
 #ifdef CONFIG_SCSI_LOGGING
-        SCSI_LOG_HLCOMPLETE(1, printk("sd_rw_intr: %s: res=0x%x\n", 
-                                SCpnt->request->rq_disk->disk_name, result));
+        SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));
         if (sense_valid) {
-                SCSI_LOG_HLCOMPLETE(1, printk("sd_rw_intr: sb[respc,sk,asc,"
-                                "ascq]=%x,%x,%x,%x\n", sshdr.response_code,
-                                sshdr.sense_key, sshdr.asc, sshdr.ascq));
+                SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
+                                                   "sd_rw_intr: sb[respc,sk,asc,"
+                                                   "ascq]=%x,%x,%x,%x\n",
+                                                   sshdr.response_code,
+                                                   sshdr.sense_key, sshdr.asc,
+                                                   sshdr.ascq));
         }
 #endif
         if (driver_byte(result) != DRIVER_SENSE &&
@@ -1025,7 +1006,7 @@ static int media_not_present(struct scsi_disk *sdkp,
  * spinup disk - called only in sd_revalidate_disk()
  */
 static void
-sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
+sd_spinup_disk(struct scsi_disk *sdkp)
 {
         unsigned char cmd[10];
         unsigned long spintime_expire = 0;
@@ -1069,9 +1050,10 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
                 if ((driver_byte(the_result) & DRIVER_SENSE) == 0) {
                         /* no sense, TUR either succeeded or failed
                          * with a status error */
-                        if(!spintime && !scsi_status_is_good(the_result))
-                                printk(KERN_NOTICE "%s: Unit Not Ready, "
-                                       "error = 0x%x\n", diskname, the_result);
+                        if(!spintime && !scsi_status_is_good(the_result)) {
+                                sd_printk(KERN_NOTICE, sdkp, "Unit Not Ready\n");
+                                sd_print_result(sdkp, the_result);
+                        }
                         break;
                 }
                                         
@@ -1096,8 +1078,7 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
                  */
                 } else if (sense_valid && sshdr.sense_key == NOT_READY) {
                         if (!spintime) {
-                                printk(KERN_NOTICE "%s: Spinning up disk...",
-                                       diskname);
+                                sd_printk(KERN_NOTICE, sdkp, "Spinning up disk...");
                                 cmd[0] = START_STOP;
                                 cmd[1] = 1;     /* Return immediately */
                                 memset((void *) &cmd[2], 0, 8);
@@ -1130,9 +1111,8 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
                         /* we don't understand the sense code, so it's
                          * probably pointless to loop */
                         if(!spintime) {
-                                printk(KERN_NOTICE "%s: Unit Not Ready, "
-                                        "sense:\n", diskname);
-                                scsi_print_sense_hdr("", &sshdr);
+                                sd_printk(KERN_NOTICE, sdkp, "Unit Not Ready\n");
+                                sd_print_sense_hdr(sdkp, &sshdr);
                         }
                         break;
                 }
@@ -1151,8 +1131,7 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
  * read disk capacity
  */
 static void
-sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                 unsigned char *buffer)
+sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
 {
         unsigned char cmd[16];
         int the_result, retries;
@@ -1191,18 +1170,12 @@ repeat:
         } while (the_result && retries);
 
         if (the_result && !longrc) {
-                printk(KERN_NOTICE "%s : READ CAPACITY failed.\n"
-                       "%s : status=%x, message=%02x, host=%d, driver=%02x \n",
-                       diskname, diskname,
-                       status_byte(the_result),
-                       msg_byte(the_result),
-                       host_byte(the_result),
-                       driver_byte(the_result));
-
+                sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY failed\n");
+                sd_print_result(sdkp, the_result);
                 if (driver_byte(the_result) & DRIVER_SENSE)
-                        scsi_print_sense_hdr("sd", &sshdr);
+                        sd_print_sense_hdr(sdkp, &sshdr);
                 else
-                        printk("%s : sense not available. \n", diskname);
+                        sd_printk(KERN_NOTICE, sdkp, "Sense not available.\n");
 
                 /* Set dirty bit for removable devices if not ready -
                  * sometimes drives will not report this properly. */
@@ -1218,16 +1191,10 @@ repeat:
                 return;
         } else if (the_result && longrc) {
                 /* READ CAPACITY(16) has been failed */
-                printk(KERN_NOTICE "%s : READ CAPACITY(16) failed.\n"
-                       "%s : status=%x, message=%02x, host=%d, driver=%02x \n",
-                       diskname, diskname,
-                       status_byte(the_result),
-                       msg_byte(the_result),
-                       host_byte(the_result),
-                       driver_byte(the_result));
-                printk(KERN_NOTICE "%s : use 0xffffffff as device size\n",
-                       diskname);
-                
+                sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n");
+                sd_print_result(sdkp, the_result);
+                sd_printk(KERN_NOTICE, sdkp, "Use 0xffffffff as device size\n");
+
                 sdkp->capacity = 1 + (sector_t) 0xffffffff;             
                 goto got_data;
         }       
@@ -1238,14 +1205,14 @@ repeat:
                 if (buffer[0] == 0xff && buffer[1] == 0xff &&
                     buffer[2] == 0xff && buffer[3] == 0xff) {
                         if(sizeof(sdkp->capacity) > 4) {
-                                printk(KERN_NOTICE "%s : very big device. try to use"
-                                       " READ CAPACITY(16).\n", diskname);
+                                sd_printk(KERN_NOTICE, sdkp, "Very big device. "
+                                          "Trying to use READ CAPACITY(16).\n");
                                 longrc = 1;
                                 goto repeat;
                         }
-                        printk(KERN_ERR "%s: too big for this kernel.  Use a "
-                               "kernel compiled with support for large block "
-                               "devices.\n", diskname);
+                        sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use "
+                                  "a kernel compiled with support for large "
+                                  "block devices.\n");
                         sdkp->capacity = 0;
                         goto got_data;
                 }
@@ -1284,8 +1251,8 @@ repeat:
 got_data:
         if (sector_size == 0) {
                 sector_size = 512;
-                printk(KERN_NOTICE "%s : sector size 0 reported, "
-                       "assuming 512.\n", diskname);
+                sd_printk(KERN_NOTICE, sdkp, "Sector size 0 reported, "
+                          "assuming 512.\n");
         }
 
         if (sector_size != 512 &&
@@ -1293,8 +1260,8 @@ got_data:
             sector_size != 2048 &&
             sector_size != 4096 &&
             sector_size != 256) {
-                printk(KERN_NOTICE "%s : unsupported sector size "
-                       "%d.\n", diskname, sector_size);
+                sd_printk(KERN_NOTICE, sdkp, "Unsupported sector size %d.\n",
+                          sector_size);
                 /*
                  * The user might want to re-format the drive with
                  * a supported sectorsize.  Once this happens, it
@@ -1327,10 +1294,10 @@ got_data:
                 mb -= sz - 974;
                 sector_div(mb, 1950);
 
-                printk(KERN_NOTICE "SCSI device %s: "
-                       "%llu %d-byte hdwr sectors (%llu MB)\n",
-                       diskname, (unsigned long long)sdkp->capacity,
-                       hard_sector, (unsigned long long)mb);
+                sd_printk(KERN_NOTICE, sdkp,
+                          "%llu %d-byte hardware sectors (%llu MB)\n",
+                          (unsigned long long)sdkp->capacity,
+                          hard_sector, (unsigned long long)mb);
         }
 
         /* Rescale capacity to 512-byte units */
@@ -1362,8 +1329,7 @@ sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage,
  * called with buffer of length SD_BUF_SIZE
  */
 static void
-sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
-                           unsigned char *buffer)
+sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
 {
         int res;
         struct scsi_device *sdp = sdkp->device;
@@ -1371,7 +1337,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
 
         set_disk_ro(sdkp->disk, 0);
         if (sdp->skip_ms_page_3f) {
-                printk(KERN_NOTICE "%s: assuming Write Enabled\n", diskname);
+                sd_printk(KERN_NOTICE, sdkp, "Assuming Write Enabled\n");
                 return;
         }
 
@@ -1403,15 +1369,16 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
         }
 
         if (!scsi_status_is_good(res)) {
-                printk(KERN_WARNING
-                       "%s: test WP failed, assume Write Enabled\n", diskname);
+                sd_printk(KERN_WARNING, sdkp,
+                          "Test WP failed, assume Write Enabled\n");
         } else {
                 sdkp->write_prot = ((data.device_specific & 0x80) != 0);
                 set_disk_ro(sdkp->disk, sdkp->write_prot);
-                printk(KERN_NOTICE "%s: Write Protect is %s\n", diskname,
-                       sdkp->write_prot ? "on" : "off");
-                printk(KERN_DEBUG "%s: Mode Sense: %02x %02x %02x %02x\n",
-                       diskname, buffer[0], buffer[1], buffer[2], buffer[3]);
+                sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
+                          sdkp->write_prot ? "on" : "off");
+                sd_printk(KERN_DEBUG, sdkp,
+                          "Mode Sense: %02x %02x %02x %02x\n",
+                          buffer[0], buffer[1], buffer[2], buffer[3]);
         }
 }
 
@@ -1420,8 +1387,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
  * called with buffer of length SD_BUF_SIZE
  */
 static void
-sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
-                   unsigned char *buffer)
+sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
 {
         int len = 0, res;
         struct scsi_device *sdp = sdkp->device;
@@ -1450,8 +1416,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
 
         if (!data.header_length) {
                 modepage = 6;
-                printk(KERN_ERR "%s: missing header in MODE_SENSE response\n",
-                       diskname);
+                sd_printk(KERN_ERR, sdkp, "Missing header in MODE_SENSE response\n");
         }
 
         /* that went OK, now ask for the proper length */
@@ -1478,13 +1443,12 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
                 int offset = data.header_length + data.block_descriptor_length;
 
                 if (offset >= SD_BUF_SIZE - 2) {
-                        printk(KERN_ERR "%s: malformed MODE SENSE response",
-                                diskname);
+                        sd_printk(KERN_ERR, sdkp, "Malformed MODE SENSE response\n");
                         goto defaults;
                 }
 
                 if ((buffer[offset] & 0x3f) != modepage) {
-                        printk(KERN_ERR "%s: got wrong page\n", diskname);
+                        sd_printk(KERN_ERR, sdkp, "Got wrong page\n");
                         goto defaults;
                 }
 
@@ -1498,14 +1462,13 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
 
                 sdkp->DPOFUA = (data.device_specific & 0x10) != 0;
                 if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {
-                        printk(KERN_NOTICE "SCSI device %s: uses "
-                               "READ/WRITE(6), disabling FUA\n", diskname);
+                        sd_printk(KERN_NOTICE, sdkp,
+                                  "Uses READ/WRITE(6), disabling FUA\n");
                         sdkp->DPOFUA = 0;
                 }
 
-                printk(KERN_NOTICE "SCSI device %s: "
-                       "write cache: %s, read cache: %s, %s\n",
-                       diskname,
+                sd_printk(KERN_NOTICE, sdkp,
+                       "Write cache: %s, read cache: %s, %s\n",
                        sdkp->WCE ? "enabled" : "disabled",
                        sdkp->RCD ? "disabled" : "enabled",
                        sdkp->DPOFUA ? "supports DPO and FUA"
@@ -1518,15 +1481,13 @@ bad_sense:
         if (scsi_sense_valid(&sshdr) &&
             sshdr.sense_key == ILLEGAL_REQUEST &&
             sshdr.asc == 0x24 && sshdr.ascq == 0x0)
-                printk(KERN_NOTICE "%s: cache data unavailable\n",
-                       diskname);       /* Invalid field in CDB */
+                /* Invalid field in CDB */
+                sd_printk(KERN_NOTICE, sdkp, "Cache data unavailable\n");
         else
-                printk(KERN_ERR "%s: asking for cache data failed\n",
-                       diskname);
+                sd_printk(KERN_ERR, sdkp, "Asking for cache data failed\n");
 
 defaults:
-        printk(KERN_ERR "%s: assuming drive cache: write through\n",
-               diskname);
+        sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n");
         sdkp->WCE = 0;
         sdkp->RCD = 0;
         sdkp->DPOFUA = 0;
@@ -1544,7 +1505,8 @@ static int sd_revalidate_disk(struct gendisk *disk)
         unsigned char *buffer;
         unsigned ordered;
 
-        SCSI_LOG_HLQUEUE(3, printk("sd_revalidate_disk: disk=%s\n", disk->disk_name));
+        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
+                                      "sd_revalidate_disk\n"));
 
         /*
          * If the device is offline, don't try and read capacity or any
@@ -1555,8 +1517,8 @@ static int sd_revalidate_disk(struct gendisk *disk)
 
         buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL | __GFP_DMA);
         if (!buffer) {
-                printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation "
-                       "failure.\n");
+                sd_printk(KERN_WARNING, sdkp, "sd_revalidate_disk: Memory "
+                          "allocation failure.\n");
                 goto out;
         }
 
@@ -1568,16 +1530,16 @@ static int sd_revalidate_disk(struct gendisk *disk)
         sdkp->WCE = 0;
         sdkp->RCD = 0;
 
-        sd_spinup_disk(sdkp, disk->disk_name);
+        sd_spinup_disk(sdkp);
 
         /*
          * Without media there is no reason to ask; moreover, some devices
          * react badly if we do.
          */
         if (sdkp->media_present) {
-                sd_read_capacity(sdkp, disk->disk_name, buffer);
-                sd_read_write_protect_flag(sdkp, disk->disk_name, buffer);
-                sd_read_cache_type(sdkp, disk->disk_name, buffer);
+                sd_read_capacity(sdkp, buffer);
+                sd_read_write_protect_flag(sdkp, buffer);
+                sd_read_cache_type(sdkp, buffer);
         }
 
         /*
@@ -1709,8 +1671,8 @@ static int sd_probe(struct device *dev)
         dev_set_drvdata(dev, sdkp);
         add_disk(gd);
 
-        sdev_printk(KERN_NOTICE, sdp, "Attached scsi %sdisk %s\n",
-                    sdp->removable ? "removable " : "", gd->disk_name);
+        sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
+                  sdp->removable ? "removable " : "");
 
         return 0;
 
@@ -1774,6 +1736,31 @@ static void scsi_disk_release(struct class_device *cdev)
         kfree(sdkp);
 }
 
+static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
+{
+        unsigned char cmd[6] = { START_STOP };  /* START_VALID */
+        struct scsi_sense_hdr sshdr;
+        struct scsi_device *sdp = sdkp->device;
+        int res;
+
+        if (start)
+                cmd[4] |= 1;    /* START */
+
+        if (!scsi_device_online(sdp))
+                return -ENODEV;
+
+        res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
+                               SD_TIMEOUT, SD_MAX_RETRIES);
+        if (res) {
+                sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n");
+                sd_print_result(sdkp, res);
+                if (driver_byte(res) & DRIVER_SENSE)
+                        sd_print_sense_hdr(sdkp, &sshdr);
+        }
+
+        return res;
+}
+
 /*
  * Send a SYNCHRONIZE CACHE instruction down to the device through
  * the normal SCSI command structure.  Wait for the command to
@@ -1781,20 +1768,62 @@ static void scsi_disk_release(struct class_device *cdev)
  */
 static void sd_shutdown(struct device *dev)
 {
-        struct scsi_device *sdp = to_scsi_device(dev);
         struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
 
         if (!sdkp)
                 return;         /* this can happen */
 
         if (sdkp->WCE) {
-                printk(KERN_NOTICE "Synchronizing SCSI cache for disk %s: \n",
-                                sdkp->disk->disk_name);
-                sd_sync_cache(sdp);
+                sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
+                sd_sync_cache(sdkp);
+        }
+
+        if (system_state != SYSTEM_RESTART && sdkp->device->manage_start_stop) {
+                sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
+                sd_start_stop_device(sdkp, 0);
         }
+
         scsi_disk_put(sdkp);
 }
 
+static int sd_suspend(struct device *dev, pm_message_t mesg)
+{
+        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+        int ret;
+
+        if (!sdkp)
+                return 0;       /* this can happen */
+
+        if (sdkp->WCE) {
+                sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
+                ret = sd_sync_cache(sdkp);
+                if (ret)
+                        return ret;
+        }
+
+        if (mesg.event == PM_EVENT_SUSPEND &&
+            sdkp->device->manage_start_stop) {
+                sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
+                ret = sd_start_stop_device(sdkp, 0);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int sd_resume(struct device *dev)
+{
+        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+
+        if (!sdkp->device->manage_start_stop)
+                return 0;
+
+        sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+
+        return sd_start_stop_device(sdkp, 1);
+}
+
 /**
  *      init_sd - entry point for this driver (both when built in or when
  *      a module).
@@ -1852,3 +1881,19 @@ static void __exit exit_sd(void)
 
 module_init(init_sd);
 module_exit(exit_sd);
+
+static void sd_print_sense_hdr(struct scsi_disk *sdkp,
+                               struct scsi_sense_hdr *sshdr)
+{
+        sd_printk(KERN_INFO, sdkp, "");
+        scsi_show_sense_hdr(sshdr);
+        sd_printk(KERN_INFO, sdkp, "");
+        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+}
+
+static void sd_print_result(struct scsi_disk *sdkp, int result)
+{
+        sd_printk(KERN_INFO, sdkp, "");
+        scsi_show_result(result);
+}
+
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 81e3bc7b02a1..570977cf9efb 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -917,6 +917,8 @@ sg_ioctl(struct inode *inode, struct file *filp,
                         return result;
                 if (val < 0)
                         return -EINVAL;
+                val = min_t(int, val,
+                                sdp->device->request_queue->max_sectors * 512);
                 if (val != sfp->reserve.bufflen) {
                         if (sg_res_in_use(sfp) || sfp->mmap_called)
                                 return -EBUSY;
@@ -925,7 +927,8 @@ sg_ioctl(struct inode *inode, struct file *filp,
                 }
                 return 0;
         case SG_GET_RESERVED_SIZE:
-                val = (int) sfp->reserve.bufflen;
+                val = min_t(int, sfp->reserve.bufflen,
+                                sdp->device->request_queue->max_sectors * 512);
                 return put_user(val, ip);
         case SG_SET_COMMAND_Q:
                 result = get_user(val, ip);
@@ -1061,6 +1064,9 @@ sg_ioctl(struct inode *inode, struct file *filp,
                 if (sdp->detached)
                         return -ENODEV;
                 return scsi_ioctl(sdp->device, cmd_in, p);
+        case BLKSECTGET:
+                return put_user(sdp->device->request_queue->max_sectors * 512,
+                                ip);
         default:
                 if (read_only)
                         return -EPERM;  /* don't know so take safe approach */
@@ -2339,6 +2345,7 @@ sg_add_sfp(Sg_device * sdp, int dev)
 {
         Sg_fd *sfp;
         unsigned long iflags;
+        int bufflen;
 
         sfp = kzalloc(sizeof(*sfp), GFP_ATOMIC | __GFP_NOWARN);
         if (!sfp)
@@ -2369,7 +2376,9 @@ sg_add_sfp(Sg_device * sdp, int dev)
         if (unlikely(sg_big_buff != def_reserved_size))
                 sg_big_buff = def_reserved_size;
 
-        sg_build_reserve(sfp, sg_big_buff);
+        bufflen = min_t(int, sg_big_buff,
+                        sdp->device->request_queue->max_sectors * 512);
+        sg_build_reserve(sfp, bufflen);
         SCSI_LOG_TIMEOUT(3, printk("sg_add_sfp:   bufflen=%d, k_use_sg=%d\n",
                            sfp->reserve.bufflen, sfp->reserve.k_use_sg));
         return sfp;
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 1857d68e7195..f9a52af7f5b4 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -62,6 +62,8 @@
 MODULE_DESCRIPTION("SCSI cdrom (sr) driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_CDROM_MAJOR);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_ROM);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_WORM);
 
 #define SR_DISKS        256
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 98d8411bbccc..55bfeccf68a2 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -89,6 +89,7 @@ MODULE_AUTHOR("Kai Makisara");
 MODULE_DESCRIPTION("SCSI tape (st) driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(SCSI_TAPE_MAJOR);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_TAPE);
 
 /* Set 'perm' (4th argument) to 0 to disable module_param's definition
  * of sysfs parameters (which module_param doesn't yet support).
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 8c766bcd1095..bbeb2451d32f 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -5,6 +5,7 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/init.h>
 
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index a583e89238fc..3158949ffa62 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2680,7 +2680,7 @@ static int __init dc390_module_init(void)
                 printk (KERN_INFO "DC390: Using safe settings.\n");
         }
 
-        return pci_module_init(&dc390_driver);
+        return pci_register_driver(&dc390_driver);
 }
 
 static void __exit dc390_module_exit(void)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 90621c3312bc..c9832d963f1e 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -251,9 +251,16 @@ static const struct serial8250_config uart_config[] = {
                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                 .flags          = UART_CAP_FIFO | UART_CAP_UUE,
         },
+        [PORT_RM9000] = {
+                .name           = "RM9000",
+                .fifo_size      = 16,
+                .tx_loadsz      = 16,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO,
+        },
 };
 
-#ifdef CONFIG_SERIAL_8250_AU1X00
+#if defined (CONFIG_SERIAL_8250_AU1X00)
 
 /* Au1x00 UART hardware has a weird register layout */
 static const u8 au_io_in_map[] = {
@@ -289,6 +296,44 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
         return au_io_out_map[offset];
 }
 
+#elif defined (CONFIG_SERIAL_8250_RM9K)
+
+static const u8
+        regmap_in[8] = {
+                [UART_RX]       = 0x00,
+                [UART_IER]      = 0x0c,
+                [UART_IIR]      = 0x14,
+                [UART_LCR]      = 0x1c,
+                [UART_MCR]      = 0x20,
+                [UART_LSR]      = 0x24,
+                [UART_MSR]      = 0x28,
+                [UART_SCR]      = 0x2c
+        },
+        regmap_out[8] = {
+                [UART_TX]       = 0x04,
+                [UART_IER]      = 0x0c,
+                [UART_FCR]      = 0x18,
+                [UART_LCR]      = 0x1c,
+                [UART_MCR]      = 0x20,
+                [UART_LSR]      = 0x24,
+                [UART_MSR]      = 0x28,
+                [UART_SCR]      = 0x2c
+        };
+
+static inline int map_8250_in_reg(struct uart_8250_port *up, int offset)
+{
+        if (up->port.iotype != UPIO_RM9000)
+                return offset;
+        return regmap_in[offset];
+}
+
+static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
+{
+        if (up->port.iotype != UPIO_RM9000)
+                return offset;
+        return regmap_out[offset];
+}
+
 #else
 
 /* sane hardware needs no mapping */
@@ -308,8 +353,10 @@ static unsigned int serial_in(struct uart_8250_port *up, int offset)
                 return inb(up->port.iobase + 1);
 
         case UPIO_MEM:
+        case UPIO_DWAPB:
                 return readb(up->port.membase + offset);
 
+        case UPIO_RM9000:
         case UPIO_MEM32:
                 return readl(up->port.membase + offset);
 
@@ -333,6 +380,8 @@ static unsigned int serial_in(struct uart_8250_port *up, int offset)
 static void
 serial_out(struct uart_8250_port *up, int offset, int value)
 {
+        /* Save the offset before it's remapped */
+        int save_offset = offset;
         offset = map_8250_out_reg(up, offset) << up->port.regshift;
 
         switch (up->port.iotype) {
@@ -345,6 +394,7 @@ serial_out(struct uart_8250_port *up, int offset, int value)
                 writeb(value, up->port.membase + offset);
                 break;
 
+        case UPIO_RM9000:
         case UPIO_MEM32:
                 writel(value, up->port.membase + offset);
                 break;
@@ -359,6 +409,18 @@ serial_out(struct uart_8250_port *up, int offset, int value)
                         writeb(value, up->port.membase + offset);
                 break;
 
+        case UPIO_DWAPB:
+                /* Save the LCR value so it can be re-written when a
+                 * Busy Detect interrupt occurs. */
+                if (save_offset == UART_LCR)
+                        up->lcr = value;
+                writeb(value, up->port.membase + offset);
+                /* Read the IER to ensure any interrupt is cleared before
+                 * returning from ISR. */
+                if (save_offset == UART_TX || save_offset == UART_IER)
+                        value = serial_in(up, UART_IER);
+                break;
+
         default:
                 outb(value, up->port.iobase + offset);
         }
@@ -373,6 +435,7 @@ serial_out_sync(struct uart_8250_port *up, int offset, int value)
 #ifdef CONFIG_SERIAL_8250_AU1X00
         case UPIO_AU:
 #endif
+        case UPIO_DWAPB:
                 serial_out(up, offset, value);
                 serial_in(up, UART_LCR);        /* safe, no side-effects */
                 break;
@@ -403,7 +466,7 @@ static inline void _serial_dl_write(struct uart_8250_port *up, int value)
         serial_outp(up, UART_DLM, value >> 8 & 0xff);
 }
 
-#ifdef CONFIG_SERIAL_8250_AU1X00
+#if defined (CONFIG_SERIAL_8250_AU1X00)
 /* Au1x00 haven't got a standard divisor latch */
 static int serial_dl_read(struct uart_8250_port *up)
 {
@@ -420,6 +483,24 @@ static void serial_dl_write(struct uart_8250_port *up, int value)
         else
                 _serial_dl_write(up, value);
 }
+#elif defined (CONFIG_SERIAL_8250_RM9K)
+static int serial_dl_read(struct uart_8250_port *up)
+{
+        return  (up->port.iotype == UPIO_RM9000) ?
+                (((__raw_readl(up->port.membase + 0x10) << 8) |
+                (__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff) :
+                _serial_dl_read(up);
+}
+
+static void serial_dl_write(struct uart_8250_port *up, int value)
+{
+        if (up->port.iotype == UPIO_RM9000) {
+                __raw_writel(value, up->port.membase + 0x08);
+                __raw_writel(value >> 8, up->port.membase + 0x10);
+        } else {
+                _serial_dl_write(up, value);
+        }
+}
 #else
 #define serial_dl_read(up) _serial_dl_read(up)
 #define serial_dl_write(up, value) _serial_dl_write(up, value)
@@ -621,7 +702,7 @@ static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
  * its clones.  (We treat the broken original StarTech 16650 V1 as a
  * 16550, and why not?  Startech doesn't seem to even acknowledge its
  * existence.)
- * 
+ *
  * What evil have men's minds wrought...
  */
 static void autoconfig_has_efr(struct uart_8250_port *up)
@@ -674,7 +755,7 @@ static void autoconfig_has_efr(struct uart_8250_port *up)
                         up->bugs |= UART_BUG_QUOT;
                 return;
         }
-        
+
         /*
          * We check for a XR16C850 by setting DLL and DLM to 0, and then
          * reading back DLL and DLM.  The chip type depends on the DLM
@@ -817,7 +898,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                         status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
                         status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
                         serial_outp(up, 0x04, status1);
-                        
+
                         serial_dl_write(up, quot);
 
                         serial_outp(up, UART_LCR, 0);
@@ -922,7 +1003,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                 /*
                  * Do a simple existence test first; if we fail this,
                  * there's no point trying anything else.
-                 * 
+                 *
                  * 0x80 is used as a nonsense port to prevent against
                  * false positives due to ISA bus float.  The
                  * assumption is that 0x80 is a non-existent port;
@@ -961,7 +1042,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         save_mcr = serial_in(up, UART_MCR);
         save_lcr = serial_in(up, UART_LCR);
 
-        /* 
+        /*
          * Check to see if a UART is really there.  Certain broken
          * internal modems based on the Rockwell chipset fail this
          * test, because they apparently don't implement the loopback
@@ -1068,7 +1149,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         else
                 serial_outp(up, UART_IER, 0);
 
- out:   
+ out:
         spin_unlock_irqrestore(&up->port.lock, flags);
 //      restore_flags(flags);
         DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
@@ -1094,7 +1175,7 @@ static void autoconfig_irq(struct uart_8250_port *up)
         save_mcr = serial_inp(up, UART_MCR);
         save_ier = serial_inp(up, UART_IER);
         serial_outp(up, UART_MCR, UART_MCR_OUT1 | UART_MCR_OUT2);
-        
+
         irqs = probe_irq_on();
         serial_outp(up, UART_MCR, 0);
         udelay (10);
@@ -1159,8 +1240,11 @@ static void serial8250_start_tx(struct uart_port *port)
                 if (up->bugs & UART_BUG_TXEN) {
                         unsigned char lsr, iir;
                         lsr = serial_in(up, UART_LSR);
-                        iir = serial_in(up, UART_IIR);
-                        if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT)
+                        iir = serial_in(up, UART_IIR) & 0x0f;
+                        if ((up->port.type == PORT_RM9000) ?
+                                (lsr & UART_LSR_THRE &&
+                                (iir == UART_IIR_NO_INT || iir == UART_IIR_THRI)) :
+                                (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT))
                                 transmit_chars(up);
                 }
         }
@@ -1389,6 +1473,19 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
                         handled = 1;
 
                         end = NULL;
+                } else if (up->port.iotype == UPIO_DWAPB &&
+                          (iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
+                        /* The DesignWare APB UART has an Busy Detect (0x07)
+                         * interrupt meaning an LCR write attempt occured while the
+                         * UART was busy. The interrupt must be cleared by reading
+                         * the UART status register (USR) and the LCR re-written. */
+                        unsigned int status;
+                        status = *(volatile u32 *)up->port.private_data;
+                        serial_out(up, UART_LCR, up->lcr);
+
+                        handled = 1;
+
+                        end = NULL;
                 } else if (end == NULL)
                         end = l;
 
@@ -1928,7 +2025,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
         /*
          * Ask the core to calculate the divisor for us.
          */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
         quot = serial8250_get_divisor(port, baud);
 
         /*
@@ -2090,6 +2187,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
+        case UPIO_DWAPB:
                 if (!up->port.mapbase)
                         break;
 
@@ -2127,6 +2225,7 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
+        case UPIO_DWAPB:
                 if (!up->port.mapbase)
                         break;
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ad9f321968e1..924e9bd757f0 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -254,6 +254,15 @@ config SERIAL_8250_AU1X00
           to this option.  The driver can handle 1 or 2 serial ports.
           If unsure, say N.
 
+config SERIAL_8250_RM9K
+        bool "Support for MIPS RM9xxx integrated serial port"
+        depends on SERIAL_8250 != n && SERIAL_RM9000
+        select SERIAL_8250_SHARE_IRQ
+        help
+          Selecting this option will add support for the integrated serial
+          port hardware found on MIPS RM9122 and similar processors.
+          If unsure, say N.
+
 comment "Non-8250 serial port support"
 
 config SERIAL_AMBA_PL010
@@ -499,6 +508,100 @@ config SERIAL_SA1100_CONSOLE
           your boot loader (lilo or loadlin) about how to pass options to the
           kernel at boot time.)
 
+config SERIAL_BFIN
+        tristate "Blackfin serial port support"
+        depends on BFIN
+        select SERIAL_CORE
+        select SERIAL_BFIN_UART0 if (BF531 || BF532 || BF533 || BF561)
+        help
+          Add support for the built-in UARTs on the Blackfin.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin_5xx.
+
+config SERIAL_BFIN_CONSOLE
+        bool "Console on Blackfin serial port"
+        depends on SERIAL_BFIN
+        select SERIAL_CORE_CONSOLE
+
+choice
+        prompt "UART Mode"
+        depends on SERIAL_BFIN
+        default SERIAL_BFIN_DMA
+        help
+          This driver supports the built-in serial ports of the Blackfin family
+          of CPUs
+
+config SERIAL_BFIN_DMA
+        bool "DMA mode"
+        depends on DMA_UNCACHED_1M
+        help
+          This driver works under DMA mode. If this option is selected, the
+          blackfin simple dma driver is also enabled.
+
+config SERIAL_BFIN_PIO
+        bool "PIO mode"
+        help
+          This driver works under PIO mode.
+
+endchoice
+
+config SERIAL_BFIN_UART0
+        bool "Enable UART0"
+        depends on SERIAL_BFIN
+        help
+          Enable UART0
+
+config BFIN_UART0_CTSRTS
+        bool "Enable UART0 hardware flow control"
+        depends on SERIAL_BFIN_UART0
+        help
+          Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
+          signal.
+
+config UART0_CTS_PIN
+        int "UART0 CTS pin"
+        depends on BFIN_UART0_CTSRTS
+        default 23
+        help
+          The default pin is GPIO_GP7.
+          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config UART0_RTS_PIN
+        int "UART0 RTS pin"
+        depends on BFIN_UART0_CTSRTS
+        default 22
+        help
+          The default pin is GPIO_GP6.
+          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config SERIAL_BFIN_UART1
+        bool "Enable UART1"
+        depends on SERIAL_BFIN && (BF534 || BF536 || BF537)
+        help
+          Enable UART1
+
+config BFIN_UART1_CTSRTS
+        bool "Enable UART1 hardware flow control"
+        depends on SERIAL_BFIN_UART1
+        help
+          Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
+          signal.
+
+config UART1_CTS_PIN
+        int "UART1 CTS pin"
+        depends on BFIN_UART1_CTSRTS
+        default -1
+        help
+          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config UART1_RTS_PIN
+        int "UART1 RTS pin"
+        depends on BFIN_UART1_CTSRTS
+        default -1
+        help
+          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
 config SERIAL_IMX
         bool "IMX serial port support"
         depends on ARM && ARCH_IMX
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 6b3560c5749a..4959bcb8d1ef 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
 obj-$(CONFIG_SERIAL_PXA) += pxa.o
 obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
 obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
+obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
 obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
 obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index f69bd097166e..1a9a24b82636 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -48,6 +48,7 @@
 #include <linux/serial.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 
@@ -70,6 +71,7 @@
  */
 struct uart_amba_port {
         struct uart_port        port;
+        struct clk              *clk;
         struct amba_device      *dev;
         struct amba_pl010_data  *data;
         unsigned int            old_status;
@@ -77,73 +79,77 @@ struct uart_amba_port {
 
 static void pl010_stop_tx(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
 
-        cr = readb(port->membase + UART010_CR);
+        cr = readb(uap->port.membase + UART010_CR);
         cr &= ~UART010_CR_TIE;
-        writel(cr, port->membase + UART010_CR);
+        writel(cr, uap->port.membase + UART010_CR);
 }
 
 static void pl010_start_tx(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
 
-        cr = readb(port->membase + UART010_CR);
+        cr = readb(uap->port.membase + UART010_CR);
         cr |= UART010_CR_TIE;
-        writel(cr, port->membase + UART010_CR);
+        writel(cr, uap->port.membase + UART010_CR);
 }
 
 static void pl010_stop_rx(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
 
-        cr = readb(port->membase + UART010_CR);
+        cr = readb(uap->port.membase + UART010_CR);
         cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
-        writel(cr, port->membase + UART010_CR);
+        writel(cr, uap->port.membase + UART010_CR);
 }
 
 static void pl010_enable_ms(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
 
-        cr = readb(port->membase + UART010_CR);
+        cr = readb(uap->port.membase + UART010_CR);
         cr |= UART010_CR_MSIE;
-        writel(cr, port->membase + UART010_CR);
+        writel(cr, uap->port.membase + UART010_CR);
 }
 
-static void pl010_rx_chars(struct uart_port *port)
+static void pl010_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = uap->port.info->tty;
         unsigned int status, ch, flag, rsr, max_count = 256;
 
-        status = readb(port->membase + UART01x_FR);
+        status = readb(uap->port.membase + UART01x_FR);
         while (UART_RX_DATA(status) && max_count--) {
-                ch = readb(port->membase + UART01x_DR);
+                ch = readb(uap->port.membase + UART01x_DR);
                 flag = TTY_NORMAL;
 
-                port->icount.rx++;
+                uap->port.icount.rx++;
 
                 /*
                  * Note that the error handling code is
                  * out of the main execution path
                  */
-                rsr = readb(port->membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
+                rsr = readb(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
                 if (unlikely(rsr & UART01x_RSR_ANY)) {
-                        writel(0, port->membase + UART01x_ECR);
+                        writel(0, uap->port.membase + UART01x_ECR);
 
                         if (rsr & UART01x_RSR_BE) {
                                 rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
-                                port->icount.brk++;
-                                if (uart_handle_break(port))
+                                uap->port.icount.brk++;
+                                if (uart_handle_break(&uap->port))
                                         goto ignore_char;
                         } else if (rsr & UART01x_RSR_PE)
-                                port->icount.parity++;
+                                uap->port.icount.parity++;
                         else if (rsr & UART01x_RSR_FE)
-                                port->icount.frame++;
+                                uap->port.icount.frame++;
                         if (rsr & UART01x_RSR_OE)
-                                port->icount.overrun++;
+                                uap->port.icount.overrun++;
 
-                        rsr &= port->read_status_mask;
+                        rsr &= uap->port.read_status_mask;
 
                         if (rsr & UART01x_RSR_BE)
                                 flag = TTY_BREAK;
@@ -153,53 +159,52 @@ static void pl010_rx_chars(struct uart_port *port)
                                 flag = TTY_FRAME;
                 }
 
-                if (uart_handle_sysrq_char(port, ch))
+                if (uart_handle_sysrq_char(&uap->port, ch))
                         goto ignore_char;
 
-                uart_insert_char(port, rsr, UART01x_RSR_OE, ch, flag);
+                uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
 
         ignore_char:
-                status = readb(port->membase + UART01x_FR);
+                status = readb(uap->port.membase + UART01x_FR);
         }
         tty_flip_buffer_push(tty);
         return;
 }
 
-static void pl010_tx_chars(struct uart_port *port)
+static void pl010_tx_chars(struct uart_amba_port *uap)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &uap->port.info->xmit;
         int count;
 
-        if (port->x_char) {
-                writel(port->x_char, port->membase + UART01x_DR);
-                port->icount.tx++;
-                port->x_char = 0;
+        if (uap->port.x_char) {
+                writel(uap->port.x_char, uap->port.membase + UART01x_DR);
+                uap->port.icount.tx++;
+                uap->port.x_char = 0;
                 return;
         }
-        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                pl010_stop_tx(port);
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&uap->port)) {
+                pl010_stop_tx(&uap->port);
                 return;
         }
 
-        count = port->fifosize >> 1;
+        count = uap->port.fifosize >> 1;
         do {
-                writel(xmit->buf[xmit->tail], port->membase + UART01x_DR);
+                writel(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
                 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                port->icount.tx++;
+                uap->port.icount.tx++;
                 if (uart_circ_empty(xmit))
                         break;
         } while (--count > 0);
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
+                uart_write_wakeup(&uap->port);
 
         if (uart_circ_empty(xmit))
-                pl010_stop_tx(port);
+                pl010_stop_tx(&uap->port);
 }
 
-static void pl010_modem_status(struct uart_port *port)
+static void pl010_modem_status(struct uart_amba_port *uap)
 {
-        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int status, delta;
 
         writel(0, uap->port.membase + UART010_ICR);
@@ -226,47 +231,50 @@ static void pl010_modem_status(struct uart_port *port)
 
 static irqreturn_t pl010_int(int irq, void *dev_id)
 {
-        struct uart_port *port = dev_id;
+        struct uart_amba_port *uap = dev_id;
         unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
         int handled = 0;
 
-        spin_lock(&port->lock);
+        spin_lock(&uap->port.lock);
 
-        status = readb(port->membase + UART010_IIR);
+        status = readb(uap->port.membase + UART010_IIR);
         if (status) {
                 do {
                         if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
-                                pl010_rx_chars(port);
+                                pl010_rx_chars(uap);
                         if (status & UART010_IIR_MIS)
-                                pl010_modem_status(port);
+                                pl010_modem_status(uap);
                         if (status & UART010_IIR_TIS)
-                                pl010_tx_chars(port);
+                                pl010_tx_chars(uap);
 
                         if (pass_counter-- == 0)
                                 break;
 
-                        status = readb(port->membase + UART010_IIR);
+                        status = readb(uap->port.membase + UART010_IIR);
                 } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
                                    UART010_IIR_TIS));
                 handled = 1;
         }
 
-        spin_unlock(&port->lock);
+        spin_unlock(&uap->port.lock);
 
         return IRQ_RETVAL(handled);
 }
 
 static unsigned int pl010_tx_empty(struct uart_port *port)
 {
-        return readb(port->membase + UART01x_FR) & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int status = readb(uap->port.membase + UART01x_FR);
+        return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
 }
 
 static unsigned int pl010_get_mctrl(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int result = 0;
         unsigned int status;
 
-        status = readb(port->membase + UART01x_FR);
+        status = readb(uap->port.membase + UART01x_FR);
         if (status & UART01x_FR_DCD)
                 result |= TIOCM_CAR;
         if (status & UART01x_FR_DSR)
@@ -287,17 +295,18 @@ static void pl010_set_mctrl(struct uart_port *port, unsigned int mctrl)
 
 static void pl010_break_ctl(struct uart_port *port, int break_state)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned long flags;
         unsigned int lcr_h;
 
-        spin_lock_irqsave(&port->lock, flags);
-        lcr_h = readb(port->membase + UART010_LCRH);
+        spin_lock_irqsave(&uap->port.lock, flags);
+        lcr_h = readb(uap->port.membase + UART010_LCRH);
         if (break_state == -1)
                 lcr_h |= UART01x_LCRH_BRK;
         else
                 lcr_h &= ~UART01x_LCRH_BRK;
-        writel(lcr_h, port->membase + UART010_LCRH);
-        spin_unlock_irqrestore(&port->lock, flags);
+        writel(lcr_h, uap->port.membase + UART010_LCRH);
+        spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
 static int pl010_startup(struct uart_port *port)
@@ -306,48 +315,70 @@ static int pl010_startup(struct uart_port *port)
         int retval;
 
         /*
+         * Try to enable the clock producer.
+         */
+        retval = clk_enable(uap->clk);
+        if (retval)
+                goto out;
+
+        uap->port.uartclk = clk_get_rate(uap->clk);
+
+        /*
          * Allocate the IRQ
          */
-        retval = request_irq(port->irq, pl010_int, 0, "uart-pl010", port);
+        retval = request_irq(uap->port.irq, pl010_int, 0, "uart-pl010", uap);
         if (retval)
-                return retval;
+                goto clk_dis;
 
         /*
          * initialise the old status of the modem signals
          */
-        uap->old_status = readb(port->membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
+        uap->old_status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
 
         /*
          * Finally, enable interrupts
          */
         writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
-               port->membase + UART010_CR);
+               uap->port.membase + UART010_CR);
 
         return 0;
+
+ clk_dis:
+        clk_disable(uap->clk);
+ out:
+        return retval;
 }
 
 static void pl010_shutdown(struct uart_port *port)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+
         /*
          * Free the interrupt
          */
-        free_irq(port->irq, port);
+        free_irq(uap->port.irq, uap);
 
         /*
          * disable all interrupts, disable the port
          */
-        writel(0, port->membase + UART010_CR);
+        writel(0, uap->port.membase + UART010_CR);
 
         /* disable break condition and fifos */
-        writel(readb(port->membase + UART010_LCRH) &
+        writel(readb(uap->port.membase + UART010_LCRH) &
                 ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
-               port->membase + UART010_LCRH);
+               uap->port.membase + UART010_LCRH);
+
+        /*
+         * Shut down the clock producer
+         */
+        clk_disable(uap->clk);
 }
 
 static void
 pl010_set_termios(struct uart_port *port, struct ktermios *termios,
                      struct ktermios *old)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int lcr_h, old_cr;
         unsigned long flags;
         unsigned int baud, quot;
@@ -355,7 +386,7 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
         /*
          * Ask the core to calculate the divisor for us.
          */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16); 
         quot = uart_get_divisor(port, baud);
 
         switch (termios->c_cflag & CSIZE) {
@@ -379,66 +410,66 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
                 if (!(termios->c_cflag & PARODD))
                         lcr_h |= UART01x_LCRH_EPS;
         }
-        if (port->fifosize > 1)
+        if (uap->port.fifosize > 1)
                 lcr_h |= UART01x_LCRH_FEN;
 
-        spin_lock_irqsave(&port->lock, flags);
+        spin_lock_irqsave(&uap->port.lock, flags);
 
         /*
          * Update the per-port timeout.
          */
         uart_update_timeout(port, termios->c_cflag, baud);
 
-        port->read_status_mask = UART01x_RSR_OE;
+        uap->port.read_status_mask = UART01x_RSR_OE;
         if (termios->c_iflag & INPCK)
-                port->read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+                uap->port.read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
         if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= UART01x_RSR_BE;
+                uap->port.read_status_mask |= UART01x_RSR_BE;
 
         /*
          * Characters to ignore
          */
-        port->ignore_status_mask = 0;
+        uap->port.ignore_status_mask = 0;
         if (termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+                uap->port.ignore_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
         if (termios->c_iflag & IGNBRK) {
-                port->ignore_status_mask |= UART01x_RSR_BE;
+                uap->port.ignore_status_mask |= UART01x_RSR_BE;
                 /*
                  * If we're ignoring parity and break indicators,
                  * ignore overruns too (for real raw support).
                  */
                 if (termios->c_iflag & IGNPAR)
-                        port->ignore_status_mask |= UART01x_RSR_OE;
+                        uap->port.ignore_status_mask |= UART01x_RSR_OE;
         }
 
         /*
          * Ignore all characters if CREAD is not set.
          */
         if ((termios->c_cflag & CREAD) == 0)
-                port->ignore_status_mask |= UART_DUMMY_RSR_RX;
+                uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
 
         /* first, disable everything */
-        old_cr = readb(port->membase + UART010_CR) & ~UART010_CR_MSIE;
+        old_cr = readb(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
 
         if (UART_ENABLE_MS(port, termios->c_cflag))
                 old_cr |= UART010_CR_MSIE;
 
-        writel(0, port->membase + UART010_CR);
+        writel(0, uap->port.membase + UART010_CR);
 
         /* Set baud rate */
         quot -= 1;
-        writel((quot & 0xf00) >> 8, port->membase + UART010_LCRM);
-        writel(quot & 0xff, port->membase + UART010_LCRL);
+        writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM);
+        writel(quot & 0xff, uap->port.membase + UART010_LCRL);
 
         /*
          * ----------v----------v----------v----------v-----
          * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
          * ----------^----------^----------^----------^-----
          */
-        writel(lcr_h, port->membase + UART010_LCRH);
-        writel(old_cr, port->membase + UART010_CR);
+        writel(lcr_h, uap->port.membase + UART010_LCRH);
+        writel(old_cr, uap->port.membase + UART010_CR);
 
-        spin_unlock_irqrestore(&port->lock, flags);
+        spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
 static const char *pl010_type(struct uart_port *port)
@@ -514,47 +545,52 @@ static struct uart_amba_port *amba_ports[UART_NR];
 
 static void pl010_console_putchar(struct uart_port *port, int ch)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int status;
 
         do {
-                status = readb(port->membase + UART01x_FR);
+                status = readb(uap->port.membase + UART01x_FR);
                 barrier();
         } while (!UART_TX_READY(status));
-        writel(ch, port->membase + UART01x_DR);
+        writel(ch, uap->port.membase + UART01x_DR);
 }
 
 static void
 pl010_console_write(struct console *co, const char *s, unsigned int count)
 {
-        struct uart_port *port = &amba_ports[co->index]->port;
+        struct uart_amba_port *uap = amba_ports[co->index];
         unsigned int status, old_cr;
 
+        clk_enable(uap->clk);
+
         /*
          *      First save the CR then disable the interrupts
          */
-        old_cr = readb(port->membase + UART010_CR);
-        writel(UART01x_CR_UARTEN, port->membase + UART010_CR);
+        old_cr = readb(uap->port.membase + UART010_CR);
+        writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
 
-        uart_console_write(port, s, count, pl010_console_putchar);
+        uart_console_write(&uap->port, s, count, pl010_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
          *      and restore the TCR
          */
         do {
-                status = readb(port->membase + UART01x_FR);
+                status = readb(uap->port.membase + UART01x_FR);
                 barrier();
         } while (status & UART01x_FR_BUSY);
-        writel(old_cr, port->membase + UART010_CR);
+        writel(old_cr, uap->port.membase + UART010_CR);
+
+        clk_disable(uap->clk);
 }
 
 static void __init
-pl010_console_get_options(struct uart_port *port, int *baud,
+pl010_console_get_options(struct uart_amba_port *uap, int *baud,
                              int *parity, int *bits)
 {
-        if (readb(port->membase + UART010_CR) & UART01x_CR_UARTEN) {
+        if (readb(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
                 unsigned int lcr_h, quot;
-                lcr_h = readb(port->membase + UART010_LCRH);
+                lcr_h = readb(uap->port.membase + UART010_LCRH);
 
                 *parity = 'n';
                 if (lcr_h & UART01x_LCRH_PEN) {
@@ -569,14 +605,15 @@ pl010_console_get_options(struct uart_port *port, int *baud,
                 else
                         *bits = 8;
 
-                quot = readb(port->membase + UART010_LCRL) | readb(port->membase + UART010_LCRM) << 8;
-                *baud = port->uartclk / (16 * (quot + 1));
+                quot = readb(uap->port.membase + UART010_LCRL) |
+                       readb(uap->port.membase + UART010_LCRM) << 8;
+                *baud = uap->port.uartclk / (16 * (quot + 1));
         }
 }
 
 static int __init pl010_console_setup(struct console *co, char *options)
 {
-        struct uart_port *port;
+        struct uart_amba_port *uap;
         int baud = 38400;
         int bits = 8;
         int parity = 'n';
@@ -589,16 +626,18 @@ static int __init pl010_console_setup(struct console *co, char *options)
          */
         if (co->index >= UART_NR)
                 co->index = 0;
-        if (!amba_ports[co->index])
+        uap = amba_ports[co->index];
+        if (!uap)
                 return -ENODEV;
-        port = &amba_ports[co->index]->port;
+
+        uap->port.uartclk = clk_get_rate(uap->clk);
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
         else
-                pl010_console_get_options(port, &baud, &parity, &bits);
+                pl010_console_get_options(uap, &baud, &parity, &bits);
 
-        return uart_set_options(port, co, baud, parity, bits, flow);
+        return uart_set_options(&uap->port, co, baud, parity, bits, flow);
 }
 
 static struct uart_driver amba_reg;
@@ -629,7 +668,7 @@ static struct uart_driver amba_reg = {
 
 static int pl010_probe(struct amba_device *dev, void *id)
 {
-        struct uart_amba_port *port;
+        struct uart_amba_port *uap;
         void __iomem *base;
         int i, ret;
 
@@ -642,8 +681,8 @@ static int pl010_probe(struct amba_device *dev, void *id)
                 goto out;
         }
 
-        port = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL);
-        if (!port) {
+        uap = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL);
+        if (!uap) {
                 ret = -ENOMEM;
                 goto out;
         }
@@ -654,51 +693,57 @@ static int pl010_probe(struct amba_device *dev, void *id)
                 goto free;
         }
 
-        port->port.dev = &dev->dev;
-        port->port.mapbase = dev->res.start;
-        port->port.membase = base;
-        port->port.iotype = UPIO_MEM;
-        port->port.irq = dev->irq[0];
-        port->port.uartclk = 14745600;
-        port->port.fifosize = 16;
-        port->port.ops = &amba_pl010_pops;
-        port->port.flags = UPF_BOOT_AUTOCONF;
-        port->port.line = i;
-        port->dev = dev;
-        port->data = dev->dev.platform_data;
-
-        amba_ports[i] = port;
-
-        amba_set_drvdata(dev, port);
-        ret = uart_add_one_port(&amba_reg, &port->port);
+        uap->clk = clk_get(&dev->dev, "UARTCLK");
+        if (IS_ERR(uap->clk)) {
+                ret = PTR_ERR(uap->clk);
+                goto unmap;
+        }
+
+        uap->port.dev = &dev->dev;
+        uap->port.mapbase = dev->res.start;
+        uap->port.membase = base;
+        uap->port.iotype = UPIO_MEM;
+        uap->port.irq = dev->irq[0];
+        uap->port.fifosize = 16;
+        uap->port.ops = &amba_pl010_pops;
+        uap->port.flags = UPF_BOOT_AUTOCONF;
+        uap->port.line = i;
+        uap->dev = dev;
+        uap->data = dev->dev.platform_data;
+
+        amba_ports[i] = uap;
+
+        amba_set_drvdata(dev, uap);
+        ret = uart_add_one_port(&amba_reg, &uap->port);
         if (ret) {
                 amba_set_drvdata(dev, NULL);
                 amba_ports[i] = NULL;
+                clk_put(uap->clk);
+ unmap:
                 iounmap(base);
  free:
-                kfree(port);
+                kfree(uap);
         }
-
  out:
         return ret;
 }
 
 static int pl010_remove(struct amba_device *dev)
 {
-        struct uart_amba_port *port = amba_get_drvdata(dev);
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
         int i;
 
         amba_set_drvdata(dev, NULL);
 
-        uart_remove_one_port(&amba_reg, &port->port);
+        uart_remove_one_port(&amba_reg, &uap->port);
 
         for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
-                if (amba_ports[i] == port)
+                if (amba_ports[i] == uap)
                         amba_ports[i] = NULL;
 
-        iounmap(port->port.membase);
-        kfree(port);
-
+        iounmap(uap->port.membase);
+        clk_put(uap->clk);
+        kfree(uap);
         return 0;
 }
 
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 935f48fa501d..3320bcd92c0a 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -484,11 +484,16 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios * termios,
         unsigned long flags;
         unsigned int mode, imr, quot, baud;
 
+        /* Get current mode register */
+        mode = UART_GET_MR(port) & ~(ATMEL_US_USCLKS | ATMEL_US_CHRL | ATMEL_US_NBSTOP | ATMEL_US_PAR);
+
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
         quot = uart_get_divisor(port, baud);
 
-        /* Get current mode register */
-        mode = UART_GET_MR(port) & ~(ATMEL_US_CHRL | ATMEL_US_NBSTOP | ATMEL_US_PAR);
+        if (quot > 65535) {             /* BRGR is 16-bit, so switch to slower clock */
+                quot /= 8;
+                mode |= ATMEL_US_USCLKS_MCK_DIV8;
+        }
 
         /* byte size */
         switch (termios->c_cflag & CSIZE) {
diff --git a/drivers/serial/atmel_serial.h b/drivers/serial/atmel_serial.h
index 11b44360e108..e0141776517c 100644
--- a/drivers/serial/atmel_serial.h
+++ b/drivers/serial/atmel_serial.h
@@ -46,6 +46,9 @@
 #define                 ATMEL_US_USMODE_ISO7816_T1      6
 #define                 ATMEL_US_USMODE_IRDA            8
 #define         ATMEL_US_USCLKS         (3   <<  4)             /* Clock Selection */
+#define                 ATMEL_US_USCLKS_MCK             (0 <<  4)
+#define                 ATMEL_US_USCLKS_MCK_DIV8        (1 <<  4)
+#define                 ATMEL_US_USCLKS_SCK             (3 <<  4)
 #define         ATMEL_US_CHRL           (3   <<  6)             /* Character Length */
 #define                 ATMEL_US_CHRL_5                 (0 <<  6)
 #define                 ATMEL_US_CHRL_6                 (1 <<  6)
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
new file mode 100644
index 000000000000..408390f93db9
--- /dev/null
+++ b/drivers/serial/bfin_5xx.c
@@ -0,0 +1,1012 @@
+/*
+ * File:         drivers/serial/bfin_5xx.c
+ * Based on:     Based on drivers/serial/sa1100.c
+ * Author:       Aubrey Li <aubrey.li@analog.com>
+ *
+ * Created:
+ * Description:  Driver for blackfin 5xx serial ports
+ *
+ * Rev:          $Id: bfin_5xx.c,v 1.19 2006/09/24 02:33:53 aubrey Exp $
+ *
+ * Modified:
+ *               Copyright 2006 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.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, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if defined(CONFIG_SERIAL_BFIN_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/platform_device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+
+#include <asm/gpio.h>
+#include <asm/mach/bfin_serial_5xx.h>
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+#include <linux/dma-mapping.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/cacheflush.h>
+#endif
+
+/* UART name and device definitions */
+#define BFIN_SERIAL_NAME        "ttyBF"
+#define BFIN_SERIAL_MAJOR       204
+#define BFIN_SERIAL_MINOR       64
+
+/*
+ * Setup for console. Argument comes from the menuconfig
+ */
+#define DMA_RX_XCOUNT           512
+#define DMA_RX_YCOUNT           (PAGE_SIZE / DMA_RX_XCOUNT)
+
+#define DMA_RX_FLUSH_JIFFIES    5
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart);
+#else
+static void bfin_serial_do_work(struct work_struct *work);
+static void bfin_serial_tx_chars(struct bfin_serial_port *uart);
+static void local_put_char(struct bfin_serial_port *uart, char ch);
+#endif
+
+static void bfin_serial_mctrl_check(struct bfin_serial_port *uart);
+
+/*
+ * interrupts are disabled on entry
+ */
+static void bfin_serial_stop_tx(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+        disable_dma(uart->tx_dma_channel);
+#else
+        unsigned short ier;
+
+        ier = UART_GET_IER(uart);
+        ier &= ~ETBEI;
+        UART_PUT_IER(uart, ier);
+#endif
+}
+
+/*
+ * port is locked and interrupts are disabled
+ */
+static void bfin_serial_start_tx(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+        bfin_serial_dma_tx_chars(uart);
+#else
+        unsigned short ier;
+        ier = UART_GET_IER(uart);
+        ier |= ETBEI;
+        UART_PUT_IER(uart, ier);
+        bfin_serial_tx_chars(uart);
+#endif
+}
+
+/*
+ * Interrupts are enabled
+ */
+static void bfin_serial_stop_rx(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        unsigned short ier;
+
+        ier = UART_GET_IER(uart);
+        ier &= ~ERBFI;
+        UART_PUT_IER(uart, ier);
+}
+
+/*
+ * Set the modem control timer to fire immediately.
+ */
+static void bfin_serial_enable_ms(struct uart_port *port)
+{
+}
+
+#ifdef CONFIG_SERIAL_BFIN_PIO
+static void local_put_char(struct bfin_serial_port *uart, char ch)
+{
+        unsigned short status;
+        int flags = 0;
+
+        spin_lock_irqsave(&uart->port.lock, flags);
+
+        do {
+                status = UART_GET_LSR(uart);
+        } while (!(status & THRE));
+
+        UART_PUT_CHAR(uart, ch);
+        SSYNC();
+
+        spin_unlock_irqrestore(&uart->port.lock, flags);
+}
+
+static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
+{
+        struct tty_struct *tty = uart->port.info?uart->port.info->tty:0;
+        unsigned int status, ch, flg;
+#ifdef BF533_FAMILY
+        static int in_break = 0;
+#endif
+
+        status = UART_GET_LSR(uart);
+        ch = UART_GET_CHAR(uart);
+        uart->port.icount.rx++;
+
+#ifdef BF533_FAMILY
+        /* The BF533 family of processors have a nice misbehavior where
+         * they continuously generate characters for a "single" break.
+         * We have to basically ignore this flood until the "next" valid
+         * character comes across.  All other Blackfin families operate
+         * properly though.
+         */
+        if (in_break) {
+                if (ch != 0) {
+                        in_break = 0;
+                        ch = UART_GET_CHAR(uart);
+                }
+                return;
+        }
+#endif
+
+        if (status & BI) {
+#ifdef BF533_FAMILY
+                in_break = 1;
+#endif
+                uart->port.icount.brk++;
+                if (uart_handle_break(&uart->port))
+                        goto ignore_char;
+                flg = TTY_BREAK;
+        } else if (status & PE) {
+                flg = TTY_PARITY;
+                uart->port.icount.parity++;
+        } else if (status & OE) {
+                flg = TTY_OVERRUN;
+                uart->port.icount.overrun++;
+        } else if (status & FE) {
+                flg = TTY_FRAME;
+                uart->port.icount.frame++;
+        } else
+                flg = TTY_NORMAL;
+
+        if (uart_handle_sysrq_char(&uart->port, ch))
+                goto ignore_char;
+        if (tty)
+                uart_insert_char(&uart->port, status, 2, ch, flg);
+
+ignore_char:
+        if (tty)
+                tty_flip_buffer_push(tty);
+}
+
+static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
+{
+        struct circ_buf *xmit = &uart->port.info->xmit;
+
+        if (uart->port.x_char) {
+                UART_PUT_CHAR(uart, uart->port.x_char);
+                uart->port.icount.tx++;
+                uart->port.x_char = 0;
+                return;
+        }
+        /*
+         * Check the modem control lines before
+         * transmitting anything.
+         */
+        bfin_serial_mctrl_check(uart);
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
+                bfin_serial_stop_tx(&uart->port);
+                return;
+        }
+
+        local_put_char(uart, xmit->buf[xmit->tail]);
+        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+        uart->port.icount.tx++;
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&uart->port);
+
+        if (uart_circ_empty(xmit))
+                bfin_serial_stop_tx(&uart->port);
+}
+
+static irqreturn_t bfin_serial_int(int irq, void *dev_id)
+{
+        struct bfin_serial_port *uart = dev_id;
+        unsigned short status;
+
+        spin_lock(&uart->port.lock);
+        status = UART_GET_IIR(uart);
+        do {
+                if ((status & IIR_STATUS) == IIR_TX_READY)
+                        bfin_serial_tx_chars(uart);
+                if ((status & IIR_STATUS) == IIR_RX_READY)
+                        bfin_serial_rx_chars(uart);
+                status = UART_GET_IIR(uart);
+        } while (status & (IIR_TX_READY | IIR_RX_READY));
+        spin_unlock(&uart->port.lock);
+        return IRQ_HANDLED;
+}
+
+static void bfin_serial_do_work(struct work_struct *work)
+{
+        struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue);
+
+        bfin_serial_mctrl_check(uart);
+}
+
+#endif
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
+{
+        struct circ_buf *xmit = &uart->port.info->xmit;
+        unsigned short ier;
+        int flags = 0;
+
+        if (!uart->tx_done)
+                return;
+
+        uart->tx_done = 0;
+
+        if (uart->port.x_char) {
+                UART_PUT_CHAR(uart, uart->port.x_char);
+                uart->port.icount.tx++;
+                uart->port.x_char = 0;
+                uart->tx_done = 1;
+                return;
+        }
+        /*
+         * Check the modem control lines before
+         * transmitting anything.
+         */
+        bfin_serial_mctrl_check(uart);
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
+                bfin_serial_stop_tx(&uart->port);
+                uart->tx_done = 1;
+                return;
+        }
+
+        spin_lock_irqsave(&uart->port.lock, flags);
+        uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
+        if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail))
+                uart->tx_count = UART_XMIT_SIZE - xmit->tail;
+        blackfin_dcache_flush_range((unsigned long)(xmit->buf+xmit->tail),
+                                        (unsigned long)(xmit->buf+xmit->tail+uart->tx_count));
+        set_dma_config(uart->tx_dma_channel,
+                set_bfin_dma_config(DIR_READ, DMA_FLOW_STOP,
+                        INTR_ON_BUF,
+                        DIMENSION_LINEAR,
+                        DATA_SIZE_8));
+        set_dma_start_addr(uart->tx_dma_channel, (unsigned long)(xmit->buf+xmit->tail));
+        set_dma_x_count(uart->tx_dma_channel, uart->tx_count);
+        set_dma_x_modify(uart->tx_dma_channel, 1);
+        enable_dma(uart->tx_dma_channel);
+        ier = UART_GET_IER(uart);
+        ier |= ETBEI;
+        UART_PUT_IER(uart, ier);
+        spin_unlock_irqrestore(&uart->port.lock, flags);
+}
+
+static void bfin_serial_dma_rx_chars(struct bfin_serial_port * uart)
+{
+        struct tty_struct *tty = uart->port.info->tty;
+        int i, flg, status;
+
+        status = UART_GET_LSR(uart);
+        uart->port.icount.rx += CIRC_CNT(uart->rx_dma_buf.head, uart->rx_dma_buf.tail, UART_XMIT_SIZE);;
+
+        if (status & BI) {
+                uart->port.icount.brk++;
+                if (uart_handle_break(&uart->port))
+                        goto dma_ignore_char;
+                flg = TTY_BREAK;
+        } else if (status & PE) {
+                flg = TTY_PARITY;
+                uart->port.icount.parity++;
+        } else if (status & OE) {
+                flg = TTY_OVERRUN;
+                uart->port.icount.overrun++;
+        } else if (status & FE) {
+                flg = TTY_FRAME;
+                uart->port.icount.frame++;
+        } else
+                flg = TTY_NORMAL;
+
+        for (i = uart->rx_dma_buf.head; i < uart->rx_dma_buf.tail; i++) {
+                if (uart_handle_sysrq_char(&uart->port, uart->rx_dma_buf.buf[i]))
+                        goto dma_ignore_char;
+                uart_insert_char(&uart->port, status, 2, uart->rx_dma_buf.buf[i], flg);
+        }
+dma_ignore_char:
+        tty_flip_buffer_push(tty);
+}
+
+void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
+{
+        int x_pos, pos;
+        int flags = 0;
+
+        bfin_serial_dma_tx_chars(uart);
+
+        spin_lock_irqsave(&uart->port.lock, flags);
+        x_pos = DMA_RX_XCOUNT - get_dma_curr_xcount(uart->rx_dma_channel);
+        if (x_pos == DMA_RX_XCOUNT)
+                x_pos = 0;
+
+        pos = uart->rx_dma_nrows * DMA_RX_XCOUNT + x_pos;
+
+        if (pos>uart->rx_dma_buf.tail) {
+                uart->rx_dma_buf.tail = pos;
+                bfin_serial_dma_rx_chars(uart);
+                uart->rx_dma_buf.head = uart->rx_dma_buf.tail;
+        }
+        spin_unlock_irqrestore(&uart->port.lock, flags);
+        uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES;
+        add_timer(&(uart->rx_dma_timer));
+}
+
+static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
+{
+        struct bfin_serial_port *uart = dev_id;
+        struct circ_buf *xmit = &uart->port.info->xmit;
+        unsigned short ier;
+
+        spin_lock(&uart->port.lock);
+        if (!(get_dma_curr_irqstat(uart->tx_dma_channel)&DMA_RUN)) {
+                clear_dma_irqstat(uart->tx_dma_channel);
+                disable_dma(uart->tx_dma_channel);
+                ier = UART_GET_IER(uart);
+                ier &= ~ETBEI;
+                UART_PUT_IER(uart, ier);
+                xmit->tail = (xmit->tail+uart->tx_count) &(UART_XMIT_SIZE -1);
+                uart->port.icount.tx+=uart->tx_count;
+
+                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                        uart_write_wakeup(&uart->port);
+
+                if (uart_circ_empty(xmit))
+                        bfin_serial_stop_tx(&uart->port);
+                uart->tx_done = 1;
+        }
+
+        spin_unlock(&uart->port.lock);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t bfin_serial_dma_rx_int(int irq, void *dev_id)
+{
+        struct bfin_serial_port *uart = dev_id;
+        unsigned short irqstat;
+
+        uart->rx_dma_nrows++;
+        if (uart->rx_dma_nrows == DMA_RX_YCOUNT) {
+                uart->rx_dma_nrows = 0;
+                uart->rx_dma_buf.tail = DMA_RX_XCOUNT*DMA_RX_YCOUNT;
+                bfin_serial_dma_rx_chars(uart);
+                uart->rx_dma_buf.head = uart->rx_dma_buf.tail = 0;
+        }
+        spin_lock(&uart->port.lock);
+        irqstat = get_dma_curr_irqstat(uart->rx_dma_channel);
+        clear_dma_irqstat(uart->rx_dma_channel);
+
+        spin_unlock(&uart->port.lock);
+        return IRQ_HANDLED;
+}
+#endif
+
+/*
+ * Return TIOCSER_TEMT when transmitter is not busy.
+ */
+static unsigned int bfin_serial_tx_empty(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        unsigned short lsr;
+
+        lsr = UART_GET_LSR(uart);
+        if (lsr & TEMT)
+                return TIOCSER_TEMT;
+        else
+                return 0;
+}
+
+static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
+{
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        if (uart->cts_pin < 0)
+                return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+
+        if (gpio_get_value(uart->cts_pin))
+                return TIOCM_DSR | TIOCM_CAR;
+        else
+#endif
+                return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+}
+
+static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        if (uart->rts_pin < 0)
+                return;
+
+        if (mctrl & TIOCM_RTS)
+                gpio_set_value(uart->rts_pin, 0);
+        else
+                gpio_set_value(uart->rts_pin, 1);
+#endif
+}
+
+/*
+ * Handle any change of modem status signal since we were last called.
+ */
+static void bfin_serial_mctrl_check(struct bfin_serial_port *uart)
+{
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+        unsigned int status;
+# ifdef CONFIG_SERIAL_BFIN_DMA
+        struct uart_info *info = uart->port.info;
+        struct tty_struct *tty = info->tty;
+
+        status = bfin_serial_get_mctrl(&uart->port);
+        if (!(status & TIOCM_CTS)) {
+                tty->hw_stopped = 1;
+        } else {
+                tty->hw_stopped = 0;
+        }
+# else
+        status = bfin_serial_get_mctrl(&uart->port);
+        uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
+        if (!(status & TIOCM_CTS))
+                schedule_work(&uart->cts_workqueue);
+# endif
+#endif
+}
+
+/*
+ * Interrupts are always disabled.
+ */
+static void bfin_serial_break_ctl(struct uart_port *port, int break_state)
+{
+}
+
+static int bfin_serial_startup(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+        dma_addr_t dma_handle;
+
+        if (request_dma(uart->rx_dma_channel, "BFIN_UART_RX") < 0) {
+                printk(KERN_NOTICE "Unable to attach Blackfin UART RX DMA channel\n");
+                return -EBUSY;
+        }
+
+        if (request_dma(uart->tx_dma_channel, "BFIN_UART_TX") < 0) {
+                printk(KERN_NOTICE "Unable to attach Blackfin UART TX DMA channel\n");
+                free_dma(uart->rx_dma_channel);
+                return -EBUSY;
+        }
+
+        set_dma_callback(uart->rx_dma_channel, bfin_serial_dma_rx_int, uart);
+        set_dma_callback(uart->tx_dma_channel, bfin_serial_dma_tx_int, uart);
+
+        uart->rx_dma_buf.buf = (unsigned char *)dma_alloc_coherent(NULL, PAGE_SIZE, &dma_handle, GFP_DMA);
+        uart->rx_dma_buf.head = 0;
+        uart->rx_dma_buf.tail = 0;
+        uart->rx_dma_nrows = 0;
+
+        set_dma_config(uart->rx_dma_channel,
+                set_bfin_dma_config(DIR_WRITE, DMA_FLOW_AUTO,
+                                INTR_ON_ROW, DIMENSION_2D,
+                                DATA_SIZE_8));
+        set_dma_x_count(uart->rx_dma_channel, DMA_RX_XCOUNT);
+        set_dma_x_modify(uart->rx_dma_channel, 1);
+        set_dma_y_count(uart->rx_dma_channel, DMA_RX_YCOUNT);
+        set_dma_y_modify(uart->rx_dma_channel, 1);
+        set_dma_start_addr(uart->rx_dma_channel, (unsigned long)uart->rx_dma_buf.buf);
+        enable_dma(uart->rx_dma_channel);
+
+        uart->rx_dma_timer.data = (unsigned long)(uart);
+        uart->rx_dma_timer.function = (void *)bfin_serial_rx_dma_timeout;
+        uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES;
+        add_timer(&(uart->rx_dma_timer));
+#else
+        if (request_irq
+            (uart->port.irq, bfin_serial_int, IRQF_DISABLED,
+             "BFIN_UART_RX", uart)) {
+                printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
+                return -EBUSY;
+        }
+
+        if (request_irq
+            (uart->port.irq+1, bfin_serial_int, IRQF_DISABLED,
+             "BFIN_UART_TX", uart)) {
+                printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
+                free_irq(uart->port.irq, uart);
+                return -EBUSY;
+        }
+#endif
+        UART_PUT_IER(uart, UART_GET_IER(uart) | ERBFI);
+        return 0;
+}
+
+static void bfin_serial_shutdown(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+#ifdef CONFIG_SERIAL_BFIN_DMA
+        disable_dma(uart->tx_dma_channel);
+        free_dma(uart->tx_dma_channel);
+        disable_dma(uart->rx_dma_channel);
+        free_dma(uart->rx_dma_channel);
+        del_timer(&(uart->rx_dma_timer));
+#else
+        free_irq(uart->port.irq, uart);
+        free_irq(uart->port.irq+1, uart);
+#endif
+}
+
+static void
+bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
+                   struct ktermios *old)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        unsigned long flags;
+        unsigned int baud, quot;
+        unsigned short val, ier, lsr, lcr = 0;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS8:
+                lcr = WLS(8);
+                break;
+        case CS7:
+                lcr = WLS(7);
+                break;
+        case CS6:
+                lcr = WLS(6);
+                break;
+        case CS5:
+                lcr = WLS(5);
+                break;
+        default:
+                printk(KERN_ERR "%s: word lengh not supported\n",
+                        __FUNCTION__);
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                lcr |= STB;
+        if (termios->c_cflag & PARENB) {
+                lcr |= PEN;
+                if (!(termios->c_cflag & PARODD))
+                        lcr |= EPS;
+        }
+
+        /* These controls are not implemented for this port */
+        termios->c_iflag |= INPCK | BRKINT | PARMRK;
+        termios->c_iflag &= ~(IGNPAR | IGNBRK);
+
+        /* These controls are not implemented for this port */
+        termios->c_iflag |= INPCK | BRKINT | PARMRK;
+        termios->c_iflag &= ~(IGNPAR | IGNBRK);
+
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+        spin_lock_irqsave(&uart->port.lock, flags);
+
+        do {
+                lsr = UART_GET_LSR(uart);
+        } while (!(lsr & TEMT));
+
+        /* Disable UART */
+        ier = UART_GET_IER(uart);
+        UART_PUT_IER(uart, 0);
+
+        /* Set DLAB in LCR to Access DLL and DLH */
+        val = UART_GET_LCR(uart);
+        val |= DLAB;
+        UART_PUT_LCR(uart, val);
+        SSYNC();
+
+        UART_PUT_DLL(uart, quot & 0xFF);
+        SSYNC();
+        UART_PUT_DLH(uart, (quot >> 8) & 0xFF);
+        SSYNC();
+
+        /* Clear DLAB in LCR to Access THR RBR IER */
+        val = UART_GET_LCR(uart);
+        val &= ~DLAB;
+        UART_PUT_LCR(uart, val);
+        SSYNC();
+
+        UART_PUT_LCR(uart, lcr);
+
+        /* Enable UART */
+        UART_PUT_IER(uart, ier);
+
+        val = UART_GET_GCTL(uart);
+        val |= UCEN;
+        UART_PUT_GCTL(uart, val);
+
+        spin_unlock_irqrestore(&uart->port.lock, flags);
+}
+
+static const char *bfin_serial_type(struct uart_port *port)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+        return uart->port.type == PORT_BFIN ? "BFIN-UART" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'.
+ */
+static void bfin_serial_release_port(struct uart_port *port)
+{
+}
+
+/*
+ * Request the memory region(s) being used by 'port'.
+ */
+static int bfin_serial_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void bfin_serial_config_port(struct uart_port *port, int flags)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+
+        if (flags & UART_CONFIG_TYPE &&
+            bfin_serial_request_port(&uart->port) == 0)
+                uart->port.type = PORT_BFIN;
+}
+
+/*
+ * Verify the new serial_struct (for TIOCSSERIAL).
+ * The only change we allow are to the flags and type, and
+ * even then only between PORT_BFIN and PORT_UNKNOWN
+ */
+static int
+bfin_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return 0;
+}
+
+static struct uart_ops bfin_serial_pops = {
+        .tx_empty       = bfin_serial_tx_empty,
+        .set_mctrl      = bfin_serial_set_mctrl,
+        .get_mctrl      = bfin_serial_get_mctrl,
+        .stop_tx        = bfin_serial_stop_tx,
+        .start_tx       = bfin_serial_start_tx,
+        .stop_rx        = bfin_serial_stop_rx,
+        .enable_ms      = bfin_serial_enable_ms,
+        .break_ctl      = bfin_serial_break_ctl,
+        .startup        = bfin_serial_startup,
+        .shutdown       = bfin_serial_shutdown,
+        .set_termios    = bfin_serial_set_termios,
+        .type           = bfin_serial_type,
+        .release_port   = bfin_serial_release_port,
+        .request_port   = bfin_serial_request_port,
+        .config_port    = bfin_serial_config_port,
+        .verify_port    = bfin_serial_verify_port,
+};
+
+static void __init bfin_serial_init_ports(void)
+{
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0; i < nr_ports; i++) {
+                bfin_serial_ports[i].port.uartclk   = get_sclk();
+                bfin_serial_ports[i].port.ops       = &bfin_serial_pops;
+                bfin_serial_ports[i].port.line      = i;
+                bfin_serial_ports[i].port.iotype    = UPIO_MEM;
+                bfin_serial_ports[i].port.membase   =
+                        (void __iomem *)bfin_serial_resource[i].uart_base_addr;
+                bfin_serial_ports[i].port.mapbase   =
+                        bfin_serial_resource[i].uart_base_addr;
+                bfin_serial_ports[i].port.irq       =
+                        bfin_serial_resource[i].uart_irq;
+                bfin_serial_ports[i].port.flags     = UPF_BOOT_AUTOCONF;
+#ifdef CONFIG_SERIAL_BFIN_DMA
+                bfin_serial_ports[i].tx_done        = 1;
+                bfin_serial_ports[i].tx_count       = 0;
+                bfin_serial_ports[i].tx_dma_channel =
+                        bfin_serial_resource[i].uart_tx_dma_channel;
+                bfin_serial_ports[i].rx_dma_channel =
+                        bfin_serial_resource[i].uart_rx_dma_channel;
+                init_timer(&(bfin_serial_ports[i].rx_dma_timer));
+#else
+                INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work);
+#endif
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+                bfin_serial_ports[i].cts_pin        =
+                        bfin_serial_resource[i].uart_cts_pin;
+                bfin_serial_ports[i].rts_pin        =
+                        bfin_serial_resource[i].uart_rts_pin;
+#endif
+                bfin_serial_hw_init(&bfin_serial_ports[i]);
+
+        }
+}
+
+#ifdef CONFIG_SERIAL_BFIN_CONSOLE
+static void bfin_serial_console_putchar(struct uart_port *port, int ch)
+{
+        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+        while (!(UART_GET_LSR(uart)))
+                barrier();
+        UART_PUT_CHAR(uart, ch);
+        SSYNC();
+}
+
+/*
+ * Interrupts are disabled on entering
+ */
+static void
+bfin_serial_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct bfin_serial_port *uart = &bfin_serial_ports[co->index];
+        int flags = 0;
+
+        spin_lock_irqsave(&uart->port.lock, flags);
+        uart_console_write(&uart->port, s, count, bfin_serial_console_putchar);
+        spin_unlock_irqrestore(&uart->port.lock, flags);
+
+}
+
+/*
+ * If the port was already initialised (eg, by a boot loader),
+ * try to determine the current setup.
+ */
+static void __init
+bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud,
+                           int *parity, int *bits)
+{
+        unsigned short status;
+
+        status = UART_GET_IER(uart) & (ERBFI | ETBEI);
+        if (status == (ERBFI | ETBEI)) {
+                /* ok, the port was enabled */
+                unsigned short lcr, val;
+                unsigned short dlh, dll;
+
+                lcr = UART_GET_LCR(uart);
+
+                *parity = 'n';
+                if (lcr & PEN) {
+                        if (lcr & EPS)
+                                *parity = 'e';
+                        else
+                                *parity = 'o';
+                }
+                switch (lcr & 0x03) {
+                        case 0: *bits = 5; break;
+                        case 1: *bits = 6; break;
+                        case 2: *bits = 7; break;
+                        case 3: *bits = 8; break;
+                }
+                /* Set DLAB in LCR to Access DLL and DLH */
+                val = UART_GET_LCR(uart);
+                val |= DLAB;
+                UART_PUT_LCR(uart, val);
+
+                dll = UART_GET_DLL(uart);
+                dlh = UART_GET_DLH(uart);
+
+                /* Clear DLAB in LCR to Access THR RBR IER */
+                val = UART_GET_LCR(uart);
+                val &= ~DLAB;
+                UART_PUT_LCR(uart, val);
+
+                *baud = get_sclk() / (16*(dll | dlh << 8));
+        }
+        pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __FUNCTION__, *baud, *parity, *bits);
+}
+
+static int __init
+bfin_serial_console_setup(struct console *co, char *options)
+{
+        struct bfin_serial_port *uart;
+        int baud = 57600;
+        int bits = 8;
+        int parity = 'n';
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+        int flow = 'r';
+#else
+        int flow = 'n';
+#endif
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index == -1 || co->index >= nr_ports)
+                co->index = 0;
+        uart = &bfin_serial_ports[co->index];
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                bfin_serial_console_get_options(uart, &baud, &parity, &bits);
+
+        return uart_set_options(&uart->port, co, baud, parity, bits, flow);
+}
+
+static struct uart_driver bfin_serial_reg;
+static struct console bfin_serial_console = {
+        .name           = BFIN_SERIAL_NAME,
+        .write          = bfin_serial_console_write,
+        .device         = uart_console_device,
+        .setup          = bfin_serial_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &bfin_serial_reg,
+};
+
+static int __init bfin_serial_rs_console_init(void)
+{
+        bfin_serial_init_ports();
+        register_console(&bfin_serial_console);
+        return 0;
+}
+console_initcall(bfin_serial_rs_console_init);
+
+#define BFIN_SERIAL_CONSOLE     &bfin_serial_console
+#else
+#define BFIN_SERIAL_CONSOLE     NULL
+#endif
+
+static struct uart_driver bfin_serial_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "bfin-uart",
+        .dev_name               = BFIN_SERIAL_NAME,
+        .major                  = BFIN_SERIAL_MAJOR,
+        .minor                  = BFIN_SERIAL_MINOR,
+        .nr                     = NR_PORTS,
+        .cons                   = BFIN_SERIAL_CONSOLE,
+};
+
+static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct bfin_serial_port *uart = platform_get_drvdata(dev);
+
+        if (uart)
+                uart_suspend_port(&bfin_serial_reg, &uart->port);
+
+        return 0;
+}
+
+static int bfin_serial_resume(struct platform_device *dev)
+{
+        struct bfin_serial_port *uart = platform_get_drvdata(dev);
+
+        if (uart)
+                uart_resume_port(&bfin_serial_reg, &uart->port);
+
+        return 0;
+}
+
+static int bfin_serial_probe(struct platform_device *dev)
+{
+        struct resource *res = dev->resource;
+        int i;
+
+        for (i = 0; i < dev->num_resources; i++, res++)
+                if (res->flags & IORESOURCE_MEM)
+                        break;
+
+        if (i < dev->num_resources) {
+                for (i = 0; i < nr_ports; i++, res++) {
+                        if (bfin_serial_ports[i].port.mapbase != res->start)
+                                continue;
+                        bfin_serial_ports[i].port.dev = &dev->dev;
+                        uart_add_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+                        platform_set_drvdata(dev, &bfin_serial_ports[i]);
+                }
+        }
+
+        return 0;
+}
+
+static int bfin_serial_remove(struct platform_device *pdev)
+{
+        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
+
+
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+        gpio_free(uart->cts_pin);
+        gpio_free(uart->rts_pin);
+#endif
+
+        platform_set_drvdata(pdev, NULL);
+
+        if (uart)
+                uart_remove_one_port(&bfin_serial_reg, &uart->port);
+
+        return 0;
+}
+
+static struct platform_driver bfin_serial_driver = {
+        .probe          = bfin_serial_probe,
+        .remove         = bfin_serial_remove,
+        .suspend        = bfin_serial_suspend,
+        .resume         = bfin_serial_resume,
+        .driver         = {
+                .name   = "bfin-uart",
+        },
+};
+
+static int __init bfin_serial_init(void)
+{
+        int ret;
+
+        pr_info("Serial: Blackfin serial driver\n");
+
+        bfin_serial_init_ports();
+
+        ret = uart_register_driver(&bfin_serial_reg);
+        if (ret == 0) {
+                ret = platform_driver_register(&bfin_serial_driver);
+                if (ret) {
+                        pr_debug("uart register failed\n");
+                        uart_unregister_driver(&bfin_serial_reg);
+                }
+        }
+        return ret;
+}
+
+static void __exit bfin_serial_exit(void)
+{
+        platform_driver_unregister(&bfin_serial_driver);
+        uart_unregister_driver(&bfin_serial_reg);
+}
+
+module_init(bfin_serial_init);
+module_exit(bfin_serial_exit);
+
+MODULE_AUTHOR("Aubrey.Li <aubrey.li@analog.com>");
+MODULE_DESCRIPTION("Blackfin generic serial port driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV_MAJOR(BFIN_SERIAL_MAJOR);
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
deleted file mode 100644
index 4a23340663aa..000000000000
--- a/drivers/serial/crisv10.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * serial.h: Arch-dep definitions for the Etrax100 serial driver.
- *
- * Copyright (C) 1998, 1999, 2000 Axis Communications AB
- */
-
-#ifndef _ETRAX_SERIAL_H
-#define _ETRAX_SERIAL_H
-
-#include <linux/circ_buf.h>
-#include <asm/termios.h>
-
-/* Software state per channel */
-
-#ifdef __KERNEL__
-/*
- * This is our internal structure for each serial port's state.
- *
- * Many fields are paralleled by the structure used by the serial_struct
- * structure.
- *
- * For definitions of the flags field, see tty.h
- */
-
-#define SERIAL_RECV_DESCRIPTORS 8
-
-struct etrax_recv_buffer {
-        struct etrax_recv_buffer *next;
-        unsigned short length;
-        unsigned char error;
-        unsigned char pad;
-
-        unsigned char buffer[0];
-};
-
-struct e100_serial {
-        int                     baud;
-        volatile u8             *port; /* R_SERIALx_CTRL */
-        u32                     irq;  /* bitnr in R_IRQ_MASK2 for dmaX_descr */
-
-        /* Output registers */
-        volatile u8             *oclrintradr; /* adr to R_DMA_CHx_CLR_INTR */
-        volatile u32            *ofirstadr;   /* adr to R_DMA_CHx_FIRST */
-        volatile u8             *ocmdadr;     /* adr to R_DMA_CHx_CMD */
-        const volatile u8       *ostatusadr;  /* adr to R_DMA_CHx_STATUS */
-
-        /* Input registers */
-        volatile u8             *iclrintradr; /* adr to R_DMA_CHx_CLR_INTR */
-        volatile u32            *ifirstadr;   /* adr to R_DMA_CHx_FIRST */
-        volatile u8             *icmdadr;     /* adr to R_DMA_CHx_CMD */
-        volatile u32            *idescradr;   /* adr to R_DMA_CHx_DESCR */
-
-        int                     flags;  /* defined in tty.h */
-
-        u8                      rx_ctrl; /* shadow for R_SERIALx_REC_CTRL */
-        u8                      tx_ctrl; /* shadow for R_SERIALx_TR_CTRL */
-        u8                      iseteop; /* bit number for R_SET_EOP for the input dma */
-        int                     enabled; /* Set to 1 if the port is enabled in HW config */
-
-        u8              dma_out_enabled:1; /* Set to 1 if DMA should be used */
-        u8              dma_in_enabled:1;  /* Set to 1 if DMA should be used */
-
-        /* end of fields defined in rs_table[] in .c-file */
-        u8              uses_dma_in;  /* Set to 1 if DMA is used */
-        u8              uses_dma_out; /* Set to 1 if DMA is used */
-        u8              forced_eop;   /* a fifo eop has been forced */
-        int                     baud_base;     /* For special baudrates */
-        int                     custom_divisor; /* For special baudrates */
-        struct etrax_dma_descr  tr_descr;
-        struct etrax_dma_descr  rec_descr[SERIAL_RECV_DESCRIPTORS];
-        int                     cur_rec_descr;
-
-        volatile int            tr_running; /* 1 if output is running */
-
-        struct tty_struct       *tty;
-        int                     read_status_mask;
-        int                     ignore_status_mask;
-        int                     x_char; /* xon/xoff character */
-        int                     close_delay;
-        unsigned short          closing_wait;
-        unsigned short          closing_wait2;
-        unsigned long           event;
-        unsigned long           last_active;
-        int                     line;
-        int                     type;  /* PORT_ETRAX */
-        int                     count;      /* # of fd on device */
-        int                     blocked_open; /* # of blocked opens */
-        struct circ_buf         xmit;
-        struct etrax_recv_buffer *first_recv_buffer;
-        struct etrax_recv_buffer *last_recv_buffer;
-        unsigned int            recv_cnt;
-        unsigned int            max_recv_cnt;
-
-        struct work_struct      work;
-        struct async_icount     icount;   /* error-statistics etc.*/
-        struct ktermios         normal_termios;
-        struct ktermios         callout_termios;
-#ifdef DECLARE_WAITQUEUE
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
-#else
-        struct wait_queue       *open_wait;
-        struct wait_queue       *close_wait;
-#endif
-
-        unsigned long           char_time_usec;       /* The time for 1 char, in usecs */
-        unsigned long           flush_time_usec;      /* How often we should flush */
-        unsigned long           last_tx_active_usec;  /* Last tx usec in the jiffies */
-        unsigned long           last_tx_active;       /* Last tx time in jiffies */
-        unsigned long           last_rx_active_usec;  /* Last rx usec in the jiffies */
-        unsigned long           last_rx_active;       /* Last rx time in jiffies */
-
-        int                     break_detected_cnt;
-        int                     errorcode;
-
-#ifdef CONFIG_ETRAX_RS485
-        struct rs485_control    rs485;  /* RS-485 support */
-#endif
-};
-
-/* this PORT is not in the standard serial.h. it's not actually used for
- * anything since we only have one type of async serial-port anyway in this
- * system.
- */
-
-#define PORT_ETRAX 1
-
-/*
- * Events are used to schedule things to happen at timer-interrupt
- * time, instead of at rs interrupt time.
- */
-#define RS_EVENT_WRITE_WAKEUP   0
-
-#endif /* __KERNEL__ */
-
-#endif /* !_ETRAX_SERIAL_H */
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 04cc88cc528c..e42faa4e4282 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -46,6 +46,122 @@
 #include <asm/hardware.h>
 #include <asm/arch/imx-uart.h>
 
+/* Register definitions */
+#define URXD0 0x0  /* Receiver Register */
+#define URTX0 0x40 /* Transmitter Register */
+#define UCR1  0x80 /* Control Register 1 */
+#define UCR2  0x84 /* Control Register 2 */
+#define UCR3  0x88 /* Control Register 3 */
+#define UCR4  0x8c /* Control Register 4 */
+#define UFCR  0x90 /* FIFO Control Register */
+#define USR1  0x94 /* Status Register 1 */
+#define USR2  0x98 /* Status Register 2 */
+#define UESC  0x9c /* Escape Character Register */
+#define UTIM  0xa0 /* Escape Timer Register */
+#define UBIR  0xa4 /* BRM Incremental Register */
+#define UBMR  0xa8 /* BRM Modulator Register */
+#define UBRC  0xac /* Baud Rate Count Register */
+#define BIPR1 0xb0 /* Incremental Preset Register 1 */
+#define BIPR2 0xb4 /* Incremental Preset Register 2 */
+#define BIPR3 0xb8 /* Incremental Preset Register 3 */
+#define BIPR4 0xbc /* Incremental Preset Register 4 */
+#define BMPR1 0xc0 /* BRM Modulator Register 1 */
+#define BMPR2 0xc4 /* BRM Modulator Register 2 */
+#define BMPR3 0xc8 /* BRM Modulator Register 3 */
+#define BMPR4 0xcc /* BRM Modulator Register 4 */
+#define UTS   0xd0 /* UART Test Register */
+
+/* UART Control Register Bit Fields.*/
+#define  URXD_CHARRDY    (1<<15)
+#define  URXD_ERR        (1<<14)
+#define  URXD_OVRRUN     (1<<13)
+#define  URXD_FRMERR     (1<<12)
+#define  URXD_BRK        (1<<11)
+#define  URXD_PRERR      (1<<10)
+#define  UCR1_ADEN       (1<<15) /* Auto dectect interrupt */
+#define  UCR1_ADBR       (1<<14) /* Auto detect baud rate */
+#define  UCR1_TRDYEN     (1<<13) /* Transmitter ready interrupt enable */
+#define  UCR1_IDEN       (1<<12) /* Idle condition interrupt */
+#define  UCR1_RRDYEN     (1<<9)  /* Recv ready interrupt enable */
+#define  UCR1_RDMAEN     (1<<8)  /* Recv ready DMA enable */
+#define  UCR1_IREN       (1<<7)  /* Infrared interface enable */
+#define  UCR1_TXMPTYEN   (1<<6)  /* Transimitter empty interrupt enable */
+#define  UCR1_RTSDEN     (1<<5)  /* RTS delta interrupt enable */
+#define  UCR1_SNDBRK     (1<<4)  /* Send break */
+#define  UCR1_TDMAEN     (1<<3)  /* Transmitter ready DMA enable */
+#define  UCR1_UARTCLKEN  (1<<2)  /* UART clock enabled */
+#define  UCR1_DOZE       (1<<1)  /* Doze */
+#define  UCR1_UARTEN     (1<<0)  /* UART enabled */
+#define  UCR2_ESCI       (1<<15) /* Escape seq interrupt enable */
+#define  UCR2_IRTS       (1<<14) /* Ignore RTS pin */
+#define  UCR2_CTSC       (1<<13) /* CTS pin control */
+#define  UCR2_CTS        (1<<12) /* Clear to send */
+#define  UCR2_ESCEN      (1<<11) /* Escape enable */
+#define  UCR2_PREN       (1<<8)  /* Parity enable */
+#define  UCR2_PROE       (1<<7)  /* Parity odd/even */
+#define  UCR2_STPB       (1<<6)  /* Stop */
+#define  UCR2_WS         (1<<5)  /* Word size */
+#define  UCR2_RTSEN      (1<<4)  /* Request to send interrupt enable */
+#define  UCR2_TXEN       (1<<2)  /* Transmitter enabled */
+#define  UCR2_RXEN       (1<<1)  /* Receiver enabled */
+#define  UCR2_SRST       (1<<0)  /* SW reset */
+#define  UCR3_DTREN      (1<<13) /* DTR interrupt enable */
+#define  UCR3_PARERREN   (1<<12) /* Parity enable */
+#define  UCR3_FRAERREN   (1<<11) /* Frame error interrupt enable */
+#define  UCR3_DSR        (1<<10) /* Data set ready */
+#define  UCR3_DCD        (1<<9)  /* Data carrier detect */
+#define  UCR3_RI         (1<<8)  /* Ring indicator */
+#define  UCR3_TIMEOUTEN  (1<<7)  /* Timeout interrupt enable */
+#define  UCR3_RXDSEN     (1<<6)  /* Receive status interrupt enable */
+#define  UCR3_AIRINTEN   (1<<5)  /* Async IR wake interrupt enable */
+#define  UCR3_AWAKEN     (1<<4)  /* Async wake interrupt enable */
+#define  UCR3_REF25      (1<<3)  /* Ref freq 25 MHz */
+#define  UCR3_REF30      (1<<2)  /* Ref Freq 30 MHz */
+#define  UCR3_INVT       (1<<1)  /* Inverted Infrared transmission */
+#define  UCR3_BPEN       (1<<0)  /* Preset registers enable */
+#define  UCR4_CTSTL_32   (32<<10) /* CTS trigger level (32 chars) */
+#define  UCR4_INVR       (1<<9)  /* Inverted infrared reception */
+#define  UCR4_ENIRI      (1<<8)  /* Serial infrared interrupt enable */
+#define  UCR4_WKEN       (1<<7)  /* Wake interrupt enable */
+#define  UCR4_REF16      (1<<6)  /* Ref freq 16 MHz */
+#define  UCR4_IRSC       (1<<5)  /* IR special case */
+#define  UCR4_TCEN       (1<<3)  /* Transmit complete interrupt enable */
+#define  UCR4_BKEN       (1<<2)  /* Break condition interrupt enable */
+#define  UCR4_OREN       (1<<1)  /* Receiver overrun interrupt enable */
+#define  UCR4_DREN       (1<<0)  /* Recv data ready interrupt enable */
+#define  UFCR_RXTL_SHF   0       /* Receiver trigger level shift */
+#define  UFCR_RFDIV      (7<<7)  /* Reference freq divider mask */
+#define  UFCR_TXTL_SHF   10      /* Transmitter trigger level shift */
+#define  USR1_PARITYERR  (1<<15) /* Parity error interrupt flag */
+#define  USR1_RTSS       (1<<14) /* RTS pin status */
+#define  USR1_TRDY       (1<<13) /* Transmitter ready interrupt/dma flag */
+#define  USR1_RTSD       (1<<12) /* RTS delta */
+#define  USR1_ESCF       (1<<11) /* Escape seq interrupt flag */
+#define  USR1_FRAMERR    (1<<10) /* Frame error interrupt flag */
+#define  USR1_RRDY       (1<<9)  /* Receiver ready interrupt/dma flag */
+#define  USR1_TIMEOUT    (1<<7)  /* Receive timeout interrupt status */
+#define  USR1_RXDS       (1<<6)  /* Receiver idle interrupt flag */
+#define  USR1_AIRINT     (1<<5)  /* Async IR wake interrupt flag */
+#define  USR1_AWAKE      (1<<4)  /* Aysnc wake interrupt flag */
+#define  USR2_ADET       (1<<15) /* Auto baud rate detect complete */
+#define  USR2_TXFE       (1<<14) /* Transmit buffer FIFO empty */
+#define  USR2_DTRF       (1<<13) /* DTR edge interrupt flag */
+#define  USR2_IDLE       (1<<12) /* Idle condition */
+#define  USR2_IRINT      (1<<8)  /* Serial infrared interrupt flag */
+#define  USR2_WAKE       (1<<7)  /* Wake */
+#define  USR2_RTSF       (1<<4)  /* RTS edge interrupt flag */
+#define  USR2_TXDC       (1<<3)  /* Transmitter complete */
+#define  USR2_BRCD       (1<<2)  /* Break condition */
+#define  USR2_ORE        (1<<1)  /* Overrun error */
+#define  USR2_RDR        (1<<0)  /* Recv data ready */
+#define  UTS_FRCPERR     (1<<13) /* Force parity error */
+#define  UTS_LOOP        (1<<12) /* Loop tx and rx */
+#define  UTS_TXEMPTY     (1<<6)  /* TxFIFO empty */
+#define  UTS_RXEMPTY     (1<<5)  /* RxFIFO empty */
+#define  UTS_TXFULL      (1<<4)  /* TxFIFO full */
+#define  UTS_RXFULL      (1<<3)  /* RxFIFO full */
+#define  UTS_SOFTRST     (1<<0)  /* Software reset */
+
 /* We've been assigned a range on the "Low-density serial ports" major */
 #define SERIAL_IMX_MAJOR        204
 #define MINOR_START             41
@@ -128,7 +244,10 @@ static void imx_timeout(unsigned long data)
 static void imx_stop_tx(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
-        UCR1((u32)sport->port.membase) &= ~UCR1_TXMPTYEN;
+        unsigned long temp;
+
+        temp = readl(sport->port.membase + UCR1);
+        writel(temp & ~UCR1_TXMPTYEN, sport->port.membase + UCR1);
 }
 
 /*
@@ -137,7 +256,10 @@ static void imx_stop_tx(struct uart_port *port)
 static void imx_stop_rx(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
-        UCR2((u32)sport->port.membase) &= ~UCR2_RXEN;
+        unsigned long temp;
+
+        temp = readl(sport->port.membase + UCR2);
+        writel(temp &~ UCR2_RXEN, sport->port.membase + UCR2);
 }
 
 /*
@@ -154,10 +276,10 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
 {
         struct circ_buf *xmit = &sport->port.info->xmit;
 
-        while (!(UTS((u32)sport->port.membase) & UTS_TXFULL)) {
+        while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
                 /* send xmit->buf[xmit->tail]
                  * out the port here */
-                URTX0((u32)sport->port.membase) = xmit->buf[xmit->tail];
+                writel(xmit->buf[xmit->tail], sport->port.membase + URTX0);
                 xmit->tail = (xmit->tail + 1) &
                          (UART_XMIT_SIZE - 1);
                 sport->port.icount.tx++;
@@ -175,21 +297,24 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
 static void imx_start_tx(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
+        unsigned long temp;
 
-        UCR1((u32)sport->port.membase) |= UCR1_TXMPTYEN;
+        temp = readl(sport->port.membase + UCR1);
+        writel(temp | UCR1_TXMPTYEN, sport->port.membase + UCR1);
 
-        imx_transmit_buffer(sport);
+        if (readl(sport->port.membase + UTS) & UTS_TXEMPTY)
+                imx_transmit_buffer(sport);
 }
 
 static irqreturn_t imx_rtsint(int irq, void *dev_id)
 {
         struct imx_port *sport = (struct imx_port *)dev_id;
-        unsigned int val = USR1((u32)sport->port.membase)&USR1_RTSS;
+        unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
         unsigned long flags;
 
         spin_lock_irqsave(&sport->port.lock, flags);
 
-        USR1((u32)sport->port.membase) = USR1_RTSD;
+        writel(USR1_RTSD, sport->port.membase + USR1);
         uart_handle_cts_change(&sport->port, !!val);
         wake_up_interruptible(&sport->port.info->delta_msr_wait);
 
@@ -207,7 +332,7 @@ static irqreturn_t imx_txint(int irq, void *dev_id)
         if (sport->port.x_char)
         {
                 /* Send next char */
-                URTX0((u32)sport->port.membase) = sport->port.x_char;
+                writel(sport->port.x_char, sport->port.membase + URTX0);
                 goto out;
         }
 
@@ -231,17 +356,18 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
         struct imx_port *sport = dev_id;
         unsigned int rx,flg,ignored = 0;
         struct tty_struct *tty = sport->port.info->tty;
-        unsigned long flags;
+        unsigned long flags, temp;
 
-        rx = URXD0((u32)sport->port.membase);
+        rx = readl(sport->port.membase + URXD0);
         spin_lock_irqsave(&sport->port.lock,flags);
 
         do {
                 flg = TTY_NORMAL;
                 sport->port.icount.rx++;
 
-                if( USR2((u32)sport->port.membase) & USR2_BRCD ) {
-                        USR2((u32)sport->port.membase) |= USR2_BRCD;
+                temp = readl(sport->port.membase + USR2);
+                if( temp & USR2_BRCD ) {
+                        writel(temp | USR2_BRCD, sport->port.membase + USR2);
                         if(uart_handle_break(&sport->port))
                                 goto ignore_char;
                 }
@@ -257,7 +383,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
                 tty_insert_flip_char(tty, rx, flg);
 
         ignore_char:
-                rx = URXD0((u32)sport->port.membase);
+                rx = readl(sport->port.membase + URXD0);
         } while(rx & URXD_CHARRDY);
 
 out:
@@ -301,7 +427,7 @@ static unsigned int imx_tx_empty(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
 
-        return USR2((u32)sport->port.membase) & USR2_TXDC ?  TIOCSER_TEMT : 0;
+        return (readl(sport->port.membase + USR2) & USR2_TXDC) ?  TIOCSER_TEMT : 0;
 }
 
 /*
@@ -312,10 +438,10 @@ static unsigned int imx_get_mctrl(struct uart_port *port)
         struct imx_port *sport = (struct imx_port *)port;
         unsigned int tmp = TIOCM_DSR | TIOCM_CAR;
 
-        if (USR1((u32)sport->port.membase) & USR1_RTSS)
+        if (readl(sport->port.membase + USR1) & USR1_RTSS)
                 tmp |= TIOCM_CTS;
 
-        if (UCR2((u32)sport->port.membase) & UCR2_CTS)
+        if (readl(sport->port.membase + UCR2) & UCR2_CTS)
                 tmp |= TIOCM_RTS;
 
         return tmp;
@@ -324,11 +450,14 @@ static unsigned int imx_get_mctrl(struct uart_port *port)
 static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
         struct imx_port *sport = (struct imx_port *)port;
+        unsigned long temp;
+
+        temp = readl(sport->port.membase + UCR2) & ~UCR2_CTS;
 
         if (mctrl & TIOCM_RTS)
-                UCR2((u32)sport->port.membase) |= UCR2_CTS;
-        else
-                UCR2((u32)sport->port.membase) &= ~UCR2_CTS;
+                temp |= UCR2_CTS;
+
+        writel(temp, sport->port.membase + UCR2);
 }
 
 /*
@@ -337,14 +466,16 @@ static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static void imx_break_ctl(struct uart_port *port, int break_state)
 {
         struct imx_port *sport = (struct imx_port *)port;
-        unsigned long flags;
+        unsigned long flags, temp;
 
         spin_lock_irqsave(&sport->port.lock, flags);
 
+        temp = readl(sport->port.membase + UCR1) & ~UCR1_SNDBRK;
+
         if ( break_state != 0 )
-                UCR1((u32)sport->port.membase) |= UCR1_SNDBRK;
-        else
-                UCR1((u32)sport->port.membase) &= ~UCR1_SNDBRK;
+                temp |= UCR1_SNDBRK;
+
+        writel(temp, sport->port.membase + UCR1);
 
         spin_unlock_irqrestore(&sport->port.lock, flags);
 }
@@ -360,7 +491,7 @@ static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
         /* set receiver / transmitter trigger level.
          * RFDIV is set such way to satisfy requested uartclk value
          */
-        val = TXTL<<10 | RXTL;
+        val = TXTL << 10 | RXTL;
         ufcr_rfdiv = (imx_get_perclk1() + sport->port.uartclk / 2) / sport->port.uartclk;
 
         if(!ufcr_rfdiv)
@@ -373,7 +504,7 @@ static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
 
         val |= UFCR_RFDIV & (ufcr_rfdiv << 7);
 
-        UFCR((u32)sport->port.membase) = val;
+        writel(val, sport->port.membase + UFCR);
 
         return 0;
 }
@@ -382,14 +513,15 @@ static int imx_startup(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
         int retval;
-        unsigned long flags;
+        unsigned long flags, temp;
 
         imx_setup_ufcr(sport, 0);
 
         /* disable the DREN bit (Data Ready interrupt enable) before
          * requesting IRQs
          */
-        UCR4((u32)sport->port.membase) &= ~UCR4_DREN;
+        temp = readl(sport->port.membase + UCR4);
+        writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
         /*
          * Allocate the IRQ
@@ -411,12 +543,16 @@ static int imx_startup(struct uart_port *port)
         /*
          * Finally, clear and enable interrupts
          */
+        writel(USR1_RTSD, sport->port.membase + USR1);
+
+        temp = readl(sport->port.membase + UCR1);
+        temp |= (UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+        writel(temp, sport->port.membase + UCR1);
 
-        USR1((u32)sport->port.membase) = USR1_RTSD;
-        UCR1((u32)sport->port.membase) |=
-                         (UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+        temp = readl(sport->port.membase + UCR2);
+        temp |= (UCR2_RXEN | UCR2_TXEN);
+        writel(temp, sport->port.membase + UCR2);
 
-        UCR2((u32)sport->port.membase) |= (UCR2_RXEN | UCR2_TXEN);
         /*
          * Enable modem status interrupts
          */
@@ -437,6 +573,7 @@ error_out1:
 static void imx_shutdown(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
+        unsigned long temp;
 
         /*
          * Stop our timer.
@@ -454,8 +591,9 @@ static void imx_shutdown(struct uart_port *port)
          * Disable all interrupts, port and break condition.
          */
 
-        UCR1((u32)sport->port.membase) &=
-                         ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+        temp = readl(sport->port.membase + UCR1);
+        temp &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+        writel(temp, sport->port.membase + UCR1);
 }
 
 static void
@@ -548,18 +686,18 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
         /*
          * disable interrupts and drain transmitter
          */
-        old_ucr1 = UCR1((u32)sport->port.membase);
-        UCR1((u32)sport->port.membase) &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN);
+        old_ucr1 = readl(sport->port.membase + UCR1);
+        writel(old_ucr1 & ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN),
+                        sport->port.membase + UCR1);
 
-        while ( !(USR2((u32)sport->port.membase) & USR2_TXDC))
+        while ( !(readl(sport->port.membase + USR2) & USR2_TXDC))
                 barrier();
 
         /* then, disable everything */
-        old_txrxen = UCR2((u32)sport->port.membase) & ( UCR2_TXEN | UCR2_RXEN );
-        UCR2((u32)sport->port.membase) &= ~( UCR2_TXEN | UCR2_RXEN);
-
-        /* set the parity, stop bits and data size */
-        UCR2((u32)sport->port.membase) = ucr2;
+        old_txrxen = readl(sport->port.membase + UCR2);
+        writel(old_txrxen & ~( UCR2_TXEN | UCR2_RXEN),
+                        sport->port.membase + UCR2);
+        old_txrxen &= (UCR2_TXEN | UCR2_RXEN);
 
         /* set the baud rate. We assume uartclk = 16 MHz
          *
@@ -567,11 +705,13 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
          * --------- = --------
          *  uartclk    UBMR - 1
          */
-        UBIR((u32)sport->port.membase) = (baud / 100) - 1;
-        UBMR((u32)sport->port.membase) = 10000 - 1;
+        writel((baud / 100) - 1, sport->port.membase + UBIR);
+        writel(10000 - 1, sport->port.membase + UBMR);
+
+        writel(old_ucr1, sport->port.membase + UCR1);
 
-        UCR1((u32)sport->port.membase) = old_ucr1;
-        UCR2((u32)sport->port.membase) |= old_txrxen;
+        /* set the parity, stop bits and data size */
+        writel(ucr2 | old_txrxen, sport->port.membase + UCR2);
 
         if (UART_ENABLE_MS(&sport->port, termios->c_cflag))
                 imx_enable_ms(&sport->port);
@@ -730,9 +870,11 @@ static void __init imx_init_ports(void)
 static void imx_console_putchar(struct uart_port *port, int ch)
 {
         struct imx_port *sport = (struct imx_port *)port;
-        while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
+
+        while (readl(sport->port.membase + UTS) & UTS_TXFULL)
                 barrier();
-        URTX0((u32)sport->port.membase) = ch;
+
+        writel(ch, sport->port.membase + URTX0);
 }
 
 /*
@@ -747,13 +889,14 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
         /*
          *      First, save UCR1/2 and then disable interrupts
          */
-        old_ucr1 = UCR1((u32)sport->port.membase);
-        old_ucr2 = UCR2((u32)sport->port.membase);
+        old_ucr1 = readl(sport->port.membase + UCR1);
+        old_ucr2 = readl(sport->port.membase + UCR2);
 
-        UCR1((u32)sport->port.membase) =
-                           (old_ucr1 | UCR1_UARTCLKEN | UCR1_UARTEN)
-                           & ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN);
-        UCR2((u32)sport->port.membase) = old_ucr2 | UCR2_TXEN;
+        writel((old_ucr1 | UCR1_UARTCLKEN | UCR1_UARTEN) &
+                ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN),
+                sport->port.membase + UCR1);
+
+        writel(old_ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
 
         uart_console_write(&sport->port, s, count, imx_console_putchar);
 
@@ -761,10 +904,10 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
          *      Finally, wait for transmitter to become empty
          *      and restore UCR1/2
          */
-        while (!(USR2((u32)sport->port.membase) & USR2_TXDC));
+        while (!(readl(sport->port.membase + USR2) & USR2_TXDC));
 
-        UCR1((u32)sport->port.membase) = old_ucr1;
-        UCR2((u32)sport->port.membase) = old_ucr2;
+        writel(old_ucr1, sport->port.membase + UCR1);
+        writel(old_ucr2, sport->port.membase + UCR2);
 }
 
 /*
@@ -776,13 +919,13 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                            int *parity, int *bits)
 {
 
-        if ( UCR1((u32)sport->port.membase) | UCR1_UARTEN ) {
+        if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
                 /* ok, the port was enabled */
                 unsigned int ucr2, ubir,ubmr, uartclk;
                 unsigned int baud_raw;
                 unsigned int ucfr_rfdiv;
 
-                ucr2 = UCR2((u32)sport->port.membase);
+                ucr2 = readl(sport->port.membase + UCR2);
 
                 *parity = 'n';
                 if (ucr2 & UCR2_PREN) {
@@ -797,11 +940,10 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                 else
                         *bits = 7;
 
-                ubir = UBIR((u32)sport->port.membase) & 0xffff;
-                ubmr = UBMR((u32)sport->port.membase) & 0xffff;
-
+                ubir = readl(sport->port.membase + UBIR) & 0xffff;
+                ubmr = readl(sport->port.membase + UBMR) & 0xffff;
 
-                ucfr_rfdiv = (UFCR((u32)sport->port.membase) & UFCR_RFDIV) >> 7;
+                ucfr_rfdiv = (readl(sport->port.membase + UFCR) & UFCR_RFDIV) >> 7;
                 if (ucfr_rfdiv == 6)
                         ucfr_rfdiv = 7;
                 else
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 3d2fcc57b1ce..d09f2097d5b0 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -183,6 +183,7 @@ struct mpsc_port_info {
         u8 *txb_p;              /* Phys addr of txb */
         int txr_head;           /* Where new data goes */
         int txr_tail;           /* Where sent data comes off */
+        spinlock_t tx_lock;     /* transmit lock */
 
         /* Mirrored values of regs we can't read (if 'mirror_regs' set) */
         u32 MPSC_MPCR_m;
@@ -1212,6 +1213,9 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
 {
         struct mpsc_tx_desc *txre;
         int rc = 0;
+        unsigned long iflags;
+
+        spin_lock_irqsave(&pi->tx_lock, iflags);
 
         if (!mpsc_sdma_tx_active(pi)) {
                 txre = (struct mpsc_tx_desc *)(pi->txr +
@@ -1248,6 +1252,7 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
                 mpsc_sdma_start_tx(pi); /* start next desc if ready */
         }
 
+        spin_unlock_irqrestore(&pi->tx_lock, iflags);
         return rc;
 }
 
@@ -1338,11 +1343,16 @@ static void
 mpsc_start_tx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        unsigned long iflags;
+
+        spin_lock_irqsave(&pi->tx_lock, iflags);
 
         mpsc_unfreeze(pi);
         mpsc_copy_tx_data(pi);
         mpsc_sdma_start_tx(pi);
 
+        spin_unlock_irqrestore(&pi->tx_lock, iflags);
+
         pr_debug("mpsc_start_tx[%d]\n", port->line);
         return;
 }
@@ -1625,6 +1635,16 @@ mpsc_console_write(struct console *co, const char *s, uint count)
         struct mpsc_port_info *pi = &mpsc_ports[co->index];
         u8 *bp, *dp, add_cr = 0;
         int i;
+        unsigned long iflags;
+
+        spin_lock_irqsave(&pi->tx_lock, iflags);
+
+        while (pi->txr_head != pi->txr_tail) {
+                while (mpsc_sdma_tx_active(pi))
+                        udelay(100);
+                mpsc_sdma_intr_ack(pi);
+                mpsc_tx_intr(pi);
+        }
 
         while (mpsc_sdma_tx_active(pi))
                 udelay(100);
@@ -1668,6 +1688,7 @@ mpsc_console_write(struct console *co, const char *s, uint count)
                 pi->txr_tail = (pi->txr_tail + 1) & (MPSC_TXR_ENTRIES - 1);
         }
 
+        spin_unlock_irqrestore(&pi->tx_lock, iflags);
         return;
 }
 
@@ -2005,7 +2026,8 @@ mpsc_drv_probe(struct platform_device *dev)
                 if (!(rc = mpsc_drv_map_regs(pi, dev))) {
                         mpsc_drv_get_platform_data(pi, dev, dev->id);
 
-                        if (!(rc = mpsc_make_ready(pi)))
+                        if (!(rc = mpsc_make_ready(pi))) {
+                                spin_lock_init(&pi->tx_lock);
                                 if (!(rc = uart_add_one_port(&mpsc_reg,
                                         &pi->port)))
                                         rc = 0;
@@ -2014,6 +2036,7 @@ mpsc_drv_probe(struct platform_device *dev)
                                                 (struct uart_port *)pi);
                                         mpsc_drv_unmap_regs(pi);
                                 }
+                        }
                         else
                                 mpsc_drv_unmap_regs(pi);
                 }
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index e7928fee833a..7ffdaeaf0545 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -48,7 +48,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
         port->iotype = UPIO_MEM;
         port->type = type;
         port->uartclk = *clk;
-        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP;
+        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
+                | UPF_FIXED_PORT;
         port->dev = &ofdev->dev;
         port->custom_divisor = *clk / (16 * (*spd));
 
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index d403aaa55092..e9c6cb391a23 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -717,7 +717,7 @@ struct uart_ops serial_pxa_pops = {
 static struct uart_pxa_port serial_pxa_ports[] = {
      {  /* FFUART */
         .name   = "FFUART",
-        .cken   = CKEN6_FFUART,
+        .cken   = CKEN_FFUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -731,7 +731,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* BTUART */
         .name   = "BTUART",
-        .cken   = CKEN7_BTUART,
+        .cken   = CKEN_BTUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -745,7 +745,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* STUART */
         .name   = "STUART",
-        .cken   = CKEN5_STUART,
+        .cken   = CKEN_STUART,
         .port   = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
@@ -759,7 +759,7 @@ static struct uart_pxa_port serial_pxa_ports[] = {
         },
   }, {  /* HWUART */
         .name   = "HWUART",
-        .cken   = CKEN4_HWUART,
+        .cken   = CKEN_HWUART,
         .port = {
                 .type           = PORT_PXA,
                 .iotype         = UPIO_MEM,
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0422c0f1f852..326020f86f75 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,13 +37,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#undef  DEBUG
-#ifdef DEBUG
-#define DPRINTK(x...)   printk(x)
-#else
-#define DPRINTK(x...)   do { } while (0)
-#endif
-
 /*
  * This is used to lock changes in serial line configuration.
  */
@@ -552,7 +545,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
                 return;
         }
 
-        DPRINTK("uart_flush_buffer(%d) called\n", tty->index);
+        pr_debug("uart_flush_buffer(%d) called\n", tty->index);
 
         spin_lock_irqsave(&port->lock, flags);
         uart_circ_clear(&state->info->xmit);
@@ -672,19 +665,21 @@ static int uart_set_info(struct uart_state *state,
          */
         mutex_lock(&state->mutex);
 
-        change_irq  = new_serial.irq != port->irq;
+        change_irq  = !(port->flags & UPF_FIXED_PORT)
+                && new_serial.irq != port->irq;
 
         /*
          * Since changing the 'type' of the port changes its resource
          * allocations, we should treat type changes the same as
          * IO port changes.
          */
-        change_port = new_port != port->iobase ||
-                      (unsigned long)new_serial.iomem_base != port->mapbase ||
-                      new_serial.hub6 != port->hub6 ||
-                      new_serial.io_type != port->iotype ||
-                      new_serial.iomem_reg_shift != port->regshift ||
-                      new_serial.type != port->type;
+        change_port = !(port->flags & UPF_FIXED_PORT)
+                && (new_port != port->iobase ||
+                    (unsigned long)new_serial.iomem_base != port->mapbase ||
+                    new_serial.hub6 != port->hub6 ||
+                    new_serial.io_type != port->iotype ||
+                    new_serial.iomem_reg_shift != port->regshift ||
+                    new_serial.type != port->type);
 
         old_flags = port->flags;
         new_flags = new_serial.flags;
@@ -796,8 +791,10 @@ static int uart_set_info(struct uart_state *state,
                 }
         }
 
-        port->irq              = new_serial.irq;
-        port->uartclk          = new_serial.baud_base * 16;
+        if (change_irq)
+                port->irq      = new_serial.irq;
+        if (!(port->flags & UPF_FIXED_PORT))
+                port->uartclk  = new_serial.baud_base * 16;
         port->flags            = (port->flags & ~UPF_CHANGE_MASK) |
                                  (new_flags & UPF_CHANGE_MASK);
         port->custom_divisor   = new_serial.custom_divisor;
@@ -1220,7 +1217,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
 
         port = state->port;
 
-        DPRINTK("uart_close(%d) called\n", port->line);
+        pr_debug("uart_close(%d) called\n", port->line);
 
         mutex_lock(&state->mutex);
 
@@ -1339,7 +1336,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
 
         expire = jiffies + timeout;
 
-        DPRINTK("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
+        pr_debug("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
                 port->line, jiffies, expire);
 
         /*
@@ -1368,7 +1365,7 @@ static void uart_hangup(struct tty_struct *tty)
         struct uart_state *state = tty->driver_data;
 
         BUG_ON(!kernel_locked());
-        DPRINTK("uart_hangup(%d)\n", state->port->line);
+        pr_debug("uart_hangup(%d)\n", state->port->line);
 
         mutex_lock(&state->mutex);
         if (state->info && state->info->flags & UIF_NORMAL_ACTIVE) {
@@ -1566,7 +1563,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         int retval, line = tty->index;
 
         BUG_ON(!kernel_locked());
-        DPRINTK("uart_open(%d) called\n", line);
+        pr_debug("uart_open(%d) called\n", line);
 
         /*
          * tty->driver->num won't change, so we won't fail here with
@@ -2064,6 +2061,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
         case UPIO_MEM32:
         case UPIO_AU:
         case UPIO_TSI:
+        case UPIO_DWAPB:
                 snprintf(address, sizeof(address),
                          "MMIO 0x%lx", port->mapbase);
                 break;
@@ -2409,6 +2407,7 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2)
         case UPIO_MEM32:
         case UPIO_AU:
         case UPIO_TSI:
+        case UPIO_DWAPB:
                 return (port1->mapbase == port2->mapbase);
         }
         return 0;
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 46c40bbc4bc6..1f89496d530e 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -46,6 +46,7 @@
 #endif
 
 #if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#include <linux/ctype.h>
 #include <asm/clock.h>
 #include <asm/sh_bios.h>
 #include <asm/kgdb.h>
@@ -61,7 +62,7 @@ struct sci_port {
         unsigned int            type;
 
         /* Port IRQs: ERI, RXI, TXI, BRI (optional) */
-        unsigned int            irqs[SCIx_NR_IRQS]; 
+        unsigned int            irqs[SCIx_NR_IRQS];
 
         /* Port pin configuration */
         void                    (*init_pins)(struct uart_port *port,
@@ -76,6 +77,11 @@ struct sci_port {
         /* Break timer */
         struct timer_list       break_timer;
         int                     break_flag;
+
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+        /* Port clock */
+        struct clk              *clk;
+#endif
 };
 
 #ifdef CONFIG_SH_KGDB
@@ -163,7 +169,7 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)
         usegdb |= sh_bios_in_gdb_mode();
 #endif
 #ifdef CONFIG_SH_KGDB
-        usegdb |= (kgdb_in_gdb_mode && (port == kgdb_sci_port));
+        usegdb |= (kgdb_in_gdb_mode && (sci_port == kgdb_sci_port));
 #endif
 
         if (usegdb) {
@@ -204,7 +210,7 @@ static int kgdb_sci_getchar(void)
         int c;
 
         /* Keep trying to read a character, this could be neater */
-        while ((c = get_char(kgdb_sci_port)) < 0)
+        while ((c = get_char(&kgdb_sci_port->port)) < 0)
                 cpu_relax();
 
         return c;
@@ -212,7 +218,7 @@ static int kgdb_sci_getchar(void)
 
 static inline void kgdb_sci_putchar(int c)
 {
-        put_char(kgdb_sci_port, c);
+        put_char(&kgdb_sci_port->port, c);
 }
 #endif /* CONFIG_SH_KGDB */
 
@@ -283,12 +289,23 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 #endif
 
 #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) 
 /* SH7300 doesn't use RTS/CTS */
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 {
         sci_out(port, SCFCR, 0);
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
+static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
+{
+        unsigned int fcr_val = 0;
+
+        set_sh771x_scif_pfc(port);
+        if (cflag & CRTSCTS) {
+                fcr_val |= SCFCR_MCE;
+        }
+        sci_out(port, SCFCR, fcr_val);
+}
 #elif defined(CONFIG_CPU_SH3)
 /* For SH7705, SH7706, SH7707, SH7709, SH7709A, SH7729 */
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
@@ -350,7 +367,7 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
         } else {
 #ifdef CONFIG_CPU_SUBTYPE_SH7343
                 /* Nothing */
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
                 ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */
 #else
                 ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */
@@ -360,7 +377,9 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 }
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+#if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785)
 static inline int scif_txroom(struct uart_port *port)
 {
         return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);
@@ -735,12 +754,6 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr)
 
         /* Handle BREAKs */
         sci_handle_breaks(port);
-
-#ifdef CONFIG_SH_KGDB
-        /* Break into the debugger if a break is detected */
-        BREAKPOINT();
-#endif
-
         sci_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
 
         return IRQ_HANDLED;
@@ -947,6 +960,10 @@ static int sci_startup(struct uart_port *port)
         if (s->enable)
                 s->enable(port);
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+        s->clk = clk_get(NULL, "module_clk");
+#endif
+
         sci_request_irq(s);
         sci_start_tx(port);
         sci_start_rx(port, 1);
@@ -964,6 +981,11 @@ static void sci_shutdown(struct uart_port *port)
 
         if (s->disable)
                 s->disable(port);
+
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+        clk_put(s->clk);
+        s->clk = NULL;
+#endif
 }
 
 static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
@@ -971,7 +993,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 {
         struct sci_port *s = &sci_ports[port->line];
         unsigned int status, baud, smr_val;
-        unsigned long flags;
         int t;
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
@@ -983,18 +1004,14 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
                 default:
                 {
 #if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
-                        struct clk *clk = clk_get(NULL, "module_clk");
-                        t = SCBRR_VALUE(baud, clk_get_rate(clk));
-                        clk_put(clk);
+                        t = SCBRR_VALUE(baud, clk_get_rate(s->clk));
 #else
                         t = SCBRR_VALUE(baud);
 #endif
-                }
                         break;
+                }
         }
 
-        spin_lock_irqsave(&port->lock, flags);
-
         do {
                 status = sci_in(port, SCxSR);
         } while (!(status & SCxSR_TEND(port)));
@@ -1038,8 +1055,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 
         if ((termios->c_cflag & CREAD) != 0)
               sci_start_rx(port,0);
-
-        spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static const char *sci_type(struct uart_port *port)
@@ -1220,10 +1235,13 @@ static int __init serial_console_setup(struct console *co, char *options)
         if (!port->membase || !port->mapbase)
                 return -ENODEV;
 
-        spin_lock_init(&port->lock);
-
         port->type = serial_console_port->type;
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+        if (!serial_console_port->clk)
+                serial_console_port->clk = clk_get(NULL, "module_clk");
+#endif
+
         if (port->flags & UPF_IOREMAP)
                 sci_config_port(port, 0);
 
@@ -1247,7 +1265,7 @@ static struct console serial_console = {
         .device         = uart_console_device,
         .write          = serial_console_write,
         .setup          = serial_console_setup,
-        .flags          = CON_PRINTBUFFER, 
+        .flags          = CON_PRINTBUFFER,
         .index          = -1,
         .data           = &sci_uart_driver,
 };
@@ -1292,11 +1310,23 @@ int __init kgdb_console_setup(struct console *co, char *options)
         int parity = 'n';
         int flow = 'n';
 
-        spin_lock_init(&port->lock);
-
         if (co->index != kgdb_portnum)
                 co->index = kgdb_portnum;
 
+        kgdb_sci_port = &sci_ports[co->index];
+        port = &kgdb_sci_port->port;
+
+        /*
+         * Also need to check port->type, we don't actually have any
+         * UPIO_PORT ports, but uart_report_port() handily misreports
+         * it anyways if we don't have a port available by the time this is
+         * called.
+         */
+        if (!port->type)
+                return -ENODEV;
+        if (!port->membase || !port->mapbase)
+                return -ENODEV;
+
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
         else
@@ -1311,11 +1341,12 @@ int __init kgdb_console_setup(struct console *co, char *options)
 
 #ifdef CONFIG_SH_KGDB_CONSOLE
 static struct console kgdb_console = {
-        .name           = "ttySC",
-        .write          = kgdb_console_write,
-        .setup          = kgdb_console_setup,
-        .flags          = CON_PRINTBUFFER | CON_ENABLED,
-        .index          = -1,
+        .name           = "ttySC",
+        .device         = uart_console_device,
+        .write          = kgdb_console_write,
+        .setup          = kgdb_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
         .data           = &sci_uart_driver,
 };
 
@@ -1361,9 +1392,19 @@ static int __devinit sci_probe(struct platform_device *dev)
         struct plat_sci_port *p = dev->dev.platform_data;
         int i;
 
-        for (i = 0; p && p->flags != 0 && i < SCI_NPORTS; p++, i++) {
+        for (i = 0; p && p->flags != 0; p++, i++) {
                 struct sci_port *sciport = &sci_ports[i];
 
+                /* Sanity check */
+                if (unlikely(i == SCI_NPORTS)) {
+                        dev_notice(&dev->dev, "Attempting to register port "
+                                   "%d when only %d are available.\n",
+                                   i+1, SCI_NPORTS);
+                        dev_notice(&dev->dev, "Consider bumping "
+                                   "CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
+                        break;
+                }
+
                 sciport->port.mapbase   = p->mapbase;
 
                 /*
@@ -1386,6 +1427,12 @@ static int __devinit sci_probe(struct platform_device *dev)
                 uart_add_one_port(&sci_uart_driver, &sciport->port);
         }
 
+#if defined(CONFIG_SH_KGDB) && !defined(CONFIG_SH_KGDB_CONSOLE)
+        kgdb_sci_port   = &sci_ports[kgdb_portnum];
+        kgdb_getchar    = kgdb_sci_getchar;
+        kgdb_putchar    = kgdb_sci_putchar;
+#endif
+
 #ifdef CONFIG_CPU_FREQ
         cpufreq_register_notifier(&sci_nb, CPUFREQ_TRANSITION_NOTIFIER);
         dev_info(&dev->dev, "sci: CPU frequency notifier registered\n");
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 77f7d6351ab1..fb04fb5f9843 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -73,9 +73,13 @@
 # define SCPDR  0xA4050136        /* 16 bit SCIF */
 # define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCIF_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7710)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) 
 # define SCSPTR0 0xA4400000       /* 16 bit SCIF */
-# define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCI_NPORTS 2
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define PACR 0xa4050100
+# define PBCR 0xa4050102
+# define SCSCR_INIT(port)          0x3B
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH73180)
 # define SCPDR  0xA4050138        /* 16 bit SCIF */
@@ -140,6 +144,16 @@
 # define SCIF_ORER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7785)
+# define SCSPTR0        0xffea0024      /* 16 bit SCIF */
+# define SCSPTR1        0xffeb0024      /* 16 bit SCIF */
+# define SCSPTR2        0xffec0024      /* 16 bit SCIF */
+# define SCSPTR3        0xffed0024      /* 16 bit SCIF */
+# define SCSPTR4        0xffee0024      /* 16 bit SCIF */
+# define SCSPTR5        0xffef0024      /* 16 bit SCIF */
+# define SCIF_OPER      0x0001          /* Overrun error bit */
+# define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7206)
 # define SCSPTR0 0xfffe8020 /* 16 bit SCIF */
 # define SCSPTR1 0xfffe8820 /* 16 bit SCIF */
@@ -163,7 +177,10 @@
 #define SCI_CTRL_FLAGS_RIE  0x40 /* all */
 #define SCI_CTRL_FLAGS_TE   0x20 /* all */
 #define SCI_CTRL_FLAGS_RE   0x10 /* all */
-#if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+#if defined(CONFIG_CPU_SUBTYPE_SH7750) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7751) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */
 #else
 #define SCI_CTRL_FLAGS_REIE 0
@@ -333,9 +350,15 @@
   }
 
 #ifdef CONFIG_CPU_SH3
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
+#define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+                                sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
+                                 h8_sci_offset, h8_sci_size) \
+  CPU_SCIx_FNS(name, sh4_sci_offset, sh4_sci_size, sh4_scif_offset, sh4_scif_size)
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+          CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7300) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7705) 
 #define SCIF_FNS(name, scif_offset, scif_size) \
   CPU_SCIF_FNS(name, scif_offset, scif_size)
 #else
@@ -362,8 +385,8 @@
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7710)
+    defined(CONFIG_CPU_SUBTYPE_SH7705) 
+
 SCIF_FNS(SCSMR,  0x00, 16)
 SCIF_FNS(SCBRR,  0x04,  8)
 SCIF_FNS(SCSCR,  0x08, 16)
@@ -385,7 +408,9 @@ SCIx_FNS(SCxTDR, 0x06,  8, 0x0c,  8, 0x06,  8, 0x0C,  8, 0x03,  8)
 SCIx_FNS(SCxSR,  0x08,  8, 0x10,  8, 0x08, 16, 0x10, 16, 0x04,  8)
 SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)
 SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
-#if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+#if defined(CONFIG_CPU_SUBTYPE_SH7760) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785)
 SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCTFDR,                     0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCRFDR,                     0x0e, 16, 0x20, 16)
@@ -471,13 +496,24 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inb(SCPDR)&0x10 ? 1 : 0; /* SCIF */
         return 1;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7710)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 static inline int sci_rxd_in(struct uart_port *port)
 {
-        if (port->mapbase == SCSPTR0)
-                return ctrl_inw(SCSPTR0 + 0x10) & 0x01 ? 1 : 0;
-        return 1;
+          return sci_in(port,SCxSR)&0x0010 ? 1 : 0;
+}
+static inline void set_sh771x_scif_pfc(struct uart_port *port)
+{
+        if (port->mapbase == 0xA4400000){
+                ctrl_outw(ctrl_inw(PACR)&0xffc0,PACR);
+                ctrl_outw(ctrl_inw(PBCR)&0x0fff,PBCR);
+                return;
+        }
+        if (port->mapbase == 0xA4410000){
+                ctrl_outw(ctrl_inw(PBCR)&0xf003,PBCR);
+                return;
+        }
 }
+
 #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \
       defined(CONFIG_CPU_SUBTYPE_SH7751) || \
       defined(CONFIG_CPU_SUBTYPE_SH4_202)
@@ -576,6 +612,23 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
         return 1;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7785)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffea0000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffeb0000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffec0000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffed0000)
+                return ctrl_inw(SCSPTR3) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffee0000)
+                return ctrl_inw(SCSPTR4) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffef0000)
+                return ctrl_inw(SCSPTR5) & 0x0001 ? 1 : 0; /* SCIF */
+        return 1;
+}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7206)
 static inline int sci_rxd_in(struct uart_port *port)
 {
@@ -634,7 +687,9 @@ static inline int sci_rxd_in(struct uart_port *port)
  * -- Mitch Davis - 15 Jul 2000
  */
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(16*bps)-1)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
 #define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1)
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index bfd44177a215..2a63cdba3208 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1312,7 +1312,7 @@ static void sunsu_console_write(struct console *co, const char *s,
  *      - initialize the serial port
  *      Return non-zero if we didn't find a serial port.
  */
-static int sunsu_console_setup(struct console *co, char *options)
+static int __init sunsu_console_setup(struct console *co, char *options)
 {
         struct uart_port *port;
         int baud = 9600;
@@ -1343,7 +1343,7 @@ static int sunsu_console_setup(struct console *co, char *options)
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-static struct console sunsu_cons = {
+static struct console sunsu_console = {
         .name   =       "ttyS",
         .write  =       sunsu_console_write,
         .device =       uart_console_device,
@@ -1373,9 +1373,9 @@ static inline struct console *SUNSU_CONSOLE(int num_uart)
         if (i == num_uart)
                 return NULL;
 
-        sunsu_cons.index = i;
+        sunsu_console.index = i;
 
-        return &sunsu_cons;
+        return &sunsu_console;
 }
 #else
 #define SUNSU_CONSOLE(num_uart)         (NULL)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7e54e48efd5c..4a012d9acbff 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -58,6 +58,12 @@ config SPI_ATMEL
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
 
+config SPI_BFIN
+        tristate "SPI controller driver for ADI Blackfin5xx"
+        depends on SPI_MASTER && BFIN
+        help
+          This is the SPI controller master driver for Blackfin 5xx processor.
+
 config SPI_BITBANG
         tristate "Bitbanging SPI master"
         depends on SPI_MASTER && EXPERIMENTAL
@@ -157,7 +163,6 @@ config SPI_AT25
 # Add new SPI protocol masters in alphabetical order above this line
 #
 
-
 # (slave support would go here)
 
 endmenu # "SPI support"
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 3c280ad89202..a95ade857a2f 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -11,8 +11,9 @@ endif
 obj-$(CONFIG_SPI_MASTER)                += spi.o
 
 # SPI master controller drivers (bus)
-obj-$(CONFIG_SPI_BITBANG)               += spi_bitbang.o
 obj-$(CONFIG_SPI_ATMEL)                 += atmel_spi.o
+obj-$(CONFIG_SPI_BFIN)                  += spi_bfin5xx.o
+obj-$(CONFIG_SPI_BITBANG)               += spi_bitbang.o
 obj-$(CONFIG_SPI_BUTTERFLY)             += spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)                   += spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)                += pxa2xx_spi.o
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
new file mode 100644
index 000000000000..ce3c0ce2316e
--- /dev/null
+++ b/drivers/spi/spi_bfin5xx.c
@@ -0,0 +1,1313 @@
+/*
+ * File:         drivers/spi/bfin5xx_spi.c
+ * Based on:     N/A
+ * Author:       Luke Yang (Analog Devices Inc.)
+ *
+ * Created:      March. 10th 2006
+ * Description:  SPI controller driver for Blackfin 5xx
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Modified:
+ *      March 10, 2006  bfin5xx_spi.c Created. (Luke Yang)
+ *      August 7, 2006  added full duplex mode (Axel Weiss & Luke Yang)
+ *
+ * Copyright 2004-2006 Analog Devices 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)
+ * 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 ;  see the file COPYING.
+ * If not, write to the Free Software Foundation,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/ioport.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/spi/spi.h>
+#include <linux/workqueue.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/delay.h>
+#include <asm/dma.h>
+
+#include <asm/bfin5xx_spi.h>
+
+MODULE_AUTHOR("Luke Yang");
+MODULE_DESCRIPTION("Blackfin 5xx SPI Contoller");
+MODULE_LICENSE("GPL");
+
+#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
+
+#define DEFINE_SPI_REG(reg, off) \
+static inline u16 read_##reg(void) \
+            { return *(volatile unsigned short*)(SPI0_REGBASE + off); } \
+static inline void write_##reg(u16 v) \
+            {*(volatile unsigned short*)(SPI0_REGBASE + off) = v;\
+             SSYNC();}
+
+DEFINE_SPI_REG(CTRL, 0x00)
+DEFINE_SPI_REG(FLAG, 0x04)
+DEFINE_SPI_REG(STAT, 0x08)
+DEFINE_SPI_REG(TDBR, 0x0C)
+DEFINE_SPI_REG(RDBR, 0x10)
+DEFINE_SPI_REG(BAUD, 0x14)
+DEFINE_SPI_REG(SHAW, 0x18)
+#define START_STATE ((void*)0)
+#define RUNNING_STATE ((void*)1)
+#define DONE_STATE ((void*)2)
+#define ERROR_STATE ((void*)-1)
+#define QUEUE_RUNNING 0
+#define QUEUE_STOPPED 1
+int dma_requested;
+
+struct driver_data {
+        /* Driver model hookup */
+        struct platform_device *pdev;
+
+        /* SPI framework hookup */
+        struct spi_master *master;
+
+        /* BFIN hookup */
+        struct bfin5xx_spi_master *master_info;
+
+        /* Driver message queue */
+        struct workqueue_struct *workqueue;
+        struct work_struct pump_messages;
+        spinlock_t lock;
+        struct list_head queue;
+        int busy;
+        int run;
+
+        /* Message Transfer pump */
+        struct tasklet_struct pump_transfers;
+
+        /* Current message transfer state info */
+        struct spi_message *cur_msg;
+        struct spi_transfer *cur_transfer;
+        struct chip_data *cur_chip;
+        size_t len_in_bytes;
+        size_t len;
+        void *tx;
+        void *tx_end;
+        void *rx;
+        void *rx_end;
+        int dma_mapped;
+        dma_addr_t rx_dma;
+        dma_addr_t tx_dma;
+        size_t rx_map_len;
+        size_t tx_map_len;
+        u8 n_bytes;
+        void (*write) (struct driver_data *);
+        void (*read) (struct driver_data *);
+        void (*duplex) (struct driver_data *);
+};
+
+struct chip_data {
+        u16 ctl_reg;
+        u16 baud;
+        u16 flag;
+
+        u8 chip_select_num;
+        u8 n_bytes;
+        u32 width;              /* 0 or 1 */
+        u8 enable_dma;
+        u8 bits_per_word;       /* 8 or 16 */
+        u8 cs_change_per_word;
+        u8 cs_chg_udelay;
+        void (*write) (struct driver_data *);
+        void (*read) (struct driver_data *);
+        void (*duplex) (struct driver_data *);
+};
+
+void bfin_spi_enable(struct driver_data *drv_data)
+{
+        u16 cr;
+
+        cr = read_CTRL();
+        write_CTRL(cr | BIT_CTL_ENABLE);
+        SSYNC();
+}
+
+void bfin_spi_disable(struct driver_data *drv_data)
+{
+        u16 cr;
+
+        cr = read_CTRL();
+        write_CTRL(cr & (~BIT_CTL_ENABLE));
+        SSYNC();
+}
+
+/* Caculate the SPI_BAUD register value based on input HZ */
+static u16 hz_to_spi_baud(u32 speed_hz)
+{
+        u_long sclk = get_sclk();
+        u16 spi_baud = (sclk / (2 * speed_hz));
+
+        if ((sclk % (2 * speed_hz)) > 0)
+                spi_baud++;
+
+        pr_debug("sclk = %ld, speed_hz = %d, spi_baud = %d\n", sclk, speed_hz,
+                 spi_baud);
+
+        return spi_baud;
+}
+
+static int flush(struct driver_data *drv_data)
+{
+        unsigned long limit = loops_per_jiffy << 1;
+
+        /* wait for stop and clear stat */
+        while (!(read_STAT() & BIT_STAT_SPIF) && limit--)
+                continue;
+
+        write_STAT(BIT_STAT_CLR);
+
+        return limit;
+}
+
+/* stop controller and re-config current chip*/
+static void restore_state(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        /* Clear status and disable clock */
+        write_STAT(BIT_STAT_CLR);
+        bfin_spi_disable(drv_data);
+        pr_debug("restoring spi ctl state\n");
+
+#if defined(CONFIG_BF534) || defined(CONFIG_BF536) || defined(CONFIG_BF537)
+        pr_debug("chip select number is %d\n", chip->chip_select_num);
+
+        switch (chip->chip_select_num) {
+        case 1:
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3c00);
+                SSYNC();
+                break;
+
+        case 2:
+        case 3:
+                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PJSE_SPI);
+                SSYNC();
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3800);
+                SSYNC();
+                break;
+
+        case 4:
+                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS4E_SPI);
+                SSYNC();
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3840);
+                SSYNC();
+                break;
+
+        case 5:
+                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS5E_SPI);
+                SSYNC();
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3820);
+                SSYNC();
+                break;
+
+        case 6:
+                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS6E_SPI);
+                SSYNC();
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3810);
+                SSYNC();
+                break;
+
+        case 7:
+                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PJCE_SPI);
+                SSYNC();
+                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3800);
+                SSYNC();
+                break;
+        }
+#endif
+
+        /* Load the registers */
+        write_CTRL(chip->ctl_reg);
+        write_BAUD(chip->baud);
+        write_FLAG(chip->flag);
+}
+
+/* used to kick off transfer in rx mode */
+static unsigned short dummy_read(void)
+{
+        unsigned short tmp;
+        tmp = read_RDBR();
+        return tmp;
+}
+
+static void null_writer(struct driver_data *drv_data)
+{
+        u8 n_bytes = drv_data->n_bytes;
+
+        while (drv_data->tx < drv_data->tx_end) {
+                write_TDBR(0);
+                while ((read_STAT() & BIT_STAT_TXS))
+                        continue;
+                drv_data->tx += n_bytes;
+        }
+}
+
+static void null_reader(struct driver_data *drv_data)
+{
+        u8 n_bytes = drv_data->n_bytes;
+        dummy_read();
+
+        while (drv_data->rx < drv_data->rx_end) {
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                dummy_read();
+                drv_data->rx += n_bytes;
+        }
+}
+
+static void u8_writer(struct driver_data *drv_data)
+{
+        pr_debug("cr8-s is 0x%x\n", read_STAT());
+        while (drv_data->tx < drv_data->tx_end) {
+                write_TDBR(*(u8 *) (drv_data->tx));
+                while (read_STAT() & BIT_STAT_TXS)
+                        continue;
+                ++drv_data->tx;
+        }
+
+        /* poll for SPI completion before returning */
+        while (!(read_STAT() & BIT_STAT_SPIF))
+                continue;
+}
+
+static void u8_cs_chg_writer(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->tx < drv_data->tx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                write_TDBR(*(u8 *) (drv_data->tx));
+                while (read_STAT() & BIT_STAT_TXS)
+                        continue;
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                ++drv_data->tx;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+static void u8_reader(struct driver_data *drv_data)
+{
+        pr_debug("cr-8 is 0x%x\n", read_STAT());
+
+        /* clear TDBR buffer before read(else it will be shifted out) */
+        write_TDBR(0xFFFF);
+
+        dummy_read();
+
+        while (drv_data->rx < drv_data->rx_end - 1) {
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u8 *) (drv_data->rx) = read_RDBR();
+                ++drv_data->rx;
+        }
+
+        while (!(read_STAT() & BIT_STAT_RXS))
+                continue;
+        *(u8 *) (drv_data->rx) = read_SHAW();
+        ++drv_data->rx;
+}
+
+static void u8_cs_chg_reader(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->rx < drv_data->rx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                read_RDBR();    /* kick off */
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                *(u8 *) (drv_data->rx) = read_SHAW();
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                ++drv_data->rx;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+static void u8_duplex(struct driver_data *drv_data)
+{
+        /* in duplex mode, clk is triggered by writing of TDBR */
+        while (drv_data->rx < drv_data->rx_end) {
+                write_TDBR(*(u8 *) (drv_data->tx));
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u8 *) (drv_data->rx) = read_RDBR();
+                ++drv_data->rx;
+                ++drv_data->tx;
+        }
+}
+
+static void u8_cs_chg_duplex(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->rx < drv_data->rx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                write_TDBR(*(u8 *) (drv_data->tx));
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u8 *) (drv_data->rx) = read_RDBR();
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                ++drv_data->rx;
+                ++drv_data->tx;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+static void u16_writer(struct driver_data *drv_data)
+{
+        pr_debug("cr16 is 0x%x\n", read_STAT());
+        while (drv_data->tx < drv_data->tx_end) {
+                write_TDBR(*(u16 *) (drv_data->tx));
+                while ((read_STAT() & BIT_STAT_TXS))
+                        continue;
+                drv_data->tx += 2;
+        }
+
+        /* poll for SPI completion before returning */
+        while (!(read_STAT() & BIT_STAT_SPIF))
+                continue;
+}
+
+static void u16_cs_chg_writer(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->tx < drv_data->tx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                write_TDBR(*(u16 *) (drv_data->tx));
+                while ((read_STAT() & BIT_STAT_TXS))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                drv_data->tx += 2;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+static void u16_reader(struct driver_data *drv_data)
+{
+        pr_debug("cr-16 is 0x%x\n", read_STAT());
+        dummy_read();
+
+        while (drv_data->rx < (drv_data->rx_end - 2)) {
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u16 *) (drv_data->rx) = read_RDBR();
+                drv_data->rx += 2;
+        }
+
+        while (!(read_STAT() & BIT_STAT_RXS))
+                continue;
+        *(u16 *) (drv_data->rx) = read_SHAW();
+        drv_data->rx += 2;
+}
+
+static void u16_cs_chg_reader(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->rx < drv_data->rx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                read_RDBR();    /* kick off */
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                *(u16 *) (drv_data->rx) = read_SHAW();
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                drv_data->rx += 2;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+static void u16_duplex(struct driver_data *drv_data)
+{
+        /* in duplex mode, clk is triggered by writing of TDBR */
+        while (drv_data->tx < drv_data->tx_end) {
+                write_TDBR(*(u16 *) (drv_data->tx));
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u16 *) (drv_data->rx) = read_RDBR();
+                drv_data->rx += 2;
+                drv_data->tx += 2;
+        }
+}
+
+static void u16_cs_chg_duplex(struct driver_data *drv_data)
+{
+        struct chip_data *chip = drv_data->cur_chip;
+
+        while (drv_data->tx < drv_data->tx_end) {
+                write_FLAG(chip->flag);
+                SSYNC();
+
+                write_TDBR(*(u16 *) (drv_data->tx));
+                while (!(read_STAT() & BIT_STAT_SPIF))
+                        continue;
+                while (!(read_STAT() & BIT_STAT_RXS))
+                        continue;
+                *(u16 *) (drv_data->rx) = read_RDBR();
+                write_FLAG(0xFF00 | chip->flag);
+                SSYNC();
+                if (chip->cs_chg_udelay)
+                        udelay(chip->cs_chg_udelay);
+                drv_data->rx += 2;
+                drv_data->tx += 2;
+        }
+        write_FLAG(0xFF00);
+        SSYNC();
+}
+
+/* test if ther is more transfer to be done */
+static void *next_transfer(struct driver_data *drv_data)
+{
+        struct spi_message *msg = drv_data->cur_msg;
+        struct spi_transfer *trans = drv_data->cur_transfer;
+
+        /* Move to next transfer */
+        if (trans->transfer_list.next != &msg->transfers) {
+                drv_data->cur_transfer =
+                    list_entry(trans->transfer_list.next,
+                               struct spi_transfer, transfer_list);
+                return RUNNING_STATE;
+        } else
+                return DONE_STATE;
+}
+
+/*
+ * caller already set message->status;
+ * dma and pio irqs are blocked give finished message back
+ */
+static void giveback(struct driver_data *drv_data)
+{
+        struct spi_transfer *last_transfer;
+        unsigned long flags;
+        struct spi_message *msg;
+
+        spin_lock_irqsave(&drv_data->lock, flags);
+        msg = drv_data->cur_msg;
+        drv_data->cur_msg = NULL;
+        drv_data->cur_transfer = NULL;
+        drv_data->cur_chip = NULL;
+        queue_work(drv_data->workqueue, &drv_data->pump_messages);
+        spin_unlock_irqrestore(&drv_data->lock, flags);
+
+        last_transfer = list_entry(msg->transfers.prev,
+                                   struct spi_transfer, transfer_list);
+
+        msg->state = NULL;
+
+        /* disable chip select signal. And not stop spi in autobuffer mode */
+        if (drv_data->tx_dma != 0xFFFF) {
+                write_FLAG(0xFF00);
+                bfin_spi_disable(drv_data);
+        }
+
+        if (msg->complete)
+                msg->complete(msg->context);
+}
+
+static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct driver_data *drv_data = (struct driver_data *)dev_id;
+        struct spi_message *msg = drv_data->cur_msg;
+
+        pr_debug("in dma_irq_handler\n");
+        clear_dma_irqstat(CH_SPI);
+
+        /*
+         * wait for the last transaction shifted out.  yes, these two
+         * while loops are supposed to be the same (see the HRM).
+         */
+        if (drv_data->tx != NULL) {
+                while (bfin_read_SPI_STAT() & TXS)
+                        continue;
+                while (bfin_read_SPI_STAT() & TXS)
+                        continue;
+        }
+
+        while (!(bfin_read_SPI_STAT() & SPIF))
+                continue;
+
+        bfin_spi_disable(drv_data);
+
+        msg->actual_length += drv_data->len_in_bytes;
+
+        /* Move to next transfer */
+        msg->state = next_transfer(drv_data);
+
+        /* Schedule transfer tasklet */
+        tasklet_schedule(&drv_data->pump_transfers);
+
+        /* free the irq handler before next transfer */
+        pr_debug("disable dma channel irq%d\n", CH_SPI);
+        dma_disable_irq(CH_SPI);
+
+        return IRQ_HANDLED;
+}
+
+static void pump_transfers(unsigned long data)
+{
+        struct driver_data *drv_data = (struct driver_data *)data;
+        struct spi_message *message = NULL;
+        struct spi_transfer *transfer = NULL;
+        struct spi_transfer *previous = NULL;
+        struct chip_data *chip = NULL;
+        u16 cr, width, dma_width, dma_config;
+        u32 tranf_success = 1;
+
+        /* Get current state information */
+        message = drv_data->cur_msg;
+        transfer = drv_data->cur_transfer;
+        chip = drv_data->cur_chip;
+
+        /*
+         * if msg is error or done, report it back using complete() callback
+         */
+
+         /* Handle for abort */
+        if (message->state == ERROR_STATE) {
+                message->status = -EIO;
+                giveback(drv_data);
+                return;
+        }
+
+        /* Handle end of message */
+        if (message->state == DONE_STATE) {
+                message->status = 0;
+                giveback(drv_data);
+                return;
+        }
+
+        /* Delay if requested at end of transfer */
+        if (message->state == RUNNING_STATE) {
+                previous = list_entry(transfer->transfer_list.prev,
+                                      struct spi_transfer, transfer_list);
+                if (previous->delay_usecs)
+                        udelay(previous->delay_usecs);
+        }
+
+        /* Setup the transfer state based on the type of transfer */
+        if (flush(drv_data) == 0) {
+                dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n");
+                message->status = -EIO;
+                giveback(drv_data);
+                return;
+        }
+
+        if (transfer->tx_buf != NULL) {
+                drv_data->tx = (void *)transfer->tx_buf;
+                drv_data->tx_end = drv_data->tx + transfer->len;
+                pr_debug("tx_buf is %p, tx_end is %p\n", transfer->tx_buf,
+                         drv_data->tx_end);
+        } else {
+                drv_data->tx = NULL;
+        }
+
+        if (transfer->rx_buf != NULL) {
+                drv_data->rx = transfer->rx_buf;
+                drv_data->rx_end = drv_data->rx + transfer->len;
+                pr_debug("rx_buf is %p, rx_end is %p\n", transfer->rx_buf,
+                         drv_data->rx_end);
+        } else {
+                drv_data->rx = NULL;
+        }
+
+        drv_data->rx_dma = transfer->rx_dma;
+        drv_data->tx_dma = transfer->tx_dma;
+        drv_data->len_in_bytes = transfer->len;
+
+        width = chip->width;
+        if (width == CFG_SPI_WORDSIZE16) {
+                drv_data->len = (transfer->len) >> 1;
+        } else {
+                drv_data->len = transfer->len;
+        }
+        drv_data->write = drv_data->tx ? chip->write : null_writer;
+        drv_data->read = drv_data->rx ? chip->read : null_reader;
+        drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
+        pr_debug
+            ("transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
+             drv_data->write, chip->write, null_writer);
+
+        /* speed and width has been set on per message */
+        message->state = RUNNING_STATE;
+        dma_config = 0;
+
+        /* restore spi status for each spi transfer */
+        if (transfer->speed_hz) {
+                write_BAUD(hz_to_spi_baud(transfer->speed_hz));
+        } else {
+                write_BAUD(chip->baud);
+        }
+        write_FLAG(chip->flag);
+
+        pr_debug("now pumping a transfer: width is %d, len is %d\n", width,
+                 transfer->len);
+
+        /*
+         * Try to map dma buffer and do a dma transfer if
+         * successful use different way to r/w according to
+         * drv_data->cur_chip->enable_dma
+         */
+        if (drv_data->cur_chip->enable_dma && drv_data->len > 6) {
+
+                write_STAT(BIT_STAT_CLR);
+                disable_dma(CH_SPI);
+                clear_dma_irqstat(CH_SPI);
+                bfin_spi_disable(drv_data);
+
+                /* config dma channel */
+                pr_debug("doing dma transfer\n");
+                if (width == CFG_SPI_WORDSIZE16) {
+                        set_dma_x_count(CH_SPI, drv_data->len);
+                        set_dma_x_modify(CH_SPI, 2);
+                        dma_width = WDSIZE_16;
+                } else {
+                        set_dma_x_count(CH_SPI, drv_data->len);
+                        set_dma_x_modify(CH_SPI, 1);
+                        dma_width = WDSIZE_8;
+                }
+
+                /* set transfer width,direction. And enable spi */
+                cr = (read_CTRL() & (~BIT_CTL_TIMOD));
+
+                /* dirty hack for autobuffer DMA mode */
+                if (drv_data->tx_dma == 0xFFFF) {
+                        pr_debug("doing autobuffer DMA out.\n");
+
+                        /* no irq in autobuffer mode */
+                        dma_config =
+                            (DMAFLOW_AUTO | RESTART | dma_width | DI_EN);
+                        set_dma_config(CH_SPI, dma_config);
+                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->tx);
+                        enable_dma(CH_SPI);
+                        write_CTRL(cr | CFG_SPI_DMAWRITE | (width << 8) |
+                                   (CFG_SPI_ENABLE << 14));
+
+                        /* just return here, there can only be one transfer in this mode */
+                        message->status = 0;
+                        giveback(drv_data);
+                        return;
+                }
+
+                /* In dma mode, rx or tx must be NULL in one transfer */
+                if (drv_data->rx != NULL) {
+                        /* set transfer mode, and enable SPI */
+                        pr_debug("doing DMA in.\n");
+
+                        /* disable SPI before write to TDBR */
+                        write_CTRL(cr & ~BIT_CTL_ENABLE);
+
+                        /* clear tx reg soformer data is not shifted out */
+                        write_TDBR(0xFF);
+
+                        set_dma_x_count(CH_SPI, drv_data->len);
+
+                        /* start dma */
+                        dma_enable_irq(CH_SPI);
+                        dma_config = (WNR | RESTART | dma_width | DI_EN);
+                        set_dma_config(CH_SPI, dma_config);
+                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->rx);
+                        enable_dma(CH_SPI);
+
+                        cr |=
+                            CFG_SPI_DMAREAD | (width << 8) | (CFG_SPI_ENABLE <<
+                                                              14);
+                        /* set transfer mode, and enable SPI */
+                        write_CTRL(cr);
+                } else if (drv_data->tx != NULL) {
+                        pr_debug("doing DMA out.\n");
+
+                        /* start dma */
+                        dma_enable_irq(CH_SPI);
+                        dma_config = (RESTART | dma_width | DI_EN);
+                        set_dma_config(CH_SPI, dma_config);
+                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->tx);
+                        enable_dma(CH_SPI);
+
+                        write_CTRL(cr | CFG_SPI_DMAWRITE | (width << 8) |
+                                   (CFG_SPI_ENABLE << 14));
+
+                }
+        } else {
+                /* IO mode write then read */
+                pr_debug("doing IO transfer\n");
+
+                write_STAT(BIT_STAT_CLR);
+
+                if (drv_data->tx != NULL && drv_data->rx != NULL) {
+                        /* full duplex mode */
+                        BUG_ON((drv_data->tx_end - drv_data->tx) !=
+                               (drv_data->rx_end - drv_data->rx));
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* clear the TIMOD bits */
+                        cr |=
+                            CFG_SPI_WRITE | (width << 8) | (CFG_SPI_ENABLE <<
+                                                            14);
+                        pr_debug("IO duplex: cr is 0x%x\n", cr);
+
+                        write_CTRL(cr);
+                        SSYNC();
+
+                        drv_data->duplex(drv_data);
+
+                        if (drv_data->tx != drv_data->tx_end)
+                                tranf_success = 0;
+                } else if (drv_data->tx != NULL) {
+                        /* write only half duplex */
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* clear the TIMOD bits */
+                        cr |=
+                            CFG_SPI_WRITE | (width << 8) | (CFG_SPI_ENABLE <<
+                                                            14);
+                        pr_debug("IO write: cr is 0x%x\n", cr);
+
+                        write_CTRL(cr);
+                        SSYNC();
+
+                        drv_data->write(drv_data);
+
+                        if (drv_data->tx != drv_data->tx_end)
+                                tranf_success = 0;
+                } else if (drv_data->rx != NULL) {
+                        /* read only half duplex */
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* cleare the TIMOD bits */
+                        cr |=
+                            CFG_SPI_READ | (width << 8) | (CFG_SPI_ENABLE <<
+                                                           14);
+                        pr_debug("IO read: cr is 0x%x\n", cr);
+
+                        write_CTRL(cr);
+                        SSYNC();
+
+                        drv_data->read(drv_data);
+                        if (drv_data->rx != drv_data->rx_end)
+                                tranf_success = 0;
+                }
+
+                if (!tranf_success) {
+                        pr_debug("IO write error!\n");
+                        message->state = ERROR_STATE;
+                } else {
+                        /* Update total byte transfered */
+                        message->actual_length += drv_data->len;
+
+                        /* Move to next transfer of this msg */
+                        message->state = next_transfer(drv_data);
+                }
+
+                /* Schedule next transfer tasklet */
+                tasklet_schedule(&drv_data->pump_transfers);
+
+        }
+}
+
+/* pop a msg from queue and kick off real transfer */
+static void pump_messages(struct work_struct *work)
+{
+        struct driver_data *drv_data = container_of(work, struct driver_data, pump_messages);
+        unsigned long flags;
+
+        /* Lock queue and check for queue work */
+        spin_lock_irqsave(&drv_data->lock, flags);
+        if (list_empty(&drv_data->queue) || drv_data->run == QUEUE_STOPPED) {
+                /* pumper kicked off but no work to do */
+                drv_data->busy = 0;
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                return;
+        }
+
+        /* Make sure we are not already running a message */
+        if (drv_data->cur_msg) {
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                return;
+        }
+
+        /* Extract head of queue */
+        drv_data->cur_msg = list_entry(drv_data->queue.next,
+                                       struct spi_message, queue);
+        list_del_init(&drv_data->cur_msg->queue);
+
+        /* Initial message state */
+        drv_data->cur_msg->state = START_STATE;
+        drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next,
+                                            struct spi_transfer, transfer_list);
+
+        /* Setup the SSP using the per chip configuration */
+        drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
+        restore_state(drv_data);
+        pr_debug
+            ("got a message to pump, state is set to: baud %d, flag 0x%x, ctl 0x%x\n",
+             drv_data->cur_chip->baud, drv_data->cur_chip->flag,
+             drv_data->cur_chip->ctl_reg);
+        pr_debug("the first transfer len is %d\n", drv_data->cur_transfer->len);
+
+        /* Mark as busy and launch transfers */
+        tasklet_schedule(&drv_data->pump_transfers);
+
+        drv_data->busy = 1;
+        spin_unlock_irqrestore(&drv_data->lock, flags);
+}
+
+/*
+ * got a msg to transfer, queue it in drv_data->queue.
+ * And kick off message pumper
+ */
+static int transfer(struct spi_device *spi, struct spi_message *msg)
+{
+        struct driver_data *drv_data = spi_master_get_devdata(spi->master);
+        unsigned long flags;
+
+        spin_lock_irqsave(&drv_data->lock, flags);
+
+        if (drv_data->run == QUEUE_STOPPED) {
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                return -ESHUTDOWN;
+        }
+
+        msg->actual_length = 0;
+        msg->status = -EINPROGRESS;
+        msg->state = START_STATE;
+
+        pr_debug("adding an msg in transfer() \n");
+        list_add_tail(&msg->queue, &drv_data->queue);
+
+        if (drv_data->run == QUEUE_RUNNING && !drv_data->busy)
+                queue_work(drv_data->workqueue, &drv_data->pump_messages);
+
+        spin_unlock_irqrestore(&drv_data->lock, flags);
+
+        return 0;
+}
+
+/* first setup for new devices */
+static int setup(struct spi_device *spi)
+{
+        struct bfin5xx_spi_chip *chip_info = NULL;
+        struct chip_data *chip;
+        struct driver_data *drv_data = spi_master_get_devdata(spi->master);
+        u8 spi_flg;
+
+        /* Abort device setup if requested features are not supported */
+        if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST)) {
+                dev_err(&spi->dev, "requested mode not fully supported\n");
+                return -EINVAL;
+        }
+
+        /* Zero (the default) here means 8 bits */
+        if (!spi->bits_per_word)
+                spi->bits_per_word = 8;
+
+        if (spi->bits_per_word != 8 && spi->bits_per_word != 16)
+                return -EINVAL;
+
+        /* Only alloc (or use chip_info) on first setup */
+        chip = spi_get_ctldata(spi);
+        if (chip == NULL) {
+                chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
+                if (!chip)
+                        return -ENOMEM;
+
+                chip->enable_dma = 0;
+                chip_info = spi->controller_data;
+        }
+
+        /* chip_info isn't always needed */
+        if (chip_info) {
+                chip->enable_dma = chip_info->enable_dma != 0
+                    && drv_data->master_info->enable_dma;
+                chip->ctl_reg = chip_info->ctl_reg;
+                chip->bits_per_word = chip_info->bits_per_word;
+                chip->cs_change_per_word = chip_info->cs_change_per_word;
+                chip->cs_chg_udelay = chip_info->cs_chg_udelay;
+        }
+
+        /* translate common spi framework into our register */
+        if (spi->mode & SPI_CPOL)
+                chip->ctl_reg |= CPOL;
+        if (spi->mode & SPI_CPHA)
+                chip->ctl_reg |= CPHA;
+        if (spi->mode & SPI_LSB_FIRST)
+                chip->ctl_reg |= LSBF;
+        /* we dont support running in slave mode (yet?) */
+        chip->ctl_reg |= MSTR;
+
+        /*
+         * if any one SPI chip is registered and wants DMA, request the
+         * DMA channel for it
+         */
+        if (chip->enable_dma && !dma_requested) {
+                /* register dma irq handler */
+                if (request_dma(CH_SPI, "BF53x_SPI_DMA") < 0) {
+                        pr_debug
+                            ("Unable to request BlackFin SPI DMA channel\n");
+                        return -ENODEV;
+                }
+                if (set_dma_callback(CH_SPI, (void *)dma_irq_handler, drv_data)
+                    < 0) {
+                        pr_debug("Unable to set dma callback\n");
+                        return -EPERM;
+                }
+                dma_disable_irq(CH_SPI);
+                dma_requested = 1;
+        }
+
+        /*
+         * Notice: for blackfin, the speed_hz is the value of register
+         * SPI_BAUD, not the real baudrate
+         */
+        chip->baud = hz_to_spi_baud(spi->max_speed_hz);
+        spi_flg = ~(1 << (spi->chip_select));
+        chip->flag = ((u16) spi_flg << 8) | (1 << (spi->chip_select));
+        chip->chip_select_num = spi->chip_select;
+
+        switch (chip->bits_per_word) {
+        case 8:
+                chip->n_bytes = 1;
+                chip->width = CFG_SPI_WORDSIZE8;
+                chip->read = chip->cs_change_per_word ?
+                        u8_cs_chg_reader : u8_reader;
+                chip->write = chip->cs_change_per_word ?
+                        u8_cs_chg_writer : u8_writer;
+                chip->duplex = chip->cs_change_per_word ?
+                        u8_cs_chg_duplex : u8_duplex;
+                break;
+
+        case 16:
+                chip->n_bytes = 2;
+                chip->width = CFG_SPI_WORDSIZE16;
+                chip->read = chip->cs_change_per_word ?
+                        u16_cs_chg_reader : u16_reader;
+                chip->write = chip->cs_change_per_word ?
+                        u16_cs_chg_writer : u16_writer;
+                chip->duplex = chip->cs_change_per_word ?
+                        u16_cs_chg_duplex : u16_duplex;
+                break;
+
+        default:
+                dev_err(&spi->dev, "%d bits_per_word is not supported\n",
+                                chip->bits_per_word);
+                kfree(chip);
+                return -ENODEV;
+        }
+
+        pr_debug("setup spi chip %s, width is %d, dma is %d,",
+                        spi->modalias, chip->width, chip->enable_dma);
+        pr_debug("ctl_reg is 0x%x, flag_reg is 0x%x\n",
+                        chip->ctl_reg, chip->flag);
+
+        spi_set_ctldata(spi, chip);
+
+        return 0;
+}
+
+/*
+ * callback for spi framework.
+ * clean driver specific data
+ */
+static void cleanup(const struct spi_device *spi)
+{
+        struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
+
+        kfree(chip);
+}
+
+static inline int init_queue(struct driver_data *drv_data)
+{
+        INIT_LIST_HEAD(&drv_data->queue);
+        spin_lock_init(&drv_data->lock);
+
+        drv_data->run = QUEUE_STOPPED;
+        drv_data->busy = 0;
+
+        /* init transfer tasklet */
+        tasklet_init(&drv_data->pump_transfers,
+                     pump_transfers, (unsigned long)drv_data);
+
+        /* init messages workqueue */
+        INIT_WORK(&drv_data->pump_messages, pump_messages);
+        drv_data->workqueue =
+            create_singlethread_workqueue(drv_data->master->cdev.dev->bus_id);
+        if (drv_data->workqueue == NULL)
+                return -EBUSY;
+
+        return 0;
+}
+
+static inline int start_queue(struct driver_data *drv_data)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&drv_data->lock, flags);
+
+        if (drv_data->run == QUEUE_RUNNING || drv_data->busy) {
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                return -EBUSY;
+        }
+
+        drv_data->run = QUEUE_RUNNING;
+        drv_data->cur_msg = NULL;
+        drv_data->cur_transfer = NULL;
+        drv_data->cur_chip = NULL;
+        spin_unlock_irqrestore(&drv_data->lock, flags);
+
+        queue_work(drv_data->workqueue, &drv_data->pump_messages);
+
+        return 0;
+}
+
+static inline int stop_queue(struct driver_data *drv_data)
+{
+        unsigned long flags;
+        unsigned limit = 500;
+        int status = 0;
+
+        spin_lock_irqsave(&drv_data->lock, flags);
+
+        /*
+         * This is a bit lame, but is optimized for the common execution path.
+         * A wait_queue on the drv_data->busy could be used, but then the common
+         * execution path (pump_messages) would be required to call wake_up or
+         * friends on every SPI message. Do this instead
+         */
+        drv_data->run = QUEUE_STOPPED;
+        while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) {
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                msleep(10);
+                spin_lock_irqsave(&drv_data->lock, flags);
+        }
+
+        if (!list_empty(&drv_data->queue) || drv_data->busy)
+                status = -EBUSY;
+
+        spin_unlock_irqrestore(&drv_data->lock, flags);
+
+        return status;
+}
+
+static inline int destroy_queue(struct driver_data *drv_data)
+{
+        int status;
+
+        status = stop_queue(drv_data);
+        if (status != 0)
+                return status;
+
+        destroy_workqueue(drv_data->workqueue);
+
+        return 0;
+}
+
+static int __init bfin5xx_spi_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct bfin5xx_spi_master *platform_info;
+        struct spi_master *master;
+        struct driver_data *drv_data = 0;
+        int status = 0;
+
+        platform_info = dev->platform_data;
+
+        /* Allocate master with space for drv_data */
+        master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
+        if (!master) {
+                dev_err(&pdev->dev, "can not alloc spi_master\n");
+                return -ENOMEM;
+        }
+        drv_data = spi_master_get_devdata(master);
+        drv_data->master = master;
+        drv_data->master_info = platform_info;
+        drv_data->pdev = pdev;
+
+        master->bus_num = pdev->id;
+        master->num_chipselect = platform_info->num_chipselect;
+        master->cleanup = cleanup;
+        master->setup = setup;
+        master->transfer = transfer;
+
+        /* Initial and start queue */
+        status = init_queue(drv_data);
+        if (status != 0) {
+                dev_err(&pdev->dev, "problem initializing queue\n");
+                goto out_error_queue_alloc;
+        }
+        status = start_queue(drv_data);
+        if (status != 0) {
+                dev_err(&pdev->dev, "problem starting queue\n");
+                goto out_error_queue_alloc;
+        }
+
+        /* Register with the SPI framework */
+        platform_set_drvdata(pdev, drv_data);
+        status = spi_register_master(master);
+        if (status != 0) {
+                dev_err(&pdev->dev, "problem registering spi master\n");
+                goto out_error_queue_alloc;
+        }
+        pr_debug("controller probe successfully\n");
+        return status;
+
+      out_error_queue_alloc:
+        destroy_queue(drv_data);
+        spi_master_put(master);
+        return status;
+}
+
+/* stop hardware and remove the driver */
+static int __devexit bfin5xx_spi_remove(struct platform_device *pdev)
+{
+        struct driver_data *drv_data = platform_get_drvdata(pdev);
+        int status = 0;
+
+        if (!drv_data)
+                return 0;
+
+        /* Remove the queue */
+        status = destroy_queue(drv_data);
+        if (status != 0)
+                return status;
+
+        /* Disable the SSP at the peripheral and SOC level */
+        bfin_spi_disable(drv_data);
+
+        /* Release DMA */
+        if (drv_data->master_info->enable_dma) {
+                if (dma_channel_active(CH_SPI))
+                        free_dma(CH_SPI);
+        }
+
+        /* Disconnect from the SPI framework */
+        spi_unregister_master(drv_data->master);
+
+        /* Prevent double remove */
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bfin5xx_spi_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct driver_data *drv_data = platform_get_drvdata(pdev);
+        int status = 0;
+
+        status = stop_queue(drv_data);
+        if (status != 0)
+                return status;
+
+        /* stop hardware */
+        bfin_spi_disable(drv_data);
+
+        return 0;
+}
+
+static int bfin5xx_spi_resume(struct platform_device *pdev)
+{
+        struct driver_data *drv_data = platform_get_drvdata(pdev);
+        int status = 0;
+
+        /* Enable the SPI interface */
+        bfin_spi_enable(drv_data);
+
+        /* Start the queue running */
+        status = start_queue(drv_data);
+        if (status != 0) {
+                dev_err(&pdev->dev, "problem starting queue (%d)\n", status);
+                return status;
+        }
+
+        return 0;
+}
+#else
+#define bfin5xx_spi_suspend NULL
+#define bfin5xx_spi_resume NULL
+#endif                          /* CONFIG_PM */
+
+static struct platform_driver bfin5xx_spi_driver = {
+        .driver = {
+                   .name = "bfin-spi-master",
+                   .bus = &platform_bus_type,
+                   .owner = THIS_MODULE,
+                   },
+        .probe = bfin5xx_spi_probe,
+        .remove = __devexit_p(bfin5xx_spi_remove),
+        .suspend = bfin5xx_spi_suspend,
+        .resume = bfin5xx_spi_resume,
+};
+
+static int __init bfin5xx_spi_init(void)
+{
+        return platform_driver_register(&bfin5xx_spi_driver);
+}
+
+module_init(bfin5xx_spi_init);
+
+static void __exit bfin5xx_spi_exit(void)
+{
+        platform_driver_unregister(&bfin5xx_spi_driver);
+}
+
+module_exit(bfin5xx_spi_exit);
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index b10211c420ef..d5a710f6e445 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -342,8 +342,6 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
                 goto err_register;
         }
 
-        dev_dbg(hw->dev, "shutdown=%d\n", hw->bitbang.shutdown);
-
         /* register all the devices associated */
 
         bi = &hw->pdata->board_info[0];
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 2c043a1ea156..84392e835d5f 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1483,7 +1483,7 @@ static void udc_disable(struct pxa2xx_udc *dev)
 
 #ifdef  CONFIG_ARCH_PXA
         /* Disable clock for USB device */
-        pxa_set_cken(CKEN11_USB, 0);
+        pxa_set_cken(CKEN_USB, 0);
 #endif
 
         ep0_idle (dev);
@@ -1529,7 +1529,7 @@ static void udc_enable (struct pxa2xx_udc *dev)
 
 #ifdef  CONFIG_ARCH_PXA
         /* Enable clock for USB device */
-        pxa_set_cken(CKEN11_USB, 1);
+        pxa_set_cken(CKEN_USB, 1);
         udelay(5);
 #endif
 
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 29dcd27b55de..37b83ba09969 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -73,13 +73,6 @@ static const struct hc_driver ps3_ehci_hc_driver = {
 #endif
 };
 
-#if !defined(DEBUG)
-#undef dev_dbg
-static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
-        const struct device *_dev, const char *fmt, ...) {return 0;}
-#endif
-
-
 static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
 {
         int result;
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 93a6eb0de2d1..d7cf07288b0b 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -75,14 +75,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
 #endif
 };
 
-/* redefine dev_dbg to do a syntax check */
-
-#if !defined(DEBUG)
-#undef dev_dbg
-static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
-        const struct device *_dev, const char *fmt, ...) {return 0;}
-#endif
-
 static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
 {
         int result;
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index f1563dc319d3..23d2fe5a62f4 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -80,7 +80,7 @@ static int pxa27x_start_hc(struct device *dev)
 
         inf = dev->platform_data;
 
-        pxa_set_cken(CKEN10_USBHOST, 1);
+        pxa_set_cken(CKEN_USBHOST, 1);
 
         UHCHR |= UHCHR_FHR;
         udelay(11);
@@ -123,7 +123,7 @@ static void pxa27x_stop_hc(struct device *dev)
         UHCCOMS |= 1;
         udelay(10);
 
-        pxa_set_cken(CKEN10_USBHOST, 0);
+        pxa_set_cken(CKEN_USBHOST, 0);
 }
 
 
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 9bf420eef77f..284a0734e0cd 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -10,9 +10,6 @@ obj-$(CONFIG_USB_ATI_REMOTE)	+= ati_remote.o
 obj-$(CONFIG_USB_ATI_REMOTE2)   += ati_remote2.o
 obj-$(CONFIG_USB_KBTAB)         += kbtab.o
 obj-$(CONFIG_USB_KEYSPAN_REMOTE)        += keyspan_remote.o
-obj-$(CONFIG_USB_MTOUCH)        += mtouchusb.o
-obj-$(CONFIG_USB_ITMTOUCH)      += itmtouch.o
-obj-$(CONFIG_USB_EGALAX)        += touchkitusb.o
 obj-$(CONFIG_USB_TOUCHSCREEN)   += usbtouchscreen.o
 obj-$(CONFIG_USB_POWERMATE)     += powermate.o
 obj-$(CONFIG_USB_WACOM)         += wacom.o
@@ -20,7 +17,7 @@ obj-$(CONFIG_USB_ACECAD)	+= acecad.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
-obj-$(CONFIG_USB_GTCO)         += gtco.o
+obj-$(CONFIG_USB_GTCO)          += gtco.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 909138e5aa04..be8e9243c062 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -111,7 +111,7 @@ resubmit:
 
 static int usb_acecad_open(struct input_dev *dev)
 {
-        struct usb_acecad *acecad = dev->private;
+        struct usb_acecad *acecad = input_get_drvdata(dev);
 
         acecad->irq->dev = acecad->usbdev;
         if (usb_submit_urb(acecad->irq, GFP_KERNEL))
@@ -122,7 +122,7 @@ static int usb_acecad_open(struct input_dev *dev)
 
 static void usb_acecad_close(struct input_dev *dev)
 {
-        struct usb_acecad *acecad = dev->private;
+        struct usb_acecad *acecad = input_get_drvdata(dev);
 
         usb_kill_urb(acecad->irq);
 }
@@ -135,6 +135,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         struct usb_acecad *acecad;
         struct input_dev *input_dev;
         int pipe, maxp;
+        int err = -ENOMEM;
 
         if (interface->desc.bNumEndpoints != 1)
                 return -ENODEV;
@@ -149,16 +150,22 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
 
         acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!acecad || !input_dev)
+        if (!acecad || !input_dev) {
+                err = -ENOMEM;
                 goto fail1;
+        }
 
         acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma);
-        if (!acecad->data)
+        if (!acecad->data) {
+                err= -ENOMEM;
                 goto fail1;
+        }
 
         acecad->irq = usb_alloc_urb(0, GFP_KERNEL);
-        if (!acecad->irq)
+        if (!acecad->irq) {
+                err = -ENOMEM;
                 goto fail2;
+        }
 
         acecad->usbdev = dev;
         acecad->input = input_dev;
@@ -178,8 +185,9 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         input_dev->name = acecad->name;
         input_dev->phys = acecad->phys;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = acecad;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, acecad);
 
         input_dev->open = usb_acecad_open;
         input_dev->close = usb_acecad_close;
@@ -221,7 +229,9 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         acecad->irq->transfer_dma = acecad->data_dma;
         acecad->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        input_register_device(acecad->input);
+        err = input_register_device(acecad->input);
+        if (err)
+                goto fail2;
 
         usb_set_intfdata(intf, acecad);
 
@@ -230,7 +240,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
  fail2: usb_buffer_free(dev, 8, acecad->data, acecad->data_dma);
  fail1: input_free_device(input_dev);
         kfree(acecad);
-        return -ENOMEM;
+        return err;
 }
 
 static void usb_acecad_disconnect(struct usb_interface *intf)
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index f857935e615c..cc0a498763d8 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -798,7 +798,7 @@ MODULE_DEVICE_TABLE(usb, aiptek_ids);
  */
 static int aiptek_open(struct input_dev *inputdev)
 {
-        struct aiptek *aiptek = inputdev->private;
+        struct aiptek *aiptek = input_get_drvdata(inputdev);
 
         aiptek->urb->dev = aiptek->usbdev;
         if (usb_submit_urb(aiptek->urb, GFP_KERNEL) != 0)
@@ -812,7 +812,7 @@ static int aiptek_open(struct input_dev *inputdev)
  */
 static void aiptek_close(struct input_dev *inputdev)
 {
-        struct aiptek *aiptek = inputdev->private;
+        struct aiptek *aiptek = input_get_drvdata(inputdev);
 
         usb_kill_urb(aiptek->urb);
 }
@@ -1972,6 +1972,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 AIPTEK_PROGRAMMABLE_DELAY_200,
                 AIPTEK_PROGRAMMABLE_DELAY_300
         };
+        int err = -ENOMEM;
 
         /* programmableDelay is where the command-line specified
          * delay is kept. We make it the first element of speeds[],
@@ -2043,8 +2044,10 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         inputdev->name = "Aiptek";
         inputdev->phys = aiptek->features.usbPath;
         usb_to_input_id(usbdev, &inputdev->id);
-        inputdev->cdev.dev = &intf->dev;
-        inputdev->private = aiptek;
+        inputdev->dev.parent = &intf->dev;
+
+        input_set_drvdata(inputdev, aiptek);
+
         inputdev->open = aiptek_open;
         inputdev->close = aiptek_close;
 
@@ -2133,7 +2136,9 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         /* Register the tablet as an Input Device
          */
-        input_register_device(aiptek->inputdev);
+        err = input_register_device(aiptek->inputdev);
+        if (err)
+                goto fail2;
 
         /* We now will look for the evdev device which is mapped to
          * the tablet. The partial name is kept in the link list of
@@ -2165,23 +2170,13 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         return 0;
 
-fail2:  usb_buffer_free(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data,
+ fail2: usb_buffer_free(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data,
                         aiptek->data_dma);
-fail1:  input_free_device(inputdev);
+ fail1: input_free_device(inputdev);
         kfree(aiptek);
-        return -ENOMEM;
+        return err;
 }
 
-/* Forward declaration */
-static void aiptek_disconnect(struct usb_interface *intf);
-
-static struct usb_driver aiptek_driver = {
-        .name = "aiptek",
-        .probe = aiptek_probe,
-        .disconnect = aiptek_disconnect,
-        .id_table = aiptek_ids,
-};
-
 /***********************************************************************
  * Deal with tablet disconnecting from the system.
  */
@@ -2206,6 +2201,13 @@ static void aiptek_disconnect(struct usb_interface *intf)
         }
 }
 
+static struct usb_driver aiptek_driver = {
+        .name = "aiptek",
+        .probe = aiptek_probe,
+        .disconnect = aiptek_disconnect,
+        .id_table = aiptek_ids,
+};
+
 static int __init aiptek_init(void)
 {
         int result = usb_register(&aiptek_driver);
diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c
index c77291d3d063..e3215267db11 100644
--- a/drivers/usb/input/appletouch.c
+++ b/drivers/usb/input/appletouch.c
@@ -466,7 +466,7 @@ exit:
 
 static int atp_open(struct input_dev *input)
 {
-        struct atp *dev = input->private;
+        struct atp *dev = input_get_drvdata(input);
 
         if (usb_submit_urb(dev->urb, GFP_ATOMIC))
                 return -EIO;
@@ -477,7 +477,7 @@ static int atp_open(struct input_dev *input)
 
 static void atp_close(struct input_dev *input)
 {
-        struct atp *dev = input->private;
+        struct atp *dev = input_get_drvdata(input);
 
         usb_kill_urb(dev->urb);
         dev->open = 0;
@@ -491,8 +491,7 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
         int int_in_endpointAddr = 0;
-        int i, retval = -ENOMEM;
-
+        int i, error = -ENOMEM;
 
         /* set up the endpoint information */
         /* use only the first interrupt-in endpoint */
@@ -567,17 +566,13 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
         }
 
         dev->urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!dev->urb) {
-                retval = -ENOMEM;
+        if (!dev->urb)
                 goto err_free_devs;
-        }
 
         dev->data = usb_buffer_alloc(dev->udev, dev->datalen, GFP_KERNEL,
                                      &dev->urb->transfer_dma);
-        if (!dev->data) {
-                retval = -ENOMEM;
+        if (!dev->data)
                 goto err_free_urb;
-        }
 
         usb_fill_int_urb(dev->urb, udev,
                          usb_rcvintpipe(udev, int_in_endpointAddr),
@@ -589,9 +584,10 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
         input_dev->name = "appletouch";
         input_dev->phys = dev->phys;
         usb_to_input_id(dev->udev, &input_dev->id);
-        input_dev->cdev.dev = &iface->dev;
+        input_dev->dev.parent = &iface->dev;
+
+        input_set_drvdata(input_dev, dev);
 
-        input_dev->private = dev;
         input_dev->open = atp_open;
         input_dev->close = atp_close;
 
@@ -633,20 +629,25 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
         set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
         set_bit(BTN_LEFT, input_dev->keybit);
 
-        input_register_device(dev->input);
+        error = input_register_device(dev->input);
+        if (error)
+                goto err_free_buffer;
 
         /* save our data pointer in this interface device */
         usb_set_intfdata(iface, dev);
 
         return 0;
 
+ err_free_buffer:
+        usb_buffer_free(dev->udev, dev->datalen,
+                        dev->data, dev->urb->transfer_dma);
  err_free_urb:
         usb_free_urb(dev->urb);
  err_free_devs:
         usb_set_intfdata(iface, NULL);
         kfree(dev);
         input_free_device(input_dev);
-        return retval;
+        return error;
 }
 
 static void atp_disconnect(struct usb_interface *iface)
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index b724e36f7b92..471aab206443 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -120,6 +120,7 @@
  * behaviour.
  */
 #define FILTER_TIME     60 /* msec */
+#define REPEAT_DELAY    500 /* msec */
 
 static unsigned long channel_mask;
 module_param(channel_mask, ulong, 0644);
@@ -133,6 +134,10 @@ static int repeat_filter = FILTER_TIME;
 module_param(repeat_filter, int, 0644);
 MODULE_PARM_DESC(repeat_filter, "Repeat filter time, default = 60 msec");
 
+static int repeat_delay = REPEAT_DELAY;
+module_param(repeat_delay, int, 0644);
+MODULE_PARM_DESC(repeat_delay, "Delay before sending repeats, default = 500 msec");
+
 #define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
 #undef err
 #define err(format, arg...) printk(KERN_ERR format , ## arg)
@@ -174,6 +179,8 @@ struct ati_remote {
         unsigned char old_data[2];  /* Detect duplicate events */
         unsigned long old_jiffies;
         unsigned long acc_jiffies;  /* handle acceleration */
+        unsigned long first_jiffies;
+
         unsigned int repeat_count;
 
         char name[NAME_BUFSIZE];
@@ -318,7 +325,7 @@ static void ati_remote_dump(unsigned char *data, unsigned int len)
  */
 static int ati_remote_open(struct input_dev *inputdev)
 {
-        struct ati_remote *ati_remote = inputdev->private;
+        struct ati_remote *ati_remote = input_get_drvdata(inputdev);
 
         /* On first open, submit the read urb which was set up previously. */
         ati_remote->irq_urb->dev = ati_remote->udev;
@@ -336,7 +343,7 @@ static int ati_remote_open(struct input_dev *inputdev)
  */
 static void ati_remote_close(struct input_dev *inputdev)
 {
-        struct ati_remote *ati_remote = inputdev->private;
+        struct ati_remote *ati_remote = input_get_drvdata(inputdev);
 
         usb_kill_urb(ati_remote->irq_urb);
 }
@@ -501,21 +508,31 @@ static void ati_remote_input_report(struct urb *urb)
         }
 
         if (ati_remote_tbl[index].kind == KIND_FILTERED) {
+                unsigned long now = jiffies;
+
                 /* Filter duplicate events which happen "too close" together. */
                 if (ati_remote->old_data[0] == data[1] &&
                     ati_remote->old_data[1] == data[2] &&
-                    time_before(jiffies, ati_remote->old_jiffies + msecs_to_jiffies(repeat_filter))) {
+                    time_before(now, ati_remote->old_jiffies +
+                                     msecs_to_jiffies(repeat_filter))) {
                         ati_remote->repeat_count++;
                 } else {
                         ati_remote->repeat_count = 0;
+                        ati_remote->first_jiffies = now;
                 }
 
                 ati_remote->old_data[0] = data[1];
                 ati_remote->old_data[1] = data[2];
-                ati_remote->old_jiffies = jiffies;
+                ati_remote->old_jiffies = now;
 
+                /* Ensure we skip at least the 4 first duplicate events (generated
+                 * by a single keypress), and continue skipping until repeat_delay
+                 * msecs have passed
+                 */
                 if (ati_remote->repeat_count > 0 &&
-                    ati_remote->repeat_count < 5)
+                    (ati_remote->repeat_count < 5 ||
+                     time_before(now, ati_remote->first_jiffies +
+                                      msecs_to_jiffies(repeat_delay))))
                         return;
 
 
@@ -653,7 +670,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
                 if (ati_remote_tbl[i].type == EV_KEY)
                         set_bit(ati_remote_tbl[i].code, idev->keybit);
 
-        idev->private = ati_remote;
+        input_set_drvdata(idev, ati_remote);
+
         idev->open = ati_remote_open;
         idev->close = ati_remote_close;
 
@@ -661,7 +679,7 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
         idev->phys = ati_remote->phys;
 
         usb_to_input_id(ati_remote->udev, &idev->id);
-        idev->cdev.dev = &ati_remote->udev->dev;
+        idev->dev.parent = &ati_remote->udev->dev;
 }
 
 static int ati_remote_initialize(struct ati_remote *ati_remote)
@@ -772,15 +790,17 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
                 goto fail3;
 
         /* Set up and register input device */
-        input_register_device(ati_remote->idev);
+        err = input_register_device(ati_remote->idev);
+        if (err)
+                goto fail3;
 
         usb_set_intfdata(interface, ati_remote);
         return 0;
 
-fail3:  usb_kill_urb(ati_remote->irq_urb);
+ fail3: usb_kill_urb(ati_remote->irq_urb);
         usb_kill_urb(ati_remote->out_urb);
-fail2:  ati_remote_free_buffers(ati_remote);
-fail1:  input_free_device(input_dev);
+ fail2: ati_remote_free_buffers(ati_remote);
+ fail1: input_free_device(input_dev);
         kfree(ati_remote);
         return err;
 }
diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c
index 6459be90599c..a9032aa3465f 100644
--- a/drivers/usb/input/ati_remote2.c
+++ b/drivers/usb/input/ati_remote2.c
@@ -131,7 +131,7 @@ static struct usb_driver ati_remote2_driver = {
 
 static int ati_remote2_open(struct input_dev *idev)
 {
-        struct ati_remote2 *ar2 = idev->private;
+        struct ati_remote2 *ar2 = input_get_drvdata(idev);
         int r;
 
         r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
@@ -153,7 +153,7 @@ static int ati_remote2_open(struct input_dev *idev)
 
 static void ati_remote2_close(struct input_dev *idev)
 {
-        struct ati_remote2 *ar2 = idev->private;
+        struct ati_remote2 *ar2 = input_get_drvdata(idev);
 
         usb_kill_urb(ar2->urb[0]);
         usb_kill_urb(ar2->urb[1]);
@@ -337,14 +337,14 @@ static void ati_remote2_complete_key(struct urb *urb)
 static int ati_remote2_input_init(struct ati_remote2 *ar2)
 {
         struct input_dev *idev;
-        int i;
+        int i, retval;
 
         idev = input_allocate_device();
         if (!idev)
                 return -ENOMEM;
 
         ar2->idev = idev;
-        idev->private = ar2;
+        input_set_drvdata(idev, ar2);
 
         idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
         idev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
@@ -362,13 +362,13 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
         idev->phys = ar2->phys;
 
         usb_to_input_id(ar2->udev, &idev->id);
-        idev->cdev.dev = &ar2->udev->dev;
+        idev->dev.parent = &ar2->udev->dev;
 
-        i = input_register_device(idev);
-        if (i)
+        retval = input_register_device(idev);
+        if (retval)
                 input_free_device(idev);
 
-        return i;
+        return retval;
 }
 
 static int ati_remote2_urb_init(struct ati_remote2 *ar2)
diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c
index ae756e0afc99..b2ca10f2fe0e 100644
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@ -187,7 +187,6 @@ struct hid_descriptor
 
 
 /*
- *
  *   This is an abbreviated parser for the HID Report Descriptor.  We
  *   know what devices we are talking to, so this is by no means meant
  *   to be generic.  We can make some safe assumptions:
@@ -204,7 +203,7 @@ struct hid_descriptor
 static void parse_hid_report_descriptor(struct gtco *device, char * report,
                                         int length)
 {
-        int   x,i=0;
+        int   x, i = 0;
 
         /* Tag primitive vars */
         __u8   prefix;
@@ -215,7 +214,6 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
         __u16  data16 = 0;
         __u32  data32 = 0;
 
-
         /* For parsing logic */
         int   inputnum = 0;
         __u32 usage = 0;
@@ -225,46 +223,46 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
         __u32 oldval[TAG_GLOB_MAX];
 
         /* Debug stuff */
-        char  maintype='x';
+        char  maintype = 'x';
         char  globtype[12];
-        int   indent=0;
-        char  indentstr[10]="";
-
+        int   indent = 0;
+        char  indentstr[10] = "";
 
 
         dbg("======>>>>>>PARSE<<<<<<======");
 
         /* Walk  this report and pull out the info we need */
-        while (i<length){
-                prefix=report[i];
+        while (i < length) {
+                prefix = report[i];
 
                 /* Skip over prefix */
                 i++;
 
                 /* Determine data size and save the data in the proper variable */
                 size = PREF_SIZE(prefix);
-                switch(size){
+                switch (size) {
                 case 1:
                         data = report[i];
                         break;
                 case 2:
-                        data16 = le16_to_cpu(get_unaligned((__le16*)(&(report[i]))));
+                        data16 = le16_to_cpu(get_unaligned((__le16 *)&report[i]));
                         break;
                 case 3:
                         size = 4;
-                        data32 = le32_to_cpu(get_unaligned((__le32*)(&(report[i]))));
+                        data32 = le32_to_cpu(get_unaligned((__le32 *)&report[i]));
+                        break;
                 }
 
                 /* Skip size of data */
-                i+=size;
+                i += size;
 
                 /* What we do depends on the tag type */
                 tag  = PREF_TAG(prefix);
                 type = PREF_TYPE(prefix);
-                switch(type){
+                switch (type) {
                 case TYPE_MAIN:
-                        strcpy(globtype,"");
-                        switch(tag){
+                        strcpy(globtype, "");
+                        switch (tag) {
 
                         case TAG_MAIN_INPUT:
                                 /*
@@ -274,19 +272,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
                                  * min/max values
                                  */
 
-                                maintype='I';
-                                if (data==2){
-                                        strcpy(globtype,"Variable");
-                                }
-                                if (data==3){
-                                        strcpy(globtype,"Var|Const");
-                                }
+                                maintype = 'I';
+                                if (data == 2)
+                                        strcpy(globtype, "Variable");
+                                else if (data == 3)
+                                        strcpy(globtype, "Var|Const");
 
                                 dbg("::::: Saving Report: %d input #%d Max: 0x%X(%d) Min:0x%X(%d) of %d bits",
-                                    globalval[TAG_GLOB_REPORT_ID],inputnum,
-                                    globalval[TAG_GLOB_LOG_MAX],globalval[TAG_GLOB_LOG_MAX],
-                                    globalval[TAG_GLOB_LOG_MIN],globalval[TAG_GLOB_LOG_MIN],
-                                    (globalval[TAG_GLOB_REPORT_SZ] * globalval[TAG_GLOB_REPORT_CNT]));
+                                    globalval[TAG_GLOB_REPORT_ID], inputnum,
+                                    globalval[TAG_GLOB_LOG_MAX], globalval[TAG_GLOB_LOG_MAX],
+                                    globalval[TAG_GLOB_LOG_MIN], globalval[TAG_GLOB_LOG_MIN],
+                                    globalval[TAG_GLOB_REPORT_SZ] * globalval[TAG_GLOB_REPORT_CNT]);
 
 
                                 /*
@@ -295,43 +291,43 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
                                   that, we look for everything else by
                                   local usage value
                                  */
-                                switch (inputnum){
+                                switch (inputnum) {
                                 case 0:  /* X coord */
-                                        dbg("GER: X Usage: 0x%x",usage);
-                                        if (device->max_X == 0){
+                                        dbg("GER: X Usage: 0x%x", usage);
+                                        if (device->max_X == 0) {
                                                 device->max_X = globalval[TAG_GLOB_LOG_MAX];
                                                 device->min_X = globalval[TAG_GLOB_LOG_MIN];
                                         }
-
                                         break;
+
                                 case 1:  /* Y coord */
-                                        dbg("GER: Y Usage: 0x%x",usage);
-                                        if (device->max_Y == 0){
+                                        dbg("GER: Y Usage: 0x%x", usage);
+                                        if (device->max_Y == 0) {
                                                 device->max_Y = globalval[TAG_GLOB_LOG_MAX];
                                                 device->min_Y = globalval[TAG_GLOB_LOG_MIN];
                                         }
                                         break;
+
                                 default:
                                         /* Tilt X */
-                                        if (usage == DIGITIZER_USAGE_TILT_X){
-                                                if (device->maxtilt_X == 0){
+                                        if (usage == DIGITIZER_USAGE_TILT_X) {
+                                                if (device->maxtilt_X == 0) {
                                                         device->maxtilt_X = globalval[TAG_GLOB_LOG_MAX];
                                                         device->mintilt_X = globalval[TAG_GLOB_LOG_MIN];
                                                 }
                                         }
 
                                         /* Tilt Y */
-                                        if (usage == DIGITIZER_USAGE_TILT_Y){
-                                                if (device->maxtilt_Y == 0){
+                                        if (usage == DIGITIZER_USAGE_TILT_Y) {
+                                                if (device->maxtilt_Y == 0) {
                                                         device->maxtilt_Y = globalval[TAG_GLOB_LOG_MAX];
                                                         device->mintilt_Y = globalval[TAG_GLOB_LOG_MIN];
                                                 }
                                         }
 
-
                                         /* Pressure */
-                                        if (usage == DIGITIZER_USAGE_TIP_PRESSURE){
-                                                if (device->maxpressure == 0){
+                                        if (usage == DIGITIZER_USAGE_TIP_PRESSURE) {
+                                                if (device->maxpressure == 0) {
                                                         device->maxpressure = globalval[TAG_GLOB_LOG_MAX];
                                                         device->minpressure = globalval[TAG_GLOB_LOG_MIN];
                                                 }
@@ -341,214 +337,226 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
                                 }
 
                                 inputnum++;
-
-
                                 break;
+
                         case TAG_MAIN_OUTPUT:
-                                maintype='O';
+                                maintype = 'O';
                                 break;
+
                         case TAG_MAIN_FEATURE:
-                                maintype='F';
+                                maintype = 'F';
                                 break;
+
                         case TAG_MAIN_COL_START:
-                                maintype='S';
+                                maintype = 'S';
 
-                                if (data==0){
+                                if (data == 0) {
                                         dbg("======>>>>>> Physical");
-                                        strcpy(globtype,"Physical");
-                                }else{
+                                        strcpy(globtype, "Physical");
+                                } else
                                         dbg("======>>>>>>");
-                                }
 
                                 /* Indent the debug output */
                                 indent++;
-                                for (x=0;x<indent;x++){
-                                        indentstr[x]='-';
-                                }
-                                indentstr[x]=0;
+                                for (x = 0; x < indent; x++)
+                                        indentstr[x] = '-';
+                                indentstr[x] = 0;
 
                                 /* Save global tags */
-                                for (x=0;x<TAG_GLOB_MAX;x++){
+                                for (x = 0; x < TAG_GLOB_MAX; x++)
                                         oldval[x] = globalval[x];
-                                }
 
                                 break;
+
                         case TAG_MAIN_COL_END:
                                 dbg("<<<<<<======");
-                                maintype='E';
+                                maintype = 'E';
                                 indent--;
-                                for (x=0;x<indent;x++){
-                                        indentstr[x]='-';
-                                }
-                                indentstr[x]=0;
+                                for (x = 0; x < indent; x++)
+                                        indentstr[x] = '-';
+                                indentstr[x] = 0;
 
                                 /* Copy global tags back */
-                                for (x=0;x<TAG_GLOB_MAX;x++){
+                                for (x = 0; x < TAG_GLOB_MAX; x++)
                                         globalval[x] = oldval[x];
-                                }
 
                                 break;
                         }
 
-                        switch (size){
+                        switch (size) {
                         case 1:
                                 dbg("%sMAINTAG:(%d) %c SIZE: %d Data: %s 0x%x",
-                                    indentstr,tag,maintype,size,globtype,data);
+                                    indentstr, tag, maintype, size, globtype, data);
                                 break;
+
                         case 2:
                                 dbg("%sMAINTAG:(%d) %c SIZE: %d Data: %s 0x%x",
-                                    indentstr,tag,maintype,size,globtype, data16);
+                                    indentstr, tag, maintype, size, globtype, data16);
                                 break;
+
                         case 4:
                                 dbg("%sMAINTAG:(%d) %c SIZE: %d Data: %s 0x%x",
-                                    indentstr,tag,maintype,size,globtype,data32);
+                                    indentstr, tag, maintype, size, globtype, data32);
                                 break;
                         }
                         break;
+
                 case TYPE_GLOBAL:
-                        switch(tag){
+                        switch (tag) {
                         case TAG_GLOB_USAGE:
                                 /*
                                  * First time we hit the global usage tag,
                                  * it should tell us the type of device
                                  */
-                                if (device->usage == 0){
+                                if (device->usage == 0)
                                         device->usage = data;
-                                }
-                                strcpy(globtype,"USAGE");
+
+                                strcpy(globtype, "USAGE");
                                 break;
-                        case TAG_GLOB_LOG_MIN   :
-                                strcpy(globtype,"LOG_MIN");
+
+                        case TAG_GLOB_LOG_MIN:
+                                strcpy(globtype, "LOG_MIN");
                                 break;
-                        case TAG_GLOB_LOG_MAX   :
-                                strcpy(globtype,"LOG_MAX");
+
+                        case TAG_GLOB_LOG_MAX:
+                                strcpy(globtype, "LOG_MAX");
                                 break;
-                        case TAG_GLOB_PHYS_MIN  :
-                                strcpy(globtype,"PHYS_MIN");
+
+                        case TAG_GLOB_PHYS_MIN:
+                                strcpy(globtype, "PHYS_MIN");
                                 break;
-                        case TAG_GLOB_PHYS_MAX  :
-                                strcpy(globtype,"PHYS_MAX");
+
+                        case TAG_GLOB_PHYS_MAX:
+                                strcpy(globtype, "PHYS_MAX");
                                 break;
-                        case TAG_GLOB_UNIT_EXP  :
-                                strcpy(globtype,"EXP");
+
+                        case TAG_GLOB_UNIT_EXP:
+                                strcpy(globtype, "EXP");
                                 break;
-                        case TAG_GLOB_UNIT      :
-                                strcpy(globtype,"UNIT");
+
+                        case TAG_GLOB_UNIT:
+                                strcpy(globtype, "UNIT");
                                 break;
-                        case TAG_GLOB_REPORT_SZ :
-                                strcpy(globtype,"REPORT_SZ");
+
+                        case TAG_GLOB_REPORT_SZ:
+                                strcpy(globtype, "REPORT_SZ");
                                 break;
-                        case TAG_GLOB_REPORT_ID :
-                                strcpy(globtype,"REPORT_ID");
+
+                        case TAG_GLOB_REPORT_ID:
+                                strcpy(globtype, "REPORT_ID");
                                 /* New report, restart numbering */
-                                inputnum=0;
+                                inputnum = 0;
                                 break;
+
                         case TAG_GLOB_REPORT_CNT:
-                                strcpy(globtype,"REPORT_CNT");
+                                strcpy(globtype, "REPORT_CNT");
                                 break;
-                        case TAG_GLOB_PUSH :
-                                strcpy(globtype,"PUSH");
+
+                        case TAG_GLOB_PUSH:
+                                strcpy(globtype, "PUSH");
                                 break;
+
                         case TAG_GLOB_POP:
-                                strcpy(globtype,"POP");
+                                strcpy(globtype, "POP");
                                 break;
                         }
 
-
                         /* Check to make sure we have a good tag number
                            so we don't overflow array */
-                        if (tag < TAG_GLOB_MAX){
-                                switch (size){
+                        if (tag < TAG_GLOB_MAX) {
+                                switch (size) {
                                 case 1:
-                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",indentstr,globtype,tag,size,data);
-                                        globalval[tag]=data;
+                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",
+                                            indentstr, globtype, tag, size, data);
+                                        globalval[tag] = data;
                                         break;
+
                                 case 2:
-                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",indentstr,globtype,tag,size,data16);
-                                        globalval[tag]=data16;
+                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",
+                                            indentstr, globtype, tag, size, data16);
+                                        globalval[tag] = data16;
                                         break;
+
                                 case 4:
-                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",indentstr,globtype,tag,size,data32);
-                                        globalval[tag]=data32;
+                                        dbg("%sGLOBALTAG:%s(%d) SIZE: %d Data: 0x%x",
+                                            indentstr, globtype, tag, size, data32);
+                                        globalval[tag] = data32;
                                         break;
                                 }
-                        }else{
+                        } else {
                                 dbg("%sGLOBALTAG: ILLEGAL TAG:%d SIZE: %d ",
-                                    indentstr,tag,size);
+                                    indentstr, tag, size);
                         }
-
-
                         break;
 
                 case TYPE_LOCAL:
-                        switch(tag){
+                        switch (tag) {
                         case TAG_GLOB_USAGE:
-                                strcpy(globtype,"USAGE");
+                                strcpy(globtype, "USAGE");
                                 /* Always 1 byte */
                                 usage = data;
                                 break;
-                        case TAG_GLOB_LOG_MIN   :
-                                strcpy(globtype,"MIN");
+
+                        case TAG_GLOB_LOG_MIN:
+                                strcpy(globtype, "MIN");
                                 break;
-                        case TAG_GLOB_LOG_MAX   :
-                                strcpy(globtype,"MAX");
+
+                        case TAG_GLOB_LOG_MAX:
+                                strcpy(globtype, "MAX");
                                 break;
+
                         default:
-                                strcpy(globtype,"UNKNOWN");
+                                strcpy(globtype, "UNKNOWN");
+                                break;
                         }
 
-                        switch (size){
+                        switch (size) {
                         case 1:
                                 dbg("%sLOCALTAG:(%d) %s SIZE: %d Data: 0x%x",
-                                    indentstr,tag,globtype,size,data);
+                                    indentstr, tag, globtype, size, data);
                                 break;
+
                         case 2:
                                 dbg("%sLOCALTAG:(%d) %s SIZE: %d Data: 0x%x",
-                                    indentstr,tag,globtype,size,data16);
+                                    indentstr, tag, globtype, size, data16);
                                 break;
+
                         case 4:
                                 dbg("%sLOCALTAG:(%d) %s SIZE: %d Data: 0x%x",
-                                    indentstr,tag,globtype,size,data32);
+                                    indentstr, tag, globtype, size, data32);
                                 break;
                         }
 
                         break;
                 }
-
         }
-
 }
 
-
-
 /*   INPUT DRIVER Routines                               */
 
-
 /*
- *    Called when opening the input device.  This will submit the URB to
- *    the usb system so we start getting reports
+ * Called when opening the input device.  This will submit the URB to
+ * the usb system so we start getting reports
  */
 static int gtco_input_open(struct input_dev *inputdev)
 {
-        struct gtco *device;
-        device = inputdev->private;
+        struct gtco *device = input_get_drvdata(inputdev);
 
         device->urbinfo->dev = device->usbdev;
-        if (usb_submit_urb(device->urbinfo, GFP_KERNEL)) {
+        if (usb_submit_urb(device->urbinfo, GFP_KERNEL))
                 return -EIO;
-        }
+
         return 0;
 }
 
-/**
-    Called when closing the input device.  This will unlink the URB
-*/
+/*
+ * Called when closing the input device.  This will unlink the URB
+ */
 static void gtco_input_close(struct input_dev *inputdev)
 {
-        struct gtco *device = inputdev->private;
+        struct gtco *device = input_get_drvdata(inputdev);
 
         usb_kill_urb(device->urbinfo);
-
 }
 
 
@@ -560,19 +568,16 @@ static void gtco_input_close(struct input_dev *inputdev)
  *  placed in the struct gtco structure
  *
  */
-static void  gtco_setup_caps(struct input_dev  *inputdev)
+static void gtco_setup_caps(struct input_dev *inputdev)
 {
-        struct gtco *device = inputdev->private;
-
+        struct gtco *device = input_get_drvdata(inputdev);
 
         /* Which events */
         inputdev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC);
 
-
         /* Misc event menu block */
         inputdev->mscbit[0] = BIT(MSC_SCAN)|BIT(MSC_SERIAL)|BIT(MSC_RAW) ;
 
-
         /* Absolute values based on HID report info */
         input_set_abs_params(inputdev, ABS_X, device->min_X, device->max_X,
                              0, 0);
@@ -590,17 +595,12 @@ static void  gtco_setup_caps(struct input_dev  *inputdev)
         input_set_abs_params(inputdev, ABS_PRESSURE, device->minpressure,
                              device->maxpressure, 0, 0);
 
-
         /* Transducer */
-        input_set_abs_params(inputdev, ABS_MISC, 0,0xFF, 0, 0);
-
+        input_set_abs_params(inputdev, ABS_MISC, 0, 0xFF, 0, 0);
 }
 
-
-
 /*   USB Routines  */
 
-
 /*
  * URB callback routine.  Called when we get IRQ reports from the
  *  digitizer.
@@ -610,9 +610,7 @@ static void  gtco_setup_caps(struct input_dev  *inputdev)
  */
 static void gtco_urb_callback(struct urb *urbinfo)
 {
-
-
-        struct gtco     *device = urbinfo->context;
+        struct gtco *device = urbinfo->context;
         struct input_dev  *inputdev;
         int               rc;
         u32               val = 0;
@@ -621,19 +619,20 @@ static void gtco_urb_callback(struct urb *urbinfo)
 
         inputdev = device->inputdevice;
 
-
         /* Was callback OK? */
-        if ((urbinfo->status == -ECONNRESET ) ||
-            (urbinfo->status == -ENOENT ) ||
-            (urbinfo->status == -ESHUTDOWN )){
+        if (urbinfo->status == -ECONNRESET ||
+            urbinfo->status == -ENOENT ||
+            urbinfo->status == -ESHUTDOWN) {
 
                 /* Shutdown is occurring. Return and don't queue up any more */
                 return;
         }
 
-        if (urbinfo->status != 0 ) {
-                /* Some unknown error.  Hopefully temporary.  Just go and */
-                /* requeue an URB */
+        if (urbinfo->status != 0) {
+                /*
+                 * Some unknown error.  Hopefully temporary. Just go and
+                 * requeue an URB
+                 */
                 goto resubmit;
         }
 
@@ -642,10 +641,9 @@ static void gtco_urb_callback(struct urb *urbinfo)
          */
 
         /* PID dependent when we interpret the report */
-        if ((inputdev->id.product == PID_1000 )||
-            (inputdev->id.product == PID_1001 )||
-            (inputdev->id.product == PID_1002 ))
-        {
+        if (inputdev->id.product == PID_1000 ||
+            inputdev->id.product == PID_1001 ||
+            inputdev->id.product == PID_1002) {
 
                 /*
                  * Switch on the report ID
@@ -653,10 +651,10 @@ static void gtco_urb_callback(struct urb *urbinfo)
                  * the report number.  We can just fall through the case
                  * statements if we start with the highest number report
                  */
-                switch(device->buffer[0]){
+                switch (device->buffer[0]) {
                 case 5:
                         /* Pressure is 9 bits */
-                        val =  ((u16)(device->buffer[8]) << 1);
+                        val = ((u16)(device->buffer[8]) << 1);
                         val |= (u16)(device->buffer[7] >> 7);
                         input_report_abs(inputdev, ABS_PRESSURE,
                                          device->buffer[8]);
@@ -664,7 +662,6 @@ static void gtco_urb_callback(struct urb *urbinfo)
                         /* Mask out the Y tilt value used for pressure */
                         device->buffer[7] = (u8)((device->buffer[7]) & 0x7F);
 
-
                         /* Fall thru */
                 case 4:
                         /* Tilt */
@@ -684,11 +681,10 @@ static void gtco_urb_callback(struct urb *urbinfo)
                         input_report_abs(inputdev, ABS_TILT_Y, (s32)valsigned);
 
                         /* Fall thru */
-
                 case 2:
                 case 3:
                         /* Convert buttons, only 5 bits possible */
-                        val = (device->buffer[5])&MASK_BUTTON;
+                        val = (device->buffer[5]) & MASK_BUTTON;
 
                         /* We don't apply any meaning to the bitmask,
                            just report */
@@ -696,132 +692,109 @@ static void gtco_urb_callback(struct urb *urbinfo)
 
                         /*  Fall thru */
                 case 1:
-
                         /* All reports have X and Y coords in the same place */
-                        val = le16_to_cpu(get_unaligned((__le16 *) &(device->buffer[1])));
+                        val = le16_to_cpu(get_unaligned((__le16 *)&device->buffer[1]));
                         input_report_abs(inputdev, ABS_X, val);
 
-                        val = le16_to_cpu(get_unaligned((__le16 *) &(device->buffer[3])));
+                        val = le16_to_cpu(get_unaligned((__le16 *)&device->buffer[3]));
                         input_report_abs(inputdev, ABS_Y, val);
 
-
                         /* Ditto for proximity bit */
-                        if (device->buffer[5]& MASK_INRANGE){
-                                val = 1;
-                        }else{
-                                val=0;
-                        }
+                        val = device->buffer[5] & MASK_INRANGE ? 1 : 0;
                         input_report_abs(inputdev, ABS_DISTANCE, val);
 
-
                         /* Report 1 is an exception to how we handle buttons */
                         /* Buttons are an index, not a bitmask */
-                        if (device->buffer[0] == 1){
+                        if (device->buffer[0] == 1) {
 
-                                /* Convert buttons, 5 bit index */
-                                /* Report value of index set as one,
-                                   the rest as 0 */
-                                val = device->buffer[5]& MASK_BUTTON;
+                                /*
+                                 * Convert buttons, 5 bit index
+                                 * Report value of index set as one,
+                                 * the rest as 0
+                                 */
+                                val = device->buffer[5] & MASK_BUTTON;
                                 dbg("======>>>>>>REPORT 1: val 0x%X(%d)",
-                                    val,val);
+                                    val, val);
 
                                 /*
                                  * We don't apply any meaning to the button
                                  * index, just report it
                                  */
                                 input_event(inputdev, EV_MSC, MSC_SERIAL, val);
-
-
                         }
-
                         break;
+
                 case 7:
                         /* Menu blocks */
                         input_event(inputdev, EV_MSC, MSC_SCAN,
                                     device->buffer[1]);
-
-
                         break;
-
                 }
-
-
         }
+
         /* Other pid class */
-        if ((inputdev->id.product == PID_400 )||
-            (inputdev->id.product == PID_401 ))
-        {
+        if (inputdev->id.product == PID_400 ||
+            inputdev->id.product == PID_401) {
 
                 /* Report 2 */
-                if (device->buffer[0] == 2){
+                if (device->buffer[0] == 2) {
                         /* Menu blocks */
-                        input_event(inputdev, EV_MSC, MSC_SCAN,
-                                    device->buffer[1]);
+                        input_event(inputdev, EV_MSC, MSC_SCAN, device->buffer[1]);
                 }
 
                 /*  Report 1 */
-                if (device->buffer[0] == 1){
+                if (device->buffer[0] == 1) {
                         char buttonbyte;
 
-
                         /*  IF X max > 64K, we still a bit from the y report */
-                        if (device->max_X > 0x10000){
+                        if (device->max_X > 0x10000) {
 
-                                val = (u16)(((u16)(device->buffer[2]<<8))|((u8)(device->buffer[1])));
-                                val |= (u32)(((u8)device->buffer[3]&0x1)<< 16);
+                                val = (u16)(((u16)(device->buffer[2] << 8)) | (u8)device->buffer[1]);
+                                val |= (u32)(((u8)device->buffer[3] & 0x1) << 16);
 
                                 input_report_abs(inputdev, ABS_X, val);
 
-                                le_buffer[0]  = (u8)((u8)(device->buffer[3])>>1);
-                                le_buffer[0] |= (u8)((device->buffer[3]&0x1)<<7);
-
-                                le_buffer[1]  = (u8)(device->buffer[4]>>1);
-                                le_buffer[1] |= (u8)((device->buffer[5]&0x1)<<7);
+                                le_buffer[0]  = (u8)((u8)(device->buffer[3]) >> 1);
+                                le_buffer[0] |= (u8)((device->buffer[3] & 0x1) << 7);
 
-                                val = le16_to_cpu(get_unaligned((__le16 *)(le_buffer)));
+                                le_buffer[1]  = (u8)(device->buffer[4] >> 1);
+                                le_buffer[1] |= (u8)((device->buffer[5] & 0x1) << 7);
 
+                                val = le16_to_cpu(get_unaligned((__le16 *)le_buffer));
                                 input_report_abs(inputdev, ABS_Y, val);
 
-
                                 /*
                                  * Shift the button byte right by one to
                                  * make it look like the standard report
                                  */
-                                buttonbyte = (device->buffer[5])>>1;
-                        }else{
+                                buttonbyte = device->buffer[5] >> 1;
+                        } else {
 
-                                val = le16_to_cpu(get_unaligned((__le16 *) (&(device->buffer[1]))));
+                                val = le16_to_cpu(get_unaligned((__le16 *)&device->buffer[1]));
                                 input_report_abs(inputdev, ABS_X, val);
 
-                                val = le16_to_cpu(get_unaligned((__le16 *) (&(device->buffer[3]))));
+                                val = le16_to_cpu(get_unaligned((__le16 *)&device->buffer[3]));
                                 input_report_abs(inputdev, ABS_Y, val);
 
                                 buttonbyte = device->buffer[5];
-
                         }
 
-
                         /* BUTTONS and PROXIMITY */
-                        if (buttonbyte& MASK_INRANGE){
-                                val = 1;
-                        }else{
-                                val=0;
-                        }
+                        val = buttonbyte & MASK_INRANGE ? 1 : 0;
                         input_report_abs(inputdev, ABS_DISTANCE, val);
 
                         /* Convert buttons, only 4 bits possible */
-                        val = buttonbyte&0x0F;
+                        val = buttonbyte & 0x0F;
 #ifdef USE_BUTTONS
-                        for ( i=0;i<5;i++){
-                                input_report_key(inputdev, BTN_DIGI+i,val&(1<<i));
-                        }
+                        for (i = 0; i < 5; i++)
+                                input_report_key(inputdev, BTN_DIGI + i, val & (1 << i));
 #else
                         /* We don't apply any meaning to the bitmask, just report */
                         input_event(inputdev, EV_MSC, MSC_SERIAL, val);
 #endif
+
                         /* TRANSDUCER */
                         input_report_abs(inputdev, ABS_MISC, device->buffer[6]);
-
                 }
         }
 
@@ -833,10 +806,8 @@ static void gtco_urb_callback(struct urb *urbinfo)
 
  resubmit:
         rc = usb_submit_urb(urbinfo, GFP_ATOMIC);
-        if (rc != 0) {
-                err("usb_submit_urb failed rc=0x%x",rc);
-        }
-
+        if (rc != 0)
+                err("usb_submit_urb failed rc=0x%x", rc);
 }
 
 /*
@@ -854,58 +825,46 @@ static int gtco_probe(struct usb_interface *usbinterface,
                       const struct usb_device_id *id)
 {
 
-        struct gtco             *device = NULL;
-        char                    path[PATHLENGTH];
-        struct input_dev        *inputdev;
+        struct gtco             *gtco;
+        struct input_dev        *input_dev;
         struct hid_descriptor   *hid_desc;
-        char                    *report;
-        int                     result=0, retry;
+        char                    *report = NULL;
+        int                     result = 0, retry;
+        int                     error;
         struct usb_endpoint_descriptor *endpoint;
 
         /* Allocate memory for device structure */
-        device = kzalloc(sizeof(struct gtco), GFP_KERNEL);
-        if (device == NULL) {
+        gtco = kzalloc(sizeof(struct gtco), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!gtco || !input_dev) {
                 err("No more memory");
-                return -ENOMEM;
+                error = -ENOMEM;
+                goto err_free_devs;
         }
 
-
-        device->inputdevice = input_allocate_device();
-        if (!device->inputdevice){
-                kfree(device);
-                err("No more memory");
-                return -ENOMEM;
-        }
-
-        /* Get pointer to the input device */
-        inputdev = device->inputdevice;
+        /* Set pointer to the input device */
+        gtco->inputdevice = input_dev;
 
         /* Save interface information */
-        device->usbdev     = usb_get_dev(interface_to_usbdev(usbinterface));
-
+        gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface));
 
         /* Allocate some data for incoming reports */
-        device->buffer = usb_buffer_alloc(device->usbdev, REPORT_MAX_SIZE,
-                                           GFP_KERNEL, &(device->buf_dma));
-        if (!device->buffer){
-                input_free_device(device->inputdevice);
-                kfree(device);
-                err("No more memory");
-                return -ENOMEM;
+        gtco->buffer = usb_buffer_alloc(gtco->usbdev, REPORT_MAX_SIZE,
+                                        GFP_KERNEL, &gtco->buf_dma);
+        if (!gtco->buffer) {
+                err("No more memory for us buffers");
+                error = -ENOMEM;
+                goto err_free_devs;
         }
 
         /* Allocate URB for reports */
-        device->urbinfo = usb_alloc_urb(0, GFP_KERNEL);
-        if (!device->urbinfo) {
-                usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-                                device->buffer, device->buf_dma);
-                input_free_device(device->inputdevice);
-                kfree(device);
-                err("No more memory");
+        gtco->urbinfo = usb_alloc_urb(0, GFP_KERNEL);
+        if (!gtco->urbinfo) {
+                err("Failed to allocate URB");
                 return -ENOMEM;
+                goto err_free_buf;
         }
 
-
         /*
          * The endpoint is always altsetting 0, we know this since we know
          * this device only has one interrupt endpoint
@@ -913,51 +872,43 @@ static int gtco_probe(struct usb_interface *usbinterface,
         endpoint = &usbinterface->altsetting[0].endpoint[0].desc;
 
         /* Some debug */
-        dbg("gtco # interfaces: %d",usbinterface->num_altsetting);
-        dbg("num endpoints:     %d",usbinterface->cur_altsetting->desc.bNumEndpoints);
-        dbg("interface class:   %d",usbinterface->cur_altsetting->desc.bInterfaceClass);
-        dbg("endpoint: attribute:0x%x type:0x%x",endpoint->bmAttributes,endpoint->bDescriptorType);
+        dbg("gtco # interfaces: %d", usbinterface->num_altsetting);
+        dbg("num endpoints:     %d", usbinterface->cur_altsetting->desc.bNumEndpoints);
+        dbg("interface class:   %d", usbinterface->cur_altsetting->desc.bInterfaceClass);
+        dbg("endpoint: attribute:0x%x type:0x%x", endpoint->bmAttributes, endpoint->bDescriptorType);
         if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
                 dbg("endpoint: we have interrupt endpoint\n");
 
-        dbg("endpoint extra len:%d ",usbinterface->altsetting[0].extralen);
-
-
+        dbg("endpoint extra len:%d ", usbinterface->altsetting[0].extralen);
 
         /*
          * Find the HID descriptor so we can find out the size of the
          * HID report descriptor
          */
         if (usb_get_extra_descriptor(usbinterface->cur_altsetting,
-                                     HID_DEVICE_TYPE,&hid_desc) != 0){
+                                     HID_DEVICE_TYPE, &hid_desc) != 0){
                 err("Can't retrieve exta USB descriptor to get hid report descriptor length");
-                usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-                                device->buffer, device->buf_dma);
-                input_free_device(device->inputdevice);
-                kfree(device);
-                return -EIO;
+                error = -EIO;
+                goto err_free_urb;
         }
 
         dbg("Extra descriptor success: type:%d  len:%d",
             hid_desc->bDescriptorType,  hid_desc->wDescriptorLength);
 
-        if (!(report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL))) {
-                usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-                                device->buffer, device->buf_dma);
-
-                input_free_device(device->inputdevice);
-                kfree(device);
-                err("No more memory");
-                return -ENOMEM;
+        report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL);
+        if (!report) {
+                err("No more memory for report");
+                error = -ENOMEM;
+                goto err_free_urb;
         }
 
         /* Couple of tries to get reply */
-        for (retry=0;retry<3;retry++) {
-                result = usb_control_msg(device->usbdev,
-                                         usb_rcvctrlpipe(device->usbdev, 0),
+        for (retry = 0; retry < 3; retry++) {
+                result = usb_control_msg(gtco->usbdev,
+                                         usb_rcvctrlpipe(gtco->usbdev, 0),
                                          USB_REQ_GET_DESCRIPTOR,
                                          USB_RECIP_INTERFACE | USB_DIR_IN,
-                                         (REPORT_DEVICE_TYPE << 8),
+                                         REPORT_DEVICE_TYPE << 8,
                                          0, /* interface */
                                          report,
                                          hid_desc->wDescriptorLength,
@@ -969,72 +920,76 @@ static int gtco_probe(struct usb_interface *usbinterface,
 
         /* If we didn't get the report, fail */
         dbg("usb_control_msg result: :%d", result);
-        if (result != hid_desc->wDescriptorLength){
-                kfree(report);
-                usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-                                device->buffer, device->buf_dma);
-                input_free_device(device->inputdevice);
-                kfree(device);
+        if (result != hid_desc->wDescriptorLength) {
                 err("Failed to get HID Report Descriptor of size: %d",
                     hid_desc->wDescriptorLength);
-                return -EIO;
+                error = -EIO;
+                goto err_free_urb;
         }
 
-
         /* Now we parse the report */
-        parse_hid_report_descriptor(device,report,result);
+        parse_hid_report_descriptor(gtco, report, result);
 
         /* Now we delete it */
         kfree(report);
 
         /* Create a device file node */
-        usb_make_path(device->usbdev, path, PATHLENGTH);
-        sprintf(device->usbpath, "%s/input0", path);
-
+        usb_make_path(gtco->usbdev, gtco->usbpath, sizeof(gtco->usbpath));
+        strlcat(gtco->usbpath, "/input0", sizeof(gtco->usbpath));
 
         /* Set Input device functions */
-        inputdev->open     = gtco_input_open;
-        inputdev->close    = gtco_input_close;
+        input_dev->open = gtco_input_open;
+        input_dev->close = gtco_input_close;
 
         /* Set input device information */
-        inputdev->name     = "GTCO_CalComp";
-        inputdev->phys     = device->usbpath;
-        inputdev->private  = device;
+        input_dev->name = "GTCO_CalComp";
+        input_dev->phys = gtco->usbpath;
 
+        input_set_drvdata(input_dev, gtco);
 
         /* Now set up all the input device capabilities */
-        gtco_setup_caps(inputdev);
+        gtco_setup_caps(input_dev);
 
         /* Set input device required ID information */
-        usb_to_input_id(device->usbdev, &device->inputdevice->id);
-        inputdev->cdev.dev = &usbinterface->dev;
+        usb_to_input_id(gtco->usbdev, &input_dev->id);
+        input_dev->dev.parent = &usbinterface->dev;
 
         /* Setup the URB, it will be posted later on open of input device */
         endpoint = &usbinterface->altsetting[0].endpoint[0].desc;
 
-        usb_fill_int_urb(device->urbinfo,
-                         device->usbdev,
-                         usb_rcvintpipe(device->usbdev,
+        usb_fill_int_urb(gtco->urbinfo,
+                         gtco->usbdev,
+                         usb_rcvintpipe(gtco->usbdev,
                                         endpoint->bEndpointAddress),
-                         device->buffer,
+                         gtco->buffer,
                          REPORT_MAX_SIZE,
                          gtco_urb_callback,
-                         device,
+                         gtco,
                          endpoint->bInterval);
 
-        device->urbinfo->transfer_dma = device->buf_dma;
-        device->urbinfo->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-
+        gtco->urbinfo->transfer_dma = gtco->buf_dma;
+        gtco->urbinfo->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        /* Save device pointer in USB interface device */
-        usb_set_intfdata(usbinterface, device);
+        /* Save gtco pointer in USB interface gtco */
+        usb_set_intfdata(usbinterface, gtco);
 
         /* All done, now register the input device */
-        input_register_device(inputdev);
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_free_urb;
 
-        info( "gtco driver created usb:  %s\n",  path);
         return 0;
 
+ err_free_urb:
+        usb_free_urb(gtco->urbinfo);
+ err_free_buf:
+        usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE,
+                        gtco->buffer, gtco->buf_dma);
+ err_free_devs:
+        kfree(report);
+        input_free_device(input_dev);
+        kfree(gtco);
+        return error;
 }
 
 /*
@@ -1044,47 +999,46 @@ static int gtco_probe(struct usb_interface *usbinterface,
  */
 static void gtco_disconnect(struct usb_interface *interface)
 {
-
         /* Grab private device ptr */
-        struct gtco    *device = usb_get_intfdata (interface);
+        struct gtco *gtco = usb_get_intfdata(interface);
 
         /* Now reverse all the registration stuff */
-        if (device) {
-                input_unregister_device(device->inputdevice);
-                usb_kill_urb(device->urbinfo);
-                usb_free_urb(device->urbinfo);
-                usb_buffer_free(device->usbdev, REPORT_MAX_SIZE,
-                                device->buffer, device->buf_dma);
-                kfree(device);
+        if (gtco) {
+                input_unregister_device(gtco->inputdevice);
+                usb_kill_urb(gtco->urbinfo);
+                usb_free_urb(gtco->urbinfo);
+                usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE,
+                                gtco->buffer, gtco->buf_dma);
+                kfree(gtco);
         }
 
         info("gtco driver disconnected");
 }
 
-
 /*   STANDARD MODULE LOAD ROUTINES  */
 
 static struct usb_driver gtco_driverinfo_table = {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
-        .owner      = THIS_MODULE,
-#endif
-        .name       = "gtco",
-        .id_table   = gtco_usbid_table,
-        .probe      = gtco_probe,
-        .disconnect = gtco_disconnect,
+        .name           = "gtco",
+        .id_table       = gtco_usbid_table,
+        .probe          = gtco_probe,
+        .disconnect     = gtco_disconnect,
 };
+
 /*
  *  Register this module with the USB subsystem
  */
 static int __init gtco_init(void)
 {
-        int rc;
-        rc = usb_register(&gtco_driverinfo_table);
-        if (rc) {
-                err("usb_register() failed rc=0x%x", rc);
+        int error;
+
+        error = usb_register(&gtco_driverinfo_table);
+        if (error) {
+                err("usb_register() failed rc=0x%x", error);
+                return error;
         }
-        printk("GTCO usb driver version: %s",GTCO_VERSION);
-        return rc;
+
+        printk("GTCO usb driver version: %s", GTCO_VERSION);
+        return 0;
 }
 
 /*
@@ -1095,7 +1049,7 @@ static void __exit gtco_exit(void)
         usb_deregister(&gtco_driverinfo_table);
 }
 
-module_init (gtco_init);
-module_exit (gtco_exit);
+module_init(gtco_init);
+module_exit(gtco_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
deleted file mode 100644
index aac968aab860..000000000000
--- a/drivers/usb/input/itmtouch.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/******************************************************************************
- * itmtouch.c  --  Driver for ITM touchscreen panel
- *
- * 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.
- *
- * Based upon original work by Chris Collins <xfire-itmtouch@xware.cx>.
- *
- * Kudos to ITM for providing me with the datasheet for the panel,
- * even though it was a day later than I had finished writing this
- * driver.
- *
- * It has meant that I've been able to correct my interpretation of the
- * protocol packets however.
- *
- * CC -- 2003/9/29
- *
- * History
- * 1.0 & 1.1  2003 (CC) vojtech@suse.cz
- *   Original version for 2.4.x kernels
- *
- * 1.2  02/03/2005 (HCE) hc@mivu.no
- *   Complete rewrite to support Linux 2.6.10, thanks to mtouchusb.c for hints.
- *   Unfortunately no calibration support at this time.
- *
- * 1.2.1  09/03/2005 (HCE) hc@mivu.no
- *   Code cleanup and adjusting syntax to start matching kernel standards
- * 
- * 1.2.2  10/05/2006 (MJA) massad@gmail.com
- *   Flag for detecting if the screen was being touch was incorrectly 
- *   inverted, so no touch events were being detected.  
- *   
- *****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/usb/input.h>
-
-/* only an 8 byte buffer necessary for a single packet */
-#define ITM_BUFSIZE                     8
-#define PATH_SIZE                       64
-
-#define USB_VENDOR_ID_ITMINC            0x0403
-#define USB_PRODUCT_ID_TOUCHPANEL       0xf9e9
-
-#define DRIVER_AUTHOR "Hans-Christian Egtvedt <hc@mivu.no>"
-#define DRIVER_VERSION "v1.2.2"
-#define DRIVER_DESC "USB ITM Inc Touch Panel Driver"
-#define DRIVER_LICENSE "GPL"
-
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
-MODULE_LICENSE( DRIVER_LICENSE );
-
-struct itmtouch_dev {
-        struct usb_device       *usbdev; /* usb device */
-        struct input_dev        *inputdev; /* input device */
-        struct urb              *readurb; /* urb */
-        char                    rbuf[ITM_BUFSIZE]; /* data */
-        int                     users;
-        char name[128];
-        char phys[64];
-};
-
-static struct usb_device_id itmtouch_ids [] = {
-        { USB_DEVICE(USB_VENDOR_ID_ITMINC, USB_PRODUCT_ID_TOUCHPANEL) },
-        { }
-};
-
-static void itmtouch_irq(struct urb *urb)
-{
-        struct itmtouch_dev *itmtouch = urb->context;
-        unsigned char *data = urb->transfer_buffer;
-        struct input_dev *dev = itmtouch->inputdev;
-        int retval;
-
-        switch (urb->status) {
-        case 0:
-                /* success */
-                break;
-        case -ETIME:
-                /* this urb is timing out */
-                dbg("%s - urb timed out - was the device unplugged?",
-                    __FUNCTION__);
-                return;
-        case -ECONNRESET:
-        case -ENOENT:
-        case -ESHUTDOWN:
-                /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                    __FUNCTION__, urb->status);
-                return;
-        default:
-                dbg("%s - nonzero urb status received: %d",
-                    __FUNCTION__, urb->status);
-                goto exit;
-        }
-
-        /* if pressure has been released, then don't report X/Y */
-        if (!(data[7] & 0x20)) {
-                input_report_abs(dev, ABS_X, (data[0] & 0x1F) << 7 | (data[3] & 0x7F));
-                input_report_abs(dev, ABS_Y, (data[1] & 0x1F) << 7 | (data[4] & 0x7F));
-        }
-
-        input_report_abs(dev, ABS_PRESSURE, (data[2] & 1) << 7 | (data[5] & 0x7F));
-        input_report_key(dev, BTN_TOUCH, ~data[7] & 0x20);
-        input_sync(dev);
-
-exit:
-        retval = usb_submit_urb (urb, GFP_ATOMIC);
-        if (retval)
-                printk(KERN_ERR "%s - usb_submit_urb failed with result: %d",
-                                __FUNCTION__, retval);
-}
-
-static int itmtouch_open(struct input_dev *input)
-{
-        struct itmtouch_dev *itmtouch = input->private;
-
-        itmtouch->readurb->dev = itmtouch->usbdev;
-
-        if (usb_submit_urb(itmtouch->readurb, GFP_KERNEL))
-                return -EIO;
-
-        return 0;
-}
-
-static void itmtouch_close(struct input_dev *input)
-{
-        struct itmtouch_dev *itmtouch = input->private;
-
-        usb_kill_urb(itmtouch->readurb);
-}
-
-static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id *id)
-{
-        struct itmtouch_dev *itmtouch;
-        struct input_dev *input_dev;
-        struct usb_host_interface *interface;
-        struct usb_endpoint_descriptor *endpoint;
-        struct usb_device *udev = interface_to_usbdev(intf);
-        unsigned int pipe;
-        unsigned int maxp;
-
-        interface = intf->cur_altsetting;
-        endpoint = &interface->endpoint[0].desc;
-
-        itmtouch = kzalloc(sizeof(struct itmtouch_dev), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!itmtouch || !input_dev) {
-                err("%s - Out of memory.", __FUNCTION__);
-                goto fail;
-        }
-
-        itmtouch->usbdev = udev;
-        itmtouch->inputdev = input_dev;
-
-        if (udev->manufacturer)
-                strlcpy(itmtouch->name, udev->manufacturer, sizeof(itmtouch->name));
-
-        if (udev->product) {
-                if (udev->manufacturer)
-                        strlcat(itmtouch->name, " ", sizeof(itmtouch->name));
-                strlcat(itmtouch->name, udev->product, sizeof(itmtouch->name));
-        }
-
-        if (!strlen(itmtouch->name))
-                sprintf(itmtouch->name, "USB ITM touchscreen");
-
-        usb_make_path(udev, itmtouch->phys, sizeof(itmtouch->phys));
-        strlcpy(itmtouch->phys, "/input0", sizeof(itmtouch->phys));
-
-        input_dev->name = itmtouch->name;
-        input_dev->phys = itmtouch->phys;
-        usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = itmtouch;
-
-        input_dev->open = itmtouch_open;
-        input_dev->close = itmtouch_close;
-
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
-
-        /* device limits */
-        /* as specified by the ITM datasheet, X and Y are 12bit,
-         * Z (pressure) is 8 bit. However, the fields are defined up
-         * to 14 bits for future possible expansion.
-         */
-        input_set_abs_params(input_dev, ABS_X, 0, 0x0FFF, 2, 0);
-        input_set_abs_params(input_dev, ABS_Y, 0, 0x0FFF, 2, 0);
-        input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xFF, 2, 0);
-
-        /* initialise the URB so we can read from the transport stream */
-        pipe = usb_rcvintpipe(itmtouch->usbdev, endpoint->bEndpointAddress);
-        maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
-
-        if (maxp > ITM_BUFSIZE)
-                maxp = ITM_BUFSIZE;
-
-        itmtouch->readurb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!itmtouch->readurb) {
-                dbg("%s - usb_alloc_urb failed: itmtouch->readurb", __FUNCTION__);
-                goto fail;
-        }
-
-        usb_fill_int_urb(itmtouch->readurb, itmtouch->usbdev, pipe, itmtouch->rbuf,
-                         maxp, itmtouch_irq, itmtouch, endpoint->bInterval);
-
-        input_register_device(itmtouch->inputdev);
-
-        usb_set_intfdata(intf, itmtouch);
-
-        return 0;
-
- fail:  input_free_device(input_dev);
-        kfree(itmtouch);
-        return -ENOMEM;
-}
-
-static void itmtouch_disconnect(struct usb_interface *intf)
-{
-        struct itmtouch_dev *itmtouch = usb_get_intfdata(intf);
-
-        usb_set_intfdata(intf, NULL);
-
-        if (itmtouch) {
-                input_unregister_device(itmtouch->inputdev);
-                usb_kill_urb(itmtouch->readurb);
-                usb_free_urb(itmtouch->readurb);
-                kfree(itmtouch);
-        }
-}
-
-MODULE_DEVICE_TABLE(usb, itmtouch_ids);
-
-static struct usb_driver itmtouch_driver = {
-        .name =         "itmtouch",
-        .probe =        itmtouch_probe,
-        .disconnect =   itmtouch_disconnect,
-        .id_table =     itmtouch_ids,
-};
-
-static int __init itmtouch_init(void)
-{
-        info(DRIVER_DESC " " DRIVER_VERSION);
-        info(DRIVER_AUTHOR);
-        return usb_register(&itmtouch_driver);
-}
-
-static void __exit itmtouch_exit(void)
-{
-        usb_deregister(&itmtouch_driver);
-}
-
-module_init(itmtouch_init);
-module_exit(itmtouch_exit);
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index fedbcb127c21..c4781b9d1297 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -100,7 +100,7 @@ MODULE_DEVICE_TABLE(usb, kbtab_ids);
 
 static int kbtab_open(struct input_dev *dev)
 {
-        struct kbtab *kbtab = dev->private;
+        struct kbtab *kbtab = input_get_drvdata(dev);
 
         kbtab->irq->dev = kbtab->usbdev;
         if (usb_submit_urb(kbtab->irq, GFP_KERNEL))
@@ -111,7 +111,7 @@ static int kbtab_open(struct input_dev *dev)
 
 static void kbtab_close(struct input_dev *dev)
 {
-        struct kbtab *kbtab = dev->private;
+        struct kbtab *kbtab = input_get_drvdata(dev);
 
         usb_kill_urb(kbtab->irq);
 }
@@ -122,6 +122,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         struct usb_endpoint_descriptor *endpoint;
         struct kbtab *kbtab;
         struct input_dev *input_dev;
+        int error = -ENOMEM;
 
         kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);
         input_dev = input_allocate_device();
@@ -145,8 +146,9 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->name = "KB Gear Tablet";
         input_dev->phys = kbtab->phys;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = kbtab;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, kbtab);
 
         input_dev->open = kbtab_open;
         input_dev->close = kbtab_close;
@@ -168,15 +170,19 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         kbtab->irq->transfer_dma = kbtab->data_dma;
         kbtab->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        input_register_device(kbtab->dev);
+        error = input_register_device(kbtab->dev);
+        if (error)
+                goto fail3;
 
         usb_set_intfdata(intf, kbtab);
+
         return 0;
 
-fail2:  usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma);
-fail1:  input_free_device(input_dev);
+ fail3: usb_free_urb(kbtab->irq);
+ fail2: usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma);
+ fail1: input_free_device(input_dev);
         kfree(kbtab);
-        return -ENOMEM;
+        return error;
 }
 
 static void kbtab_disconnect(struct usb_interface *intf)
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index 98bd323369c7..1bffc9fa98c2 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -394,7 +394,7 @@ resubmit:
 
 static int keyspan_open(struct input_dev *dev)
 {
-        struct usb_keyspan *remote = dev->private;
+        struct usb_keyspan *remote = input_get_drvdata(dev);
 
         remote->irq_urb->dev = remote->udev;
         if (usb_submit_urb(remote->irq_urb, GFP_KERNEL))
@@ -405,7 +405,7 @@ static int keyspan_open(struct input_dev *dev)
 
 static void keyspan_close(struct input_dev *dev)
 {
-        struct usb_keyspan *remote = dev->private;
+        struct usb_keyspan *remote = input_get_drvdata(dev);
 
         usb_kill_urb(remote->irq_urb);
 }
@@ -437,7 +437,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         struct usb_endpoint_descriptor *endpoint;
         struct usb_keyspan *remote;
         struct input_dev *input_dev;
-        int i, retval;
+        int i, error;
 
         endpoint = keyspan_get_in_endpoint(interface->cur_altsetting);
         if (!endpoint)
@@ -446,7 +446,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         remote = kzalloc(sizeof(*remote), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!remote || !input_dev) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail1;
         }
 
@@ -458,19 +458,19 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
 
         remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma);
         if (!remote->in_buffer) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail1;
         }
 
         remote->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!remote->irq_urb) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail2;
         }
 
-        retval = keyspan_setup(udev);
-        if (retval) {
-                retval = -ENODEV;
+        error = keyspan_setup(udev);
+        if (error) {
+                error = -ENODEV;
                 goto fail3;
         }
 
@@ -495,14 +495,15 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         input_dev->name = remote->name;
         input_dev->phys = remote->phys;
         usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &interface->dev;
+        input_dev->dev.parent = &interface->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY);              /* We will only report KEY events. */
         for (i = 0; i < ARRAY_SIZE(keyspan_key_table); i++)
                 if (keyspan_key_table[i] != KEY_RESERVED)
                         set_bit(keyspan_key_table[i], input_dev->keybit);
 
-        input_dev->private = remote;
+        input_set_drvdata(input_dev, remote);
+
         input_dev->open = keyspan_open;
         input_dev->close = keyspan_close;
 
@@ -517,7 +518,9 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
         /* we can register the device now, as it is ready */
-        input_register_device(remote->input);
+        error = input_register_device(remote->input);
+        if (error)
+                goto fail3;
 
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, remote);
@@ -529,7 +532,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
  fail1: kfree(remote);
         input_free_device(input_dev);
 
-        return retval;
+        return error;
 }
 
 /*
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c
deleted file mode 100644
index 92c4e07da4c8..000000000000
--- a/drivers/usb/input/mtouchusb.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/******************************************************************************
- * mtouchusb.c  --  Driver for Microtouch (Now 3M) USB Touchscreens
- *
- * 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.
- *
- * Based upon original work by Radoslaw Garbacz (usb-support@ite.pl)
- *  (http://freshmeat.net/projects/3mtouchscreendriver)
- *
- * History
- *
- *  0.3 & 0.4  2002 (TEJ) tejohnson@yahoo.com
- *    Updated to 2.4.18, then 2.4.19
- *    Old version still relied on stealing a minor
- *
- *  0.5  02/26/2004 (TEJ) tejohnson@yahoo.com
- *    Complete rewrite using Linux Input in 2.6.3
- *    Unfortunately no calibration support at this time
- *
- *  1.4 04/25/2004 (TEJ) tejohnson@yahoo.com
- *    Changed reset from standard USB dev reset to vendor reset
- *    Changed data sent to host from compensated to raw coordinates
- *    Eliminated vendor/product module params
- *    Performed multiple successful tests with an EXII-5010UC
- *
- *  1.5 02/27/2005 ddstreet@ieee.org
- *    Added module parameter to select raw or hw-calibrated coordinate reporting
- *
- *****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/usb/input.h>
-
-#define MTOUCHUSB_MIN_XC                0x0
-#define MTOUCHUSB_MAX_RAW_XC            0x4000
-#define MTOUCHUSB_MAX_CALIB_XC          0xffff
-#define MTOUCHUSB_XC_FUZZ               0x0
-#define MTOUCHUSB_XC_FLAT               0x0
-#define MTOUCHUSB_MIN_YC                0x0
-#define MTOUCHUSB_MAX_RAW_YC            0x4000
-#define MTOUCHUSB_MAX_CALIB_YC          0xffff
-#define MTOUCHUSB_YC_FUZZ               0x0
-#define MTOUCHUSB_YC_FLAT               0x0
-
-#define MTOUCHUSB_ASYNC_REPORT          1
-#define MTOUCHUSB_RESET                 7
-#define MTOUCHUSB_REPORT_DATA_SIZE      11
-#define MTOUCHUSB_REQ_CTRLLR_ID         10
-
-#define MTOUCHUSB_GET_RAW_XC(data)      (data[8]<<8 | data[7])
-#define MTOUCHUSB_GET_CALIB_XC(data)    (data[4]<<8 | data[3])
-#define MTOUCHUSB_GET_RAW_YC(data)      (data[10]<<8 | data[9])
-#define MTOUCHUSB_GET_CALIB_YC(data)    (data[6]<<8 | data[5])
-#define MTOUCHUSB_GET_XC(data)          (raw_coordinates ? \
-                                         MTOUCHUSB_GET_RAW_XC(data) : \
-                                         MTOUCHUSB_GET_CALIB_XC(data))
-#define MTOUCHUSB_GET_YC(data)          (raw_coordinates ? \
-                                         MTOUCHUSB_GET_RAW_YC(data) : \
-                                         MTOUCHUSB_GET_CALIB_YC(data))
-#define MTOUCHUSB_GET_TOUCHED(data)     ((data[2] & 0x40) ? 1:0)
-
-#define DRIVER_VERSION "v1.5"
-#define DRIVER_AUTHOR "Todd E. Johnson, tejohnson@yahoo.com"
-#define DRIVER_DESC "3M USB Touchscreen Driver"
-#define DRIVER_LICENSE "GPL"
-
-static int raw_coordinates = 1;
-
-module_param(raw_coordinates, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(raw_coordinates, "report raw coordinate values (y, default) or hardware-calibrated coordinate values (n)");
-
-struct mtouch_usb {
-        unsigned char *data;
-        dma_addr_t data_dma;
-        struct urb *irq;
-        struct usb_device *udev;
-        struct input_dev *input;
-        char name[128];
-        char phys[64];
-};
-
-static struct usb_device_id mtouchusb_devices[] = {
-        { USB_DEVICE(0x0596, 0x0001) },
-        { }
-};
-
-static void mtouchusb_irq(struct urb *urb)
-{
-        struct mtouch_usb *mtouch = urb->context;
-        int retval;
-
-        switch (urb->status) {
-        case 0:
-                /* success */
-                break;
-        case -ETIME:
-                /* this urb is timing out */
-                dbg("%s - urb timed out - was the device unplugged?",
-                    __FUNCTION__);
-                return;
-        case -ECONNRESET:
-        case -ENOENT:
-        case -ESHUTDOWN:
-                /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                    __FUNCTION__, urb->status);
-                return;
-        default:
-                dbg("%s - nonzero urb status received: %d",
-                    __FUNCTION__, urb->status);
-                goto exit;
-        }
-
-        input_report_key(mtouch->input, BTN_TOUCH,
-                         MTOUCHUSB_GET_TOUCHED(mtouch->data));
-        input_report_abs(mtouch->input, ABS_X, MTOUCHUSB_GET_XC(mtouch->data));
-        input_report_abs(mtouch->input, ABS_Y,
-                         (raw_coordinates ? MTOUCHUSB_MAX_RAW_YC : MTOUCHUSB_MAX_CALIB_YC)
-                         - MTOUCHUSB_GET_YC(mtouch->data));
-        input_sync(mtouch->input);
-
-exit:
-        retval = usb_submit_urb(urb, GFP_ATOMIC);
-        if (retval)
-                err("%s - usb_submit_urb failed with result: %d",
-                    __FUNCTION__, retval);
-}
-
-static int mtouchusb_open(struct input_dev *input)
-{
-        struct mtouch_usb *mtouch = input->private;
-
-        mtouch->irq->dev = mtouch->udev;
-
-        if (usb_submit_urb(mtouch->irq, GFP_ATOMIC))
-                return -EIO;
-
-        return 0;
-}
-
-static void mtouchusb_close(struct input_dev *input)
-{
-        struct mtouch_usb *mtouch = input->private;
-
-        usb_kill_urb(mtouch->irq);
-}
-
-static int mtouchusb_alloc_buffers(struct usb_device *udev, struct mtouch_usb *mtouch)
-{
-        dbg("%s - called", __FUNCTION__);
-
-        mtouch->data = usb_buffer_alloc(udev, MTOUCHUSB_REPORT_DATA_SIZE,
-                                        GFP_ATOMIC, &mtouch->data_dma);
-
-        if (!mtouch->data)
-                return -1;
-
-        return 0;
-}
-
-static void mtouchusb_free_buffers(struct usb_device *udev, struct mtouch_usb *mtouch)
-{
-        dbg("%s - called", __FUNCTION__);
-
-        if (mtouch->data)
-                usb_buffer_free(udev, MTOUCHUSB_REPORT_DATA_SIZE,
-                                mtouch->data, mtouch->data_dma);
-}
-
-static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_id *id)
-{
-        struct mtouch_usb *mtouch;
-        struct input_dev *input_dev;
-        struct usb_host_interface *interface;
-        struct usb_endpoint_descriptor *endpoint;
-        struct usb_device *udev = interface_to_usbdev(intf);
-        int nRet;
-
-        dbg("%s - called", __FUNCTION__);
-
-        dbg("%s - setting interface", __FUNCTION__);
-        interface = intf->cur_altsetting;
-
-        dbg("%s - setting endpoint", __FUNCTION__);
-        endpoint = &interface->endpoint[0].desc;
-
-        mtouch = kzalloc(sizeof(struct mtouch_usb), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!mtouch || !input_dev) {
-                err("%s - Out of memory.", __FUNCTION__);
-                goto fail1;
-        }
-
-        dbg("%s - allocating buffers", __FUNCTION__);
-        if (mtouchusb_alloc_buffers(udev, mtouch))
-                goto fail2;
-
-        mtouch->udev = udev;
-        mtouch->input = input_dev;
-
-        if (udev->manufacturer)
-                strlcpy(mtouch->name, udev->manufacturer, sizeof(mtouch->name));
-
-        if (udev->product) {
-                if (udev->manufacturer)
-                        strlcat(mtouch->name, " ", sizeof(mtouch->name));
-                strlcat(mtouch->name, udev->product, sizeof(mtouch->name));
-        }
-
-        if (!strlen(mtouch->name))
-                snprintf(mtouch->name, sizeof(mtouch->name),
-                        "USB Touchscreen %04x:%04x",
-                        le16_to_cpu(udev->descriptor.idVendor),
-                        le16_to_cpu(udev->descriptor.idProduct));
-
-        usb_make_path(udev, mtouch->phys, sizeof(mtouch->phys));
-        strlcpy(mtouch->phys, "/input0", sizeof(mtouch->phys));
-
-        input_dev->name = mtouch->name;
-        input_dev->phys = mtouch->phys;
-        usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = mtouch;
-
-        input_dev->open = mtouchusb_open;
-        input_dev->close = mtouchusb_close;
-
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
-        input_set_abs_params(input_dev, ABS_X, MTOUCHUSB_MIN_XC,
-                raw_coordinates ? MTOUCHUSB_MAX_RAW_XC : MTOUCHUSB_MAX_CALIB_XC,
-                                MTOUCHUSB_XC_FUZZ, MTOUCHUSB_XC_FLAT);
-        input_set_abs_params(input_dev, ABS_Y, MTOUCHUSB_MIN_YC,
-                raw_coordinates ? MTOUCHUSB_MAX_RAW_YC : MTOUCHUSB_MAX_CALIB_YC,
-                MTOUCHUSB_YC_FUZZ, MTOUCHUSB_YC_FLAT);
-
-        nRet = usb_control_msg(mtouch->udev, usb_rcvctrlpipe(udev, 0),
-                               MTOUCHUSB_RESET,
-                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                               1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
-        dbg("%s - usb_control_msg - MTOUCHUSB_RESET - bytes|err: %d",
-            __FUNCTION__, nRet);
-
-        dbg("%s - usb_alloc_urb: mtouch->irq", __FUNCTION__);
-        mtouch->irq = usb_alloc_urb(0, GFP_KERNEL);
-        if (!mtouch->irq) {
-                dbg("%s - usb_alloc_urb failed: mtouch->irq", __FUNCTION__);
-                goto fail2;
-        }
-
-        dbg("%s - usb_fill_int_urb", __FUNCTION__);
-        usb_fill_int_urb(mtouch->irq, mtouch->udev,
-                         usb_rcvintpipe(mtouch->udev, 0x81),
-                         mtouch->data, MTOUCHUSB_REPORT_DATA_SIZE,
-                         mtouchusb_irq, mtouch, endpoint->bInterval);
-
-        dbg("%s - input_register_device", __FUNCTION__);
-        input_register_device(mtouch->input);
-
-        nRet = usb_control_msg(mtouch->udev, usb_rcvctrlpipe(udev, 0),
-                               MTOUCHUSB_ASYNC_REPORT,
-                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                               1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT);
-        dbg("%s - usb_control_msg - MTOUCHUSB_ASYNC_REPORT - bytes|err: %d",
-            __FUNCTION__, nRet);
-
-        usb_set_intfdata(intf, mtouch);
-        return 0;
-
-fail2:  mtouchusb_free_buffers(udev, mtouch);
-fail1:  input_free_device(input_dev);
-        kfree(mtouch);
-        return -ENOMEM;
-}
-
-static void mtouchusb_disconnect(struct usb_interface *intf)
-{
-        struct mtouch_usb *mtouch = usb_get_intfdata(intf);
-
-        dbg("%s - called", __FUNCTION__);
-        usb_set_intfdata(intf, NULL);
-        if (mtouch) {
-                dbg("%s - mtouch is initialized, cleaning up", __FUNCTION__);
-                usb_kill_urb(mtouch->irq);
-                input_unregister_device(mtouch->input);
-                usb_free_urb(mtouch->irq);
-                mtouchusb_free_buffers(interface_to_usbdev(intf), mtouch);
-                kfree(mtouch);
-        }
-}
-
-MODULE_DEVICE_TABLE(usb, mtouchusb_devices);
-
-static struct usb_driver mtouchusb_driver = {
-        .name           = "mtouchusb",
-        .probe          = mtouchusb_probe,
-        .disconnect     = mtouchusb_disconnect,
-        .id_table       = mtouchusb_devices,
-};
-
-static int __init mtouchusb_init(void)
-{
-        dbg("%s - called", __FUNCTION__);
-        return usb_register(&mtouchusb_driver);
-}
-
-static void __exit mtouchusb_cleanup(void)
-{
-        dbg("%s - called", __FUNCTION__);
-        usb_deregister(&mtouchusb_driver);
-}
-
-module_init(mtouchusb_init);
-module_exit(mtouchusb_cleanup);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index fea97e5437f8..4f93a760faee 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -252,7 +252,7 @@ static void powermate_pulse_led(struct powermate_device *pm, int static_brightne
 static int powermate_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int _value)
 {
         unsigned int command = (unsigned int)_value;
-        struct powermate_device *pm = dev->private;
+        struct powermate_device *pm = input_get_drvdata(dev);
 
         if (type == EV_MSC && code == MSC_PULSELED){
                 /*
@@ -308,7 +308,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
         struct powermate_device *pm;
         struct input_dev *input_dev;
         int pipe, maxp;
-        int err = -ENOMEM;
+        int error = -ENOMEM;
 
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
@@ -359,8 +359,9 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
 
         input_dev->phys = pm->phys;
         usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = pm;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, pm);
 
         input_dev->event = powermate_input_event;
 
@@ -387,11 +388,14 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
 
         /* register our interrupt URB with the USB system */
         if (usb_submit_urb(pm->irq, GFP_KERNEL)) {
-                err = -EIO;
+                error = -EIO;
                 goto fail4;
         }
 
-        input_register_device(pm->input);
+        error = input_register_device(pm->input);
+        if (error)
+                goto fail5;
+
 
         /* force an update of everything */
         pm->requires_update = UPDATE_PULSE_ASLEEP | UPDATE_PULSE_AWAKE | UPDATE_PULSE_MODE | UPDATE_STATIC_BRIGHTNESS;
@@ -400,12 +404,13 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
         usb_set_intfdata(intf, pm);
         return 0;
 
-fail4:  usb_free_urb(pm->config);
-fail3:  usb_free_urb(pm->irq);
-fail2:  powermate_free_buffers(udev, pm);
-fail1:  input_free_device(input_dev);
+ fail5: usb_kill_urb(pm->irq);
+ fail4: usb_free_urb(pm->config);
+ fail3: usb_free_urb(pm->irq);
+ fail2: powermate_free_buffers(udev, pm);
+ fail1: input_free_device(input_dev);
         kfree(pm);
-        return err;
+        return error;
 }
 
 /* Called when a USB device we've accepted ownership of is removed */
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
deleted file mode 100644
index 2a314b065922..000000000000
--- a/drivers/usb/input/touchkitusb.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/******************************************************************************
- * touchkitusb.c  --  Driver for eGalax TouchKit USB Touchscreens
- *
- * Copyright (C) 2004-2005 by Daniel Ritz <daniel.ritz@gmx.ch>
- * Copyright (C) by Todd E. Johnson (mtouchusb.c)
- *
- * 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.
- *
- * Based upon mtouchusb.c
- *
- *****************************************************************************/
-
-//#define DEBUG
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/usb/input.h>
-
-#define TOUCHKIT_MIN_XC                 0x0
-#define TOUCHKIT_MAX_XC                 0x07ff
-#define TOUCHKIT_XC_FUZZ                0x0
-#define TOUCHKIT_XC_FLAT                0x0
-#define TOUCHKIT_MIN_YC                 0x0
-#define TOUCHKIT_MAX_YC                 0x07ff
-#define TOUCHKIT_YC_FUZZ                0x0
-#define TOUCHKIT_YC_FLAT                0x0
-#define TOUCHKIT_REPORT_DATA_SIZE       16
-
-#define TOUCHKIT_DOWN                   0x01
-
-#define TOUCHKIT_PKT_TYPE_MASK          0xFE
-#define TOUCHKIT_PKT_TYPE_REPT          0x80
-#define TOUCHKIT_PKT_TYPE_DIAG          0x0A
-
-#define DRIVER_VERSION                  "v0.1"
-#define DRIVER_AUTHOR                   "Daniel Ritz <daniel.ritz@gmx.ch>"
-#define DRIVER_DESC                     "eGalax TouchKit USB HID Touchscreen Driver"
-
-static int swap_xy;
-module_param(swap_xy, bool, 0644);
-MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped.");
-
-struct touchkit_usb {
-        unsigned char *data;
-        dma_addr_t data_dma;
-        char buffer[TOUCHKIT_REPORT_DATA_SIZE];
-        int buf_len;
-        struct urb *irq;
-        struct usb_device *udev;
-        struct input_dev *input;
-        char name[128];
-        char phys[64];
-};
-
-static struct usb_device_id touchkit_devices[] = {
-        {USB_DEVICE(0x3823, 0x0001)},
-        {USB_DEVICE(0x0123, 0x0001)},
-        {USB_DEVICE(0x0eef, 0x0001)},
-        {USB_DEVICE(0x0eef, 0x0002)},
-        {}
-};
-
-/* helpers to read the data */
-static inline int touchkit_get_touched(char *data)
-{
-        return (data[0] & TOUCHKIT_DOWN) ? 1 : 0;
-}
-
-static inline int touchkit_get_x(char *data)
-{
-        return ((data[3] & 0x0F) << 7) | (data[4] & 0x7F);
-}
-
-static inline int touchkit_get_y(char *data)
-{
-        return ((data[1] & 0x0F) << 7) | (data[2] & 0x7F);
-}
-
-
-/* processes one input packet. */
-static void touchkit_process_pkt(struct touchkit_usb *touchkit, char *pkt)
-{
-        int x, y;
-
-        /* only process report packets */
-        if ((pkt[0] & TOUCHKIT_PKT_TYPE_MASK) != TOUCHKIT_PKT_TYPE_REPT)
-                return;
-
-        if (swap_xy) {
-                y = touchkit_get_x(pkt);
-                x = touchkit_get_y(pkt);
-        } else {
-                x = touchkit_get_x(pkt);
-                y = touchkit_get_y(pkt);
-        }
-
-        input_report_key(touchkit->input, BTN_TOUCH, touchkit_get_touched(pkt));
-        input_report_abs(touchkit->input, ABS_X, x);
-        input_report_abs(touchkit->input, ABS_Y, y);
-        input_sync(touchkit->input);
-}
-
-
-static int touchkit_get_pkt_len(char *buf)
-{
-        switch (buf[0] & TOUCHKIT_PKT_TYPE_MASK) {
-        case TOUCHKIT_PKT_TYPE_REPT:
-                return 5;
-
-        case TOUCHKIT_PKT_TYPE_DIAG:
-                return buf[1] + 2;
-        }
-
-        return 0;
-}
-
-static void touchkit_process(struct touchkit_usb *touchkit, int len)
-{
-        char *buffer;
-        int pkt_len, buf_len, pos;
-
-        /* if the buffer contains data, append */
-        if (unlikely(touchkit->buf_len)) {
-                int tmp;
-
-                /* if only 1 byte in buffer, add another one to get length */
-                if (touchkit->buf_len == 1)
-                        touchkit->buffer[1] = touchkit->data[0];
-
-                pkt_len = touchkit_get_pkt_len(touchkit->buffer);
-
-                /* unknown packet: drop everything */
-                if (!pkt_len)
-                        return;
-
-                /* append, process */
-                tmp = pkt_len - touchkit->buf_len;
-                memcpy(touchkit->buffer + touchkit->buf_len, touchkit->data, tmp);
-                touchkit_process_pkt(touchkit, touchkit->buffer);
-
-                buffer = touchkit->data + tmp;
-                buf_len = len - tmp;
-        } else {
-                buffer = touchkit->data;
-                buf_len = len;
-        }
-
-        /* only one byte left in buffer */
-        if (unlikely(buf_len == 1)) {
-                touchkit->buffer[0] = buffer[0];
-                touchkit->buf_len = 1;
-                return;
-        }
-
-        /* loop over the buffer */
-        pos = 0;
-        while (pos < buf_len) {
-                /* get packet len */
-                pkt_len = touchkit_get_pkt_len(buffer + pos);
-
-                /* unknown packet: drop everything */
-                if (unlikely(!pkt_len))
-                        return;
-
-                /* full packet: process */
-                if (likely(pkt_len <= buf_len)) {
-                        touchkit_process_pkt(touchkit, buffer + pos);
-                } else {
-                        /* incomplete packet: save in buffer */
-                        memcpy(touchkit->buffer, buffer + pos, buf_len - pos);
-                        touchkit->buf_len = buf_len - pos;
-                }
-                pos += pkt_len;
-        }
-}
-
-
-static void touchkit_irq(struct urb *urb)
-{
-        struct touchkit_usb *touchkit = urb->context;
-        int retval;
-
-        switch (urb->status) {
-        case 0:
-                /* success */
-                break;
-        case -ETIME:
-                /* this urb is timing out */
-                dbg("%s - urb timed out - was the device unplugged?",
-                    __FUNCTION__);
-                return;
-        case -ECONNRESET:
-        case -ENOENT:
-        case -ESHUTDOWN:
-                /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                    __FUNCTION__, urb->status);
-                return;
-        default:
-                dbg("%s - nonzero urb status received: %d",
-                    __FUNCTION__, urb->status);
-                goto exit;
-        }
-
-        touchkit_process(touchkit, urb->actual_length);
-
-exit:
-        retval = usb_submit_urb(urb, GFP_ATOMIC);
-        if (retval)
-                err("%s - usb_submit_urb failed with result: %d",
-                    __FUNCTION__, retval);
-}
-
-static int touchkit_open(struct input_dev *input)
-{
-        struct touchkit_usb *touchkit = input->private;
-
-        touchkit->irq->dev = touchkit->udev;
-
-        if (usb_submit_urb(touchkit->irq, GFP_ATOMIC))
-                return -EIO;
-
-        return 0;
-}
-
-static void touchkit_close(struct input_dev *input)
-{
-        struct touchkit_usb *touchkit = input->private;
-
-        usb_kill_urb(touchkit->irq);
-}
-
-static int touchkit_alloc_buffers(struct usb_device *udev,
-                                  struct touchkit_usb *touchkit)
-{
-        touchkit->data = usb_buffer_alloc(udev, TOUCHKIT_REPORT_DATA_SIZE,
-                                          GFP_ATOMIC, &touchkit->data_dma);
-
-        if (!touchkit->data)
-                return -1;
-
-        return 0;
-}
-
-static void touchkit_free_buffers(struct usb_device *udev,
-                                  struct touchkit_usb *touchkit)
-{
-        if (touchkit->data)
-                usb_buffer_free(udev, TOUCHKIT_REPORT_DATA_SIZE,
-                                touchkit->data, touchkit->data_dma);
-}
-
-static int touchkit_probe(struct usb_interface *intf,
-                          const struct usb_device_id *id)
-{
-        struct touchkit_usb *touchkit;
-        struct input_dev *input_dev;
-        struct usb_host_interface *interface;
-        struct usb_endpoint_descriptor *endpoint;
-        struct usb_device *udev = interface_to_usbdev(intf);
-
-        interface = intf->cur_altsetting;
-        endpoint = &interface->endpoint[0].desc;
-
-        touchkit = kzalloc(sizeof(struct touchkit_usb), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!touchkit || !input_dev)
-                goto out_free;
-
-        if (touchkit_alloc_buffers(udev, touchkit))
-                goto out_free;
-
-        touchkit->irq = usb_alloc_urb(0, GFP_KERNEL);
-        if (!touchkit->irq) {
-                dbg("%s - usb_alloc_urb failed: touchkit->irq", __FUNCTION__);
-                goto out_free_buffers;
-        }
-
-        touchkit->udev = udev;
-        touchkit->input = input_dev;
-
-        if (udev->manufacturer)
-                strlcpy(touchkit->name, udev->manufacturer, sizeof(touchkit->name));
-
-        if (udev->product) {
-                if (udev->manufacturer)
-                        strlcat(touchkit->name, " ", sizeof(touchkit->name));
-                strlcat(touchkit->name, udev->product, sizeof(touchkit->name));
-        }
-
-        if (!strlen(touchkit->name))
-                snprintf(touchkit->name, sizeof(touchkit->name),
-                        "USB Touchscreen %04x:%04x",
-                         le16_to_cpu(udev->descriptor.idVendor),
-                         le16_to_cpu(udev->descriptor.idProduct));
-
-        usb_make_path(udev, touchkit->phys, sizeof(touchkit->phys));
-        strlcpy(touchkit->phys, "/input0", sizeof(touchkit->phys));
-
-        input_dev->name = touchkit->name;
-        input_dev->phys = touchkit->phys;
-        usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = touchkit;
-        input_dev->open = touchkit_open;
-        input_dev->close = touchkit_close;
-
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
-        input_set_abs_params(input_dev, ABS_X, TOUCHKIT_MIN_XC, TOUCHKIT_MAX_XC,
-                                TOUCHKIT_XC_FUZZ, TOUCHKIT_XC_FLAT);
-        input_set_abs_params(input_dev, ABS_Y, TOUCHKIT_MIN_YC, TOUCHKIT_MAX_YC,
-                                TOUCHKIT_YC_FUZZ, TOUCHKIT_YC_FLAT);
-
-        usb_fill_int_urb(touchkit->irq, touchkit->udev,
-                         usb_rcvintpipe(touchkit->udev, 0x81),
-                         touchkit->data, TOUCHKIT_REPORT_DATA_SIZE,
-                         touchkit_irq, touchkit, endpoint->bInterval);
-
-        touchkit->irq->transfer_dma = touchkit->data_dma;
-        touchkit->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-
-        input_register_device(touchkit->input);
-
-        usb_set_intfdata(intf, touchkit);
-        return 0;
-
-out_free_buffers:
-        touchkit_free_buffers(udev, touchkit);
-out_free:
-        input_free_device(input_dev);
-        kfree(touchkit);
-        return -ENOMEM;
-}
-
-static void touchkit_disconnect(struct usb_interface *intf)
-{
-        struct touchkit_usb *touchkit = usb_get_intfdata(intf);
-
-        dbg("%s - called", __FUNCTION__);
-
-        if (!touchkit)
-                return;
-
-        dbg("%s - touchkit is initialized, cleaning up", __FUNCTION__);
-        usb_set_intfdata(intf, NULL);
-        usb_kill_urb(touchkit->irq);
-        input_unregister_device(touchkit->input);
-        usb_free_urb(touchkit->irq);
-        touchkit_free_buffers(interface_to_usbdev(intf), touchkit);
-        kfree(touchkit);
-}
-
-MODULE_DEVICE_TABLE(usb, touchkit_devices);
-
-static struct usb_driver touchkit_driver = {
-        .name           = "touchkitusb",
-        .probe          = touchkit_probe,
-        .disconnect     = touchkit_disconnect,
-        .id_table       = touchkit_devices,
-};
-
-static int __init touchkit_init(void)
-{
-        return usb_register(&touchkit_driver);
-}
-
-static void __exit touchkit_cleanup(void)
-{
-        usb_deregister(&touchkit_driver);
-}
-
-module_init(touchkit_init);
-module_exit(touchkit_cleanup);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 86e37a20f8e5..e0829413336b 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -647,7 +647,7 @@ exit:
 
 static int usbtouch_open(struct input_dev *input)
 {
-        struct usbtouch_usb *usbtouch = input->private;
+        struct usbtouch_usb *usbtouch = input_get_drvdata(input);
 
         usbtouch->irq->dev = usbtouch->udev;
 
@@ -659,7 +659,7 @@ static int usbtouch_open(struct input_dev *input)
 
 static void usbtouch_close(struct input_dev *input)
 {
-        struct usbtouch_usb *usbtouch = input->private;
+        struct usbtouch_usb *usbtouch = input_get_drvdata(input);
 
         usb_kill_urb(usbtouch->irq);
 }
@@ -740,8 +740,10 @@ static int usbtouch_probe(struct usb_interface *intf,
         input_dev->name = usbtouch->name;
         input_dev->phys = usbtouch->phys;
         usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = usbtouch;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, usbtouch);
+
         input_dev->open = usbtouch_open;
         input_dev->close = usbtouch_close;
 
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index 12b42746ded8..1fe48208c2f4 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -122,7 +122,7 @@ void wacom_input_sync(void *wcombo)
 
 static int wacom_open(struct input_dev *dev)
 {
-        struct wacom *wacom = dev->private;
+        struct wacom *wacom = input_get_drvdata(dev);
 
         wacom->irq->dev = wacom->usbdev;
         if (usb_submit_urb(wacom->irq, GFP_KERNEL))
@@ -133,7 +133,7 @@ static int wacom_open(struct input_dev *dev)
 
 static void wacom_close(struct input_dev *dev)
 {
-        struct wacom *wacom = dev->private;
+        struct wacom *wacom = input_get_drvdata(dev);
 
         usb_kill_urb(wacom->irq);
 }
@@ -201,6 +201,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         struct wacom *wacom;
         struct wacom_wac *wacom_wac;
         struct input_dev *input_dev;
+        int error = -ENOMEM;
         char rep_data[2], limit = 0;
 
         wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
@@ -229,8 +230,10 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         wacom->wacom_wac = wacom_wac;
         usb_to_input_id(dev, &input_dev->id);
 
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = wacom;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, wacom);
+
         input_dev->open = wacom_open;
         input_dev->close = wacom_close;
 
@@ -252,7 +255,9 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         wacom->irq->transfer_dma = wacom->data_dma;
         wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        input_register_device(wacom->dev);
+        error = input_register_device(wacom->dev);
+        if (error)
+                goto fail3;
 
         /* Ask the tablet to report tablet data. Repeat until it succeeds */
         do {
@@ -265,11 +270,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         usb_set_intfdata(intf, wacom);
         return 0;
 
-fail2:  usb_buffer_free(dev, 10, wacom_wac->data, wacom->data_dma);
-fail1:  input_free_device(input_dev);
+ fail3: usb_free_urb(wacom->irq);
+ fail2: usb_buffer_free(dev, 10, wacom_wac->data, wacom->data_dma);
+ fail1: input_free_device(input_dev);
         kfree(wacom);
         kfree(wacom_wac);
-        return -ENOMEM;
+        return error;
 }
 
 static void wacom_disconnect(struct usb_interface *intf)
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index e4bc76ebc835..735723912950 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -267,7 +267,7 @@ exit:
 
 static int xpad_open (struct input_dev *dev)
 {
-        struct usb_xpad *xpad = dev->private;
+        struct usb_xpad *xpad = input_get_drvdata(dev);
 
         xpad->irq_in->dev = xpad->udev;
         if (usb_submit_urb(xpad->irq_in, GFP_KERNEL))
@@ -278,7 +278,7 @@ static int xpad_open (struct input_dev *dev)
 
 static void xpad_close (struct input_dev *dev)
 {
-        struct usb_xpad *xpad = dev->private;
+        struct usb_xpad *xpad = input_get_drvdata(dev);
 
         usb_kill_urb(xpad->irq_in);
 }
@@ -312,6 +312,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         struct input_dev *input_dev;
         struct usb_endpoint_descriptor *ep_irq_in;
         int i;
+        int error = -ENOMEM;
 
         for (i = 0; xpad_device[i].idVendor; i++) {
                 if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
@@ -344,8 +345,10 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         input_dev->name = xpad_device[i].name;
         input_dev->phys = xpad->phys;
         usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
-        input_dev->private = xpad;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, xpad);
+
         input_dev->open = xpad_open;
         input_dev->close = xpad_close;
 
@@ -373,15 +376,18 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         xpad->irq_in->transfer_dma = xpad->idata_dma;
         xpad->irq_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        input_register_device(xpad->dev);
+        error = input_register_device(xpad->dev);
+        if (error)
+                goto fail3;
 
         usb_set_intfdata(intf, xpad);
         return 0;
 
-fail2:  usb_buffer_free(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
-fail1:  input_free_device(input_dev);
+ fail3: usb_free_urb(xpad->irq_in);
+ fail2: usb_buffer_free(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
+ fail1: input_free_device(input_dev);
         kfree(xpad);
-        return -ENOMEM;
+        return error;
 
 }
 
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index caff8e6d7448..c54f1a5dcb4a 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -502,7 +502,7 @@ static int input_ev(struct input_dev *dev, unsigned int type,
 
 static int input_open(struct input_dev *dev)
 {
-        struct yealink_dev *yld = dev->private;
+        struct yealink_dev *yld = input_get_drvdata(dev);
         int i, ret;
 
         dbg("%s", __FUNCTION__);
@@ -529,7 +529,7 @@ static int input_open(struct input_dev *dev)
 
 static void input_close(struct input_dev *dev)
 {
-        struct yealink_dev *yld = dev->private;
+        struct yealink_dev *yld = input_get_drvdata(dev);
 
         usb_kill_urb(yld->urb_ctl);
         usb_kill_urb(yld->urb_irq);
@@ -937,9 +937,10 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         input_dev->name = nfo->name;
         input_dev->phys = yld->phys;
         usb_to_input_id(udev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, yld);
 
-        input_dev->private = yld;
         input_dev->open = input_open;
         input_dev->close = input_close;
         /* input_dev->event = input_ev; TODO */
@@ -955,7 +956,9 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 }
         }
 
-        input_register_device(yld->idev);
+        ret = input_register_device(yld->idev);
+        if (ret)
+                return usb_cleanup(yld, ret);
 
         usb_set_intfdata(intf, yld);
 
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index a0cc05d21a6a..60d29440f316 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -55,7 +55,6 @@
 #include <linux/usb.h>
 #include <linux/types.h>
 #include <linux/ethtool.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b1cb72c3780f..344c37595305 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -191,7 +191,7 @@ config FB_ARMCLCD
 
           If you want to compile this as a module (=code which can be
           inserted into and removed from the running kernel), say M
-          here and read <file:Documentation/modules.txt>.  The module
+          here and read <file:Documentation/kbuild/modules.txt>.  The module
           will be called amba-clcd.
 
 choice
@@ -389,7 +389,10 @@ config FB_ARC
 
 config FB_ATARI
         bool "Atari native chipset support"
-        depends on (FB = y) && ATARI && BROKEN
+        depends on (FB = y) && ATARI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
         help
           This is the frame buffer device driver for the builtin graphics
           chipset found in Ataris.
@@ -1380,6 +1383,32 @@ config FB_LEO
           This is the frame buffer device driver for the SBUS-based Sun ZX
           (leo) frame buffer cards.
 
+config FB_XVR500
+        bool "Sun XVR-500 3DLABS Wildcat support"
+        depends on FB && PCI && SPARC64
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the framebuffer device for the Sun XVR-500 and similar
+          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
+          only works on sparc64 systems where the system firwmare has
+          mostly initialized the card already.  It is treated as a
+          completely dumb framebuffer device.
+
+config FB_XVR2500
+        bool "Sun XVR-2500 3DLABS Wildcat support"
+        depends on FB && PCI && SPARC64
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the framebuffer device for the Sun XVR-2500 and similar
+          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
+          only works on sparc64 systems where the system firwmare has
+          mostly initialized the card already.  It is treated as a
+          completely dumb framebuffer device.
+
 config FB_PCI
         bool "PCI framebuffers"
         depends on (FB = y) && PCI && SPARC
@@ -1491,7 +1520,7 @@ config FB_PXA
           This driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). The
           module will be called pxafb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If unsure, say N.
 
@@ -1544,7 +1573,7 @@ config FB_W100
           This driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). The
           module will be called w100fb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If unsure, say N.
 
@@ -1561,7 +1590,7 @@ config FB_S3C2410
           This driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). The
           module will be called s3c2410fb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
 
           If unsure, say N.
 config FB_S3C2410_DEBUG
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 760305c8a841..558473d040d6 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -63,9 +63,12 @@ obj-$(CONFIG_FB_TCX)              += tcx.o sbuslib.o
 obj-$(CONFIG_FB_LEO)              += leo.o sbuslib.o
 obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
 obj-$(CONFIG_FB_ACORN)            += acornfb.o
-obj-$(CONFIG_FB_ATARI)            += atafb.o
+obj-$(CONFIG_FB_ATARI)            += atafb.o c2p.o atafb_mfb.o \
+                                     atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
 obj-$(CONFIG_FB_MAC)              += macfb.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o
+obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
+obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
 obj-$(CONFIG_FB_IGA)              += igafb.o
 obj-$(CONFIG_FB_APOLLO)           += dnfb.o
 obj-$(CONFIG_FB_Q40)              += q40fb.o
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index bffe2b946344..0038a0541c7e 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2,7 +2,7 @@
  * linux/drivers/video/atafb.c -- Atari builtin chipset frame buffer device
  *
  *  Copyright (C) 1994 Martin Schaller & Roman Hodek
- *  
+ *
  * 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.
@@ -70,14 +70,8 @@
 #include <linux/fb.h>
 #include <asm/atarikb.h>
 
-#include <video/fbcon.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-iplan2p2.h>
-#include <video/fbcon-iplan2p4.h>
-#include <video/fbcon-iplan2p8.h>
-#include <video/fbcon-mfb.h>
-
+#include "c2p.h"
+#include "atafb.h"
 
 #define SWITCH_ACIA 0x01                /* modes for switch on OverScan */
 #define SWITCH_SND6 0x40
@@ -87,22 +81,48 @@
 
 #define up(x, r) (((x) + (r) - 1) & ~((r)-1))
 
+        /*
+         * Interface to the world
+         */
+
+static int atafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info);
+static int atafb_set_par(struct fb_info *info);
+static int atafb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
+                           unsigned int blue, unsigned int transp,
+                           struct fb_info *info);
+static int atafb_blank(int blank, struct fb_info *info);
+static int atafb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info);
+static void atafb_fillrect(struct fb_info *info,
+                           const struct fb_fillrect *rect);
+static void atafb_copyarea(struct fb_info *info,
+                           const struct fb_copyarea *region);
+static void atafb_imageblit(struct fb_info *info, const struct fb_image *image);
+static int atafb_ioctl(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg);
+
 
-static int default_par=0;       /* default resolution (0=none) */
+static int default_par;         /* default resolution (0=none) */
 
-static unsigned long default_mem_req=0;
+static unsigned long default_mem_req;
 
-static int hwscroll=-1;
+static int hwscroll = -1;
 
 static int use_hwscroll = 1;
 
-static int sttt_xres=640,st_yres=400,tt_yres=480;
-static int sttt_xres_virtual=640,sttt_yres_virtual=400;
-static int ovsc_offset=0, ovsc_addlen=0;
+static int sttt_xres = 640, st_yres = 400, tt_yres = 480;
+static int sttt_xres_virtual = 640, sttt_yres_virtual = 400;
+static int ovsc_offset, ovsc_addlen;
+
+        /*
+         * Hardware parameters for current mode
+         */
 
 static struct atafb_par {
         void *screen_base;
         int yres_virtual;
+        u_long next_line;
+        u_long next_plane;
 #if defined ATAFB_TT || defined ATAFB_STE
         union {
                 struct {
@@ -138,7 +158,7 @@ static struct atafb_par {
 /* Don't calculate an own resolution, and thus don't change the one found when
  * booting (currently used for the Falcon to keep settings for internal video
  * hardware extensions (e.g. ScreenBlaster)  */
-static int DontCalcRes = 0; 
+static int DontCalcRes = 0;
 
 #ifdef ATAFB_FALCON
 #define HHT hw.falcon.hht
@@ -163,83 +183,84 @@ static int DontCalcRes = 0;
 #define VMO_PREMASK             0x0c
 #endif
 
-static struct fb_info fb_info;
+static struct fb_info fb_info = {
+        .fix = {
+                .id     = "Atari ",
+                .visual = FB_VISUAL_PSEUDOCOLOR,
+                .accel  = FB_ACCEL_NONE,
+        }
+};
 
 static void *screen_base;       /* base address of screen */
 static void *real_screen_base;  /* (only for Overscan) */
 
 static int screen_len;
 
-static int current_par_valid=0; 
+static int current_par_valid;
 
-static int mono_moni=0;
-
-static struct display disp;
+static int mono_moni;
 
 
 #ifdef ATAFB_EXT
-/* external video handling */
 
-static unsigned                 external_xres;
-static unsigned                 external_xres_virtual;
-static unsigned                 external_yres;
-/* not needed - atafb will never support panning/hardwarescroll with external
- * static unsigned              external_yres_virtual;  
-*/
+/* external video handling */
+static unsigned int external_xres;
+static unsigned int external_xres_virtual;
+static unsigned int external_yres;
 
-static unsigned                 external_depth;
-static int                              external_pmode;
-static void *external_addr = 0;
-static unsigned long    external_len;
-static unsigned long    external_vgaiobase = 0;
-static unsigned int             external_bitspercol = 6;
-
-/* 
-JOE <joe@amber.dinoco.de>: 
-added card type for external driver, is only needed for
-colormap handling.
-*/
+/*
+ * not needed - atafb will never support panning/hardwarescroll with external
+ * static unsigned int external_yres_virtual;
+ */
+static unsigned int external_depth;
+static int external_pmode;
+static void *external_addr;
+static unsigned long external_len;
+static unsigned long external_vgaiobase;
+static unsigned int external_bitspercol = 6;
 
+/*
+ * JOE <joe@amber.dinoco.de>:
+ * added card type for external driver, is only needed for
+ * colormap handling.
+ */
 enum cardtype { IS_VGA, IS_MV300 };
 static enum cardtype external_card_type = IS_VGA;
 
 /*
-The MV300 mixes the color registers. So we need an array of munged
-indices in order to access the correct reg.
-*/
-static int MV300_reg_1bit[2]={0,1};
-static int MV300_reg_4bit[16]={
-0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15 };
-static int MV300_reg_8bit[256]={
-0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240, 
-8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248, 
-4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244, 
-12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220, 60, 188, 124, 252, 
-2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242, 
-10, 138, 74, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250, 
-6, 134, 70, 198, 38, 166, 102, 230, 22, 150, 86, 214, 54, 182, 118, 246, 
-14, 142, 78, 206, 46, 174, 110, 238, 30, 158, 94, 222, 62, 190, 126, 254, 
-1, 129, 65, 193, 33, 161, 97, 225, 17, 145, 81, 209, 49, 177, 113, 241, 
-9, 137, 73, 201, 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, 121, 249, 
-5, 133, 69, 197, 37, 165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245, 
-13, 141, 77, 205, 45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253, 
-3, 131, 67, 195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243, 
-11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251, 
-7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247, 
-15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255 }; 
+ * The MV300 mixes the color registers. So we need an array of munged
+ * indices in order to access the correct reg.
+ */
+static int MV300_reg_1bit[2] = {
+        0, 1
+};
+static int MV300_reg_4bit[16] = {
+        0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15
+};
+static int MV300_reg_8bit[256] = {
+        0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240,
+        8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248,
+        4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244,
+        12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220, 60, 188, 124, 252,
+        2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242,
+        10, 138, 74, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250,
+        6, 134, 70, 198, 38, 166, 102, 230, 22, 150, 86, 214, 54, 182, 118, 246,
+        14, 142, 78, 206, 46, 174, 110, 238, 30, 158, 94, 222, 62, 190, 126, 254,
+        1, 129, 65, 193, 33, 161, 97, 225, 17, 145, 81, 209, 49, 177, 113, 241,
+        9, 137, 73, 201, 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, 121, 249,
+        5, 133, 69, 197, 37, 165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245,
+        13, 141, 77, 205, 45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253,
+        3, 131, 67, 195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243,
+        11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251,
+        7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247,
+        15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
+};
 
 static int *MV300_reg = MV300_reg_8bit;
-
-/*
-And on the MV300 it's difficult to read out the hardware palette. So we
-just keep track of the set colors in our own array here, and use that!
-*/
-
-static struct { unsigned char red,green,blue,pad; } ext_color[256];
 #endif /* ATAFB_EXT */
 
 
-static int inverse=0;
+static int inverse;
 
 extern int fontheight_8x8;
 extern int fontwidth_8x8;
@@ -249,96 +270,154 @@ extern int fontheight_8x16;
 extern int fontwidth_8x16;
 extern unsigned char fontdata_8x16[];
 
+/*
+ * struct fb_ops {
+ *      * open/release and usage marking
+ *      struct module *owner;
+ *      int (*fb_open)(struct fb_info *info, int user);
+ *      int (*fb_release)(struct fb_info *info, int user);
+ *
+ *      * For framebuffers with strange non linear layouts or that do not
+ *      * work with normal memory mapped access
+ *      ssize_t (*fb_read)(struct file *file, char __user *buf, size_t count, loff_t *ppos);
+ *      ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos);
+ *
+ *      * checks var and eventually tweaks it to something supported,
+ *      * DOES NOT MODIFY PAR *
+ *      int (*fb_check_var)(struct fb_var_screeninfo *var, struct fb_info *info);
+ *
+ *      * set the video mode according to info->var *
+ *      int (*fb_set_par)(struct fb_info *info);
+ *
+ *      * set color register *
+ *      int (*fb_setcolreg)(unsigned int regno, unsigned int red, unsigned int green,
+ *                          unsigned int blue, unsigned int transp, struct fb_info *info);
+ *
+ *      * set color registers in batch *
+ *      int (*fb_setcmap)(struct fb_cmap *cmap, struct fb_info *info);
+ *
+ *      * blank display *
+ *      int (*fb_blank)(int blank, struct fb_info *info);
+ *
+ *      * pan display *
+ *      int (*fb_pan_display)(struct fb_var_screeninfo *var, struct fb_info *info);
+ *
+ *      *** The meat of the drawing engine ***
+ *      * Draws a rectangle *
+ *      void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect);
+ *      * Copy data from area to another *
+ *      void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region);
+ *      * Draws a image to the display *
+ *      void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image);
+ *
+ *      * Draws cursor *
+ *      int (*fb_cursor) (struct fb_info *info, struct fb_cursor *cursor);
+ *
+ *      * Rotates the display *
+ *      void (*fb_rotate)(struct fb_info *info, int angle);
+ *
+ *      * wait for blit idle, optional *
+ *      int (*fb_sync)(struct fb_info *info);
+ *
+ *      * perform fb specific ioctl (optional) *
+ *      int (*fb_ioctl)(struct fb_info *info, unsigned int cmd,
+ *                      unsigned long arg);
+ *
+ *      * Handle 32bit compat ioctl (optional) *
+ *      int (*fb_compat_ioctl)(struct fb_info *info, unsigned int cmd,
+ *                      unsigned long arg);
+ *
+ *      * perform fb specific mmap *
+ *      int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
+ *
+ *      * save current hardware state *
+ *      void (*fb_save_state)(struct fb_info *info);
+ *
+ *      * restore saved state *
+ *      void (*fb_restore_state)(struct fb_info *info);
+ * } ;
+ */
+
+
 /* ++roman: This structure abstracts from the underlying hardware (ST(e),
  * TT, or Falcon.
  *
- * int (*detect)( void )
+ * int (*detect)(void)
  *   This function should detect the current video mode settings and
  *   store them in atafb_predefined[0] for later reference by the
  *   user. Return the index+1 of an equivalent predefined mode or 0
  *   if there is no such.
- * 
- * int (*encode_fix)( struct fb_fix_screeninfo *fix,
- *                    struct atafb_par *par )
+ *
+ * int (*encode_fix)(struct fb_fix_screeninfo *fix,
+ *                   struct atafb_par *par)
  *   This function should fill in the 'fix' structure based on the
  *   values in the 'par' structure.
- *   
- * int (*decode_var)( struct fb_var_screeninfo *var,
- *                    struct atafb_par *par )
+ * !!! Obsolete, perhaps !!!
+ *
+ * int (*decode_var)(struct fb_var_screeninfo *var,
+ *                   struct atafb_par *par)
  *   Get the video params out of 'var'. If a value doesn't fit, round
  *   it up, if it's too big, return EINVAL.
- *   Round up in the following order: bits_per_pixel, xres, yres, 
- *   xres_virtual, yres_virtual, xoffset, yoffset, grayscale, bitfields, 
+ *   Round up in the following order: bits_per_pixel, xres, yres,
+ *   xres_virtual, yres_virtual, xoffset, yoffset, grayscale, bitfields,
  *   horizontal timing, vertical timing.
  *
- * int (*encode_var)( struct fb_var_screeninfo *var,
- *                    struct atafb_par *par );
+ * int (*encode_var)(struct fb_var_screeninfo *var,
+ *                   struct atafb_par *par);
  *   Fill the 'var' structure based on the values in 'par' and maybe
  *   other values read out of the hardware.
- *   
- * void (*get_par)( struct atafb_par *par )
+ *
+ * void (*get_par)(struct atafb_par *par)
  *   Fill the hardware's 'par' structure.
- *   
- * void (*set_par)( struct atafb_par *par )
+ *   !!! Used only by detect() !!!
+ *
+ * void (*set_par)(struct atafb_par *par)
  *   Set the hardware according to 'par'.
- *   
- * int (*getcolreg)( unsigned regno, unsigned *red,
- *                   unsigned *green, unsigned *blue,
- *                   unsigned *transp, struct fb_info *info )
- *   Read a single color register and split it into
- *   colors/transparent. Return != 0 for invalid regno.
  *
  * void (*set_screen_base)(void *s_base)
  *   Set the base address of the displayed frame buffer. Only called
  *   if yres_virtual > yres or xres_virtual > xres.
  *
- * int (*blank)( int blank_mode )
- *   Blank the screen if blank_mode!=0, else unblank. If blank==NULL then
+ * int (*blank)(int blank_mode)
+ *   Blank the screen if blank_mode != 0, else unblank. If blank == NULL then
  *   the caller blanks by setting the CLUT to all black. Return 0 if blanking
  *   succeeded, !=0 if un-/blanking failed due to e.g. a video mode which
  *   doesn't support it. Implements VESA suspend and powerdown modes on
  *   hardware that supports disabling hsync/vsync:
- *       blank_mode==2: suspend vsync, 3:suspend hsync, 4: powerdown.
+ *       blank_mode == 2: suspend vsync, 3:suspend hsync, 4: powerdown.
  */
 
 static struct fb_hwswitch {
-        int  (*detect)( void );
-        int  (*encode_fix)( struct fb_fix_screeninfo *fix,
-                                                struct atafb_par *par );
-        int  (*decode_var)( struct fb_var_screeninfo *var,
-                                                struct atafb_par *par );
-        int  (*encode_var)( struct fb_var_screeninfo *var,
-                                                struct atafb_par *par );
-        void (*get_par)( struct atafb_par *par );
-        void (*set_par)( struct atafb_par *par );
-        int  (*getcolreg)( unsigned regno, unsigned *red,
-                                           unsigned *green, unsigned *blue,
-                                           unsigned *transp, struct fb_info *info );
+        int (*detect)(void);
+        int (*encode_fix)(struct fb_fix_screeninfo *fix,
+                          struct atafb_par *par);
+        int (*decode_var)(struct fb_var_screeninfo *var,
+                          struct atafb_par *par);
+        int (*encode_var)(struct fb_var_screeninfo *var,
+                          struct atafb_par *par);
+        void (*get_par)(struct atafb_par *par);
+        void (*set_par)(struct atafb_par *par);
         void (*set_screen_base)(void *s_base);
-        int  (*blank)( int blank_mode );
-        int  (*pan_display)( struct fb_var_screeninfo *var,
-                                                 struct atafb_par *par);
+        int (*blank)(int blank_mode);
+        int (*pan_display)(struct fb_var_screeninfo *var,
+                           struct fb_info *info);
 } *fbhw;
 
-static char *autodetect_names[] = {"autodetect", NULL};
-static char *stlow_names[] = {"stlow", NULL};
-static char *stmid_names[] = {"stmid", "default5", NULL};
-static char *sthigh_names[] = {"sthigh", "default4", NULL};
-static char *ttlow_names[] = {"ttlow", NULL};
-static char *ttmid_names[]= {"ttmid", "default1", NULL};
-static char *tthigh_names[]= {"tthigh", "default2", NULL};
-static char *vga2_names[] = {"vga2", NULL};
-static char *vga4_names[] = {"vga4", NULL};
-static char *vga16_names[] = {"vga16", "default3", NULL};
-static char *vga256_names[] = {"vga256", NULL};
-static char *falh2_names[] = {"falh2", NULL};
-static char *falh16_names[] = {"falh16", NULL};
+static char *autodetect_names[] = { "autodetect", NULL };
+static char *stlow_names[] = { "stlow", NULL };
+static char *stmid_names[] = { "stmid", "default5", NULL };
+static char *sthigh_names[] = { "sthigh", "default4", NULL };
+static char *ttlow_names[] = { "ttlow", NULL };
+static char *ttmid_names[] = { "ttmid", "default1", NULL };
+static char *tthigh_names[] = { "tthigh", "default2", NULL };
+static char *vga2_names[] = { "vga2", NULL };
+static char *vga4_names[] = { "vga4", NULL };
+static char *vga16_names[] = { "vga16", "default3", NULL };
+static char *vga256_names[] = { "vga256", NULL };
+static char *falh2_names[] = { "falh2", NULL };
+static char *falh16_names[] = { "falh16", NULL };
 
 static char **fb_var_names[] = {
-        /* Writing the name arrays directly in this array (via "(char *[]){...}")
-         * crashes gcc 2.5.8 (sigsegv) if the inner array
-         * contains more than two items. I've also seen that all elements
-         * were identical to the last (my cross-gcc) :-(*/
         autodetect_names,
         stlow_names,
         stmid_names,
@@ -353,18 +432,17 @@ static char **fb_var_names[] = {
         falh2_names,
         falh16_names,
         NULL
-        /* ,NULL */ /* this causes a sigsegv on my gcc-2.5.8 */
 };
 
 static struct fb_var_screeninfo atafb_predefined[] = {
-        /*
-         * yres_virtual==0 means use hw-scrolling if possible, else yres
-         */
-        { /* autodetect */
-          0, 0, 0, 0, 0, 0, 0, 0,               /* xres-grayscale */
-          {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0},   /* red green blue tran*/
+        /*
+         * yres_virtual == 0 means use hw-scrolling if possible, else yres
+         */
+        { /* autodetect */
+          0, 0, 0, 0, 0, 0, 0, 0,               /* xres-grayscale */
+          {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0},   /* red green blue tran*/
           0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0 },
-        { /* st low */
+        { /* st low */
           320, 200, 320, 0, 0, 0, 4, 0,
           {0, 4, 0}, {0, 4, 0}, {0, 4, 0}, {0, 0, 0},
           0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -414,27 +492,100 @@ static struct fb_var_screeninfo atafb_predefined[] = {
           0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-static int num_atafb_predefined=ARRAY_SIZE(atafb_predefined);
+static int num_atafb_predefined = ARRAY_SIZE(atafb_predefined);
 
+static struct fb_videomode atafb_modedb[] __initdata = {
+        /*
+         *  Atari Video Modes
+         *
+         *  If you change these, make sure to update DEFMODE_* as well!
+         */
 
-static int
-get_video_mode(char *vname)
+        /*
+         *  ST/TT Video Modes
+         */
+
+        {
+                /* 320x200, 15 kHz, 60 Hz (ST low) */
+                "st-low", 60, 320, 200, 32000, 32, 16, 31, 14, 96, 4,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x200, 15 kHz, 60 Hz (ST medium) */
+                "st-mid", 60, 640, 200, 32000, 32, 16, 31, 14, 96, 4,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 30.25 kHz, 63.5 Hz (ST high) */
+                "st-high", 63, 640, 400, 32000, 128, 0, 40, 14, 128, 4,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 320x480, 15 kHz, 60 Hz (TT low) */
+                "tt-low", 60, 320, 480, 31041, 120, 100, 8, 16, 140, 30,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x480, 29 kHz, 57 Hz (TT medium) */
+                "tt-mid", 60, 640, 480, 31041, 120, 100, 8, 16, 140, 30,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 1280x960, 29 kHz, 60 Hz (TT high) */
+                "tt-high", 57, 640, 960, 31041, 120, 100, 8, 16, 140, 30,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        },
+
+        /*
+         *  VGA Video Modes
+         */
+
+        {
+                /* 640x480, 31 kHz, 60 Hz (VGA) */
+                "vga", 63.5, 640, 480, 32000, 18, 42, 31, 11, 96, 3,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        }, {
+                /* 640x400, 31 kHz, 70 Hz (VGA) */
+                "vga70", 70, 640, 400, 32000, 18, 42, 31, 11, 96, 3,
+                FB_SYNC_VERT_HIGH_ACT | FB_SYNC_COMP_HIGH_ACT, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        },
+
+        /*
+         *  Falcon HiRes Video Modes
+         */
+
+        {
+                /* 896x608, 31 kHz, 60 Hz (Falcon High) */
+                "falh", 60, 896, 608, 32000, 18, 42, 31, 1, 96,3,
+                0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
+        },
+};
+
+#define NUM_TOTAL_MODES  ARRAY_SIZE(atafb_modedb)
+
+static char *mode_option __initdata = NULL;
+
+ /* default modes */
+
+#define DEFMODE_TT      5               /* "tt-high" for TT */
+#define DEFMODE_F30     7               /* "vga70" for Falcon */
+#define DEFMODE_STE     2               /* "st-high" for ST/E */
+#define DEFMODE_EXT     6               /* "vga" for external */
+
+
+static int get_video_mode(char *vname)
 {
-    char ***name_list;
-    char **name;
-    int i;
-    name_list=fb_var_names;
-    for (i = 0 ; i < num_atafb_predefined ; i++) {
-        name=*(name_list++);
-        if (! name || ! *name)
-            break;
-        while (*name) {
-            if (! strcmp(vname, *name))
-                return i+1;
-            name++;
+        char ***name_list;
+        char **name;
+        int i;
+
+        name_list = fb_var_names;
+        for (i = 0; i < num_atafb_predefined; i++) {
+                name = *name_list++;
+                if (!name || !*name)
+                        break;
+                while (*name) {
+                        if (!strcmp(vname, *name))
+                                return i + 1;
+                        name++;
+                }
         }
-    }
-    return 0;
+        return 0;
 }
 
 
@@ -443,93 +594,84 @@ get_video_mode(char *vname)
 
 #ifdef ATAFB_TT
 
-static int tt_encode_fix( struct fb_fix_screeninfo *fix,
-                                                  struct atafb_par *par )
-
+static int tt_encode_fix(struct fb_fix_screeninfo *fix, struct atafb_par *par)
 {
         int mode;
 
-        strcpy(fix->id,"Atari Builtin");
+        strcpy(fix->id, "Atari Builtin");
         fix->smem_start = (unsigned long)real_screen_base;
         fix->smem_len = screen_len;
-        fix->type=FB_TYPE_INTERLEAVED_PLANES;
-        fix->type_aux=2;
-        fix->visual=FB_VISUAL_PSEUDOCOLOR;
+        fix->type = FB_TYPE_INTERLEAVED_PLANES;
+        fix->type_aux = 2;
+        fix->visual = FB_VISUAL_PSEUDOCOLOR;
         mode = par->hw.tt.mode & TT_SHIFTER_MODEMASK;
         if (mode == TT_SHIFTER_TTHIGH || mode == TT_SHIFTER_STHIGH) {
-                fix->type=FB_TYPE_PACKED_PIXELS;
-                fix->type_aux=0;
+                fix->type = FB_TYPE_PACKED_PIXELS;
+                fix->type_aux = 0;
                 if (mode == TT_SHIFTER_TTHIGH)
-                        fix->visual=FB_VISUAL_MONO01;
+                        fix->visual = FB_VISUAL_MONO01;
         }
-        fix->xpanstep=0;
-        fix->ypanstep=1;
-        fix->ywrapstep=0;
+        fix->xpanstep = 0;
+        fix->ypanstep = 1;
+        fix->ywrapstep = 0;
         fix->line_length = 0;
         fix->accel = FB_ACCEL_ATARIBLITT;
         return 0;
 }
 
-
-static int tt_decode_var( struct fb_var_screeninfo *var,
-                                                  struct atafb_par *par )
+static int tt_decode_var(struct fb_var_screeninfo *var, struct atafb_par *par)
 {
-        int xres=var->xres;
-        int yres=var->yres;
-        int bpp=var->bits_per_pixel;
+        int xres = var->xres;
+        int yres = var->yres;
+        int bpp = var->bits_per_pixel;
         int linelen;
         int yres_virtual = var->yres_virtual;
 
         if (mono_moni) {
-                if (bpp > 1 || xres > sttt_xres*2 || yres >tt_yres*2)
+                if (bpp > 1 || xres > sttt_xres * 2 || yres > tt_yres * 2)
                         return -EINVAL;
-                par->hw.tt.mode=TT_SHIFTER_TTHIGH;
-                xres=sttt_xres*2;
-                yres=tt_yres*2;
-                bpp=1;
+                par->hw.tt.mode = TT_SHIFTER_TTHIGH;
+                xres = sttt_xres * 2;
+                yres = tt_yres * 2;
+                bpp = 1;
         } else {
                 if (bpp > 8 || xres > sttt_xres || yres > tt_yres)
                         return -EINVAL;
                 if (bpp > 4) {
-                        if (xres > sttt_xres/2 || yres > tt_yres)
+                        if (xres > sttt_xres / 2 || yres > tt_yres)
                                 return -EINVAL;
-                        par->hw.tt.mode=TT_SHIFTER_TTLOW;
-                        xres=sttt_xres/2;
-                        yres=tt_yres;
-                        bpp=8;
-                }
-                else if (bpp > 2) {
+                        par->hw.tt.mode = TT_SHIFTER_TTLOW;
+                        xres = sttt_xres / 2;
+                        yres = tt_yres;
+                        bpp = 8;
+                } else if (bpp > 2) {
                         if (xres > sttt_xres || yres > tt_yres)
                                 return -EINVAL;
-                        if (xres > sttt_xres/2 || yres > st_yres/2) {
-                                par->hw.tt.mode=TT_SHIFTER_TTMID;
-                                xres=sttt_xres;
-                                yres=tt_yres;
-                                bpp=4;
-                        }
-                        else {
-                                par->hw.tt.mode=TT_SHIFTER_STLOW;
-                                xres=sttt_xres/2;
-                                yres=st_yres/2;
-                                bpp=4;
+                        if (xres > sttt_xres / 2 || yres > st_yres / 2) {
+                                par->hw.tt.mode = TT_SHIFTER_TTMID;
+                                xres = sttt_xres;
+                                yres = tt_yres;
+                                bpp = 4;
+                        } else {
+                                par->hw.tt.mode = TT_SHIFTER_STLOW;
+                                xres = sttt_xres / 2;
+                                yres = st_yres / 2;
+                                bpp = 4;
                         }
-                }
-                else if (bpp > 1) {
-                        if (xres > sttt_xres || yres > st_yres/2)
+                } else if (bpp > 1) {
+                        if (xres > sttt_xres || yres > st_yres / 2)
                                 return -EINVAL;
-                        par->hw.tt.mode=TT_SHIFTER_STMID;
-                        xres=sttt_xres;
-                        yres=st_yres/2;
-                        bpp=2;
-                }
-                else if (var->xres > sttt_xres || var->yres > st_yres) {
+                        par->hw.tt.mode = TT_SHIFTER_STMID;
+                        xres = sttt_xres;
+                        yres = st_yres / 2;
+                        bpp = 2;
+                } else if (var->xres > sttt_xres || var->yres > st_yres) {
                         return -EINVAL;
-                }
-                else {
-                        par->hw.tt.mode=TT_SHIFTER_STHIGH;
-                        xres=sttt_xres;
-                        yres=st_yres;
-                        bpp=1;
+                } else {
+                        par->hw.tt.mode = TT_SHIFTER_STHIGH;
+                        xres = sttt_xres;
+                        yres = st_yres;
+                        bpp = 1;
                 }
         }
         if (yres_virtual <= 0)
@@ -537,10 +679,10 @@ static int tt_decode_var( struct fb_var_screeninfo *var,
         else if (yres_virtual < yres)
                 yres_virtual = yres;
         if (var->sync & FB_SYNC_EXT)
-                par->hw.tt.sync=0;
+                par->hw.tt.sync = 0;
         else
-                par->hw.tt.sync=1;
-        linelen=xres*bpp/8;
+                par->hw.tt.sync = 1;
+        linelen = xres * bpp / 8;
         if (yres_virtual * linelen > screen_len && screen_len)
                 return -EINVAL;
         if (yres * linelen > screen_len && screen_len)
@@ -552,154 +694,123 @@ static int tt_decode_var( struct fb_var_screeninfo *var,
         return 0;
 }
 
-static int tt_encode_var( struct fb_var_screeninfo *var,
-                                                  struct atafb_par *par )
+static int tt_encode_var(struct fb_var_screeninfo *var, struct atafb_par *par)
 {
         int linelen;
         memset(var, 0, sizeof(struct fb_var_screeninfo));
-        var->red.offset=0;
-        var->red.length=4;
-        var->red.msb_right=0;
-        var->grayscale=0;
-
-        var->pixclock=31041;
-        var->left_margin=120;           /* these may be incorrect       */
-        var->right_margin=100;
-        var->upper_margin=8;
-        var->lower_margin=16;
-        var->hsync_len=140;
-        var->vsync_len=30;
-
-        var->height=-1;
-        var->width=-1;
+        var->red.offset = 0;
+        var->red.length = 4;
+        var->red.msb_right = 0;
+        var->grayscale = 0;
+
+        var->pixclock = 31041;
+        var->left_margin = 120;         /* these may be incorrect */
+        var->right_margin = 100;
+        var->upper_margin = 8;
+        var->lower_margin = 16;
+        var->hsync_len = 140;
+        var->vsync_len = 30;
+
+        var->height = -1;
+        var->width = -1;
 
         if (par->hw.tt.sync & 1)
-                var->sync=0;
+                var->sync = 0;
         else
-                var->sync=FB_SYNC_EXT;
+                var->sync = FB_SYNC_EXT;
 
         switch (par->hw.tt.mode & TT_SHIFTER_MODEMASK) {
         case TT_SHIFTER_STLOW:
-                var->xres=sttt_xres/2;
-                var->xres_virtual=sttt_xres_virtual/2;
-                var->yres=st_yres/2;
-                var->bits_per_pixel=4;
+                var->xres = sttt_xres / 2;
+                var->xres_virtual = sttt_xres_virtual / 2;
+                var->yres = st_yres / 2;
+                var->bits_per_pixel = 4;
                 break;
         case TT_SHIFTER_STMID:
-                var->xres=sttt_xres;
-                var->xres_virtual=sttt_xres_virtual;
-                var->yres=st_yres/2;
-                var->bits_per_pixel=2;
+                var->xres = sttt_xres;
+                var->xres_virtual = sttt_xres_virtual;
+                var->yres = st_yres / 2;
+                var->bits_per_pixel = 2;
                 break;
         case TT_SHIFTER_STHIGH:
-                var->xres=sttt_xres;
-                var->xres_virtual=sttt_xres_virtual;
-                var->yres=st_yres;
-                var->bits_per_pixel=1;
+                var->xres = sttt_xres;
+                var->xres_virtual = sttt_xres_virtual;
+                var->yres = st_yres;
+                var->bits_per_pixel = 1;
                 break;
         case TT_SHIFTER_TTLOW:
-                var->xres=sttt_xres/2;
-                var->xres_virtual=sttt_xres_virtual/2;
-                var->yres=tt_yres;
-                var->bits_per_pixel=8;
+                var->xres = sttt_xres / 2;
+                var->xres_virtual = sttt_xres_virtual / 2;
+                var->yres = tt_yres;
+                var->bits_per_pixel = 8;
                 break;
         case TT_SHIFTER_TTMID:
-                var->xres=sttt_xres;
-                var->xres_virtual=sttt_xres_virtual;
-                var->yres=tt_yres;
-                var->bits_per_pixel=4;
+                var->xres = sttt_xres;
+                var->xres_virtual = sttt_xres_virtual;
+                var->yres = tt_yres;
+                var->bits_per_pixel = 4;
                 break;
         case TT_SHIFTER_TTHIGH:
-                var->red.length=0;
-                var->xres=sttt_xres*2;
-                var->xres_virtual=sttt_xres_virtual*2;
-                var->yres=tt_yres*2;
-                var->bits_per_pixel=1;
+                var->red.length = 0;
+                var->xres = sttt_xres * 2;
+                var->xres_virtual = sttt_xres_virtual * 2;
+                var->yres = tt_yres * 2;
+                var->bits_per_pixel = 1;
                 break;
-        }               
-        var->blue=var->green=var->red;
-        var->transp.offset=0;
-        var->transp.length=0;
-        var->transp.msb_right=0;
-        linelen=var->xres_virtual * var->bits_per_pixel / 8;
-        if (! use_hwscroll)
-                var->yres_virtual=var->yres;
+        }
+        var->blue = var->green = var->red;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
+        linelen = var->xres_virtual * var->bits_per_pixel / 8;
+        if (!use_hwscroll)
+                var->yres_virtual = var->yres;
         else if (screen_len) {
                 if (par->yres_virtual)
                         var->yres_virtual = par->yres_virtual;
                 else
-                        /* yres_virtual==0 means use maximum */
+                        /* yres_virtual == 0 means use maximum */
                         var->yres_virtual = screen_len / linelen;
         } else {
                 if (hwscroll < 0)
                         var->yres_virtual = 2 * var->yres;
                 else
-                        var->yres_virtual=var->yres+hwscroll * 16;
+                        var->yres_virtual = var->yres + hwscroll * 16;
         }
-        var->xoffset=0;
+        var->xoffset = 0;
         if (screen_base)
-                var->yoffset=(par->screen_base - screen_base)/linelen;
+                var->yoffset = (par->screen_base - screen_base) / linelen;
         else
-                var->yoffset=0;
-        var->nonstd=0;
-        var->activate=0;
-        var->vmode=FB_VMODE_NONINTERLACED;
+                var->yoffset = 0;
+        var->nonstd = 0;
+        var->activate = 0;
+        var->vmode = FB_VMODE_NONINTERLACED;
         return 0;
 }
 
-
-static void tt_get_par( struct atafb_par *par )
+static void tt_get_par(struct atafb_par *par)
 {
         unsigned long addr;
-        par->hw.tt.mode=shifter_tt.tt_shiftmode;
-        par->hw.tt.sync=shifter.syncmode;
+        par->hw.tt.mode = shifter_tt.tt_shiftmode;
+        par->hw.tt.sync = shifter.syncmode;
         addr = ((shifter.bas_hi & 0xff) << 16) |
                ((shifter.bas_md & 0xff) << 8)  |
                ((shifter.bas_lo & 0xff));
         par->screen_base = phys_to_virt(addr);
 }
 
-static void tt_set_par( struct atafb_par *par )
+static void tt_set_par(struct atafb_par *par)
 {
-        shifter_tt.tt_shiftmode=par->hw.tt.mode;
-        shifter.syncmode=par->hw.tt.sync;
+        shifter_tt.tt_shiftmode = par->hw.tt.mode;
+        shifter.syncmode = par->hw.tt.sync;
         /* only set screen_base if really necessary */
         if (current_par.screen_base != par->screen_base)
                 fbhw->set_screen_base(par->screen_base);
 }
 
-
-static int tt_getcolreg(unsigned regno, unsigned *red,
-                        unsigned *green, unsigned *blue,
-                        unsigned *transp, struct fb_info *info)
-{
-        int t, col;
-
-        if ((shifter_tt.tt_shiftmode & TT_SHIFTER_MODEMASK) == TT_SHIFTER_STHIGH)
-                regno += 254;
-        if (regno > 255)
-                return 1;
-        t = tt_palette[regno];
-        col = t & 15;
-        col |= col << 4;
-        col |= col << 8;
-        *blue = col;
-        col = (t >> 4) & 15;
-        col |= col << 4;
-        col |= col << 8;
-        *green = col;
-        col = (t >> 8) & 15;
-        col |= col << 4;
-        col |= col << 8;
-        *red = col;
-        *transp = 0;
-        return 0;
-}
-
-
-static int tt_setcolreg(unsigned regno, unsigned red,
-                        unsigned green, unsigned blue,
-                        unsigned transp, struct fb_info *info)
+static int tt_setcolreg(unsigned int regno, unsigned int red,
+                        unsigned int green, unsigned int blue,
+                        unsigned int transp, struct fb_info *info)
 {
         if ((shifter_tt.tt_shiftmode & TT_SHIFTER_MODEMASK) == TT_SHIFTER_STHIGH)
                 regno += 254;
@@ -708,15 +819,14 @@ static int tt_setcolreg(unsigned regno, unsigned red,
         tt_palette[regno] = (((red >> 12) << 8) | ((green >> 12) << 4) |
                              (blue >> 12));
         if ((shifter_tt.tt_shiftmode & TT_SHIFTER_MODEMASK) ==
-                TT_SHIFTER_STHIGH && regno == 254)
+            TT_SHIFTER_STHIGH && regno == 254)
                 tt_palette[0] = 0;
         return 0;
 }
 
-                                                  
-static int tt_detect( void )
-
-{       struct atafb_par par;
+static int tt_detect(void)
+{
+        struct atafb_par par;
 
         /* Determine the connected monitor: The DMA sound must be
          * disabled before reading the MFP GPIP, because the Sound
@@ -726,9 +836,9 @@ static int tt_detect( void )
          * announced that the Eagle is TT compatible, but only the PCM is
          * missing...
          */
-        if (ATARIHW_PRESENT(PCM_8BIT)) { 
+        if (ATARIHW_PRESENT(PCM_8BIT)) {
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
-                udelay(20);     /* wait a while for things to settle down */
+                udelay(20);             /* wait a while for things to settle down */
         }
         mono_moni = (mfp.par_dt_reg & 0x80) == 0;
 
@@ -755,19 +865,24 @@ static struct pixel_clock {
         unsigned long f;        /* f/[Hz] */
         unsigned long t;        /* t/[ps] (=1/f) */
         int right, hsync, left; /* standard timing in clock cycles, not pixel */
-                /* hsync initialized in falcon_detect() */
+        /* hsync initialized in falcon_detect() */
         int sync_mask;          /* or-mask for hw.falcon.sync to set this clock */
         int control_mask;       /* ditto, for hw.falcon.vid_control */
-}
-f25  = {25175000, 39721, 18, 0, 42, 0x0, VCO_CLOCK25},
-f32  = {32000000, 31250, 18, 0, 42, 0x0, 0},
-fext = {       0,     0, 18, 0, 42, 0x1, 0};
+} f25 = {
+        25175000, 39721, 18, 0, 42, 0x0, VCO_CLOCK25
+}, f32 = {
+        32000000, 31250, 18, 0, 42, 0x0, 0
+}, fext = {
+        0, 0, 18, 0, 42, 0x1, 0
+};
 
 /* VIDEL-prescale values [mon_type][pixel_length from VCO] */
-static int vdl_prescale[4][3] = {{4,2,1}, {4,2,1}, {4,2,2}, {4,2,1}};
+static int vdl_prescale[4][3] = {
+        { 4,2,1 }, { 4,2,1 }, { 4,2,2 }, { 4,2,1 }
+};
 
 /* Default hsync timing [mon_type] in picoseconds */
-static long h_syncs[4] = {3000000, 4875000, 4000000, 4875000};
+static long h_syncs[4] = { 3000000, 4875000, 4000000, 4875000 };
 
 #ifdef FBCON_HAS_CFB16
 static u16 fbcon_cfb16_cmap[16];
@@ -775,12 +890,12 @@ static u16 fbcon_cfb16_cmap[16];
 
 static inline int hxx_prescale(struct falcon_hw *hw)
 {
-        return hw->ste_mode ? 16 :
-                   vdl_prescale[mon_type][hw->vid_mode >> 2 & 0x3];
+        return hw->ste_mode ? 16
+                            : vdl_prescale[mon_type][hw->vid_mode >> 2 & 0x3];
 }
 
-static int falcon_encode_fix( struct fb_fix_screeninfo *fix,
-                                                          struct atafb_par *par )
+static int falcon_encode_fix(struct fb_fix_screeninfo *fix,
+                             struct atafb_par *par)
 {
         strcpy(fix->id, "Atari Builtin");
         fix->smem_start = (unsigned long)real_screen_base;
@@ -796,8 +911,7 @@ static int falcon_encode_fix( struct fb_fix_screeninfo *fix,
                 fix->type_aux = 0;
                 /* no smooth scrolling with longword aligned video mem */
                 fix->xpanstep = 32;
-        }
-        else if (par->hw.falcon.f_shift & 0x100) {
+        } else if (par->hw.falcon.f_shift & 0x100) {
                 fix->type = FB_TYPE_PACKED_PIXELS;
                 fix->type_aux = 0;
                 /* Is this ok or should it be DIRECTCOLOR? */
@@ -809,9 +923,8 @@ static int falcon_encode_fix( struct fb_fix_screeninfo *fix,
         return 0;
 }
 
-
-static int falcon_decode_var( struct fb_var_screeninfo *var,
-                                                          struct atafb_par *par )
+static int falcon_decode_var(struct fb_var_screeninfo *var,
+                             struct atafb_par *par)
 {
         int bpp = var->bits_per_pixel;
         int xres = var->xres;
@@ -823,17 +936,19 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         int linelen;
         int interlace = 0, doubleline = 0;
         struct pixel_clock *pclock;
-        int plen; /* width of pixel in clock cycles */
+        int plen;                       /* width of pixel in clock cycles */
         int xstretch;
         int prescale;
         int longoffset = 0;
         int hfreq, vfreq;
+        int hdb_off, hde_off, base_off;
+        int gstart, gend1, gend2, align;
 
 /*
         Get the video params out of 'var'. If a value doesn't fit, round
         it up, if it's too big, return EINVAL.
-        Round up in the following order: bits_per_pixel, xres, yres, 
-        xres_virtual, yres_virtual, xoffset, yoffset, grayscale, bitfields, 
+        Round up in the following order: bits_per_pixel, xres, yres,
+        xres_virtual, yres_virtual, xoffset, yoffset, grayscale, bitfields,
         horizontal timing, vertical timing.
 
         There is a maximum of screen resolution determined by pixelclock
@@ -843,11 +958,11 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         Frequency range for multisync monitors is given via command line.
         For TV and SM124 both frequencies are fixed.
 
-        X % 16 == 0 to fit 8x?? font (except 1 bitplane modes must use X%32==0)
+        X % 16 == 0 to fit 8x?? font (except 1 bitplane modes must use X%32 == 0)
         Y % 16 == 0 to fit 8x16 font
         Y % 8 == 0 if Y<400
 
-        Currently interlace and doubleline mode in var are ignored. 
+        Currently interlace and doubleline mode in var are ignored.
         On SM124 and TV only the standard resolutions can be used.
 */
 
@@ -855,43 +970,38 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         if (!xres || !yres || !bpp)
                 return -EINVAL;
 
-        if (mon_type == F_MON_SM && bpp != 1) {
+        if (mon_type == F_MON_SM && bpp != 1)
                 return -EINVAL;
-        }
-        else if (bpp <= 1) {
+
+        if (bpp <= 1) {
                 bpp = 1;
                 par->hw.falcon.f_shift = 0x400;
                 par->hw.falcon.st_shift = 0x200;
-        }
-        else if (bpp <= 2) {
+        } else if (bpp <= 2) {
                 bpp = 2;
                 par->hw.falcon.f_shift = 0x000;
                 par->hw.falcon.st_shift = 0x100;
-        }
-        else if (bpp <= 4) {
+        } else if (bpp <= 4) {
                 bpp = 4;
                 par->hw.falcon.f_shift = 0x000;
                 par->hw.falcon.st_shift = 0x000;
-        }
-        else if (bpp <= 8) {
+        } else if (bpp <= 8) {
                 bpp = 8;
                 par->hw.falcon.f_shift = 0x010;
-        }
-        else if (bpp <= 16) {
-                bpp = 16; /* packed pixel mode */
-                par->hw.falcon.f_shift = 0x100; /* hicolor, no overlay */
-        }
-        else
+        } else if (bpp <= 16) {
+                bpp = 16;               /* packed pixel mode */
+                par->hw.falcon.f_shift = 0x100; /* hicolor, no overlay */
+        } else
                 return -EINVAL;
         par->hw.falcon.bpp = bpp;
 
         if (mon_type == F_MON_SM || DontCalcRes) {
                 /* Skip all calculations. VGA/TV/SC1224 only supported. */
                 struct fb_var_screeninfo *myvar = &atafb_predefined[0];
-                
+
                 if (bpp > myvar->bits_per_pixel ||
-                        var->xres > myvar->xres ||
-                        var->yres > myvar->yres)
+                    var->xres > myvar->xres ||
+                    var->yres > myvar->yres)
                         return -EINVAL;
                 fbhw->get_par(par);     /* Current par will be new par */
                 goto set_screen_base;   /* Don't forget this */
@@ -910,8 +1020,8 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                 yres = 400;
 
         /* 2 planes must use STE compatibility mode */
-        par->hw.falcon.ste_mode = bpp==2;
-        par->hw.falcon.mono = bpp==1;
+        par->hw.falcon.ste_mode = bpp == 2;
+        par->hw.falcon.mono = bpp == 1;
 
         /* Total and visible scanline length must be a multiple of one longword,
          * this and the console fontwidth yields the alignment for xres and
@@ -967,8 +1077,7 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                 left_margin = hsync_len = 128 / plen;
                 right_margin = 0;
                 /* TODO set all margins */
-        }
-        else
+        } else
 #endif
         if (mon_type == F_MON_SC || mon_type == F_MON_TV) {
                 plen = 2 * xstretch;
@@ -1002,26 +1111,24 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                                 vsync_len *= 2;
                         }
                 }
-        }
-        else
-        {       /* F_MON_VGA */
+        } else {                        /* F_MON_VGA */
                 if (bpp == 16)
-                        xstretch = 2; /* Double pixel width only for hicolor */
+                        xstretch = 2;   /* Double pixel width only for hicolor */
                 /* Default values are used for vert./hor. timing if no pixelclock given. */
                 if (var->pixclock == 0) {
                         int linesize;
 
                         /* Choose master pixelclock depending on hor. timing */
                         plen = 1 * xstretch;
-                        if ((plen * xres + f25.right+f25.hsync+f25.left) *
+                        if ((plen * xres + f25.right + f25.hsync + f25.left) *
                             fb_info.monspecs.hfmin < f25.f)
                                 pclock = &f25;
-                        else if ((plen * xres + f32.right+f32.hsync+f32.left) * 
-                            fb_info.monspecs.hfmin < f32.f)
+                        else if ((plen * xres + f32.right + f32.hsync +
+                                  f32.left) * fb_info.monspecs.hfmin < f32.f)
                                 pclock = &f32;
-                        else if ((plen * xres + fext.right+fext.hsync+fext.left) * 
-                            fb_info.monspecs.hfmin < fext.f
-                                 && fext.f)
+                        else if ((plen * xres + fext.right + fext.hsync +
+                                  fext.left) * fb_info.monspecs.hfmin < fext.f &&
+                                 fext.f)
                                 pclock = &fext;
                         else
                                 return -EINVAL;
@@ -1033,22 +1140,24 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                         upper_margin = 31;
                         lower_margin = 11;
                         vsync_len = 3;
-                }
-                else {
+                } else {
                         /* Choose largest pixelclock <= wanted clock */
                         int i;
                         unsigned long pcl = ULONG_MAX;
                         pclock = 0;
-                        for (i=1; i <= 4; i *= 2) {
-                                if (f25.t*i >= var->pixclock && f25.t*i < pcl) {
+                        for (i = 1; i <= 4; i *= 2) {
+                                if (f25.t * i >= var->pixclock &&
+                                    f25.t * i < pcl) {
                                         pcl = f25.t * i;
                                         pclock = &f25;
                                 }
-                                if (f32.t*i >= var->pixclock && f32.t*i < pcl) {
+                                if (f32.t * i >= var->pixclock &&
+                                    f32.t * i < pcl) {
                                         pcl = f32.t * i;
                                         pclock = &f32;
                                 }
-                                if (fext.t && fext.t*i >= var->pixclock && fext.t*i < pcl) {
+                                if (fext.t && fext.t * i >= var->pixclock &&
+                                    fext.t * i < pcl) {
                                         pcl = fext.t * i;
                                         pclock = &fext;
                                 }
@@ -1070,8 +1179,7 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                                 upper_margin = (upper_margin + 1) / 2;
                                 lower_margin = (lower_margin + 1) / 2;
                                 vsync_len = (vsync_len + 1) / 2;
-                        }
-                        else if (var->vmode & FB_VMODE_DOUBLE) {
+                        } else if (var->vmode & FB_VMODE_DOUBLE) {
                                 /* External unit is [double lines per frame] */
                                 upper_margin *= 2;
                                 lower_margin *= 2;
@@ -1079,7 +1187,7 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                         }
                 }
                 if (pclock == &fext)
-                        longoffset = 1; /* VIDEL doesn't synchronize on short offset */
+                        longoffset = 1; /* VIDEL doesn't synchronize on short offset */
         }
         /* Is video bus bandwidth (32MB/s) too low for this resolution? */
         /* this is definitely wrong if bus clock != 32MHz */
@@ -1098,7 +1206,7 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
          * between interlace and non-interlace without messing around
          * with these.
          */
-  again:
+again:
         /* Set base_offset 128 and video bus width */
         par->hw.falcon.vid_control = mon_type | f030_bus_width;
         if (!longoffset)
@@ -1112,37 +1220,34 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         /* External or internal clock */
         par->hw.falcon.sync = pclock->sync_mask | 0x2;
         /* Pixellength and prescale */
-        par->hw.falcon.vid_mode = (2/plen) << 2;
+        par->hw.falcon.vid_mode = (2 / plen) << 2;
         if (doubleline)
                 par->hw.falcon.vid_mode |= VMO_DOUBLE;
         if (interlace)
                 par->hw.falcon.vid_mode |= VMO_INTER;
 
         /*********************
-        Horizontal timing: unit = [master clock cycles]
-        unit of hxx-registers: [master clock cycles * prescale]
-        Hxx-registers are 9 bit wide
-
-        1 line = ((hht + 2) * 2 * prescale) clock cycles
-
-        graphic output = hdb & 0x200 ?
-               ((hht+2)*2 - hdb + hde) * prescale - hdboff + hdeoff:
-               ( hht + 2  - hdb + hde) * prescale - hdboff + hdeoff
-        (this must be a multiple of plen*128/bpp, on VGA pixels
-         to the right may be cut off with a bigger right margin)
-
-        start of graphics relative to start of 1st halfline = hdb & 0x200 ?
-               (hdb - hht - 2) * prescale + hdboff :
-               hdb * prescale + hdboff
-
-        end of graphics relative to start of 1st halfline =
-               (hde + hht + 2) * prescale + hdeoff
-        *********************/
+         * Horizontal timing: unit = [master clock cycles]
+         * unit of hxx-registers: [master clock cycles * prescale]
+         * Hxx-registers are 9 bit wide
+         *
+         * 1 line = ((hht + 2) * 2 * prescale) clock cycles
+         *
+         * graphic output = hdb & 0x200 ?
+         *        ((hht + 2) * 2 - hdb + hde) * prescale - hdboff + hdeoff:
+         *        (hht + 2  - hdb + hde) * prescale - hdboff + hdeoff
+         * (this must be a multiple of plen*128/bpp, on VGA pixels
+         *  to the right may be cut off with a bigger right margin)
+         *
+         * start of graphics relative to start of 1st halfline = hdb & 0x200 ?
+         *        (hdb - hht - 2) * prescale + hdboff :
+         *        hdb * prescale + hdboff
+         *
+         * end of graphics relative to start of 1st halfline =
+         *        (hde + hht + 2) * prescale + hdeoff
+         *********************/
         /* Calculate VIDEL registers */
-        {
-        int hdb_off, hde_off, base_off;
-        int gstart, gend1, gend2, align;
-
+{
         prescale = hxx_prescale(&par->hw.falcon);
         base_off = par->hw.falcon.vid_control & VCO_SHORTOFFS ? 64 : 128;
 
@@ -1154,8 +1259,7 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                 align = 1;
                 hde_off = 0;
                 hdb_off = (base_off + 16 * plen) + prescale;
-        }
-        else {
+        } else {
                 align = 128 / bpp;
                 hde_off = ((128 / bpp + 2) * plen);
                 if (par->hw.falcon.ste_mode)
@@ -1164,23 +1268,24 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
                         hdb_off = (base_off + (128 / bpp + 18) * plen) + prescale;
         }
 
-        gstart = (prescale/2 + plen * left_margin) / prescale;
+        gstart = (prescale / 2 + plen * left_margin) / prescale;
         /* gend1 is for hde (gend-gstart multiple of align), shifter's xres */
-        gend1 = gstart + ((xres + align-1) / align)*align * plen / prescale;
+        gend1 = gstart + ((xres + align - 1) / align) * align * plen / prescale;
         /* gend2 is for hbb, visible xres (rest to gend1 is cut off by hblank) */
         gend2 = gstart + xres * plen / prescale;
         par->HHT = plen * (left_margin + xres + right_margin) /
                            (2 * prescale) - 2;
 /*      par->HHT = (gend2 + plen * right_margin / prescale) / 2 - 2;*/
 
-        par->HDB = gstart - hdb_off/prescale;
+        par->HDB = gstart - hdb_off / prescale;
         par->HBE = gstart;
-        if (par->HDB < 0) par->HDB += par->HHT + 2 + 0x200;
-        par->HDE = gend1 - par->HHT - 2 - hde_off/prescale;
+        if (par->HDB < 0)
+                par->HDB += par->HHT + 2 + 0x200;
+        par->HDE = gend1 - par->HHT - 2 - hde_off / prescale;
         par->HBB = gend2 - par->HHT - 2;
 #if 0
         /* One more Videl constraint: data fetch of two lines must not overlap */
-        if ((par->HDB & 0x200)  &&  (par->HDB & ~0x200) - par->HDE <= 5) {
+        if ((par->HDB & 0x200) && (par->HDB & ~0x200) - par->HDE <= 5) {
                 /* if this happens increase margins, decrease hfreq. */
         }
 #endif
@@ -1189,11 +1294,11 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         par->HSS = par->HHT + 2 - plen * hsync_len / prescale;
         if (par->HSS < par->HBB)
                 par->HSS = par->HBB;
-        }
+}
 
         /*  check hor. frequency */
-        hfreq = pclock->f / ((par->HHT+2)*prescale*2);
-        if (hfreq > fb_info.monspecs.hfmax && mon_type!=F_MON_VGA) {
+        hfreq = pclock->f / ((par->HHT + 2) * prescale * 2);
+        if (hfreq > fb_info.monspecs.hfmax && mon_type != F_MON_VGA) {
                 /* ++guenther:   ^^^^^^^^^^^^^^^^^^^ can't remember why I did this */
                 /* Too high -> enlarge margin */
                 left_margin += 1;
@@ -1213,12 +1318,14 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         par->VBE = (upper_margin * 2 + 1); /* must begin on odd halfline */
         par->VDB = par->VBE;
         par->VDE = yres;
-        if (!interlace) par->VDE <<= 1;
-        if (doubleline) par->VDE <<= 1;  /* VDE now half lines per (half-)frame */
+        if (!interlace)
+                par->VDE <<= 1;
+        if (doubleline)
+                par->VDE <<= 1;         /* VDE now half lines per (half-)frame */
         par->VDE += par->VDB;
         par->VBB = par->VDE;
         par->VFT = par->VBB + (lower_margin * 2 - 1) - 1;
-        par->VSS = par->VFT+1 - (vsync_len * 2 - 1);
+        par->VSS = par->VFT + 1 - (vsync_len * 2 - 1);
         /* vbb,vss,vft must be even in interlace mode */
         if (interlace) {
                 par->VBB++;
@@ -1229,55 +1336,53 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         /* V-frequency check, hope I didn't create any loop here. */
         /* Interlace and doubleline are mutually exclusive. */
         vfreq = (hfreq * 2) / (par->VFT + 1);
-        if      (vfreq > fb_info.monspecs.vfmax && !doubleline && !interlace) {
+        if (vfreq > fb_info.monspecs.vfmax && !doubleline && !interlace) {
                 /* Too high -> try again with doubleline */
                 doubleline = 1;
                 goto again;
-        }
-        else if (vfreq < fb_info.monspecs.vfmin && !interlace && !doubleline) {
+        } else if (vfreq < fb_info.monspecs.vfmin && !interlace && !doubleline) {
                 /* Too low -> try again with interlace */
                 interlace = 1;
                 goto again;
-        }
-        else if (vfreq < fb_info.monspecs.vfmin && doubleline) {
+        } else if (vfreq < fb_info.monspecs.vfmin && doubleline) {
                 /* Doubleline too low -> clear doubleline and enlarge margins */
                 int lines;
                 doubleline = 0;
-                for (lines=0;
-                     (hfreq*2)/(par->VFT+1+4*lines-2*yres)>fb_info.monspecs.vfmax;
+                for (lines = 0;
+                     (hfreq * 2) / (par->VFT + 1 + 4 * lines - 2 * yres) >
+                     fb_info.monspecs.vfmax;
                      lines++)
                         ;
                 upper_margin += lines;
                 lower_margin += lines;
                 goto again;
-        }
-        else if (vfreq > fb_info.monspecs.vfmax && doubleline) {
+        } else if (vfreq > fb_info.monspecs.vfmax && doubleline) {
                 /* Doubleline too high -> enlarge margins */
                 int lines;
-                for (lines=0;
-                     (hfreq*2)/(par->VFT+1+4*lines)>fb_info.monspecs.vfmax;
-                     lines+=2)
+                for (lines = 0;
+                     (hfreq * 2) / (par->VFT + 1 + 4 * lines) >
+                     fb_info.monspecs.vfmax;
+                     lines += 2)
                         ;
                 upper_margin += lines;
                 lower_margin += lines;
                 goto again;
-        }
-        else if (vfreq > fb_info.monspecs.vfmax && interlace) {
+        } else if (vfreq > fb_info.monspecs.vfmax && interlace) {
                 /* Interlace, too high -> enlarge margins */
                 int lines;
-                for (lines=0;
-                     (hfreq*2)/(par->VFT+1+4*lines)>fb_info.monspecs.vfmax;
+                for (lines = 0;
+                     (hfreq * 2) / (par->VFT + 1 + 4 * lines) >
+                     fb_info.monspecs.vfmax;
                      lines++)
                         ;
                 upper_margin += lines;
                 lower_margin += lines;
                 goto again;
-        }
-        else if (vfreq < fb_info.monspecs.vfmin ||
-                 vfreq > fb_info.monspecs.vfmax)
+        } else if (vfreq < fb_info.monspecs.vfmin ||
+                   vfreq > fb_info.monspecs.vfmax)
                 return -EINVAL;
 
-  set_screen_base:
+set_screen_base:
         linelen = xres_virtual * bpp / 8;
         if (yres_virtual * linelen > screen_len && screen_len)
                 return -EINVAL;
@@ -1289,11 +1394,20 @@ static int falcon_decode_var( struct fb_var_screeninfo *var,
         par->screen_base = screen_base + var->yoffset * linelen;
         par->hw.falcon.xoffset = 0;
 
+        // FIXME!!! sort of works, no crash
+        //par->next_line = linelen;
+        //par->next_plane = yres_virtual * linelen;
+        par->next_line = linelen;
+        par->next_plane = 2;
+        // crashes
+        //par->next_plane = linelen;
+        //par->next_line  = yres_virtual * linelen;
+
         return 0;
 }
 
-static int falcon_encode_var( struct fb_var_screeninfo *var,
-                                                          struct atafb_par *par )
+static int falcon_encode_var(struct fb_var_screeninfo *var,
+                             struct atafb_par *par)
 {
 /* !!! only for VGA !!! */
         int linelen;
@@ -1306,10 +1420,10 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
         var->pixclock = hw->sync & 0x1 ? fext.t :
                         hw->vid_control & VCO_CLOCK25 ? f25.t : f32.t;
 
-        var->height=-1;
-        var->width=-1;
+        var->height = -1;
+        var->width = -1;
 
-        var->sync=0;
+        var->sync = 0;
         if (hw->vid_control & VCO_HSYPOS)
                 var->sync |= FB_SYNC_HOR_HIGH_ACT;
         if (hw->vid_control & VCO_VSYPOS)
@@ -1320,7 +1434,7 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
                 var->vmode |= FB_VMODE_INTERLACED;
         if (hw->vid_mode & VMO_DOUBLE)
                 var->vmode |= FB_VMODE_DOUBLE;
-        
+
         /* visible y resolution:
          * Graphics display starts at line VDB and ends at line
          * VDE. If interlace mode off unit of VC-registers is
@@ -1332,14 +1446,15 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
         if (var->vmode & FB_VMODE_DOUBLE)
                 var->yres >>= 1;
 
-        /* to get bpp, we must examine f_shift and st_shift.
+        /*
+         * to get bpp, we must examine f_shift and st_shift.
          * f_shift is valid if any of bits no. 10, 8 or 4
          * is set. Priority in f_shift is: 10 ">" 8 ">" 4, i.e.
          * if bit 10 set then bit 8 and bit 4 don't care...
          * If all these bits are 0 get display depth from st_shift
          * (as for ST and STE)
          */
-        if (hw->f_shift & 0x400)                /* 2 colors */
+        if (hw->f_shift & 0x400)        /* 2 colors */
                 var->bits_per_pixel = 1;
         else if (hw->f_shift & 0x100)   /* hicolor */
                 var->bits_per_pixel = 16;
@@ -1349,7 +1464,7 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
                 var->bits_per_pixel = 4;
         else if (hw->st_shift == 0x100)
                 var->bits_per_pixel = 2;
-        else /* if (hw->st_shift == 0x200) */
+        else                            /* if (hw->st_shift == 0x200) */
                 var->bits_per_pixel = 1;
 
         var->xres = hw->line_width * 16 / var->bits_per_pixel;
@@ -1358,42 +1473,42 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
                 var->xres_virtual += 16;
 
         if (var->bits_per_pixel == 16) {
-                var->red.offset=11;
-                var->red.length=5;
-                var->red.msb_right=0;
-                var->green.offset=5;
-                var->green.length=6;
-                var->green.msb_right=0;
-                var->blue.offset=0;
-                var->blue.length=5;
-                var->blue.msb_right=0;
-        }
-        else {
-                var->red.offset=0;
+                var->red.offset = 11;
+                var->red.length = 5;
+                var->red.msb_right = 0;
+                var->green.offset = 5;
+                var->green.length = 6;
+                var->green.msb_right = 0;
+                var->blue.offset = 0;
+                var->blue.length = 5;
+                var->blue.msb_right = 0;
+        } else {
+                var->red.offset = 0;
                 var->red.length = hw->ste_mode ? 4 : 6;
-                var->red.msb_right=0;
-                var->grayscale=0;
-                var->blue=var->green=var->red;
+                if (var->red.length > var->bits_per_pixel)
+                        var->red.length = var->bits_per_pixel;
+                var->red.msb_right = 0;
+                var->grayscale = 0;
+                var->blue = var->green = var->red;
         }
-        var->transp.offset=0;
-        var->transp.length=0;
-        var->transp.msb_right=0;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
 
         linelen = var->xres_virtual * var->bits_per_pixel / 8;
         if (screen_len) {
                 if (par->yres_virtual)
                         var->yres_virtual = par->yres_virtual;
                 else
-                        /* yres_virtual==0 means use maximum */
+                        /* yres_virtual == 0 means use maximum */
                         var->yres_virtual = screen_len / linelen;
-        }
-        else {
+        } else {
                 if (hwscroll < 0)
                         var->yres_virtual = 2 * var->yres;
                 else
-                        var->yres_virtual=var->yres+hwscroll * 16;
+                        var->yres_virtual = var->yres + hwscroll * 16;
         }
-        var->xoffset=0; /* TODO change this */
+        var->xoffset = 0;               /* TODO change this */
 
         /* hdX-offsets */
         prescale = hxx_prescale(hw);
@@ -1402,8 +1517,7 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
         if (hw->f_shift & 0x100) {
                 hde_off = 0;
                 hdb_off = (base_off + 16 * plen) + prescale;
-        }
-        else {
+        } else {
                 hde_off = ((128 / var->bits_per_pixel + 2) * plen);
                 if (hw->ste_mode)
                         hdb_off = (64 + base_off + (128 / var->bits_per_pixel + 2) * plen)
@@ -1415,8 +1529,8 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
 
         /* Right margin includes hsync */
         var->left_margin = hdb_off + prescale * ((hw->hdb & 0x1ff) -
-                                           (hw->hdb & 0x200 ? 2+hw->hht : 0));
-        if (hw->ste_mode || mon_type!=F_MON_VGA)
+                                           (hw->hdb & 0x200 ? 2 + hw->hht : 0));
+        if (hw->ste_mode || mon_type != F_MON_VGA)
                 var->right_margin = prescale * (hw->hht + 2 - hw->hde) - hde_off;
         else
                 /* can't use this in ste_mode, because hbb is +1 off */
@@ -1424,15 +1538,14 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
         var->hsync_len = prescale * (hw->hht + 2 - hw->hss);
 
         /* Lower margin includes vsync */
-        var->upper_margin = hw->vdb / 2 ;  /* round down to full lines */
-        var->lower_margin = (hw->vft+1 - hw->vde + 1) / 2; /* round up */
-        var->vsync_len    = (hw->vft+1 - hw->vss + 1) / 2; /* round up */
+        var->upper_margin = hw->vdb / 2;        /* round down to full lines */
+        var->lower_margin = (hw->vft + 1 - hw->vde + 1) / 2;    /* round up */
+        var->vsync_len = (hw->vft + 1 - hw->vss + 1) / 2;       /* round up */
         if (var->vmode & FB_VMODE_INTERLACED) {
                 var->upper_margin *= 2;
                 var->lower_margin *= 2;
                 var->vsync_len *= 2;
-        }
-        else if (var->vmode & FB_VMODE_DOUBLE) {
+        } else if (var->vmode & FB_VMODE_DOUBLE) {
                 var->upper_margin = (var->upper_margin + 1) / 2;
                 var->lower_margin = (var->lower_margin + 1) / 2;
                 var->vsync_len = (var->vsync_len + 1) / 2;
@@ -1447,20 +1560,19 @@ static int falcon_encode_var( struct fb_var_screeninfo *var,
         var->lower_margin -= var->vsync_len;
 
         if (screen_base)
-                var->yoffset=(par->screen_base - screen_base)/linelen;
+                var->yoffset = (par->screen_base - screen_base) / linelen;
         else
-                var->yoffset=0;
-        var->nonstd=0;  /* what is this for? */
-        var->activate=0;
+                var->yoffset = 0;
+        var->nonstd = 0;                /* what is this for? */
+        var->activate = 0;
         return 0;
 }
 
-
-static int f_change_mode = 0;
+static int f_change_mode;
 static struct falcon_hw f_new_mode;
-static int f_pan_display = 0;
+static int f_pan_display;
 
-static void falcon_get_par( struct atafb_par *par )
+static void falcon_get_par(struct atafb_par *par)
 {
         unsigned long addr;
         struct falcon_hw *hw = &par->hw.falcon;
@@ -1492,12 +1604,12 @@ static void falcon_get_par( struct atafb_par *par )
         par->screen_base = phys_to_virt(addr);
 
         /* derived parameters */
-        hw->ste_mode = (hw->f_shift & 0x510)==0 && hw->st_shift==0x100;
+        hw->ste_mode = (hw->f_shift & 0x510) == 0 && hw->st_shift == 0x100;
         hw->mono = (hw->f_shift & 0x400) ||
-                   ((hw->f_shift & 0x510)==0 && hw->st_shift==0x200);
+                   ((hw->f_shift & 0x510) == 0 && hw->st_shift == 0x200);
 }
 
-static void falcon_set_par( struct atafb_par *par )
+static void falcon_set_par(struct atafb_par *par)
 {
         f_change_mode = 0;
 
@@ -1519,8 +1631,7 @@ static void falcon_set_par( struct atafb_par *par )
         f_change_mode = 1;
 }
 
-
-static irqreturn_t falcon_vbl_switcher( int irq, void *dummy )
+static irqreturn_t falcon_vbl_switcher(int irq, void *dummy)
 {
         struct falcon_hw *hw = &f_new_mode;
 
@@ -1529,11 +1640,10 @@ static irqreturn_t falcon_vbl_switcher( int irq, void *dummy )
 
                 if (hw->sync & 0x1) {
                         /* Enable external pixelclock. This code only for ScreenWonder */
-                        *(volatile unsigned short*)0xffff9202 = 0xffbf;
-                }
-                else {
+                        *(volatile unsigned short *)0xffff9202 = 0xffbf;
+                } else {
                         /* Turn off external clocks. Read sets all output bits to 1. */
-                        *(volatile unsigned short*)0xffff9202;
+                        *(volatile unsigned short *)0xffff9202;
                 }
                 shifter.syncmode = hw->sync;
 
@@ -1550,15 +1660,14 @@ static irqreturn_t falcon_vbl_switcher( int irq, void *dummy )
                 videl.vde = hw->vde;
                 videl.vss = hw->vss;
 
-                videl.f_shift = 0; /* write enables Falcon palette, 0: 4 planes */
+                videl.f_shift = 0;      /* write enables Falcon palette, 0: 4 planes */
                 if (hw->ste_mode) {
-                        videl.st_shift = hw->st_shift; /* write enables STE palette */
-                }
-                else {
+                        videl.st_shift = hw->st_shift;  /* write enables STE palette */
+                } else {
                         /* IMPORTANT:
-                         * set st_shift 0, so we can tell the screen-depth if f_shift==0.
+                         * set st_shift 0, so we can tell the screen-depth if f_shift == 0.
                          * Writing 0 to f_shift enables 4 plane Falcon mode but
-                         * doesn't set st_shift. st_shift!=0 (!=4planes) is impossible
+                         * doesn't set st_shift. st_shift != 0 (!= 4planes) is impossible
                          * with Falcon palette.
                          */
                         videl.st_shift = 0;
@@ -1580,12 +1689,13 @@ static irqreturn_t falcon_vbl_switcher( int irq, void *dummy )
         return IRQ_HANDLED;
 }
 
-
-static int falcon_pan_display( struct fb_var_screeninfo *var,
-                                                           struct atafb_par *par )
+static int falcon_pan_display(struct fb_var_screeninfo *var,
+                              struct fb_info *info)
 {
+        struct atafb_par *par = (struct atafb_par *)info->par;
+
         int xoffset;
-        int bpp = fb_display[fb_info.currcon].var.bits_per_pixel;
+        int bpp = info->var.bits_per_pixel;
 
         if (bpp == 1)
                 var->xoffset = up(var->xoffset, 32);
@@ -1596,45 +1706,24 @@ static int falcon_pan_display( struct fb_var_screeninfo *var,
                 var->xoffset = up(var->xoffset, 2);
         }
         par->hw.falcon.line_offset = bpp *
-                (fb_display[fb_info.currcon].var.xres_virtual - fb_display[fb_info.currcon].var.xres) / 16;
+                (info->var.xres_virtual - info->var.xres) / 16;
         if (par->hw.falcon.xoffset)
                 par->hw.falcon.line_offset -= bpp;
         xoffset = var->xoffset - par->hw.falcon.xoffset;
 
         par->screen_base = screen_base +
-                (var->yoffset * fb_display[fb_info.currcon].var.xres_virtual + xoffset) * bpp / 8;
+                (var->yoffset * info->var.xres_virtual + xoffset) * bpp / 8;
         if (fbhw->set_screen_base)
-                fbhw->set_screen_base (par->screen_base);
+                fbhw->set_screen_base(par->screen_base);
         else
-                return -EINVAL; /* shouldn't happen */
+                return -EINVAL;         /* shouldn't happen */
         f_pan_display = 1;
         return 0;
 }
 
-
-static int falcon_getcolreg( unsigned regno, unsigned *red,
-                                 unsigned *green, unsigned *blue,
-                                 unsigned *transp, struct fb_info *info )
-{       unsigned long col;
-        
-        if (regno > 255)
-                return 1;
-        /* This works in STE-mode (with 4bit/color) since f030_col-registers
-         * hold up to 6bit/color.
-         * Even with hicolor r/g/b=5/6/5 bit!
-         */
-        col = f030_col[regno];
-        *red = (col >> 16) & 0xff00;
-        *green = (col >> 8) & 0xff00;
-        *blue = (col << 8) & 0xff00;
-        *transp = 0;
-        return 0;
-}
-
-
-static int falcon_setcolreg( unsigned regno, unsigned red,
-                                                         unsigned green, unsigned blue,
-                                                         unsigned transp, struct fb_info *info )
+static int falcon_setcolreg(unsigned int regno, unsigned int red,
+                            unsigned int green, unsigned int blue,
+                            unsigned int transp, struct fb_info *info)
 {
         if (regno > 255)
                 return 1;
@@ -1655,13 +1744,12 @@ static int falcon_setcolreg( unsigned regno, unsigned red,
         return 0;
 }
 
-
-static int falcon_blank( int blank_mode )
+static int falcon_blank(int blank_mode)
 {
-/* ++guenther: we can switch off graphics by changing VDB and VDE,
- * so VIDEL doesn't hog the bus while saving.
- * (this may affect usleep()).
- */
+        /* ++guenther: we can switch off graphics by changing VDB and VDE,
+         * so VIDEL doesn't hog the bus while saving.
+         * (this may affect usleep()).
+         */
         int vdb, vss, hbe, hss;
 
         if (mon_type == F_MON_SM)       /* this doesn't work on SM124 */
@@ -1694,14 +1782,13 @@ static int falcon_blank( int blank_mode )
         return 0;
 }
 
- 
-static int falcon_detect( void )
+static int falcon_detect(void)
 {
         struct atafb_par par;
         unsigned char fhw;
 
         /* Determine connected monitor and set monitor parameters */
-        fhw = *(unsigned char*)0xffff8006;
+        fhw = *(unsigned char *)0xffff8006;
         mon_type = fhw >> 6 & 0x3;
         /* bit 1 of fhw: 1=32 bit ram bus, 0=16 bit */
         f030_bus_width = fhw << 6 & 0x80;
@@ -1715,7 +1802,7 @@ static int falcon_detect( void )
         case F_MON_SC:
         case F_MON_TV:
                 /* PAL...NTSC */
-                fb_info.monspecs.vfmin = 49; /* not 50, since TOS defaults to 49.9x Hz */
+                fb_info.monspecs.vfmin = 49;    /* not 50, since TOS defaults to 49.9x Hz */
                 fb_info.monspecs.vfmax = 60;
                 fb_info.monspecs.hfmin = 15620;
                 fb_info.monspecs.hfmax = 15755;
@@ -1740,13 +1827,12 @@ static int falcon_detect( void )
 
 #ifdef ATAFB_STE
 
-static int stste_encode_fix( struct fb_fix_screeninfo *fix,
-                                                         struct atafb_par *par )
-
+static int stste_encode_fix(struct fb_fix_screeninfo *fix,
+                            struct atafb_par *par)
 {
         int mode;
 
-        strcpy(fix->id,"Atari Builtin");
+        strcpy(fix->id, "Atari Builtin");
         fix->smem_start = (unsigned long)real_screen_base;
         fix->smem_len = screen_len;
         fix->type = FB_TYPE_INTERLEAVED_PLANES;
@@ -1771,43 +1857,40 @@ static int stste_encode_fix( struct fb_fix_screeninfo *fix,
         return 0;
 }
 
-
-static int stste_decode_var( struct fb_var_screeninfo *var,
-                                                  struct atafb_par *par )
+static int stste_decode_var(struct fb_var_screeninfo *var,
+                            struct atafb_par *par)
 {
-        int xres=var->xres;
-        int yres=var->yres;
-        int bpp=var->bits_per_pixel;
+        int xres = var->xres;
+        int yres = var->yres;
+        int bpp = var->bits_per_pixel;
         int linelen;
         int yres_virtual = var->yres_virtual;
 
         if (mono_moni) {
                 if (bpp > 1 || xres > sttt_xres || yres > st_yres)
                         return -EINVAL;
-                par->hw.st.mode=ST_HIGH;
-                xres=sttt_xres;
-                yres=st_yres;
-                bpp=1;
+                par->hw.st.mode = ST_HIGH;
+                xres = sttt_xres;
+                yres = st_yres;
+                bpp = 1;
         } else {
                 if (bpp > 4 || xres > sttt_xres || yres > st_yres)
                         return -EINVAL;
                 if (bpp > 2) {
-                        if (xres > sttt_xres/2 || yres > st_yres/2)
+                        if (xres > sttt_xres / 2 || yres > st_yres / 2)
                                 return -EINVAL;
-                        par->hw.st.mode=ST_LOW;
-                        xres=sttt_xres/2;
-                        yres=st_yres/2;
-                        bpp=4;
-                }
-                else if (bpp > 1) {
-                        if (xres > sttt_xres || yres > st_yres/2)
+                        par->hw.st.mode = ST_LOW;
+                        xres = sttt_xres / 2;
+                        yres = st_yres / 2;
+                        bpp = 4;
+                } else if (bpp > 1) {
+                        if (xres > sttt_xres || yres > st_yres / 2)
                                 return -EINVAL;
-                        par->hw.st.mode=ST_MID;
-                        xres=sttt_xres;
-                        yres=st_yres/2;
-                        bpp=2;
-                }
-                else
+                        par->hw.st.mode = ST_MID;
+                        xres = sttt_xres;
+                        yres = st_yres / 2;
+                        bpp = 2;
+                } else
                         return -EINVAL;
         }
         if (yres_virtual <= 0)
@@ -1815,10 +1898,10 @@ static int stste_decode_var( struct fb_var_screeninfo *var,
         else if (yres_virtual < yres)
                 yres_virtual = yres;
         if (var->sync & FB_SYNC_EXT)
-                par->hw.st.sync=(par->hw.st.sync & ~1) | 1;
+                par->hw.st.sync = (par->hw.st.sync & ~1) | 1;
         else
-                par->hw.st.sync=(par->hw.st.sync & ~1);
-        linelen=xres*bpp/8;
+                par->hw.st.sync = (par->hw.st.sync & ~1);
+        linelen = xres * bpp / 8;
         if (yres_virtual * linelen > screen_len && screen_len)
                 return -EINVAL;
         if (yres * linelen > screen_len && screen_len)
@@ -1826,93 +1909,91 @@ static int stste_decode_var( struct fb_var_screeninfo *var,
         if (var->yoffset + yres > yres_virtual && yres_virtual)
                 return -EINVAL;
         par->yres_virtual = yres_virtual;
-        par->screen_base=screen_base+ var->yoffset*linelen;
+        par->screen_base = screen_base + var->yoffset * linelen;
         return 0;
 }
 
-static int stste_encode_var( struct fb_var_screeninfo *var,
-                                                  struct atafb_par *par )
+static int stste_encode_var(struct fb_var_screeninfo *var,
+                            struct atafb_par *par)
 {
         int linelen;
         memset(var, 0, sizeof(struct fb_var_screeninfo));
-        var->red.offset=0;
+        var->red.offset = 0;
         var->red.length = ATARIHW_PRESENT(EXTD_SHIFTER) ? 4 : 3;
-        var->red.msb_right=0;
-        var->grayscale=0;
+        var->red.msb_right = 0;
+        var->grayscale = 0;
 
-        var->pixclock=31041;
-        var->left_margin=120;           /* these are incorrect */
-        var->right_margin=100;
-        var->upper_margin=8;
-        var->lower_margin=16;
-        var->hsync_len=140;
-        var->vsync_len=30;
+        var->pixclock = 31041;
+        var->left_margin = 120;         /* these are incorrect */
+        var->right_margin = 100;
+        var->upper_margin = 8;
+        var->lower_margin = 16;
+        var->hsync_len = 140;
+        var->vsync_len = 30;
 
-        var->height=-1;
-        var->width=-1;
+        var->height = -1;
+        var->width = -1;
 
         if (!(par->hw.st.sync & 1))
-                var->sync=0;
+                var->sync = 0;
         else
-                var->sync=FB_SYNC_EXT;
+                var->sync = FB_SYNC_EXT;
 
         switch (par->hw.st.mode & 3) {
         case ST_LOW:
-                var->xres=sttt_xres/2;
-                var->yres=st_yres/2;
-                var->bits_per_pixel=4;
+                var->xres = sttt_xres / 2;
+                var->yres = st_yres / 2;
+                var->bits_per_pixel = 4;
                 break;
         case ST_MID:
-                var->xres=sttt_xres;
-                var->yres=st_yres/2;
-                var->bits_per_pixel=2;
+                var->xres = sttt_xres;
+                var->yres = st_yres / 2;
+                var->bits_per_pixel = 2;
                 break;
         case ST_HIGH:
-                var->xres=sttt_xres;
-                var->yres=st_yres;
-                var->bits_per_pixel=1;
+                var->xres = sttt_xres;
+                var->yres = st_yres;
+                var->bits_per_pixel = 1;
                 break;
-        }               
-        var->blue=var->green=var->red;
-        var->transp.offset=0;
-        var->transp.length=0;
-        var->transp.msb_right=0;
-        var->xres_virtual=sttt_xres_virtual;
-        linelen=var->xres_virtual * var->bits_per_pixel / 8;
-        ovsc_addlen=linelen*(sttt_yres_virtual - st_yres);
-        
-        if (! use_hwscroll)
-                var->yres_virtual=var->yres;
+        }
+        var->blue = var->green = var->red;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
+        var->xres_virtual = sttt_xres_virtual;
+        linelen = var->xres_virtual * var->bits_per_pixel / 8;
+        ovsc_addlen = linelen * (sttt_yres_virtual - st_yres);
+
+        if (!use_hwscroll)
+                var->yres_virtual = var->yres;
         else if (screen_len) {
                 if (par->yres_virtual)
                         var->yres_virtual = par->yres_virtual;
                 else
-                        /* yres_virtual==0 means use maximum */
+                        /* yres_virtual == 0 means use maximum */
                         var->yres_virtual = screen_len / linelen;
-        }
-        else {
+        } else {
                 if (hwscroll < 0)
                         var->yres_virtual = 2 * var->yres;
                 else
-                        var->yres_virtual=var->yres+hwscroll * 16;
+                        var->yres_virtual = var->yres + hwscroll * 16;
         }
-        var->xoffset=0;
+        var->xoffset = 0;
         if (screen_base)
-                var->yoffset=(par->screen_base - screen_base)/linelen;
+                var->yoffset = (par->screen_base - screen_base) / linelen;
         else
-                var->yoffset=0;
-        var->nonstd=0;
-        var->activate=0;
-        var->vmode=FB_VMODE_NONINTERLACED;
+                var->yoffset = 0;
+        var->nonstd = 0;
+        var->activate = 0;
+        var->vmode = FB_VMODE_NONINTERLACED;
         return 0;
 }
 
-
-static void stste_get_par( struct atafb_par *par )
+static void stste_get_par(struct atafb_par *par)
 {
         unsigned long addr;
-        par->hw.st.mode=shifter_tt.st_shiftmode;
-        par->hw.st.sync=shifter.syncmode;
+        par->hw.st.mode = shifter_tt.st_shiftmode;
+        par->hw.st.sync = shifter.syncmode;
         addr = ((shifter.bas_hi & 0xff) << 16) |
                ((shifter.bas_md & 0xff) << 8);
         if (ATARIHW_PRESENT(EXTD_SHIFTER))
@@ -1920,55 +2001,18 @@ static void stste_get_par( struct atafb_par *par )
         par->screen_base = phys_to_virt(addr);
 }
 
-static void stste_set_par( struct atafb_par *par )
+static void stste_set_par(struct atafb_par *par)
 {
-        shifter_tt.st_shiftmode=par->hw.st.mode;
-        shifter.syncmode=par->hw.st.sync;
+        shifter_tt.st_shiftmode = par->hw.st.mode;
+        shifter.syncmode = par->hw.st.sync;
         /* only set screen_base if really necessary */
         if (current_par.screen_base != par->screen_base)
                 fbhw->set_screen_base(par->screen_base);
 }
 
-
-static int stste_getcolreg(unsigned regno, unsigned *red,
-                           unsigned *green, unsigned *blue,
-                           unsigned *transp, struct fb_info *info)
-{
-        unsigned col, t;
-        
-        if (regno > 15)
-                return 1;
-        col = shifter_tt.color_reg[regno];
-        if (ATARIHW_PRESENT(EXTD_SHIFTER)) {
-                t = ((col >> 7) & 0xe) | ((col >> 11) & 1);
-                t |= t << 4;
-                *red = t | (t << 8);
-                t = ((col >> 3) & 0xe) | ((col >> 7) & 1);
-                t |= t << 4;
-                *green = t | (t << 8);
-                t = ((col << 1) & 0xe) | ((col >> 3) & 1);
-                t |= t << 4;
-                *blue = t | (t << 8);
-        }
-        else {
-                t = (col >> 7) & 0xe;
-                t |= t << 4;
-                *red = t | (t << 8);
-                t = (col >> 3) & 0xe;
-                t |= t << 4;
-                *green = t | (t << 8);
-                t = (col << 1) & 0xe;
-                t |= t << 4;
-                *blue = t | (t << 8);
-        }
-        *transp = 0;
-        return 0;
-}
-
-
-static int stste_setcolreg(unsigned regno, unsigned red,
-                           unsigned green, unsigned blue,
-                           unsigned transp, struct fb_info *info)
+static int stste_setcolreg(unsigned int regno, unsigned int red,
+                           unsigned int green, unsigned int blue,
+                           unsigned int transp, struct fb_info *info)
 {
         if (regno > 15)
                 return 1;
@@ -1988,10 +2032,9 @@ static int stste_setcolreg(unsigned regno, unsigned red,
         return 0;
 }
 
-                                                  
-static int stste_detect( void )
-
-{       struct atafb_par par;
+static int stste_detect(void)
+{
+        struct atafb_par par;
 
         /* Determine the connected monitor: The DMA sound must be
          * disabled before reading the MFP GPIP, because the Sound
@@ -1999,7 +2042,7 @@ static int stste_detect( void )
          */
         if (ATARIHW_PRESENT(PCM_8BIT)) {
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
-                udelay(20);     /* wait a while for things to settle down */
+                udelay(20);             /* wait a while for things to settle down */
         }
         mono_moni = (mfp.par_dt_reg & 0x80) == 0;
 
@@ -2014,12 +2057,12 @@ static int stste_detect( void )
 static void stste_set_screen_base(void *s_base)
 {
         unsigned long addr;
-        addr= virt_to_phys(s_base);
+        addr = virt_to_phys(s_base);
         /* Setup Screen Memory */
-        shifter.bas_hi=(unsigned char) ((addr & 0xff0000) >> 16);
-        shifter.bas_md=(unsigned char) ((addr & 0x00ff00) >> 8);
+        shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
+        shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
         if (ATARIHW_PRESENT(EXTD_SHIFTER))
-                shifter.bas_lo=(unsigned char)  (addr & 0x0000ff);
+                shifter.bas_lo = (unsigned char)(addr & 0x0000ff);
 }
 
 #endif /* ATAFB_STE */
@@ -2045,51 +2088,49 @@ static void stste_set_screen_base(void *s_base)
 /* SWITCH_ACIA may be used for Falcon (ScreenBlaster III internal!) */
 static void st_ovsc_switch(void)
 {
-    unsigned long flags;
-    register unsigned char old, new;
+        unsigned long flags;
+        register unsigned char old, new;
 
-    if (!(atari_switches & ATARI_SWITCH_OVSC_MASK))
-        return;
-    local_irq_save(flags);
-
-    mfp.tim_ct_b = 0x10;
-    mfp.active_edge |= 8;
-    mfp.tim_ct_b = 0;
-    mfp.tim_dt_b = 0xf0;
-    mfp.tim_ct_b = 8;
-    while (mfp.tim_dt_b > 1)    /* TOS does it this way, don't ask why */
-        ;
-    new = mfp.tim_dt_b;
-    do {
-        udelay(LINE_DELAY);
-        old = new;
+        if (!(atari_switches & ATARI_SWITCH_OVSC_MASK))
+                return;
+        local_irq_save(flags);
+
+        mfp.tim_ct_b = 0x10;
+        mfp.active_edge |= 8;
+        mfp.tim_ct_b = 0;
+        mfp.tim_dt_b = 0xf0;
+        mfp.tim_ct_b = 8;
+        while (mfp.tim_dt_b > 1)        /* TOS does it this way, don't ask why */
+                ;
         new = mfp.tim_dt_b;
-    } while (old != new);
-    mfp.tim_ct_b = 0x10;
-    udelay(SYNC_DELAY);
-
-    if (atari_switches & ATARI_SWITCH_OVSC_IKBD)
-        acia.key_ctrl = ACIA_DIV64 | ACIA_D8N1S | ACIA_RHTID | ACIA_RIE;
-    if (atari_switches & ATARI_SWITCH_OVSC_MIDI)
-        acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | ACIA_RHTID;
-    if (atari_switches & (ATARI_SWITCH_OVSC_SND6|ATARI_SWITCH_OVSC_SND7)) {
-        sound_ym.rd_data_reg_sel = 14;
-        sound_ym.wd_data = sound_ym.rd_data_reg_sel |
-                           ((atari_switches&ATARI_SWITCH_OVSC_SND6) ? 0x40:0) |
-                           ((atari_switches&ATARI_SWITCH_OVSC_SND7) ? 0x80:0);
-    }
-    local_irq_restore(flags);
+        do {
+                udelay(LINE_DELAY);
+                old = new;
+                new = mfp.tim_dt_b;
+        } while (old != new);
+        mfp.tim_ct_b = 0x10;
+        udelay(SYNC_DELAY);
+
+        if (atari_switches & ATARI_SWITCH_OVSC_IKBD)
+                acia.key_ctrl = ACIA_DIV64 | ACIA_D8N1S | ACIA_RHTID | ACIA_RIE;
+        if (atari_switches & ATARI_SWITCH_OVSC_MIDI)
+                acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | ACIA_RHTID;
+        if (atari_switches & (ATARI_SWITCH_OVSC_SND6|ATARI_SWITCH_OVSC_SND7)) {
+                sound_ym.rd_data_reg_sel = 14;
+                sound_ym.wd_data = sound_ym.rd_data_reg_sel |
+                                   ((atari_switches & ATARI_SWITCH_OVSC_SND6) ? 0x40:0) |
+                                   ((atari_switches & ATARI_SWITCH_OVSC_SND7) ? 0x80:0);
+        }
+        local_irq_restore(flags);
 }
 
 /* ------------------- External Video ---------------------- */
 
 #ifdef ATAFB_EXT
 
-static int ext_encode_fix( struct fb_fix_screeninfo *fix,
-                                                   struct atafb_par *par )
-
+static int ext_encode_fix(struct fb_fix_screeninfo *fix, struct atafb_par *par)
 {
-        strcpy(fix->id,"Unknown Extern");
+        strcpy(fix->id, "Unknown Extern");
         fix->smem_start = (unsigned long)external_addr;
         fix->smem_len = PAGE_ALIGN(external_len);
         if (external_depth == 1) {
@@ -2099,31 +2140,29 @@ static int ext_encode_fix( struct fb_fix_screeninfo *fix,
                 fix->visual =
                         (external_pmode == FB_TYPE_INTERLEAVED_PLANES ||
                          external_pmode == FB_TYPE_PACKED_PIXELS) ?
-                                FB_VISUAL_MONO10 :
-                                        FB_VISUAL_MONO01;
-        }
-        else {
+                                FB_VISUAL_MONO10 : FB_VISUAL_MONO01;
+        } else {
                 /* Use STATIC if we don't know how to access color registers */
                 int visual = external_vgaiobase ?
                                          FB_VISUAL_PSEUDOCOLOR :
                                          FB_VISUAL_STATIC_PSEUDOCOLOR;
                 switch (external_pmode) {
-                    case -1:              /* truecolor */
-                        fix->type=FB_TYPE_PACKED_PIXELS;
-                        fix->visual=FB_VISUAL_TRUECOLOR;
+                case -1:                /* truecolor */
+                        fix->type = FB_TYPE_PACKED_PIXELS;
+                        fix->visual = FB_VISUAL_TRUECOLOR;
                         break;
-                    case FB_TYPE_PACKED_PIXELS:
-                        fix->type=FB_TYPE_PACKED_PIXELS;
-                        fix->visual=visual;
+                case FB_TYPE_PACKED_PIXELS:
+                        fix->type = FB_TYPE_PACKED_PIXELS;
+                        fix->visual = visual;
                         break;
-                    case FB_TYPE_PLANES:
-                        fix->type=FB_TYPE_PLANES;
-                        fix->visual=visual;
+                case FB_TYPE_PLANES:
+                        fix->type = FB_TYPE_PLANES;
+                        fix->visual = visual;
                         break;
-                    case FB_TYPE_INTERLEAVED_PLANES:
-                        fix->type=FB_TYPE_INTERLEAVED_PLANES;
-                        fix->type_aux=2;
-                        fix->visual=visual;
+                case FB_TYPE_INTERLEAVED_PLANES:
+                        fix->type = FB_TYPE_INTERLEAVED_PLANES;
+                        fix->type_aux = 2;
+                        fix->visual = visual;
                         break;
                 }
         }
@@ -2134,137 +2173,112 @@ static int ext_encode_fix( struct fb_fix_screeninfo *fix,
         return 0;
 }
 
-
-static int ext_decode_var( struct fb_var_screeninfo *var,
-                                                   struct atafb_par *par )
+static int ext_decode_var(struct fb_var_screeninfo *var, struct atafb_par *par)
 {
         struct fb_var_screeninfo *myvar = &atafb_predefined[0];
-        
+
         if (var->bits_per_pixel > myvar->bits_per_pixel ||
-                var->xres > myvar->xres ||
-                var->xres_virtual > myvar->xres_virtual ||
-                var->yres > myvar->yres ||
-                var->xoffset > 0 ||
-                var->yoffset > 0)
+            var->xres > myvar->xres ||
+            var->xres_virtual > myvar->xres_virtual ||
+            var->yres > myvar->yres ||
+            var->xoffset > 0 ||
+            var->yoffset > 0)
                 return -EINVAL;
         return 0;
 }
 
-
-static int ext_encode_var( struct fb_var_screeninfo *var,
-                                                   struct atafb_par *par )
+static int ext_encode_var(struct fb_var_screeninfo *var, struct atafb_par *par)
 {
         memset(var, 0, sizeof(struct fb_var_screeninfo));
-        var->red.offset=0;
-        var->red.length=(external_pmode == -1) ? external_depth/3 : 
+        var->red.offset = 0;
+        var->red.length = (external_pmode == -1) ? external_depth / 3 :
                         (external_vgaiobase ? external_bitspercol : 0);
-        var->red.msb_right=0;
-        var->grayscale=0;
+        var->red.msb_right = 0;
+        var->grayscale = 0;
 
-        var->pixclock=31041;
-        var->left_margin=120;           /* these are surely incorrect   */
-        var->right_margin=100;
-        var->upper_margin=8;
-        var->lower_margin=16;
-        var->hsync_len=140;
-        var->vsync_len=30;
+        var->pixclock = 31041;
+        var->left_margin = 120;         /* these are surely incorrect */
+        var->right_margin = 100;
+        var->upper_margin = 8;
+        var->lower_margin = 16;
+        var->hsync_len = 140;
+        var->vsync_len = 30;
 
-        var->height=-1;
-        var->width=-1;
+        var->height = -1;
+        var->width = -1;
 
-        var->sync=0;
+        var->sync = 0;
 
         var->xres = external_xres;
         var->yres = external_yres;
         var->xres_virtual = external_xres_virtual;
         var->bits_per_pixel = external_depth;
-        
-        var->blue=var->green=var->red;
-        var->transp.offset=0;
-        var->transp.length=0;
-        var->transp.msb_right=0;
-        var->yres_virtual=var->yres;
-        var->xoffset=0;
-        var->yoffset=0;
-        var->nonstd=0;
-        var->activate=0;
-        var->vmode=FB_VMODE_NONINTERLACED;
+
+        var->blue = var->green = var->red;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
+        var->yres_virtual = var->yres;
+        var->xoffset = 0;
+        var->yoffset = 0;
+        var->nonstd = 0;
+        var->activate = 0;
+        var->vmode = FB_VMODE_NONINTERLACED;
         return 0;
 }
 
-
-static void ext_get_par( struct atafb_par *par )
+static void ext_get_par(struct atafb_par *par)
 {
         par->screen_base = external_addr;
 }
 
-static void ext_set_par( struct atafb_par *par )
+static void ext_set_par(struct atafb_par *par)
 {
 }
 
 #define OUTB(port,val) \
-        *((unsigned volatile char *) ((port)+external_vgaiobase))=(val)
+        *((unsigned volatile char *) ((port)+external_vgaiobase)) = (val)
 #define INB(port) \
         (*((unsigned volatile char *) ((port)+external_vgaiobase)))
-#define DACDelay                                \
+#define DACDelay                                \
         do {                                    \
-                unsigned char tmp=INB(0x3da);   \
-                tmp=INB(0x3da);                 \
+                unsigned char tmp = INB(0x3da); \
+                tmp = INB(0x3da);                       \
         } while (0)
 
-static int ext_getcolreg( unsigned regno, unsigned *red,
-                                                  unsigned *green, unsigned *blue,
-                                                  unsigned *transp, struct fb_info *info )
+static int ext_setcolreg(unsigned int regno, unsigned int red,
+                         unsigned int green, unsigned int blue,
+                         unsigned int transp, struct fb_info *info)
 {
-        if (! external_vgaiobase)
+        unsigned char colmask = (1 << external_bitspercol) - 1;
+
+        if (!external_vgaiobase)
                 return 1;
 
-            *red   = ext_color[regno].red;
-            *green = ext_color[regno].green;
-            *blue  = ext_color[regno].blue;
-            *transp=0;
-            return 0;
-}
-        
-static int ext_setcolreg( unsigned regno, unsigned red,
-                                                  unsigned green, unsigned blue,
-                                                  unsigned transp, struct fb_info *info )
+        switch (external_card_type) {
+        case IS_VGA:
+                OUTB(0x3c8, regno);
+                DACDelay;
+                OUTB(0x3c9, red & colmask);
+                DACDelay;
+                OUTB(0x3c9, green & colmask);
+                DACDelay;
+                OUTB(0x3c9, blue & colmask);
+                DACDelay;
+                return 0;
 
-{       unsigned char colmask = (1 << external_bitspercol) - 1;
+        case IS_MV300:
+                OUTB((MV300_reg[regno] << 2) + 1, red);
+                OUTB((MV300_reg[regno] << 2) + 1, green);
+                OUTB((MV300_reg[regno] << 2) + 1, blue);
+                return 0;
 
-        if (! external_vgaiobase)
+        default:
                 return 1;
-
-        ext_color[regno].red = red;
-        ext_color[regno].green = green;
-        ext_color[regno].blue = blue;
-
-        switch (external_card_type) {
-          case IS_VGA:
-            OUTB(0x3c8, regno);
-            DACDelay;
-            OUTB(0x3c9, red & colmask);
-            DACDelay;
-            OUTB(0x3c9, green & colmask);
-            DACDelay;
-            OUTB(0x3c9, blue & colmask);
-            DACDelay;
-            return 0;
-
-          case IS_MV300:
-            OUTB((MV300_reg[regno] << 2)+1, red);
-            OUTB((MV300_reg[regno] << 2)+1, green);
-            OUTB((MV300_reg[regno] << 2)+1, blue);
-            return 0;
-
-          default:
-            return 1;
-          }
+        }
 }
-        
-
-static int ext_detect( void )
 
+static int ext_detect(void)
 {
         struct fb_var_screeninfo *myvar = &atafb_predefined[0];
         struct atafb_par dummy_par;
@@ -2284,213 +2298,182 @@ static int ext_detect( void )
 static void set_screen_base(void *s_base)
 {
         unsigned long addr;
-        addr= virt_to_phys(s_base);
+
+        addr = virt_to_phys(s_base);
         /* Setup Screen Memory */
-        shifter.bas_hi=(unsigned char) ((addr & 0xff0000) >> 16);
-        shifter.bas_md=(unsigned char) ((addr & 0x00ff00) >> 8);
-        shifter.bas_lo=(unsigned char)  (addr & 0x0000ff);
+        shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
+        shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
+        shifter.bas_lo = (unsigned char)(addr & 0x0000ff);
 }
 
-
-static int pan_display( struct fb_var_screeninfo *var,
-                        struct atafb_par *par )
+static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 {
+        struct atafb_par *par = (struct atafb_par *)info->par;
+
         if (!fbhw->set_screen_base ||
-                (!ATARIHW_PRESENT(EXTD_SHIFTER) && var->xoffset))
+            (!ATARIHW_PRESENT(EXTD_SHIFTER) && var->xoffset))
                 return -EINVAL;
         var->xoffset = up(var->xoffset, 16);
         par->screen_base = screen_base +
-                (var->yoffset * fb_display[fb_info.currcon].var.xres_virtual + var->xoffset)
-                * fb_display[fb_info.currcon].var.bits_per_pixel / 8;
-        fbhw->set_screen_base (par->screen_base);
+                (var->yoffset * info->var.xres_virtual + var->xoffset)
+                * info->var.bits_per_pixel / 8;
+        fbhw->set_screen_base(par->screen_base);
         return 0;
 }
 
-
 /* ------------ Interfaces to hardware functions ------------ */
 
-
 #ifdef ATAFB_TT
 static struct fb_hwswitch tt_switch = {
-        tt_detect, tt_encode_fix, tt_decode_var, tt_encode_var,
-        tt_get_par, tt_set_par, tt_getcolreg, 
-        set_screen_base, NULL, pan_display
+        .detect         = tt_detect,
+        .encode_fix     = tt_encode_fix,
+        .decode_var     = tt_decode_var,
+        .encode_var     = tt_encode_var,
+        .get_par        = tt_get_par,
+        .set_par        = tt_set_par,
+        .set_screen_base = set_screen_base,
+        .pan_display    = pan_display,
 };
 #endif
 
 #ifdef ATAFB_FALCON
 static struct fb_hwswitch falcon_switch = {
-        falcon_detect, falcon_encode_fix, falcon_decode_var, falcon_encode_var,
-        falcon_get_par, falcon_set_par, falcon_getcolreg,
-        set_screen_base, falcon_blank, falcon_pan_display
+        .detect         = falcon_detect,
+        .encode_fix     = falcon_encode_fix,
+        .decode_var     = falcon_decode_var,
+        .encode_var     = falcon_encode_var,
+        .get_par        = falcon_get_par,
+        .set_par        = falcon_set_par,
+        .set_screen_base = set_screen_base,
+        .blank          = falcon_blank,
+        .pan_display    = falcon_pan_display,
 };
 #endif
 
 #ifdef ATAFB_STE
 static struct fb_hwswitch st_switch = {
-        stste_detect, stste_encode_fix, stste_decode_var, stste_encode_var,
-        stste_get_par, stste_set_par, stste_getcolreg,
-        stste_set_screen_base, NULL, pan_display
+        .detect         = stste_detect,
+        .encode_fix     = stste_encode_fix,
+        .decode_var     = stste_decode_var,
+        .encode_var     = stste_encode_var,
+        .get_par        = stste_get_par,
+        .set_par        = stste_set_par,
+        .set_screen_base = stste_set_screen_base,
+        .pan_display    = pan_display
 };
 #endif
 
 #ifdef ATAFB_EXT
 static struct fb_hwswitch ext_switch = {
-        ext_detect, ext_encode_fix, ext_decode_var, ext_encode_var,
-        ext_get_par, ext_set_par, ext_getcolreg, NULL, NULL, NULL
+        .detect         = ext_detect,
+        .encode_fix     = ext_encode_fix,
+        .decode_var     = ext_decode_var,
+        .encode_var     = ext_encode_var,
+        .get_par        = ext_get_par,
+        .set_par        = ext_set_par,
 };
 #endif
 
-
-
-static void atafb_get_par( struct atafb_par *par )
+static void ata_get_par(struct atafb_par *par)
 {
-        if (current_par_valid) {
-                *par=current_par;
-        }
+        if (current_par_valid)
+                *par = current_par;
         else
                 fbhw->get_par(par);
 }
 
-
-static void atafb_set_par( struct atafb_par *par )
+static void ata_set_par(struct atafb_par *par)
 {
         fbhw->set_par(par);
-        current_par=*par;
-        current_par_valid=1;
+        current_par = *par;
+        current_par_valid = 1;
 }
 
 
-
 /* =========================================================== */
 /* ============== Hardware Independent Functions ============= */
 /* =========================================================== */
 
-
 /* used for hardware scrolling */
 
-static int
-fb_update_var(int con, struct fb_info *info)
-{
-        int off=fb_display[con].var.yoffset*fb_display[con].var.xres_virtual*
-                        fb_display[con].var.bits_per_pixel>>3;
-
-        current_par.screen_base=screen_base + off;
-
-        if (fbhw->set_screen_base)
-                fbhw->set_screen_base(current_par.screen_base);
-        return 0;
-}
-
-static int
-do_fb_set_var(struct fb_var_screeninfo *var, int isactive)
+static int do_fb_set_var(struct fb_var_screeninfo *var, int isactive)
 {
-        int err,activate;
+        int err, activate;
         struct atafb_par par;
-        if ((err=fbhw->decode_var(var, &par)))
+
+        err = fbhw->decode_var(var, &par);
+        if (err)
                 return err;
-        activate=var->activate;
+        activate = var->activate;
         if (((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) && isactive)
-                atafb_set_par(&par);
+                ata_set_par(&par);
         fbhw->encode_var(var, &par);
-        var->activate=activate;
+        var->activate = activate;
         return 0;
 }
 
-static int
-atafb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
+static int atafb_get_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)
 {
         struct atafb_par par;
-        if (con == -1)
-                atafb_get_par(&par);
-        else {
-          int err;
-                if ((err=fbhw->decode_var(&fb_display[con].var,&par)))
-                  return err;
-        }
+        int err;
+        // Get fix directly (case con == -1 before)??
+        err = fbhw->decode_var(&info->var, &par);
+        if (err)
+                return err;
         memset(fix, 0, sizeof(struct fb_fix_screeninfo));
         return fbhw->encode_fix(fix, &par);
 }
-        
-static int
-atafb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
+
+static int atafb_get_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
         struct atafb_par par;
-        if (con == -1) {
-                atafb_get_par(&par);
-                fbhw->encode_var(var, &par);
-        }
-        else
-                *var=fb_display[con].var;
+
+        ata_get_par(&par);
+        fbhw->encode_var(var, &par);
+
         return 0;
 }
 
-static void
-atafb_set_disp(int con, struct fb_info *info)
+// No longer called by fbcon!
+// Still called by set_var internally
+
+static void atafb_set_disp(struct fb_info *info)
 {
-        struct fb_fix_screeninfo fix;
-        struct fb_var_screeninfo var;
-        struct display *display;
+        atafb_get_var(&info->var, info);
+        atafb_get_fix(&info->fix, info);
 
-        if (con >= 0)
-                display = &fb_display[con];
-        else
-                display = &disp;        /* used during initialization */
-
-        atafb_get_fix(&fix, con, info);
-        atafb_get_var(&var, con, info);
-        if (con == -1)
-                con=0;
-        info->screen_base = (void *)fix.smem_start;
-        display->visual = fix.visual;
-        display->type = fix.type;
-        display->type_aux = fix.type_aux;
-        display->ypanstep = fix.ypanstep;
-        display->ywrapstep = fix.ywrapstep;
-        display->line_length = fix.line_length;
-        if (fix.visual != FB_VISUAL_PSEUDOCOLOR &&
-                fix.visual != FB_VISUAL_DIRECTCOLOR)
-                display->can_soft_blank = 0;
-        else
-                display->can_soft_blank = 1;
-        display->inverse =
-            (fix.visual == FB_VISUAL_MONO01 ? !inverse : inverse);
-        switch (fix.type) {
-            case FB_TYPE_INTERLEAVED_PLANES:
-                switch (var.bits_per_pixel) {
-#ifdef FBCON_HAS_IPLAN2P2
-                    case 2:
-                        display->dispsw = &fbcon_iplan2p2;
+        info->screen_base = (void *)info->fix.smem_start;
+
+        switch (info->fix.type) {
+        case FB_TYPE_INTERLEAVED_PLANES:
+                switch (info->var.bits_per_pixel) {
+                case 2:
+                        // display->dispsw = &fbcon_iplan2p2;
                         break;
-#endif
-#ifdef FBCON_HAS_IPLAN2P4
-                    case 4:
-                        display->dispsw = &fbcon_iplan2p4;
+                case 4:
+                        // display->dispsw = &fbcon_iplan2p4;
                         break;
-#endif
-#ifdef FBCON_HAS_IPLAN2P8
-                    case 8:
-                        display->dispsw = &fbcon_iplan2p8;
+                case 8:
+                        // display->dispsw = &fbcon_iplan2p8;
                         break;
-#endif
                 }
                 break;
-            case FB_TYPE_PACKED_PIXELS:
-                switch (var.bits_per_pixel) {
+        case FB_TYPE_PACKED_PIXELS:
+                switch (info->var.bits_per_pixel) {
 #ifdef FBCON_HAS_MFB
-                    case 1:
-                        display->dispsw = &fbcon_mfb;
+                case 1:
+                        // display->dispsw = &fbcon_mfb;
                         break;
 #endif
 #ifdef FBCON_HAS_CFB8
-                    case 8:
-                        display->dispsw = &fbcon_cfb8;
+                case 8:
+                        // display->dispsw = &fbcon_cfb8;
                         break;
 #endif
 #ifdef FBCON_HAS_CFB16
-                    case 16:
-                        display->dispsw = &fbcon_cfb16;
-                        display->dispsw_data = fbcon_cfb16_cmap;
+                case 16:
+                        // display->dispsw = &fbcon_cfb16;
+                        // display->dispsw_data = fbcon_cfb16_cmap;
                         break;
 #endif
                 }
@@ -2498,74 +2481,203 @@ atafb_set_disp(int con, struct fb_info *info)
         }
 }
 
+static int atafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int transp, struct fb_info *info)
+{
+        red >>= 8;
+        green >>= 8;
+        blue >>= 8;
+
+        return info->fbops->fb_setcolreg(regno, red, green, blue, transp, info);
+}
+
 static int
-atafb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
+atafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 {
-        int err,oldxres,oldyres,oldbpp,oldxres_virtual,
-            oldyres_virtual,oldyoffset;
-        if ((err=do_fb_set_var(var, con==info->currcon)))
-                return err;
-        if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
-                oldxres=fb_display[con].var.xres;
-                oldyres=fb_display[con].var.yres;
-                oldxres_virtual=fb_display[con].var.xres_virtual;
-                oldyres_virtual=fb_display[con].var.yres_virtual;
-                oldbpp=fb_display[con].var.bits_per_pixel;
-                oldyoffset=fb_display[con].var.yoffset;
-                fb_display[con].var=*var;
-                if (oldxres != var->xres || oldyres != var->yres 
-                    || oldxres_virtual != var->xres_virtual
-                    || oldyres_virtual != var->yres_virtual
-                    || oldbpp != var->bits_per_pixel
-                    || oldyoffset != var->yoffset) {
-                        atafb_set_disp(con, info);
-                        (*fb_info.changevar)(con);
-                        fb_alloc_cmap(&fb_display[con].cmap, 0, 0);
-                        do_install_cmap(con, info);
-                }
+        int xoffset = var->xoffset;
+        int yoffset = var->yoffset;
+        int err;
+
+        if (var->vmode & FB_VMODE_YWRAP) {
+                if (yoffset < 0 || yoffset >= info->var.yres_virtual || xoffset)
+                        return -EINVAL;
+        } else {
+                if (xoffset + info->var.xres > info->var.xres_virtual ||
+                    yoffset + info->var.yres > info->var.yres_virtual)
+                        return -EINVAL;
         }
-        var->activate=0;
+
+        if (fbhw->pan_display) {
+                err = fbhw->pan_display(var, info);
+                if (err)
+                        return err;
+        } else
+                return -EINVAL;
+
+        info->var.xoffset = xoffset;
+        info->var.yoffset = yoffset;
+
+        if (var->vmode & FB_VMODE_YWRAP)
+                info->var.vmode |= FB_VMODE_YWRAP;
+        else
+                info->var.vmode &= ~FB_VMODE_YWRAP;
+
         return 0;
 }
 
+/*
+ * generic drawing routines; imageblit needs updating for image depth > 1
+ */
 
+#if BITS_PER_LONG == 32
+#define BYTES_PER_LONG  4
+#define SHIFT_PER_LONG  5
+#elif BITS_PER_LONG == 64
+#define BYTES_PER_LONG  8
+#define SHIFT_PER_LONG  6
+#else
+#define Please update me
+#endif
 
-static int
-atafb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
+
+static void atafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
-        if (con == info->currcon) /* current console ? */
-                return fb_get_cmap(cmap, kspc, fbhw->getcolreg, info);
+        struct atafb_par *par = (struct atafb_par *)info->par;
+        int x2, y2;
+        u32 width, height;
+
+        if (!rect->width || !rect->height)
+                return;
+
+        /*
+         * We could use hardware clipping but on many cards you get around
+         * hardware clipping by writing to framebuffer directly.
+         * */
+        x2 = rect->dx + rect->width;
+        y2 = rect->dy + rect->height;
+        x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+        y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+        width = x2 - rect->dx;
+        height = y2 - rect->dy;
+
+        if (info->var.bits_per_pixel == 1)
+                atafb_mfb_fillrect(info, par->next_line, rect->color,
+                                   rect->dy, rect->dx, height, width);
+        else if (info->var.bits_per_pixel == 2)
+                atafb_iplan2p2_fillrect(info, par->next_line, rect->color,
+                                        rect->dy, rect->dx, height, width);
+        else if (info->var.bits_per_pixel == 4)
+                atafb_iplan2p4_fillrect(info, par->next_line, rect->color,
+                                        rect->dy, rect->dx, height, width);
         else
-                if (fb_display[con].cmap.len) /* non default colormap ? */
-                        fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
-                else
-                        fb_copy_cmap(fb_default_cmap(1<<fb_display[con].var.bits_per_pixel),
-                                     cmap, kspc ? 0 : 2);
-        return 0;
+                atafb_iplan2p8_fillrect(info, par->next_line, rect->color,
+                                        rect->dy, rect->dx, height, width);
+
+        return;
 }
 
-static int
-atafb_pan_display(struct fb_var_screeninfo *var, int con, struct fb_info *info)
+static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
-        int xoffset = var->xoffset;
-        int yoffset = var->yoffset;
-        int err;
+        struct atafb_par *par = (struct atafb_par *)info->par;
+        int x2, y2;
+        u32 dx, dy, sx, sy, width, height;
+        int rev_copy = 0;
+
+        /* clip the destination */
+        x2 = area->dx + area->width;
+        y2 = area->dy + area->height;
+        dx = area->dx > 0 ? area->dx : 0;
+        dy = area->dy > 0 ? area->dy : 0;
+        x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+        y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+        width = x2 - dx;
+        height = y2 - dy;
+
+        /* update sx,sy */
+        sx = area->sx + (dx - area->dx);
+        sy = area->sy + (dy - area->dy);
+
+        /* the source must be completely inside the virtual screen */
+        if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual ||
+            (sy + height) > info->var.yres_virtual)
+                return;
 
-        if (   xoffset < 0 || xoffset + fb_display[con].var.xres > fb_display[con].var.xres_virtual
-            || yoffset < 0 || yoffset + fb_display[con].var.yres > fb_display[con].var.yres_virtual)
-                return -EINVAL;
+        if (dy > sy || (dy == sy && dx > sx)) {
+                dy += height;
+                sy += height;
+                rev_copy = 1;
+        }
+
+        if (info->var.bits_per_pixel == 1)
+                atafb_mfb_copyarea(info, par->next_line, sy, sx, dy, dx, height, width);
+        else if (info->var.bits_per_pixel == 2)
+                atafb_iplan2p2_copyarea(info, par->next_line, sy, sx, dy, dx, height, width);
+        else if (info->var.bits_per_pixel == 4)
+                atafb_iplan2p4_copyarea(info, par->next_line, sy, sx, dy, dx, height, width);
+        else
+                atafb_iplan2p8_copyarea(info, par->next_line, sy, sx, dy, dx, height, width);
 
-        if (con == info->currcon) {
-                if (fbhw->pan_display) {
-                        if ((err = fbhw->pan_display(var, &current_par)))
-                                return err;
+        return;
+}
+
+static void atafb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        struct atafb_par *par = (struct atafb_par *)info->par;
+        int x2, y2;
+        unsigned long *dst;
+        int dst_idx;
+        const char *src;
+        u32 dx, dy, width, height, pitch;
+
+        /*
+         * We could use hardware clipping but on many cards you get around
+         * hardware clipping by writing to framebuffer directly like we are
+         * doing here.
+         */
+        x2 = image->dx + image->width;
+        y2 = image->dy + image->height;
+        dx = image->dx;
+        dy = image->dy;
+        x2 = x2 < info->var.xres_virtual ? x2 : info->var.xres_virtual;
+        y2 = y2 < info->var.yres_virtual ? y2 : info->var.yres_virtual;
+        width = x2 - dx;
+        height = y2 - dy;
+
+        if (image->depth == 1) {
+                // used for font data
+                dst = (unsigned long *)
+                        ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
+                dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
+                dst_idx += dy * par->next_line * 8 + dx;
+                src = image->data;
+                pitch = (image->width + 7) / 8;
+                while (height--) {
+
+                        if (info->var.bits_per_pixel == 1)
+                                atafb_mfb_linefill(info, par->next_line,
+                                                   dy, dx, width, src,
+                                                   image->bg_color, image->fg_color);
+                        else if (info->var.bits_per_pixel == 2)
+                                atafb_iplan2p2_linefill(info, par->next_line,
+                                                        dy, dx, width, src,
+                                                        image->bg_color, image->fg_color);
+                        else if (info->var.bits_per_pixel == 4)
+                                atafb_iplan2p4_linefill(info, par->next_line,
+                                                        dy, dx, width, src,
+                                                        image->bg_color, image->fg_color);
+                        else
+                                atafb_iplan2p8_linefill(info, par->next_line,
+                                                        dy, dx, width, src,
+                                                        image->bg_color, image->fg_color);
+                        dy++;
+                        src += pitch;
                 }
-                else
-                        return -EINVAL;
+        } else {
+                // only used for logo; broken
+                c2p(info->screen_base, image->data, dx, dy, width, height,
+                    par->next_line, par->next_plane, image->width,
+                    info->var.bits_per_pixel);
         }
-        fb_display[con].var.xoffset = var->xoffset;
-        fb_display[con].var.yoffset = var->yoffset;
-        return 0;
 }
 
 static int
@@ -2584,7 +2696,7 @@ atafb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
                 if (copy_from_user((void *)&current_par, (void *)arg,
                                    sizeof(struct atafb_par)))
                         return -EFAULT;
-                atafb_set_par(&current_par);
+                ata_set_par(&current_par);
                 return 0;
 #endif
         }
@@ -2598,42 +2710,82 @@ atafb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  * 3 = suspend hsync
  * 4 = off
  */
-static int 
-atafb_blank(int blank, struct fb_info *info)
+static int atafb_blank(int blank, struct fb_info *info)
 {
         unsigned short black[16];
         struct fb_cmap cmap;
         if (fbhw->blank && !fbhw->blank(blank))
                 return 1;
         if (blank) {
-                memset(black, 0, 16*sizeof(unsigned short));
-                cmap.red=black;
-                cmap.green=black;
-                cmap.blue=black;
-                cmap.transp=NULL;
-                cmap.start=0;
-                cmap.len=16;
-                fb_set_cmap(&cmap, 1, info);
+                memset(black, 0, 16 * sizeof(unsigned short));
+                cmap.red = black;
+                cmap.green = black;
+                cmap.blue = black;
+                cmap.transp = NULL;
+                cmap.start = 0;
+                cmap.len = 16;
+                fb_set_cmap(&cmap, info);
         }
+#if 0
         else
-                do_install_cmap(info->currcon, info);
+                do_install_cmap(info);
+#endif
+        return 0;
+}
+
+        /*
+         * New fbcon interface ...
+         */
+
+         /* check var by decoding var into hw par, rounding if necessary,
+          * then encoding hw par back into new, validated var */
+static int atafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        int err;
+        struct atafb_par par;
+
+        /* Validate wanted screen parameters */
+        // if ((err = ata_decode_var(var, &par)))
+        err = fbhw->decode_var(var, &par);
+        if (err)
+                return err;
+
+        /* Encode (possibly rounded) screen parameters */
+        fbhw->encode_var(var, &par);
+        return 0;
+}
+
+        /* actually set hw par by decoding var, then setting hardware from
+         * hw par just decoded */
+static int atafb_set_par(struct fb_info *info)
+{
+        struct atafb_par *par = (struct atafb_par *)info->par;
+
+        /* Decode wanted screen parameters */
+        fbhw->decode_var(&info->var, par);
+        fbhw->encode_fix(&info->fix, par);
+
+        /* Set new videomode */
+        ata_set_par(par);
+
         return 0;
 }
 
+
 static struct fb_ops atafb_ops = {
         .owner =        THIS_MODULE,
-        .fb_get_fix =   atafb_get_fix,
-        .fb_get_var =   atafb_get_var,
-        .fb_set_var =   atafb_set_var,
-        .fb_get_cmap =  atafb_get_cmap,
-        .fb_set_cmap =  gen_set_cmap,
-        .fb_pan_display =atafb_pan_display,
+        .fb_check_var   = atafb_check_var,
+        .fb_set_par     = atafb_set_par,
+        .fb_setcolreg   = atafb_setcolreg,
         .fb_blank =     atafb_blank,
+        .fb_pan_display = atafb_pan_display,
+        .fb_fillrect    = atafb_fillrect,
+        .fb_copyarea    = atafb_copyarea,
+        .fb_imageblit   = atafb_imageblit,
         .fb_ioctl =     atafb_ioctl,
 };
 
-static void
-check_default_par( int detected_mode )
+static void check_default_par(int detected_mode)
 {
         char default_name[10];
         int i;
@@ -2642,199 +2794,41 @@ check_default_par( int detected_mode )
 
         /* First try the user supplied mode */
         if (default_par) {
-                var=atafb_predefined[default_par-1];
+                var = atafb_predefined[default_par - 1];
                 var.activate = FB_ACTIVATE_TEST;
-                if (do_fb_set_var(&var,1))
-                        default_par=0;          /* failed */
+                if (do_fb_set_var(&var, 1))
+                        default_par = 0;        /* failed */
         }
         /* Next is the autodetected one */
-        if (! default_par) {
-                var=atafb_predefined[detected_mode-1]; /* autodetect */
+        if (!default_par) {
+                var = atafb_predefined[detected_mode - 1]; /* autodetect */
                 var.activate = FB_ACTIVATE_TEST;
-                if (!do_fb_set_var(&var,1))
-                        default_par=detected_mode;
+                if (!do_fb_set_var(&var, 1))
+                        default_par = detected_mode;
         }
         /* If that also failed, try some default modes... */
-        if (! default_par) {
+        if (!default_par) {
                 /* try default1, default2... */
-                for (i=1 ; i < 10 ; i++) {
-                        sprintf(default_name,"default%d",i);
-                        default_par=get_video_mode(default_name);
-                        if (! default_par)
+                for (i = 1; i < 10; i++) {
+                        sprintf(default_name,"default%d", i);
+                        default_par = get_video_mode(default_name);
+                        if (!default_par)
                                 panic("can't set default video mode");
-                        var=atafb_predefined[default_par-1];
+                        var = atafb_predefined[default_par - 1];
                         var.activate = FB_ACTIVATE_TEST;
-                        if (! do_fb_set_var(&var,1))
+                        if (!do_fb_set_var(&var,1))
                                 break;  /* ok */
                 }
         }
-        min_mem=var.xres_virtual * var.yres_virtual * var.bits_per_pixel/8;
+        min_mem = var.xres_virtual * var.yres_virtual * var.bits_per_pixel / 8;
         if (default_mem_req < min_mem)
-                default_mem_req=min_mem;
-}
-
-static int
-atafb_switch(int con, struct fb_info *info)
-{
-        /* Do we have to save the colormap ? */
-        if (fb_display[info->currcon].cmap.len)
-                fb_get_cmap(&fb_display[info->currcon].cmap, 1, fbhw->getcolreg,
-                            info);
-        do_fb_set_var(&fb_display[con].var,1);
-        info->currcon=con;
-        /* Install new colormap */
-        do_install_cmap(con, info);
-        return 0;
-}
-
-int __init atafb_init(void)
-{
-        int pad;
-        int detected_mode;
-        unsigned long mem_req;
-
-        if (!MACH_IS_ATARI)
-                return -ENXIO;
-
-        do {
-#ifdef ATAFB_EXT
-                if (external_addr) {
-                        fbhw = &ext_switch;
-                        atafb_ops.fb_setcolreg = &ext_setcolreg;
-                        break;
-                }
-#endif
-#ifdef ATAFB_TT
-                if (ATARIHW_PRESENT(TT_SHIFTER)) {
-                        fbhw = &tt_switch;
-                        atafb_ops.fb_setcolreg = &tt_setcolreg;
-                        break;
-                }
-#endif
-#ifdef ATAFB_FALCON
-                if (ATARIHW_PRESENT(VIDEL_SHIFTER)) {
-                        fbhw = &falcon_switch;
-                        atafb_ops.fb_setcolreg = &falcon_setcolreg;
-                        request_irq(IRQ_AUTO_4, falcon_vbl_switcher, IRQ_TYPE_PRIO,
-                                    "framebuffer/modeswitch", falcon_vbl_switcher);
-                        break;
-                }
-#endif
-#ifdef ATAFB_STE
-                if (ATARIHW_PRESENT(STND_SHIFTER) ||
-                    ATARIHW_PRESENT(EXTD_SHIFTER)) {
-                        fbhw = &st_switch;
-                        atafb_ops.fb_setcolreg = &stste_setcolreg;
-                        break;
-                }
-                fbhw = &st_switch;
-                atafb_ops.fb_setcolreg = &stste_setcolreg;
-                printk("Cannot determine video hardware; defaulting to ST(e)\n");
-#else /* ATAFB_STE */
-                /* no default driver included */
-                /* Nobody will ever see this message :-) */
-                panic("Cannot initialize video hardware");
-#endif
-        } while (0);
-
-        /* Multisync monitor capabilities */
-        /* Atari-TOS defaults if no boot option present */
-        if (fb_info.monspecs.hfmin == 0) {
-            fb_info.monspecs.hfmin = 31000;
-            fb_info.monspecs.hfmax = 32000;
-            fb_info.monspecs.vfmin = 58;
-            fb_info.monspecs.vfmax = 62;
-        }
-
-        detected_mode = fbhw->detect();
-        check_default_par(detected_mode);
-#ifdef ATAFB_EXT
-        if (!external_addr) {
-#endif /* ATAFB_EXT */
-                mem_req = default_mem_req + ovsc_offset + ovsc_addlen;
-                mem_req = PAGE_ALIGN(mem_req) + PAGE_SIZE;
-                screen_base = atari_stram_alloc(mem_req, "atafb");
-                if (!screen_base)
-                        panic("Cannot allocate screen memory");
-                memset(screen_base, 0, mem_req);
-                pad = -(unsigned long)screen_base & (PAGE_SIZE-1);
-                screen_base+=pad;
-                real_screen_base=screen_base+ovsc_offset;
-                screen_len = (mem_req - pad - ovsc_offset) & PAGE_MASK;
-                st_ovsc_switch();
-                if (CPU_IS_040_OR_060) {
-                        /* On a '040+, the cache mode of video RAM must be set to
-                         * write-through also for internal video hardware! */
-                        cache_push(virt_to_phys(screen_base), screen_len);
-                        kernel_set_cachemode(screen_base, screen_len,
-                                             IOMAP_WRITETHROUGH);
-                }
-#ifdef ATAFB_EXT
-        }
-        else {
-                /* Map the video memory (physical address given) to somewhere
-                 * in the kernel address space.
-                 */
-                external_addr =
-                  ioremap_writethrough((unsigned long)external_addr,
-                                       external_len);
-                if (external_vgaiobase)
-                        external_vgaiobase =
-                          (unsigned long)ioremap(external_vgaiobase, 0x10000);
-                screen_base      =
-                real_screen_base = external_addr;
-                screen_len       = external_len & PAGE_MASK;
-                memset (screen_base, 0, external_len);
-        }
-#endif /* ATAFB_EXT */
-
-        strcpy(fb_info.modename, "Atari Builtin ");
-        fb_info.changevar = NULL;
-        fb_info.fbops = &atafb_ops;
-        fb_info.disp = &disp;
-        fb_info.currcon = -1;
-        fb_info.switch_con = &atafb_switch;
-        fb_info.updatevar = &fb_update_var;
-        fb_info.flags = FBINFO_FLAG_DEFAULT;
-        do_fb_set_var(&atafb_predefined[default_par-1], 1);
-        strcat(fb_info.modename, fb_var_names[default_par-1][0]);
-
-        atafb_get_var(&disp.var, -1, &fb_info);
-        atafb_set_disp(-1, &fb_info);
-        do_install_cmap(0, &fb_info);
-
-        if (register_framebuffer(&fb_info) < 0) {
-#ifdef ATAFB_EXT
-                if (external_addr) {
-                        iounmap(external_addr);
-                        external_addr = NULL;
-                }
-                if (external_vgaiobase) {
-                        iounmap((void*)external_vgaiobase);
-                        external_vgaiobase = 0;
-                }
-#endif
-                return -EINVAL;
-        }
-
-        printk("Determined %dx%d, depth %d\n",
-               disp.var.xres, disp.var.yres, disp.var.bits_per_pixel);
-        if ((disp.var.xres != disp.var.xres_virtual) ||
-            (disp.var.yres != disp.var.yres_virtual))
-           printk("   virtual %dx%d\n",
-                          disp.var.xres_virtual, disp.var.yres_virtual);
-        printk("fb%d: %s frame buffer device, using %dK of video memory\n",
-               fb_info.node, fb_info.modename, screen_len>>10);
-
-        /* TODO: This driver cannot be unloaded yet */
-        return 0;
+                default_mem_req = min_mem;
 }
 
-
 #ifdef ATAFB_EXT
 static void __init atafb_setup_ext(char *spec)
 {
-        int             xres, xres_virtual, yres, depth, planes;
+        int xres, xres_virtual, yres, depth, planes;
         unsigned long addr, len;
         char *p;
 
@@ -2848,27 +2842,31 @@ static void __init atafb_setup_ext(char *spec)
          *
          * Even xres_virtual is available, we neither support panning nor hw-scrolling!
          */
-        if (!(p = strsep(&spec, ";")) || !*p)
-            return;
+        p = strsep(&spec, ";");
+        if (!p || !*p)
+                return;
         xres_virtual = xres = simple_strtoul(p, NULL, 10);
         if (xres <= 0)
-            return;
+                return;
 
-        if (!(p = strsep(&spec, ";")) || !*p)
-            return;
+        p = strsep(&spec, ";");
+        if (!p || !*p)
+                return;
         yres = simple_strtoul(p, NULL, 10);
         if (yres <= 0)
-            return;
+                return;
 
-        if (!(p = strsep(&spec, ";")) || !*p)
-            return;
+        p = strsep(&spec, ";");
+        if (!p || !*p)
+                return;
         depth = simple_strtoul(p, NULL, 10);
         if (depth != 1 && depth != 2 && depth != 4 && depth != 8 &&
-                depth != 16 && depth != 24)
-            return;
+            depth != 16 && depth != 24)
+                return;
 
-        if (!(p = strsep(&spec, ";")) || !*p)
-            return;
+        p = strsep(&spec, ";");
+        if (!p || !*p)
+                return;
         if (*p == 'i')
                 planes = FB_TYPE_INTERLEAVED_PLANES;
         else if (*p == 'p')
@@ -2876,25 +2874,27 @@ static void __init atafb_setup_ext(char *spec)
         else if (*p == 'n')
                 planes = FB_TYPE_PLANES;
         else if (*p == 't')
-                planes = -1; /* true color */
+                planes = -1;            /* true color */
         else
                 return;
 
-
-        if (!(p = strsep(&spec, ";")) || !*p)
+        p = strsep(&spec, ";");
+        if (!p || !*p)
                 return;
         addr = simple_strtoul(p, NULL, 0);
 
-        if (!(p = strsep(&spec, ";")) || !*p)
-                len = xres*yres*depth/8;
+        p = strsep(&spec, ";");
+        if (!p || !*p)
+                len = xres * yres * depth / 8;
         else
                 len = simple_strtoul(p, NULL, 0);
 
-        if ((p = strsep(&spec, ";")) && *p) {
-                external_vgaiobase=simple_strtoul(p, NULL, 0);
-        }
+        p = strsep(&spec, ";");
+        if (p && *p)
+                external_vgaiobase = simple_strtoul(p, NULL, 0);
 
-        if ((p = strsep(&spec, ";")) && *p) {
+        p = strsep(&spec, ";");
+        if (p && *p) {
                 external_bitspercol = simple_strtoul(p, NULL, 0);
                 if (external_bitspercol > 8)
                         external_bitspercol = 8;
@@ -2902,59 +2902,61 @@ static void __init atafb_setup_ext(char *spec)
                         external_bitspercol = 1;
         }
 
-        if ((p = strsep(&spec, ";")) && *p) {
+        p = strsep(&spec, ";");
+        if (p && *p) {
                 if (!strcmp(p, "vga"))
                         external_card_type = IS_VGA;
                 if (!strcmp(p, "mv300"))
                         external_card_type = IS_MV300;
         }
 
-        if ((p = strsep(&spec, ";")) && *p) {
+        p = strsep(&spec, ";");
+        if (p && *p) {
                 xres_virtual = simple_strtoul(p, NULL, 10);
                 if (xres_virtual < xres)
                         xres_virtual = xres;
-                if (xres_virtual*yres*depth/8 > len)
-                        len=xres_virtual*yres*depth/8;
+                if (xres_virtual * yres * depth / 8 > len)
+                        len = xres_virtual * yres * depth / 8;
         }
 
-        external_xres  = xres;
-        external_xres_virtual  = xres_virtual;
-        external_yres  = yres;
+        external_xres = xres;
+        external_xres_virtual = xres_virtual;
+        external_yres = yres;
         external_depth = depth;
         external_pmode = planes;
-        external_addr  = (void *)addr;
-        external_len   = len;
-
-        if (external_card_type == IS_MV300)
-          switch (external_depth) {
-            case 1:
-              MV300_reg = MV300_reg_1bit;
-              break;
-            case 4:
-              MV300_reg = MV300_reg_4bit;
-              break;
-            case 8:
-              MV300_reg = MV300_reg_8bit;
-              break;
-            }
+        external_addr = (void *)addr;
+        external_len = len;
+
+        if (external_card_type == IS_MV300) {
+                switch (external_depth) {
+                case 1:
+                        MV300_reg = MV300_reg_1bit;
+                        break;
+                case 4:
+                        MV300_reg = MV300_reg_4bit;
+                        break;
+                case 8:
+                        MV300_reg = MV300_reg_8bit;
+                        break;
+                }
+        }
 }
 #endif /* ATAFB_EXT */
 
-
 static void __init atafb_setup_int(char *spec)
 {
         /* Format to config extended internal video hardware like OverScan:
-        "internal:<xres>;<yres>;<xres_max>;<yres_max>;<offset>"
-        Explanation:
-        <xres>: x-resolution 
-        <yres>: y-resolution
-        The following are only needed if you have an overscan which
-        needs a black border:
-        <xres_max>: max. length of a line in pixels your OverScan hardware would allow
-        <yres_max>: max. number of lines your OverScan hardware would allow
-        <offset>: Offset from physical beginning to visible beginning
-                  of screen in bytes
-        */
+         * "internal:<xres>;<yres>;<xres_max>;<yres_max>;<offset>"
+         * Explanation:
+         * <xres>: x-resolution
+         * <yres>: y-resolution
+         * The following are only needed if you have an overscan which
+         * needs a black border:
+         * <xres_max>: max. length of a line in pixels your OverScan hardware would allow
+         * <yres_max>: max. number of lines your OverScan hardware would allow
+         * <offset>: Offset from physical beginning to visible beginning
+         *        of screen in bytes
+         */
         int xres;
         char *p;
 
@@ -2963,23 +2965,19 @@ static void __init atafb_setup_int(char *spec)
         xres = simple_strtoul(p, NULL, 10);
         if (!(p = strsep(&spec, ";")) || !*p)
                 return;
-        sttt_xres=xres;
-        tt_yres=st_yres=simple_strtoul(p, NULL, 10);
-        if ((p=strsep(&spec, ";")) && *p) {
-                sttt_xres_virtual=simple_strtoul(p, NULL, 10);
-        }
-        if ((p=strsep(&spec, ";")) && *p) {
-                sttt_yres_virtual=simple_strtoul(p, NULL, 0);
-        }
-        if ((p=strsep(&spec, ";")) && *p) {
-                ovsc_offset=simple_strtoul(p, NULL, 0);
-        }
+        sttt_xres = xres;
+        tt_yres = st_yres = simple_strtoul(p, NULL, 10);
+        if ((p = strsep(&spec, ";")) && *p)
+                sttt_xres_virtual = simple_strtoul(p, NULL, 10);
+        if ((p = strsep(&spec, ";")) && *p)
+                sttt_yres_virtual = simple_strtoul(p, NULL, 0);
+        if ((p = strsep(&spec, ";")) && *p)
+                ovsc_offset = simple_strtoul(p, NULL, 0);
 
         if (ovsc_offset || (sttt_yres_virtual != st_yres))
-                use_hwscroll=0;
+                use_hwscroll = 0;
 }
 
-
 #ifdef ATAFB_FALCON
 static void __init atafb_setup_mcap(char *spec)
 {
@@ -3018,7 +3016,6 @@ static void __init atafb_setup_mcap(char *spec)
 }
 #endif /* ATAFB_FALCON */
 
-
 static void __init atafb_setup_user(char *spec)
 {
         /* Format of user defined video mode is: <xres>;<yres>;<depth>
@@ -3026,81 +3023,257 @@ static void __init atafb_setup_user(char *spec)
         char *p;
         int xres, yres, depth, temp;
 
-        if (!(p = strsep(&spec, ";")) || !*p)
+        p = strsep(&spec, ";");
+        if (!p || !*p)
                 return;
         xres = simple_strtoul(p, NULL, 10);
-        if (!(p = strsep(&spec, ";")) || !*p)
+        p = strsep(&spec, ";");
+        if (!p || !*p)
                 return;
         yres = simple_strtoul(p, NULL, 10);
-        if (!(p = strsep(&spec, "")) || !*p)
+        p = strsep(&spec, "");
+        if (!p || !*p)
                 return;
         depth = simple_strtoul(p, NULL, 10);
-        if ((temp=get_video_mode("user0"))) {
-                default_par=temp;
-                atafb_predefined[default_par-1].xres = xres;
-                atafb_predefined[default_par-1].yres = yres;
-                atafb_predefined[default_par-1].bits_per_pixel = depth;
+        temp = get_video_mode("user0");
+        if (temp) {
+                default_par = temp;
+                atafb_predefined[default_par - 1].xres = xres;
+                atafb_predefined[default_par - 1].yres = yres;
+                atafb_predefined[default_par - 1].bits_per_pixel = depth;
         }
 }
 
-int __init atafb_setup( char *options )
+int __init atafb_setup(char *options)
 {
-    char *this_opt;
-    int temp;
-
-    fb_info.fontname[0] = '\0';
+        char *this_opt;
+        int temp;
 
-    if (!options || !*options)
+        if (!options || !*options)
                 return 0;
-    
-    while ((this_opt = strsep(&options, ",")) != NULL) {         
-        if (!*this_opt) continue;
-        if ((temp=get_video_mode(this_opt)))
-                default_par=temp;
-        else if (! strcmp(this_opt, "inverse"))
-                inverse=1;
-        else if (!strncmp(this_opt, "font:", 5))
-           strcpy(fb_info.fontname, this_opt+5);
-        else if (! strncmp(this_opt, "hwscroll_",9)) {
-                hwscroll=simple_strtoul(this_opt+9, NULL, 10);
-                if (hwscroll < 0)
-                        hwscroll = 0;
-                if (hwscroll > 200)
-                        hwscroll = 200;
-        }
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+                if ((temp = get_video_mode(this_opt))) {
+                        default_par = temp;
+                        mode_option = this_opt;
+                } else if (!strcmp(this_opt, "inverse"))
+                        inverse = 1;
+                else if (!strncmp(this_opt, "hwscroll_", 9)) {
+                        hwscroll = simple_strtoul(this_opt + 9, NULL, 10);
+                        if (hwscroll < 0)
+                                hwscroll = 0;
+                        if (hwscroll > 200)
+                                hwscroll = 200;
+                }
 #ifdef ATAFB_EXT
-        else if (!strcmp(this_opt,"mv300")) {
-                external_bitspercol = 8;
-                external_card_type = IS_MV300;
+                else if (!strcmp(this_opt, "mv300")) {
+                        external_bitspercol = 8;
+                        external_card_type = IS_MV300;
+                } else if (!strncmp(this_opt, "external:", 9))
+                        atafb_setup_ext(this_opt + 9);
+#endif
+                else if (!strncmp(this_opt, "internal:", 9))
+                        atafb_setup_int(this_opt + 9);
+#ifdef ATAFB_FALCON
+                else if (!strncmp(this_opt, "eclock:", 7)) {
+                        fext.f = simple_strtoul(this_opt + 7, NULL, 10);
+                        /* external pixelclock in kHz --> ps */
+                        fext.t = 1000000000 / fext.f;
+                        fext.f *= 1000;
+                } else if (!strncmp(this_opt, "monitorcap:", 11))
+                        atafb_setup_mcap(this_opt + 11);
+#endif
+                else if (!strcmp(this_opt, "keep"))
+                        DontCalcRes = 1;
+                else if (!strncmp(this_opt, "R", 1))
+                        atafb_setup_user(this_opt + 1);
         }
-        else if (!strncmp(this_opt,"external:",9))
-                atafb_setup_ext(this_opt+9);
+        return 0;
+}
+
+int __init atafb_init(void)
+{
+        int pad;
+        int detected_mode;
+        unsigned int defmode = 0;
+        unsigned long mem_req;
+
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("atafb", &option))
+                return -ENODEV;
+        atafb_setup(option);
+#endif
+        printk("atafb_init: start\n");
+
+        if (!MACH_IS_ATARI)
+                return -ENXIO;
+
+        do {
+#ifdef ATAFB_EXT
+                if (external_addr) {
+                        printk("atafb_init: initializing external hw\n");
+                        fbhw = &ext_switch;
+                        atafb_ops.fb_setcolreg = &ext_setcolreg;
+                        defmode = DEFMODE_EXT;
+                        break;
+                }
+#endif
+#ifdef ATAFB_TT
+                if (ATARIHW_PRESENT(TT_SHIFTER)) {
+                        printk("atafb_init: initializing TT hw\n");
+                        fbhw = &tt_switch;
+                        atafb_ops.fb_setcolreg = &tt_setcolreg;
+                        defmode = DEFMODE_TT;
+                        break;
+                }
 #endif
-        else if (!strncmp(this_opt,"internal:",9))
-                atafb_setup_int(this_opt+9);
 #ifdef ATAFB_FALCON
-        else if (!strncmp(this_opt, "eclock:", 7)) {
-                fext.f = simple_strtoul(this_opt+7, NULL, 10);
-                /* external pixelclock in kHz --> ps */
-                fext.t = 1000000000/fext.f;
-                fext.f *= 1000;
+                if (ATARIHW_PRESENT(VIDEL_SHIFTER)) {
+                        printk("atafb_init: initializing Falcon hw\n");
+                        fbhw = &falcon_switch;
+                        atafb_ops.fb_setcolreg = &falcon_setcolreg;
+                        request_irq(IRQ_AUTO_4, falcon_vbl_switcher, IRQ_TYPE_PRIO,
+                                    "framebuffer/modeswitch", falcon_vbl_switcher);
+                        defmode = DEFMODE_F30;
+                        break;
+                }
+#endif
+#ifdef ATAFB_STE
+                if (ATARIHW_PRESENT(STND_SHIFTER) ||
+                    ATARIHW_PRESENT(EXTD_SHIFTER)) {
+                        printk("atafb_init: initializing ST/E hw\n");
+                        fbhw = &st_switch;
+                        atafb_ops.fb_setcolreg = &stste_setcolreg;
+                        defmode = DEFMODE_STE;
+                        break;
+                }
+                fbhw = &st_switch;
+                atafb_ops.fb_setcolreg = &stste_setcolreg;
+                printk("Cannot determine video hardware; defaulting to ST(e)\n");
+#else /* ATAFB_STE */
+                /* no default driver included */
+                /* Nobody will ever see this message :-) */
+                panic("Cannot initialize video hardware");
+#endif
+        } while (0);
+
+        /* Multisync monitor capabilities */
+        /* Atari-TOS defaults if no boot option present */
+        if (fb_info.monspecs.hfmin == 0) {
+                fb_info.monspecs.hfmin = 31000;
+                fb_info.monspecs.hfmax = 32000;
+                fb_info.monspecs.vfmin = 58;
+                fb_info.monspecs.vfmax = 62;
         }
-        else if (!strncmp(this_opt, "monitorcap:", 11))
-                atafb_setup_mcap(this_opt+11);
+
+        detected_mode = fbhw->detect();
+        check_default_par(detected_mode);
+#ifdef ATAFB_EXT
+        if (!external_addr) {
+#endif /* ATAFB_EXT */
+                mem_req = default_mem_req + ovsc_offset + ovsc_addlen;
+                mem_req = PAGE_ALIGN(mem_req) + PAGE_SIZE;
+                screen_base = atari_stram_alloc(mem_req, "atafb");
+                if (!screen_base)
+                        panic("Cannot allocate screen memory");
+                memset(screen_base, 0, mem_req);
+                pad = -(unsigned long)screen_base & (PAGE_SIZE - 1);
+                screen_base += pad;
+                real_screen_base = screen_base + ovsc_offset;
+                screen_len = (mem_req - pad - ovsc_offset) & PAGE_MASK;
+                st_ovsc_switch();
+                if (CPU_IS_040_OR_060) {
+                        /* On a '040+, the cache mode of video RAM must be set to
+                         * write-through also for internal video hardware! */
+                        cache_push(virt_to_phys(screen_base), screen_len);
+                        kernel_set_cachemode(screen_base, screen_len,
+                                             IOMAP_WRITETHROUGH);
+                }
+                printk("atafb: screen_base %p real_screen_base %p screen_len %d\n",
+                        screen_base, real_screen_base, screen_len);
+#ifdef ATAFB_EXT
+        } else {
+                /* Map the video memory (physical address given) to somewhere
+                 * in the kernel address space.
+                 */
+                external_addr = ioremap_writethrough((unsigned long)external_addr,
+                                                     external_len);
+                if (external_vgaiobase)
+                        external_vgaiobase =
+                          (unsigned long)ioremap(external_vgaiobase, 0x10000);
+                screen_base =
+                real_screen_base = external_addr;
+                screen_len = external_len & PAGE_MASK;
+                memset (screen_base, 0, external_len);
+        }
+#endif /* ATAFB_EXT */
+
+//      strcpy(fb_info.mode->name, "Atari Builtin ");
+        fb_info.fbops = &atafb_ops;
+        // try to set default (detected; requested) var
+        do_fb_set_var(&atafb_predefined[default_par - 1], 1);
+        // reads hw state into current par, which may not be sane yet
+        ata_get_par(&current_par);
+        fb_info.par = &current_par;
+        // tries to read from HW which may not be initialized yet
+        // so set sane var first, then call atafb_set_par
+        atafb_get_var(&fb_info.var, &fb_info);
+        fb_info.flags = FBINFO_FLAG_DEFAULT;
+
+        if (!fb_find_mode(&fb_info.var, &fb_info, mode_option, atafb_modedb,
+                          NUM_TOTAL_MODES, &atafb_modedb[defmode],
+                          fb_info.var.bits_per_pixel)) {
+                return -EINVAL;
+        }
+
+        atafb_set_disp(&fb_info);
+
+        fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0);
+
+
+        printk("Determined %dx%d, depth %d\n",
+               fb_info.var.xres, fb_info.var.yres, fb_info.var.bits_per_pixel);
+        if ((fb_info.var.xres != fb_info.var.xres_virtual) ||
+            (fb_info.var.yres != fb_info.var.yres_virtual))
+                printk("   virtual %dx%d\n", fb_info.var.xres_virtual,
+                       fb_info.var.yres_virtual);
+
+        if (register_framebuffer(&fb_info) < 0) {
+#ifdef ATAFB_EXT
+                if (external_addr) {
+                        iounmap(external_addr);
+                        external_addr = NULL;
+                }
+                if (external_vgaiobase) {
+                        iounmap((void*)external_vgaiobase);
+                        external_vgaiobase = 0;
+                }
 #endif
-        else if (!strcmp(this_opt, "keep"))
-                DontCalcRes = 1;
-        else if (!strncmp(this_opt, "R", 1))
-                atafb_setup_user(this_opt+1);
-    }
-    return 0;
+                return -EINVAL;
+        }
+
+        // FIXME: mode needs setting!
+        //printk("fb%d: %s frame buffer device, using %dK of video memory\n",
+        //       fb_info.node, fb_info.mode->name, screen_len>>10);
+        printk("fb%d: frame buffer device, using %dK of video memory\n",
+               fb_info.node, screen_len >> 10);
+
+        /* TODO: This driver cannot be unloaded yet */
+        return 0;
 }
 
+module_init(atafb_init);
+
 #ifdef MODULE
 MODULE_LICENSE("GPL");
 
-int init_module(void)
+int cleanup_module(void)
 {
-        return atafb_init();
+        unregister_framebuffer(&fb_info);
+        return atafb_deinit();
 }
 #endif /* MODULE */
diff --git a/drivers/video/atafb.h b/drivers/video/atafb.h
new file mode 100644
index 000000000000..014e05906cb1
--- /dev/null
+++ b/drivers/video/atafb.h
@@ -0,0 +1,36 @@
+#ifndef _VIDEO_ATAFB_H
+#define _VIDEO_ATAFB_H
+
+void atafb_mfb_copyarea(struct fb_info *info, u_long next_line, int sy, int sx, int dy,
+                        int dx, int height, int width);
+void atafb_mfb_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                        int sy, int sx, int height, int width);
+void atafb_mfb_linefill(struct fb_info *info, u_long next_line,
+                        int dy, int dx, u32 width,
+                        const u8 *data, u32 bgcolor, u32 fgcolor);
+
+void atafb_iplan2p2_copyarea(struct fb_info *info, u_long next_line, int sy, int sx, int dy,
+                             int dx, int height, int width);
+void atafb_iplan2p2_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width);
+void atafb_iplan2p2_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor);
+
+void atafb_iplan2p4_copyarea(struct fb_info *info, u_long next_line, int sy, int sx, int dy,
+                             int dx, int height, int width);
+void atafb_iplan2p4_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width);
+void atafb_iplan2p4_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor);
+
+void atafb_iplan2p8_copyarea(struct fb_info *info, u_long next_line, int sy, int sx, int dy,
+                             int dx, int height, int width);
+void atafb_iplan2p8_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width);
+void atafb_iplan2p8_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor);
+
+#endif /* _VIDEO_ATAFB_H */
diff --git a/drivers/video/atafb_iplan2p2.c b/drivers/video/atafb_iplan2p2.c
new file mode 100644
index 000000000000..8cc9c50379d0
--- /dev/null
+++ b/drivers/video/atafb_iplan2p2.c
@@ -0,0 +1,293 @@
+/*
+ *  linux/drivers/video/iplan2p2.c -- Low level frame buffer operations for
+ *                                    interleaved bitplanes à la Atari (2
+ *                                    planes, 2 bytes interleave)
+ *
+ *      Created 5 Apr 1997 by Geert Uytterhoeven
+ *
+ *  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.
+ */
+
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include <asm/setup.h>
+
+#include "atafb.h"
+
+#define BPL     2
+#include "atafb_utils.h"
+
+void atafb_iplan2p2_copyarea(struct fb_info *info, u_long next_line,
+                             int sy, int sx, int dy, int dx,
+                             int height, int width)
+{
+        /*  bmove() has to distinguish two major cases: If both, source and
+         *  destination, start at even addresses or both are at odd
+         *  addresses, just the first odd and last even column (if present)
+         *  require special treatment (memmove_col()). The rest between
+         *  then can be copied by normal operations, because all adjacent
+         *  bytes are affected and are to be stored in the same order.
+         *    The pathological case is when the move should go from an odd
+         *  address to an even or vice versa. Since the bytes in the plane
+         *  words must be assembled in new order, it seems wisest to make
+         *  all movements by memmove_col().
+         */
+
+        u8 *src, *dst;
+        u32 *s, *d;
+        int w, l , i, j;
+        u_int colsize;
+        u_int upwards = (dy < sy) || (dy == sy && dx < sx);
+
+        colsize = height;
+        if (!((sx ^ dx) & 15)) {
+                /* odd->odd or even->even */
+
+                if (upwards) {
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+                        if (sx & 15) {
+                                memmove32_col(dst, src, 0xff00ff, height, next_line - BPL * 2);
+                                src += BPL * 2;
+                                dst += BPL * 2;
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *d++ = *s++;
+                                        s = (u32 *)((u8 *)s + l);
+                                        d = (u32 *)((u8 *)d + l);
+                                }
+                        }
+                        if (width & 15)
+                                memmove32_col(dst + width / (8 / BPL), src + width / (8 / BPL),
+                                              0xff00ff00, height, next_line - BPL * 2);
+                } else {
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        if ((sx + width) & 15) {
+                                src -= BPL * 2;
+                                dst -= BPL * 2;
+                                memmove32_col(dst, src, 0xff00ff00, colsize, -next_line - BPL * 2);
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *--d = *--s;
+                                        s = (u32 *)((u8 *)s - l);
+                                        d = (u32 *)((u8 *)d - l);
+                                }
+                        }
+                        if (sx & 15)
+                                memmove32_col(dst - (width - 16) / (8 / BPL),
+                                              src - (width - 16) / (8 / BPL),
+                                              0xff00ff, colsize, -next_line - BPL * 2);
+                }
+        } else {
+                /* odd->even or even->odd */
+                if (upwards) {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff00;
+                        f = 0;
+                        w = width;
+                        if (sx & 15) {
+                                f = 1;
+                                w += 8;
+                        }
+                        if ((sx + width) & 15)
+                                f |= 2;
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = (*src32++ << 8) & mask;
+                                } else {
+                                        pval[0] = dst32[0] & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[0] | (v1 >> 8);
+                                        pval[0] = (v ^ v1) << 8;
+                                }
+
+                                if (f & 2) {
+                                        dst32[0] = (dst32[0] & mask) | pval[0];
+                                }
+
+                                src += next_line;
+                                dst += next_line;
+                        }
+                } else {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff;
+                        f = 0;
+                        w = width;
+                        if ((dx + width) & 15)
+                                f = 1;
+                        if (sx & 15) {
+                                f |= 2;
+                                w += 8;
+                        }
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = dst32[-1] & mask;
+                                } else {
+                                        pval[0] = (*--src32 >> 8) & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[0] | (v1 << 8);
+                                        pval[0] = (v ^ v1) >> 8;
+                                }
+
+                                if (!(f & 2)) {
+                                        dst32[-1] = (dst32[-1] & mask) | pval[0];
+                                }
+
+                                src -= next_line;
+                                dst -= next_line;
+                        }
+                }
+        }
+}
+
+void atafb_iplan2p2_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width)
+{
+        u32 *dest;
+        int rows, i;
+        u32 cval[4];
+
+        dest = (u32 *)(info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL));
+        if (sx & 15) {
+                u8 *dest8 = (u8 *)dest + 1;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        expand16_col2mask(color, cval);
+        rows = width >> 4;
+        if (rows) {
+                u32 *d = dest;
+                u32 off = next_line - rows * BPL * 2;
+                for (i = height; i; i--) {
+                        d = fill16_col(d, rows, cval);
+                        d = (u32 *)((long)d + off);
+                }
+                dest += rows * BPL / 2;
+                width &= 15;
+        }
+
+        if (width) {
+                u8 *dest8 = (u8 *)dest;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+        }
+}
+
+void atafb_iplan2p2_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor)
+{
+        u32 *dest;
+        const u16 *data16;
+        int rows;
+        u32 fgm[4], bgm[4], m;
+
+        dest = (u32 *)(info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL));
+        if (dx & 15) {
+                fill8_2col((u8 *)dest + 1, fgcolor, bgcolor, *data++);
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        if (width >= 16) {
+                data16 = (const u16 *)data;
+                expand16_2col2mask(fgcolor, bgcolor, fgm, bgm);
+
+                for (rows = width / 16; rows; rows--) {
+                        u16 d = *data16++;
+                        m = d | ((u32)d << 16);
+                        *dest++ = (m & fgm[0]) ^ bgm[0];
+                }
+
+                data = (const u8 *)data16;
+                width &= 15;
+        }
+
+        if (width)
+                fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);
+}
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+        return 0;
+}
+
+void cleanup_module(void)
+{
+}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(atafb_iplan2p2_copyarea);
+EXPORT_SYMBOL(atafb_iplan2p2_fillrect);
+EXPORT_SYMBOL(atafb_iplan2p2_linefill);
diff --git a/drivers/video/atafb_iplan2p4.c b/drivers/video/atafb_iplan2p4.c
new file mode 100644
index 000000000000..bee0d89463f7
--- /dev/null
+++ b/drivers/video/atafb_iplan2p4.c
@@ -0,0 +1,308 @@
+/*
+ *  linux/drivers/video/iplan2p4.c -- Low level frame buffer operations for
+ *                                    interleaved bitplanes à la Atari (4
+ *                                    planes, 2 bytes interleave)
+ *
+ *      Created 5 Apr 1997 by Geert Uytterhoeven
+ *
+ *  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.
+ */
+
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include <asm/setup.h>
+
+#include "atafb.h"
+
+#define BPL     4
+#include "atafb_utils.h"
+
+void atafb_iplan2p4_copyarea(struct fb_info *info, u_long next_line,
+                             int sy, int sx, int dy, int dx,
+                             int height, int width)
+{
+        /*  bmove() has to distinguish two major cases: If both, source and
+         *  destination, start at even addresses or both are at odd
+         *  addresses, just the first odd and last even column (if present)
+         *  require special treatment (memmove_col()). The rest between
+         *  then can be copied by normal operations, because all adjacent
+         *  bytes are affected and are to be stored in the same order.
+         *    The pathological case is when the move should go from an odd
+         *  address to an even or vice versa. Since the bytes in the plane
+         *  words must be assembled in new order, it seems wisest to make
+         *  all movements by memmove_col().
+         */
+
+        u8 *src, *dst;
+        u32 *s, *d;
+        int w, l , i, j;
+        u_int colsize;
+        u_int upwards = (dy < sy) || (dy == sy && dx < sx);
+
+        colsize = height;
+        if (!((sx ^ dx) & 15)) {
+                /* odd->odd or even->even */
+
+                if (upwards) {
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+                        if (sx & 15) {
+                                memmove32_col(dst, src, 0xff00ff, height, next_line - BPL * 2);
+                                src += BPL * 2;
+                                dst += BPL * 2;
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *d++ = *s++;
+                                        s = (u32 *)((u8 *)s + l);
+                                        d = (u32 *)((u8 *)d + l);
+                                }
+                        }
+                        if (width & 15)
+                                memmove32_col(dst + width / (8 / BPL), src + width / (8 / BPL),
+                                              0xff00ff00, height, next_line - BPL * 2);
+                } else {
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        if ((sx + width) & 15) {
+                                src -= BPL * 2;
+                                dst -= BPL * 2;
+                                memmove32_col(dst, src, 0xff00ff00, colsize, -next_line - BPL * 2);
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *--d = *--s;
+                                        s = (u32 *)((u8 *)s - l);
+                                        d = (u32 *)((u8 *)d - l);
+                                }
+                        }
+                        if (sx & 15)
+                                memmove32_col(dst - (width - 16) / (8 / BPL),
+                                              src - (width - 16) / (8 / BPL),
+                                              0xff00ff, colsize, -next_line - BPL * 2);
+                }
+        } else {
+                /* odd->even or even->odd */
+                if (upwards) {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff00;
+                        f = 0;
+                        w = width;
+                        if (sx & 15) {
+                                f = 1;
+                                w += 8;
+                        }
+                        if ((sx + width) & 15)
+                                f |= 2;
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = (*src32++ << 8) & mask;
+                                        pval[1] = (*src32++ << 8) & mask;
+                                } else {
+                                        pval[0] = dst32[0] & mask;
+                                        pval[1] = dst32[1] & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[0] | (v1 >> 8);
+                                        pval[0] = (v ^ v1) << 8;
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[1] | (v1 >> 8);
+                                        pval[1] = (v ^ v1) << 8;
+                                }
+
+                                if (f & 2) {
+                                        dst32[0] = (dst32[0] & mask) | pval[0];
+                                        dst32[1] = (dst32[1] & mask) | pval[1];
+                                }
+
+                                src += next_line;
+                                dst += next_line;
+                        }
+                } else {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff;
+                        f = 0;
+                        w = width;
+                        if ((dx + width) & 15)
+                                f = 1;
+                        if (sx & 15) {
+                                f |= 2;
+                                w += 8;
+                        }
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = dst32[-1] & mask;
+                                        pval[1] = dst32[-2] & mask;
+                                } else {
+                                        pval[0] = (*--src32 >> 8) & mask;
+                                        pval[1] = (*--src32 >> 8) & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[0] | (v1 << 8);
+                                        pval[0] = (v ^ v1) >> 8;
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[1] | (v1 << 8);
+                                        pval[1] = (v ^ v1) >> 8;
+                                }
+
+                                if (!(f & 2)) {
+                                        dst32[-1] = (dst32[-1] & mask) | pval[0];
+                                        dst32[-2] = (dst32[-2] & mask) | pval[1];
+                                }
+
+                                src -= next_line;
+                                dst -= next_line;
+                        }
+                }
+        }
+}
+
+void atafb_iplan2p4_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width)
+{
+        u32 *dest;
+        int rows, i;
+        u32 cval[4];
+
+        dest = (u32 *)(info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL));
+        if (sx & 15) {
+                u8 *dest8 = (u8 *)dest + 1;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        expand16_col2mask(color, cval);
+        rows = width >> 4;
+        if (rows) {
+                u32 *d = dest;
+                u32 off = next_line - rows * BPL * 2;
+                for (i = height; i; i--) {
+                        d = fill16_col(d, rows, cval);
+                        d = (u32 *)((long)d + off);
+                }
+                dest += rows * BPL / 2;
+                width &= 15;
+        }
+
+        if (width) {
+                u8 *dest8 = (u8 *)dest;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+        }
+}
+
+void atafb_iplan2p4_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor)
+{
+        u32 *dest;
+        const u16 *data16;
+        int rows;
+        u32 fgm[4], bgm[4], m;
+
+        dest = (u32 *)(info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL));
+        if (dx & 15) {
+                fill8_2col((u8 *)dest + 1, fgcolor, bgcolor, *data++);
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        if (width >= 16) {
+                data16 = (const u16 *)data;
+                expand16_2col2mask(fgcolor, bgcolor, fgm, bgm);
+
+                for (rows = width / 16; rows; rows--) {
+                        u16 d = *data16++;
+                        m = d | ((u32)d << 16);
+                        *dest++ = (m & fgm[0]) ^ bgm[0];
+                        *dest++ = (m & fgm[1]) ^ bgm[1];
+                }
+
+                data = (const u8 *)data16;
+                width &= 15;
+        }
+
+        if (width)
+                fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);
+}
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+        return 0;
+}
+
+void cleanup_module(void)
+{
+}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(atafb_iplan2p4_copyarea);
+EXPORT_SYMBOL(atafb_iplan2p4_fillrect);
+EXPORT_SYMBOL(atafb_iplan2p4_linefill);
diff --git a/drivers/video/atafb_iplan2p8.c b/drivers/video/atafb_iplan2p8.c
new file mode 100644
index 000000000000..356fb52ce443
--- /dev/null
+++ b/drivers/video/atafb_iplan2p8.c
@@ -0,0 +1,345 @@
+/*
+ *  linux/drivers/video/iplan2p8.c -- Low level frame buffer operations for
+ *                                    interleaved bitplanes à la Atari (8
+ *                                    planes, 2 bytes interleave)
+ *
+ *      Created 5 Apr 1997 by Geert Uytterhoeven
+ *
+ *  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.
+ */
+
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include <asm/setup.h>
+
+#include "atafb.h"
+
+#define BPL     8
+#include "atafb_utils.h"
+
+
+/* Copies a 8 plane column from 's', height 'h', to 'd'. */
+
+/* This expands a 8 bit color into two longs for two movepl (8 plane)
+ * operations.
+ */
+
+void atafb_iplan2p8_copyarea(struct fb_info *info, u_long next_line,
+                             int sy, int sx, int dy, int dx,
+                             int height, int width)
+{
+        /*  bmove() has to distinguish two major cases: If both, source and
+         *  destination, start at even addresses or both are at odd
+         *  addresses, just the first odd and last even column (if present)
+         *  require special treatment (memmove_col()). The rest between
+         *  then can be copied by normal operations, because all adjacent
+         *  bytes are affected and are to be stored in the same order.
+         *    The pathological case is when the move should go from an odd
+         *  address to an even or vice versa. Since the bytes in the plane
+         *  words must be assembled in new order, it seems wisest to make
+         *  all movements by memmove_col().
+         */
+
+        u8 *src, *dst;
+        u32 *s, *d;
+        int w, l , i, j;
+        u_int colsize;
+        u_int upwards = (dy < sy) || (dy == sy && dx < sx);
+
+        colsize = height;
+        if (!((sx ^ dx) & 15)) {
+                /* odd->odd or even->even */
+
+                if (upwards) {
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+                        if (sx & 15) {
+                                memmove32_col(dst, src, 0xff00ff, height, next_line - BPL * 2);
+                                src += BPL * 2;
+                                dst += BPL * 2;
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *d++ = *s++;
+                                        s = (u32 *)((u8 *)s + l);
+                                        d = (u32 *)((u8 *)d + l);
+                                }
+                        }
+                        if (width & 15)
+                                memmove32_col(dst + width / (8 / BPL), src + width / (8 / BPL),
+                                              0xff00ff00, height, next_line - BPL * 2);
+                } else {
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        if ((sx + width) & 15) {
+                                src -= BPL * 2;
+                                dst -= BPL * 2;
+                                memmove32_col(dst, src, 0xff00ff00, colsize, -next_line - BPL * 2);
+                                width -= 8;
+                        }
+                        w = width >> 4;
+                        if (w) {
+                                s = (u32 *)src;
+                                d = (u32 *)dst;
+                                w *= BPL / 2;
+                                l = next_line - w * 4;
+                                for (j = height; j > 0; j--) {
+                                        for (i = w; i > 0; i--)
+                                                *--d = *--s;
+                                        s = (u32 *)((u8 *)s - l);
+                                        d = (u32 *)((u8 *)d - l);
+                                }
+                        }
+                        if (sx & 15)
+                                memmove32_col(dst - (width - 16) / (8 / BPL),
+                                              src - (width - 16) / (8 / BPL),
+                                              0xff00ff, colsize, -next_line - BPL * 2);
+                }
+        } else {
+                /* odd->even or even->odd */
+                if (upwards) {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff00;
+                        f = 0;
+                        w = width;
+                        if (sx & 15) {
+                                f = 1;
+                                w += 8;
+                        }
+                        if ((sx + width) & 15)
+                                f |= 2;
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = (*src32++ << 8) & mask;
+                                        pval[1] = (*src32++ << 8) & mask;
+                                        pval[2] = (*src32++ << 8) & mask;
+                                        pval[3] = (*src32++ << 8) & mask;
+                                } else {
+                                        pval[0] = dst32[0] & mask;
+                                        pval[1] = dst32[1] & mask;
+                                        pval[2] = dst32[2] & mask;
+                                        pval[3] = dst32[3] & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[0] | (v1 >> 8);
+                                        pval[0] = (v ^ v1) << 8;
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[1] | (v1 >> 8);
+                                        pval[1] = (v ^ v1) << 8;
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[2] | (v1 >> 8);
+                                        pval[2] = (v ^ v1) << 8;
+                                        v = *src32++;
+                                        v1 = v & mask;
+                                        *dst32++ = pval[3] | (v1 >> 8);
+                                        pval[3] = (v ^ v1) << 8;
+                                }
+
+                                if (f & 2) {
+                                        dst32[0] = (dst32[0] & mask) | pval[0];
+                                        dst32[1] = (dst32[1] & mask) | pval[1];
+                                        dst32[2] = (dst32[2] & mask) | pval[2];
+                                        dst32[3] = (dst32[3] & mask) | pval[3];
+                                }
+
+                                src += next_line;
+                                dst += next_line;
+                        }
+                } else {
+                        u32 *src32, *dst32;
+                        u32 pval[4], v, v1, mask;
+                        int i, j, w, f;
+
+                        src = (u8 *)info->screen_base + (sy - 1) * next_line + ((sx + width + 8) & ~15) / (8 / BPL);
+                        dst = (u8 *)info->screen_base + (dy - 1) * next_line + ((dx + width + 8) & ~15) / (8 / BPL);
+
+                        mask = 0xff00ff;
+                        f = 0;
+                        w = width;
+                        if ((dx + width) & 15)
+                                f = 1;
+                        if (sx & 15) {
+                                f |= 2;
+                                w += 8;
+                        }
+                        w >>= 4;
+                        for (i = height; i; i--) {
+                                src32 = (u32 *)src;
+                                dst32 = (u32 *)dst;
+
+                                if (f & 1) {
+                                        pval[0] = dst32[-1] & mask;
+                                        pval[1] = dst32[-2] & mask;
+                                        pval[2] = dst32[-3] & mask;
+                                        pval[3] = dst32[-4] & mask;
+                                } else {
+                                        pval[0] = (*--src32 >> 8) & mask;
+                                        pval[1] = (*--src32 >> 8) & mask;
+                                        pval[2] = (*--src32 >> 8) & mask;
+                                        pval[3] = (*--src32 >> 8) & mask;
+                                }
+
+                                for (j = w; j > 0; j--) {
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[0] | (v1 << 8);
+                                        pval[0] = (v ^ v1) >> 8;
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[1] | (v1 << 8);
+                                        pval[1] = (v ^ v1) >> 8;
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[2] | (v1 << 8);
+                                        pval[2] = (v ^ v1) >> 8;
+                                        v = *--src32;
+                                        v1 = v & mask;
+                                        *--dst32 = pval[3] | (v1 << 8);
+                                        pval[3] = (v ^ v1) >> 8;
+                                }
+
+                                if (!(f & 2)) {
+                                        dst32[-1] = (dst32[-1] & mask) | pval[0];
+                                        dst32[-2] = (dst32[-2] & mask) | pval[1];
+                                        dst32[-3] = (dst32[-3] & mask) | pval[2];
+                                        dst32[-4] = (dst32[-4] & mask) | pval[3];
+                                }
+
+                                src -= next_line;
+                                dst -= next_line;
+                        }
+                }
+        }
+}
+
+void atafb_iplan2p8_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                             int sy, int sx, int height, int width)
+{
+        u32 *dest;
+        int rows, i;
+        u32 cval[4];
+
+        dest = (u32 *)(info->screen_base + sy * next_line + (sx & ~15) / (8 / BPL));
+        if (sx & 15) {
+                u8 *dest8 = (u8 *)dest + 1;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        expand16_col2mask(color, cval);
+        rows = width >> 4;
+        if (rows) {
+                u32 *d = dest;
+                u32 off = next_line - rows * BPL * 2;
+                for (i = height; i; i--) {
+                        d = fill16_col(d, rows, cval);
+                        d = (u32 *)((long)d + off);
+                }
+                dest += rows * BPL / 2;
+                width &= 15;
+        }
+
+        if (width) {
+                u8 *dest8 = (u8 *)dest;
+
+                expand8_col2mask(color, cval);
+
+                for (i = height; i; i--) {
+                        fill8_col(dest8, cval);
+                        dest8 += next_line;
+                }
+        }
+}
+
+void atafb_iplan2p8_linefill(struct fb_info *info, u_long next_line,
+                             int dy, int dx, u32 width,
+                             const u8 *data, u32 bgcolor, u32 fgcolor)
+{
+        u32 *dest;
+        const u16 *data16;
+        int rows;
+        u32 fgm[4], bgm[4], m;
+
+        dest = (u32 *)(info->screen_base + dy * next_line + (dx & ~15) / (8 / BPL));
+        if (dx & 15) {
+                fill8_2col((u8 *)dest + 1, fgcolor, bgcolor, *data++);
+                dest += BPL / 2;
+                width -= 8;
+        }
+
+        if (width >= 16) {
+                data16 = (const u16 *)data;
+                expand16_2col2mask(fgcolor, bgcolor, fgm, bgm);
+
+                for (rows = width / 16; rows; rows--) {
+                        u16 d = *data16++;
+                        m = d | ((u32)d << 16);
+                        *dest++ = (m & fgm[0]) ^ bgm[0];
+                        *dest++ = (m & fgm[1]) ^ bgm[1];
+                        *dest++ = (m & fgm[2]) ^ bgm[2];
+                        *dest++ = (m & fgm[3]) ^ bgm[3];
+                }
+
+                data = (const u8 *)data16;
+                width &= 15;
+        }
+
+        if (width)
+                fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);
+}
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+        return 0;
+}
+
+void cleanup_module(void)
+{
+}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(atafb_iplan2p8_copyarea);
+EXPORT_SYMBOL(atafb_iplan2p8_fillrect);
+EXPORT_SYMBOL(atafb_iplan2p8_linefill);
diff --git a/drivers/video/atafb_mfb.c b/drivers/video/atafb_mfb.c
new file mode 100644
index 000000000000..6a352d62eecf
--- /dev/null
+++ b/drivers/video/atafb_mfb.c
@@ -0,0 +1,112 @@
+/*
+ *  linux/drivers/video/mfb.c -- Low level frame buffer operations for
+ *                               monochrome
+ *
+ *      Created 5 Apr 1997 by Geert Uytterhoeven
+ *
+ *  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.
+ */
+
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include "atafb.h"
+#include "atafb_utils.h"
+
+
+    /*
+     *  Monochrome
+     */
+
+void atafb_mfb_copyarea(struct fb_info *info, u_long next_line,
+                        int sy, int sx, int dy, int dx,
+                        int height, int width)
+{
+        u8 *src, *dest;
+        u_int rows;
+
+        if (sx == 0 && dx == 0 && width == next_line) {
+                src = (u8 *)info->screen_base + sy * (width >> 3);
+                dest = (u8 *)info->screen_base + dy * (width >> 3);
+                fb_memmove(dest, src, height * (width >> 3));
+        } else if (dy <= sy) {
+                src = (u8 *)info->screen_base + sy * next_line + (sx >> 3);
+                dest = (u8 *)info->screen_base + dy * next_line + (dx >> 3);
+                for (rows = height; rows--;) {
+                        fb_memmove(dest, src, width >> 3);
+                        src += next_line;
+                        dest += next_line;
+                }
+        } else {
+                src = (u8 *)info->screen_base + (sy + height - 1) * next_line + (sx >> 3);
+                dest = (u8 *)info->screen_base + (dy + height - 1) * next_line + (dx >> 3);
+                for (rows = height; rows--;) {
+                        fb_memmove(dest, src, width >> 3);
+                        src -= next_line;
+                        dest -= next_line;
+                }
+        }
+}
+
+void atafb_mfb_fillrect(struct fb_info *info, u_long next_line, u32 color,
+                        int sy, int sx, int height, int width)
+{
+        u8 *dest;
+        u_int rows;
+
+        dest = (u8 *)info->screen_base + sy * next_line + (sx >> 3);
+
+        if (sx == 0 && width == next_line) {
+                if (color)
+                        fb_memset255(dest, height * (width >> 3));
+                else
+                        fb_memclear(dest, height * (width >> 3));
+        } else {
+                for (rows = height; rows--; dest += next_line) {
+                        if (color)
+                                fb_memset255(dest, width >> 3);
+                        else
+                                fb_memclear_small(dest, width >> 3);
+                }
+        }
+}
+
+void atafb_mfb_linefill(struct fb_info *info, u_long next_line,
+                        int dy, int dx, u32 width,
+                        const u8 *data, u32 bgcolor, u32 fgcolor)
+{
+        u8 *dest;
+        u_int rows;
+
+        dest = (u8 *)info->screen_base + dy * next_line + (dx >> 3);
+
+        for (rows = width / 8; rows--; /* check margins */ ) {
+                // use fast_memmove or fb_memmove
+                *dest++ = *data++;
+        }
+}
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+        return 0;
+}
+
+void cleanup_module(void)
+{
+}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(atafb_mfb_copyarea);
+EXPORT_SYMBOL(atafb_mfb_fillrect);
+EXPORT_SYMBOL(atafb_mfb_linefill);
diff --git a/drivers/video/atafb_utils.h b/drivers/video/atafb_utils.h
new file mode 100644
index 000000000000..ac9e19dc5057
--- /dev/null
+++ b/drivers/video/atafb_utils.h
@@ -0,0 +1,400 @@
+#ifndef _VIDEO_ATAFB_UTILS_H
+#define _VIDEO_ATAFB_UTILS_H
+
+/* ================================================================= */
+/*                      Utility Assembler Functions                  */
+/* ================================================================= */
+
+/* ====================================================================== */
+
+/* Those of a delicate disposition might like to skip the next couple of
+ * pages.
+ *
+ * These functions are drop in replacements for memmove and
+ * memset(_, 0, _). However their five instances add at least a kilobyte
+ * to the object file. You have been warned.
+ *
+ * Not a great fan of assembler for the sake of it, but I think
+ * that these routines are at least 10 times faster than their C
+ * equivalents for large blits, and that's important to the lowest level of
+ * a graphics driver. Question is whether some scheme with the blitter
+ * would be faster. I suspect not for simple text system - not much
+ * asynchrony.
+ *
+ * Code is very simple, just gruesome expansion. Basic strategy is to
+ * increase data moved/cleared at each step to 16 bytes to reduce
+ * instruction per data move overhead. movem might be faster still
+ * For more than 15 bytes, we try to align the write direction on a
+ * longword boundary to get maximum speed. This is even more gruesome.
+ * Unaligned read/write used requires 68020+ - think this is a problem?
+ *
+ * Sorry!
+ */
+
+
+/* ++roman: I've optimized Robert's original versions in some minor
+ * aspects, e.g. moveq instead of movel, let gcc choose the registers,
+ * use movem in some places...
+ * For other modes than 1 plane, lots of more such assembler functions
+ * were needed (e.g. the ones using movep or expanding color values).
+ */
+
+/* ++andreas: more optimizations:
+   subl #65536,d0 replaced by clrw d0; subql #1,d0 for dbcc
+   addal is faster than addaw
+   movep is rather expensive compared to ordinary move's
+   some functions rewritten in C for clarity, no speed loss */
+
+static inline void *fb_memclear_small(void *s, size_t count)
+{
+        if (!count)
+                return 0;
+
+        asm volatile ("\n"
+                "       lsr.l   #1,%1 ; jcc 1f ; move.b %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.w %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.l %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.l %2,-(%0) ; move.l %2,-(%0)\n"
+                "1:"
+                : "=a" (s), "=d" (count)
+                : "d" (0), "0" ((char *)s + count), "1" (count));
+        asm volatile ("\n"
+                "       subq.l  #1,%1\n"
+                "       jcs     3f\n"
+                "       move.l  %2,%%d4; move.l %2,%%d5; move.l %2,%%d6\n"
+                "2:     movem.l %2/%%d4/%%d5/%%d6,-(%0)\n"
+                "       dbra    %1,2b\n"
+                "3:"
+                : "=a" (s), "=d" (count)
+                : "d" (0), "0" (s), "1" (count)
+                : "d4", "d5", "d6"
+                );
+
+        return 0;
+}
+
+
+static inline void *fb_memclear(void *s, size_t count)
+{
+        if (!count)
+                return 0;
+
+        if (count < 16) {
+                asm volatile ("\n"
+                        "       lsr.l   #1,%1 ; jcc 1f ; clr.b (%0)+\n"
+                        "1:     lsr.l   #1,%1 ; jcc 1f ; clr.w (%0)+\n"
+                        "1:     lsr.l   #1,%1 ; jcc 1f ; clr.l (%0)+\n"
+                        "1:     lsr.l   #1,%1 ; jcc 1f ; clr.l (%0)+ ; clr.l (%0)+\n"
+                        "1:"
+                        : "=a" (s), "=d" (count)
+                        : "0" (s), "1" (count));
+        } else {
+                long tmp;
+                asm volatile ("\n"
+                        "       move.l  %1,%2\n"
+                        "       lsr.l   #1,%2 ; jcc 1f ; clr.b (%0)+ ; subq.w #1,%1\n"
+                        "       lsr.l   #1,%2 ; jcs 2f\n"  /* %0 increased=>bit 2 switched*/
+                        "       clr.w   (%0)+  ; subq.w  #2,%1 ; jra 2f\n"
+                        "1:     lsr.l   #1,%2 ; jcc 2f\n"
+                        "       clr.w   (%0)+  ; subq.w  #2,%1\n"
+                        "2:     move.w  %1,%2; lsr.l #2,%1 ; jeq 6f\n"
+                        "       lsr.l   #1,%1 ; jcc 3f ; clr.l (%0)+\n"
+                        "3:     lsr.l   #1,%1 ; jcc 4f ; clr.l (%0)+ ; clr.l (%0)+\n"
+                        "4:     subq.l  #1,%1 ; jcs 6f\n"
+                        "5:     clr.l   (%0)+; clr.l (%0)+ ; clr.l (%0)+ ; clr.l (%0)+\n"
+                        "       dbra    %1,5b ; clr.w %1; subq.l #1,%1; jcc 5b\n"
+                        "6:     move.w  %2,%1; btst #1,%1 ; jeq 7f ; clr.w (%0)+\n"
+                        "7:     btst    #0,%1 ; jeq 8f ; clr.b (%0)+\n"
+                        "8:"
+                        : "=a" (s), "=d" (count), "=d" (tmp)
+                        : "0" (s), "1" (count));
+        }
+
+        return 0;
+}
+
+
+static inline void *fb_memset255(void *s, size_t count)
+{
+        if (!count)
+                return 0;
+
+        asm volatile ("\n"
+                "       lsr.l   #1,%1 ; jcc 1f ; move.b %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.w %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.l %2,-(%0)\n"
+                "1:     lsr.l   #1,%1 ; jcc 1f ; move.l %2,-(%0) ; move.l %2,-(%0)\n"
+                "1:"
+                : "=a" (s), "=d" (count)
+                : "d" (-1), "0" ((char *)s+count), "1" (count));
+        asm volatile ("\n"
+                "       subq.l  #1,%1 ; jcs 3f\n"
+                "       move.l  %2,%%d4; move.l %2,%%d5; move.l %2,%%d6\n"
+                "2:     movem.l %2/%%d4/%%d5/%%d6,-(%0)\n"
+                "       dbra    %1,2b\n"
+                "3:"
+                : "=a" (s), "=d" (count)
+                : "d" (-1), "0" (s), "1" (count)
+                : "d4", "d5", "d6");
+
+        return 0;
+}
+
+
+static inline void *fb_memmove(void *d, const void *s, size_t count)
+{
+        if (d < s) {
+                if (count < 16) {
+                        asm volatile ("\n"
+                                "       lsr.l   #1,%2 ; jcc 1f ; move.b (%1)+,(%0)+\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.w (%1)+,(%0)+\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.l (%1)+,(%0)+\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.l (%1)+,(%0)+ ; move.l (%1)+,(%0)+\n"
+                                "1:"
+                                : "=a" (d), "=a" (s), "=d" (count)
+                                : "0" (d), "1" (s), "2" (count));
+                } else {
+                        long tmp;
+                        asm volatile ("\n"
+                                "       move.l  %0,%3\n"
+                                "       lsr.l   #1,%3 ; jcc 1f ; move.b (%1)+,(%0)+ ; subqw #1,%2\n"
+                                "       lsr.l   #1,%3 ; jcs 2f\n"  /* %0 increased=>bit 2 switched*/
+                                "       move.w  (%1)+,(%0)+  ; subqw  #2,%2 ; jra 2f\n"
+                                "1:     lsr.l   #1,%3 ; jcc 2f\n"
+                                "       move.w  (%1)+,(%0)+  ; subqw  #2,%2\n"
+                                "2:     move.w  %2,%-; lsr.l #2,%2 ; jeq 6f\n"
+                                "       lsr.l   #1,%2 ; jcc 3f ; move.l (%1)+,(%0)+\n"
+                                "3:     lsr.l   #1,%2 ; jcc 4f ; move.l (%1)+,(%0)+ ; move.l (%1)+,(%0)+\n"
+                                "4:     subq.l  #1,%2 ; jcs 6f\n"
+                                "5:     move.l  (%1)+,(%0)+; move.l (%1)+,(%0)+\n"
+                                "       move.l  (%1)+,(%0)+; move.l (%1)+,(%0)+\n"
+                                "       dbra    %2,5b ; clr.w %2; subq.l #1,%2; jcc 5b\n"
+                                "6:     move.w  %+,%2; btst #1,%2 ; jeq 7f ; move.w (%1)+,(%0)+\n"
+                                "7:     btst    #0,%2 ; jeq 8f ; move.b (%1)+,(%0)+\n"
+                                "8:"
+                                : "=a" (d), "=a" (s), "=d" (count), "=d" (tmp)
+                                : "0" (d), "1" (s), "2" (count));
+                }
+        } else {
+                if (count < 16) {
+                        asm volatile ("\n"
+                                "       lsr.l   #1,%2 ; jcc 1f ; move.b -(%1),-(%0)\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.w -(%1),-(%0)\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.l -(%1),-(%0)\n"
+                                "1:     lsr.l   #1,%2 ; jcc 1f ; move.l -(%1),-(%0) ; move.l -(%1),-(%0)\n"
+                                "1:"
+                                : "=a" (d), "=a" (s), "=d" (count)
+                                : "0" ((char *) d + count), "1" ((char *) s + count), "2" (count));
+                } else {
+                        long tmp;
+
+                        asm volatile ("\n"
+                                "       move.l  %0,%3\n"
+                                "       lsr.l   #1,%3 ; jcc 1f ; move.b -(%1),-(%0) ; subqw #1,%2\n"
+                                "       lsr.l   #1,%3 ; jcs 2f\n"  /* %0 increased=>bit 2 switched*/
+                                "       move.w  -(%1),-(%0) ; subqw  #2,%2 ; jra 2f\n"
+                                "1:     lsr.l   #1,%3 ; jcc 2f\n"
+                                "       move.w  -(%1),-(%0) ; subqw  #2,%2\n"
+                                "2:     move.w  %2,%-; lsr.l #2,%2 ; jeq 6f\n"
+                                "       lsr.l   #1,%2 ; jcc 3f ; move.l -(%1),-(%0)\n"
+                                "3:     lsr.l   #1,%2 ; jcc 4f ; move.l -(%1),-(%0) ; move.l -(%1),-(%0)\n"
+                                "4:     subq.l  #1,%2 ; jcs 6f\n"
+                                "5:     move.l  -(%1),-(%0); move.l -(%1),-(%0)\n"
+                                "       move.l  -(%1),-(%0); move.l -(%1),-(%0)\n"
+                                "       dbra    %2,5b ; clr.w %2; subq.l #1,%2; jcc 5b\n"
+                                "6:     move.w  %+,%2; btst #1,%2 ; jeq 7f ; move.w -(%1),-(%0)\n"
+                                "7:     btst    #0,%2 ; jeq 8f ; move.b -(%1),-(%0)\n"
+                                "8:"
+                                : "=a" (d), "=a" (s), "=d" (count), "=d" (tmp)
+                                : "0" ((char *) d + count), "1" ((char *) s + count), "2" (count));
+                }
+        }
+
+        return 0;
+}
+
+
+/* ++andreas: Simple and fast version of memmove, assumes size is
+   divisible by 16, suitable for moving the whole screen bitplane */
+static inline void fast_memmove(char *dst, const char *src, size_t size)
+{
+        if (!size)
+                return;
+        if (dst < src)
+                asm volatile ("\n"
+                        "1:     movem.l (%0)+,%%d0/%%d1/%%a0/%%a1\n"
+                        "       movem.l %%d0/%%d1/%%a0/%%a1,%1@\n"
+                        "       addq.l  #8,%1; addq.l #8,%1\n"
+                        "       dbra    %2,1b\n"
+                        "       clr.w   %2; subq.l #1,%2\n"
+                        "       jcc     1b"
+                        : "=a" (src), "=a" (dst), "=d" (size)
+                        : "0" (src), "1" (dst), "2" (size / 16 - 1)
+                        : "d0", "d1", "a0", "a1", "memory");
+        else
+                asm volatile ("\n"
+                        "1:     subq.l  #8,%0; subq.l #8,%0\n"
+                        "       movem.l %0@,%%d0/%%d1/%%a0/%%a1\n"
+                        "       movem.l %%d0/%%d1/%%a0/%%a1,-(%1)\n"
+                        "       dbra    %2,1b\n"
+                        "       clr.w   %2; subq.l #1,%2\n"
+                        "       jcc 1b"
+                        : "=a" (src), "=a" (dst), "=d" (size)
+                        : "0" (src + size), "1" (dst + size), "2" (size / 16 - 1)
+                        : "d0", "d1", "a0", "a1", "memory");
+}
+
+#ifdef BPL
+
+/*
+ * This expands a up to 8 bit color into two longs
+ * for movel operations.
+ */
+static const u32 four2long[] = {
+        0x00000000, 0x000000ff, 0x0000ff00, 0x0000ffff,
+        0x00ff0000, 0x00ff00ff, 0x00ffff00, 0x00ffffff,
+        0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff,
+        0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff,
+};
+
+static inline void expand8_col2mask(u8 c, u32 m[])
+{
+        m[0] = four2long[c & 15];
+#if BPL > 4
+        m[1] = four2long[c >> 4];
+#endif
+}
+
+static inline void expand8_2col2mask(u8 fg, u8 bg, u32 fgm[], u32 bgm[])
+{
+        fgm[0] = four2long[fg & 15] ^ (bgm[0] = four2long[bg & 15]);
+#if BPL > 4
+        fgm[1] = four2long[fg >> 4] ^ (bgm[1] = four2long[bg >> 4]);
+#endif
+}
+
+/*
+ * set an 8bit value to a color
+ */
+static inline void fill8_col(u8 *dst, u32 m[])
+{
+        u32 tmp = m[0];
+        dst[0] = tmp;
+        dst[2] = (tmp >>= 8);
+#if BPL > 2
+        dst[4] = (tmp >>= 8);
+        dst[6] = tmp >> 8;
+#endif
+#if BPL > 4
+        tmp = m[1];
+        dst[8] = tmp;
+        dst[10] = (tmp >>= 8);
+        dst[12] = (tmp >>= 8);
+        dst[14] = tmp >> 8;
+#endif
+}
+
+/*
+ * set an 8bit value according to foreground/background color
+ */
+static inline void fill8_2col(u8 *dst, u8 fg, u8 bg, u32 mask)
+{
+        u32 fgm[2], bgm[2], tmp;
+
+        expand8_2col2mask(fg, bg, fgm, bgm);
+
+        mask |= mask << 8;
+#if BPL > 2
+        mask |= mask << 16;
+#endif
+        tmp = (mask & fgm[0]) ^ bgm[0];
+        dst[0] = tmp;
+        dst[2] = (tmp >>= 8);
+#if BPL > 2
+        dst[4] = (tmp >>= 8);
+        dst[6] = tmp >> 8;
+#endif
+#if BPL > 4
+        tmp = (mask & fgm[1]) ^ bgm[1];
+        dst[8] = tmp;
+        dst[10] = (tmp >>= 8);
+        dst[12] = (tmp >>= 8);
+        dst[14] = tmp >> 8;
+#endif
+}
+
+static const u32 two2word[] = {
+        0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
+};
+
+static inline void expand16_col2mask(u8 c, u32 m[])
+{
+        m[0] = two2word[c & 3];
+#if BPL > 2
+        m[1] = two2word[(c >> 2) & 3];
+#endif
+#if BPL > 4
+        m[2] = two2word[(c >> 4) & 3];
+        m[3] = two2word[c >> 6];
+#endif
+}
+
+static inline void expand16_2col2mask(u8 fg, u8 bg, u32 fgm[], u32 bgm[])
+{
+        bgm[0] = two2word[bg & 3];
+        fgm[0] = two2word[fg & 3] ^ bgm[0];
+#if BPL > 2
+        bgm[1] = two2word[(bg >> 2) & 3];
+        fgm[1] = two2word[(fg >> 2) & 3] ^ bgm[1];
+#endif
+#if BPL > 4
+        bgm[2] = two2word[(bg >> 4) & 3];
+        fgm[2] = two2word[(fg >> 4) & 3] ^ bgm[2];
+        bgm[3] = two2word[bg >> 6];
+        fgm[3] = two2word[fg >> 6] ^ bgm[3];
+#endif
+}
+
+static inline u32 *fill16_col(u32 *dst, int rows, u32 m[])
+{
+        while (rows) {
+                *dst++ = m[0];
+#if BPL > 2
+                *dst++ = m[1];
+#endif
+#if BPL > 4
+                *dst++ = m[2];
+                *dst++ = m[3];
+#endif
+                rows--;
+        }
+        return dst;
+}
+
+static inline void memmove32_col(void *dst, void *src, u32 mask, u32 h, u32 bytes)
+{
+        u32 *s, *d, v;
+
+        s = src;
+        d = dst;
+        do {
+                v = (*s++ & mask) | (*d  & ~mask);
+                *d++ = v;
+#if BPL > 2
+                v = (*s++ & mask) | (*d  & ~mask);
+                *d++ = v;
+#endif
+#if BPL > 4
+                v = (*s++ & mask) | (*d  & ~mask);
+                *d++ = v;
+                v = (*s++ & mask) | (*d  & ~mask);
+                *d++ = v;
+#endif
+                d = (u32 *)((u8 *)d + bytes);
+                s = (u32 *)((u8 *)s + bytes);
+        } while (--h);
+}
+
+#endif
+
+#endif /* _VIDEO_ATAFB_UTILS_H */
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 508479920705..7db9de681716 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -1,7 +1,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/fb.h>
 
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 91a20785108a..3e67c34df9a5 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -371,7 +371,8 @@ static const char *vgacon_startup(void)
         }
 
         /* VGA16 modes are not handled by VGACON */
-        if ((ORIG_VIDEO_MODE == 0x0D) ||        /* 320x200/4 */
+        if ((ORIG_VIDEO_MODE == 0x00) ||        /* SCREEN_INFO not initialized */
+            (ORIG_VIDEO_MODE == 0x0D) ||        /* 320x200/4 */
             (ORIG_VIDEO_MODE == 0x0E) ||        /* 640x200/4 */
             (ORIG_VIDEO_MODE == 0x10) ||        /* 640x350/4 */
             (ORIG_VIDEO_MODE == 0x12) ||        /* 640x480/4 */
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index ca93a75f2997..b7655c05da53 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/jazz.h>
 
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index f4ede5f6b588..61e4c8759b23 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -104,7 +104,8 @@ static int intelfb_setup_i2c_bus(struct intelfb_info *dinfo,
 
         chan->dinfo                                     = dinfo;
         chan->reg                                       = reg;
-        snprintf(chan->adapter.name, I2C_NAME_SIZE, "intelfb %s", name);
+        snprintf(chan->adapter.name, sizeof(chan->adapter.name),
+                 "intelfb %s", name);
         chan->adapter.owner                     = THIS_MODULE;
         chan->adapter.id                        = I2C_HW_B_INTELFB;
         chan->adapter.algo_data         = &chan->algo;
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 5ec718a5fe22..4baab7be58de 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -111,7 +111,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
         b->mask.data = data;
         b->mask.clock = clock;
         b->adapter = matrox_i2c_adapter_template;
-        snprintf(b->adapter.name, I2C_NAME_SIZE, name,
+        snprintf(b->adapter.name, sizeof(b->adapter.name), name,
                 minfo->fbcon.node);
         i2c_set_adapdata(&b->adapter, b);
         b->adapter.algo_data = &b->bac;
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 233871655824..e64f8b5d0056 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -28,7 +28,6 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/nvram.h>
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index a9ca4986645c..9756a728b74f 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -32,6 +32,8 @@
 #include <linux/ioctl.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
+#include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 #include <linux/fb.h>
@@ -45,7 +47,7 @@
 #include <asm/ps3.h>
 
 #ifdef PS3FB_DEBUG
-#define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ##args)
+#define DPRINTK(fmt, args...) printk("%s: " fmt, __func__ , ##args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
@@ -129,7 +131,6 @@ struct ps3fb_priv {
         u64 context_handle, memory_handle;
         void *xdr_ea;
         struct gpu_driver_info *dinfo;
-        struct semaphore sem;
         u32 res_index;
 
         u64 vblank_count;       /* frame count */
@@ -139,6 +140,8 @@ struct ps3fb_priv {
         atomic_t ext_flip;      /* on/off flip with vsync */
         atomic_t f_count;       /* fb_open count */
         int is_blanked;
+        int is_kicked;
+        struct task_struct *task;
 };
 static struct ps3fb_priv ps3fb;
 
@@ -294,10 +297,10 @@ static const struct fb_videomode ps3fb_modedb[] = {
 #define VP_OFF(i)       (WIDTH(i) * Y_OFF(i) * BPP + X_OFF(i) * BPP)
 #define FB_OFF(i)       (GPU_OFFSET - VP_OFF(i) % GPU_OFFSET)
 
-static int ps3fb_mode = 0;
+static int ps3fb_mode;
 module_param(ps3fb_mode, bool, 0);
 
-static char *mode_option __initdata = NULL;
+static char *mode_option __initdata;
 
 
 static int ps3fb_get_res_table(u32 xres, u32 yres)
@@ -393,7 +396,7 @@ static int ps3fb_sync(u32 frame)
 
         if (frame > ps3fb.num_frames - 1) {
                 printk(KERN_WARNING "%s: invalid frame number (%u)\n",
-                       __FUNCTION__, frame);
+                       __func__, frame);
                 return -EINVAL;
         }
         offset = xres * yres * BPP * frame;
@@ -406,23 +409,26 @@ static int ps3fb_sync(u32 frame)
                                            (xres << 16) | yres,
                                            xres * BPP); /* line_length */
         if (status)
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute FB_BLIT failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute FB_BLIT failed: %d\n",
+                       __func__, status);
 #ifdef HEAD_A
         status = lv1_gpu_context_attribute(ps3fb.context_handle,
                                            L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,
                                            0, offset, 0, 0);
         if (status)
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
+                       __func__, status);
 #endif
 #ifdef HEAD_B
         status = lv1_gpu_context_attribute(ps3fb.context_handle,
                                            L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,
                                            1, offset, 0, 0);
         if (status)
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
+                       __func__, status);
 #endif
         return 0;
 }
@@ -631,7 +637,7 @@ static int ps3fb_blank(int blank, struct fb_info *info)
 {
         int retval;
 
-        DPRINTK("%s: blank:%d\n", __FUNCTION__, blank);
+        DPRINTK("%s: blank:%d\n", __func__, blank);
         switch (blank) {
         case FB_BLANK_POWERDOWN:
         case FB_BLANK_HSYNC_SUSPEND:
@@ -677,13 +683,10 @@ EXPORT_SYMBOL_GPL(ps3fb_wait_for_vsync);
 
 void ps3fb_flip_ctl(int on)
 {
-        if (on) {
-                if (atomic_read(&ps3fb.ext_flip) > 0) {
-                        atomic_dec(&ps3fb.ext_flip);
-                }
-        } else {
+        if (on)
+                atomic_dec_if_positive(&ps3fb.ext_flip);
+        else
                 atomic_inc(&ps3fb.ext_flip);
-        }
 }
 
 EXPORT_SYMBOL_GPL(ps3fb_flip_ctl);
@@ -732,6 +735,11 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
                         if (copy_from_user(&val, argp, sizeof(val)))
                                 break;
 
+                        if (!(val & PS3AV_MODE_MASK)) {
+                                u32 id = ps3av_get_auto_mode(0);
+                                if (id > 0)
+                                        val = (val & ~PS3AV_MODE_MASK) | id;
+                        }
                         DPRINTK("PS3FB_IOCTL_SETMODE:%x\n", val);
                         retval = -EINVAL;
                         old_mode = ps3fb_mode;
@@ -783,8 +791,7 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
 
         case PS3FB_IOCTL_OFF:
                 DPRINTK("PS3FB_IOCTL_OFF:\n");
-                if (atomic_read(&ps3fb.ext_flip) > 0)
-                        atomic_dec(&ps3fb.ext_flip);
+                atomic_dec_if_positive(&ps3fb.ext_flip);
                 retval = 0;
                 break;
 
@@ -805,11 +812,14 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
 
 static int ps3fbd(void *arg)
 {
-        daemonize("ps3fbd");
-        for (;;) {
-                down(&ps3fb.sem);
-                if (atomic_read(&ps3fb.ext_flip) == 0)
+        while (!kthread_should_stop()) {
+                try_to_freeze();
+                set_current_state(TASK_INTERRUPTIBLE);
+                if (ps3fb.is_kicked) {
+                        ps3fb.is_kicked = 0;
                         ps3fb_sync(0);  /* single buffer */
+                }
+                schedule();
         }
         return 0;
 }
@@ -823,15 +833,18 @@ static irqreturn_t ps3fb_vsync_interrupt(int irq, void *ptr)
         status = lv1_gpu_context_intr(ps3fb.context_handle, &v1);
         if (status) {
                 printk(KERN_ERR "%s: lv1_gpu_context_intr failed: %d\n",
-                       __FUNCTION__, status);
+                       __func__, status);
                 return IRQ_NONE;
         }
 
         if (v1 & (1 << GPU_INTR_STATUS_VSYNC_1)) {
                 /* VSYNC */
                 ps3fb.vblank_count = head->vblank_count;
-                if (!ps3fb.is_blanked)
-                        up(&ps3fb.sem);
+                if (ps3fb.task && !ps3fb.is_blanked &&
+                    !atomic_read(&ps3fb.ext_flip)) {
+                        ps3fb.is_kicked = 1;
+                        wake_up_process(ps3fb.task);
+                }
                 wake_up_interruptible(&ps3fb.wait_vsync);
         }
 
@@ -879,7 +892,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
                 dinfo->nvcore_frequency/1000000, dinfo->memory_frequency/1000000);
 
         if (dinfo->version_driver != GPU_DRIVER_INFO_VERSION) {
-                printk(KERN_ERR "%s: version_driver err:%x\n", __FUNCTION__,
+                printk(KERN_ERR "%s: version_driver err:%x\n", __func__,
                        dinfo->version_driver);
                 return -EINVAL;
         }
@@ -888,7 +901,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
                                    &ps3fb.irq_no);
         if (error) {
-                printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __FUNCTION__,
+                printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__,
                        error);
                 return error;
         }
@@ -896,7 +909,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         error = request_irq(ps3fb.irq_no, ps3fb_vsync_interrupt, IRQF_DISABLED,
                             "ps3fb vsync", ps3fb.dev);
         if (error) {
-                printk(KERN_ERR "%s: request_irq failed %d\n", __FUNCTION__,
+                printk(KERN_ERR "%s: request_irq failed %d\n", __func__,
                        error);
                 ps3_irq_plug_destroy(ps3fb.irq_no);
                 return error;
@@ -915,7 +928,7 @@ static int ps3fb_xdr_settings(u64 xdr_lpar)
                                        xdr_lpar, ps3fb_videomemory.size, 0);
         if (status) {
                 printk(KERN_ERR "%s: lv1_gpu_context_iomap failed: %d\n",
-                       __FUNCTION__, status);
+                       __func__, status);
                 return -ENXIO;
         }
         DPRINTK("video:%p xdr_ea:%p ioif:%lx lpar:%lx phys:%lx size:%lx\n",
@@ -927,8 +940,9 @@ static int ps3fb_xdr_settings(u64 xdr_lpar)
                                            xdr_lpar, ps3fb_videomemory.size,
                                            GPU_IOIF, 0);
         if (status) {
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute FB_SETUP failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute FB_SETUP failed: %d\n",
+                       __func__, status);
                 return -ENXIO;
         }
         return 0;
@@ -968,13 +982,14 @@ static int __init ps3fb_probe(struct platform_device *dev)
         u64 xdr_lpar;
         int status;
         unsigned long offset;
+        struct task_struct *task;
 
         /* get gpu context handle */
         status = lv1_gpu_memory_allocate(DDR_SIZE, 0, 0, 0, 0,
                                          &ps3fb.memory_handle, &ddr_lpar);
         if (status) {
                 printk(KERN_ERR "%s: lv1_gpu_memory_allocate failed: %d\n",
-                       __FUNCTION__, status);
+                       __func__, status);
                 goto err;
         }
         DPRINTK("ddr:lpar:0x%lx\n", ddr_lpar);
@@ -985,14 +1000,14 @@ static int __init ps3fb_probe(struct platform_device *dev)
                                           &lpar_reports, &lpar_reports_size);
         if (status) {
                 printk(KERN_ERR "%s: lv1_gpu_context_attribute failed: %d\n",
-                       __FUNCTION__, status);
+                       __func__, status);
                 goto err_gpu_memory_free;
         }
 
         /* vsync interrupt */
         ps3fb.dinfo = ioremap(lpar_driver_info, 128 * 1024);
         if (!ps3fb.dinfo) {
-                printk(KERN_ERR "%s: ioremap failed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: ioremap failed\n", __func__);
                 goto err_gpu_context_free;
         }
 
@@ -1050,9 +1065,18 @@ static int __init ps3fb_probe(struct platform_device *dev)
                "fb%d: PS3 frame buffer device, using %ld KiB of video memory\n",
                info->node, ps3fb_videomemory.size >> 10);
 
-        kernel_thread(ps3fbd, info, CLONE_KERNEL);
+        task = kthread_run(ps3fbd, info, "ps3fbd");
+        if (IS_ERR(task)) {
+                retval = PTR_ERR(task);
+                goto err_unregister_framebuffer;
+        }
+
+        ps3fb.task = task;
+
         return 0;
 
+err_unregister_framebuffer:
+        unregister_framebuffer(info);
 err_fb_dealloc:
         fb_dealloc_cmap(&info->cmap);
 err_framebuffer_release:
@@ -1083,6 +1107,11 @@ void ps3fb_cleanup(void)
 {
         int status;
 
+        if (ps3fb.task) {
+                struct task_struct *task = ps3fb.task;
+                ps3fb.task = NULL;
+                kthread_stop(task);
+        }
         if (ps3fb.irq_no) {
                 free_irq(ps3fb.irq_no, ps3fb.dev);
                 ps3_irq_plug_destroy(ps3fb.irq_no);
@@ -1137,8 +1166,9 @@ int ps3fb_set_sync(void)
                                            L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC,
                                            0, L1GPU_DISPLAY_SYNC_VSYNC, 0, 0);
         if (status) {
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute DISPLAY_SYNC failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute DISPLAY_SYNC failed: %d\n",
+                       __func__, status);
                 return -1;
         }
 #endif
@@ -1148,8 +1178,9 @@ int ps3fb_set_sync(void)
                                            1, L1GPU_DISPLAY_SYNC_VSYNC, 0, 0);
 
         if (status) {
-                printk(KERN_ERR "%s: lv1_gpu_context_attribute DISPLAY_MODE failed: %d\n",
-                       __FUNCTION__, status);
+                printk(KERN_ERR
+                       "%s: lv1_gpu_context_attribute DISPLAY_MODE failed: %d\n",
+                       __func__, status);
                 return -1;
         }
 #endif
@@ -1174,7 +1205,7 @@ static int __init ps3fb_init(void)
 
         error = ps3av_dev_open();
         if (error) {
-                printk(KERN_ERR "%s: ps3av_dev_open failed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: ps3av_dev_open failed\n", __func__);
                 goto err;
         }
 
@@ -1195,7 +1226,6 @@ static int __init ps3fb_init(void)
 
         atomic_set(&ps3fb.f_count, -1); /* fbcon opens ps3fb */
         atomic_set(&ps3fb.ext_flip, 0); /* for flip with vsync */
-        init_MUTEX(&ps3fb.sem);
         init_waitqueue_head(&ps3fb.wait_vsync);
         ps3fb.num_frames = 1;
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index b4947c810706..0b195f33f84f 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -803,7 +803,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
         pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
         /* enable LCD controller clock */
-        pxa_set_cken(CKEN16_LCD, 1);
+        pxa_set_cken(CKEN_LCD, 1);
 
         /* Sequence from 11.7.10 */
         LCCR3 = fbi->reg_lccr3;
@@ -840,7 +840,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
         remove_wait_queue(&fbi->ctrlr_wait, &wait);
 
         /* disable LCD controller clock */
-        pxa_set_cken(CKEN16_LCD, 0);
+        pxa_set_cken(CKEN_LCD, 0);
 }
 
 /*
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 69f3b264a22e..c97709ecbad0 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -64,7 +64,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/pci.h>
 
 #include <asm/grfioctl.h>       /* for HP-UX compatibility */
 #include <asm/uaccess.h>
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c
new file mode 100644
index 000000000000..4316c7fe8e21
--- /dev/null
+++ b/drivers/video/sunxvr2500.c
@@ -0,0 +1,277 @@
+/* s3d.c: Sun 3DLABS XVR-2500 et al. driver for sparc64 systems
+ *
+ * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
+
+struct s3d_info {
+        struct fb_info          *info;
+        struct pci_dev          *pdev;
+
+        char __iomem            *fb_base;
+        unsigned long           fb_base_phys;
+
+        struct device_node      *of_node;
+
+        unsigned int            width;
+        unsigned int            height;
+        unsigned int            depth;
+        unsigned int            fb_size;
+
+        u32                     pseudo_palette[256];
+};
+
+static int __devinit s3d_get_props(struct s3d_info *sp)
+{
+        sp->width = of_getintprop_default(sp->of_node, "width", 0);
+        sp->height = of_getintprop_default(sp->of_node, "height", 0);
+        sp->depth = of_getintprop_default(sp->of_node, "depth", 8);
+
+        if (!sp->width || !sp->height) {
+                printk(KERN_ERR "s3d: Critical properties missing for %s\n",
+                       pci_name(sp->pdev));
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int s3d_setcolreg(unsigned regno,
+                         unsigned red, unsigned green, unsigned blue,
+                         unsigned transp, struct fb_info *info)
+{
+        u32 value;
+
+        if (regno >= 256)
+                return 1;
+
+        red >>= 8;
+        green >>= 8;
+        blue >>= 8;
+
+        value = (blue << 24) | (green << 16) | (red << 8);
+        ((u32 *)info->pseudo_palette)[regno] = value;
+
+        return 0;
+}
+
+static struct fb_ops s3d_ops = {
+        .owner                  = THIS_MODULE,
+        .fb_setcolreg           = s3d_setcolreg,
+        .fb_fillrect            = cfb_fillrect,
+        .fb_copyarea            = cfb_copyarea,
+        .fb_imageblit           = cfb_imageblit,
+};
+
+static int __devinit s3d_set_fbinfo(struct s3d_info *sp)
+{
+        struct fb_info *info = sp->info;
+        struct fb_var_screeninfo *var = &info->var;
+
+        info->flags = FBINFO_DEFAULT;
+        info->fbops = &s3d_ops;
+        info->screen_base = sp->fb_base;
+        info->screen_size = sp->fb_size;
+
+        info->pseudo_palette = sp->pseudo_palette;
+
+        /* Fill fix common fields */
+        strlcpy(info->fix.id, "s3d", sizeof(info->fix.id));
+        info->fix.smem_start = sp->fb_base_phys;
+        info->fix.smem_len = sp->fb_size;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        if (sp->depth == 32 || sp->depth == 24)
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        else
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+
+        var->xres = sp->width;
+        var->yres = sp->height;
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+        var->bits_per_pixel = sp->depth;
+
+        var->red.offset = 8;
+        var->red.length = 8;
+        var->green.offset = 16;
+        var->green.length = 8;
+        var->blue.offset = 24;
+        var->blue.length = 8;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0)) {
+                printk(KERN_ERR "s3d: Cannot allocate color map.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static int __devinit s3d_pci_register(struct pci_dev *pdev,
+                                      const struct pci_device_id *ent)
+{
+        struct fb_info *info;
+        struct s3d_info *sp;
+        int err;
+
+        err = pci_enable_device(pdev);
+        if (err < 0) {
+                printk(KERN_ERR "s3d: Cannot enable PCI device %s\n",
+                       pci_name(pdev));
+                goto err_out;
+        }
+
+        info = framebuffer_alloc(sizeof(struct s3d_info), &pdev->dev);
+        if (!info) {
+                printk(KERN_ERR "s3d: Cannot allocate fb_info\n");
+                err = -ENOMEM;
+                goto err_disable;
+        }
+
+        sp = info->par;
+        sp->info = info;
+        sp->pdev = pdev;
+        sp->of_node = pci_device_to_OF_node(pdev);
+        if (!sp->of_node) {
+                printk(KERN_ERR "s3d: Cannot find OF node of %s\n",
+                       pci_name(pdev));
+                err = -ENODEV;
+                goto err_release_fb;
+        }
+
+        sp->fb_base_phys = pci_resource_start (pdev, 1);
+
+        err = pci_request_region(pdev, 1, "s3d framebuffer");
+        if (err < 0) {
+                printk("s3d: Cannot request region 1 for %s\n",
+                       pci_name(pdev));
+                goto err_release_fb;
+        }
+
+        err = s3d_get_props(sp);
+        if (err)
+                goto err_release_pci;
+
+        /* XXX 'linebytes' is often wrong, it is equal to the width
+         * XXX with depth of 32 on my XVR-2500 which is clearly not
+         * XXX right.  So we don't try to use it.
+         */
+        switch (sp->depth) {
+        case 8:
+                info->fix.line_length = sp->width;
+                break;
+        case 16:
+                info->fix.line_length = sp->width * 2;
+                break;
+        case 24:
+                info->fix.line_length = sp->width * 3;
+                break;
+        case 32:
+                info->fix.line_length = sp->width * 4;
+                break;
+        }
+        sp->fb_size = info->fix.line_length * sp->height;
+
+        sp->fb_base = ioremap(sp->fb_base_phys, sp->fb_size);
+        if (!sp->fb_base)
+                goto err_release_pci;
+
+        err = s3d_set_fbinfo(sp);
+        if (err)
+                goto err_unmap_fb;
+
+        pci_set_drvdata(pdev, info);
+
+        printk("s3d: Found device at %s\n", pci_name(pdev));
+
+        err = register_framebuffer(info);
+        if (err < 0) {
+                printk(KERN_ERR "s3d: Could not register framebuffer %s\n",
+                       pci_name(pdev));
+                goto err_unmap_fb;
+        }
+
+        return 0;
+
+err_unmap_fb:
+        iounmap(sp->fb_base);
+
+err_release_pci:
+        pci_release_region(pdev, 1);
+
+err_release_fb:
+        framebuffer_release(info);
+
+err_disable:
+        pci_disable_device(pdev);
+
+err_out:
+        return err;
+}
+
+static void __devexit s3d_pci_unregister(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        struct s3d_info *sp = info->par;
+
+        unregister_framebuffer(info);
+
+        iounmap(sp->fb_base);
+
+        pci_release_region(pdev, 1);
+
+        framebuffer_release(info);
+
+        pci_disable_device(pdev);
+}
+
+static struct pci_device_id s3d_pci_table[] = {
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002e),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002f),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0030),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0031),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032),       },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0033),       },
+        { 0, }
+};
+
+static struct pci_driver s3d_driver = {
+        .name           = "s3d",
+        .id_table       = s3d_pci_table,
+        .probe          = s3d_pci_register,
+        .remove         = __devexit_p(s3d_pci_unregister),
+};
+
+static int __init s3d_init(void)
+{
+        if (fb_get_options("s3d", NULL))
+                return -ENODEV;
+
+        return pci_register_driver(&s3d_driver);
+}
+
+static void __exit s3d_exit(void)
+{
+        pci_unregister_driver(&s3d_driver);
+}
+
+module_init(s3d_init);
+module_exit(s3d_exit);
+
+MODULE_DESCRIPTION("framebuffer driver for Sun XVR-2500 graphics");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
new file mode 100644
index 000000000000..08880a62bfa3
--- /dev/null
+++ b/drivers/video/sunxvr500.c
@@ -0,0 +1,443 @@
+/* sunxvr500.c: Sun 3DLABS XVR-500 Expert3D driver for sparc64 systems
+ *
+ * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
+
+/* XXX This device has a 'dev-comm' property which aparently is
+ * XXX a pointer into the openfirmware's address space which is
+ * XXX a shared area the kernel driver can use to keep OBP
+ * XXX informed about the current resolution setting.  The idea
+ * XXX is that the kernel can change resolutions, and as long
+ * XXX as the values in the 'dev-comm' area are accurate then
+ * XXX OBP can still render text properly to the console.
+ * XXX
+ * XXX I'm still working out the layout of this and whether there
+ * XXX are any signatures we need to look for etc.
+ */
+struct e3d_info {
+        struct fb_info          *info;
+        struct pci_dev          *pdev;
+
+        spinlock_t              lock;
+
+        char __iomem            *fb_base;
+        unsigned long           fb_base_phys;
+
+        unsigned long           fb8_buf_diff;
+        unsigned long           regs_base_phys;
+
+        void __iomem            *ramdac;
+
+        struct device_node      *of_node;
+
+        unsigned int            width;
+        unsigned int            height;
+        unsigned int            depth;
+        unsigned int            fb_size;
+
+        u32                     fb_base_reg;
+        u32                     fb8_0_off;
+        u32                     fb8_1_off;
+
+        u32                     pseudo_palette[256];
+};
+
+static int __devinit e3d_get_props(struct e3d_info *ep)
+{
+        ep->width = of_getintprop_default(ep->of_node, "width", 0);
+        ep->height = of_getintprop_default(ep->of_node, "height", 0);
+        ep->depth = of_getintprop_default(ep->of_node, "depth", 8);
+
+        if (!ep->width || !ep->height) {
+                printk(KERN_ERR "e3d: Critical properties missing for %s\n",
+                       pci_name(ep->pdev));
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* My XVR-500 comes up, at 1280x768 and a FB base register value of
+ * 0x04000000, the following video layout register values:
+ *
+ * RAMDAC_VID_WH        0x03ff04ff
+ * RAMDAC_VID_CFG       0x1a0b0088
+ * RAMDAC_VID_32FB_0    0x04000000
+ * RAMDAC_VID_32FB_1    0x04800000
+ * RAMDAC_VID_8FB_0     0x05000000
+ * RAMDAC_VID_8FB_1     0x05200000
+ * RAMDAC_VID_XXXFB     0x05400000
+ * RAMDAC_VID_YYYFB     0x05c00000
+ * RAMDAC_VID_ZZZFB     0x05e00000
+ */
+/* Video layout registers */
+#define RAMDAC_VID_WH           0x00000070UL /* (height-1)<<16 | (width-1) */
+#define RAMDAC_VID_CFG          0x00000074UL /* 0x1a000088|(linesz_log2<<16) */
+#define RAMDAC_VID_32FB_0       0x00000078UL /* PCI base 32bpp FB buffer 0 */
+#define RAMDAC_VID_32FB_1       0x0000007cUL /* PCI base 32bpp FB buffer 1 */
+#define RAMDAC_VID_8FB_0        0x00000080UL /* PCI base 8bpp FB buffer 0 */
+#define RAMDAC_VID_8FB_1        0x00000084UL /* PCI base 8bpp FB buffer 1 */
+#define RAMDAC_VID_XXXFB        0x00000088UL /* PCI base of XXX FB */
+#define RAMDAC_VID_YYYFB        0x0000008cUL /* PCI base of YYY FB */
+#define RAMDAC_VID_ZZZFB        0x00000090UL /* PCI base of ZZZ FB */
+
+/* CLUT registers */
+#define RAMDAC_INDEX            0x000000bcUL
+#define RAMDAC_DATA             0x000000c0UL
+
+static void e3d_clut_write(struct e3d_info *ep, int index, u32 val)
+{
+        void __iomem *ramdac = ep->ramdac;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ep->lock, flags);
+
+        writel(index, ramdac + RAMDAC_INDEX);
+        writel(val, ramdac + RAMDAC_DATA);
+
+        spin_unlock_irqrestore(&ep->lock, flags);
+}
+
+static int e3d_setcolreg(unsigned regno,
+                         unsigned red, unsigned green, unsigned blue,
+                         unsigned transp, struct fb_info *info)
+{
+        struct e3d_info *ep = info->par;
+        u32 red_8, green_8, blue_8;
+        u32 red_10, green_10, blue_10;
+        u32 value;
+
+        if (regno >= 256)
+                return 1;
+
+        red_8 = red >> 8;
+        green_8 = green >> 8;
+        blue_8 = blue >> 8;
+
+        value = (blue_8 << 24) | (green_8 << 16) | (red_8 << 8);
+        ((u32 *)info->pseudo_palette)[regno] = value;
+
+
+        red_10 = red >> 6;
+        green_10 = green >> 6;
+        blue_10 = blue >> 6;
+
+        value = (blue_10 << 20) | (green_10 << 10) | (red_10 << 0);
+        e3d_clut_write(ep, regno, value);
+
+        return 0;
+}
+
+/* XXX This is a bit of a hack.  I can't figure out exactly how the
+ * XXX two 8bpp areas of the framebuffer work.  I imagine there is
+ * XXX a WID attribute somewhere else in the framebuffer which tells
+ * XXX the ramdac which of the two 8bpp framebuffer regions to take
+ * XXX the pixel from.  So, for now, render into both regions to make
+ * XXX sure the pixel shows up.
+ */
+static void e3d_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        struct e3d_info *ep = info->par;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ep->lock, flags);
+        cfb_imageblit(info, image);
+        info->screen_base += ep->fb8_buf_diff;
+        cfb_imageblit(info, image);
+        info->screen_base -= ep->fb8_buf_diff;
+        spin_unlock_irqrestore(&ep->lock, flags);
+}
+
+static void e3d_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        struct e3d_info *ep = info->par;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ep->lock, flags);
+        cfb_fillrect(info, rect);
+        info->screen_base += ep->fb8_buf_diff;
+        cfb_fillrect(info, rect);
+        info->screen_base -= ep->fb8_buf_diff;
+        spin_unlock_irqrestore(&ep->lock, flags);
+}
+
+static void e3d_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+        struct e3d_info *ep = info->par;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ep->lock, flags);
+        cfb_copyarea(info, area);
+        info->screen_base += ep->fb8_buf_diff;
+        cfb_copyarea(info, area);
+        info->screen_base -= ep->fb8_buf_diff;
+        spin_unlock_irqrestore(&ep->lock, flags);
+}
+
+static struct fb_ops e3d_ops = {
+        .owner                  = THIS_MODULE,
+        .fb_setcolreg           = e3d_setcolreg,
+        .fb_fillrect            = e3d_fillrect,
+        .fb_copyarea            = e3d_copyarea,
+        .fb_imageblit           = e3d_imageblit,
+};
+
+static int __devinit e3d_set_fbinfo(struct e3d_info *ep)
+{
+        struct fb_info *info = ep->info;
+        struct fb_var_screeninfo *var = &info->var;
+
+        info->flags = FBINFO_DEFAULT;
+        info->fbops = &e3d_ops;
+        info->screen_base = ep->fb_base;
+        info->screen_size = ep->fb_size;
+
+        info->pseudo_palette = ep->pseudo_palette;
+
+        /* Fill fix common fields */
+        strlcpy(info->fix.id, "e3d", sizeof(info->fix.id));
+        info->fix.smem_start = ep->fb_base_phys;
+        info->fix.smem_len = ep->fb_size;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        if (ep->depth == 32 || ep->depth == 24)
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        else
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+
+        var->xres = ep->width;
+        var->yres = ep->height;
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+        var->bits_per_pixel = ep->depth;
+
+        var->red.offset = 8;
+        var->red.length = 8;
+        var->green.offset = 16;
+        var->green.length = 8;
+        var->blue.offset = 24;
+        var->blue.length = 8;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0)) {
+                printk(KERN_ERR "e3d: Cannot allocate color map.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static int __devinit e3d_pci_register(struct pci_dev *pdev,
+                                      const struct pci_device_id *ent)
+{
+        struct fb_info *info;
+        struct e3d_info *ep;
+        unsigned int line_length;
+        int err;
+
+        err = pci_enable_device(pdev);
+        if (err < 0) {
+                printk(KERN_ERR "e3d: Cannot enable PCI device %s\n",
+                       pci_name(pdev));
+                goto err_out;
+        }
+
+        info = framebuffer_alloc(sizeof(struct e3d_info), &pdev->dev);
+        if (!info) {
+                printk(KERN_ERR "e3d: Cannot allocate fb_info\n");
+                err = -ENOMEM;
+                goto err_disable;
+        }
+
+        ep = info->par;
+        ep->info = info;
+        ep->pdev = pdev;
+        spin_lock_init(&ep->lock);
+        ep->of_node = pci_device_to_OF_node(pdev);
+        if (!ep->of_node) {
+                printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
+                       pci_name(pdev));
+                err = -ENODEV;
+                goto err_release_fb;
+        }
+
+        /* Read the PCI base register of the frame buffer, which we
+         * need in order to interpret the RAMDAC_VID_*FB* values in
+         * the ramdac correctly.
+         */
+        pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0,
+                              &ep->fb_base_reg);
+        ep->fb_base_reg &= PCI_BASE_ADDRESS_MEM_MASK;
+
+        ep->regs_base_phys = pci_resource_start (pdev, 1);
+        err = pci_request_region(pdev, 1, "e3d regs");
+        if (err < 0) {
+                printk("e3d: Cannot request region 1 for %s\n",
+                       pci_name(pdev));
+                goto err_release_fb;
+        }
+        ep->ramdac = ioremap(ep->regs_base_phys + 0x8000, 0x1000);
+        if (!ep->ramdac)
+                goto err_release_pci1;
+
+        ep->fb8_0_off = readl(ep->ramdac + RAMDAC_VID_8FB_0);
+        ep->fb8_0_off -= ep->fb_base_reg;
+
+        ep->fb8_1_off = readl(ep->ramdac + RAMDAC_VID_8FB_1);
+        ep->fb8_1_off -= ep->fb_base_reg;
+
+        ep->fb8_buf_diff = ep->fb8_1_off - ep->fb8_0_off;
+
+        ep->fb_base_phys = pci_resource_start (pdev, 0);
+        ep->fb_base_phys += ep->fb8_0_off;
+
+        err = pci_request_region(pdev, 0, "e3d framebuffer");
+        if (err < 0) {
+                printk("e3d: Cannot request region 0 for %s\n",
+                       pci_name(pdev));
+                goto err_unmap_ramdac;
+        }
+
+        err = e3d_get_props(ep);
+        if (err)
+                goto err_release_pci0;
+
+        line_length = (readl(ep->ramdac + RAMDAC_VID_CFG) >> 16) & 0xff;
+        line_length = 1 << line_length;
+
+        switch (ep->depth) {
+        case 8:
+                info->fix.line_length = line_length;
+                break;
+        case 16:
+                info->fix.line_length = line_length * 2;
+                break;
+        case 24:
+                info->fix.line_length = line_length * 3;
+                break;
+        case 32:
+                info->fix.line_length = line_length * 4;
+                break;
+        }
+        ep->fb_size = info->fix.line_length * ep->height;
+
+        ep->fb_base = ioremap(ep->fb_base_phys, ep->fb_size);
+        if (!ep->fb_base)
+                goto err_release_pci0;
+
+        err = e3d_set_fbinfo(ep);
+        if (err)
+                goto err_unmap_fb;
+
+        pci_set_drvdata(pdev, info);
+
+        printk("e3d: Found device at %s\n", pci_name(pdev));
+
+        err = register_framebuffer(info);
+        if (err < 0) {
+                printk(KERN_ERR "e3d: Could not register framebuffer %s\n",
+                       pci_name(pdev));
+                goto err_unmap_fb;
+        }
+
+        return 0;
+
+err_unmap_fb:
+        iounmap(ep->fb_base);
+
+err_release_pci0:
+        pci_release_region(pdev, 0);
+
+err_unmap_ramdac:
+        iounmap(ep->ramdac);
+
+err_release_pci1:
+        pci_release_region(pdev, 1);
+
+err_release_fb:
+        framebuffer_release(info);
+
+err_disable:
+        pci_disable_device(pdev);
+
+err_out:
+        return err;
+}
+
+static void __devexit e3d_pci_unregister(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        struct e3d_info *ep = info->par;
+
+        unregister_framebuffer(info);
+
+        iounmap(ep->ramdac);
+        iounmap(ep->fb_base);
+
+        pci_release_region(pdev, 0);
+        pci_release_region(pdev, 1);
+
+        framebuffer_release(info);
+
+        pci_disable_device(pdev);
+}
+
+static struct pci_device_id e3d_pci_table[] = {
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0),        },
+        {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2),        },
+        {       .vendor = PCI_VENDOR_ID_3DLABS,
+                .device = PCI_ANY_ID,
+                .subvendor = PCI_VENDOR_ID_3DLABS,
+                .subdevice = 0x0108,
+        },
+        {       .vendor = PCI_VENDOR_ID_3DLABS,
+                .device = PCI_ANY_ID,
+                .subvendor = PCI_VENDOR_ID_3DLABS,
+                .subdevice = 0x0140,
+        },
+        {       .vendor = PCI_VENDOR_ID_3DLABS,
+                .device = PCI_ANY_ID,
+                .subvendor = PCI_VENDOR_ID_3DLABS,
+                .subdevice = 0x1024,
+        },
+        { 0, }
+};
+
+static struct pci_driver e3d_driver = {
+        .name           = "e3d",
+        .id_table       = e3d_pci_table,
+        .probe          = e3d_pci_register,
+        .remove         = __devexit_p(e3d_pci_unregister),
+};
+
+static int __init e3d_init(void)
+{
+        if (fb_get_options("e3d", NULL))
+                return -ENODEV;
+
+        return pci_register_driver(&e3d_driver);
+}
+
+static void __exit e3d_exit(void)
+{
+        pci_unregister_driver(&e3d_driver);
+}
+
+module_init(e3d_init);
+module_exit(e3d_exit);
+
+MODULE_DESCRIPTION("framebuffer driver for Sun XVR-500 graphics");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 06fc19a61192..ad66f070acb8 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -51,7 +51,6 @@
 #include <linux/fb.h>
 #include <linux/selection.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/nvram.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index b3ce8859a586..2ce4cebc31d9 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -90,8 +90,9 @@ get_zorro_dev_info(char *buf, char **start, off_t pos, int count)
         for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) {
                 struct zorro_dev *z = &zorro_autocon[slot];
                 len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot,
-                              z->id, zorro_resource_start(z),
-                              zorro_resource_len(z), z->rom.er_Type);
+                              z->id, (unsigned long)zorro_resource_start(z),
+                              (unsigned long)zorro_resource_len(z),
+                              z->rom.er_Type);
                 at += len;
                 if (at >= pos) {
                         if (!*start) {
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 87c29d7b6c17..c3ba0ec334c4 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -42,7 +42,8 @@ static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *
         struct zorro_dev *z = to_zorro_dev(dev);
 
         return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n",
-                       zorro_resource_start(z), zorro_resource_end(z),
+                       (unsigned long)zorro_resource_start(z),
+                       (unsigned long)zorro_resource_end(z),
                        zorro_resource_flags(z));
 }
 
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 0f2b40605b06..4cc42b64820c 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -164,7 +164,8 @@ static int __init zorro_init(void)
         if (request_resource(zorro_find_parent_resource(z), &z->resource))
             printk(KERN_ERR "Zorro: Address space collision on device %s "
                    "[%lx:%lx]\n",
-                   z->name, zorro_resource_start(z), zorro_resource_end(z));
+                   z->name, (unsigned long)zorro_resource_start(z),
+                   (unsigned long)zorro_resource_end(z));
         sprintf(z->dev.bus_id, "%02x", i);
         z->dev.parent = &zorro_bus.dev;
         z->dev.bus = &zorro_bus_type;