Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179503
b: refs/heads/master
c: 8b9c385
h: refs/heads/master
i:
  179501: c1653fa
  179499: d212303
  179495: cde17fd
  179487: 5c7ee9e
v: v3
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Jan 17, 2010
1 parent 35aa99d commit 4d97559
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e2a0c99019bbc78d6fb00caf7a79f03df020b3c
refs/heads/master: 8b9c385f765bcc7fc5ae802830ffcb4b6ca6bc9c
7 changes: 6 additions & 1 deletion trunk/drivers/media/dvb/mantis/mantis_hif.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ 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;
Expand Down Expand Up @@ -83,7 +84,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
return -EREMOTEIO;
}
data = mmread(MANTIS_GPIF_DIN);

dprintk(verbose, MANTIS_DEBUG, 1, "Mem Read: 0x%02x", data);
return (data >> 24) & 0xff;
}

Expand Down Expand Up @@ -111,6 +112,8 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
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;
}

Expand All @@ -137,6 +140,7 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
data = mmread(MANTIS_GPIF_DIN);
hif_addr |= MANTIS_GPIF_PCMCIAREG;
mmwrite(hif_addr, MANTIS_GPIF_ADDR);
dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
udelay(50);

return (u8) data;
Expand Down Expand Up @@ -165,6 +169,7 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
hif_addr |= MANTIS_GPIF_PCMCIAREG;
mmwrite(hif_addr, MANTIS_GPIF_ADDR);
dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
udelay(50);

return 0;
Expand Down

0 comments on commit 4d97559

Please sign in to comment.