lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DVB (2428): Fixes for the topuptv/SCM mediaguard CAM module in KNC1 CI module

Browse Source 
- Fixes for the topuptv/SCM mediaguard CAM module in KNC1 CI module

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
Andrew de Quincey
2006-01-09 15:25:05 -02:00
committed by Mauro Carvalho Chehab
parent 8a8e9c281d
commit 2d0235df0e
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/dvb/ttpci/budget-av.c
View File

@@ -127,7 +127,7 @@ static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int ad
saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTHI); saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTHI);
udelay(1); udelay(1);
result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, address & 0xfff, 1, 0, 0); result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, address & 0xfff, 1, 0, 1);
if (result == -ETIMEDOUT) if (result == -ETIMEDOUT)
budget_av->slot_status = 0; budget_av->slot_status = 0;
@@ -145,7 +145,7 @@ static int ciintf_write_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int a
saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTHI); saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTHI);
udelay(1); udelay(1);
result = ttpci_budget_debiwrite(&budget_av->budget, DEBICICAM, address & 0xfff, 1, value, 0, 0); result = ttpci_budget_debiwrite(&budget_av->budget, DEBICICAM, address & 0xfff, 1, value, 0, 1);
if (result == -ETIMEDOUT) if (result == -ETIMEDOUT)
budget_av->slot_status = 0; budget_av->slot_status = 0;
@@ -192,7 +192,7 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
{ {
struct budget_av *budget_av = (struct budget_av *) ca->data; struct budget_av *budget_av = (struct budget_av *) ca->data;
struct saa7146_dev *saa = budget_av->budget.dev; struct saa7146_dev *saa = budget_av->budget.dev;
int timeout = 500; // 5 seconds (4.4.6 Ready) int timeout = 50; // 5 seconds (4.4.6 Ready)
if (slot != 0) if (slot != 0)
return -EINVAL; return -EINVAL;
@@ -256,19 +256,37 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
{ {
struct budget_av *budget_av = (struct budget_av *) ca->data; struct budget_av *budget_av = (struct budget_av *) ca->data;
struct saa7146_dev *saa = budget_av->budget.dev; struct saa7146_dev *saa = budget_av->budget.dev;
int cam_present = 0;
if (slot != 0) if (slot != 0)
return -EINVAL; return -EINVAL;
if (!budget_av->slot_status) { if (!budget_av->slot_status)
{
// first of all test the card detect line
saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT); saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
udelay(1); udelay(1);
if (saa7146_read(saa, PSR) & MASK_06) if (saa7146_read(saa, PSR) & MASK_06)
{ {
cam_present = 1;
}
saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
// that is unreliable however, so try and read from IO memory
if (!cam_present)
{
saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO);
if (ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1) != -ETIMEDOUT)
{
cam_present = 1;
}
}
// did we find something?
if (cam_present) {
printk(KERN_INFO "budget-av: cam inserted\n"); printk(KERN_INFO "budget-av: cam inserted\n");
budget_av->slot_status = 1; budget_av->slot_status = 1;
} }
saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
} else if (!open) { } else if (!open) {
saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO); saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO);
if (ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1) == -ETIMEDOUT) if (ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1) == -ETIMEDOUT)