155 files changed, 3658 insertions, 3533 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index caebd0a1c02..6a901a0268e 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,12 +1,12 @@
 config VIDEO_SAA7146
-        tristate
+        tristate
        select I2C
 config VIDEO_SAA7146_VV
-        tristate
+        tristate
        select VIDEO_BUF
        select VIDEO_VIDEOBUF
        select VIDEO_SAA7146
 config VIDEO_VIDEOBUF
-        tristate
+        tristate
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 97b4341255e..bd458cb9b4e 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,5 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o 
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o  
+saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
 obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
 obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 7972c73bc14..97fa3fc571c 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -313,6 +313,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
        if (ir_codes)
                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
        dev->keycode     = ir->ir_codes;
        dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
        dev->keycodemax  = IR_KEYTAB_SIZE;
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 206cc2f61f2..2899d34e5f7 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -174,8 +174,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
 {
-        u32          *cpu;
+        u32          *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr;
        cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr);
        if (NULL == cpu) {
@@ -405,7 +405,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        pci_set_drvdata(pci, dev);
-        init_MUTEX(&dev->lock);
+        init_MUTEX(&dev->lock);
        spin_lock_init(&dev->int_slock);
        spin_lock_init(&dev->slock);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 37888989ea2..09ec964dec5 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,6 +1,6 @@
 #include <media/saa7146_vv.h>
-#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 
+#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
@@ -102,9 +102,9 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
        /* finish current buffer */
        if (NULL == q->curr) {
                DEB_D(("aiii. no current buffer\n"));
-                return; 
+                return;
        }
-                        
        q->curr->vb.state = state;
        do_gettimeofday(&q->curr->vb.ts);
        wake_up(&q->curr->vb.done);
@@ -143,13 +143,13 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
                        // fixme: fix this for vflip != 0
                        saa7146_write(dev, PROT_ADDR1, 0);
-                        saa7146_write(dev, MC2, (MASK_02|MASK_18));             
+                        saa7146_write(dev, MC2, (MASK_02|MASK_18));
                        /* write the address of the rps-program */
                        saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
                        /* turn on rps */
                        saa7146_write(dev, MC1, (MASK_12 | MASK_28));
-                                
 /*
                        printk("vdma%d.base_even:     0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1));
                        printk("vdma%d.base_odd:      0x%08x\n", 1,saa7146_read(dev,BASE_ODD1));
@@ -246,7 +246,7 @@ static int fops_open(struct inode *inode, struct file *file)
                goto out;
        }
        memset(fh,0,sizeof(*fh));
-        
        file->private_data = fh;
        fh->dev = dev;
        fh->type = type;
@@ -275,7 +275,7 @@ out:
                file->private_data = NULL;
        }
        up(&saa7146_devices_lock);
-        return result;
+        return result;
 }
 static int fops_release(struct inode *inode, struct file *file)
@@ -405,7 +405,7 @@ static struct file_operations video_fops =
 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
        u32 isr = status;
-        
        DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
        if (0 != (isr & (MASK_27))) {
@@ -454,11 +454,11 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
           handle different devices that might need different
           configuration data) */
        dev->ext_vv_data = ext_vv;
-        
        vv->video_minor = -1;
        vv->vbi_minor = -1;
-        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);     
+        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
        if( NULL == vv->d_clipping.cpu_addr ) {
                ERR(("out of memory. aborting.\n"));
                kfree(vv);
@@ -468,7 +468,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
        saa7146_video_uops.init(dev,vv);
        saa7146_vbi_uops.init(dev,vv);
-        
        dev->vv_data = vv;
        dev->vv_callback = &vv_callback;
@@ -480,12 +480,12 @@ int saa7146_vv_release(struct saa7146_dev* dev)
        struct saa7146_vv *vv = dev->vv_data;
        DEB_EE(("dev:%p\n",dev));
- 
        pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
-        kfree(vv);
+        kfree(vv);
        dev->vv_data = NULL;
        dev->vv_callback = NULL;
-        
        return 0;
 }
@@ -498,7 +498,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
        // released by vfd->release
-        vfd = video_device_alloc();
+        vfd = video_device_alloc();
        if (vfd == NULL)
                return -ENOMEM;
@@ -530,7 +530,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
-        
        DEB_EE(("dev:%p\n",dev));
        if( VFL_TYPE_GRABBER == (*vid)->type ) {
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index fec6beab8c2..8aabdd8fb3c 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -276,8 +276,8 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
        int i = 0, count = 0;
        u32* buffer = dev->d_i2c.cpu_addr;
        int err = 0;
-        int address_err = 0;
+        int address_err = 0;
-        int short_delay = 0;
+        int short_delay = 0;
        if (down_interruptible (&dev->i2c_lock))
                return -ERESTARTSYS;
@@ -325,7 +325,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                                        if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
                                                goto out;
                                        }
-                                        address_err++;
+                                        address_err++;
                                }
                                DEB_I2C(("error while sending message(s). starting again.\n"));
                                break;
@@ -336,14 +336,14 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                        break;
                }
-                /* delay a bit before retrying */
+                /* delay a bit before retrying */
-                msleep(10);
+                msleep(10);
        } while (err != num && retries--);
-        /* if every retry had an address error, exit right away */
+        /* if every retry had an address error, exit right away */
-        if (address_err == retries) {
+        if (address_err == retries) {
-                goto out;
+                goto out;
        }
        /* if any things had to be read, get the results */
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index cb86a97fda1..063986ec16b 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -6,8 +6,8 @@ static int vbi_workaround(struct saa7146_dev *dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
-        u32          *cpu;
+        u32          *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr;
        int count = 0;
        int i;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 8dd4d15ca36..1d961023b83 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -150,23 +150,23 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
        maxh  = vv->standard->v_max_out;
        if (V4L2_FIELD_ANY == field) {
-                field = (win->w.height > maxh/2)
+                field = (win->w.height > maxh/2)
-                        ? V4L2_FIELD_INTERLACED
+                        ? V4L2_FIELD_INTERLACED
-                        : V4L2_FIELD_TOP;
+                        : V4L2_FIELD_TOP;
-                }
+                }
-        switch (field) {
+        switch (field) {
-        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_TOP:
-        case V4L2_FIELD_BOTTOM:
+        case V4L2_FIELD_BOTTOM:
-        case V4L2_FIELD_ALTERNATE:
+        case V4L2_FIELD_ALTERNATE:
-                maxh = maxh / 2;
+                maxh = maxh / 2;
-                break;
+                break;
-        case V4L2_FIELD_INTERLACED:
+        case V4L2_FIELD_INTERLACED:
-                break;
+                break;
-        default: {
+        default: {
                DEB_D(("no known field mode '%d'.\n",field));
-                return -EINVAL;
+                return -EINVAL;
+        }
        }
-        }
        win->field = field;
        if (win->w.width > maxw)
@@ -887,7 +887,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                DEB_EE(("VIDIOC_QUERYCAP\n"));
-                strcpy(cap->driver, "saa7146 v4l2");
+                strcpy(cap->driver, "saa7146 v4l2");
                strlcpy(cap->card, dev->ext->name, sizeof(cap->card));
                sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
                cap->version = SAA7146_VERSION_CODE;
@@ -1011,19 +1011,19 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                err = set_control(fh,arg);
                return err;
        }
-        case VIDIOC_G_PARM:
+        case VIDIOC_G_PARM:
-        {
+        {
-                struct v4l2_streamparm *parm = arg;
+                struct v4l2_streamparm *parm = arg;
                if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) {
                        return -EINVAL;
                }
-                memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
+                memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
                parm->parm.capture.readbuffers = 1;
                // fixme: only for PAL!
                parm->parm.capture.timeperframe.numerator = 1;
                parm->parm.capture.timeperframe.denominator = 25;
-                return 0;
+                return 0;
-        }
+        }
        case VIDIOC_G_FMT:
        {
                struct v4l2_format *f = arg;
@@ -1383,7 +1383,7 @@ static struct videobuf_queue_ops video_qops = {
 static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
-        INIT_LIST_HEAD(&vv->video_q.queue);
+        INIT_LIST_HEAD(&vv->video_q.queue);
        init_timer(&vv->video_q.timeout);
        vv->video_q.timeout.function = saa7146_buffer_timeout;
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h
index a94912ac187..344a3c89846 100644
--- a/drivers/media/dvb/b2c2/flexcop-common.h
+++ b/drivers/media/dvb/b2c2/flexcop-common.h
@@ -132,7 +132,7 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended);
 * I2C-channel of the flexcop.
 */
 int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t,
-                        flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
+                        flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
 /* from flexcop-sram.c */
 int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target);
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index a35330315f6..21a9045b3ef 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -298,7 +298,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
 }
 static int lgdt3303_pll_set(struct dvb_frontend* fe,
-                            struct dvb_frontend_parameters* params)
+                            struct dvb_frontend_parameters* params)
 {
        struct flexcop_device *fc = fe->dvb->priv;
        u8 buf[4];
@@ -332,7 +332,7 @@ static int lgdt3303_pll_set(struct dvb_frontend* fe,
                        return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static struct lgdt330x_config air2pc_atsc_hd5000_config = {
diff --git a/drivers/media/dvb/b2c2/flexcop-hw-filter.c b/drivers/media/dvb/b2c2/flexcop-hw-filter.c
index 75cf237196e..b386cc66c6b 100644
--- a/drivers/media/dvb/b2c2/flexcop-hw-filter.c
+++ b/drivers/media/dvb/b2c2/flexcop-hw-filter.c
@@ -19,7 +19,7 @@ void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff)
        flexcop_set_ibi_value(ctrl_208,SMC_Enable_sig,onoff);
 }
-void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff)
+static void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff)
 {
        flexcop_set_ibi_value(ctrl_208,Null_filter_sig,onoff);
 }
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index 0a78ba3737a..a6c91db40ad 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -544,7 +544,6 @@ static struct usb_device_id flexcop_usb_table [] = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver flexcop_usb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "b2c2_flexcop_usb",
        .probe          = flexcop_usb_probe,
        .disconnect = flexcop_usb_disconnect,
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index e6541aff399..2239651969c 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -406,7 +406,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
        }
        dprintk(verbose, DST_CA_DEBUG, 1, " ");
-        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) {
+        if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) {
                result = -EFAULT;
                goto free_mem_and_exit;
        }
@@ -579,7 +579,7 @@ static int dst_ca_release(struct inode *inode, struct file *file)
        return 0;
 }
-static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
        int bytes_read = 0;
@@ -588,7 +588,7 @@ static int dst_ca_read(struct file *file, char __user *buffer, size_t length, lo
        return bytes_read;
 }
-static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
 {
        dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 2e398090cf6..77977e9c013 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -556,9 +556,9 @@ static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_par
        dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
                __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
        if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
-                printk(KERN_WARNING "dvb-bt8xx: %s error "
+                printk(KERN_WARNING "dvb-bt8xx: %s error "
-                        "(addr %02x <- %02x, err = %i)\n",
+                        "(addr %02x <- %02x, err = %i)\n",
-                        __FUNCTION__, buf[0], buf[1], err);
+                        __FUNCTION__, buf[0], buf[1], err);
                if (err < 0)
                        return err;
                else
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 336fc284fa5..1d69bf031fb 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -60,7 +60,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
 #define dprintk(level, args...)                                         \
 do {                                                                    \
        if ((debug & level)) {                                          \
-                printk("%s: %s(): ", __stringify(KBUILD_MODNAME),       \
+                printk("%s: %s(): ", KBUILD_MODNAME,                    \
                       __FUNCTION__);                                   \
                printk(args); }                                         \
 } while (0)
@@ -986,7 +986,6 @@ static const struct usb_device_id cinergyt2_table [] __devinitdata = {
 MODULE_DEVICE_TABLE(usb, cinergyt2_table);
 static struct usb_driver cinergyt2_driver = {
-        .owner  = THIS_MODULE,
        .name   = "cinergyT2",
        .probe  = cinergyt2_probe,
        .disconnect     = cinergyt2_disconnect,
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 7d7b0067f22..9f025825b2d 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -86,25 +86,25 @@ enum dmx_success {
 enum dmx_ts_pes
 {  /* also send packets to decoder (if it exists) */
-        DMX_TS_PES_AUDIO0,
+        DMX_TS_PES_AUDIO0,
        DMX_TS_PES_VIDEO0,
        DMX_TS_PES_TELETEXT0,
        DMX_TS_PES_SUBTITLE0,
        DMX_TS_PES_PCR0,
-        DMX_TS_PES_AUDIO1,
+        DMX_TS_PES_AUDIO1,
        DMX_TS_PES_VIDEO1,
        DMX_TS_PES_TELETEXT1,
        DMX_TS_PES_SUBTITLE1,
        DMX_TS_PES_PCR1,
-        DMX_TS_PES_AUDIO2,
+        DMX_TS_PES_AUDIO2,
        DMX_TS_PES_VIDEO2,
        DMX_TS_PES_TELETEXT2,
        DMX_TS_PES_SUBTITLE2,
        DMX_TS_PES_PCR2,
-        DMX_TS_PES_AUDIO3,
+        DMX_TS_PES_AUDIO3,
        DMX_TS_PES_VIDEO3,
        DMX_TS_PES_TELETEXT3,
        DMX_TS_PES_SUBTITLE3,
@@ -121,17 +121,17 @@ enum dmx_ts_pes
 struct dmx_ts_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
+        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux *parent; /* Back-pointer */
+        struct dmx_demux *parent; /* Back-pointer */
-        void *priv; /* Pointer to private data of the API client */
+        void *priv; /* Pointer to private data of the API client */
-        int (*set) (struct dmx_ts_feed *feed,
+        int (*set) (struct dmx_ts_feed *feed,
                    u16 pid,
                    int type,
                    enum dmx_ts_pes pes_type,
                    size_t circular_buffer_size,
                    struct timespec timeout);
-        int (*start_filtering) (struct dmx_ts_feed* feed);
+        int (*start_filtering) (struct dmx_ts_feed* feed);
-        int (*stop_filtering) (struct dmx_ts_feed* feed);
+        int (*stop_filtering) (struct dmx_ts_feed* feed);
 };
 /*--------------------------------------------------------------------------*/
@@ -139,35 +139,35 @@ struct dmx_ts_feed {
 /*--------------------------------------------------------------------------*/
 struct dmx_section_filter {
-        u8 filter_value [DMX_MAX_FILTER_SIZE];
+        u8 filter_value [DMX_MAX_FILTER_SIZE];
-        u8 filter_mask [DMX_MAX_FILTER_SIZE];
+        u8 filter_mask [DMX_MAX_FILTER_SIZE];
-        u8 filter_mode [DMX_MAX_FILTER_SIZE];
+        u8 filter_mode [DMX_MAX_FILTER_SIZE];
-        struct dmx_section_feed* parent; /* Back-pointer */
+        struct dmx_section_feed* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+        void* priv; /* Pointer to private data of the API client */
 };
 struct dmx_section_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
+        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux* parent; /* Back-pointer */
+        struct dmx_demux* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+        void* priv; /* Pointer to private data of the API client */
-        int check_crc;
+        int check_crc;
        u32 crc_val;
-        u8 *secbuf;
+        u8 *secbuf;
-        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
+        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
-        u16 secbufp, seclen, tsfeedp;
+        u16 secbufp, seclen, tsfeedp;
-        int (*set) (struct dmx_section_feed* feed,
+        int (*set) (struct dmx_section_feed* feed,
                    u16 pid,
                    size_t circular_buffer_size,
                    int check_crc);
-        int (*allocate_filter) (struct dmx_section_feed* feed,
+        int (*allocate_filter) (struct dmx_section_feed* feed,
                                struct dmx_section_filter** filter);
-        int (*release_filter) (struct dmx_section_feed* feed,
+        int (*release_filter) (struct dmx_section_feed* feed,
                               struct dmx_section_filter* filter);
-        int (*start_filtering) (struct dmx_section_feed* feed);
+        int (*start_filtering) (struct dmx_section_feed* feed);
-        int (*stop_filtering) (struct dmx_section_feed* feed);
+        int (*stop_filtering) (struct dmx_section_feed* feed);
 };
 /*--------------------------------------------------------------------------*/
@@ -205,10 +205,10 @@ enum dmx_frontend_source {
 };
 struct dmx_frontend {
-        struct list_head connectivity_list; /* List of front-ends that can
+        struct list_head connectivity_list; /* List of front-ends that can
                                               be connected to a particular
                                               demux */
-        enum dmx_frontend_source source;
+        enum dmx_frontend_source source;
 };
 /*--------------------------------------------------------------------------*/
@@ -240,38 +240,38 @@ struct dmx_frontend {
 #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list)
 struct dmx_demux {
-        u32 capabilities;            /* Bitfield of capability flags */
+        u32 capabilities;            /* Bitfield of capability flags */
-        struct dmx_frontend* frontend;    /* Front-end connected to the demux */
+        struct dmx_frontend* frontend;    /* Front-end connected to the demux */
-        void* priv;                  /* Pointer to private data of the API client */
+        void* priv;                  /* Pointer to private data of the API client */
-        int (*open) (struct dmx_demux* demux);
+        int (*open) (struct dmx_demux* demux);
-        int (*close) (struct dmx_demux* demux);
+        int (*close) (struct dmx_demux* demux);
-        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
+        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
-        int (*allocate_ts_feed) (struct dmx_demux* demux,
+        int (*allocate_ts_feed) (struct dmx_demux* demux,
                                 struct dmx_ts_feed** feed,
                                 dmx_ts_cb callback);
-        int (*release_ts_feed) (struct dmx_demux* demux,
+        int (*release_ts_feed) (struct dmx_demux* demux,
                                struct dmx_ts_feed* feed);
-        int (*allocate_section_feed) (struct dmx_demux* demux,
+        int (*allocate_section_feed) (struct dmx_demux* demux,
                                      struct dmx_section_feed** feed,
                                      dmx_section_cb callback);
-        int (*release_section_feed) (struct dmx_demux* demux,
+        int (*release_section_feed) (struct dmx_demux* demux,
                                     struct dmx_section_feed* feed);
-        int (*add_frontend) (struct dmx_demux* demux,
+        int (*add_frontend) (struct dmx_demux* demux,
                             struct dmx_frontend* frontend);
-        int (*remove_frontend) (struct dmx_demux* demux,
+        int (*remove_frontend) (struct dmx_demux* demux,
                                struct dmx_frontend* frontend);
-        struct list_head* (*get_frontends) (struct dmx_demux* demux);
+        struct list_head* (*get_frontends) (struct dmx_demux* demux);
-        int (*connect_frontend) (struct dmx_demux* demux,
+        int (*connect_frontend) (struct dmx_demux* demux,
                                 struct dmx_frontend* frontend);
-        int (*disconnect_frontend) (struct dmx_demux* demux);
+        int (*disconnect_frontend) (struct dmx_demux* demux);
-        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
+        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
        int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps);
        int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src);
-        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
+        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
                        u64 *stc, unsigned int *base);
 };
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 8028c3a5e28..7b8373ad121 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -947,7 +947,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file,
        case DMX_GET_STC:
                if (!dmxdev->demux->get_stc) {
-                        ret=-EINVAL;
+                        ret=-EINVAL;
                        break;
                }
                ret = dmxdev->demux->get_stc(dmxdev->demux,
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h
index 395a9cd7501..fd72920c219 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb/dvb-core/dmxdev.h
@@ -53,51 +53,51 @@ enum dmxdev_state {
 };
 struct dmxdev_buffer {
-        u8 *data;
+        u8 *data;
-        int size;
+        int size;
-        int pread;
+        int pread;
-        int pwrite;
+        int pwrite;
        wait_queue_head_t queue;
-        int error;
+        int error;
 };
 struct dmxdev_filter {
        struct dvb_device *dvbdev;
-        union {
+        union {
-                struct dmx_section_filter *sec;
+                struct dmx_section_filter *sec;
        } filter;
-        union {
+        union {
-                struct dmx_ts_feed *ts;
+                struct dmx_ts_feed *ts;
-                struct dmx_section_feed *sec;
+                struct dmx_section_feed *sec;
        } feed;
-        union {
+        union {
-                struct dmx_sct_filter_params sec;
+                struct dmx_sct_filter_params sec;
-                struct dmx_pes_filter_params pes;
+                struct dmx_pes_filter_params pes;
        } params;
-        int type;
+        int type;
-        enum dmxdev_state state;
+        enum dmxdev_state state;
-        struct dmxdev *dev;
+        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+        struct dmxdev_buffer buffer;
        struct semaphore mutex;
-        /* only for sections */
+        /* only for sections */
-        struct timer_list timer;
+        struct timer_list timer;
-        int todo;
+        int todo;
-        u8 secheader[3];
+        u8 secheader[3];
-        u16 pid;
+        u16 pid;
 };
 struct dmxdev_dvr {
-        int state;
+        int state;
-        struct dmxdev *dev;
+        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+        struct dmxdev_buffer buffer;
 };
@@ -105,16 +105,16 @@ struct dmxdev {
        struct dvb_device *dvbdev;
        struct dvb_device *dvr_dvbdev;
-        struct dmxdev_filter *filter;
+        struct dmxdev_filter *filter;
-        struct dmxdev_dvr *dvr;
+        struct dmxdev_dvr *dvr;
-        struct dmx_demux *demux;
+        struct dmx_demux *demux;
-        int filternum;
+        int filternum;
-        int capabilities;
+        int capabilities;
 #define DMXDEV_CAP_DUPLEX 1
-        struct dmx_frontend *dvr_orig_fe;
+        struct dmx_frontend *dvr_orig_fe;
-        struct dmxdev_buffer dvr_buffer;
+        struct dmxdev_buffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
        struct semaphore mutex;
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 2aa767f9bd7..5956c35d34a 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -35,7 +35,7 @@
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
-#include <linux/rwsem.h>
+#include <linux/spinlock.h>
 #include <linux/sched.h>
 #include "dvb_ca_en50221.h"
@@ -111,9 +111,6 @@ struct dvb_ca_slot {
        /* size of the buffer to use when talking to the CAM */
        int link_buf_size;
-        /* semaphore for syncing access to slot structure */
-        struct rw_semaphore sem;
        /* buffer for incoming packets */
        struct dvb_ringbuffer rx_buffer;
@@ -501,7 +498,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
        /* process the CFTABLE_ENTRY tuples, and any after those */
        while ((!end_chain) && (address < 0x1000)) {
                if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType,
-                                                        &tupleLength, tuple)) < 0)
+                                                        &tupleLength, tuple)) < 0)
                        return status;
                switch (tupleType) {
                case 0x1B:      // CISTPL_CFTABLE_ENTRY
@@ -602,14 +599,11 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
        if (ebuf == NULL) {
                int buf_free;
-                down_read(&ca->slot_info[slot].sem);
                if (ca->slot_info[slot].rx_buffer.data == NULL) {
-                        up_read(&ca->slot_info[slot].sem);
                        status = -EIO;
                        goto exit;
                }
                buf_free = dvb_ringbuffer_free(&ca->slot_info[slot].rx_buffer);
-                up_read(&ca->slot_info[slot].sem);
                if (buf_free < (ca->slot_info[slot].link_buf_size + DVB_RINGBUFFER_PKTHDRSIZE)) {
                        status = -EAGAIN;
@@ -680,14 +674,11 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
        /* OK, add it to the receive buffer, or copy into external buffer if supplied */
        if (ebuf == NULL) {
-                down_read(&ca->slot_info[slot].sem);
                if (ca->slot_info[slot].rx_buffer.data == NULL) {
-                        up_read(&ca->slot_info[slot].sem);
                        status = -EIO;
                        goto exit;
                }
                dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read);
-                up_read(&ca->slot_info[slot].sem);
        } else {
                memcpy(ebuf, buf, bytes_read);
        }
@@ -802,12 +793,8 @@ static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot)
 {
        dprintk("%s\n", __FUNCTION__);
-        down_write(&ca->slot_info[slot].sem);
        ca->pub->slot_shutdown(ca->pub, slot);
        ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
-        vfree(ca->slot_info[slot].rx_buffer.data);
-        ca->slot_info[slot].rx_buffer.data = NULL;
-        up_write(&ca->slot_info[slot].sem);
        /* need to wake up all processes to check if they're now
           trying to write to a defunct CAM */
@@ -893,7 +880,7 @@ void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot)
        case DVB_CA_SLOTSTATE_RUNNING:
                if (ca->open)
-                        dvb_ca_en50221_read_data(ca, slot, NULL, 0);
+                        dvb_ca_en50221_thread_wakeup(ca);
                break;
        }
 }
@@ -1127,16 +1114,16 @@ static int dvb_ca_en50221_thread(void *data)
                                        break;
                                }
-                                rxbuf = vmalloc(RX_BUFFER_SIZE);
+                                if (ca->slot_info[slot].rx_buffer.data == NULL) {
-                                if (rxbuf == NULL) {
+                                        rxbuf = vmalloc(RX_BUFFER_SIZE);
-                                        printk("dvb_ca adapter %d: Unable to allocate CAM rx buffer :(\n", ca->dvbdev->adapter->num);
+                                        if (rxbuf == NULL) {
-                                        ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID;
+                                                printk("dvb_ca adapter %d: Unable to allocate CAM rx buffer :(\n", ca->dvbdev->adapter->num);
-                                        dvb_ca_en50221_thread_update_delay(ca);
+                                                ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID;
-                                        break;
+                                                dvb_ca_en50221_thread_update_delay(ca);
+                                                break;
+                                        }
+                                        dvb_ringbuffer_init(&ca->slot_info[slot].rx_buffer, rxbuf, RX_BUFFER_SIZE);
                                }
-                                down_write(&ca->slot_info[slot].sem);
-                                dvb_ringbuffer_init(&ca->slot_info[slot].rx_buffer, rxbuf, RX_BUFFER_SIZE);
-                                up_write(&ca->slot_info[slot].sem);
                                ca->pub->slot_ts_enable(ca->pub, slot);
                                ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_RUNNING;
@@ -1148,11 +1135,7 @@ static int dvb_ca_en50221_thread(void *data)
                                if (!ca->open)
                                        continue;
-                                // no need to poll if the CAM supports IRQs
+                                // poll slots for data
-                                if (ca->slot_info[slot].da_irq_supported)
-                                        break;
-                                // poll mode
                                pktcount = 0;
                                while ((status = dvb_ca_en50221_read_data(ca, slot, NULL, 0)) > 0) {
                                        if (!ca->open)
@@ -1367,12 +1350,13 @@ exit:
 /**
 * Condition for waking up in dvb_ca_en50221_io_read_condition
 */
-static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *result, int *_slot)
+static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca,
+                                            int *result, int *_slot)
 {
        int slot;
        int slot_count = 0;
        int idx;
-        int fraglen;
+        size_t fraglen;
        int connection_id = -1;
        int found = 0;
        u8 hdr[2];
@@ -1382,10 +1366,7 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu
                if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_RUNNING)
                        goto nextslot;
-                down_read(&ca->slot_info[slot].sem);
                if (ca->slot_info[slot].rx_buffer.data == NULL) {
-                        up_read(&ca->slot_info[slot].sem);
                        return 0;
                }
@@ -1403,10 +1384,7 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu
                        idx = dvb_ringbuffer_pkt_next(&ca->slot_info[slot].rx_buffer, idx, &fraglen);
                }
-                if (!found)
+nextslot:
-                        up_read(&ca->slot_info[slot].sem);
-              nextslot:
                slot = (slot + 1) % ca->slot_count;
                slot_count++;
        }
@@ -1511,8 +1489,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
                goto exit;
        status = pktlen;
-      exit:
+exit:
-        up_read(&ca->slot_info[slot].sem);
        return status;
 }
@@ -1544,11 +1521,11 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file)
        for (i = 0; i < ca->slot_count; i++) {
                if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) {
-                        down_write(&ca->slot_info[i].sem);
                        if (ca->slot_info[i].rx_buffer.data != NULL) {
+                                /* it is safe to call this here without locks because
+                                 * ca->open == 0. Data is not read in this case */
                                dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer);
                        }
-                        up_write(&ca->slot_info[i].sem);
                }
        }
@@ -1607,7 +1584,6 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait)
        dprintk("%s\n", __FUNCTION__);
        if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {
-                up_read(&ca->slot_info[slot].sem);
                mask |= POLLIN;
        }
@@ -1619,7 +1595,6 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait)
        poll_wait(file, &ca->wait_queue, wait);
        if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) {
-                up_read(&ca->slot_info[slot].sem);
                mask |= POLLIN;
        }
@@ -1709,7 +1684,6 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
                ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE;
                atomic_set(&ca->slot_info[i].camchange_count, 0);
                ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED;
-                init_rwsem(&ca->slot_info[i].sem);
        }
        if (signal_pending(current)) {
@@ -1729,7 +1703,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
        ca->thread_pid = ret;
        return 0;
-      error:
+error:
        if (ca != NULL) {
                if (ca->dvbdev != NULL)
                        dvb_unregister_device(ca->dvbdev);
@@ -1771,6 +1745,9 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
        for (i = 0; i < ca->slot_count; i++) {
                dvb_ca_en50221_slot_shutdown(ca, i);
+                if (ca->slot_info[i].rx_buffer.data != NULL) {
+                        vfree(ca->slot_info[i].rx_buffer.data);
+                }
        }
        kfree(ca->slot_info);
        dvb_unregister_device(ca->dvbdev);
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.c b/drivers/media/dvb/dvb-core/dvb_filter.c
index bd514390608..c49fd0bd718 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -72,12 +72,12 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        u8 pct;
        if (pr) printk( "Pic header: ");
-        pic->temporal_reference[field] = (( headr[0] << 2 ) |
+        pic->temporal_reference[field] = (( headr[0] << 2 ) |
                                          (headr[1] & 0x03) )& 0x03ff;
        if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]);
        pct = ( headr[1] >> 2 ) & 0x07;
-        pic->picture_coding_type[field] = pct;
+        pic->picture_coding_type[field] = pct;
        if (pr) {
                switch(pct){
                        case I_FRAME:
@@ -93,17 +93,17 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        }
-        pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
+        pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
                                 ( (headr[3] & 0x1F) << 11) ) & 0xffff;
        if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay);
-        pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
+        pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
                ((headr[4] & 0x80) >> 3);
-        if ( pct == B_FRAME ){
+        if ( pct == B_FRAME ){
-                pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
+                pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
-        }
+        }
        if (pr) printk( " pic head param: 0x%x",
                        pic->picture_header_parameter);
@@ -124,18 +124,18 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
                       ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F),
                       ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F));
-        if ( ( headr[3] & 0x40 ) != 0 ){
+        if ( ( headr[3] & 0x40 ) != 0 ){
-                pic->closed_gop = 1;
+                pic->closed_gop = 1;
-        } else {
+        } else {
-                pic->closed_gop = 0;
+                pic->closed_gop = 0;
-        }
+        }
        if (pr) printk("closed: %d", pic->closed_gop);
-        if ( ( headr[3] & 0x20 ) != 0 ){
+        if ( ( headr[3] & 0x20 ) != 0 ){
-                pic->broken_link = 1;
+                pic->broken_link = 1;
-        } else {
+        } else {
-                pic->broken_link = 0;
+                pic->broken_link = 0;
-        }
+        }
        if (pr) printk(" broken: %d\n", pic->broken_link);
        return 0;
