Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[safe/jmp/linux-2.6] / drivers / media / dvb / mantis / mantis_core.c

diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
index 3b5fea7..8113b23 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_core.c
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -1,7 +1,7 @@
 /*
        Mantis PCI bridge driver
 
-       Copyright (C) 2005, 2006 Manu Abraham (abraham.manu@gmail.com)
+       Copyright (C) Manu Abraham (abraham.manu@gmail.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
@@ -22,7 +22,9 @@
 #include "mantis_core.h"
 #include "mantis_vp1033.h"
 #include "mantis_vp1034.h"
+#include "mantis_vp1041.h"
 #include "mantis_vp2033.h"
+#include "mantis_vp2040.h"
 #include "mantis_vp3030.h"
 
 static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
@@ -34,14 +36,16 @@ static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
                        .flags = 0,
                        .buf = data,
                        .len = 1
-               },{
+               }, {
                        .addr = 0x50,
                        .flags = I2C_M_RD,
                        .buf = data,
                        .len = length
                },
        };
-       if ((err = i2c_transfer(&mantis->adapter, msg, 2)) < 0) {
+
+       err = i2c_transfer(&mantis->adapter, msg, 2);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1,
                        "ERROR: i2c read: < err=%i d0=0x%02x d1=0x%02x >",
                        err, data[0], data[1]);
@@ -63,7 +67,8 @@ static int write_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
                .len = length
        };
 
-       if ((err = i2c_transfer(&mantis->adapter, &msg, 1)) < 0) {
+       err = i2c_transfer(&mantis->adapter, &msg, 1);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1,
                        "ERROR: i2c write: < err=%i length=0x%02x d0=0x%02x, d1=0x%02x >",
                        err, length, data[0], data[1]);
@@ -79,7 +84,8 @@ static int get_mac_address(struct mantis_pci *mantis)
        int err;
 
        mantis->mac_address[0] = 0x08;
-       if ((err = read_eeprom_byte(mantis, &mantis->mac_address[0], 6)) < 0) {
+       err = read_eeprom_byte(mantis, &mantis->mac_address[0], 6);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1, "Mantis EEPROM read error");
 
                return err;
@@ -104,17 +110,25 @@ struct mantis_hwconfig unknown_device = {
 static void mantis_load_config(struct mantis_pci *mantis)
 {
        switch (mantis->subsystem_device) {
-       case MANTIS_VP_1033_DVB_S:      // VP-1033
+       case MANTIS_VP_1033_DVB_S:      /* VP-1033 */
                mantis->hwconfig = &vp1033_mantis_config;
                break;
-       case MANTIS_VP_1034_DVB_S:      // VP-1034
+       case MANTIS_VP_1034_DVB_S:      /* VP-1034 */
                mantis->hwconfig = &vp1034_mantis_config;
                break;
-       case MANTIS_VP_2033_DVB_C:      // VP-2033
-       case TERRATEC_CINERGY_C_PCI:    // Terratec Cinergy C PCI
+       case MANTIS_VP_1041_DVB_S2:     /* VP-1041 */
+       case TECHNISAT_SKYSTAR_HD2:
+               mantis->hwconfig = &vp1041_mantis_config;
+               break;
+       case MANTIS_VP_2033_DVB_C:      /* VP-2033 */
                mantis->hwconfig = &vp2033_mantis_config;
                break;
-       case MANTIS_VP_3030_DVB_T:      // VP-3030
+       case MANTIS_VP_2040_DVB_C:      /* VP-2040 */
+       case TERRATEC_CINERGY_C_PCI:    /* VP-2040 clone */
+       case TECHNISAT_CABLESTAR_HD2:
+               mantis->hwconfig = &vp2040_mantis_config;
+               break;
+       case MANTIS_VP_3030_DVB_T:      /* VP-3030 */
                mantis->hwconfig = &vp3030_mantis_config;
                break;
        default:
@@ -139,22 +153,31 @@ int mantis_core_init(struct mantis_pci *mantis)
                mantis->pdev->irq, mantis->latency,
                mantis->mantis_addr, mantis->mantis_mmio);
 
-       if ((err = mantis_i2c_init(mantis)) < 0) {
+       err = mantis_i2c_init(mantis);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1, "Mantis I2C init failed");
                return err;
        }
-       if ((err = get_mac_address(mantis)) < 0) {
+       err = get_mac_address(mantis);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1, "get MAC address failed");
                return err;
        }
-       if ((err = mantis_dma_init(mantis)) < 0) {
+       err = mantis_dma_init(mantis);
+       if (err < 0) {
                dprintk(verbose, MANTIS_ERROR, 1, "Mantis DMA init failed");
                return err;
        }
-       if ((err = mantis_dvb_init(mantis)) < 0) {
+       err = mantis_dvb_init(mantis);
+       if (err < 0) {
                dprintk(verbose, MANTIS_DEBUG, 1, "Mantis DVB init failed");
                return err;
        }
+       err = mantis_uart_init(mantis);
+       if (err < 0) {
+               dprintk(verbose, MANTIS_DEBUG, 1, "Mantis UART init failed");
+               return err;
+       }
 
        return 0;
 }
@@ -163,6 +186,10 @@ int mantis_core_exit(struct mantis_pci *mantis)
 {
        mantis_dma_stop(mantis);
        dprintk(verbose, MANTIS_ERROR, 1, "DMA engine stopping");
+
+       mantis_uart_exit(mantis);
+       dprintk(verbose, MANTIS_ERROR, 1, "UART exit failed");
+
        if (mantis_dma_exit(mantis) < 0)
                dprintk(verbose, MANTIS_ERROR, 1, "DMA exit failed");
        if (mantis_dvb_exit(mantis) < 0)
@@ -173,31 +200,31 @@ int mantis_core_exit(struct mantis_pci *mantis)
        return 0;
 }
 
-// Turn the given bit on or off.
+/* Turn the given bit on or off. */
 void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
 {
-       u32 currVal, newVal;
-
-       currVal = mmread(MANTIS_GPIF_ADDR);
+       u32 cur;
 
+       cur = mmread(MANTIS_GPIF_ADDR);
        if (value)
-               newVal = currVal | (1 << bitpos);
+               mantis->gpio_status = cur | (1 << bitpos);
        else
-               newVal = currVal & (~(1 << bitpos));
+               mantis->gpio_status = cur & (~(1 << bitpos));
 
-       mmwrite(newVal, MANTIS_GPIF_ADDR);
+       mmwrite(mantis->gpio_status, MANTIS_GPIF_ADDR);
        mmwrite(0x00, MANTIS_GPIF_DOUT);
        udelay(100);
 }
 
-//direction = 0 , no CI passthrough ; 1 , CI passthrough
+/* direction = 0 , no CI passthrough ; 1 , CI passthrough */
 void mantis_set_direction(struct mantis_pci *mantis, int direction)
 {
        u32 reg;
 
        reg = mmread(0x28);
        dprintk(verbose, MANTIS_DEBUG, 1, "TS direction setup");
-       if (direction == 0x01) { //to CI
+       if (direction == 0x01) {
+               /* to CI */
                reg |= 0x04;
                mmwrite(reg, 0x28);
                reg &= 0xff - 0x04;