V4L/DVB (13775): [Mantis] Remove unnecessary job queues

[deliverable/linux.git] / drivers / media / dvb / mantis / mantis_hif.c

diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 42e0360e96d94f50fdfe014ff3d4627f71fe0cf3..621dce3eb5d6d30554811cfb2ff0a89f210daf0e 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -51,11 +51,13 @@ static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Smart buffer operation timeout !", mantis->num);
                rc = -EREMOTEIO;
        }
+       dprintk(verbose, MANTIS_DEBUG, 1, "Smart Buffer Operation complete");
        ca->hif_event &= ~MANTIS_SBUF_OPDONE;
        udelay(5);
        return rc;
 }
 
+
 int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
 {
        struct mantis_pci *mantis = ca->ca_priv;
@@ -67,22 +69,18 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
        hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
        hif_addr |=  addr;
 
-       mmwrite(hif_addr, MANTIS_GPIF_BRADDR);
+       mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_BRADDR);
        mmwrite(count, MANTIS_GPIF_BRBYTES);
 
        udelay(20);
 
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
-       if (mantis_hif_data_available(ca) != 0) {
-               dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer burst read failed", mantis->num);
-               return -EREMOTEIO;
-       }
+       mmwrite(hif_addr, MANTIS_GPIF_ADDR);
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
-       data = mmread(MANTIS_GPIF_HIFDIN);
-
+       data = mmread(MANTIS_GPIF_DIN);
+       dprintk(verbose, MANTIS_DEBUG, 1, "Mem Read: 0x%02x", data);
        return (data >> 24) & 0xff;
 }
 
@@ -99,17 +97,15 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
        hif_addr |= addr;
 
        mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
-
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
-       mmwrite(data, MANTIS_GPIF_HIFDOUT);
-       ca->hif_job_queue = MANTIS_HIF_MEMWR;
+       mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
+       mmwrite(data, MANTIS_GPIF_DOUT);
 
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_MEMWR;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
-       ca->hif_job_queue &= ~MANTIS_HIF_MEMWR;
+       dprintk(verbose, MANTIS_DEBUG, 1, "Mem Write: (0x%02x to 0x%02x)", data, addr);
+
        return 0;
 }
 
@@ -124,21 +120,17 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
        hif_addr |=  addr;
 
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
-       ca->hif_job_queue = MANTIS_HIF_IOMRD;
+       mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
 
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
+       data = mmread(MANTIS_GPIF_DIN);
+       dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
        udelay(50);
-       ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
-       data = mmread(MANTIS_GPIF_HIFDIN);
-       hif_addr |= MANTIS_GPIF_PCMCIAREG;
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
 
-       return data;
+       return (u8) data;
 }
 
 int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
@@ -152,34 +144,38 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
        hif_addr |=  addr;
 
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
-       mmwrite(data, MANTIS_GPIF_HIFDOUT);
+       mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
+       mmwrite(data, MANTIS_GPIF_DOUT);
 
-       ca->hif_job_queue = MANTIS_HIF_IOMWR;
        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
-               ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
                dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
                return -EREMOTEIO;
        }
+       dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
        udelay(50);
-       ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
-       hif_addr |= MANTIS_GPIF_PCMCIAREG;
-       mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
 
        return 0;
 }
 
 int mantis_hif_init(struct mantis_ca *ca)
 {
+       struct mantis_slot *slot = ca->slot;
        struct mantis_pci *mantis = ca->ca_priv;
        u32 irqcfg;
 
+       slot[0].slave_cfg = 0x70773028;
        dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num);
        init_waitqueue_head(&ca->hif_data_wq);
        init_waitqueue_head(&ca->hif_opdone_wq);
 
-       irqcfg  = mmread(MANTIS_GPIF_IRQCFG);
-       irqcfg |= MANTIS_MASK_BRRDY;
+       irqcfg = mmread(MANTIS_GPIF_IRQCFG);
+       irqcfg = MANTIS_MASK_BRRDY      |
+                MANTIS_MASK_WRACK      |
+                MANTIS_MASK_EXTIRQ     |
+                MANTIS_MASK_WSTO       |
+                MANTIS_MASK_OTHERR     |
+                MANTIS_MASK_OVFLW;
+
        mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
 
        return 0;