@@ -146,7 +146,7 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
 /* needs 8 byte input */
 static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
 {
-        int sw;
+        int sw;
        int form = -1;
        if (pr) printk("Reading sequence header\n");
@@ -154,9 +154,9 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        vi->horizontal_size     = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
        vi->vertical_size       = ((headr[1] &0x0F) << 8) | (headr[2]);
-        sw = (int)((headr[3]&0xF0) >> 4) ;
+        sw = (int)((headr[3]&0xF0) >> 4) ;
-        switch( sw ){
+        switch( sw ){
        case 1:
                if (pr)
                        printk("Videostream: ASPECT: 1:1");
@@ -165,84 +165,84 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        case 2:
                if (pr)
                        printk("Videostream: ASPECT: 4:3");
-                vi->aspect_ratio = 133;
+                vi->aspect_ratio = 133;
                break;
        case 3:
                if (pr)
                        printk("Videostream: ASPECT: 16:9");
-                vi->aspect_ratio = 177;
+                vi->aspect_ratio = 177;
                break;
        case 4:
                if (pr)
                        printk("Videostream: ASPECT: 2.21:1");
-                vi->aspect_ratio = 221;
+                vi->aspect_ratio = 221;
                break;
-        case 5 ... 15:
+        case 5 ... 15:
                if (pr)
                        printk("Videostream: ASPECT: reserved");
-                vi->aspect_ratio = 0;
+                vi->aspect_ratio = 0;
                break;
-        default:
+        default:
-                vi->aspect_ratio = 0;
+                vi->aspect_ratio = 0;
-                return -1;
+                return -1;
        }
        if (pr)
                printk("  Size = %dx%d",vi->horizontal_size,vi->vertical_size);
-        sw = (int)(headr[3]&0x0F);
+        sw = (int)(headr[3]&0x0F);
-        switch ( sw ) {
+        switch ( sw ) {
        case 1:
                if (pr)
                        printk("  FRate: 23.976 fps");
-                vi->framerate = 23976;
+                vi->framerate = 23976;
                form = -1;
                break;
        case 2:
                if (pr)
                        printk("  FRate: 24 fps");
-                vi->framerate = 24000;
+                vi->framerate = 24000;
                form = -1;
                break;
        case 3:
                if (pr)
                        printk("  FRate: 25 fps");
-                vi->framerate = 25000;
+                vi->framerate = 25000;
                form = VIDEO_MODE_PAL;
                break;
        case 4:
                if (pr)
                        printk("  FRate: 29.97 fps");
-                vi->framerate = 29970;
+                vi->framerate = 29970;
                form = VIDEO_MODE_NTSC;
                break;
        case 5:
                if (pr)
                        printk("  FRate: 30 fps");
-                vi->framerate = 30000;
+                vi->framerate = 30000;
                form = VIDEO_MODE_NTSC;
                break;
        case 6:
                if (pr)
                        printk("  FRate: 50 fps");
-                vi->framerate = 50000;
+                vi->framerate = 50000;
                form = VIDEO_MODE_PAL;
                break;
        case 7:
                if (pr)
                        printk("  FRate: 60 fps");
-                vi->framerate = 60000;
+                vi->framerate = 60000;
                form = VIDEO_MODE_NTSC;
                break;
        }
        vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03);
-        vi->vbv_buffer_size
+        vi->vbv_buffer_size
-                = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
+                = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
        if (pr){
                printk("  BRate: %d Mbit/s",4*(vi->bit_rate)/10000);
@@ -250,7 +250,7 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
                printk("\n");
        }
-        vi->video_format = form;
+        vi->video_format = form;
        return 0;
 }
@@ -308,7 +308,7 @@ static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
        if (!found) return -1;
        if (c+3 >= count) return -1;
-        headr = mbuf+c;
+        headr = mbuf+c;
        ai->layer = (headr[1] & 0x06) >> 1;
@@ -368,7 +368,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
        if (c+5 >= count) return -1;
        ai->layer = 0;  // 0 for AC3
-        headr = mbuf+c+2;
+        headr = mbuf+c+2;
        frame = (headr[2]&0x3f);
        ai->bit_rate = ac3_bitrates[frame >> 1]*1000;
@@ -396,159 +396,159 @@ EXPORT_SYMBOL(dvb_filter_get_ac3info);
 #if 0
 static u8 *skip_pes_header(u8 **bufp)
 {
-        u8 *inbuf = *bufp;
+        u8 *inbuf = *bufp;
-        u8 *buf = inbuf;
+        u8 *buf = inbuf;
-        u8 *pts = NULL;
+        u8 *pts = NULL;
-        int skip = 0;
+        int skip = 0;
        static const int mpeg1_skip_table[16] = {
                1, 0xffff,      5,     10, 0xffff, 0xffff, 0xffff, 0xffff,
-                0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
+                0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
        };
-        if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
+        if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
-                if (buf[7] & PTS_ONLY)
+                if (buf[7] & PTS_ONLY)
-                        pts = buf+9;
+                        pts = buf+9;
-                else pts = NULL;
+                else pts = NULL;
-                buf = inbuf + 9 + inbuf[8];
+                buf = inbuf + 9 + inbuf[8];
-        } else {        /* mpeg1 */
+        } else {        /* mpeg1 */
-                for (buf = inbuf + 6; *buf == 0xff; buf++)
+                for (buf = inbuf + 6; *buf == 0xff; buf++)
-                        if (buf == inbuf + 6 + 16) {
+                        if (buf == inbuf + 6 + 16) {
-                                break;
+                                break;
-                        }
+                        }
-                if ((*buf & 0xc0) == 0x40)
+                if ((*buf & 0xc0) == 0x40)
-                        buf += 2;
+                        buf += 2;
-                skip = mpeg1_skip_table [*buf >> 4];
+                skip = mpeg1_skip_table [*buf >> 4];
-                if (skip == 5 || skip == 10) pts = buf;
+                if (skip == 5 || skip == 10) pts = buf;
-                else pts = NULL;
+                else pts = NULL;
-                buf += mpeg1_skip_table [*buf >> 4];
+                buf += mpeg1_skip_table [*buf >> 4];
-        }
+        }
-        *bufp = buf;
+        *bufp = buf;
-        return pts;
+        return pts;
 }
 #endif
 #if 0
 static void initialize_quant_matrix( u32 *matrix )
 {
-        int i;
+        int i;
-        matrix[0]  = 0x08101013;
+        matrix[0]  = 0x08101013;
-        matrix[1]  = 0x10131616;
+        matrix[1]  = 0x10131616;
-        matrix[2]  = 0x16161616;
+        matrix[2]  = 0x16161616;
-        matrix[3]  = 0x1a181a1b;
+        matrix[3]  = 0x1a181a1b;
-        matrix[4]  = 0x1b1b1a1a;
+        matrix[4]  = 0x1b1b1a1a;
-        matrix[5]  = 0x1a1a1b1b;
+        matrix[5]  = 0x1a1a1b1b;
-        matrix[6]  = 0x1b1d1d1d;
+        matrix[6]  = 0x1b1d1d1d;
-        matrix[7]  = 0x2222221d;
+        matrix[7]  = 0x2222221d;
-        matrix[8]  = 0x1d1d1b1b;
+        matrix[8]  = 0x1d1d1b1b;
-        matrix[9]  = 0x1d1d2020;
+        matrix[9]  = 0x1d1d2020;
-        matrix[10] = 0x22222526;
+        matrix[10] = 0x22222526;
-        matrix[11] = 0x25232322;
+        matrix[11] = 0x25232322;
-        matrix[12] = 0x23262628;
+        matrix[12] = 0x23262628;
-        matrix[13] = 0x28283030;
+        matrix[13] = 0x28283030;
-        matrix[14] = 0x2e2e3838;
+        matrix[14] = 0x2e2e3838;
-        matrix[15] = 0x3a454553;
+        matrix[15] = 0x3a454553;
-        for ( i = 16 ; i < 32 ; i++ )
+        for ( i = 16 ; i < 32 ; i++ )
-                matrix[i] = 0x10101010;
+                matrix[i] = 0x10101010;
 }
 #endif
 #if 0
 static void initialize_mpg_picture(struct mpg_picture *pic)
 {
-        int i;
+        int i;
-        /* set MPEG1 */
+        /* set MPEG1 */
-        pic->mpeg1_flag = 1;
+        pic->mpeg1_flag = 1;
-        pic->profile_and_level = 0x4A ;        /* MP@LL */
+        pic->profile_and_level = 0x4A ;        /* MP@LL */
-        pic->progressive_sequence = 1;
+        pic->progressive_sequence = 1;
-        pic->low_delay = 0;
+        pic->low_delay = 0;
-        pic->sequence_display_extension_flag = 0;
+        pic->sequence_display_extension_flag = 0;
-        for ( i = 0 ; i < 4 ; i++ ){
+        for ( i = 0 ; i < 4 ; i++ ){
-                pic->frame_centre_horizontal_offset[i] = 0;
+                pic->frame_centre_horizontal_offset[i] = 0;
-                pic->frame_centre_vertical_offset[i] = 0;
+                pic->frame_centre_vertical_offset[i] = 0;
-        }
+        }
-        pic->last_frame_centre_horizontal_offset = 0;
+        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
+        pic->last_frame_centre_vertical_offset = 0;
-        pic->picture_display_extension_flag[0] = 0;
+        pic->picture_display_extension_flag[0] = 0;
-        pic->picture_display_extension_flag[1] = 0;
+        pic->picture_display_extension_flag[1] = 0;
-        pic->sequence_header_flag = 0;
+        pic->sequence_header_flag = 0;
        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
+        pic->sequence_end_flag = 0;
 }
 #endif
 #if 0
 static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
 {
-        int16_t last_h_offset;
+        int16_t last_h_offset;
-        int16_t last_v_offset;
+        int16_t last_v_offset;
-        int16_t *p_h_offset;
+        int16_t *p_h_offset;
-        int16_t *p_v_offset;
+        int16_t *p_v_offset;
-        if ( pic->mpeg1_flag ){
+        if ( pic->mpeg1_flag ){
-                pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
+                pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
-                pic->top_field_first = 0;
+                pic->top_field_first = 0;
-                pic->repeat_first_field = 0;
+                pic->repeat_first_field = 0;
-                pic->progressive_frame = 1;
+                pic->progressive_frame = 1;
-                pic->picture_coding_parameter = 0x000010;
+                pic->picture_coding_parameter = 0x000010;
-        }
+        }
-        /* Reset flag */
+        /* Reset flag */
-        pic->picture_display_extension_flag[field_type] = 0;
+        pic->picture_display_extension_flag[field_type] = 0;
-        last_h_offset = pic->last_frame_centre_horizontal_offset;
+        last_h_offset = pic->last_frame_centre_horizontal_offset;
-        last_v_offset = pic->last_frame_centre_vertical_offset;
+        last_v_offset = pic->last_frame_centre_vertical_offset;
-        if ( field_type == FIRST_FIELD ){
+        if ( field_type == FIRST_FIELD ){
-                p_h_offset = pic->frame_centre_horizontal_offset;
+                p_h_offset = pic->frame_centre_horizontal_offset;
-                p_v_offset = pic->frame_centre_vertical_offset;
+                p_v_offset = pic->frame_centre_vertical_offset;
-                *p_h_offset = last_h_offset;
+                *p_h_offset = last_h_offset;
-                *(p_h_offset + 1) = last_h_offset;
+                *(p_h_offset + 1) = last_h_offset;
-                *(p_h_offset + 2) = last_h_offset;
+                *(p_h_offset + 2) = last_h_offset;
-                *p_v_offset = last_v_offset;
+                *p_v_offset = last_v_offset;
-                *(p_v_offset + 1) = last_v_offset;
+                *(p_v_offset + 1) = last_v_offset;
-                *(p_v_offset + 2) = last_v_offset;
+                *(p_v_offset + 2) = last_v_offset;
-        } else {
+        } else {
-                pic->frame_centre_horizontal_offset[3] = last_h_offset;
+                pic->frame_centre_horizontal_offset[3] = last_h_offset;
-                pic->frame_centre_vertical_offset[3] = last_v_offset;
+                pic->frame_centre_vertical_offset[3] = last_v_offset;
-        }
+        }
 }
 #endif
 #if 0
 static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
 {
-        pic->picture_header = 0;
+        pic->picture_header = 0;
-        pic->sequence_header_data
+        pic->sequence_header_data
-                = ( INIT_HORIZONTAL_SIZE << 20 )
+                = ( INIT_HORIZONTAL_SIZE << 20 )
-                        | ( INIT_VERTICAL_SIZE << 8 )
+                        | ( INIT_VERTICAL_SIZE << 8 )
-                        | ( INIT_ASPECT_RATIO << 4 )
+                        | ( INIT_ASPECT_RATIO << 4 )
-                        | ( INIT_FRAME_RATE );
+                        | ( INIT_FRAME_RATE );
-        pic->mpeg1_flag = 0;
+        pic->mpeg1_flag = 0;
-        pic->vinfo.horizontal_size
+        pic->vinfo.horizontal_size
-                = INIT_DISP_HORIZONTAL_SIZE;
+                = INIT_DISP_HORIZONTAL_SIZE;
-        pic->vinfo.vertical_size
+        pic->vinfo.vertical_size
-                = INIT_DISP_VERTICAL_SIZE;
+                = INIT_DISP_VERTICAL_SIZE;
-        pic->picture_display_extension_flag[field_type]
+        pic->picture_display_extension_flag[field_type]
-                = 0;
+                = 0;
-        pic->pts_flag[field_type] = 0;
+        pic->pts_flag[field_type] = 0;
-        pic->sequence_gop_header = 0;
+        pic->sequence_gop_header = 0;
-        pic->picture_header = 0;
+        pic->picture_header = 0;
-        pic->sequence_header_flag = 0;
+        pic->sequence_header_flag = 0;
-        pic->gop_flag = 0;
+        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
+        pic->sequence_end_flag = 0;
-        pic->sequence_display_extension_flag = 0;
+        pic->sequence_display_extension_flag = 0;
-        pic->last_frame_centre_horizontal_offset = 0;
+        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
+        pic->last_frame_centre_vertical_offset = 0;
        pic->channel = chan;
 }
 #endif
@@ -588,11 +588,11 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
                buf[1]&=~0x40;
        }
        if (!len)
-                return 0;
+                return 0;
        buf[3]=0x30|((p2ts->cc++)&0x0f);
        rest=183-len;
        if (rest) {
-                buf[5]=0x00;
+                buf[5]=0x00;
                if (rest-1)
                        memset(buf+6, 0xff, rest-1);
        }
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb/dvb-core/dvb_filter.h
index b0848f7836b..375e3be184b 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.h
+++ b/drivers/media/dvb/dvb-core/dvb_filter.h
@@ -29,8 +29,8 @@ typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
 struct dvb_filter_pes2ts {
        unsigned char buf[188];
-        unsigned char cc;
+        unsigned char cc;
-        dvb_filter_pes2ts_cb_t *cb;
+        dvb_filter_pes2ts_cb_t *cb;
        void *priv;
 };
@@ -162,7 +162,7 @@ struct dvb_video_info {
        u32 bit_rate;
        u32 comp_bit_rate;
        u32 vbv_buffer_size;
-        s16 vbv_delay;
+        s16 vbv_delay;
        u32 CSPF;
        u32 off;
 };
@@ -173,60 +173,60 @@ struct dvb_video_info {
 #define VIDEO_FRAME_PICTURE 0x03
 struct mpg_picture {
-        int       channel;
+        int       channel;
        struct dvb_video_info vinfo;
-        u32      *sequence_gop_header;
+        u32      *sequence_gop_header;
-        u32      *picture_header;
+        u32      *picture_header;
-        s32       time_code;
+        s32       time_code;
-        int       low_delay;
+        int       low_delay;
-        int       closed_gop;
+        int       closed_gop;
-        int       broken_link;
+        int       broken_link;
-        int       sequence_header_flag;
+        int       sequence_header_flag;
-        int       gop_flag;
+        int       gop_flag;
-        int       sequence_end_flag;
+        int       sequence_end_flag;
-        u8        profile_and_level;
+        u8        profile_and_level;
-        s32       picture_coding_parameter;
+        s32       picture_coding_parameter;
-        u32       matrix[32];
+        u32       matrix[32];
-        s8        matrix_change_flag;
+        s8        matrix_change_flag;
-        u8        picture_header_parameter;
+        u8        picture_header_parameter;
  /* bit 0 - 2: bwd f code
     bit 3    : fpb vector
     bit 4 - 6: fwd f code
     bit 7    : fpf vector */
-        int       mpeg1_flag;
+        int       mpeg1_flag;
-        int       progressive_sequence;
+        int       progressive_sequence;
-        int       sequence_display_extension_flag;
+        int       sequence_display_extension_flag;
-        u32       sequence_header_data;
+        u32       sequence_header_data;
-        s16       last_frame_centre_horizontal_offset;
+        s16       last_frame_centre_horizontal_offset;
-        s16       last_frame_centre_vertical_offset;
+        s16       last_frame_centre_vertical_offset;
-        u32       pts[2]; /* [0] 1st field, [1] 2nd field */
+        u32       pts[2]; /* [0] 1st field, [1] 2nd field */
-        int       top_field_first;
+        int       top_field_first;
-        int       repeat_first_field;
+        int       repeat_first_field;
-        int       progressive_frame;
+        int       progressive_frame;
-        int       bank;
+        int       bank;
-        int       forward_bank;
+        int       forward_bank;
-        int       backward_bank;
+        int       backward_bank;
-        int       compress;
+        int       compress;
-        s16       frame_centre_horizontal_offset[OFF_SIZE];
+        s16       frame_centre_horizontal_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
+                  /* [0-2] 1st field, [3] 2nd field */
-        s16       frame_centre_vertical_offset[OFF_SIZE];
+        s16       frame_centre_vertical_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
+                  /* [0-2] 1st field, [3] 2nd field */
-        s16       temporal_reference[2];
+        s16       temporal_reference[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_coding_type[2];
+        s8        picture_coding_type[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_structure[2];
+        s8        picture_structure[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_display_extension_flag[2];
+        s8        picture_display_extension_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-                  /* picture_display_extenion() 0:no 1:exit*/
+                  /* picture_display_extenion() 0:no 1:exit*/
-        s8        pts_flag[2];
+        s8        pts_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
 };
 struct dvb_audio_info {
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 6ffa6b21636..95ea5095e07 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -372,10 +372,10 @@ static int dvb_frontend_thread(void *data)
        snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num);
-        lock_kernel();
+        lock_kernel();
-        daemonize(name);
+        daemonize(name);
-        sigfillset(&current->blocked);
+        sigfillset(&current->blocked);
-        unlock_kernel();
+        unlock_kernel();
        fepriv->status = 0;
        dvb_frontend_init(fe);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 348c9b0b988..1e0840d02f1 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -41,10 +41,10 @@
 #include "dvbdev.h"
 struct dvb_frontend_tune_settings {
-        int min_delay_ms;
+        int min_delay_ms;
-        int step_size;
+        int step_size;
-        int max_drift;
+        int max_drift;
-        struct dvb_frontend_parameters parameters;
+        struct dvb_frontend_parameters parameters;
 };
 struct dvb_frontend;
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 87935490bfb..86bba81e851 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -151,6 +151,8 @@ struct dvb_net_priv {
        unsigned char ule_bridged;              /* Whether the ULE_BRIDGED extension header was found. */
        int ule_sndu_remain;                    /* Nr. of bytes still required for current ULE SNDU. */
        unsigned long ts_count;                 /* Current ts cell counter. */
+        struct semaphore mutex;
 };
@@ -711,7 +713,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
        if (buffer1_len > 32768)
                printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
        /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
-                  buffer1_len, buffer1_len / TS_SZ, buffer1); */
+                  buffer1_len, buffer1_len / TS_SZ, buffer1); */
        dvb_net_ule(dev, buffer1, buffer1_len);
        return 0;
 }
@@ -719,8 +721,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
 {
-        u8 *eth;
+        u8 *eth;
-        struct sk_buff *skb;
+        struct sk_buff *skb;
        struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats);
        int snap = 0;
@@ -752,7 +754,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
                        return;
                }
                snap = 8;
-        }
+        }
        if (pkt[7]) {
                /* FIXME: assemble datagram from multiple sections */
                stats->rx_errors++;
@@ -776,14 +778,14 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
        memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap);
        /* create ethernet header: */
-        eth[0]=pkt[0x0b];
+        eth[0]=pkt[0x0b];
-        eth[1]=pkt[0x0a];
+        eth[1]=pkt[0x0a];
-        eth[2]=pkt[0x09];
+        eth[2]=pkt[0x09];
-        eth[3]=pkt[0x08];
+        eth[3]=pkt[0x08];
-        eth[4]=pkt[0x04];
+        eth[4]=pkt[0x04];
-        eth[5]=pkt[0x03];
+        eth[5]=pkt[0x03];
-        eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
+        eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
        if (snap) {
                eth[12] = pkt[18];
@@ -805,7 +807,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
        stats->rx_packets++;
        stats->rx_bytes+=skb->len;
-        netif_rx(skb);
+        netif_rx(skb);
 }
 static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
@@ -813,7 +815,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
                 struct dmx_section_filter *filter,
                 enum dmx_success success)
 {
-        struct net_device *dev = filter->priv;
+        struct net_device *dev = filter->priv;
        /**
         * we rely on the DVB API definition where exactly one complete
@@ -881,12 +883,13 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
 static int dvb_net_feed_start(struct net_device *dev)
 {
-        int ret, i;
+        int ret = 0, i;
        struct dvb_net_priv *priv = dev->priv;
-        struct dmx_demux *demux = priv->demux;
+        struct dmx_demux *demux = priv->demux;
-        unsigned char *mac = (unsigned char *) dev->dev_addr;
+        unsigned char *mac = (unsigned char *) dev->dev_addr;
        dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode);
+        down(&priv->mutex);
        if (priv->tsfeed || priv->secfeed || priv->secfilter || priv->multi_secfilter[0])
                printk("%s: BUG %d\n", __FUNCTION__, __LINE__);
@@ -900,7 +903,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                                         dvb_net_sec_callback);
                if (ret<0) {
                        printk("%s: could not allocate section feed\n", dev->name);
-                        return ret;
+                        goto error;
                }
                ret = priv->secfeed->set(priv->secfeed, priv->pid, 32768, 1);
@@ -909,7 +912,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                        printk("%s: could not set section feed\n", dev->name);
                        priv->demux->release_section_feed(priv->demux, priv->secfeed);
                        priv->secfeed=NULL;
-                        return ret;
+                        goto error;
                }
                if (priv->rx_mode != RX_MODE_PROMISC) {
@@ -948,7 +951,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                ret = demux->allocate_ts_feed(demux, &priv->tsfeed, dvb_net_ts_callback);
                if (ret < 0) {
                        printk("%s: could not allocate ts feed\n", dev->name);
-                        return ret;
+                        goto error;
                }
                /* Set netdevice pointer for ts decaps callback. */
@@ -962,23 +965,26 @@ static int dvb_net_feed_start(struct net_device *dev)
                        printk("%s: could not set ts feed\n", dev->name);
                        priv->demux->release_ts_feed(priv->demux, priv->tsfeed);
                        priv->tsfeed = NULL;
-                        return ret;
+                        goto error;
                }
                dprintk("%s: start filtering\n", __FUNCTION__);
                priv->tsfeed->start_filtering(priv->tsfeed);
        } else
-                return -EINVAL;
+                ret = -EINVAL;
-        return 0;
+error:
+        up(&priv->mutex);
+        return ret;
 }
 static int dvb_net_feed_stop(struct net_device *dev)
 {
        struct dvb_net_priv *priv = dev->priv;
-        int i;
+        int i, ret = 0;
        dprintk("%s\n", __FUNCTION__);
+        down(&priv->mutex);
        if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {
                if (priv->secfeed) {
                        if (priv->secfeed->is_filtering) {
@@ -1019,8 +1025,9 @@ static int dvb_net_feed_stop(struct net_device *dev)
                else
                        printk("%s: no ts feed to stop\n", dev->name);
        } else
-                return -EINVAL;
+                ret = -EINVAL;
-        return 0;
+        up(&priv->mutex);
+        return ret;
 }
@@ -1044,8 +1051,8 @@ static void wq_set_multicast_list (void *data)
        struct dvb_net_priv *priv = dev->priv;
        dvb_net_feed_stop(dev);
        priv->rx_mode = RX_MODE_UNI;
+        spin_lock_bh(&dev->xmit_lock);
        if (dev->flags & IFF_PROMISC) {
                dprintk("%s: promiscuous mode\n", dev->name);
@@ -1070,6 +1077,7 @@ static void wq_set_multicast_list (void *data)
                }
        }
+        spin_unlock_bh(&dev->xmit_lock);
        dvb_net_feed_start(dev);
 }
@@ -1121,12 +1129,12 @@ static int dvb_net_stop(struct net_device *dev)
        struct dvb_net_priv *priv = dev->priv;
        priv->in_use--;
-        return dvb_net_feed_stop(dev);
+        return dvb_net_feed_stop(dev);
 }
 static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
 {
-        return &((struct dvb_net_priv*) dev->priv)->stats;
+        return &((struct dvb_net_priv*) dev->priv)->stats;
 }
 static void dvb_net_setup(struct net_device *dev)
@@ -1200,6 +1208,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
        INIT_WORK(&priv->set_multicast_list_wq, wq_set_multicast_list, net);
        INIT_WORK(&priv->restart_net_feed_wq, wq_restart_net_feed, net);
+        init_MUTEX(&priv->mutex);
        net->base_addr = pid;
@@ -1351,10 +1360,10 @@ static struct file_operations dvb_net_fops = {
 };
 static struct dvb_device dvbdev_net = {
-        .priv = NULL,
+        .priv = NULL,
-        .users = 1,
+        .users = 1,
-        .writers = 1,
+        .writers = 1,
-        .fops = &dvb_net_fops,
+        .fops = &dvb_net_fops,
 };
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index fb6d94a69d7..283c6e9339a 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -42,216 +42,216 @@
 void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len)
 {
-        rbuf->pread=rbuf->pwrite=0;
+        rbuf->pread=rbuf->pwrite=0;
-        rbuf->data=data;
+        rbuf->data=data;
-        rbuf->size=len;
+        rbuf->size=len;
-        init_waitqueue_head(&rbuf->queue);
+        init_waitqueue_head(&rbuf->queue);
-        spin_lock_init(&(rbuf->lock));
+        spin_lock_init(&(rbuf->lock));
 }
 int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf)
 {
-        return (rbuf->pread==rbuf->pwrite);
+        return (rbuf->pread==rbuf->pwrite);
 }
 ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t free;
+        ssize_t free;
-        free = rbuf->pread - rbuf->pwrite;
+        free = rbuf->pread - rbuf->pwrite;
-        if (free <= 0)
+        if (free <= 0)
-                free += rbuf->size;
+                free += rbuf->size;
-        return free-1;
+        return free-1;
 }
 ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t avail;
+        ssize_t avail;
-        avail = rbuf->pwrite - rbuf->pread;
+        avail = rbuf->pwrite - rbuf->pread;
-        if (avail < 0)
+        if (avail < 0)
-                avail += rbuf->size;
+                avail += rbuf->size;
-        return avail;
+        return avail;
 }
 void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
 {
-        rbuf->pread = rbuf->pwrite;
+        rbuf->pread = rbuf->pwrite;
 }
 void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf)
 {
-        unsigned long flags;
+        unsigned long flags;
-        spin_lock_irqsave(&rbuf->lock, flags);
+        spin_lock_irqsave(&rbuf->lock, flags);
-        dvb_ringbuffer_flush(rbuf);
+        dvb_ringbuffer_flush(rbuf);
-        spin_unlock_irqrestore(&rbuf->lock, flags);
+        spin_unlock_irqrestore(&rbuf->lock, flags);
-        wake_up(&rbuf->queue);
+        wake_up(&rbuf->queue);
 }
 ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem)
 {
-        size_t todo = len;
+        size_t todo = len;
-        size_t split;
+        size_t split;
-        split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
+        split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
-        if (split > 0) {
+        if (split > 0) {
-                if (!usermem)
+                if (!usermem)
-                        memcpy(buf, rbuf->data+rbuf->pread, split);
+                        memcpy(buf, rbuf->data+rbuf->pread, split);
-                else
+                else
-                        if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
+                        if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
-                                return -EFAULT;
+                                return -EFAULT;
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                rbuf->pread = 0;
+                rbuf->pread = 0;
-        }
+        }
-        if (!usermem)
+        if (!usermem)
-                memcpy(buf, rbuf->data+rbuf->pread, todo);
+                memcpy(buf, rbuf->data+rbuf->pread, todo);
-        else
+        else
-                if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
+                if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
-                        return -EFAULT;
+                        return -EFAULT;
-        rbuf->pread = (rbuf->pread + todo) % rbuf->size;
+        rbuf->pread = (rbuf->pread + todo) % rbuf->size;
-        return len;
+        return len;
 }
 ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len)
 {
-        size_t todo = len;
+        size_t todo = len;
-        size_t split;
+        size_t split;
-        split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
+        split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
-        if (split > 0) {
+        if (split > 0) {
-                memcpy(rbuf->data+rbuf->pwrite, buf, split);
+                memcpy(rbuf->data+rbuf->pwrite, buf, split);
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                rbuf->pwrite = 0;
+                rbuf->pwrite = 0;
-        }
+        }
-        memcpy(rbuf->data+rbuf->pwrite, buf, todo);
+        memcpy(rbuf->data+rbuf->pwrite, buf, todo);
-        rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
+        rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
-        return len;
+        return len;
 }
 ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len)
 {
-        int status;
+        int status;
-        ssize_t oldpwrite = rbuf->pwrite;
+        ssize_t oldpwrite = rbuf->pwrite;
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
-        status = dvb_ringbuffer_write(rbuf, buf, len);
+        status = dvb_ringbuffer_write(rbuf, buf, len);
-        if (status < 0) rbuf->pwrite = oldpwrite;
+        if (status < 0) rbuf->pwrite = oldpwrite;
-        return status;
+        return status;
 }
 ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                int offset, u8* buf, size_t len, int usermem)
+                                int offset, u8* buf, size_t len, int usermem)
 {
-        size_t todo;
+        size_t todo;
-        size_t split;
+        size_t split;
-        size_t pktlen;
+        size_t pktlen;
-        pktlen = rbuf->data[idx] << 8;
+        pktlen = rbuf->data[idx] << 8;
-        pktlen |= rbuf->data[(idx + 1) % rbuf->size];
+        pktlen |= rbuf->data[(idx + 1) % rbuf->size];
-        if (offset > pktlen) return -EINVAL;
+        if (offset > pktlen) return -EINVAL;
-        if ((offset + len) > pktlen) len = pktlen - offset;
+        if ((offset + len) > pktlen) len = pktlen - offset;
-        idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
+        idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
-        todo = len;
+        todo = len;
-        split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
+        split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
-        if (split > 0) {
+        if (split > 0) {
-                if (!usermem)
+                if (!usermem)
-                        memcpy(buf, rbuf->data+idx, split);
+                        memcpy(buf, rbuf->data+idx, split);
-                else
+                else
-                        if (copy_to_user(buf, rbuf->data+idx, split))
+                        if (copy_to_user(buf, rbuf->data+idx, split))
-                                return -EFAULT;
+                                return -EFAULT;
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                idx = 0;
+                idx = 0;
-        }
+        }
-        if (!usermem)
+        if (!usermem)
-                memcpy(buf, rbuf->data+idx, todo);
+                memcpy(buf, rbuf->data+idx, todo);
-        else
+        else
-                if (copy_to_user(buf, rbuf->data+idx, todo))
+                if (copy_to_user(buf, rbuf->data+idx, todo))
-                        return -EFAULT;
+                        return -EFAULT;
-        return len;
+        return len;
 }
 void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx)
 {
-        size_t pktlen;
+        size_t pktlen;
-        rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
+        rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
-        // clean up disposed packets
+        // clean up disposed packets
-        while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
+        while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
-                if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
+                if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
-                        pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
+                        pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
-                        pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
+                        pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
-                        DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
+                        DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
-                } else {
+                } else {
-                        // first packet is not disposed, so we stop cleaning now
+                        // first packet is not disposed, so we stop cleaning now
-                        break;
+                        break;
-                }
+                }
-        }
+        }
 }
 ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen)
 {
-        int consumed;
+        int consumed;
-        int curpktlen;
+        int curpktlen;
-        int curpktstatus;
+        int curpktstatus;
-        if (idx == -1) {
+        if (idx == -1) {
               idx = rbuf->pread;
        } else {
-                curpktlen = rbuf->data[idx] << 8;
+                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
        }
-        consumed = (idx - rbuf->pread) % rbuf->size;
+        consumed = (idx - rbuf->pread) % rbuf->size;
-        while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
+        while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
-                curpktlen = rbuf->data[idx] << 8;
+                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-                curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
+                curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
-                if (curpktstatus == PKT_READY) {
+                if (curpktstatus == PKT_READY) {
-                        *pktlen = curpktlen;
+                        *pktlen = curpktlen;
-                        return idx;
+                        return idx;
-                }
+                }
-                consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
+                consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
-                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
-        }
+        }
-        // no packets available
+        // no packets available
-        return -1;
+        return -1;
 }
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
index d18e9c4ba9e..fa476f662f8 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
+++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
@@ -31,13 +31,13 @@
 #include <linux/wait.h>
 struct dvb_ringbuffer {
-        u8               *data;
+        u8               *data;
-        ssize_t           size;
+        ssize_t           size;
-        ssize_t           pread;
+        ssize_t           pread;
-        ssize_t           pwrite;
+        ssize_t           pwrite;
-        wait_queue_head_t queue;
+        wait_queue_head_t queue;
-        spinlock_t        lock;
+        spinlock_t        lock;
 };
 #define DVB_RINGBUFFER_PKTHDRSIZE 3
@@ -106,7 +106,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
-                                   size_t len, int usermem);
+                                   size_t len, int usermem);
 /* write routines & macros */
@@ -121,7 +121,7 @@ extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
-                                    size_t len);
+                                    size_t len);
 /**
@@ -133,7 +133,7 @@ extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
 * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL.
 */
 extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
-                                        size_t len);
+                                        size_t len);
 /**
 * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this
@@ -149,7 +149,7 @@ extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
 * returns Number of bytes read, or -EFAULT.
 */
 extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                       int offset, u8* buf, size_t len, int usermem);
