8 files changed, 118 insertions, 57 deletions

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index caebd0a1c021..6a901a0268e1 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 97b4341255ea..bd458cb9b4ea 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,5 @@
-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-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
 
 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 4b71fd6f7aed..97fa3fc571c4 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -126,6 +126,66 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
 };
 EXPORT_SYMBOL_GPL(ir_codes_winfast);
 
+IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {
+        [ 0x59 ] = KEY_MUTE,
+        [ 0x4a ] = KEY_POWER,
+
+        [ 0x18 ] = KEY_TEXT,
+        [ 0x26 ] = KEY_TV,
+        [ 0x3d ] = KEY_PRINT,
+
+        [ 0x48 ] = KEY_RED,
+        [ 0x04 ] = KEY_GREEN,
+        [ 0x11 ] = KEY_YELLOW,
+        [ 0x00 ] = KEY_BLUE,
+
+        [ 0x2d ] = KEY_VOLUMEUP,
+        [ 0x1e ] = KEY_VOLUMEDOWN,
+
+        [ 0x49 ] = KEY_MENU,
+
+        [ 0x16 ] = KEY_CHANNELUP,
+        [ 0x17 ] = KEY_CHANNELDOWN,
+
+        [ 0x20 ] = KEY_UP,
+        [ 0x21 ] = KEY_DOWN,
+        [ 0x22 ] = KEY_LEFT,
+        [ 0x23 ] = KEY_RIGHT,
+        [ 0x0d ] = KEY_SELECT,
+
+
+
+        [ 0x08 ] = KEY_BACK,
+        [ 0x07 ] = KEY_REFRESH,
+
+        [ 0x2f ] = KEY_ZOOM,
+        [ 0x29 ] = KEY_RECORD,
+
+        [ 0x4b ] = KEY_PAUSE,
+        [ 0x4d ] = KEY_REWIND,
+        [ 0x2e ] = KEY_PLAY,
+        [ 0x4e ] = KEY_FORWARD,
+        [ 0x53 ] = KEY_PREVIOUS,
+        [ 0x4c ] = KEY_STOP,
+        [ 0x54 ] = KEY_NEXT,
+
+        [ 0x69 ] = KEY_KP0,
+        [ 0x6a ] = KEY_KP1,
+        [ 0x6b ] = KEY_KP2,
+        [ 0x6c ] = KEY_KP3,
+        [ 0x6d ] = KEY_KP4,
+        [ 0x6e ] = KEY_KP5,
+        [ 0x6f ] = KEY_KP6,
+        [ 0x70 ] = KEY_KP7,
+        [ 0x71 ] = KEY_KP8,
+        [ 0x72 ] = KEY_KP9,
+
+        [ 0x74 ] = KEY_CHANNEL,
+        [ 0x0a ] = KEY_BACKSPACE,
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_pinnacle);
+
 /* empty keytable, can be used as placeholder for not-yet created keytables */
 IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE] = {
         [ 42 ] = KEY_COFFEE,
@@ -253,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 206cc2f61f26..2899d34e5f7e 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;
-        dma_addr_t   dma_addr;
+        u32          *cpu;
+        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 37888989ea2e..09ec964dec5c 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 fec6beab8c28..8aabdd8fb3c5 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 short_delay = 0;
+        int address_err = 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 */
-                msleep(10);
+                /* delay a bit before retrying */
+                msleep(10);
 
         } while (err != num && retries--);
 
-        /* if every retry had an address error, exit right away */
-        if (address_err == retries) {
-                goto out;
+        /* if every retry had an address error, exit right away */
+        if (address_err == retries) {
+                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 cb86a97fda1f..063986ec16b5 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;
-        dma_addr_t   dma_addr;
+        u32          *cpu;
+        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 8dd4d15ca36d..1d961023b837 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)
-                        ? V4L2_FIELD_INTERLACED
-                        : V4L2_FIELD_TOP;
-                }
-        switch (field) {
-        case V4L2_FIELD_TOP:
-        case V4L2_FIELD_BOTTOM:
-        case V4L2_FIELD_ALTERNATE:
-                maxh = maxh / 2;
-                break;
-        case V4L2_FIELD_INTERLACED:
-                break;
-        default: {
+                field = (win->w.height > maxh/2)
+                        ? V4L2_FIELD_INTERLACED
+                        : V4L2_FIELD_TOP;
+                }
+        switch (field) {
+        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_BOTTOM:
+        case V4L2_FIELD_ALTERNATE:
+                maxh = maxh / 2;
+                break;
+        case V4L2_FIELD_INTERLACED:
+                break;
+        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:
-        {
-                struct v4l2_streamparm *parm = arg;
+        case VIDIOC_G_PARM:
+        {
+                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;