V4L/DVB (13745): [Mantis CA] Add some debug statements

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index cd6bed73729688d59b8d6d5afe2674b19f8d2710..a8b8c88238e0874e448025a441a5e2606c1d5942 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -25,6 +25,9 @@
 static int mantis_ca_read_attr_mem(struct dvb_ca_en50221 *en50221, int slot, int addr)
 {
        struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Request Attribute Mem Read", slot);
 
        if (slot != 0)
                return -EINVAL;
@@ -35,6 +38,9 @@ static int mantis_ca_read_attr_mem(struct dvb_ca_en50221 *en50221, int slot, int
 static int mantis_ca_write_attr_mem(struct dvb_ca_en50221 *en50221, int slot, int addr, u8 data)
 {
        struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Request Attribute Mem Write", slot);
 
        if (slot != 0)
                return -EINVAL;
@@ -45,6 +51,9 @@ static int mantis_ca_write_attr_mem(struct dvb_ca_en50221 *en50221, int slot, in
 static int mantis_ca_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr)
 {
        struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Request CAM control Read", slot);
 
        if (slot != 0)
                return -EINVAL;
@@ -55,6 +64,9 @@ static int mantis_ca_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 a
 static int mantis_ca_write_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr, u8 data)
 {
        struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Request CAM control Write", slot);
 
        if (slot != 0)
                return -EINVAL;
@@ -64,22 +76,40 @@ static int mantis_ca_write_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8
 
 static int mantis_ca_slot_reset(struct dvb_ca_en50221 *en50221, int slot)
 {
+       struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Slot RESET", slot);
+
        return 0;
 }
 
 static int mantis_ca_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot)
 {
+       struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Slot shutdown", slot);
+
        return 0;
 }
 
 static int mantis_ts_control(struct dvb_ca_en50221 *en50221, int slot)
 {
+       struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): TS control", slot);
+
        return 0;
 }
 
 static int mantis_slot_status(struct dvb_ca_en50221 *en50221, int slot, int open)
 {
        struct mantis_ca *ca = en50221->data;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): Poll Slot status", slot);
 
        if (ca->slot_state == MODULE_INSERTED)
                return DVB_CA_EN50221_POLL_CAM_PRESENT | DVB_CA_EN50221_POLL_CAM_READY;
@@ -93,6 +123,7 @@ int mantis_ca_init(struct mantis_pci *mantis)
        struct mantis_ca *ca;
        int ca_flags = 0, result;
 
+       dprintk(verbose, MANTIS_DEBUG, 1, "Initializing Mantis CA");
        if (!(ca = kzalloc(sizeof (struct mantis_ca), GFP_KERNEL))) {
                dprintk(verbose, MANTIS_ERROR, 1, "Out of memory!, exiting ..");
                result = -ENOMEM;
@@ -130,6 +161,9 @@ err:
 void mantis_ca_exit(struct mantis_pci *mantis)
 {
        struct mantis_ca *ca = mantis->mantis_ca;
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       dprintk(verbose, MANTIS_DEBUG, 1, "Mantis CA exit");
 
        mantis_evmgr_exit(ca);
        dprintk(verbose, MANTIS_ERROR, 1, "Unregistering EN50221 device");

diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 6a1ea96c16d998c767914c6e6bc619589f3d8370..42e0360e96d94f50fdfe014ff3d4627f71fe0cf3 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -61,6 +61,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
        struct mantis_pci *mantis = ca->ca_priv;
        u32 hif_addr = 0, data, count = 4;
 
+       dprintk(verbose, MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF Mem Read", mantis->num);
        hif_addr |=  MANTIS_GPIF_HIFRDWRN;
        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
        hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
@@ -91,6 +92,7 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
        struct mantis_pci *mantis = ca->ca_priv;
        u32 hif_addr = 0;
 
+       dprintk(verbose, MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF Mem Write", mantis->num);
        hif_addr &= ~MANTIS_GPIF_HIFRDWRN;
        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
        hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
@@ -116,6 +118,7 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
        struct mantis_pci *mantis = ca->ca_priv;
        u32 data, hif_addr = 0;
 
+       dprintk(verbose, MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF I/O Read", mantis->num);
        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
        hif_addr |=  MANTIS_GPIF_HIFRDWRN;
        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
@@ -143,6 +146,7 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
        struct mantis_pci *mantis = ca->ca_priv;
        u32 hif_addr = 0;
 
+       dprintk(verbose, MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF I/O Write", mantis->num);
        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
        hif_addr &= ~MANTIS_GPIF_HIFRDWRN;
        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;