+                                       int offset, u8* buf, size_t len, int usermem);
 /**
 * Dispose of a packet in the ring buffer.
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 477b4fa5643..a4aee866585 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -47,7 +47,7 @@ static LIST_HEAD(dvb_adapter_list);
 static DECLARE_MUTEX(dvbdev_register_lock);
 static const char * const dnames[] = {
-        "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
+        "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
        "net", "osd"
 };
@@ -90,15 +90,15 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                file->private_data = dvbdev;
                old_fops = file->f_op;
-                file->f_op = fops_get(dvbdev->fops);
+                file->f_op = fops_get(dvbdev->fops);
-                if(file->f_op->open)
+                if(file->f_op->open)
-                        err = file->f_op->open(inode,file);
+                        err = file->f_op->open(inode,file);
-                if (err) {
+                if (err) {
-                        fops_put(file->f_op);
+                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
+                        file->f_op = fops_get(old_fops);
-                }
+                }
-                fops_put(old_fops);
+                fops_put(old_fops);
-                return err;
+                return err;
        }
        return -ENODEV;
 }
@@ -117,21 +117,21 @@ static struct cdev dvb_device_cdev = {
 int dvb_generic_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
-        if (!dvbdev)
+        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if (!dvbdev->users)
-                return -EBUSY;
+                return -EBUSY;
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
-                if (!dvbdev->readers)
+                if (!dvbdev->readers)
-                        return -EBUSY;
+                        return -EBUSY;
                dvbdev->readers--;
        } else {
-                if (!dvbdev->writers)
+                if (!dvbdev->writers)
-                        return -EBUSY;
+                        return -EBUSY;
                dvbdev->writers--;
        }
@@ -143,10 +143,10 @@ EXPORT_SYMBOL(dvb_generic_open);
 int dvb_generic_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
                dvbdev->readers++;
@@ -163,10 +163,10 @@ EXPORT_SYMBOL(dvb_generic_release);
 int dvb_generic_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
-        if (!dvbdev)
+        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if (!dvbdev->kernel_ioctl)
                return -EINVAL;
@@ -334,63 +334,63 @@ EXPORT_SYMBOL(dvb_unregister_adapter);
   to the v4l "videodev.o" module, which is unnecessary for some
   cards (ie. the budget dvb-cards don't need the v4l module...) */
 int dvb_usercopy(struct inode *inode, struct file *file,
-                     unsigned int cmd, unsigned long arg,
+                     unsigned int cmd, unsigned long arg,
                     int (*func)(struct inode *inode, struct file *file,
                     unsigned int cmd, void *arg))
 {
-        char    sbuf[128];
+        char    sbuf[128];
-        void    *mbuf = NULL;
+        void    *mbuf = NULL;
-        void    *parg = NULL;
+        void    *parg = NULL;
-        int     err  = -EINVAL;
+        int     err  = -EINVAL;
-        /*  Copy arguments into temp kernel buffer  */
+        /*  Copy arguments into temp kernel buffer  */
-        switch (_IOC_DIR(cmd)) {
+        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:
+        case _IOC_NONE:
                /*
                 * For this command, the pointer is actually an integer
                 * argument.
                 */
                parg = (void *) arg;
                break;
-        case _IOC_READ: /* some v4l ioctls are marked wrong ... */
+        case _IOC_READ: /* some v4l ioctls are marked wrong ... */
-        case _IOC_WRITE:
+        case _IOC_WRITE:
-        case (_IOC_WRITE | _IOC_READ):
+        case (_IOC_WRITE | _IOC_READ):
-                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
+                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-                        parg = sbuf;
+                        parg = sbuf;
-                } else {
+                } else {
-                        /* too big to allocate from stack */
+                        /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
+                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-                        if (NULL == mbuf)
+                        if (NULL == mbuf)
-                                return -ENOMEM;
+                                return -ENOMEM;
-                        parg = mbuf;
+                        parg = mbuf;
-                }
+                }
-                err = -EFAULT;
+                err = -EFAULT;
-                if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
+                if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
-                        goto out;
+                        goto out;
-                break;
+                break;
-        }
+        }
-        /* call driver */
+        /* call driver */
-        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
+        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
-                err = -EINVAL;
+                err = -EINVAL;
-        if (err < 0)
+        if (err < 0)
-                goto out;
+                goto out;
-        /*  Copy results into user buffer  */
+        /*  Copy results into user buffer  */
-        switch (_IOC_DIR(cmd))
+        switch (_IOC_DIR(cmd))
-        {
+        {
-        case _IOC_READ:
+        case _IOC_READ:
-        case (_IOC_WRITE | _IOC_READ):
+        case (_IOC_WRITE | _IOC_READ):
-                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
-                        err = -EFAULT;
+                        err = -EFAULT;
-                break;
+                break;
-        }
+        }
 out:
-        kfree(mbuf);
+        kfree(mbuf);
-        return err;
+        return err;
 }
 static int __init init_dvbdev(void)
@@ -427,10 +427,10 @@ error:
 static void __exit exit_dvbdev(void)
 {
-        devfs_remove("dvb");
+        devfs_remove("dvb");
        class_destroy(dvb_class);
        cdev_del(&dvb_device_cdev);
-        unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
+        unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
 module_init(init_dvbdev);
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index a251867f30f..0cc6e4a0e27 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -68,8 +68,8 @@ struct dvb_device {
        int writers;
        int users;
-        /* don't really need those !? -- FIXME: use video_usercopy  */
+        /* don't really need those !? -- FIXME: use video_usercopy  */
-        int (*kernel_ioctl)(struct inode *inode, struct file *file,
+        int (*kernel_ioctl)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg);
        void *priv;
@@ -97,7 +97,7 @@ we simply define out own dvb_usercopy(), which will hopefully become
 generic_usercopy()  someday... */
 extern int dvb_usercopy(struct inode *inode, struct file *file,
-                            unsigned int cmd, unsigned long arg,
+                            unsigned int cmd, unsigned long arg,
                            int (*func)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg));
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index 49f541d9a04..ce44aa6bbb8 100644
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -65,7 +65,7 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
 };
-int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
        u8 key[5];
        if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),
@@ -144,7 +144,6 @@ static struct dvb_usb_properties a800_properties = {
 };
 static struct usb_driver a800_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_a800",
        .probe          = a800_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 3fe383f4bb4..d05fab01ccc 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -241,7 +241,6 @@ static struct dvb_usb_properties cxusb_properties = {
 };
 static struct usb_driver cxusb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_cxusb",
        .probe          = cxusb_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 00b946419b4..269d899da48 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -21,9 +21,9 @@ MODULE_LICENSE("GPL");
 int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
 {
        if (d->priv != NULL) {
-                struct dib_fe_xfer_ops *ops = d->priv;
+                struct dibusb_state *st = d->priv;
-                if (ops->fifo_ctrl != NULL)
+                if (st->ops.fifo_ctrl != NULL)
-                        if (ops->fifo_ctrl(d->fe,onoff)) {
+                        if (st->ops.fifo_ctrl(d->fe,onoff)) {
                                err("error while controlling the fifo of the demod.");
                                return -ENODEV;
                        }
@@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl);
 int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
 {
        if (d->priv != NULL) {
-                struct dib_fe_xfer_ops *ops = d->priv;
+                struct dibusb_state *st = d->priv;
-                if (d->pid_filtering && ops->pid_ctrl != NULL)
+                if (st->ops.pid_ctrl != NULL)
-                        ops->pid_ctrl(d->fe,index,pid,onoff);
+                        st->ops.pid_ctrl(d->fe,index,pid,onoff);
        }
        return 0;
 }
@@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter);
 int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
 {
        if (d->priv != NULL) {
-                struct dib_fe_xfer_ops *ops = d->priv;
+                struct dibusb_state *st = d->priv;
-                if (ops->pid_parse != NULL)
+                if (st->ops.pid_parse != NULL)
-                        if (ops->pid_parse(d->fe,onoff) < 0)
+                        if (st->ops.pid_parse(d->fe,onoff) < 0)
                                err("could not handle pid_parser");
        }
        return 0;
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index aa271a2496d..52ac3e5adf5 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -373,7 +373,6 @@ static struct dvb_usb_properties artec_t1_usb2_properties = {
 };
 static struct usb_driver dibusb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_dibusb_mb",
        .probe          = dibusb_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 6a0912eab39..55802fba3c2 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -82,7 +82,6 @@ static struct dvb_usb_properties dibusb_mc_properties = {
 };
 static struct usb_driver dibusb_mc_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_dibusb_mc",
        .probe          = dibusb_mc_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 74545f82eff..450417a9e64 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -148,7 +148,7 @@ static struct dvb_usb_rc_key digitv_rc_keys[] = {
 };
 /* TODO is it really the NEC protocol ? */
-int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
        u8 key[5];
@@ -233,7 +233,6 @@ static struct dvb_usb_properties digitv_properties = {
 };
 static struct usb_driver digitv_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_digitv",
        .probe          = digitv_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index b595476332c..6e2bac87344 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -198,7 +198,6 @@ static struct dvb_usb_properties wt220u_properties = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver dtt200u_usb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_dtt200u",
        .probe          = dtt200u_usb_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index a902059812a..dd8e0b94edb 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -23,7 +23,7 @@ module_param_named(disable_rc_polling, dvb_usb_disable_rc_polling, int, 0644);
 MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0).");
 /* general initialization functions */
-int dvb_usb_exit(struct dvb_usb_device *d)
+static int dvb_usb_exit(struct dvb_usb_device *d)
 {
        deb_info("state before exiting everything: %x\n",d->state);
        dvb_usb_remote_exit(d);
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 1841a66427b..fac48fc7a4a 100644
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -202,7 +202,6 @@ static struct dvb_usb_properties nova_t_properties = {
 };
 static struct usb_driver nova_t_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_nova_t_usb2",
        .probe          = nova_t_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index 6fd67657c26..14f1911c79b 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -128,7 +128,6 @@ static struct dvb_usb_properties umt_properties = {
 };
 static struct usb_driver umt_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_umt_010",
        .probe          = umt_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index f20d8dbd0be..104b5d016c7 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -190,7 +190,7 @@ static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
 }
 static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
-                                    struct dvb_diseqc_master_cmd *m)
+                                    struct dvb_diseqc_master_cmd *m)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        u8 cmd[8],ibuf[10];
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c
index de13c04e8e6..afa00fdb5ec 100644
--- a/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/drivers/media/dvb/dvb-usb/vp702x.c
@@ -256,7 +256,6 @@ static struct dvb_usb_properties vp702x_properties = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver vp702x_usb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb-usb-vp702x",
        .probe          = vp702x_usb_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 2746edfeccb..83f1de1e7e5 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
        struct vp7045_fe_state *state = fe->demodulator_priv;
        *ber = (vp7045_read_reg(state->d, 0x0D) << 16) |
               (vp7045_read_reg(state->d, 0x0E) << 8) |
-                vp7045_read_reg(state->d, 0x0F);
+                vp7045_read_reg(state->d, 0x0F);
        return 0;
 }
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 75765e3a569..3835235b68d 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -253,7 +253,6 @@ static struct dvb_usb_properties vp7045_properties = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver vp7045_usb_driver = {
-        .owner          = THIS_MODULE,
        .name           = "dvb_usb_vp7045",
        .probe          = vp7045_usb_probe,
        .disconnect = dvb_usb_device_exit,
diff --git a/drivers/media/dvb/frontends/at76c651.c b/drivers/media/dvb/frontends/at76c651.c
index 72a2b5455b0..8e0f4b3a141 100644
--- a/drivers/media/dvb/frontends/at76c651.c
+++ b/drivers/media/dvb/frontends/at76c651.c
@@ -361,9 +361,9 @@ static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *fesettings)
 {
-        fesettings->min_delay_ms = 50;
+        fesettings->min_delay_ms = 50;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
        return 0;
 }
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index f6d4ee78bdd..8ceb9a33c7a 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -69,7 +69,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
 #define dbufout(b,l,m) {\
            int i; \
            for (i = 0; i < l; i++) \
-                m("%02x ",b[i]); \
+                m("%02x ",b[i]); \
 }
 #define deb_info(args...) dprintk(0x01,args)
 #define deb_i2c(args...)  dprintk(0x02,args)
@@ -827,7 +827,7 @@ static struct dvb_frontend_ops bcm3510_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 803000000,
-                /* stepsize is just a guess */
+                /* stepsize is just a guess */
                .frequency_stepsize = 0,
                .caps =
                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 0c2ed443861..755f774f6b7 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -355,10 +355,10 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 150;
+        fesettings->min_delay_ms = 150;
-        fesettings->step_size = 166667;
+        fesettings->step_size = 166667;
-        fesettings->max_drift = 166667*2;
+        fesettings->max_drift = 166667*2;
-        return 0;
+        return 0;
 }
 static void cx22700_release(struct dvb_frontend* fe)
@@ -407,7 +407,7 @@ static struct dvb_frontend_ops cx22700_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                      FE_CAN_RECOVER
+                      FE_CAN_RECOVER
        },
        .release = cx22700_release,
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 9f639297a9f..5de0e6d350b 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -2,12 +2,12 @@
    Conexant 22702 DVB OFDM demodulator driver
    based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+        Alps TDMB7 DVB OFDM demodulator driver
    Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
-    Copyright (C) 2004 Steven Toth <steve@toth.demon.co.uk>
+    Copyright (C) 2004 Steven Toth <stoth@hauppauge.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
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index 11f86806756..5633976a58f 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -2,12 +2,12 @@
    Conexant 22702 DVB OFDM demodulator driver
    based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+        Alps TDMB7 DVB OFDM demodulator driver
    Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
-    Copyright (C) 2004 Steven Toth <steve@toth.demon.co.uk>
+    Copyright (C) 2004 Steven Toth <stoth@hauppauge.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
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 654d7dc879d..0c4db80ec33 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -55,81 +55,81 @@ static int debug;
        } while (0)
 static struct {u8 reg; u8 data;} cx24110_regdata[]=
-                      /* Comments beginning with @ denote this value should
+                      /* Comments beginning with @ denote this value should
-                         be the default */
+                         be the default */
-        {{0x09,0x01}, /* SoftResetAll */
+        {{0x09,0x01}, /* SoftResetAll */
-         {0x09,0x00}, /* release reset */
+         {0x09,0x00}, /* release reset */
-         {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
+         {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
-         {0x02,0x17}, /* middle byte " */
+         {0x02,0x17}, /* middle byte " */
-         {0x03,0x29}, /* LSB         " */
+         {0x03,0x29}, /* LSB         " */
-         {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
+         {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
-         {0x06,0xa5}, /* @ PLL 60MHz */
+         {0x06,0xa5}, /* @ PLL 60MHz */
-         {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
+         {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
-         {0x0a,0x00}, /* @ partial chip disables, do not set */
+         {0x0a,0x00}, /* @ partial chip disables, do not set */
-         {0x0b,0x01}, /* set output clock in gapped mode, start signal low
+         {0x0b,0x01}, /* set output clock in gapped mode, start signal low
-                         active for first byte */
+                         active for first byte */
-         {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
+         {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
-         {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
+         {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
-         {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
+         {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
-                         to avoid starting the BER counter. Reset the
+                         to avoid starting the BER counter. Reset the
-                         CRC test bit. Finite counting selected */
+                         CRC test bit. Finite counting selected */
-         {0x15,0xff}, /* @ size of the limited time window for RS BER
+         {0x15,0xff}, /* @ size of the limited time window for RS BER
-                         estimation. It is <value>*256 RS blocks, this
+                         estimation. It is <value>*256 RS blocks, this
-                         gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
+                         gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
-         {0x16,0x00}, /* @ enable all RS output ports */
+         {0x16,0x00}, /* @ enable all RS output ports */
-         {0x17,0x04}, /* @ time window allowed for the RS to sync */
+         {0x17,0x04}, /* @ time window allowed for the RS to sync */
-         {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
+         {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
-                         for automatically */
+                         for automatically */
-                      /* leave the current code rate and normalization
+                      /* leave the current code rate and normalization
-                         registers as they are after reset... */
+                         registers as they are after reset... */
-         {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
+         {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
-                         only once */
+                         only once */
-         {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
+         {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
-                         estimation. It is <value>*65536 channel bits, i.e.
+                         estimation. It is <value>*65536 channel bits, i.e.
-                         approx. 38ms at 27.5MS/s, rate 3/4 */
+                         approx. 38ms at 27.5MS/s, rate 3/4 */
-         {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
+         {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
-                      /* leave front-end AGC parameters at default values */
+                      /* leave front-end AGC parameters at default values */
-                      /* leave decimation AGC parameters at default values */
+                      /* leave decimation AGC parameters at default values */
-         {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
+         {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
-         {0x36,0xff}, /* clear all interrupt pending flags */
+         {0x36,0xff}, /* clear all interrupt pending flags */
-         {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
+         {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
-         {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
+         {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
-                      /* leave the equalizer parameters on their default values */
+                      /* leave the equalizer parameters on their default values */
-                      /* leave the final AGC parameters on their default values */
+                      /* leave the final AGC parameters on their default values */
-         {0x41,0x00}, /* @ MSB of front-end derotator frequency */
+         {0x41,0x00}, /* @ MSB of front-end derotator frequency */
-         {0x42,0x00}, /* @ middle bytes " */
+         {0x42,0x00}, /* @ middle bytes " */
-         {0x43,0x00}, /* @ LSB          " */
+         {0x43,0x00}, /* @ LSB          " */
-                      /* leave the carrier tracking loop parameters on default */
+                      /* leave the carrier tracking loop parameters on default */
-                      /* leave the bit timing loop parameters at gefault */
+                      /* leave the bit timing loop parameters at gefault */
-         {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
+         {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
-                      /* the cx24108 data sheet for symbol rates above 15MS/s */
+                      /* the cx24108 data sheet for symbol rates above 15MS/s */
-         {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
+         {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
-         {0x61,0x95}, /* GPIO pins 1-4 have special function */
+         {0x61,0x95}, /* GPIO pins 1-4 have special function */
-         {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
+         {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
-         {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
+         {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
-         {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
+         {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
-         {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
+         {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
-         {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
+         {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
-         {0x73,0x00}, /* @ disable several demod bypasses */
+         {0x73,0x00}, /* @ disable several demod bypasses */
-         {0x74,0x00}, /* @  " */
+         {0x74,0x00}, /* @  " */
-         {0x75,0x00}  /* @  " */
+         {0x75,0x00}  /* @  " */
-                      /* the remaining registers are for SEC */
+                      /* the remaining registers are for SEC */
        };
 static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
 {
-        u8 buf [] = { reg, data };
+        u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
        int err;
-        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x,"
                         " data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static int cx24110_readreg (struct cx24110_state* state, u8 reg)
@@ -153,27 +153,27 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
        switch (inversion) {
        case INVERSION_OFF:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
+                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
+                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
-                /* Initial value 0 at start of acq */
+                /* Initial value 0 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
+                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
-                /* current value 0 */
+                /* current value 0 */
-                /* The cx24110 manual tells us this reg is read-only.
+                /* The cx24110 manual tells us this reg is read-only.
-                   But what the heck... set it ayways */
+                   But what the heck... set it ayways */
-                break;
+                break;
        case INVERSION_ON:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
+                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
+                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
-                /* Initial value 1 at start of acq */
+                /* Initial value 1 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
+                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
-                /* current value 1 */
+                /* current value 1 */
-                break;
+                break;
        case INVERSION_AUTO:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
-                /* AcqSpectrInvDis off. Leave initial & current states as is */
+                /* AcqSpectrInvDis off. Leave initial & current states as is */
-                break;
+                break;
        default:
                return -EINVAL;
        }
@@ -185,18 +185,18 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
 {
 /* fixme (low): error handling */
-        static const int rate[]={-1,1,2,3,5,7,-1};
+        static const int rate[]={-1,1,2,3,5,7,-1};
-        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
+        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
-        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
+        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
-        /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
+        /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
-           searches all enabled viterbi rates, and can handle non-standard
+           searches all enabled viterbi rates, and can handle non-standard
-           rates as well. */
+           rates as well. */
-        if (fec>FEC_AUTO)
+        if (fec>FEC_AUTO)
-                fec=FEC_AUTO;
+                fec=FEC_AUTO;
-        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
+        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf);
                /* clear AcqVitDis bit */
                cx24110_writereg(state,0x18,0xae);
@@ -208,7 +208,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06);
                /* set the puncture registers for code rate 3/4 */
                return 0;
-        } else {
+        } else {
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20);
                /* set AcqVitDis bit */
                if(rate[fec]>0) {
@@ -219,10 +219,10 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                        cx24110_writereg(state,0x1a,g1[fec]);
                        cx24110_writereg(state,0x1b,g2[fec]);
                        /* not sure if this is the right way: I always used AutoAcq mode */
-           } else
+           } else
                   return -EOPNOTSUPP;
 /* fixme (low): which is the correct return code? */
-        };
+        };
        return 0;
 }
@@ -245,72 +245,72 @@ static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state)
 static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
 {
 /* fixme (low): add error handling */
-        u32 ratio;
+        u32 ratio;
-        u32 tmp, fclk, BDRI;
+        u32 tmp, fclk, BDRI;
-        static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
+        static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
-        int i;
+        int i;
 dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
-        if (srate>90999000UL/2)
+        if (srate>90999000UL/2)
-                srate=90999000UL/2;
+                srate=90999000UL/2;
-        if (srate<500000)
+        if (srate<500000)
-                srate=500000;
+                srate=500000;
-        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
+        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
                ;
-        /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
+        /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
-           and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
+           and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
-           R06[3:0] PLLphaseDetGain */
+           R06[3:0] PLLphaseDetGain */
-        tmp=cx24110_readreg(state,0x07)&0xfc;
+        tmp=cx24110_readreg(state,0x07)&0xfc;
-        if(srate<90999000UL/4) { /* sample rate 45MHz*/
+        if(srate<90999000UL/4) { /* sample rate 45MHz*/
                cx24110_writereg(state,0x07,tmp);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL/2;
-        } else if(srate<60666000UL/2) { /* sample rate 60MHz */
+        } else if(srate<60666000UL/2) { /* sample rate 60MHz */
                cx24110_writereg(state,0x07,tmp|0x1);
                cx24110_writereg(state,0x06,0xa5);
                fclk=60666000UL;
-        } else if(srate<80888000UL/2) { /* sample rate 80MHz */
+        } else if(srate<80888000UL/2) { /* sample rate 80MHz */
                cx24110_writereg(state,0x07,tmp|0x2);
                cx24110_writereg(state,0x06,0x87);
                fclk=80888000UL;
-        } else { /* sample rate 90MHz */
+        } else { /* sample rate 90MHz */
                cx24110_writereg(state,0x07,tmp|0x3);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL;
-        };
+        };
-        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
+        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
-        /* we need to divide two integers with approx. 27 bits in 32 bit
+        /* we need to divide two integers with approx. 27 bits in 32 bit
-           arithmetic giving a 25 bit result */
+           arithmetic giving a 25 bit result */
-        /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
+        /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
-           also the most complex divisor. Hence, the dividend has,
+           also the most complex divisor. Hence, the dividend has,
-           assuming 32bit unsigned arithmetic, 6 clear bits on top, the
+           assuming 32bit unsigned arithmetic, 6 clear bits on top, the
-           divisor 2 unused bits at the bottom. Also, the quotient is
+           divisor 2 unused bits at the bottom. Also, the quotient is
-           always less than 1/2. Borrowed from VES1893.c, of course */
+           always less than 1/2. Borrowed from VES1893.c, of course */
-        tmp=srate<<6;
+        tmp=srate<<6;
-        BDRI=fclk>>2;
+        BDRI=fclk>>2;
-        ratio=(tmp/BDRI);
+        ratio=(tmp/BDRI);
-        tmp=(tmp%BDRI)<<8;
+        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+        ratio=(ratio<<8)+(tmp/BDRI);
-        tmp=(tmp%BDRI)<<8;
+        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+        ratio=(ratio<<8)+(tmp/BDRI);
-        tmp=(tmp%BDRI)<<1;
+        tmp=(tmp%BDRI)<<1;
-        ratio=(ratio<<1)+(tmp/BDRI);
+        ratio=(ratio<<1)+(tmp/BDRI);
-        dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
+        dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
-        dprintk("fclk = %d\n", fclk);
+        dprintk("fclk = %d\n", fclk);
-        dprintk("ratio= %08x\n", ratio);
+        dprintk("ratio= %08x\n", ratio);
-        cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
+        cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
-        cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
+        cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
-        cx24110_writereg(state, 0x3, (ratio)&0xff);
+        cx24110_writereg(state, 0x3, (ratio)&0xff);
-        return 0;
+        return 0;
 }
@@ -324,48 +324,48 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
        dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data);
-        cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
+        cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
-        cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
+        cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
-        /* if the auto tuner writer is still busy, clear it out */
+        /* if the auto tuner writer is still busy, clear it out */
-        while (cx24110_readreg(state,0x6d)&0x80)
+        while (cx24110_readreg(state,0x6d)&0x80)
                cx24110_writereg(state,0x72,0);
-        /* write the topmost 8 bits */
+        /* write the topmost 8 bits */
-        cx24110_writereg(state,0x72,(data>>24)&0xff);
+        cx24110_writereg(state,0x72,(data>>24)&0xff);
-        /* wait for the send to be completed */
+        /* wait for the send to be completed */
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* send another 8 bytes */
+        /* send another 8 bytes */
-        cx24110_writereg(state,0x72,(data>>16)&0xff);
+        cx24110_writereg(state,0x72,(data>>16)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* and the topmost 5 bits of this byte */
+        /* and the topmost 5 bits of this byte */
-        cx24110_writereg(state,0x72,(data>>8)&0xff);
+        cx24110_writereg(state,0x72,(data>>8)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* now strobe the enable line once */
+        /* now strobe the enable line once */
-        cx24110_writereg(state,0x6d,0x32);
+        cx24110_writereg(state,0x6d,0x32);
-        cx24110_writereg(state,0x6d,0x30);
+        cx24110_writereg(state,0x6d,0x30);
-        return 0;
+        return 0;
 }
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
        struct cx24110_state *state = fe->demodulator_priv;
 /* fixme (low): error handling */
-        int i;
+        int i;
        dprintk("%s: init chip\n", __FUNCTION__);
-        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
+        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
                cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
-        };
+        };
        if (state->config->pll_init) state->config->pll_init(fe);
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 19b4bf7c21a..1c7c9122447 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -2,7 +2,7 @@
    driver for LSI L64781 COFDM demodulator
    Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                       Marko Kohtala <marko.kohtala@luukku.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
@@ -433,7 +433,7 @@ static int l64781_init(struct dvb_frontend* fe)
 {
        struct l64781_state* state = fe->demodulator_priv;
-        reset_and_configure (state);
+        reset_and_configure (state);
        /* Power up */
        l64781_writereg (state, 0x3e, 0xa5);
@@ -456,9 +456,9 @@ static int l64781_init(struct dvb_frontend* fe)
        l64781_writereg (state, 0x0d, 0x8c);
        /* With ppm=8000, it seems the DTR_SENSITIVITY will result in
-           value of 2 with all possible bandwidths and guard
+           value of 2 with all possible bandwidths and guard
-           intervals, which is the initial value anyway. */
+           intervals, which is the initial value anyway. */
-        /*l64781_writereg (state, 0x19, 0x92);*/
+        /*l64781_writereg (state, 0x19, 0x92);*/
        /* Everything is two's complement, soft bit and CSI_OUT too */
        l64781_writereg (state, 0x1e, 0x09);
@@ -477,10 +477,10 @@ static int l64781_init(struct dvb_frontend* fe)
 static int l64781_get_tune_settings(struct dvb_frontend* fe,
                                    struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 4000;
+        fesettings->min_delay_ms = 4000;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
-        return 0;
+        return 0;
 }
 static void l64781_release(struct dvb_frontend* fe)
@@ -522,7 +522,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* The chip always responds to reads */
        if (i2c_transfer(state->i2c, msg, 2) != 2) {
-                dprintk("No response to read on I2C bus\n");
+                dprintk("No response to read on I2C bus\n");
                goto error;
        }
@@ -531,7 +531,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Reading the POWER_DOWN register always returns 0 */
        if (reg0x3e != 0) {
-                dprintk("Device doesn't look like L64781\n");
+                dprintk("Device doesn't look like L64781\n");
                goto error;
        }
@@ -540,7 +540,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Responds to all reads with 0 */
        if (l64781_readreg(state, 0x1a) != 0) {
-                dprintk("Read 1 returned unexpcted value\n");
+                dprintk("Read 1 returned unexpcted value\n");
                goto error;
        }
@@ -549,7 +549,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Responds with register default value */
        if (l64781_readreg(state, 0x1a) != 0xa1) {
-                dprintk("Read 2 returned unexpcted value\n");
+                dprintk("Read 2 returned unexpcted value\n");
                goto error;
        }
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h
index 7e30fb0fdfa..947f65f8746 100644
--- a/drivers/media/dvb/frontends/l64781.h
+++ b/drivers/media/dvb/frontends/l64781.h
@@ -2,7 +2,7 @@
    driver for LSI L64781 COFDM demodulator
    Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                       Marko Kohtala <marko.kohtala@luukku.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
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 6a33f5a19a8..cb5301865d0 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -301,10 +301,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
        static u8 lgdt3303_8vsb_44_data[] = {
                0x04, 0x00,
                0x0d, 0x40,
-        0x0e, 0x87,
+        0x0e, 0x87,
-        0x0f, 0x8e,
+        0x0f, 0x8e,
-        0x10, 0x01,
+        0x10, 0x01,
-        0x47, 0x8b };
+        0x47, 0x8b };
        /*
         * Array of byte pairs <address, value>
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 9c67f406d58..8d672283c93 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -554,7 +554,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
        if ((ret = mt312_write(state, SYM_RATE_H, buf, sizeof(buf))) < 0)
                return ret;
-        mt312_reset(state, 0);
+        mt312_reset(state, 0);
        return 0;
 }
@@ -695,7 +695,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
                    FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
                    FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
                    FE_CAN_FEC_AUTO | FE_CAN_QPSK | FE_CAN_MUTE_TS |
-                    FE_CAN_RECOVER
+                    FE_CAN_RECOVER
        },
        .release = mt312_release,
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c
index 30786b1911b..52c416043a6 100644
--- a/drivers/media/dvb/frontends/nxt2002.c
+++ b/drivers/media/dvb/frontends/nxt2002.c
@@ -527,7 +527,7 @@ static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr)
        else
                snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) );
-        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
+        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
        *snr = snrdb * (0xFFFF/32000);
@@ -646,7 +646,7 @@ struct dvb_frontend* nxt2002_attach(const struct nxt2002_config* config,
        memcpy(&state->ops, &nxt2002_ops, sizeof(struct dvb_frontend_ops));
        state->initialised = 0;
-        /* Check the first 5 registers to ensure this a revision we can handle */
+        /* Check the first 5 registers to ensure this a revision we can handle */
        i2c_readbytes(state, 0x00, buf, 5);
        if (buf[0] != 0x04) goto error;         /* device id */
@@ -672,7 +672,7 @@ static struct dvb_frontend_ops nxt2002_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 860000000,
-                /* stepsize is just a guess */
+                /* stepsize is just a guess */
                .frequency_stepsize = 166666,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index bad0933eb71..aeafef46e3e 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -44,6 +44,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include "dvb_frontend.h"
 #include "dvb-pll.h"
@@ -337,7 +339,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
        switch (state->demod_chip) {
                case NXT2004:
                        if (i2c_writebytes(state, state->config->pll_address, data, 4))
-                                printk(KERN_WARNING "nxt200x: error writing to tuner\n");
+                                printk(KERN_WARNING "nxt200x: error writing to tuner\n");
                        /* wait until we have a lock */
                        while (count < 20) {
                                i2c_readbytes(state, state->config->pll_address, &buf, 1);
@@ -495,7 +497,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
        /* calculate firmware CRC */
        for (position = 0; position < fw->size; position++) {
-                crc = nxt200x_crc(crc, fw->data[position]);
+                crc = nxt200x_crc(crc, fw->data[position]);
        }
        buf[0] = rambase >> 8;
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index 88a57b79111..a458a3bfff7 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -574,11 +574,11 @@ static struct dvb_frontend_ops nxt6000_ops = {
                .symbol_rate_max = 9360000,     /* FIXME */
                .symbol_rate_tolerance = 4000,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
-                        FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+                        FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
-                        FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                        FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
-                        FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
-                        FE_CAN_HIERARCHY_AUTO,
+                        FE_CAN_HIERARCHY_AUTO,
        },
        .release = nxt6000_release,
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 78bded861d0..80e0f28127b 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -503,7 +503,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
        rcvr_stat = rec_buf[1];
        usK = (rcvr_stat & 0x10) ? 3 : 0;
-        /* The value reported back from the frontend will be FFFF=100% 0000=0% */
+        /* The value reported back from the frontend will be FFFF=100% 0000=0% */
        signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000;
        if (signal_strength > 0xffff)
                *strength = 0xffff;
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index f265418e326..18715091aed 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -494,7 +494,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state)
 }
 static void s5h1420_setfec_inversion(struct s5h1420_state* state,
-                                     struct dvb_frontend_parameters *p)
+                                     struct dvb_frontend_parameters *p)
 {
        u8 inversion = 0;
@@ -521,8 +521,8 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,
                case FEC_3_4:
                        s5h1420_writereg(state, 0x30, 0x04);
-                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
+                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
-                        break;
+                        break;
                case FEC_5_6:
                        s5h1420_writereg(state, 0x30, 0x08);
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h
index 872028ddf2a..73296f13c32 100644
--- a/drivers/media/dvb/frontends/s5h1420.h
+++ b/drivers/media/dvb/frontends/s5h1420.h
@@ -39,6 +39,6 @@ struct s5h1420_config
 };
 extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
-             struct i2c_adapter* i2c);
+             struct i2c_adapter* i2c);
 #endif // S5H1420_H
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 1c6b2e9264b..fc06cd6b46c 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -67,16 +67,16 @@ static int debug;
 static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
 {
-        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
+        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 };
        int err;
-        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static int sp8870_readreg (struct sp8870_state* state, u16 reg)
@@ -305,7 +305,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
 static int sp8870_init (struct dvb_frontend* fe)
 {
        struct sp8870_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+        const struct firmware *fw = NULL;
        sp8870_wake_up(state);
        if (state->initialised) return 0;
@@ -534,10 +534,10 @@ static int sp8870_sleep(struct dvb_frontend* fe)
 static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
+        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
-        return 0;
+        return 0;
 }
 static void sp8870_release(struct dvb_frontend* fe)
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 73384e75625..e3b66578224 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -80,7 +80,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
        u8 b1 [2];
        int ret;
        struct i2c_msg msg[] = {{ .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 },
-                         { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
+                         { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
        if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
                printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
@@ -498,7 +498,7 @@ static int sp887x_sleep(struct dvb_frontend* fe)
 static int sp887x_init(struct dvb_frontend* fe)
 {
        struct sp887x_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+        const struct firmware *fw = NULL;
        int ret;
        if (!state->initialised) {
@@ -528,10 +528,10 @@ static int sp887x_init(struct dvb_frontend* fe)
 static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
+        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 166666*2;
+        fesettings->step_size = 166666*2;
-        fesettings->max_drift = (166666*2)+1;
+        fesettings->max_drift = (166666*2)+1;
-        return 0;
+        return 0;
 }
 static void sp887x_release(struct dvb_frontend* fe)
@@ -581,7 +581,7 @@ static struct dvb_frontend_ops sp887x_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                        FE_CAN_RECOVER
+                        FE_CAN_RECOVER
        },
        .release = sp887x_release,
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 29c48665e13..177d71d56b6 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -95,7 +95,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
 int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        return stv0299_writeregI(state, reg, data);
 }
@@ -220,7 +220,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
 static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u64 big = srate;
        u32 ratio;
@@ -271,7 +271,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
 static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
                                    struct dvb_diseqc_master_cmd *m)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        int i;
@@ -301,7 +301,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        dprintk ("%s\n", __FUNCTION__);
@@ -328,7 +328,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
 static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        if (stv0299_wait_diseqc_idle (state, 100) < 0)
@@ -350,7 +350,7 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 reg0x08;
        u8 reg0x0c;
@@ -442,7 +442,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
 static int stv0299_init (struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        int i;
        dprintk("stv0299: init chip\n");
@@ -461,7 +461,7 @@ static int stv0299_init (struct dvb_frontend* fe)
 static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 signal = 0xff - stv0299_readreg (state, 0x18);
        u8 sync = stv0299_readreg (state, 0x1b);
@@ -489,7 +489,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        if (state->errmode != STATUS_BER) return 0;
        *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -499,7 +499,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 signal =  0xffff - ((stv0299_readreg (state, 0x18) << 8)
                               | stv0299_readreg (state, 0x19));
@@ -516,7 +516,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8)
                           | stv0299_readreg (state, 0x25));
@@ -528,7 +528,7 @@ static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
        else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -538,7 +538,7 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        int invval = 0;
        dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__);
@@ -571,7 +571,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 derot_freq;
        int invval;
@@ -596,7 +596,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int stv0299_sleep(struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        stv0299_writeregI(state, 0x02, 0x80);
        state->initialised = 0;
@@ -606,7 +606,7 @@ static int stv0299_sleep(struct dvb_frontend* fe)
 static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        fesettings->min_delay_ms = state->config->min_delay_ms;
        if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) {
@@ -658,7 +658,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
        /* create dvb_frontend */
        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
+        state->frontend.demodulator_priv = state;
        return &state->frontend;
 error:
@@ -714,7 +714,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver");
 MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, "
-              "Andreas Oberritter, Andrew de Quincey, Kenneth Aafl�y");
+              "Andreas Oberritter, Andrew de Quincey, Kenneth Aafl�y");
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(stv0299_writereg);
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index eaf130e666d..425cd19136f 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -1,10 +1,10 @@
 /*
    TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+               used on the the Siemens DVB-C cards
    Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
    Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                   Support for TDA10021
    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
@@ -76,9 +76,9 @@ static u8 tda10021_inittab[0x40]=
 static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
 {
-        u8 buf[] = { reg, data };
+        u8 buf[] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
-        int ret;
+        int ret;
        ret = i2c_transfer (state->i2c, &msg, 1);
        if (ret != 1)
@@ -95,7 +95,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
        u8 b0 [] = { reg };
        u8 b1 [] = { 0 };
        struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
-                                  { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+                                  { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
        int ret;
        ret = i2c_transfer (state->i2c, msg, 2);
diff --git a/drivers/media/dvb/frontends/tda10021.h b/drivers/media/dvb/frontends/tda10021.h
index 7d6a51ce291..53be939e8c5 100644
--- a/drivers/media/dvb/frontends/tda10021.h
+++ b/drivers/media/dvb/frontends/tda10021.h
@@ -1,10 +1,10 @@
 /*
    TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+               used on the the Siemens DVB-C cards
    Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
    Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                   Support for TDA10021
    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
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 7968743826f..dd02aff467f 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -475,7 +475,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
                if (ret) {
                        printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n");
-                        return ret;
+                        return ret;
                }
                tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
                ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index c05cf186105..91baa9cedd7 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -66,13 +66,13 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
        u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
-        ret = i2c_transfer(state->i2c, &msg, 1);
+        ret = i2c_transfer(state->i2c, &msg, 1);
-        if (ret != 1)
+        if (ret != 1)
-                dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
+                dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg, ret);
-        return (ret != 1) ? -1 : 0;
+        return (ret != 1) ? -1 : 0;
 }
 static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len)
@@ -87,7 +87,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
                dprintk ("%s: readreg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg1, ret);
-        return ret == 2 ? 0 : -1;
+        return ret == 2 ? 0 : -1;
 }
 static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg)
@@ -132,14 +132,14 @@ static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state)
 static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate)
 {
-        u32 ratio;
+        u32 ratio;
        u32 tmp;
        u8 filter;
        if (srate > 32000000)
-                srate = 32000000;
+                srate = 32000000;
-        if (srate < 500000)
+        if (srate < 500000)
-                srate = 500000;
+                srate = 500000;
        filter = 0;
        if (srate < 24000000)
@@ -174,7 +174,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
        unsigned long start = jiffies;
        while (jiffies - start < timeout &&
-               !(tda8083_readreg(state, 0x02) & 0x80))
+               !(tda8083_readreg(state, 0x02) & 0x80))
        {
                msleep(50);
        };
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index c6d276618e8..ad8647a3c85 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -140,25 +140,25 @@ static int ves1820_set_symbolrate(struct ves1820_state *state, u32 symbolrate)
        /* yeuch! */
        fpxin = state->config->xin * 10;
        fptmp = fpxin; do_div(fptmp, 123);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 1;
        fptmp = fpxin; do_div(fptmp, 160);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 0;
        fptmp = fpxin; do_div(fptmp, 246);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 1;
        fptmp = fpxin; do_div(fptmp, 320);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 0;
        fptmp = fpxin; do_div(fptmp, 492);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 1;
        fptmp = fpxin; do_div(fptmp, 640);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 0;
        fptmp = fpxin; do_div(fptmp, 984);
-        if (symbolrate < fptmp);
+        if (symbolrate < fptmp)
                SFIL = 1;
        fin = state->config->xin >> 4;
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index d8bf6587789..fa5034a9ecf 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -81,6 +81,7 @@ config DVB_BUDGET_CI
        tristate "Budget cards with onboard CI connector"
        depends on DVB_CORE && PCI
        select VIDEO_SAA7146
+        select DVB_STV0297
        select DVB_STV0299
        select DVB_TDA1004X
        help
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 87ea52757a2..7dae91e5863 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -176,6 +176,9 @@ static void init_av7110_av(struct av7110 *av7110)
                }
        }
+        if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000e)
+                av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, SpdifSwitch, 1, 0); // SPDIF on
        ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
        if (ret < 0)
                printk("dvb-ttpci:cannot set volume :%d\n",ret);
@@ -217,10 +220,10 @@ static int arm_thread(void *data)
        dprintk(4, "%p\n",av7110);
-        lock_kernel();
+        lock_kernel();
-        daemonize("arm_mon");
+        daemonize("arm_mon");
-        sigfillset(&current->blocked);
+        sigfillset(&current->blocked);
-        unlock_kernel();
+        unlock_kernel();
        av7110->arm_thread = current;
@@ -1535,7 +1538,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
@@ -1811,7 +1814,7 @@ static struct tda8083_config grundig_29504_451_config = {
 static int philips_cd1516_pll_set(struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters* params)
 {
-        struct av7110* av7110 = fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
        u32 div;
        u32 f = params->frequency;
        u8 data[4];
@@ -2202,7 +2205,7 @@ static u8 read_pwm(struct av7110* av7110)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
-        if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+        if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
        return pwm;
@@ -2245,7 +2248,7 @@ static int frontend_init(struct av7110 *av7110)
                        }
                        // Try the grundig 29504-451
-                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
+                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                        if (av7110->fe) {
                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
@@ -2271,12 +2274,12 @@ static int frontend_init(struct av7110 *av7110)
                case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X
                        // ALPS TDLB7
-                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
+                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
                        break;
                case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
-                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
+                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
                        break;
                case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */
@@ -2421,9 +2424,9 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
        dprintk(4, "dev: %p\n", dev);
-        /* Set RPS_IRQ to 1 to track rps1 activity.
+        /* Set RPS_IRQ to 1 to track rps1 activity.
-         * Enabling this won't send any interrupt to PC CPU.
+         * Enabling this won't send any interrupt to PC CPU.
-         */
+         */
 #define RPS_IRQ 0
        if (budgetpatch == 1) {
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index c3801e328fe..6079e8865d5 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -40,6 +40,7 @@
 #include "av7110.h"
 #include "av7110_hw.h"
+#include "av7110_ca.h"
 void CI_handle(struct av7110 *av7110, u8 *data, u16 len)
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 7442f56a72e..87106e8bf35 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -1203,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
 int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap)
 {
-        switch (cap->cmd) {
+        switch (cap->cmd) {
-        case OSD_CAP_MEMSIZE:
+        case OSD_CAP_MEMSIZE:
-                if (FW_4M_SDRAM(av7110->arm_app))
+                if (FW_4M_SDRAM(av7110->arm_app))
-                        cap->val = 1000000;
+                        cap->val = 1000000;
-                else
+                else
-                        cap->val = 92000;
+                        cap->val = 92000;
-                return 0;
+                return 0;
-        default:
+        default:
-                return -EINVAL;
+                return -EINVAL;
-        }
+        }
 }
 #endif /* CONFIG_DVB_AV7110_OSD */
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index fedd20f9815..2a5e87ba105 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -143,7 +143,8 @@ enum av7110_audio_command {
        MainSwitch,
        ADSwitch,
        SendDiSEqC,
-        SetRegister
+        SetRegister,
+        SpdifSwitch
 };
 enum av7110_request_command {
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 6af74f78b3e..b5aea4129fa 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -120,8 +120,8 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 {
-        u8 buf [] = { reg, data };
+        u8 buf [] = { reg, data };
-        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
+        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
                return -1;
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index aa75dc03a0b..9f51bae7194 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1020,6 +1020,8 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 static struct saa7146_extension budget_extension = {
        .name = "budget_av",
+        .flags = SAA7146_I2C_SHORT_DELAY,
        .pci_tbl = pci_tbl,
        .module = THIS_MODULE,
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 75fb92d6099..b9b3cd9c036 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1166,7 +1166,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 static struct saa7146_extension budget_extension = {
        .name = "budget_ci dvb\0",
-        .flags = 0,
+        .flags = SAA7146_I2C_SHORT_DELAY,
        .module = THIS_MODULE,
        .pci_tbl = &pci_tbl[0],
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 0498a055a4c..017fcbccb8c 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -87,7 +87,7 @@ static int start_ts_capture(struct budget *budget)
         *      Pitch: 188, NumBytes3: 188, NumLines3: 1024
         */
-        switch(budget->card->type) {
+        switch(budget->card->type) {
        case BUDGET_FS_ACTIVY:
                saa7146_write(dev, DD1_INIT, 0x04000000);
                saa7146_write(dev, MC2, (MASK_09 | MASK_25));
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 755df81cbc4..fc416cf5253 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -45,11 +45,11 @@ MAKE_BUDGET_INFO(ttbp, "TT-Budget/Patch DVB-S 1.x PCI", BUDGET_PATCH);
 //MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC);
 static struct pci_device_id pci_tbl[] = {
-        MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
+        MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
 //        MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
-        {
+        {
-                .vendor    = 0,
+                .vendor    = 0,
-        }
+        }
 };
 /* those lines are for budget-patch to be tried
@@ -165,57 +165,57 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
 static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length)
 {
-        int i;
+        int i;
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        for (i = 2; i < length; i++)
+        for (i = 2; i < length; i++)
-        {
+        {
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
-                  msleep(5);
+                  msleep(5);
-        }
+        }
-        if (length)
+        if (length)
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
-        else
+        else
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
-        msleep(5);
+        msleep(5);
-        ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
+        ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
-        msleep(5);
+        msleep(5);
-        return 0;
+        return 0;
 }
 static void av7110_set22k(struct budget_patch *budget, int state)
 {
-        u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
+        u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        budget_av7110_send_fw_cmd(budget, buf, 2);
+        budget_av7110_send_fw_cmd(budget, buf, 2);
 }
 static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst)
 {
-        int i;
+        int i;
-        u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
+        u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
-                16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+                16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        if (len>10)
+        if (len>10)
-                len=10;
+                len=10;
-        buf[1] = len+2;
+        buf[1] = len+2;
-        buf[2] = len;
+        buf[2] = len;
-        if (burst != -1)
+        if (burst != -1)
-                buf[3]=burst ? 0x01 : 0x00;
+                buf[3]=burst ? 0x01 : 0x00;
-        else
+        else
-                buf[3]=0xffff;
+                buf[3]=0xffff;
-        for (i=0; i<len; i++)
+        for (i=0; i<len; i++)
-                buf[i+4]=msg[i];
+                buf[i+4]=msg[i];
-        budget_av7110_send_fw_cmd(budget, buf, 18);
+        budget_av7110_send_fw_cmd(budget, buf, 18);
-        return 0;
+        return 0;
 }
 static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
@@ -276,7 +276,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -294,7 +294,7 @@ static u8 alps_bsru6_inittab[] = {
        0x01, 0x15,
        0x02, 0x00,
        0x03, 0x00,
-        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
        0x06, 0x40,   /* DAC not used, set to high impendance mode */
        0x07, 0x00,   /* DAC LSB */
@@ -413,7 +413,7 @@ static void frontend_init(struct budget_patch* budget)
 {
        switch(budget->dev->pci->subsystem_device) {
        case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X
-        case 0x1013: // SATELCO Multimedia PCI
+        case 0x1013: // SATELCO Multimedia PCI
                // try the ALPS BSRV2 first of all
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
@@ -463,8 +463,8 @@ static void frontend_init(struct budget_patch* budget)
 /* written by Emard */
 static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
 {
-        struct budget_patch *budget;
+        struct budget_patch *budget;
-        int err;
+        int err;
        int count = 0;
        int detected = 0;
@@ -472,12 +472,12 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 #define RPS_IRQ 0
 #define HPS_SETUP 0
 #if PATCH_RESET
-        saa7146_write(dev, MC1, MASK_31);
+        saa7146_write(dev, MC1, MASK_31);
-        msleep(40);
+        msleep(40);
 #endif
 #if HPS_SETUP
-        // initialize registers. Better to have it like this
+        // initialize registers. Better to have it like this
-        // than leaving something unconfigured
+        // than leaving something unconfigured
        saa7146_write(dev, DD1_STREAM_B, 0);
        // port B VSYNC at rising edge
        saa7146_write(dev, DD1_INIT, 0x00000200);  // have this in budget-core too!
@@ -486,29 +486,29 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        // debi config
        // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18);
-        // zero all HPS registers
+        // zero all HPS registers
-        saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
+        saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
-        saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
+        saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
-        saa7146_write(dev, BCS_CTRL, 0);                        // r70
+        saa7146_write(dev, BCS_CTRL, 0);                        // r70
-        saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
+        saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
-        saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
+        saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
-        saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
+        saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
-        saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
+        saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
-        // Set HPS prescaler for port B input
+        // Set HPS prescaler for port B input
-        saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
+        saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
-        saa7146_write(dev, MC2,
+        saa7146_write(dev, MC2,
-          0 * (MASK_08 | MASK_24)  |   // BRS control
+          0 * (MASK_08 | MASK_24)  |   // BRS control
-          0 * (MASK_09 | MASK_25)  |   // a
+          0 * (MASK_09 | MASK_25)  |   // a
-          0 * (MASK_10 | MASK_26)  |   // b
+          0 * (MASK_10 | MASK_26)  |   // b
-          1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
+          1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
-          1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
+          1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
-          0 * (MASK_01 | MASK_15)      // DEBI
+          0 * (MASK_01 | MASK_15)      // DEBI
-           );
+           );
 #endif
        // Disable RPS1 and RPS0
-        saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
+        saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
-        // RPS1 timeout disable
+        // RPS1 timeout disable
-        saa7146_write(dev, RPS_TOV1, 0);
+        saa7146_write(dev, RPS_TOV1, 0);
        // code for autodetection
        // will wait for VBI_B event (vertical blank at port B)
@@ -521,38 +521,38 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        WRITE_RPS1(cpu_to_le32(CMD_UPLOAD |
          MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 ));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt to increment counter
+        // issue RPS1 interrupt to increment counter
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
-        // at least a NOP is neede between two interrupts
+        // at least a NOP is neede between two interrupts
-        WRITE_RPS1(cpu_to_le32(CMD_NOP));
+        WRITE_RPS1(cpu_to_le32(CMD_NOP));
-        // interrupt again
+        // interrupt again
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_STOP));
+        WRITE_RPS1(cpu_to_le32(CMD_STOP));
 #if RPS_IRQ
-        // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
+        // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
-        // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
+        // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
-        // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
+        // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
-        saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
+        saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
-        // set event counter 1 treshold to maximum allowed value        (rEC p55)
+        // set event counter 1 treshold to maximum allowed value        (rEC p55)
-        saa7146_write(dev, ECT1R,  0x3fff );
+        saa7146_write(dev, ECT1R,  0x3fff );
 #endif
-        // Fix VSYNC level
+        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
+        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Enable RPS1,                                                 (rFC p33)
+        // Enable RPS1,                                                 (rFC p33)
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
+        saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
-        mdelay(50);
+        mdelay(50);
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
        mdelay(150);
@@ -560,17 +560,17 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
                detected = 1;
 #if RPS_IRQ
-        printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
+        printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
 #endif
        // Disable RPS1
-        saa7146_write(dev, MC1, ( MASK_29 ));
+        saa7146_write(dev, MC1, ( MASK_29 ));
        if(detected == 0)
-                printk("budget-patch not detected or saa7146 in non-default state.\n"
+                printk("budget-patch not detected or saa7146 in non-default state.\n"
-                       "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
+                       "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
        else
-                printk("BUDGET-PATCH DETECTED.\n");
+                printk("BUDGET-PATCH DETECTED.\n");
 /*      OLD (Original design by Roberto Deza):
@@ -641,83 +641,83 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 */
        // Setup RPS1 "program" (p35)
-        count = 0;
+        count = 0;
-        // Wait Source Line Counter Threshold                           (p36)
+        // Wait Source Line Counter Threshold                           (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
-        // Set GPIO3=1                                                  (p42)
+        // Set GPIO3=1                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
+        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Wait reset Source Line Counter Threshold                     (p36)
+        // Wait reset Source Line Counter Threshold                     (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
-        // Set GPIO3=0                                                  (p42)
+        // Set GPIO3=0                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
+        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Jump to begin of RPS program                                 (p37)
+        // Jump to begin of RPS program                                 (p37)
-        WRITE_RPS1(cpu_to_le32(CMD_JUMP));
+        WRITE_RPS1(cpu_to_le32(CMD_JUMP));
-        WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
+        WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
-        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-        // It generates HS event every TS_HEIGHT lines
-        // this is related to TS_WIDTH set in register
-        // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
-        // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
-        //,then RPS_THRESH1
-        // should be set to trigger every TS_HEIGHT (512) lines.
-        //
-        saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
-        // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
+        // Fix VSYNC level
-        // Enable RPS1                                                  (rFC p33)
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29));
+        // Set RPS1 Address register to point to RPS code               (r108 p42)
+        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+        // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-        if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
+        // It generates HS event every TS_HEIGHT lines
-                return -ENOMEM;
+        // this is related to TS_WIDTH set in register
+        // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
+        // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
+        //,then RPS_THRESH1
+        // should be set to trigger every TS_HEIGHT (512) lines.
+        //
+        saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
+        // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
+        // Enable RPS1                                                  (rFC p33)
+        saa7146_write(dev, MC1, (MASK_13 | MASK_29));
+        if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
+                return -ENOMEM;
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
-                kfree (budget);
+                kfree (budget);
-                return err;
+                return err;
-        }
+        }
-        dev->ext_priv = budget;
+        dev->ext_priv = budget;
        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
-        return 0;
+        return 0;
 }
 static int budget_patch_detach (struct saa7146_dev* dev)
 {
-        struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
+        struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
-        int err;
+        int err;
        if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend);
-        err = ttpci_budget_deinit (budget);
+        err = ttpci_budget_deinit (budget);
-        kfree (budget);
+        kfree (budget);
-        return err;
+        return err;
 }
 static int __init budget_patch_init(void)
@@ -727,20 +727,20 @@ static int __init budget_patch_init(void)
 static void __exit budget_patch_exit(void)
 {
-        saa7146_unregister_extension(&budget_extension);
+        saa7146_unregister_extension(&budget_extension);
 }
 static struct saa7146_extension budget_extension = {
-        .name           = "budget_patch dvb\0",
+        .name           = "budget_patch dvb\0",
-        .flags          = 0,
+        .flags          = 0,
-        .module         = THIS_MODULE,
+        .module         = THIS_MODULE,
-        .pci_tbl        = pci_tbl,
+        .pci_tbl        = pci_tbl,
-        .attach         = budget_patch_attach,
+        .attach         = budget_patch_attach,
-        .detach         = budget_patch_detach,
+        .detach         = budget_patch_detach,
-        .irq_mask       = MASK_10,
+        .irq_mask       = MASK_10,
-        .irq_func       = ttpci_budget_irq10_handler,
+        .irq_func       = ttpci_budget_irq10_handler,
 };
 module_init(budget_patch_init);
@@ -749,4 +749,4 @@ module_exit(budget_patch_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others");
 MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 "
-                   "based so-called Budget Patch cards");
+                   "based so-called Budget Patch cards");
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 4fd8bbc4703..fafe6407b3d 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -256,7 +256,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -565,7 +565,7 @@ static u8 read_pwm(struct budget* budget)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
-        if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+        if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
        return pwm;
@@ -593,7 +593,7 @@ static void frontend_init(struct budget *budget)
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
                if (budget->dvb_frontend) {
                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
                        break;
                }
@@ -738,7 +738,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 static struct saa7146_extension budget_extension = {
        .name           = "budget dvb\0",
-        .flags          = 0,
+        .flags          = SAA7146_I2C_SHORT_DELAY,
        .module         = THIS_MODULE,
        .pci_tbl        = pci_tbl,
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index c6ef496ba70..c8d48cfba27 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -19,7 +19,7 @@ extern int budget_debug;
 #endif
 #define dprintk(level,args...) \
-            do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
+            do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)
 struct budget_info {
        char *name;
diff --git a/drivers/media/dvb/ttpci/fdump.c b/drivers/media/dvb/ttpci/fdump.c
index 0b478db3e74..c90001d35e7 100644
--- a/drivers/media/dvb/ttpci/fdump.c
+++ b/drivers/media/dvb/ttpci/fdump.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
    }
    fprintf(fd_out, "\n};\n\n");
-    
    fclose(fd_in);
    fclose(fd_out);
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c
index e9a8457b072..18aa22b5478 100644
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -13,7 +13,7 @@
    Holger Waechtler    Convergence
    Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de>
-                            Metzler Brothers Systementwicklung GbR
+                            Metzler Brothers Systementwicklung GbR
    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
@@ -37,6 +37,7 @@
 #include <linux/string.h>
 #include <linux/i2c.h>
+#include "ttpci-eeprom.h"
 #if 1
 #define dprintk(x...) do { printk(x); } while (0)
@@ -47,41 +48,41 @@
 static int check_mac_tt(u8 *buf)
 {
-        int i;
+        int i;
-        u16 tmp = 0xffff;
+        u16 tmp = 0xffff;
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < 8; i++) {
-                tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
+                tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
-                tmp ^= (tmp >> 4) & 0x0f;
+                tmp ^= (tmp >> 4) & 0x0f;
-                tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
+                tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
-        }
+        }
-        tmp ^= 0xffff;
+        tmp ^= 0xffff;
-        return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
+        return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
 }
 static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC)
 {
-        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
+        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
                       0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6,
                       0x1d, 0x36, 0x64, 0x78};
-        u8 data[20];
+        u8 data[20];
-        int i;
+        int i;
        /* In case there is a sig check failure have the orig contents available */
        memcpy(data, encodedMAC, 20);
        for (i = 0; i < 20; i++)
-                data[i] ^= xor[i];
+                data[i] ^= xor[i];
-        for (i = 0; i < 10; i++)
+        for (i = 0; i < 10; i++)
-                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
+                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
                        >> ((data[2 * i + 1] >> 6) & 3);
-        if (check_mac_tt(data))
+        if (check_mac_tt(data))
-                return -ENODEV;
+                return -ENODEV;
        decodedMAC[0] = data[2]; decodedMAC[1] = data[1]; decodedMAC[2] = data[0];
        decodedMAC[3] = data[6]; decodedMAC[4] = data[5]; decodedMAC[5] = data[4];
-        return 0;
+        return 0;
 }
 static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC)
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index fd53d601050..104df610dbe 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -225,8 +225,8 @@ static int ttusb_i2c_msg(struct ttusb *ttusb,
        err = ttusb_result(ttusb, b, 0x20);
-        /* check if the i2c transaction was successful */
+        /* check if the i2c transaction was successful */
-        if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
+        if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
        if (rcv_len > 0) {
@@ -489,27 +489,27 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,
 static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
+        struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
-        int ret;
+        int ret;
-        u8 data[1];
+        u8 data[1];
-        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
+        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
-        switch(voltage) {
+        switch(voltage) {
-        case SEC_VOLTAGE_OFF:
+        case SEC_VOLTAGE_OFF:
-                data[0] = 0x00;
+                data[0] = 0x00;
-                break;
+                break;
-        case SEC_VOLTAGE_13:
+        case SEC_VOLTAGE_13:
-                data[0] = 0x44;
+                data[0] = 0x44;
-                break;
+                break;
-        case SEC_VOLTAGE_18:
+        case SEC_VOLTAGE_18:
-                data[0] = 0x4c;
+                data[0] = 0x4c;
-                break;
+                break;
-        default:
+        default:
-                return -EINVAL;
+                return -EINVAL;
-        };
+        };
-        ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
+        ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
-        return (ret != 1) ? -EIO : 0;
+        return (ret != 1) ? -EIO : 0;
 }
 static int ttusb_update_lnb(struct ttusb *ttusb)
@@ -1184,45 +1184,45 @@ static struct tda1004x_config philips_tdm1316l_config = {
 };
 static u8 alps_bsbe1_inittab[] = {
-        0x01, 0x15,
+        0x01, 0x15,
-        0x02, 0x30,
+        0x02, 0x30,
-        0x03, 0x00,
+        0x03, 0x00,
-        0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
-        0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
-        0x06, 0x40,             /* DAC not used, set to high impendance mode */
+        0x06, 0x40,             /* DAC not used, set to high impendance mode */
-        0x07, 0x00,             /* DAC LSB */
+        0x07, 0x00,             /* DAC LSB */
-        0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
-        0x09, 0x00,             /* FIFO */
+        0x09, 0x00,             /* FIFO */
-        0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
-        0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
-        0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
+        0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
-        0x10, 0x3f,             // AGC2  0x3d
+        0x10, 0x3f,             // AGC2  0x3d
-        0x11, 0x84,
+        0x11, 0x84,
-        0x12, 0xb9,
+        0x12, 0xb9,
-        0x15, 0xc9,             // lock detector threshold
+        0x15, 0xc9,             // lock detector threshold
-        0x16, 0x00,
+        0x16, 0x00,
-        0x17, 0x00,
+        0x17, 0x00,
-        0x18, 0x00,
+        0x18, 0x00,
-        0x19, 0x00,
+        0x19, 0x00,
-        0x1a, 0x00,
+        0x1a, 0x00,
-        0x1f, 0x50,
+        0x1f, 0x50,
-        0x20, 0x00,
+        0x20, 0x00,
-        0x21, 0x00,
+        0x21, 0x00,
-        0x22, 0x00,
+        0x22, 0x00,
-        0x23, 0x00,
+        0x23, 0x00,
-        0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
+        0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
-        0x29, 0x1e,             // 1/2 threshold
+        0x29, 0x1e,             // 1/2 threshold
-        0x2a, 0x14,             // 2/3 threshold
+        0x2a, 0x14,             // 2/3 threshold
-        0x2b, 0x0f,             // 3/4 threshold
+        0x2b, 0x0f,             // 3/4 threshold
-        0x2c, 0x09,             // 5/6 threshold
+        0x2c, 0x09,             // 5/6 threshold
-        0x2d, 0x05,             // 7/8 threshold
+        0x2d, 0x05,             // 7/8 threshold
-        0x2e, 0x01,
+        0x2e, 0x01,
-        0x31, 0x1f,             // test all FECs
+        0x31, 0x1f,             // test all FECs
-        0x32, 0x19,             // viterbi and synchro search
+        0x32, 0x19,             // viterbi and synchro search
-        0x33, 0xfc,             // rs control
+        0x33, 0xfc,             // rs control
-        0x34, 0x93,             // error control
+        0x34, 0x93,             // error control
-        0x0f, 0x92,
+        0x0f, 0x92,
-        0xff, 0xff
+        0xff, 0xff
 };
 static u8 alps_bsru6_inittab[] = {
@@ -1350,7 +1350,7 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct
        u32 div;
        struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
-        div = params->frequency / 125;
+        div = params->frequency / 125;
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
@@ -1487,7 +1487,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        udev = interface_to_usbdev(intf);
-        if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
+        if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
        if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
                return -ENOMEM;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
index 95ee7995455..8c3cd545e8f 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
@@ -2,1643 +2,1643 @@
 #include <asm/types.h>
 static u8 dsp_bootcode [] = {
-        0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00, 
+        0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00,
-        0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f, 
+        0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f,
-        0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb, 
+        0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb,
-        0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8, 
+        0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8,
-        0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe, 
+        0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe,
-        0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5, 
+        0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5,
-        0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00, 
+        0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00,
-        0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8, 
+        0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8,
-        0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5, 
+        0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5,
-        0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01, 
+        0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01,
-        0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8, 
+        0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89,
-        0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20, 
+        0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20,
-        0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d, 
+        0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d,
-        0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02, 
+        0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02,
-        0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00, 
+        0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00,
-        0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03, 
+        0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03,
-        0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74, 
+        0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74,
-        0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11, 
+        0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11,
-        0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8, 
+        0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8,
-        0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95, 
+        0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95,
-        0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6, 
+        0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6,
-        0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee, 
+        0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee,
-        0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff, 
+        0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff,
-        0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45, 
+        0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45,
-        0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3, 
+        0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3,
-        0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16, 
+        0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20, 
+        0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20,
-        0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e, 
+        0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e,
-        0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95, 
+        0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95,
-        0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11, 
+        0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11,
-        0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01, 
+        0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01,
-        0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11, 
+        0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11,
-        0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00, 
+        0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00,
-        0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11, 
+        0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11,
-        0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10, 
+        0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10,
-        0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15, 
+        0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15,
-        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21, 
+        0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21,
-        0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8, 
+        0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8,
-        0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16, 
+        0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16,
-        0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 
+        0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d,
-        0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 
+        0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8,
-        0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 
+        0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d,
-        0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01, 
+        0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01,
-        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb, 
+        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb,
-        0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00, 
+        0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00,
-        0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c, 
+        0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c,
-        0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11, 
+        0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11,
-        0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e, 
+        0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e,
-        0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12, 
+        0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12,
-        0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3, 
+        0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3,
-        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66, 
+        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66,
-        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87, 
+        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87,
-        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8, 
+        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8,
-        0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8, 
+        0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8,
-        0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12, 
+        0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12,
-        0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f, 
+        0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
-        0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93, 
+        0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93,
-        0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05, 
+        0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05,
-        0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0, 
+        0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0,
-        0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f, 
+        0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f,
-        0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8, 
+        0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8,
-        0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f, 
+        0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f,
-        0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93, 
+        0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93,
-        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8, 
+        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8,
-        0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0, 
+        0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0,
-        0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11, 
+        0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2, 
+        0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2,
-        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74, 
+        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74,
-        0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2, 
+        0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2,
-        0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00, 
+        0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6,
-        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
+        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
-        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
+        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
-        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
+        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
-        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
+        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
-        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
+        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
-        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
+        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
-        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
+        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
+        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
-        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd, 
+        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd,
-        0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30,
-        0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 
+        0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff,
-        0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 
+        0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80,
-        0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95, 
+        0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95,
-        0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a, 
+        0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a,
-        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19, 
+        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19,
-        0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15, 
+        0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15,
-        0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11, 
+        0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11,
-        0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 
+        0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b,
-        0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb, 
+        0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb,
-        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
-        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 
+        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2,
-        0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 
+        0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2,
-        0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
+        0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04,
-        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
+        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e, 
+        0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e,
-        0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01, 
+        0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01,
-        0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff, 
+        0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff,
-        0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00, 
+        0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
-        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2, 
+        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2,
-        0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2, 
+        0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2,
-        0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
+        0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1, 
+        0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1,
-        0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff, 
+        0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff,
-        0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06, 
+        0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06,
-        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
+        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 
+        0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39,
-        0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 
+        0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18,
-        0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 
+        0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01,
-        0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 
+        0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02,
-        0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11, 
+        0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11,
-        0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95,
-        0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98, 
+        0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98,
-        0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b, 
+        0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b,
-        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71, 
+        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71,
-        0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
-        0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15, 
+        0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15,
-        0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11, 
+        0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11,
-        0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83, 
+        0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83,
-        0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05, 
+        0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05,
-        0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8, 
+        0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8,
-        0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01, 
+        0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01,
-        0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c, 
+        0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c,
-        0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1, 
+        0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1,
-        0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9, 
+        0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9,
-        0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00, 
+        0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00,
-        0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00, 
+        0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00,
-        0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74, 
+        0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74,
-        0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10, 
+        0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74,
-        0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12, 
+        0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12,
-        0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11, 
+        0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11,
-        0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2, 
+        0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2,
-        0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2, 
+        0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2,
-        0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c, 
+        0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c,
-        0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0, 
+        0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0,
-        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8, 
+        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8,
-        0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
+        0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
-        0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16, 
+        0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16,
-        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
+        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff, 
+        0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8,
-        0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2, 
+        0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2,
-        0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0, 
+        0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0,
-        0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a, 
+        0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a,
-        0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff, 
+        0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff,
-        0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2, 
+        0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0, 
+        0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0,
-        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8, 
+        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8,
-        0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
+        0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
-        0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a, 
+        0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a,
-        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
+        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff, 
+        0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2,
-        0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12, 
+        0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12,
-        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58, 
+        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58,
-        0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8, 
+        0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8,
-        0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2, 
+        0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2,
-        0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16, 
+        0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16,
-        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58, 
+        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58,
-        0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8, 
+        0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8,
-        0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2, 
+        0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2,
-        0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a, 
+        0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a,
-        0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00,
-        0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2, 
+        0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2,
-        0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e, 
+        0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e,
-        0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00,
-        0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2, 
+        0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2,
-        0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed, 
+        0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed,
-        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02, 
+        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02,
-        0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08, 
+        0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08,
-        0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20, 
+        0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20,
-        0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10, 
+        0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10,
-        0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08, 
+        0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08,
-        0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74, 
+        0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74,
-        0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12, 
+        0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12,
-        0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04, 
+        0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04,
-        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
+        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
-        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
+        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
-        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69, 
+        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69,
-        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
+        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
-        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
+        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
-        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
+        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
-        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41, 
+        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41,
-        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
+        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
-        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57, 
+        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57,
-        0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c, 
+        0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c,
-        0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36, 
+        0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36,
-        0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 
+        0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea,
-        0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00, 
+        0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00,
-        0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 
+        0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95,
-        0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 
+        0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8,
-        0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74, 
+        0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74,
-        0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 
+        0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73,
-        0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff, 
+        0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff,
-        0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1, 
+        0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1,
-        0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01, 
+        0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01,
-        0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a, 
+        0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a,
-        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc, 
+        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc,
-        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02, 
+        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
-        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
+        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
-        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
+        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
-        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
+        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09,
-        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
+        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
-        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00, 
+        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00,
-        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
+        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
-        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
+        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
-        0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
+        0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
-        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
+        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
-        0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01, 
+        0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01,
-        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02,
-        0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03, 
+        0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03,
-        0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11, 
+        0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11,
-        0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00, 
+        0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00, 
+        0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95,
-        0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11, 
+        0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11,
-        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a, 
+        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a,
-        0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00, 
+        0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
-        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
+        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
-        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
+        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
-        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
+        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c,
-        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
+        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
-        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00, 
+        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00,
-        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
+        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
-        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
+        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
-        0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
+        0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
-        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
+        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
-        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 
+        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01,
-        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02,
-        0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 
+        0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03,
-        0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 
+        0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04,
-        0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d, 
+        0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d,
-        0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 
+        0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01,
-        0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 
+        0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c,
-        0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa, 
+        0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa,
-        0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 
+        0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38, 
+        0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38,
-        0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1, 
+        0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1,
-        0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56, 
+        0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56,
-        0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 
+        0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95,
-        0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8, 
+        0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8,
-        0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3, 
+        0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3,
-        0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2, 
+        0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2,
-        0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1, 
+        0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1,
-        0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1, 
+        0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1,
-        0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00, 
+        0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00,
-        0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8, 
+        0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8,
-        0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44, 
+        0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44,
-        0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd, 
+        0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd,
-        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8, 
+        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8,
-        0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2, 
+        0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2,
-        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
+        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
-        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
+        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
-        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
+        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
-        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
+        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
-        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
+        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
-        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
+        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
-        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
+        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
+        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
-        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff, 
+        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04,
-        0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18, 
+        0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18,
-        0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 
+        0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d,
-        0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 
+        0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e,
-        0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 
+        0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 
+        0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12,
-        0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 
+        0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c,
-        0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 
+        0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08,
-        0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38, 
+        0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38,
-        0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00,
-        0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6, 
+        0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6,
-        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b, 
+        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b,
-        0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa, 
+        0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f,
-        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a, 
+        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a,
-        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a, 
+        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a,
-        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b, 
+        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b,
-        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b, 
+        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b,
-        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
+        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
-        0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
+        0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
-        0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
+        0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
-        0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91, 
+        0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11,
-        0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79, 
+        0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79,
-        0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95, 
+        0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95,
-        0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11, 
+        0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
-        0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11, 
+        0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11,
-        0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8, 
+        0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8,
-        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
+        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
-        0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0, 
+        0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0,
-        0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8, 
+        0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8,
-        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
+        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
-        0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00, 
+        0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00,
-        0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11, 
+        0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02,
-        0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20,
-        0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11, 
+        0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73,
-        0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b, 
+        0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b,
-        0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00, 
+        0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12,
-        0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
+        0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
-        0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
+        0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
-        0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92, 
+        0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92,
-        0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00, 
+        0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00,
-        0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13, 
+        0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13,
-        0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01,
-        0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda, 
+        0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda,
-        0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 
+        0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05,
-        0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01, 
+        0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01,
-        0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01, 
+        0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01,
-        0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8, 
+        0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8,
-        0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00, 
+        0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00,
-        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba, 
+        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba,
-        0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11, 
+        0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12,
-        0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13, 
+        0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13,
-        0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20,
-        0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
+        0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
-        0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8, 
+        0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8,
-        0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11, 
+        0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11,
-        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce, 
+        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce,
-        0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30, 
+        0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30,
-        0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 
+        0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc,
-        0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16, 
+        0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16,
-        0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03, 
+        0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03,
-        0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45, 
+        0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45,
-        0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03, 
+        0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03,
-        0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00, 
+        0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00,
-        0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b, 
+        0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b,
-        0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff, 
+        0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff,
-        0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 
+        0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9, 
+        0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9,
-        0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01, 
+        0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01,
-        0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74, 
+        0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74,
-        0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11, 
+        0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11,
-        0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9, 
+        0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9,
-        0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9, 
+        0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9,
-        0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8, 
+        0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8,
-        0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11, 
+        0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30, 
+        0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8,
-        0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9, 
+        0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9,
-        0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8, 
+        0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8,
-        0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76, 
+        0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76,
-        0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8, 
+        0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8, 
+        0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8,
-        0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80, 
+        0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80,
-        0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80, 
+        0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80,
-        0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 
+        0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 
+        0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 
+        0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a,
-        0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1, 
+        0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1,
-        0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01, 
+        0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01,
-        0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8, 
+        0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8,
-        0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6, 
+        0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20,
-        0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 
+        0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d,
-        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09, 
+        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09,
-        0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74, 
+        0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74,
-        0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01, 
+        0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01,
-        0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11, 
+        0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11,
-        0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00, 
+        0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00,
-        0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f, 
+        0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80,
-        0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00, 
+        0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00,
-        0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33, 
+        0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33,
-        0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25, 
+        0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25,
-        0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82, 
+        0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82,
-        0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2, 
+        0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2,
-        0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3, 
+        0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3,
-        0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36, 
+        0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8,
-        0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39, 
+        0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39,
-        0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8, 
+        0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8,
-        0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2, 
+        0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2,
-        0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79, 
+        0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79,
-        0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30,
-        0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8, 
+        0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8,
-        0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 
+        0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79, 
+        0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff,
-        0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20, 
+        0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20,
-        0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74, 
+        0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74,
-        0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72, 
+        0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72,
-        0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95,
-        0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f, 
+        0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f,
-        0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00, 
+        0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00,
-        0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83, 
+        0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83,
-        0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff, 
+        0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff,
-        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 
+        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00,
-        0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91, 
+        0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91,
-        0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11, 
+        0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11,
-        0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30, 
+        0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30,
-        0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30, 
+        0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30,
-        0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08, 
+        0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08,
-        0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9, 
+        0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1,
-        0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b, 
+        0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b,
-        0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08, 
+        0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08,
-        0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b, 
+        0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff,
-        0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00,
-        0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75, 
+        0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75,
-        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8, 
+        0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8,
-        0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00, 
+        0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00,
-        0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74, 
+        0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74,
-        0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95, 
+        0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a, 
+        0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a,
-        0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62, 
+        0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62,
-        0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80, 
+        0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80,
-        0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11, 
+        0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb, 
+        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb,
-        0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73, 
+        0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73,
-        0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
+        0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
-        0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73, 
+        0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73,
-        0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20, 
+        0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20,
-        0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee, 
+        0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee,
-        0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96, 
+        0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96,
-        0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a, 
+        0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a,
-        0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
+        0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
-        0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03, 
+        0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03,
-        0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 
+        0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95,
-        0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb, 
+        0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb,
-        0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41, 
+        0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41,
-        0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13,
-        0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8, 
+        0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8,
-        0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00, 
+        0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00,
-        0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0, 
+        0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0,
-        0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8, 
+        0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8,
-        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8, 
+        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8,
-        0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12, 
+        0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01, 
+        0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81,
-        0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86, 
+        0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86,
-        0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
+        0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67, 
+        0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67,
-        0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a, 
+        0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a,
-        0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
+        0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67, 
+        0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67,
-        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b, 
+        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b,
-        0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30, 
+        0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30,
-        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a, 
+        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a,
-        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02, 
+        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02,
-        0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30, 
+        0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30,
-        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a, 
+        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a,
-        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01, 
+        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01,
-        0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11, 
+        0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
-        0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8, 
+        0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8,
-        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
+        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
-        0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8, 
+        0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8,
-        0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 
+        0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80,
-        0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00, 
+        0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00,
-        0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80, 
+        0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
-        0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20, 
+        0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20,
-        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73, 
+        0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73,
-        0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20, 
+        0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20,
-        0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73, 
+        0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73,
-        0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8, 
+        0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8,
-        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
+        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
-        0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00, 
+        0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00,
-        0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30, 
+        0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30,
-        0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20, 
+        0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20,
-        0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8, 
+        0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8,
-        0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b, 
+        0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b,
-        0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00, 
+        0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00,
-        0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16, 
+        0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08, 
+        0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08,
-        0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30, 
+        0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30,
-        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
+        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
-        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
+        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a,
-        0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16, 
+        0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16,
-        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
+        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
-        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
+        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
-        0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00, 
+        0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00,
-        0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17,
-        0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17, 
+        0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17,
-        0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d, 
+        0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d,
-        0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18, 
+        0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18,
-        0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f, 
+        0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f,
-        0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01, 
+        0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01,
-        0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74, 
+        0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74,
-        0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04, 
+        0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04,
-        0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
+        0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
-        0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8, 
+        0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8,
-        0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72, 
+        0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72,
-        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00,
-        0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79, 
+        0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00,
-        0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8, 
+        0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8,
-        0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8, 
+        0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 
+        0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00,
-        0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc, 
+        0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc,
-        0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00, 
+        0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00,
-        0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00, 
+        0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00,
-        0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12, 
+        0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12,
-        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12, 
+        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12,
-        0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01, 
+        0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01,
-        0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02, 
+        0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02,
-        0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11, 
+        0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11,
-        0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80, 
+        0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
-        0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20, 
+        0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20,
-        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 
+        0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00, 
+        0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00,
-        0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11, 
+        0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11,
-        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11, 
+        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11,
-        0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 
+        0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80,
-        0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20, 
+        0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20,
-        0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b, 
+        0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b,
-        0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01, 
+        0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73,
-        0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11, 
+        0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02,
-        0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb, 
+        0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb,
-        0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95, 
+        0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95,
-        0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8, 
+        0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8,
-        0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e, 
+        0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e,
-        0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e, 
+        0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e,
-        0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00, 
+        0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11,
-        0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff, 
+        0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff,
-        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00, 
+        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00,
-        0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70, 
+        0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70,
-        0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8, 
+        0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8,
-        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12, 
+        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12,
-        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12, 
+        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01, 
+        0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8,
-        0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71, 
+        0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71,
-        0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04, 
+        0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04,
-        0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a, 
+        0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a,
-        0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00, 
+        0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00,
-        0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff, 
+        0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff,
-        0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00, 
+        0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00,
-        0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 
+        0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00,
-        0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00, 
+        0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00,
-        0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11, 
+        0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11,
-        0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95, 
+        0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95,
-        0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11, 
+        0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17, 
+        0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17,
-        0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15, 
+        0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15,
-        0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05, 
+        0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05,
-        0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06, 
+        0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06,
-        0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11, 
+        0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11,
-        0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06, 
+        0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06,
-        0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20,
-        0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01, 
+        0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01,
-        0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa, 
+        0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00, 
+        0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00,
-        0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11, 
+        0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11,
-        0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a, 
+        0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a,
-        0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09, 
+        0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09,
-        0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 
+        0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce,
-        0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95,
-        0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73, 
+        0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73,
-        0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8, 
+        0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8,
-        0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12, 
+        0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c, 
+        0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c,
-        0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11, 
+        0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11,
-        0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01,
-        0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1, 
+        0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1,
-        0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02, 
+        0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02,
-        0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87, 
+        0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87,
-        0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20, 
+        0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20,
-        0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
+        0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
-        0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 
+        0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce,
-        0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17, 
+        0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17,
-        0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09, 
+        0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09,
-        0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 
+        0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74,
-        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 
+        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16,
-        0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
+        0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
-        0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
+        0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
-        0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc, 
+        0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc,
-        0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11, 
+        0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11,
-        0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
+        0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
-        0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16, 
+        0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16,
-        0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95,
-        0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00, 
+        0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00,
-        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
+        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45, 
+        0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45,
-        0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae, 
+        0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae,
-        0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1, 
+        0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1,
-        0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb, 
+        0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb,
-        0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9, 
+        0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9,
-        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
+        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
-        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
+        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
-        0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11, 
+        0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11,
-        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
+        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
-        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
+        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
-        0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06, 
+        0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06,
-        0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00, 
+        0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00,
-        0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f, 
+        0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f,
-        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
+        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
-        0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11, 
+        0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11,
-        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
+        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
-        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
+        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
-        0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11, 
+        0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11,
-        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
+        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
-        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
+        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
-        0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45, 
+        0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45,
-        0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06, 
+        0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06,
-        0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04, 
+        0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04,
-        0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30, 
+        0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30,
-        0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 
+        0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04,
-        0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 
+        0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0,
-        0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 
+        0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18,
-        0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 
+        0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04,
-        0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86, 
+        0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86,
-        0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e, 
+        0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e,
-        0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74, 
+        0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74,
-        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e, 
+        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e,
-        0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8, 
+        0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8,
-        0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30, 
+        0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30,
-        0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09, 
+        0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09,
-        0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10, 
+        0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71, 
+        0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71,
-        0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00, 
+        0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00,
-        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95, 
+        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01, 
+        0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01,
-        0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee, 
+        0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee,
-        0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99, 
+        0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99,
-        0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a, 
+        0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a,
-        0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00, 
+        0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00,
-        0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 
+        0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c,
-        0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01, 
+        0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01,
-        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9, 
+        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9,
-        0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82, 
+        0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82,
-        0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82, 
+        0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82,
-        0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01, 
+        0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01,
-        0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8, 
+        0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8,
-        0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8, 
+        0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8,
-        0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00, 
+        0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00,
-        0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11, 
+        0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11,
-        0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1, 
+        0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1,
-        0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14, 
+        0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14,
-        0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12, 
+        0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12,
-        0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff, 
+        0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff,
-        0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13,
-        0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c, 
+        0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c,
-        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
+        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
-        0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01, 
+        0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01,
-        0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9, 
+        0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9,
-        0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02, 
+        0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02,
-        0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11, 
+        0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11,
-        0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00, 
+        0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00,
-        0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00, 
+        0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00,
-        0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa, 
+        0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa,
-        0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8, 
+        0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8,
-        0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00, 
+        0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00,
-        0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48, 
+        0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48,
-        0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8, 
+        0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8,
-        0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01, 
+        0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a, 
+        0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a,
-        0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01, 
+        0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a, 
+        0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a,
-        0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12, 
+        0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12,
-        0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73, 
+        0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73,
-        0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c, 
+        0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c,
-        0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81, 
+        0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81,
-        0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10, 
+        0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10,
-        0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1, 
+        0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1,
-        0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01, 
+        0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01,
-        0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13, 
+        0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13,
-        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11,
-        0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73, 
+        0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73,
-        0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01, 
+        0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01,
-        0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13, 
+        0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13,
-        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a, 
+        0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a,
-        0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84, 
+        0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84,
-        0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88, 
+        0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88,
-        0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 
+        0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85,
-        0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 
+        0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00,
-        0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03, 
+        0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03,
-        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
+        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
-        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
+        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
-        0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 
+        0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84,
-        0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01, 
+        0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01,
-        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
+        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
-        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
+        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
-        0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff, 
+        0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff,
-        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78, 
+        0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1,
-        0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5, 
+        0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5,
-        0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06, 
+        0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06,
-        0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30, 
+        0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30,
-        0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 
+        0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07, 
+        0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07,
-        0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b, 
+        0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b,
-        0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73, 
+        0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73,
-        0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
+        0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
-        0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11, 
+        0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11,
-        0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd, 
+        0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd,
-        0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4, 
+        0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4,
-        0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60, 
+        0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60,
-        0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8, 
+        0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8,
-        0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8, 
+        0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8,
-        0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00, 
+        0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00,
-        0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20, 
+        0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20,
-        0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
+        0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
-        0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73, 
+        0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73,
-        0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74, 
+        0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74,
-        0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8, 
+        0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8,
-        0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7, 
+        0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7,
-        0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 
+        0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0,
-        0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1, 
+        0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1,
-        0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03, 
+        0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11,
-        0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01, 
+        0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01,
-        0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95, 
+        0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95,
-        0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01, 
+        0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01,
-        0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c, 
+        0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c,
-        0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3, 
+        0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3,
-        0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
-        0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e, 
+        0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e,
-        0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5, 
+        0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5,
-        0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87, 
+        0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87,
-        0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62, 
+        0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62,
-        0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5, 
+        0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5,
-        0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66, 
+        0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66,
-        0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87, 
+        0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87,
-        0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00, 
+        0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00,
-        0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00, 
+        0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00,
-        0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7, 
+        0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7,
-        0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6, 
+        0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6,
-        0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6, 
+        0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6,
-        0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11, 
+        0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 
+        0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09,
-        0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b, 
+        0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b,
-        0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73, 
+        0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73,
-        0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01, 
+        0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01,
-        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09, 
+        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09,
-        0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08, 
+        0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08,
-        0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07, 
+        0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07,
-        0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0, 
+        0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0,
-        0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00, 
+        0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00,
-        0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01, 
+        0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01,
-        0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16, 
+        0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16,
-        0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 
+        0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00,
-        0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02, 
+        0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12, 
+        0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12,
-        0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 
+        0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00,
-        0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81, 
+        0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81,
-        0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d, 
+        0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d,
-        0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1, 
+        0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c, 
+        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
+        0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e,
-        0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00, 
+        0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00,
-        0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
+        0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
-        0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00, 
+        0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00,
-        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00,
-        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e, 
+        0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e,
-        0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00, 
+        0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00,
-        0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00, 
+        0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00,
-        0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14, 
+        0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14,
-        0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c, 
+        0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c,
-        0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11, 
+        0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11,
-        0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13, 
+        0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13,
-        0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12, 
+        0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13,
-        0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14, 
+        0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d, 
+        0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d,
-        0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e, 
+        0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e,
-        0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66, 
+        0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66,
-        0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 
+        0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11,
-        0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32, 
+        0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d, 
+        0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d,
-        0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20, 
+        0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20,
-        0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04, 
+        0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04,
-        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
+        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
-        0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04, 
+        0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04,
-        0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1, 
+        0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30, 
+        0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30,
-        0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa, 
+        0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b, 
+        0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b,
-        0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8, 
+        0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8,
-        0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa, 
+        0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96, 
+        0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96,
-        0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20, 
+        0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20,
-        0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 
+        0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16,
-        0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1, 
+        0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12, 
+        0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12,
-        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c, 
+        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c,
-        0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03, 
+        0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03,
-        0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01,
-        0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10,
-        0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8, 
+        0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8,
-        0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04, 
+        0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04,
-        0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10,
-        0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc, 
+        0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c, 
+        0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c, 
+        0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c,
-        0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95, 
+        0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95,
-        0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30, 
+        0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30,
-        0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 
+        0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01,
-        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae, 
+        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae,
-        0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06, 
+        0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06,
-        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03, 
+        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03,
-        0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8, 
+        0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8,
-        0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45, 
+        0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45,
-        0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
+        0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
-        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
+        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
-        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
+        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
-        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
+        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
-        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
+        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
+        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
-        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
+        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
-        0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10, 
+        0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10,
-        0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5, 
+        0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5,
-        0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10, 
+        0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10,
-        0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 
+        0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13,
-        0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8, 
+        0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8,
-        0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd, 
+        0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd,
-        0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05, 
+        0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05,
-        0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18, 
+        0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18,
-        0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03, 
+        0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03,
-        0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33, 
+        0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33,
-        0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1, 
+        0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1,
-        0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13, 
+        0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13,
-        0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
+        0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27, 
+        0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27,
-        0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95, 
+        0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30, 
+        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30,
-        0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45, 
+        0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45,
-        0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
+        0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
-        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
+        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
-        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
+        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
-        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
+        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
-        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
+        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
+        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
-        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
+        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
-        0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c, 
+        0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab, 
+        0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab,
-        0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f, 
+        0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f,
-        0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa, 
+        0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa,
-        0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f, 
+        0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f,
-        0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c, 
+        0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c,
-        0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa, 
+        0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa,
-        0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c, 
+        0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab,
-        0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa, 
+        0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa,
-        0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1, 
+        0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1,
-        0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95, 
+        0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1, 
+        0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1, 
+        0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1,
-        0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c, 
+        0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa,
-        0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c, 
+        0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c,
-        0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00, 
+        0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00,
-        0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17, 
+        0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17,
-        0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74, 
+        0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74,
-        0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1, 
+        0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c, 
+        0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa,
-        0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45, 
+        0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45,
-        0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05, 
+        0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05,
-        0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b, 
+        0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b,
-        0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04, 
+        0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04,
-        0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f, 
+        0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f,
-        0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
-        0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16, 
+        0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16,
-        0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16, 
+        0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16,
-        0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1, 
+        0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1,
-        0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04, 
+        0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04,
-        0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73, 
+        0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73,
-        0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1, 
+        0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1,
-        0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95, 
+        0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16, 
+        0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16,
-        0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
+        0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3, 
+        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3,
-        0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45, 
+        0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45,
-        0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17, 
+        0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17,
-        0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06, 
+        0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06,
-        0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9, 
+        0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00, 
+        0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00,
-        0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16, 
+        0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16,
-        0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b, 
+        0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b,
-        0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31, 
+        0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c, 
+        0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04, 
+        0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04,
-        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
+        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
-        0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff, 
+        0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff,
-        0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86,
-        0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16, 
+        0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc,
-        0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11, 
+        0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11,
-        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
+        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
-        0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81, 
+        0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81,
-        0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8, 
+        0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8,
-        0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c, 
+        0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c,
-        0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61, 
+        0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61,
-        0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8, 
+        0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8,
-        0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13, 
+        0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13,
-        0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01, 
+        0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01,
-        0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8, 
+        0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8,
-        0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10, 
+        0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10,
-        0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75, 
+        0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75,
-        0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01, 
+        0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01,
-        0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63, 
+        0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63,
-        0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8, 
+        0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8,
-        0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03, 
+        0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03,
-        0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00, 
+        0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00,
-        0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b, 
+        0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b,
-        0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01, 
+        0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01,
-        0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8, 
+        0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8,
-        0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 
+        0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8,
-        0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9, 
+        0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9,
-        0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04, 
+        0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04,
-        0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8, 
+        0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8,
-        0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20, 
+        0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20,
-        0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01, 
+        0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01,
-        0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74, 
+        0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74,
-        0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04, 
+        0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8, 
+        0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8,
-        0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68, 
+        0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68,
-        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00,
-        0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40, 
+        0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40,
-        0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f, 
+        0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f,
-        0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11, 
+        0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11,
-        0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81, 
+        0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1,
-        0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 
+        0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
-        0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0, 
+        0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0,
-        0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00, 
+        0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00,
-        0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95, 
+        0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95,
-        0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff, 
+        0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff,
-        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 
+        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06,
-        0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00, 
+        0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
-        0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02, 
+        0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02,
-        0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9, 
+        0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9,
-        0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef, 
+        0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef,
-        0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d, 
+        0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d,
-        0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
+        0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 
+        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17,
-        0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11, 
+        0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11,
-        0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45, 
+        0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45,
-        0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78, 
+        0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78,
-        0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2, 
+        0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2,
-        0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08, 
+        0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08,
-        0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1, 
+        0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1,
-        0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0, 
+        0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0,
-        0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95, 
+        0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95,
-        0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00, 
+        0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00,
-        0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17, 
+        0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17,
-        0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42, 
+        0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42,
-        0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb, 
+        0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb,
-        0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90, 
+        0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90,
-        0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01, 
+        0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01,
-        0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16, 
+        0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16,
-        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
-        0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16, 
+        0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16,
-        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
-        0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf, 
+        0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf,
-        0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00, 
+        0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00,
-        0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16, 
+        0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16,
-        0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 
+        0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9,
-        0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90, 
+        0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90,
-        0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90, 
+        0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90,
-        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc, 
+        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc,
-        0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00, 
+        0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00,
-        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11,
-        0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10, 
+        0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10,
-        0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8, 
+        0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8,
-        0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90, 
+        0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90,
-        0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e, 
+        0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e,
-        0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12, 
+        0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12,
-        0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04, 
+        0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04,
-        0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16, 
+        0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
+        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
-        0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00, 
+        0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
-        0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00, 
+        0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11,
-        0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07, 
+        0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07,
-        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
+        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
-        0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 
+        0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff,
-        0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
-        0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec, 
+        0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec,
-        0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01, 
+        0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01,
-        0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb, 
+        0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb,
-        0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00, 
+        0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
+        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
-        0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08, 
+        0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08,
-        0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85, 
+        0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85,
-        0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8, 
+        0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8,
-        0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00, 
+        0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00,
-        0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02, 
+        0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02,
-        0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 
+        0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
+        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
-        0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8, 
+        0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8,
-        0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85, 
+        0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85,
-        0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06, 
+        0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06,
-        0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20, 
+        0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20,
-        0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d, 
+        0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d,
-        0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11, 
+        0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec, 
+        0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec,
-        0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81, 
+        0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81,
-        0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 
+        0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76, 
+        0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3, 
+        0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3, 
+        0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81, 
+        0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81,
-        0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff,
-        0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80, 
+        0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80,
-        0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8, 
+        0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
-        0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00, 
+        0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
-        0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17, 
+        0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17,
-        0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17, 
+        0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17,
-        0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f, 
+        0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f,
-        0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17, 
+        0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17,
-        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3, 
+        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06,
-        0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b, 
+        0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b,
-        0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07, 
+        0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07,
-        0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14, 
+        0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14,
-        0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95, 
+        0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95,
-        0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57, 
+        0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57,
-        0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6, 
+        0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6,
-        0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8, 
+        0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8,
-        0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11, 
+        0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11,
-        0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81, 
+        0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81,
-        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07, 
+        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07,
-        0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2, 
+        0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2,
-        0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08, 
+        0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08,
-        0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11, 
+        0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11,
-        0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81, 
+        0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81,
-        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09, 
+        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09,
-        0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11, 
+        0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11,
-        0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
+        0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
-        0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95,
-        0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52, 
+        0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52,
-        0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55, 
+        0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55,
-        0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12, 
+        0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 
+        0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82,
-        0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73, 
+        0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73,
-        0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12, 
+        0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12,
-        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
+        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
-        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d, 
+        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d,
-        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34, 
+        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34,
-        0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13, 
+        0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13,
-        0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83, 
+        0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83,
-        0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40, 
+        0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40,
-        0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40, 
+        0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40,
-        0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
+        0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
-        0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52, 
+        0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52,
-        0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73, 
+        0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73,
-        0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12, 
+        0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12,
-        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
+        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
-        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f, 
+        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f,
-        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32, 
+        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32,
-        0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57, 
+        0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57,
-        0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40, 
+        0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40,
-        0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95, 
+        0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82, 
+        0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82,
-        0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2, 
+        0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11, 
+        0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e,
-        0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04, 
+        0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04,
-        0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff, 
+        0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20,
-        0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12, 
+        0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12,
-        0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1, 
+        0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1,
-        0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54, 
+        0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54,
-        0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54, 
+        0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54,
-        0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2, 
+        0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2,
-        0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55, 
+        0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55,
-        0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12, 
+        0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13, 
+        0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13,
-        0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56, 
+        0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56,
-        0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1, 
+        0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1,
-        0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82, 
+        0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82,
-        0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01, 
+        0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01,
-        0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80, 
+        0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80,
-        0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9,
-        0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16, 
+        0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16,
-        0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a, 
+        0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a,
-        0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c, 
+        0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c,
-        0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17, 
+        0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17,
-        0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81, 
+        0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81,
-        0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53, 
+        0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53,
-        0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20, 
+        0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20,
-        0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08, 
+        0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08,
-        0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b, 
+        0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b,
-        0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06, 
+        0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06,
-        0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00, 
+        0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00,
-        0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03, 
+        0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03,
-        0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01, 
+        0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01,
-        0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08, 
+        0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08,
-        0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00, 
+        0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00,
-        0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17, 
+        0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17,
-        0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18, 
+        0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18,
-        0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c, 
+        0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c,
-        0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00, 
+        0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00,
-        0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2, 
+        0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2,
-        0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04,
-        0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14, 
+        0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14,
-        0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06, 
+        0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06,
-        0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10, 
+        0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10,
-        0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11, 
+        0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11,
-        0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05, 
+        0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05,
-        0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05, 
+        0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05,
-        0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05, 
+        0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05,
-        0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea, 
+        0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea,
-        0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07, 
+        0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07,
-        0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7, 
+        0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7,
-        0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b, 
+        0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b,
-        0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27, 
+        0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11, 
+        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11,
-        0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 
+        0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2,
-        0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10, 
+        0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10,
-        0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16, 
+        0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16,
-        0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11, 
+        0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11,
-        0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09, 
+        0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71, 
+        0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71,
-        0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 
+        0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81, 
+        0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81,
-        0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff, 
+        0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff,
-        0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86, 
+        0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86,
-        0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 
+        0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80,
-        0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e, 
+        0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e,
-        0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16, 
+        0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16,
-        0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 
+        0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11,
-        0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9,
-        0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03, 
+        0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03,
-        0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12, 
+        0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8, 
+        0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8,
-        0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01, 
+        0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01,
-        0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12, 
+        0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12,
-        0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82, 
+        0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82,
-        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76, 
+        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76,
-        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66, 
+        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66,
-        0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b, 
+        0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b,
-        0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07, 
+        0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11, 
+        0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
+        0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
-        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
+        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
-        0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11, 
+        0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
+        0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
-        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
+        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
-        0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11, 
+        0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
+        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
-        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
+        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
-        0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81, 
+        0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81,
-        0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73,
-        0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11, 
+        0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1,
-        0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
-        0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08, 
+        0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44,
-        0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81, 
+        0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81,
-        0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
-        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
+        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
-        0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01, 
+        0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01,
-        0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81, 
+        0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81,
-        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
+        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
-        0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11, 
+        0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11,
-        0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93, 
+        0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93,
-        0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10, 
+        0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10,
-        0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08, 
+        0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08,
-        0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01, 
+        0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01,
-        0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0, 
+        0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0,
-        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95, 
+        0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95,
-        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
+        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95, 
+        0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95,
-        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
+        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04, 
+        0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04,
-        0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e, 
+        0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1, 
+        0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c,
-        0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
+        0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6,
-        0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82, 
+        0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1, 
+        0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
+        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
-        0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6,
-        0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82, 
+        0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1, 
+        0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
-        0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03, 
+        0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02, 
+        0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1, 
+        0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
+        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62,
-        0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 
+        0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16,
-        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
+        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 
+        0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00,
-        0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 
+        0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11,
-        0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 
+        0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01, 
+        0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81,
-        0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c, 
+        0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c,
-        0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53, 
+        0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53,
-        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 
+        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00,
-        0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1, 
+        0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1,
-        0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20, 
+        0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1,
-        0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06, 
+        0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06,
-        0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39, 
+        0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39,
-        0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1,
-        0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a, 
+        0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41,
-        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1,
-        0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e, 
+        0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e,
-        0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48, 
+        0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48,
-        0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1,
-        0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12, 
+        0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12,
-        0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06, 
+        0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06,
-        0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12, 
+        0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12,
-        0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82, 
+        0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82,
-        0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95, 
+        0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd, 
+        0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd,
-        0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01, 
+        0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01,
-        0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8, 
+        0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8,
-        0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80, 
+        0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80,
-        0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80, 
+        0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80,
-        0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11, 
+        0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
-        0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01, 
+        0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01,
-        0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11, 
+        0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
-        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
+        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
-        0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
-        0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
+        0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1,
-        0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73, 
+        0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73,
-        0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95, 
+        0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95,
-        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80, 
+        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80,
-        0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80, 
+        0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80,
-        0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95, 
+        0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95,
-        0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11, 
+        0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11,
-        0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 
+        0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2,
-        0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02, 
+        0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6,
-        0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 
+        0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62, 
+        0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62,
-        0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01, 
+        0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01,
-        0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff,
-        0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
+        0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11,
-        0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 
+        0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff, 
+        0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff,
-        0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b, 
+        0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01, 
+        0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01,
-        0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00, 
+        0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04,
-        0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24, 
+        0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24,
-        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08, 
+        0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08,
-        0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31, 
+        0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31,
-        0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11, 
+        0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06, 
+        0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06,
-        0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 
+        0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11,
-        0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73, 
+        0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73,
-        0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 
+        0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b,
-        0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8, 
+        0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44,
-        0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95, 
+        0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95,
-        0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45, 
+        0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45,
-        0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c, 
+        0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c,
-        0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17, 
+        0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17,
-        0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86, 
+        0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86,
-        0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95, 
+        0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95,
-        0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11, 
+        0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80, 
+        0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80,
-        0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc, 
+        0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc,
-        0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82, 
+        0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82,
-        0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 
+        0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12,
-        0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02, 
+        0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1, 
+        0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0, 
+        0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0,
-        0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82,
-        0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
+        0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
-        0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02, 
+        0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1, 
+        0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda, 
+        0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda,
-        0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b, 
+        0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 
+        0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00,
-        0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9, 
+        0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
-        0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf, 
+        0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf,
-        0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12, 
+        0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12,
-        0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01, 
+        0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16, 
+        0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d,
-        0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 
+        0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79,
-        0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 
+        0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68,
-        0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, 
+        0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65,
-        0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f, 
+        0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f,
-        0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 
+        0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e,
-        0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47, 
+        0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47,
-        0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30, 
+        0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30,
-        0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, 
+        0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c,
-        0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62, 
+        0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62,
-        0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20, 
+        0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20,
-        0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, 
+        0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31,
-        0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31, 
+        0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31,
-        0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35, 
+        0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35,
-        0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00, 
+        0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00,
-        0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00,
-        0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1, 
+        0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1,
-        0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00,
-        0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02, 
+        0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02,
-        0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+        0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-        0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7, 
+        0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7,
-        0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41, 
+        0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41,
-        0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00, 
+        0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00,
-        0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40, 
+        0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40,
-        0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80, 
+        0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00,
-        0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8, 
+        0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8,
-        0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0, 
+        0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0,
-        0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81, 
+        0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81,
-        0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73, 
+        0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00,
 };
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 832d179f26f..8abc2189012 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1203,7 +1203,7 @@ static int ttusb_init_rc(struct ttusb_dec *dec)
        input_dev->keycode = rc_keys;
        for (i = 0; i < ARRAY_SIZE(rc_keys); i++)
-                set_bit(rc_keys[i], input_dev->keybit);
+                set_bit(rc_keys[i], input_dev->keybit);
        input_register_device(input_dev);
@@ -1529,7 +1529,7 @@ static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
        usb_free_urb(dec->irq_urb);
        usb_buffer_free(dec->udev,IRQ_PACKET_SIZE,
-                           dec->irq_buffer, dec->irq_dma_handle);
+                           dec->irq_buffer, dec->irq_dma_handle);
        if (dec->rc_input_dev) {
                input_unregister_device(dec->rc_input_dev);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 1a3b3c7e5e9..fc87efc5049 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -26,15 +26,12 @@ config VIDEO_BT848
          module will be called bttv.
 config VIDEO_BT848_DVB
-        tristate "DVB/ATSC Support for bt878 based TV cards"
+        bool "DVB/ATSC Support for bt878 based TV cards"
        depends on VIDEO_BT848 && DVB_CORE
        select DVB_BT8XX
        ---help---
          This adds support for DVB/ATSC cards based on the BT878 chip.
-          To compile this driver as a module, choose M here: the
-          module will be called dvb-bt8xx.
 config VIDEO_SAA6588
        tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
        depends on VIDEO_DEV && I2C && VIDEO_BT848
@@ -191,7 +188,7 @@ config VIDEO_ZORAN
          To compile this driver as a module, choose M here: the
          module will be called zr36067.
- 
 config VIDEO_ZORAN_BUZ
        tristate "Iomega Buz support"
        depends on VIDEO_ZORAN
@@ -207,8 +204,8 @@ config VIDEO_ZORAN_DC10
 config VIDEO_ZORAN_DC30
        tristate "Pinnacle/Miro DC30(+) support"
-        depends on VIDEO_ZORAN
+        depends on VIDEO_ZORAN
-        help
+        help
          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
          card. This also supports really old DC10 cards based on the
          zr36050 MJPEG codec and zr36016 VFE.
@@ -263,7 +260,7 @@ config VIDEO_MXB
        ---help---
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
-          
          To compile this driver as a module, choose M here: the
          module will be called mxb.
@@ -277,7 +274,7 @@ config VIDEO_DPC
          for SAA7146 bases boards, so if you have some unsupported
          saa7146 based, analog video card, chances are good that it
          will work with this skeleton driver.
-          
          To compile this driver as a module, choose M here: the
          module will be called dpc7146.
@@ -288,7 +285,7 @@ config VIDEO_HEXIUM_ORION
        ---help---
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
-          
          To compile this driver as a module, choose M here: the
          module will be called hexium_orion.
@@ -300,7 +297,7 @@ config VIDEO_HEXIUM_GEMINI
          This is a video4linux driver for the Hexium Gemini frame
          grabber card by Hexium. Please note that the Gemini Dual
          card is *not* fully supported.
-          
          To compile this driver as a module, choose M here: the
          module will be called hexium_gemini.
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 1ca2b67aedf..e61003de1d5 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -420,7 +420,6 @@ adv7170_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_adv7170;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        if ((client->addr == I2C_ADV7170 >> 1) ||
            (client->addr == (I2C_ADV7170 >> 1) + 1)) {
                dname = adv7170_name;
@@ -498,11 +497,11 @@ adv7170_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_adv7170 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "adv7170",      /* name */
+                .name = "adv7170",      /* name */
+        },
        .id = I2C_DRIVERID_ADV7170,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = adv7170_attach_adapter,
        .detach_client = adv7170_detach_client,
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 173bca1e029..6d9536a71ee 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -470,7 +470,6 @@ adv7175_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_adv7175;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        if ((client->addr == I2C_ADV7175 >> 1) ||
            (client->addr == (I2C_ADV7175 >> 1) + 1)) {
                dname = adv7175_name;
@@ -548,11 +547,11 @@ adv7175_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_adv7175 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "adv7175",      /* name */
+                .name = "adv7175",      /* name */
+        },
        .id = I2C_DRIVERID_ADV7175,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = adv7175_attach_adapter,
        .detach_client = adv7175_detach_client,
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 3ee0afca76a..560b9989175 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -535,7 +535,6 @@ bt819_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_bt819;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);
        if (decoder == NULL) {
@@ -623,11 +622,11 @@ bt819_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_bt819 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "bt819",
+                .name = "bt819",
+        },
        .id = I2C_DRIVERID_BT819,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = bt819_attach_adapter,
        .detach_client = bt819_detach_client,
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index e4063950ae5..1c3ff5f38a6 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -230,19 +230,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "i2c bt832 driver",
+                .name   = "i2c bt832 driver",
-        .id             = -1, /* FIXME */
+        },
-        .flags          = I2C_DF_NOTIFY,
+        .id             = -1, /* FIXME */
-        .attach_adapter = bt832_probe,
+        .attach_adapter = bt832_probe,
-        .detach_client  = bt832_detach,
+        .detach_client  = bt832_detach,
-        .command        = bt832_command,
+        .command        = bt832_command,
 };
 static struct i2c_client client_template =
 {
        .name       = "bt832",
-        .flags      = I2C_CLIENT_ALLOW_USE,
+        .driver     = &driver,
-        .driver     = &driver,
 };
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 8eb871d0e85..60508069bbe 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -323,7 +323,6 @@ bt856_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_bt856;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
        encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
@@ -405,11 +404,11 @@ bt856_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_bt856 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "bt856",
+                .name = "bt856",
+        },
        .id = I2C_DRIVERID_BT856,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = bt856_attach_adapter,
        .detach_client = bt856_detach_client,
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index e31ebb11c46..012be639aa1 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2904,7 +2904,7 @@ void __devinit bttv_idcard(struct bttv *btv)
 */
 /* Some Modular Technology cards have an eeprom, but no subsystem ID */
-void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])
+static void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])
 {
        int type = -1;
@@ -3879,7 +3879,7 @@ static void __devinit init_PXC200(struct bttv *btv)
 *                error. ERROR_CPLD_Check_Failed.
 */
 /* ----------------------------------------------------------------------- */
-void
+static void
 init_RTV24 (struct bttv *btv)
 {
        uint32_t dataRead = 0;
@@ -4103,7 +4103,7 @@ void tea5757_set_freq(struct bttv *btv, unsigned short freq)
 /* ----------------------------------------------------------------------- */
 /* winview                                                                 */
-void winview_audio(struct bttv *btv, struct video_audio *v, int set)
+static void winview_audio(struct bttv *btv, struct video_audio *v, int set)
 {
        /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */
        int bits_out, loops, vol, data;
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 709099f03bd..1ddf9ba613e 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -727,71 +727,71 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
 static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout)
 {
-        unsigned char fl, fh, fi;
+        unsigned char fl, fh, fi;
-        /* prevent overflows */
+        /* prevent overflows */
-        fin/=4;
+        fin/=4;
-        fout/=4;
+        fout/=4;
-        fout*=12;
+        fout*=12;
-        fi=fout/fin;
+        fi=fout/fin;
-        fout=(fout%fin)*256;
+        fout=(fout%fin)*256;
-        fh=fout/fin;
+        fh=fout/fin;
-        fout=(fout%fin)*256;
+        fout=(fout%fin)*256;
-        fl=fout/fin;
+        fl=fout/fin;
-        btwrite(fl, BT848_PLL_F_LO);
+        btwrite(fl, BT848_PLL_F_LO);
-        btwrite(fh, BT848_PLL_F_HI);
+        btwrite(fh, BT848_PLL_F_HI);
-        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
+        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
 }
 static void set_pll(struct bttv *btv)
 {
-        int i;
+        int i;
-        if (!btv->pll.pll_crystal)
+        if (!btv->pll.pll_crystal)
-                return;
+                return;
        if (btv->pll.pll_ofreq == btv->pll.pll_current) {
                dprintk("bttv%d: PLL: no change required\n",btv->c.nr);
-                return;
+                return;
-        }
+        }
-        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
+        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
-                /* no PLL needed */
+                /* no PLL needed */
-                if (btv->pll.pll_current == 0)
+                if (btv->pll.pll_current == 0)
-                        return;
+                        return;
                bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                           btv->c.nr,btv->pll.pll_ifreq);
+                        btv->c.nr,btv->pll.pll_ifreq);
-                btwrite(0x00,BT848_TGCTRL);
+                btwrite(0x00,BT848_TGCTRL);
-                btwrite(0x00,BT848_PLL_XCI);
+                btwrite(0x00,BT848_PLL_XCI);
-                btv->pll.pll_current = 0;
+                btv->pll.pll_current = 0;
-                return;
+                return;
-        }
+        }
        bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
-                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+                btv->pll.pll_ifreq, btv->pll.pll_ofreq);
        set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);
-        for (i=0; i<10; i++) {
+        for (i=0; i<10; i++) {
                /*  Let other people run while the PLL stabilizes */
                bttv_printk(".");
                msleep(10);
-                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
+                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
                        btwrite(0,BT848_DSTATUS);
-                } else {
+                } else {
-                        btwrite(0x08,BT848_TGCTRL);
+                        btwrite(0x08,BT848_TGCTRL);
-                        btv->pll.pll_current = btv->pll.pll_ofreq;
+                        btv->pll.pll_current = btv->pll.pll_ofreq;
                        bttv_printk(" ok\n");
-                        return;
+                        return;
-                }
+                }
-        }
+        }
-        btv->pll.pll_current = -1;
+        btv->pll.pll_current = -1;
        bttv_printk("failed\n");
-        return;
+        return;
 }
 /* used to switch between the bt848's analog/digital video capture modes */
@@ -1720,7 +1720,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                memset(i,0,sizeof(*i));
                i->index    = n;
                i->type     = V4L2_INPUT_TYPE_CAMERA;
-                i->audioset = 1;
+                i->audioset = 0;
                if (i->index == bttv_tvcards[btv->c.type].tuner) {
                        sprintf(i->name, "Television");
                        i->type  = V4L2_INPUT_TYPE_TUNER;
@@ -1771,12 +1771,20 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                memset(t,0,sizeof(*t));
                strcpy(t->name, "Television");
                t->type       = V4L2_TUNER_ANALOG_TV;
-                t->rangehigh  = 0xffffffffUL;
                t->capability = V4L2_TUNER_CAP_NORM;
                t->rxsubchans = V4L2_TUNER_SUB_MONO;
                if (btread(BT848_DSTATUS)&BT848_DSTATUS_HLOC)
                        t->signal = 0xffff;
                {
+                        struct video_tuner tuner;
+                        memset(&tuner, 0, sizeof (tuner));
+                        tuner.rangehigh = 0xffffffffUL;
+                        bttv_call_i2c_clients(btv, VIDIOCGTUNER, &tuner);
+                        t->rangelow = tuner.rangelow;
+                        t->rangehigh = tuner.rangehigh;
+                }
+                {
                        /* Hmmm ... */
                        struct video_audio va;
                        memset(&va, 0, sizeof(struct video_audio));
@@ -1853,7 +1861,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
        }
        case VIDIOC_LOG_STATUS:
        {
-                bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, 0);
+                bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, NULL);
                return 0;
        }
@@ -1956,7 +1964,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
        }
        down(&fh->cap.lock);
-        kfree(fh->ov.clips);
+                kfree(fh->ov.clips);
        fh->ov.clips    = clips;
        fh->ov.nclips   = n;
@@ -2029,19 +2037,33 @@ static int bttv_switch_type(struct bttv_fh *fh, enum v4l2_buf_type type)
        return 0;
 }
+static void
+pix_format_set_size     (struct v4l2_pix_format *       f,
+                         const struct bttv_format *     fmt,
+                         unsigned int                   width,
+                         unsigned int                   height)
+{
+        f->width = width;
+        f->height = height;
+        if (fmt->flags & FORMAT_FLAGS_PLANAR) {
+                f->bytesperline = width; /* Y plane */
+                f->sizeimage = (width * height * fmt->depth) >> 3;
+        } else {
+                f->bytesperline = (width * fmt->depth) >> 3;
+                f->sizeimage = height * f->bytesperline;
+        }
+}
 static int bttv_g_fmt(struct bttv_fh *fh, struct v4l2_format *f)
 {
        switch (f->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
                memset(&f->fmt.pix,0,sizeof(struct v4l2_pix_format));
-                f->fmt.pix.width        = fh->width;
+                pix_format_set_size (&f->fmt.pix, fh->fmt,
-                f->fmt.pix.height       = fh->height;
+                                     fh->width, fh->height);
                f->fmt.pix.field        = fh->cap.field;
                f->fmt.pix.pixelformat  = fh->fmt->fourcc;
-                f->fmt.pix.bytesperline =
-                        (f->fmt.pix.width * fh->fmt->depth) >> 3;
-                f->fmt.pix.sizeimage =
-                        f->fmt.pix.height * f->fmt.pix.bytesperline;
                return 0;
        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
                memset(&f->fmt.win,0,sizeof(struct v4l2_window));
@@ -2106,11 +2128,9 @@ static int bttv_try_fmt(struct bttv_fh *fh, struct bttv *btv,
                        f->fmt.pix.width = maxw;
                if (f->fmt.pix.height > maxh)
                        f->fmt.pix.height = maxh;
-                f->fmt.pix.width &= ~0x03;
+                pix_format_set_size (&f->fmt.pix, fmt,
-                f->fmt.pix.bytesperline =
+                                     f->fmt.pix.width & ~3,
-                        (f->fmt.pix.width * fmt->depth) >> 3;
+                                     f->fmt.pix.height);
-                f->fmt.pix.sizeimage =
-                        f->fmt.pix.height * f->fmt.pix.bytesperline;
                return 0;
        }
@@ -2278,6 +2298,15 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                        retval = -EINVAL;
                        goto fh_unlock_and_return;
                }
+                if (fmt->flags & FORMAT_FLAGS_RAW) {
+                        /* VIDIOCMCAPTURE uses gbufsize, not RAW_BPL *
+                           RAW_LINES * 2. F1 is stored at offset 0, F2
+                           at buffer size / 2. */
+                        fh->width = RAW_BPL;
+                        fh->height = gbufsize / RAW_BPL;
+                        btv->init.width  = RAW_BPL;
+                        btv->init.height = gbufsize / RAW_BPL;
+                }
                fh->ovfmt   = fmt;
                fh->fmt     = fmt;
                btv->init.ovfmt   = fmt;
@@ -2589,9 +2618,11 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                if (0 == v4l2)
                        return -EINVAL;
-                strcpy(cap->driver,"bttv");
+                memset(cap, 0, sizeof (*cap));
-                strlcpy(cap->card,btv->video_dev->name,sizeof(cap->card));
+                strlcpy(cap->driver, "bttv", sizeof (cap->driver));
-                sprintf(cap->bus_info,"PCI:%s",pci_name(btv->c.pci));
+                strlcpy(cap->card, btv->video_dev->name, sizeof (cap->card));
+                snprintf(cap->bus_info, sizeof (cap->bus_info),
+                         "PCI:%s", pci_name(btv->c.pci));
                cap->version = BTTV_VERSION_CODE;
                cap->capabilities =
                        V4L2_CAP_VIDEO_CAPTURE |
@@ -2727,7 +2758,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                        fh->ov.w.height = fb->fmt.height;
                        btv->init.ov.w.width  = fb->fmt.width;
                        btv->init.ov.w.height = fb->fmt.height;
-                        kfree(fh->ov.clips);
+                                kfree(fh->ov.clips);
                        fh->ov.clips = NULL;
                        fh->ov.nclips = 0;
@@ -2952,6 +2983,8 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
                        fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR;
                        field = videobuf_next_field(&fh->cap);
                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) {
+                                kfree (fh->cap.read_buf);
+                                fh->cap.read_buf = NULL;
                                up(&fh->cap.lock);
                                return POLLERR;
                        }
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 77619eb131f..d6418c023d3 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -300,7 +300,7 @@ static int attach_inform(struct i2c_client *client)
        if (bttv_debug)
                printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
-                        btv->c.nr,client->driver->name,client->addr,
+                        btv->c.nr, client->driver->driver.name, client->addr,
                        client->name);
        if (!client->driver->command)
                return 0;
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 3aa9c6e4fc3..1e6a5632c3c 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -45,6 +45,7 @@
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
 #include "bt848.h"
 #include "bttv.h"
 #include "btcx-risc.h"
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index ddf184f95d8..6861d408f1b 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -170,16 +170,9 @@ static size_t cpia_read_nibble (struct parport *port,
                /* Does the error line indicate end of data? */
                if (((i /*& 1*/) == 0) &&
                    (parport_read_status(port) & PARPORT_STATUS_ERROR)) {
-                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
+                        DBG("%s: No more nibble data (%d bytes)\n",
-                                DBG("%s: No more nibble data (%d bytes)\n",
+                            port->name, i/2);
-                                port->name, i/2);
+                        goto end_of_data;
-                        /* Go to reverse idle phase. */
-                        parport_frob_control (port,
-                                              PARPORT_CONTROL_AUTOFD,
-                                              PARPORT_CONTROL_AUTOFD);
-                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
-                        break;
                }
                /* Event 7: Set nAutoFd low. */
@@ -227,18 +220,21 @@ static size_t cpia_read_nibble (struct parport *port,
                        byte = nibble;
        }
-        i /= 2; /* i is now in bytes */
        if (i == len) {
                /* Read the last nibble without checking data avail. */
-                port = port->physport;
+                if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
-                if (parport_read_status (port) & PARPORT_STATUS_ERROR)
+                end_of_data:
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DNA;
+                        /* Go to reverse idle phase. */
+                        parport_frob_control (port,
+                                              PARPORT_CONTROL_AUTOFD,
+                                              PARPORT_CONTROL_AUTOFD);
+                        port->physport->ieee1284.phase = IEEE1284_PH_REV_IDLE;
+                }
                else
-                        port->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
+                        port->physport->ieee1284.phase = IEEE1284_PH_HBUSY_DAVAIL;
        }
-        return i;
+        return i/2;
 }
 /* CPiA nonstandard "Nibble Stream" mode (2 nibbles per cycle, instead of 1)
diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 9774e94d1e7..1439cb75287 100644
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -582,7 +582,6 @@ MODULE_LICENSE("GPL");
 static struct usb_driver cpia_driver = {
-        .owner          = THIS_MODULE,
        .name           = "cpia",
        .probe          = cpia_probe,
        .disconnect     = cpia_disconnect,
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 780b352ec11..643ead1a87e 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -42,15 +42,16 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
 #define cs53l32a_dbg(fmt, arg...) \
        do { \
                if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
 #define cs53l32a_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define cs53l32a_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
@@ -154,7 +155,6 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
        cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -216,13 +216,13 @@ static int cs53l32a_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "cs53l32a",
+        .driver = {
+                .name = "cs53l32a",
+        },
        .id = I2C_DRIVERID_CS53L32A,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = cs53l32a_probe,
        .detach_client = cs53l32a_detach,
        .command = cs53l32a_command,
-        .owner = THIS_MODULE,
 };
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index f6afeec499c..3b09f46dddf 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -208,8 +208,11 @@ static void cx25840_initialize(struct i2c_client *client, int loadfw)
 static void input_change(struct i2c_client *client)
 {
+        struct cx25840_state *state = i2c_get_clientdata(client);
        v4l2_std_id std = cx25840_get_v4lstd(client);
+        /* Note: perhaps V4L2_STD_PAL_M should be handled as V4L2_STD_NTSC
+           instead of V4L2_STD_PAL. Someone needs to test this. */
        if (std & V4L2_STD_PAL) {
                /* Follow tuner change procedure for PAL */
                cx25840_write(client, 0x808, 0xff);
@@ -220,7 +223,32 @@ static void input_change(struct i2c_client *client)
                cx25840_write(client, 0x80b, 0x10);
        } else if (std & V4L2_STD_NTSC) {
                /* NTSC */
-                cx25840_write(client, 0x808, 0xf6);
+                if (state->cardtype == CARDTYPE_PVR150_WORKAROUND) {
+                        /* Certain Hauppauge PVR150 models have a hardware bug
+                           that causes audio to drop out. For these models the
+                           audio standard must be set explicitly.
+                           To be precise: it affects cards with tuner models
+                           85, 99 and 112 (model numbers from tveeprom). */
+                        if (std == V4L2_STD_NTSC_M_JP) {
+                                /* Japan uses EIAJ audio standard */
+                                cx25840_write(client, 0x808, 0x2f);
+                        } else {
+                                /* Others use the BTSC audio standard */
+                                cx25840_write(client, 0x808, 0x1f);
+                        }
+                        /* South Korea uses the A2-M (aka Zweiton M) audio
+                           standard, and should set 0x808 to 0x3f, but I don't
+                           know how to detect this. */
+                } else if (std == V4L2_STD_NTSC_M_JP) {
+                        /* Japan uses EIAJ audio standard */
+                        cx25840_write(client, 0x808, 0xf7);
+                } else {
+                        /* Others use the BTSC audio standard */
+                        cx25840_write(client, 0x808, 0xf6);
+                }
+                /* South Korea uses the A2-M (aka Zweiton M) audio standard,
+                   and should set 0x808 to 0xf8, but I don't know how to
+                   detect this. */
                cx25840_write(client, 0x80b, 0x00);
        }
@@ -241,7 +269,8 @@ static int set_input(struct i2c_client *client, enum cx25840_input input)
        case CX25840_TUNER:
                cx25840_dbg("now setting Tuner input\n");
-                if (state->cardtype == CARDTYPE_PVR150) {
+                if (state->cardtype == CARDTYPE_PVR150 ||
+                    state->cardtype == CARDTYPE_PVR150_WORKAROUND) {
                        /* CH_SEL_ADC2=1 */
                        cx25840_and_or(client, 0x102, ~0x2, 0x02);
                }
@@ -304,24 +333,30 @@ static int set_input(struct i2c_client *client, enum cx25840_input input)
 static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
 {
-        u8 fmt;
+        u8 fmt=0;       /* zero is autodetect */
-        switch (std) {
+        /* First tests should be against specific std */
-        /* zero is autodetect */
+        if (std & V4L2_STD_NTSC_M_JP) {
-        case 0: fmt = 0x0; break;
+                fmt=0x2;
-        /* default ntsc to ntsc-m */
+        } else if (std & V4L2_STD_NTSC_443) {
-        case V4L2_STD_NTSC:
+                fmt=0x3;
-        case V4L2_STD_NTSC_M: fmt = 0x1; break;
+        } else if (std & V4L2_STD_PAL_M) {
-        case V4L2_STD_NTSC_M_JP: fmt = 0x2; break;
+                fmt=0x5;
-        case V4L2_STD_NTSC_443: fmt = 0x3; break;
+        } else if (std & V4L2_STD_PAL_N) {
-        case V4L2_STD_PAL: fmt = 0x4; break;
+                fmt=0x6;
-        case V4L2_STD_PAL_M: fmt = 0x5; break;
+        } else if (std & V4L2_STD_PAL_Nc) {
-        case V4L2_STD_PAL_N: fmt = 0x6; break;
+                fmt=0x7;
-        case V4L2_STD_PAL_Nc: fmt = 0x7; break;
+        } else if (std & V4L2_STD_PAL_60) {
-        case V4L2_STD_PAL_60: fmt = 0x8; break;
+                fmt=0x8;
-        case V4L2_STD_SECAM: fmt = 0xc; break;
+        } else {
-        default:
+                /* Then, test against generic ones */
-                return -ERANGE;
+                if (std & V4L2_STD_NTSC) {
+                        fmt=0x1;
+                } else if (std & V4L2_STD_PAL) {
+                        fmt=0x4;
+                } else if (std & V4L2_STD_SECAM) {
+                        fmt=0xc;
+                }
        }
        cx25840_and_or(client, 0x400, ~0xf, fmt);
@@ -363,6 +398,7 @@ static int set_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl)
        case CX25840_CID_CARDTYPE:
                switch (ctrl->value) {
                case CARDTYPE_PVR150:
+                case CARDTYPE_PVR150_WORKAROUND:
                case CARDTYPE_PG600:
                        state->cardtype = ctrl->value;
                        break;
@@ -714,7 +750,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
 /* ----------------------------------------------------------------------- */
-struct i2c_driver i2c_driver_cx25840;
+static struct i2c_driver i2c_driver_cx25840;
 static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
                                 int kind)
@@ -737,7 +773,6 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_cx25840;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name) - 1, "cx25840");
        cx25840_dbg("detecting cx25840 client on address 0x%x\n", address << 1);
@@ -807,16 +842,16 @@ static int cx25840_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
-struct i2c_driver i2c_driver_cx25840 = {
+static struct i2c_driver i2c_driver_cx25840 = {
-        .name = "cx25840",
+        .driver = {
+                .name = "cx25840",
+        },
        .id = I2C_DRIVERID_CX25840,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = cx25840_attach_adapter,
        .detach_client = cx25840_detach_client,
        .command = cx25840_command,
-        .owner = THIS_MODULE,
 };
diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h
index 5c3f0639fb7..40aa59f9c52 100644
--- a/drivers/media/video/cx25840/cx25840.h
+++ b/drivers/media/video/cx25840/cx25840.h
@@ -27,22 +27,30 @@
 extern int cx25840_debug;
 #define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \
-        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+               client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define cx25840_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define cx25840_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0)
+/* The CARDTYPE_PVR150_WORKAROUND cardtype activates a workaround for a
+   hardware bug that is present in PVR150 (and possible PVR500) cards that
+   have certain NTSC tuners (tveeprom model numbers 85, 99 and 112). The
+   audio autodetect fails on some channels for these models and the workaround
+   is to select the audio standard explicitly. Many thanks to Hauppauge for
+   providing this information. */
 enum cx25840_cardtype {
        CARDTYPE_PVR150,
-        CARDTYPE_PG600
+        CARDTYPE_PG600,
+        CARDTYPE_PVR150_WORKAROUND,
 };
 enum cx25840_input {
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 41818b6205b..85ba4106dc7 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -46,8 +46,8 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS
          If you are unsure, choose Y.
 config VIDEO_CX88_DVB_MT352
-        tristate "Zarlink MT352 DVB-T Support"
+        bool "Zarlink MT352 DVB-T Support"
-        default m
+        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_MT352
        ---help---
@@ -55,8 +55,8 @@ config VIDEO_CX88_DVB_MT352
          Connexant 2388x chip and the MT352 demodulator.
 config VIDEO_CX88_DVB_OR51132
-        tristate "OR51132 ATSC Support"
+        bool "OR51132 ATSC Support"
-        default m
+        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_OR51132
        ---help---
@@ -64,8 +64,8 @@ config VIDEO_CX88_DVB_OR51132
          Connexant 2388x chip and the OR51132 demodulator.
 config VIDEO_CX88_DVB_CX22702
-        tristate "Conexant CX22702 DVB-T Support"
+        bool "Conexant CX22702 DVB-T Support"
-        default m
+        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_CX22702
        ---help---
@@ -73,8 +73,8 @@ config VIDEO_CX88_DVB_CX22702
          Connexant 2388x chip and the CX22702 demodulator.
 config VIDEO_CX88_DVB_LGDT330X
-        tristate "LG Electronics DT3302/DT3303 ATSC Support"
+        bool "LG Electronics DT3302/DT3303 ATSC Support"
-        default m
+        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_LGDT330X
        ---help---
@@ -82,8 +82,8 @@ config VIDEO_CX88_DVB_LGDT330X
          Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator.
 config VIDEO_CX88_DVB_NXT200X
-        tristate "NXT2002/NXT2004 ATSC Support"
+        bool "NXT2002/NXT2004 ATSC Support"
-        default m
+        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_NXT200X
        ---help---
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 0df40b77345..54401b02b7c 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -9,21 +9,12 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
-ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
- EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
+extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-endif
+extra-cflags-$(CONFIG_DVB_CX22702)   += -DHAVE_CX22702=1
-ifneq ($(CONFIG_DVB_CX22702),n)
+extra-cflags-$(CONFIG_DVB_OR51132)   += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_CX22702=1
+extra-cflags-$(CONFIG_DVB_LGDT330X)  += -DHAVE_LGDT330X=1
-endif
+extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
-ifneq ($(CONFIG_DVB_OR51132),n)
+extra-cflags-$(CONFIG_DVB_NXT200X)   += -DHAVE_NXT200X=1
- EXTRA_CFLAGS += -DHAVE_OR51132=1
-endif
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
-ifneq ($(CONFIG_DVB_LGDT330X),n)
- EXTRA_CFLAGS += -DHAVE_LGDT330X=1
-endif
-ifneq ($(CONFIG_DVB_MT352),n)
- EXTRA_CFLAGS += -DHAVE_MT352=1
-endif
-ifneq ($(CONFIG_DVB_NXT200X),n)
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
-endif
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 4ae3f78cccf..74e57a53116 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -616,6 +616,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
        retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME,
                                  &dev->pci->dev);
        if (retval != 0) {
                dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
                        BLACKBIRD_FIRM_ENC_FILENAME);
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index f2268631b7c..951709aa88b 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -567,6 +567,7 @@ struct cx88_board cx88_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -711,6 +712,7 @@ struct cx88_board cx88_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -1083,41 +1085,28 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
        tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data);
        core->tuner_type = tv.tuner_type;
        core->has_radio  = tv.has_radio;
-}
-static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee)
-{
-        int model;
-        int tuner;
        /* Make sure we support the board model */
-        model = ee[0x1f] << 24 | ee[0x1e] << 16 | ee[0x1d] << 8 | ee[0x1c];
+        switch (tv.model)
-        switch(model) {
+        {
-        case 90002:
+        case 90002: /* Nova-T-PCI (9002) */
-        case 90500:
+        case 92001: /* Nova-S-Plus (Video and IR) */
-        case 90501:
+        case 92002: /* Nova-S-Plus (Video and IR) */
+        case 90003: /* Nova-T-PCI (9002 No RF out) */
+        case 90500: /* Nova-T-PCI (oem) */
+        case 90501: /* Nova-T-PCI (oem/IR) */
+        case 92000: /* Nova-SE2 (OEM, No Video or IR) */
                /* known */
                break;
        default:
                printk("%s: warning: unknown hauppauge model #%d\n",
-                       core->name, model);
+                       core->name, tv.model);
                break;
        }
-        /* Make sure we support the tuner */
+        printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n",
-        tuner = ee[0x2d];
+                        core->name, tv.model);
-        switch(tuner) {
-        case 0x4B: /* dtt 7595 */
-        case 0x4C: /* dtt 7592 */
-                break;
-        default:
-                printk("%s: error: unknown hauppauge tuner 0x%02x\n",
-                       core->name, tuner);
-                return -ENODEV;
-        }
-        printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d\n",
-               core->name, model, tuner);
-        return 0;
 }
 /* ----------------------------------------------------------------------- */
@@ -1201,7 +1190,7 @@ void cx88_card_list(struct cx88_core *core, struct pci_dev *pci)
 void cx88_card_setup(struct cx88_core *core)
 {
-        static u8 eeprom[128];
+        static u8 eeprom[256];
        if (0 == core->i2c_rc) {
                core->i2c_client.addr = 0xa0 >> 1;
@@ -1224,7 +1213,7 @@ void cx88_card_setup(struct cx88_core *core)
                break;
        case CX88_BOARD_HAUPPAUGE_DVB_T1:
                if (0 == core->i2c_rc)
-                        hauppauge_eeprom_dvb(core,eeprom);
+                        hauppauge_eeprom(core,eeprom);
                break;
        case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
        case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index eb806af1718..bb6eb54e19c 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -837,6 +837,29 @@ static int set_pll(struct cx88_core *core, int prescale, u32 ofreq)
        return -1;
 }
+int cx88_start_audio_dma(struct cx88_core *core)
+{
+        /* setup fifo + format */
+        cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH25], 128, 0);
+        cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH26], 128, 0);
+        cx_write(MO_AUDD_LNGTH,    128); /* fifo bpl size */
+        cx_write(MO_AUDR_LNGTH,    128); /* fifo bpl size */
+        /* start dma */
+        cx_write(MO_AUD_DMACNTRL, 0x0003); /* Up and Down fifo enable */
+        return 0;
+}
+int cx88_stop_audio_dma(struct cx88_core *core)
+{
+        /* stop dma */
+        cx_write(MO_AUD_DMACNTRL, 0x0000);
+        return 0;
+}
 static int set_tvaudio(struct cx88_core *core)
 {
        struct cx88_tvnorm *norm = core->tvnorm;
@@ -877,12 +900,16 @@ static int set_tvaudio(struct cx88_core *core)
        cx88_set_tvaudio(core);
        /* cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); */
-        cx_write(MO_AUDD_LNGTH,    128); /* fifo size */
+/*
-        cx_write(MO_AUDR_LNGTH,    128); /* fifo size */
+   This should be needed only on cx88-alsa. It seems that some cx88 chips have
-        cx_write(MO_AUD_DMACNTRL, 0x03); /* need audio fifo */
+   bugs and does require DMA enabled for it to work.
+ */
+        cx88_start_audio_dma(core);
        return 0;
 }
 int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)
 {
        u32 fsc8;
@@ -1204,6 +1231,8 @@ EXPORT_SYMBOL(cx88_set_scale);
 EXPORT_SYMBOL(cx88_vdev_init);
 EXPORT_SYMBOL(cx88_core_get);
 EXPORT_SYMBOL(cx88_core_put);
+EXPORT_SYMBOL(cx88_start_audio_dma);
+EXPORT_SYMBOL(cx88_stop_audio_dma);
 /*
 * Local variables:
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 9790d412f19..4a8fb161b16 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -94,7 +94,7 @@ static int attach_inform(struct i2c_client *client)
        struct cx88_core *core = i2c_get_adapdata(client->adapter);
        dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name, client->addr, client->name);
+                client->driver->driver.name, client->addr, client->name);
        if (!client->driver->command)
                return 0;
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 38b12ebaa49..461019dca90 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -453,7 +453,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                input_dev->id.product = pci->device;
        }
        input_dev->cdev.dev = &pci->dev;
        /* record handles to ourself */
        ir->core = core;
        core->ir = ir;
@@ -586,7 +585,6 @@ void cx88_ir_irq(struct cx88_core *core)
 MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
 MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
 MODULE_LICENSE("GPL");
 /*
 * Local variables:
 * c-basic-offset: 8
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 6d9bec1c583..a1b120c8a9b 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -119,13 +119,10 @@ static void set_audio_registers(struct cx88_core *core, const struct rlist *l)
 static void set_audio_start(struct cx88_core *core, u32 mode)
 {
-        // mute
+        /* mute */
        cx_write(AUD_VOL_CTL, (1 << 6));
-        // start programming
+        /* start programming */
-        cx_write(MO_AUD_DMACNTRL, 0x0000);
-        msleep(100);
-        //cx_write(AUD_CTL, 0x0000);
        cx_write(AUD_INIT, mode);
        cx_write(AUD_INIT_LD, 0x0001);
        cx_write(AUD_SOFT_RESET, 0x0001);
@@ -135,17 +132,21 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 {
        u32 volume;
+        /* restart dma; This avoids buzz in NICAM and is good in others  */
+        cx88_stop_audio_dma(core);
+        cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
+        cx88_start_audio_dma(core);
        if (cx88_boards[core->board].blackbird) {
-                // sets sound input from external adc
+                /* sets sound input from external adc */
                cx_set(AUD_CTL, EN_I2SIN_ENABLE);
-                //cx_write(AUD_I2SINPUTCNTL, 0);
                cx_write(AUD_I2SINPUTCNTL, 4);
                cx_write(AUD_BAUDRATE, 1);
-                // 'pass-thru mode': this enables the i2s output to the mpeg encoder
+                /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */
                cx_set(AUD_CTL, EN_I2SOUT_ENABLE);
                cx_write(AUD_I2SOUTPUTCNTL, 1);
                cx_write(AUD_I2SCNTL, 0);
-                //cx_write(AUD_APB_IN_RATE_ADJ, 0);
+                /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */
        } else {
                ctl |= EN_DAC_ENABLE;
                cx_write(AUD_CTL, ctl);
@@ -153,7 +154,6 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
        /* finish programming */
        cx_write(AUD_SOFT_RESET, 0x0000);
-        cx_write(MO_AUD_DMACNTRL, 0x0003);
        /* unmute */
        volume = cx_sread(SHADOW_AUD_VOL_CTL);
@@ -313,7 +313,6 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
                {AUD_RATE_ADJ3, 0x00000100},
                {AUD_RATE_ADJ4, 0x00000400},
                {AUD_RATE_ADJ5, 0x00001000},
-                //{ AUD_DMD_RA_DDS,        0x00c0d5ce },
                {AUD_ERRLOGPERIOD_R, 0x00000fff},
                {AUD_ERRINTRPTTHSHLD1_R, 0x000003ff},
                {AUD_ERRINTRPTTHSHLD2_R, 0x000000ff},
@@ -351,12 +350,12 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
                set_audio_registers(core, nicam_l);
                break;
        case WW_I:
-                dprintk("%s PAL-I NICAM (status: devel)\n", __FUNCTION__);
+                dprintk("%s PAL-I NICAM (status: known-good)\n", __FUNCTION__);
                set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_i);
                break;
        default:
-                dprintk("%s PAL-BGDK NICAM (status: unknown)\n", __FUNCTION__);
+                dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __FUNCTION__);
                set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_default);
                break;
@@ -715,8 +714,7 @@ int cx88_detect_nicam(struct cx88_core *core)
                /* if bit1=1 then nicam is detected */
                j += ((cx_read(AUD_NICAM_STATUS2) & 0x02) >> 1);
-                /* 3x detected: absolutly sure now */
+                if (j == 1) {
-                if (j == 3) {
                        dprintk("nicam is detected.\n");
                        return 1;
                }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index b19d3a9e229..77beafc5c32 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -411,7 +411,6 @@ struct cx8802_dev {
        struct videobuf_dvb        dvb;
        void*                      fe_handle;
        int                        (*fe_release)(void *handle);
        /* for switching modulation types */
        unsigned char              ts_gen_cntrl;
@@ -491,6 +490,10 @@ extern struct cx88_core* cx88_core_get(struct pci_dev *pci);
 extern void cx88_core_put(struct cx88_core *core,
                          struct pci_dev *pci);
+extern int cx88_start_audio_dma(struct cx88_core *core);
+extern int cx88_stop_audio_dma(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-vbi.c                                                  */
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index d54bc012748..0cfe75416ec 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -32,7 +32,7 @@
 /* #define ENABLE_DEBUG_ISOC_FRAMES */
-unsigned int core_debug;
+static unsigned int core_debug;
 module_param(core_debug,int,0644);
 MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
                printk(KERN_INFO "%s %s :"fmt, \
                         dev->name, __FUNCTION__ , ##arg); } while (0)
-unsigned int reg_debug;
+static unsigned int reg_debug;
 module_param(reg_debug,int,0644);
 MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
@@ -50,7 +50,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
                printk(KERN_INFO "%s %s :"fmt, \
                         dev->name, __FUNCTION__ , ##arg); } while (0)
-unsigned int isoc_debug;
+static unsigned int isoc_debug;
 module_param(isoc_debug,int,0644);
 MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
@@ -116,47 +116,6 @@ void em28xx_print_ioctl(char *name, unsigned int cmd)
        }
 }
-static void *rvmalloc(size_t size)
-{
-        void *mem;
-        unsigned long adr;
-        size = PAGE_ALIGN(size);
-        mem = vmalloc_32((unsigned long)size);
-        if (!mem)
-                return NULL;
-        memset(mem, 0, size);
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                SetPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-        return mem;
-}
-static void rvfree(void *mem, size_t size)
-{
-        unsigned long adr;
-        if (!mem)
-                return;
-        size = PAGE_ALIGN(size);
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                ClearPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-        vfree(mem);
-}
 /*
 * em28xx_request_buffers()
@@ -167,14 +126,16 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
        const size_t imagesize = PAGE_ALIGN(dev->frame_size);   /*needs to be page aligned cause the buffers can be mapped individually! */
        void *buff = NULL;
        u32 i;
-        em28xx_coredbg("requested %i buffers with size %i", count, imagesize);
+        em28xx_coredbg("requested %i buffers with size %zd", count, imagesize);
        if (count > EM28XX_NUM_FRAMES)
                count = EM28XX_NUM_FRAMES;
        dev->num_frames = count;
        while (dev->num_frames > 0) {
-                if ((buff = rvmalloc(dev->num_frames * imagesize)))
+                if ((buff = vmalloc_32(dev->num_frames * imagesize))) {
+                        memset(buff, 0, dev->num_frames * imagesize);
                        break;
+                }
                dev->num_frames--;
        }
@@ -217,8 +178,7 @@ void em28xx_queue_unusedframes(struct em28xx *dev)
 void em28xx_release_buffers(struct em28xx *dev)
 {
        if (dev->num_frames) {
-                rvfree(dev->frame[0].bufmem,
+                vfree(dev->frame[0].bufmem);
-                       dev->num_frames * PAGE_ALIGN(dev->frame[0].buf.length));
                dev->num_frames = 0;
        }
 }
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index b32d9852f34..d14bcf4ceae 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -41,7 +41,7 @@ module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
-                        printk(fmt , ##args); } while (0)
+                        printk(fmt, ##args); } while (0)
 #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
                        printk(KERN_DEBUG "%s at %s: " fmt, \
                        dev->name, __FUNCTION__ , ##args); } while (0)
@@ -497,7 +497,6 @@ static struct i2c_adapter em28xx_adap_template = {
 static struct i2c_client em28xx_client_template = {
        .name = "em28xx internal",
-        .flags = I2C_CLIENT_ALLOW_USE,
 };
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 57c1826b928..3a56120397a 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -189,16 +189,6 @@ static DECLARE_RWSEM(em28xx_disconnect);
 /*********************  v4l2 interface  ******************************************/
-static inline unsigned long kvirt_to_pa(unsigned long adr)
-{
-        unsigned long kva, ret;
-        kva = (unsigned long)page_address(vmalloc_to_page((void *)adr));
-        kva |= adr & (PAGE_SIZE - 1);
-        ret = __pa(kva);
-        return ret;
-}
 /*
 * em28xx_config()
 * inits registers with sane defaults
@@ -226,7 +216,7 @@ static int em28xx_config(struct em28xx *dev)
 * em28xx_config_i2c()
 * configure i2c attached devices
 */
-void em28xx_config_i2c(struct em28xx *dev)
+static void em28xx_config_i2c(struct em28xx *dev)
 {
        struct v4l2_frequency f;
        struct video_decoder_init em28xx_vdi = {.data = NULL };
@@ -616,7 +606,8 @@ static struct vm_operations_struct em28xx_vm_ops = {
 static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
 {
        unsigned long size = vma->vm_end - vma->vm_start,
-            start = vma->vm_start, pos, page;
+            start = vma->vm_start;
+        void *pos;
        u32 i;
        struct em28xx *dev = filp->private_data;
@@ -657,12 +648,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
        vma->vm_flags |= VM_IO;
        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
-        pos = (unsigned long)dev->frame[i].bufmem;
+        pos = dev->frame[i].bufmem;
        while (size > 0) {      /* size is page-aligned */
-                page = vmalloc_to_pfn((void *)pos);
+                if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
-                if (remap_pfn_range(vma, start, page, PAGE_SIZE,
+                        em28xx_videodbg("mmap: vm_insert_page failed\n");
-                                    vma->vm_page_prot)) {
-                        em28xx_videodbg("mmap: rename page map failed\n");
                        up(&dev->fileop_lock);
                        return -EAGAIN;
                }
@@ -1895,7 +1884,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 }
 static struct usb_driver em28xx_usb_driver = {
-        .owner = THIS_MODULE,
        .name = "em28xx",
        .probe = em28xx_usb_probe,
        .disconnect = em28xx_usb_disconnect,
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index deeef125eb9..bb5cbecffcc 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -451,10 +451,10 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
 }
 static struct i2c_driver i2c_driver_indycam = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "indycam",
+                .name   = "indycam",
+        },
        .id             = I2C_DRIVERID_INDYCAM,
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = indycam_probe,
        .detach_client  = indycam_detach,
        .command        = indycam_command,
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index 6345e29e495..de1385e5d05 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -291,13 +291,12 @@ struct IR {
        u32                     mask_keycode;
        u32                     mask_keydown;
        u32                     mask_keyup;
-        u32                     polling;
+        u32                     polling;
        u32                     last_gpio;
        struct work_struct      work;
        struct timer_list       timer;
        /* RC5 gpio */
        u32 rc5_gpio;
        struct timer_list timer_end;    /* timer_end for code completion */
        struct timer_list timer_keyup;  /* timer_end for key release */
@@ -647,7 +646,7 @@ static int ir_probe(struct device *dev)
                driver.any_irq = ir_rc5_irq;
                driver.gpio_irq = NULL;
                ir->rc5_gpio = 1;
-                 break;
+                break;
        }
        if (NULL == ir_codes) {
                kfree(ir);
@@ -657,7 +656,7 @@ static int ir_probe(struct device *dev)
        if (ir->rc5_gpio) {
                u32 gpio;
-                /* enable remote irq */
+                /* enable remote irq */
                bttv_gpio_inout(sub->core, (1 << 4), 1 << 4);
                gpio = bttv_gpio_read(sub->core);
                bttv_gpio_write(sub->core, gpio & ~(1 << 4));
@@ -726,6 +725,7 @@ static int ir_remove(struct device *dev)
                del_timer(&ir->timer);
                flush_scheduled_work();
        }
        if (ir->rc5_gpio) {
                u32 gpio;
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 801c736e932..3cc1d6a6019 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
@@ -277,9 +278,10 @@ static int ir_detach(struct i2c_client *client);
 static int ir_probe(struct i2c_adapter *adap);
 static struct i2c_driver driver = {
-        .name           = "ir remote kbd driver",
+        .driver = {
-        .id             = I2C_DRIVERID_EXP3, /* FIXME */
+                .name   = "ir remote kbd driver",
-        .flags          = I2C_DF_NOTIFY,
+        },
+        .id             = I2C_DRIVERID_INFRARED,
        .attach_adapter = ir_probe,
        .detach_client  = ir_detach,
 };
@@ -296,15 +298,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        IR_KEYTAB_TYPE *ir_codes = NULL;
        char *name;
        int ir_type;
-        struct IR_i2c *ir;
+        struct IR_i2c *ir;
        struct input_dev *input_dev;
-        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+        ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!ir || !input_dev) {
                kfree(ir);
                input_free_device(input_dev);
-                return -ENOMEM;
+                return -ENOMEM;
        }
        ir->c = client_template;
@@ -360,7 +362,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        /* register i2c device
         * At device register, IR codes may be changed to be
         * board dependent.
-        */
+         */
        i2c_attach_client(&ir->c);
        /* If IR not supported or disabled, unregisters driver */
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index a23fb033898..183253e2dd9 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -59,7 +59,8 @@
 #define msp3400_dbg(fmt, arg...) \
        do { \
                if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
@@ -67,7 +68,8 @@
 #define msp3400_dbg_mediumvol(fmt, arg...) \
        do { \
                if (debug >= 2) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                                client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
@@ -75,18 +77,19 @@
 #define msp3400_dbg_highvol(fmt, arg...) \
        do { \
                if (debug >= 16) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                                client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
 #define msp3400_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_warn(fmt, arg...) do { \
-        printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define msp3400_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define OPMODE_AUTO    -1
@@ -134,7 +137,7 @@ struct msp3400c {
        int rxsubchans;
        int muted;
-        int left, right;        /* volume */
+        int left, right;        /* volume */
        int bass, treble;
        /* shadow register set */
@@ -882,6 +885,7 @@ static void watch_stereo(struct i2c_client *client)
                msp->watch_stereo = 0;
 }
 static int msp3400c_thread(void *data)
 {
        struct i2c_client *client = data;
@@ -889,6 +893,7 @@ static int msp3400c_thread(void *data)
        struct CARRIER_DETECT *cd;
        int count, max1,max2,val1,val2, val,this;
        msp3400_info("msp3400 daemon started\n");
        for (;;) {
                msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
@@ -1162,6 +1167,7 @@ static int msp3410d_thread(void *data)
        int mode,val,i,std;
        msp3400_info("msp3410 daemon started\n");
        for (;;) {
                msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                msp34xx_sleep(msp,-1);
@@ -1384,6 +1390,7 @@ static int msp34xxg_thread(void *data)
        int val, std, i;
        msp3400_info("msp34xxg daemon started\n");
        msp->source = 1; /* default */
        for (;;) {
                msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
@@ -1557,14 +1564,12 @@ static int msp_resume(struct device * dev);
 static void msp_wake_thread(struct i2c_client *client);
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
+        .id             = I2C_DRIVERID_MSP3400,
-        .name           = "msp3400",
+        .attach_adapter = msp_probe,
-        .id             = I2C_DRIVERID_MSP3400,
+        .detach_client  = msp_detach,
-        .flags          = I2C_DF_NOTIFY,
+        .command        = msp_command,
-        .attach_adapter = msp_probe,
-        .detach_client  = msp_detach,
-        .command        = msp_command,
        .driver = {
+                .name    = "i2c msp3400 driver",
                .suspend = msp_suspend,
                .resume  = msp_resume,
        },
@@ -1573,8 +1578,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
        .name      = "(unset)",
-        .flags     = I2C_CLIENT_ALLOW_USE,
+        .driver    = &driver,
-        .driver    = &driver,
 };
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2de34ebf067..428f1bb75ec 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -410,11 +410,11 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner =                THIS_MODULE,
+        .driver = {
-        .name =                 "ovcamchip",
+                .name =         "ovcamchip",
+        },
        .id =                   I2C_DRIVERID_OVCAMCHIP,
        .class =                I2C_CLASS_CAM_DIGITAL,
-        .flags =                I2C_DF_NOTIFY,
        .attach_adapter =       ovcamchip_attach,
        .detach_client =        ovcamchip_detach,
        .command =              ovcamchip_command,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index b8054da31ff..0aa9e72f632 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -151,25 +151,18 @@ static int saa5246a_detach(struct i2c_client *client)
        return 0;
 }
-static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
-        void *arg)
-{
-        return -EINVAL;
-}
 /*
 *      I2C interfaces
 */
 static struct i2c_driver i2c_driver_videotext =
 {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = IF_NAME,              /* name */
+                .name   = IF_NAME,              /* name */
+        },
        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = saa5246a_probe,
        .detach_client  = saa5246a_detach,
-        .command        = saa5246a_command
 };
 static struct i2c_client client_template = {
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 7ffa2e9a9bf..a51c7bd9661 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -226,23 +226,16 @@ static int saa5249_detach(struct i2c_client *client)
        return 0;
 }
-static int saa5249_command(struct i2c_client *device,
-                             unsigned int cmd, void *arg)
-{
-        return -EINVAL;
-}
 /* new I2C driver support */
 static struct i2c_driver i2c_driver_videotext = 
 {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = IF_NAME,              /* name */
+                .name   = IF_NAME,              /* name */
+        },
        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = saa5249_probe,
        .detach_client  = saa5249_detach,
-        .command        = saa5249_command
 };
 static struct i2c_client client_template = {
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index dca3ddfd510..d60a783e047 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
        s->timer.function = saa6588_timer;
        s->timer.data = (unsigned long)s;
        schedule_work(&s->work);
        return 0;
 }
@@ -496,10 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "i2c saa6588 driver",
+                .name = "i2c saa6588 driver",
+        },
        .id = -1,               /* FIXME */
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa6588_probe,
        .detach_client = saa6588_detach,
        .command = saa6588_command,
@@ -507,7 +506,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template = {
        .name = "saa6588",
-        .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index e116bdbed31..619ff0b7a1f 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -501,7 +501,6 @@ saa7110_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7110;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
        decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);
@@ -587,11 +586,11 @@ saa7110_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_saa7110 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "saa7110",
+                .name = "saa7110",
+        },
        .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7110_attach_adapter,
        .detach_client = saa7110_detach_client,
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fe8a5e45396..acaeee592b5 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -518,7 +518,6 @@ saa7111_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7111;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
        decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
@@ -590,11 +589,11 @@ saa7111_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_saa7111 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "saa7111",
+                .name = "saa7111",
+        },
        .id = I2C_DRIVERID_SAA7111A,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7111_attach_adapter,
        .detach_client = saa7111_detach_client,
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index d9f50e2f7b9..b7ac0122f72 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -859,7 +859,6 @@ saa7114_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7114;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));
        decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);
@@ -1204,11 +1203,11 @@ saa7114_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_saa7114 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "saa7114",
+                .name = "saa7114",
+        },
        .id = I2C_DRIVERID_SAA7114,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7114_attach_adapter,
        .detach_client = saa7114_detach_client,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 0235cef07b3..29e28c742cd 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -52,15 +52,16 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define saa7115_dbg(fmt,arg...) \
        do { \
                if (debug) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
 #define saa7115_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7115_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
@@ -771,17 +772,19 @@ static v4l2_std_id saa7115_get_v4lstd(struct i2c_client *client)
 static void saa7115_log_status(struct i2c_client *client)
 {
-        static const char * const audclk_freq_strs[] = {
-                "44.1 kHz",
-                "48 kHz",
-                "32 kHz"
-        };
        struct saa7115_state *state = i2c_get_clientdata(client);
+        char *audfreq = "undefined";
        int reg1e, reg1f;
        int signalOk;
        int vcr;
-        saa7115_info("Audio frequency: %s\n", audclk_freq_strs[state->audclk_freq]);
+        switch (state->audclk_freq) {
+                case V4L2_AUDCLK_32_KHZ:  audfreq = "32 kHz"; break;
+                case V4L2_AUDCLK_441_KHZ: audfreq = "44.1 kHz"; break;
+                case V4L2_AUDCLK_48_KHZ:  audfreq = "48 kHz"; break;
+        }
+        saa7115_info("Audio frequency: %s\n", audfreq);
        if (client->name[6] == '4') {
                /* status for the saa7114 */
                reg1f = saa7115_read(client, 0x1f);
@@ -1268,7 +1271,6 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7115;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name) - 1, "saa7115");
        saa7115_dbg("detecting saa7115 client on address 0x%x\n", address << 1);
@@ -1352,13 +1354,13 @@ static int saa7115_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver_saa7115 = {
-        .name = "saa7115",
+        .driver = {
+                .name = "saa7115",
+        },
        .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7115_probe,
        .detach_client = saa7115_detach,
        .command = saa7115_command,
-        .owner = THIS_MODULE,
 };
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 25b30f352d8..8008537391b 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(debug, " Set the default Debug level.  Default: 0 (Off) - (0-1)
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
        } while (0)
 /* ----------------------------------------------------------------------- */
@@ -323,7 +323,7 @@ saa711x_command (struct i2c_client *client,
                case VIDEO_MODE_SECAM:
                        saa711x_write(client, 0x08,
-                                      (decoder->reg[0x0e] & 0x3f) | 0x00);
+                                      (decoder->reg[0x08] & 0x3f) | 0x00);
                        saa711x_write(client, 0x0e,
                                      (decoder->reg[0x0e] & 0x8f) | 0x50);
                        break;
@@ -494,7 +494,6 @@ saa711x_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa711x;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client)));
        decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL);
        if (decoder == NULL) {
@@ -565,11 +564,11 @@ saa711x_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_saa711x = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "saa711x",
+                .name = "saa711x",
+        },
        .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa711x_attach_adapter,
        .detach_client = saa711x_detach_client,
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 843431f10e3..bca6ed0e275 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -69,7 +69,8 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg(fmt, arg...) \
        do { \
                if (debug >= 1) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
@@ -77,15 +78,16 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg_highvol(fmt, arg...) \
        do { \
                if (debug == 2) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
        } while (0)
 #define saa7127_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7127_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
@@ -223,7 +225,7 @@ static const struct i2c_reg_value saa7127_init_config_60hz[] = {
 };
 #define SAA7127_50HZ_DAC_CONTROL 0x02
-struct i2c_reg_value saa7127_init_config_50hz[] = {
+static struct i2c_reg_value saa7127_init_config_50hz[] = {
        { SAA7127_REG_BURST_START,                      0x21 },
        /* BURST_END is also used as a chip ID in saa7127_detect_client */
        { SAA7127_REG_BURST_END,                        0x1d },
@@ -389,7 +391,7 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat
 static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
 {
        struct saa7127_state *state = i2c_get_clientdata(client);
-        u16 cc = data->data[0] << 8 | data->data[1];
+        u16 cc = data->data[1] << 8 | data->data[0];
        int enable = (data->line != 0);
        if (enable && (data->field != 0 || data->line != 21))
@@ -397,7 +399,7 @@ static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data
        if (state->cc_enable != enable) {
                saa7127_dbg("Turn CC %s\n", enable ? "on" : "off");
                saa7127_write(client, SAA7127_REG_CLOSED_CAPTION,
-                                (enable << 6) | 0x11);
+                                (state->xds_enable << 7) | (enable << 6) | 0x11);
                state->cc_enable = enable;
        }
        if (!enable)
@@ -423,7 +425,7 @@ static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_dat
        if (state->xds_enable != enable) {
                saa7127_dbg("Turn XDS %s\n", enable ? "on" : "off");
                saa7127_write(client, SAA7127_REG_CLOSED_CAPTION,
-                                (enable << 7) | 0x11);
+                                (enable << 7) | (state->cc_enable << 6) | 0x11);
                state->xds_enable = enable;
        }
        if (!enable)
@@ -696,7 +698,7 @@ static int saa7127_command(struct i2c_client *client,
 /* ----------------------------------------------------------------------- */
-struct i2c_driver i2c_driver_saa7127;
+static struct i2c_driver i2c_driver_saa7127;
 /* ----------------------------------------------------------------------- */
@@ -719,7 +721,6 @@ static int saa7127_attach(struct i2c_adapter *adapter, int address, int kind)
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7127;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name) - 1, "saa7127");
        saa7127_dbg("detecting saa7127 client on address 0x%x\n", address << 1);
@@ -818,14 +819,14 @@ static int saa7127_detach(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
-struct i2c_driver i2c_driver_saa7127 = {
+static struct i2c_driver i2c_driver_saa7127 = {
-        .name = "saa7127",
+        .driver = {
+                .name = "saa7127",
+        },
        .id = I2C_DRIVERID_SAA7127,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7127_probe,
        .detach_client = saa7127_detach,
        .command = saa7127_command,
-        .owner = THIS_MODULE,
 };
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 7bdeabe638c..8a5c3e71b37 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -1,11 +1,10 @@
 config VIDEO_SAA7134
        tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C && SOUND && SND
+        depends on VIDEO_DEV && PCI && I2C
        select VIDEO_BUF
        select VIDEO_IR
        select VIDEO_TUNER
        select CRC32
-        select SND_PCM_OSS
        ---help---
          This is a video4linux driver for Philips SAA713x based
          TV cards.
@@ -13,6 +12,29 @@ config VIDEO_SAA7134
          To compile this driver as a module, choose M here: the
          module will be called saa7134.
+config VIDEO_SAA7134_ALSA
+        tristate "Philips SAA7134 DMA audio support"
+        depends on VIDEO_SAA7134 && SND
+        select SND_PCM_OSS
+        ---help---
+          This is a video4linux driver for direct (DMA) audio in
+          Philips SAA713x based TV cards using ALSA
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134-alsa.
+config VIDEO_SAA7134_OSS
+        tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)"
+        depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA
+        ---help---
+          This is a video4linux driver for direct (DMA) audio in
+          Philips SAA713x based TV cards using OSS
+          This is deprecated in favor of the ALSA module
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134-oss.
 config VIDEO_SAA7134_DVB
        tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
@@ -42,8 +64,8 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS
          If you are unsure, choose Y.
 config VIDEO_SAA7134_DVB_MT352
-        tristate "Zarlink MT352 DVB-T Support"
+        bool "Zarlink MT352 DVB-T Support"
-        default m
+        default y
        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
        select DVB_MT352
        ---help---
@@ -51,8 +73,8 @@ config VIDEO_SAA7134_DVB_MT352
          Philips saa7134 chip and the MT352 demodulator.
 config VIDEO_SAA7134_DVB_TDA1004X
-        tristate "Phillips TDA10045H/TDA10046H DVB-T Support"
+        bool "Phillips TDA10045H/TDA10046H DVB-T Support"
-        default m
+        default y
        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
        select DVB_TDA1004X
        ---help---
@@ -60,8 +82,8 @@ config VIDEO_SAA7134_DVB_TDA1004X
          Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
 config VIDEO_SAA7134_DVB_NXT200X
-        tristate "NXT2002/NXT2004 ATSC Support"
+        bool "NXT2002/NXT2004 ATSC Support"
-        default m
+        default y
        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
        select DVB_NXT200X
        ---help---
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 4226b61cc61..1ba998424bb 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -4,22 +4,20 @@ saa7134-objs :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o	\
                saa7134-video.o saa7134-input.o
 obj-$(CONFIG_VIDEO_SAA7134) +=  saa7134.o saa7134-empress.o \
-                                saa6752hs.o saa7134-alsa.o \
+                                saa6752hs.o
-                                saa7134-oss.o
+obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
+obj-$(CONFIG_VIDEO_SAA7134_OSS) += saa7134-oss.o
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
-ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
- EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
+extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-endif
+extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
-ifneq ($(CONFIG_DVB_MT352),n)
+extra-cflags-$(CONFIG_DVB_TDA1004X)  += -DHAVE_TDA1004X=1
- EXTRA_CFLAGS += -DHAVE_MT352=1
+extra-cflags-$(CONFIG_DVB_NXT200X)   += -DHAVE_NXT200X=1
-endif
-ifneq ($(CONFIG_DVB_TDA1004X),n)
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
- EXTRA_CFLAGS += -DHAVE_TDA1004X=1
-endif
-ifneq ($(CONFIG_DVB_NXT200X),n)
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
-endif
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index cdd1ed9c806..4615a982ac6 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -523,7 +523,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
        h->standard = 0;
        i2c_set_clientdata(&h->client, h);
-        i2c_attach_client(&h->client);
+        i2c_attach_client(&h->client);
        return 0;
 }
@@ -596,20 +597,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "i2c saa6752hs MPEG encoder",
+                .name   = "i2c saa6752hs MPEG encoder",
-        .id             = I2C_DRIVERID_SAA6752HS,
+        },
-        .flags          = I2C_DF_NOTIFY,
+        .id             = I2C_DRIVERID_SAA6752HS,
-        .attach_adapter = saa6752hs_probe,
+        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
+        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
+        .command        = saa6752hs_command,
 };
 static struct i2c_client client_template =
 {
        .name       = "saa6752hs",
-        .flags      = I2C_CLIENT_ALLOW_USE,
+        .driver     = &driver,
-        .driver     = &driver,
 };
 static int __init saa6752hs_init_module(void)
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 5707c666660..ade05f75fdb 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
 #define MIXER_ADDR_LINE2        2
 #define MIXER_ADDR_LAST         2
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
@@ -58,14 +59,15 @@ static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
-int position;
 #define dprintk(fmt, arg...)    if (debug) \
-        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg)
+        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
 /*
 * Main chip structure
 */
 typedef struct snd_card_saa7134 {
        snd_card_t *card;
        spinlock_t mixer_lock;
@@ -140,7 +142,8 @@ static void saa7134_dma_start(struct saa7134_dev *dev)
 *
 */
-void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status)
+static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
+                                  unsigned long status)
 {
        int next_blk, reg = 0;
@@ -209,8 +212,8 @@ void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status)
 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+        struct saa7134_dev *dev = dmasound->priv_data;
        unsigned long report, status;
        int loop, handled = 0;
@@ -881,7 +884,7 @@ static void snd_saa7134_free(snd_card_t * card)
 *
 */
-int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
+static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
 {
        snd_card_t *card;
@@ -945,6 +948,8 @@ int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
        sprintf(card->longname, "%s at 0x%lx irq %d",
                chip->dev->name, chip->iobase, chip->irq);
+        printk(KERN_INFO "%s/alsa: %s registered as card %d\n",dev->name,card->longname,index[devnum]);
        if ((err = snd_card_register(card)) == 0) {
                snd_saa7134_cards[devnum] = card;
                return 0;
@@ -955,6 +960,22 @@ __nodev:
        return err;
 }
+static int alsa_device_init(struct saa7134_dev *dev)
+{
+        dev->dmasound.priv_data = dev;
+        alsa_card_saa7134_create(dev,dev->nr);
+        return 1;
+}
+static int alsa_device_exit(struct saa7134_dev *dev)
+{
+        snd_card_free(snd_saa7134_cards[dev->nr]);
+        snd_saa7134_cards[dev->nr] = NULL;
+        return 1;
+}
 /*
 * Module initializer
 *
@@ -968,16 +989,20 @@ static int saa7134_alsa_init(void)
        struct saa7134_dev *dev = NULL;
        struct list_head *list;
-        position = 0;
+        if (!dmasound_init && !dmasound_exit) {
+                dmasound_init = alsa_device_init;
+                dmasound_exit = alsa_device_exit;
+        } else {
+                printk(KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n");
+                return -EBUSY;
+        }
-        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
        list_for_each(list,&saa7134_devlist) {
                dev = list_entry(list, struct saa7134_dev, devlist);
                if (dev->dmasound.priv_data == NULL) {
-                        dev->dmasound.priv_data = dev;
+                        alsa_device_init(dev);
-                        alsa_card_saa7134_create(dev,position);
-                        position++;
                } else {
                        printk(KERN_ERR "saa7134 ALSA: DMA sound is being handled by OSS. ignoring %s\n",dev->name);
                        return -EBUSY;
@@ -988,13 +1013,14 @@ static int saa7134_alsa_init(void)
                printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
        return 0;
 }
 /*
 * Module destructor
 */
-void saa7134_alsa_exit(void)
+static void saa7134_alsa_exit(void)
 {
        int idx;
@@ -1002,12 +1028,18 @@ void saa7134_alsa_exit(void)
                snd_card_free(snd_saa7134_cards[idx]);
        }
+        dmasound_init = NULL;
+        dmasound_exit = NULL;
        printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
        return;
 }
-module_init(saa7134_alsa_init);
+/* We initialize this late, to make sure the sound system is up and running */
+late_initcall(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ricardo Cerqueira");
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 75abc20b0cc..672fb205959 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -976,7 +976,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 3,
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 4275d2ddb86..23d8747338e 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int tuner[]    = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]     = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr,   int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);
@@ -88,6 +89,9 @@ LIST_HEAD(saa7134_devlist);
 static LIST_HEAD(mops_list);
 static unsigned int saa7134_devcount;
+int (*dmasound_init)(struct saa7134_dev *dev);
+int (*dmasound_exit)(struct saa7134_dev *dev);
 #define dprintk(fmt, arg...)    if (core_debug) \
        printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg)
@@ -184,8 +188,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
 /* ----------------------------------------------------------- */
 /* delayed request_module                                      */
-#ifdef CONFIG_MODULES
+#if defined(CONFIG_MODULES) && defined(MODULE)
 static int need_empress;
 static int need_dvb;
 static int need_alsa;
@@ -234,9 +237,7 @@ static void request_module_depend(char *name, int *flag)
 }
 #else
 #define request_module_depend(name,flag)
 #endif /* CONFIG_MODULES */
 /* ------------------------------------------------------------------ */
@@ -1017,6 +1018,10 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        /* check for signal */
        saa7134_irq_video_intl(dev);
+        if (dmasound_init && !dev->dmasound.priv_data) {
+                dmasound_init(dev);
+        }
        return 0;
 fail4:
@@ -1040,6 +1045,11 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
        struct list_head *item;
        struct saa7134_mpeg_ops *mops;
+        /* Release DMA sound modules if present */
+        if (dmasound_exit && dev->dmasound.priv_data) {
+                dmasound_exit(dev);
+        }
        /* debugging ... */
        if (irq_debug) {
                u32 report = saa_readl(SAA7134_IRQ_REPORT);
@@ -1071,6 +1081,7 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
        saa7134_i2c_unregister(dev);
        saa7134_unregister_video(dev);
        /* the DMA sound modules should be unloaded before reaching
           this, but just in case they are still present... */
        if (dev->dmasound.priv_data != NULL) {
@@ -1078,6 +1089,7 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
                dev->dmasound.priv_data = NULL;
        }
        /* release resources */
        free_irq(pci_dev->irq, dev);
        iounmap(dev->lmmio);
@@ -1149,10 +1161,10 @@ static int saa7134_init(void)
 static void saa7134_fini(void)
 {
-#ifdef CONFIG_MODULES
+#if defined(CONFIG_MODULES) && defined(MODULE)
        if (pending_registered)
                unregister_module_notifier(&pending_notifier);
-#endif
+#endif /* CONFIG_MODULES */
        pci_unregister_driver(&saa7134_pci_driver);
 }
@@ -1168,6 +1180,8 @@ EXPORT_SYMBOL(saa7134_boards);
 /* ----------------- for the DMA sound modules --------------- */
+EXPORT_SYMBOL(dmasound_init);
+EXPORT_SYMBOL(dmasound_exit);
 EXPORT_SYMBOL(saa7134_pgtable_free);
 EXPORT_SYMBOL(saa7134_pgtable_build);
 EXPORT_SYMBOL(saa7134_pgtable_alloc);
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index e9ec69efb4c..575f3e835f9 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -36,6 +36,7 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
 static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 module_param_array(empress_nr, int, NULL, 0444);
 MODULE_PARM_DESC(empress_nr,"ts device number");
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 7575043f087..1792d03d621 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                 client->driver->name, client->addr, client->name);
+                client->driver->driver.name, client->addr, client->name);
        /* Am I an i2c remote control? */
@@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client)
                {
                        struct IR_i2c *ir = i2c_get_clientdata(client);
                        d1printk("%s i2c IR detected (%s).\n",
-                                 client->driver->name,ir->phys);
+                                 client->driver->driver.name, ir->phys);
                        saa7134_set_i2c_ir(dev,ir);
                        break;
                }
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index fd9ed11ab1e..8badd2a9cb2 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = {
 static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+        struct saa7134_dev *dev = dmasound->priv_data;
-        unsigned long report, status;
+        unsigned long report, status;
-        int loop, handled = 0;
+        int loop, handled = 0;
-        for (loop = 0; loop < 10; loop++) {
+        for (loop = 0; loop < 10; loop++) {
-                report = saa_readl(SAA7134_IRQ_REPORT);
+                report = saa_readl(SAA7134_IRQ_REPORT);
-                status = saa_readl(SAA7134_IRQ_STATUS);
+                status = saa_readl(SAA7134_IRQ_STATUS);
-                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
+                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
-                        handled = 1;
+                        handled = 1;
-                        saa_writel(SAA7134_IRQ_REPORT,report);
+                        saa_writel(SAA7134_IRQ_REPORT,report);
-                        saa7134_irq_oss_done(dev, status);
+                        saa7134_irq_oss_done(dev, status);
-                } else {
+                } else {
-                        goto out;
+                        goto out;
-                }
+                }
-        }
+        }
-        if (loop == 10) {
+        if (loop == 10) {
-                dprintk("error! looping IRQ!");
+                dprintk("error! looping IRQ!");
-        }
+        }
 out:
-        return IRQ_RETVAL(handled);
+        return IRQ_RETVAL(handled);
 }
 int saa7134_oss_init1(struct saa7134_dev *dev)
 {
-        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
+        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-                         SA_SHIRQ | SA_INTERRUPT, dev->name,
+                         SA_SHIRQ | SA_INTERRUPT, dev->name,
                        (void*) &dev->dmasound)) < 0)
                return -1;
@@ -899,94 +899,120 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
        spin_unlock(&dev->slock);
 }
-int saa7134_dsp_create(struct saa7134_dev *dev)
+static int saa7134_dsp_create(struct saa7134_dev *dev)
 {
        int err;
-                        err = dev->dmasound.minor_dsp =
+        err = dev->dmasound.minor_dsp =
-                                register_sound_dsp(&saa7134_dsp_fops,
+                register_sound_dsp(&saa7134_dsp_fops,
-                                                   dsp_nr[dev->nr]);
+                                   dsp_nr[dev->nr]);
-                        if (err < 0) {
+        if (err < 0) {
-                                goto fail;
+                goto fail;
-                        }
+        }
-                        printk(KERN_INFO "%s: registered device dsp%d\n",
+        printk(KERN_INFO "%s: registered device dsp%d\n",
-                               dev->name,dev->dmasound.minor_dsp >> 4);
+               dev->name,dev->dmasound.minor_dsp >> 4);
-                        err = dev->dmasound.minor_mixer =
+        err = dev->dmasound.minor_mixer =
-                                register_sound_mixer(&saa7134_mixer_fops,
+                register_sound_mixer(&saa7134_mixer_fops,
-                                                     mixer_nr[dev->nr]);
+                                     mixer_nr[dev->nr]);
-                        if (err < 0)
+        if (err < 0)
-                                goto fail;
+                goto fail;
-                        printk(KERN_INFO "%s: registered device mixer%d\n",
+        printk(KERN_INFO "%s: registered device mixer%d\n",
-                               dev->name,dev->dmasound.minor_mixer >> 4);
+               dev->name,dev->dmasound.minor_mixer >> 4);
        return 0;
 fail:
-        unregister_sound_dsp(dev->dmasound.minor_dsp);
+        unregister_sound_dsp(dev->dmasound.minor_dsp);
        return 0;
 }
+static int oss_device_init(struct saa7134_dev *dev)
+{
+        dev->dmasound.priv_data = dev;
+        saa7134_oss_init1(dev);
+        saa7134_dsp_create(dev);
+        return 1;
+}
+static int oss_device_exit(struct saa7134_dev *dev)
+{
+        unregister_sound_mixer(dev->dmasound.minor_mixer);
+        unregister_sound_dsp(dev->dmasound.minor_dsp);
+        saa7134_oss_fini(dev);
+        if (dev->pci->irq > 0) {
+                synchronize_irq(dev->pci->irq);
+                free_irq(dev->pci->irq,&dev->dmasound);
+        }
+        dev->dmasound.priv_data = NULL;
+        return 1;
+}
 static int saa7134_oss_init(void)
 {
-        struct saa7134_dev *dev = NULL;
+        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct list_head *list;
+        if (!dmasound_init && !dmasound_exit) {
+                dmasound_init = oss_device_init;
+                dmasound_exit = oss_device_exit;
+        } else {
+                printk(KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n");
+                return -EBUSY;
+        }
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+        list_for_each(list,&saa7134_devlist) {
+                dev = list_entry(list, struct saa7134_dev, devlist);
                if (dev->dmasound.priv_data == NULL) {
-                        dev->dmasound.priv_data = dev;
+                        oss_device_init(dev);
-                        saa7134_oss_init1(dev);
-                        saa7134_dsp_create(dev);
                } else {
-                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
+                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
                        return -EBUSY;
                }
-        }
+        }
-        if (dev == NULL)
+        if (dev == NULL)
-                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
+                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
-        return 0;
+        return 0;
 }
-void saa7134_oss_exit(void)
+static void saa7134_oss_exit(void)
 {
-        struct saa7134_dev *dev = NULL;
+        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct list_head *list;
-        list_for_each(list,&saa7134_devlist) {
+        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+                dev = list_entry(list, struct saa7134_dev, devlist);
                /* Device isn't registered by OSS, probably ALSA's */
                if (!dev->dmasound.minor_dsp)
                        continue;
-                unregister_sound_mixer(dev->dmasound.minor_mixer);
+                oss_device_exit(dev);
-                unregister_sound_dsp(dev->dmasound.minor_dsp);
-                saa7134_oss_fini(dev);
+        }
-                if (dev->pci->irq > 0) {
-                        synchronize_irq(dev->pci->irq);
-                        free_irq(dev->pci->irq,&dev->dmasound);
-                }
-                dev->dmasound.priv_data = NULL;
-        }
+        dmasound_init = NULL;
+        dmasound_exit = NULL;
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
-        return;
+        return;
 }
-module_init(saa7134_oss_init);
+/* We initialize this late, to make sure the sound system is up and running */
+late_initcall(saa7134_oss_init);
 module_exit(saa7134_oss_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 244e1973081..add49db1ad4 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -571,6 +571,10 @@ void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf);
 int saa7134_set_dmabits(struct saa7134_dev *dev);
+extern int (*dmasound_init)(struct saa7134_dev *dev);
+extern int (*dmasound_exit)(struct saa7134_dev *dev);
 /* ----------------------------------------------------------- */
 /* saa7134-cards.c                                             */
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 132aa7943c1..f72a9f79620 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -415,7 +415,6 @@ saa7185_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_saa7185;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client)));
        encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);
@@ -487,11 +486,11 @@ saa7185_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver i2c_driver_saa7185 = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "saa7185",      /* name */
+                .name = "saa7185",      /* name */
+        },
        .id = I2C_DRIVERID_SAA7185B,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa7185_attach_adapter,
        .detach_client = saa7185_detach_client,
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index cbca896e8cf..41f6f05a043 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -788,10 +788,10 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 }
 static struct i2c_driver i2c_driver_saa7191 = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "saa7191",
+                .name   = "saa7191",
+        },
        .id             = I2C_DRIVERID_SAA7191,
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = saa7191_probe,
        .detach_client  = saa7191_detach,
        .command        = saa7191_command
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index d32737dd214..549c9929f10 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -501,10 +501,10 @@ static int tda7432_command(struct i2c_client *client,
 }
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
+        .driver = {
-        .name            = "i2c tda7432 driver",
+                .name    = "i2c tda7432 driver",
+        },
        .id              = I2C_DRIVERID_TDA7432,
-        .flags           = I2C_DF_NOTIFY,
        .attach_adapter  = tda7432_probe,
        .detach_client   = tda7432_detach,
        .command         = tda7432_command,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 1794686612c..ed4c04119cc 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -34,7 +34,7 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 #define SWITCH          0x00
 #define LEVEL_ADJUST    0x02
@@ -221,10 +221,10 @@ static int detach(struct i2c_client *client)
 }
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
+        .driver = {
-        .name   = "tda9840",
+                .name   = "tda9840",
+        },
        .id     = I2C_DRIVERID_TDA9840,
-        .flags  = I2C_DF_NOTIFY,
        .attach_adapter = attach,
        .detach_client  = detach,
        .command        = command,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index a5e37dc91f3..9c3ecf7a0fe 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -372,10 +372,10 @@ static int tda9875_command(struct i2c_client *client,
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "i2c tda9875 driver",
+                .name   = "i2c tda9875 driver",
+        },
        .id             = I2C_DRIVERID_TDA9875,
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tda9875_probe,
        .detach_client  = tda9875_detach,
        .command        = tda9875_command,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 4249127c0a1..7165a1b9625 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -12,6 +12,7 @@
 #include <media/audiochip.h>
 #include <media/tuner.h>
 /* Chips:
   TDA9885 (PAL, NTSC)
   TDA9886 (PAL, SECAM, NTSC)
@@ -818,14 +819,12 @@ static int tda9887_resume(struct device * dev)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner          = THIS_MODULE,
+        .id             = -1, /* FIXME */
-        .name           = "i2c tda9887 driver",
+        .attach_adapter = tda9887_probe,
-        .id             = -1, /* FIXME */
+        .detach_client  = tda9887_detach,
-        .flags          = I2C_DF_NOTIFY,
+        .command        = tda9887_command,
-        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
        .driver = {
+                .name    = "i2c tda9887 driver",
                .suspend = tda9887_suspend,
                .resume  = tda9887_resume,
        },
@@ -833,8 +832,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
        .name      = "tda9887",
-        .flags     = I2C_CLIENT_ALLOW_USE,
+        .driver    = &driver,
-        .driver    = &driver,
 };
 static int __init tda9887_init_module(void)
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index ee3688348b6..bb35844e384 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -36,7 +36,7 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 #define TEA6415C_NUM_INPUTS     8
 #define TEA6415C_NUM_OUTPUTS    6
@@ -190,10 +190,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
+        .driver = {
-        .name   = "tea6415c",
+                .name   = "tea6415c",
+        },
        .id     = I2C_DRIVERID_TEA6415C,
-        .flags  = I2C_DF_NOTIFY,
        .attach_adapter = attach,
        .detach_client  = detach,
        .command        = command,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 17975c19da5..c4ba3742f5c 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -36,7 +36,7 @@ static int debug = 0;		/* insmod parameter */
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 #define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0)
+            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END };
@@ -167,10 +167,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
+        .driver = {
-        .name   = "tea6420",
+                .name   = "tea6420",
+        },
        .id     = I2C_DRIVERID_TEA6420,
-        .flags  = I2C_DF_NOTIFY,
        .attach_adapter = attach,
        .detach_client  = detach,
        .command        = command,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 79203595b9c..d97f66804c3 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -175,10 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
 static struct i2c_driver 
 i2c_driver_tuner = 
 {
-        .owner          =       THIS_MODULE,
+        .driver = {
-        .name           =       "sab3036",
+                .name   =       "sab3036",
+        },
        .id             =       I2C_DRIVERID_SAB3036,
-        .flags          =       I2C_DF_NOTIFY,
        .attach_adapter =       tuner_probe,
        .detach_client  =       tuner_detach,
        .command        =       tuner_command
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e58abdfcaab..c13c7b95ef3 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -206,7 +206,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
        set_freq(c, t->freq);
        tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
-                  c->adapter->name, c->driver->name, c->addr << 1, type,
+                  c->adapter->name, c->driver->driver.name, c->addr << 1, type,
                  t->mode_mask);
 }
@@ -742,21 +742,18 @@ static int tuner_resume(struct device *dev)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
-        .name = "tuner",
        .id = I2C_DRIVERID_TUNER,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = tuner_probe,
        .detach_client = tuner_detach,
        .command = tuner_command,
        .driver = {
+                   .name = "tuner",
                   .suspend = tuner_suspend,
                   .resume = tuner_resume,
                   },
 };
 static struct i2c_client client_template = {
        .name = "(tuner unset)",
-        .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index c31bf28b73f..0292c5abf14 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
                buffer[1] = val;
                if (2 != i2c_master_send(&chip->c,buffer,2)) {
                        tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n",
-                                                chip->c.name, subaddr, val);
+                        chip->c.name, subaddr, val);
                        return -1;
                }
        }
@@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip)
                chip->c.name);
                return -1;
        }
-        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
        return buffer;
 }
@@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
                return -1;
        }
        tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
-                        chip->c.name,subaddr,read[0]);
+                chip->c.name, subaddr,read[0]);
        return read[0];
 }
@@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* update our shadow register set; print bytes if (debug > 0) */
        tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
-                chip->c.name,name,cmd->bytes[0]);
+                chip->c.name, name,cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                if (debug)
                        printk(" 0x%x",cmd->bytes[i]);
@@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
        int mode = desc->getmode(chip);
        if (mode == chip->prevmode)
-                return;
+        return;
        tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
        chip->prevmode = mode;
@@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                return -EIO;
        }
        tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
-        if (desc->flags) {
+        if (desc->flags) {
-                tvaudio_dbg("matches:%s%s%s.\n",
+                tvaudio_dbg("matches:%s%s%s.\n",
-                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
+                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
-                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
+                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
-                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
-        }
+        }
        /* fill required data structures */
-        strcpy(chip->c.name,desc->name);
+        strcpy(chip->c.name, desc->name);
        chip->type = desc-chiplist;
        chip->shadow.count = desc->registers+1;
-        chip->prevmode = -1;
+        chip->prevmode = -1;
        /* register */
        i2c_attach_client(&chip->c);
@@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client,
        struct CHIPSTATE *chip = i2c_get_clientdata(client);
        struct CHIPDESC  *desc = chiplist + chip->type;
-        tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd);
+        tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd);
        switch (cmd) {
        case AUDC_SET_INPUT:
@@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client,
        /* --- v4l ioctls --- */
        /* take care: bttv does userspace copying, we'll get a
-                                        kernel pointer here... */
+        kernel pointer here... */
        case VIDIOCGAUDIO:
        {
                struct video_audio *va = arg;
@@ -1702,10 +1702,10 @@ static int chip_command(struct i2c_client *client,
 static struct i2c_driver driver = {
-        .owner           = THIS_MODULE,
+        .driver = {
-        .name            = "generic i2c audio driver",
+                .name    = "generic i2c audio driver",
+        },
        .id              = I2C_DRIVERID_TVAUDIO,
-        .flags           = I2C_DF_NOTIFY,
        .attach_adapter  = chip_probe,
        .detach_client   = chip_detach,
        .command         = chip_command,
@@ -1714,7 +1714,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
        .name       = "(unset)",
-        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 72e8741e8b5..8ac4cb82a45 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -81,7 +81,7 @@ hauppauge_tuner_fmt[] =
        { 0x00000010, " PAL(I)" },
        { 0x00400000, " SECAM(L/L')" },
        { 0x00000e00, " PAL(D/K)" },
-        { 0x03000000, " ATSC Digital" },
+        { 0x03000000, " ATSC/DVB Digital" },
 };
 /* This is the full list of possible tuners. Many thanks to Hauppauge for
@@ -206,16 +206,30 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "TCL 2002MI_3H"},
        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
        /* 100-109 */
-        { TUNER_ABSENT,        "Philips FMD1216ME"},
+        { TUNER_PHILIPS_FMD1216ME_MK3, "Philips FMD1216ME"},
        { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
        { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
-        { TUNER_ABSENT,        "TCL MFNM05-4"},
+        { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"},
        { TUNER_ABSENT,        "TCL MNM05-4"},
        { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"},
        { TUNER_ABSENT,        "TCL MQNM05-4"},
        { TUNER_ABSENT,        "LG TAPC-W701D"},
        { TUNER_ABSENT,        "TCL 9886P-WM"},
        { TUNER_ABSENT,        "TCL 1676NM-WM"},
+        /* 110-119 */
+        { TUNER_ABSENT,        "Thompson DTT75105"},
+        { TUNER_ABSENT,        "Conexant_CX24109"},
+        { TUNER_ABSENT,        "TCL M2523_5N_E"},
+        { TUNER_ABSENT,        "TCL M2523_3DB_E"},
+        { TUNER_ABSENT,        "Philips 8275A"},
+        { TUNER_ABSENT,        "Microtune MT2060"},
+        { TUNER_ABSENT,        "Philips FM1236 MK5"},
+        { TUNER_ABSENT,        "Philips FM1216ME MK5"},
+        { TUNER_ABSENT,        "TCL M2523_3DI_E"},
+        { TUNER_ABSENT,        "Samsung THPD5222FG30A"},
+        /* 120-129 */
+        { TUNER_ABSENT,        "Xceive XC3028"},
+        { TUNER_ABSENT,        "Philips FQ1216LME MK5"},
 };
 static struct HAUPPAUGE_AUDIOIC
@@ -325,6 +339,7 @@ static int hasRadioTuner(int tunerType)
                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
+                case 105:
                return 1;
        }
        return 0;
@@ -368,10 +383,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
        memset(tvee, 0, sizeof(*tvee));
        done = len = beenhere = 0;
-        /* Hack for processing eeprom for em28xx */
+        /* Hack for processing eeprom for em28xx and cx 2388x*/
-        if ((eeprom_data[0]==0x1a)&&(eeprom_data[1]==0xeb)&&
+        if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) &&
-                                (eeprom_data[2]==0x67)&&(eeprom_data[3]==0x95))
+                        (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
-                start=0xa0;
+                start=0xa0; /* Generic em28xx offset */
+        else if (((eeprom_data[0] & 0xf0) == 0x10) &&
+                                        (eeprom_data[1] == 0x00) &&
+                                        (eeprom_data[2] == 0x00) &&
+                                        (eeprom_data[8] == 0x84))
+                start=8; /* Generic cx2388x offset */
        else
                start=0;
@@ -448,6 +468,17 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                                eeprom_data[i+5] +
                                (eeprom_data[i+6] << 8) +
                                (eeprom_data[i+7] << 16);
+                                if ( (eeprom_data[i + 8] && 0xf0) &&
+                                        (tvee->serial_number < 0xffffff) ) {
+                                        tvee->MAC_address[0] = 0x00;
+                                        tvee->MAC_address[1] = 0x0D;
+                                        tvee->MAC_address[2] = 0xFE;
+                                        tvee->MAC_address[3] = eeprom_data[i + 7];
+                                        tvee->MAC_address[4] = eeprom_data[i + 6];
+                                        tvee->MAC_address[5] = eeprom_data[i + 5];
+                                        tvee->has_MAC_address = 1;
+                                }
                        break;
                case 0x05:
@@ -466,11 +497,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                case 0x06:
                        /* tag 'ModelRev' */
                        tvee->model =
-                                eeprom_data[i+1] +
+                                eeprom_data[i + 1] +
-                                (eeprom_data[i+2] << 8);
+                                (eeprom_data[i + 2] << 8) +
-                        tvee->revision = eeprom_data[i+5] +
+                                (eeprom_data[i + 3] << 16) +
-                                (eeprom_data[i+6] << 8) +
+                                (eeprom_data[i + 4] << 24);
-                                (eeprom_data[i+7] << 16);
+                        tvee->revision =
+                                eeprom_data[i +5 ] +
+                                (eeprom_data[i + 6] << 8) +
+                                (eeprom_data[i + 7] << 16);
                        break;
                case 0x07:
@@ -563,6 +597,8 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                t_name2 = "unknown";
        }
+        tvee->tuner_hauppauge_model = tuner1;
+        tvee->tuner2_hauppauge_model = tuner2;
        tvee->tuner_formats = 0;
        tvee->tuner2_formats = 0;
        for (i = j = 0; i < 8; i++) {
@@ -578,6 +614,12 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
        tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n",
                tvee->model, tvee->rev_str, tvee->serial_number);
+        if (tvee->has_MAC_address == 1) {
+                tveeprom_info("MAC address is %02X-%02X-%02X-%02X-%02X-%02X\n",
+                        tvee->MAC_address[0], tvee->MAC_address[1],
+                        tvee->MAC_address[2], tvee->MAC_address[3],
+                        tvee->MAC_address[4], tvee->MAC_address[5]);
+        }
        tveeprom_info("tuner model is %s (idx %d, type %d)\n",
                t_name1, tuner1, tvee->tuner_type);
        tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
@@ -709,9 +751,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_tveeprom;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name), "tveeprom");
-        i2c_attach_client(client);
+        i2c_attach_client(client);
        return 0;
 }
@@ -736,10 +778,10 @@ tveeprom_detach_client (struct i2c_client *client)
 }
 static struct i2c_driver i2c_driver_tveeprom = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "tveeprom",
+                .name   = "tveeprom",
+        },
        .id             = I2C_DRIVERID_TVEEPROM,
-        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tveeprom_attach_adapter,
        .detach_client  = tveeprom_detach_client,
        .command        = tveeprom_command,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1aad0..e837f9f7fed 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,16 +228,14 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-        .owner           = THIS_MODULE,
+        .driver = {
-#endif
+                .name    = "tv card mixer driver",
+        },
+#else
        .name            = "tv card mixer driver",
+#endif
        .id              = I2C_DRIVERID_TVMIXER,
-#ifdef I2C_DF_DUMMY
-        .flags           = I2C_DF_DUMMY,
-#else
-        .flags           = I2C_DF_NOTIFY,
        .detach_adapter  = tvmixer_adapters,
-#endif
        .attach_adapter  = tvmixer_adapters,
        .detach_client   = tvmixer_clients,
 };
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 81e6d4494e7..a60442ea4f9 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
        } while (0)
 /* supported controls */
@@ -714,7 +714,6 @@ static struct i2c_driver driver;
 static struct i2c_client client_template = {
        .name = "(unset)",
-        .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };
@@ -770,7 +769,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
        if (debug > 1)
                dump_reg(client);
        return 0;
 }
@@ -802,12 +800,12 @@ static int tvp5150_detach_client(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 static struct i2c_driver driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "tvp5150",
+                .name = "tvp5150",
+        },
        /* FIXME */
        .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = tvp5150_attach_adapter,
        .detach_client = tvp5150_detach_client,
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 597b8db35a1..62a7d636ef1 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -191,9 +191,7 @@ char *v4l2_type_names[] = {
 };
 char *v4l2_ioctl_names[256] = {
-#if __GNUC__ >= 3
        [0 ... 255]                      = "UNKNOWN",
-#endif
        [_IOC_NR(VIDIOC_QUERYCAP)]       = "VIDIOC_QUERYCAP",
        [_IOC_NR(VIDIOC_RESERVED)]       = "VIDIOC_RESERVED",
        [_IOC_NR(VIDIOC_ENUM_FMT)]       = "VIDIOC_ENUM_FMT",
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 55f129e964e..0a4004a4393 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -13,6 +13,7 @@
 * (at your option) any later version.
 */
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
 * compile-command: "make DVB=1"
 * End:
 */
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index acfd3a103f3..9a6bf287e26 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -753,10 +753,9 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
        int retval;
        /* setup stuff */
-        retval = -ENOMEM;
        q->read_buf = videobuf_alloc(q->msize);
        if (NULL == q->read_buf)
-                goto done;
+                return -ENOMEM;
        q->read_buf->memory = V4L2_MEMORY_USERPTR;
        q->read_buf->baddr  = (unsigned long)data;
@@ -817,10 +816,14 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
                if (NULL == q->read_buf)
                        goto done;
                q->read_buf->memory = V4L2_MEMORY_USERPTR;
+                q->read_buf->bsize = count; /* preferred size */
                field = videobuf_next_field(q);
                retval = q->ops->buf_prepare(q,q->read_buf,field);
-                if (0 != retval)
+                if (0 != retval) {
+                        kfree (q->read_buf);
+                        q->read_buf = NULL;
                        goto done;
+                }
                spin_lock_irqsave(q->irqlock,flags);
                q->ops->buf_queue(q,q->read_buf);
                spin_unlock_irqrestore(q->irqlock,flags);
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 83c49f9610d..6de5b0094b8 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -76,14 +76,14 @@ static void video_release(struct class_device *cd)
 }
 static struct class video_class = {
-        .name    = VIDEO_NAME,
+        .name    = VIDEO_NAME,
        .release = video_release,
 };
 /*
- *      Active devices 
+ *      Active devices
 */
- 
 static struct video_device *video_device[VIDEO_NUM_DEVICES];
 static DECLARE_MUTEX(videodev_lock);
@@ -101,7 +101,7 @@ static int video_open(struct inode *inode, struct file *file)
        int err = 0;
        struct video_device *vfl;
        struct file_operations *old_fops;
-        
        if(minor>=VIDEO_NUM_DEVICES)
                return -ENODEV;
        down(&videodev_lock);
@@ -189,7 +189,7 @@ video_usercopy(struct inode *inode, struct file *file,
                                return -ENOMEM;
                        parg = mbuf;
                }
-                
                err = -EFAULT;
                if (_IOC_DIR(cmd) & _IOC_WRITE)
                        if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
@@ -240,7 +240,7 @@ int video_exclusive_open(struct inode *inode, struct file *file)
 int video_exclusive_release(struct inode *inode, struct file *file)
 {
        struct  video_device *vfl = video_devdata(file);
-        
        vfl->users--;
        return 0;
 }
@@ -253,7 +253,7 @@ static struct file_operations video_fops;
 *      @type: type of device to register
 *      @nr:   which device number (0 == /dev/video0, 1 == /dev/video1, ...
 *             -1 == first free)
- *      
+ *
 *      The registration code assigns minor numbers based on the type
 *      requested. -ENFILE is returned in all the device slots for this
 *      category are full. If not then the minor field is set and the
@@ -269,7 +269,7 @@ static struct file_operations video_fops;
 *
 *      %VFL_TYPE_VBI - Vertical blank data (undecoded)
 *
- *      %VFL_TYPE_RADIO - A radio card  
+ *      %VFL_TYPE_RADIO - A radio card
 */
 int video_register_device(struct video_device *vfd, int type, int nr)
@@ -278,7 +278,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
        int base;
        int end;
        char *name_base;
-        
        switch(type)
        {
                case VFL_TYPE_GRABBER:
@@ -293,7 +293,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
                        break;
                case VFL_TYPE_VBI:
                        base=224;
-                        end=240;
+                        end=256;
                        name_base = "vbi";
                        break;
                case VFL_TYPE_RADIO:
@@ -334,7 +334,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
        init_MUTEX(&vfd->lock);
        /* sysfs class */
-        memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));
+        memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));
        if (vfd->dev)
                vfd->class_dev.dev = vfd->dev;
        vfd->class_dev.class       = &video_class;
@@ -360,7 +360,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
 *      This unregisters the passed device and deassigns the minor
 *      number. Future open calls will be met with errors.
 */
- 
 void video_unregister_device(struct video_device *vfd)
 {
        down(&videodev_lock);
@@ -384,7 +384,7 @@ static struct file_operations video_fops=
 /*
 *      Initialise video for linux
 */
- 
 static int __init videodev_init(void)
 {
        int ret;
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 137b58f2c66..8dcee8b60e2 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -631,7 +631,6 @@ vpx3220_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &vpx3220_i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        /* Check for manufacture ID and part number */
        if (kind < 0) {
@@ -722,11 +721,11 @@ vpx3220_attach_adapter (struct i2c_adapter *adapter)
 */
 static struct i2c_driver vpx3220_i2c_driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "vpx3220",
+                .name = "vpx3220",
+        },
        .id = I2C_DRIVERID_VPX3220,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = vpx3220_attach_adapter,
        .detach_client = vpx3220_detach_client,
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index a6936ad74fc..bbfd55cd994 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -40,10 +40,10 @@ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
 MODULE_LICENSE("GPL");
 #define wm8775_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define wm8775_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
@@ -168,7 +168,6 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver;
-        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name) - 1, "wm8775");
        wm8775_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -233,15 +232,15 @@ static int wm8775_detach(struct i2c_client *client)
 /* i2c implementation */
 static struct i2c_driver i2c_driver = {
-        .name = "wm8775",
+        .driver = {
+                .name = "wm8775",
+        },
        .id = I2C_DRIVERID_WM8775,
-        .flags = I2C_DF_NOTIFY,
        .attach_adapter = wm8775_probe,
        .detach_client = wm8775_detach,
        .command = wm8775_command,
-        .owner = THIS_MODULE,
 };
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 07bde9acd67..4034f1b4536 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1311,7 +1311,7 @@ zoran_open (struct inode *inode,
                res = -ENODEV;
                goto open_unlock_and_return;
        }
-        if (!try_module_get(zr->decoder->driver->owner)) {
+        if (!try_module_get(zr->decoder->driver->driver.owner)) {
                dprintk(1,
                        KERN_ERR
                        "%s: failed to grab ownership of i2c decoder\n",
@@ -1321,13 +1321,13 @@ zoran_open (struct inode *inode,
                goto open_unlock_and_return;
        }
        if (zr->encoder &&
-            !try_module_get(zr->encoder->driver->owner)) {
+            !try_module_get(zr->encoder->driver->driver.owner)) {
                dprintk(1,
                        KERN_ERR
                        "%s: failed to grab ownership of i2c encoder\n",
                        ZR_DEVNAME(zr));
                res = -EIO;
-                module_put(zr->decoder->driver->owner);
+                module_put(zr->decoder->driver->driver.owner);
                module_put(THIS_MODULE);
                goto open_unlock_and_return;
        }
@@ -1393,9 +1393,9 @@ zoran_open (struct inode *inode,
 open_unlock_and_return:
        /* if we grabbed locks, release them accordingly */
        if (have_module_locks) {
-                module_put(zr->decoder->driver->owner);
+                module_put(zr->decoder->driver->driver.owner);
                if (zr->encoder) {
-                        module_put(zr->encoder->driver->owner);
+                        module_put(zr->encoder->driver->driver.owner);
                }
                module_put(THIS_MODULE);
        }
@@ -1461,9 +1461,9 @@ zoran_close (struct inode *inode,
        kfree(fh);
        /* release locks on the i2c modules */
-        module_put(zr->decoder->driver->owner);
+        module_put(zr->decoder->driver->driver.owner);
        if (zr->encoder) {
-                 module_put(zr->encoder->driver->owner);
+                 module_put(zr->encoder->driver->driver.owner);
        }
        module_put(THIS_MODULE);