Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / media / dvb / bt8xx / dst_ca.c
index d781504..f6b49a8 100644 (file)
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/string.h>
-
 #include <linux/dvb/ca.h>
 #include "dvbdev.h"
 #include "dvb_frontend.h"
-
 #include "dst_ca.h"
 #include "dst_common.h"
 
-static unsigned int verbose = 1;
+#define DST_CA_ERROR           0
+#define DST_CA_NOTICE          1
+#define DST_CA_INFO            2
+#define DST_CA_DEBUG           3
+
+#define dprintk(x, y, z, format, arg...) do {                                          \
+       if (z) {                                                                        \
+               if      ((x > DST_CA_ERROR) && (x > y))                                 \
+                       printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg);      \
+               else if ((x > DST_CA_NOTICE) && (x > y))                                \
+                       printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg);   \
+               else if ((x > DST_CA_INFO) && (x > y))                                  \
+                       printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg);     \
+               else if ((x > DST_CA_DEBUG) && (x > y))                                 \
+                       printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg);    \
+       } else {                                                                        \
+               if (x > y)                                                              \
+                       printk(format, ## arg);                                         \
+       }                                                                               \
+} while(0)
+
+
+static unsigned int verbose = 5;
 module_param(verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
 
-static unsigned int debug = 1;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "debug messages, default is 1 (yes)");
-
-#define dprintk if (debug) printk
-
 /*     Need some more work     */
 static int ca_set_slot_descr(void)
 {
@@ -57,73 +69,53 @@ static int ca_set_pid(void)
 }
 
 
-static int put_checksum(u8 *check_string, int length)
+static void put_checksum(u8 *check_string, int length)
 {
-       u8 i = 0, checksum = 0;
-
-       if (verbose > 3) {
-               dprintk("%s: ========================= Checksum calculation ===========================\n", __FUNCTION__);
-               dprintk("%s: String Length=[0x%02x]\n", __FUNCTION__, length);
-
-               dprintk("%s: String=[", __FUNCTION__);
-       }
-       while (i < length) {
-               if (verbose > 3)
-                       dprintk(" %02x", check_string[i]);
-               checksum += check_string[i];
-               i++;
-       }
-       if (verbose > 3) {
-               dprintk(" ]\n");
-               dprintk("%s: Sum=[%02x]\n", __FUNCTION__, checksum);
-       }
-       check_string[length] = ~checksum + 1;
-       if (verbose > 3) {
-               dprintk("%s: Checksum=[%02x]\n", __FUNCTION__, check_string[length]);
-               dprintk("%s: ==========================================================================\n", __FUNCTION__);
-       }
-
-       return 0;
+       dprintk(verbose, DST_CA_DEBUG, 1, " Computing string checksum.");
+       dprintk(verbose, DST_CA_DEBUG, 1, "  -> string length : 0x%02x", length);
+       check_string[length] = dst_check_sum (check_string, length);
+       dprintk(verbose, DST_CA_DEBUG, 1, "  -> checksum      : 0x%02x", check_string[length]);
 }
 
 static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8 len, int read)
 {
        u8 reply;
 
+       mutex_lock(&state->dst_mutex);
        dst_comm_init(state);
        msleep(65);
 
        if (write_dst(state, data, len)) {
-               dprintk("%s: Write not successful, trying to recover\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_INFO, 1, " Write not successful, trying to recover");
                dst_error_recovery(state);
-               return -1;
+               goto error;
        }
-
        if ((dst_pio_disable(state)) < 0) {
-               dprintk("%s: DST PIO disable failed.\n", __FUNCTION__);
-               return -1;
+               dprintk(verbose, DST_CA_ERROR, 1, " DST PIO disable failed.");
+               goto error;
        }
-
        if (read_dst(state, &reply, GET_ACK) < 0) {
-               dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
                dst_error_recovery(state);
-               return -1;
+               goto error;
        }
-
        if (read) {
                if (! dst_wait_dst_ready(state, LONG_DELAY)) {
-                       dprintk("%s: 8820 not ready\n", __FUNCTION__);
-                       return -1;
+                       dprintk(verbose, DST_CA_NOTICE, 1, " 8820 not ready");
+                       goto error;
                }
-
                if (read_dst(state, ca_string, 128) < 0) {      /*      Try to make this dynamic        */
-                       dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__);
+                       dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
                        dst_error_recovery(state);
-                       return -1;
+                       goto error;
                }
        }
-
+       mutex_unlock(&state->dst_mutex);
        return 0;
+
+error:
+       mutex_unlock(&state->dst_mutex);
+       return -EIO;
 }
 
 
@@ -133,8 +125,7 @@ static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string,
 
        while (dst_ca_comm_err < RETRIES) {
                dst_comm_init(state);
-               if (verbose > 2)
-                       dprintk("%s: Put Command\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_NOTICE, 1, " Put Command");
                if (dst_ci_command(state, data, ca_string, len, read)) {        // If error
                        dst_error_recovery(state);
                        dst_ca_comm_err++; // work required here.
@@ -153,23 +144,20 @@ static int ca_get_app_info(struct dst_state *state)
 
        put_checksum(&command[0], command[0]);
        if ((dst_put_ci(state, command, sizeof(command), state->messages, GET_REPLY)) < 0) {
-               dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
                return -1;
        }
-       if (verbose > 1) {
-               dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
-
-               dprintk("%s: ================================ CI Module Application Info ======================================\n", __FUNCTION__);
-               dprintk("%s: Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]\n",
-                       __FUNCTION__, state->messages[7], (state->messages[8] << 8) | state->messages[9],
-                       (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12]));
-               dprintk("%s: ==================================================================================================\n", __FUNCTION__);
-       }
+       dprintk(verbose, DST_CA_INFO, 1, " -->dst_put_ci SUCCESS !");
+       dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================");
+       dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]",
+               state->messages[7], (state->messages[8] << 8) | state->messages[9],
+               (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12]));
+       dprintk(verbose, DST_CA_INFO, 1, " ==================================================================================================");
 
        return 0;
 }
 
-static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, void *arg)
+static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, void __user *arg)
 {
        int i;
        u8 slot_cap[256];
@@ -177,117 +165,100 @@ static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps,
 
        put_checksum(&slot_command[0], slot_command[0]);
        if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_cap, GET_REPLY)) < 0) {
-               dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
                return -1;
        }
-       if (verbose > 1)
-               dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_NOTICE, 1, " -->dst_put_ci SUCCESS !");
 
        /*      Will implement the rest soon            */
 
-       if (verbose > 1) {
-               dprintk("%s: Slot cap = [%d]\n", __FUNCTION__, slot_cap[7]);
-               dprintk("===================================\n");
-               for (i = 0; i < 8; i++)
-                       dprintk(" %d", slot_cap[i]);
-               dprintk("\n");
-       }
+       dprintk(verbose, DST_CA_INFO, 1, " Slot cap = [%d]", slot_cap[7]);
+       dprintk(verbose, DST_CA_INFO, 0, "===================================\n");
+       for (i = 0; i < 8; i++)
+               dprintk(verbose, DST_CA_INFO, 0, " %d", slot_cap[i]);
+       dprintk(verbose, DST_CA_INFO, 0, "\n");
 
        p_ca_caps->slot_num = 1;
        p_ca_caps->slot_type = 1;
        p_ca_caps->descr_num = slot_cap[7];
        p_ca_caps->descr_type = 1;
 
-
-       if (copy_to_user((struct ca_caps *)arg, p_ca_caps, sizeof (struct ca_caps))) {
+       if (copy_to_user(arg, p_ca_caps, sizeof (struct ca_caps)))
                return -EFAULT;
-       }
 
        return 0;
 }
 
 /*     Need some more work     */
-static int ca_get_slot_descr(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_get_slot_descr(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
        return -EOPNOTSUPP;
 }
 
 
-static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_slot_info, void *arg)
+static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_slot_info, void __user *arg)
 {
        int i;
        static u8 slot_command[8] = {0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};
 
-       u8 *slot_info = state->rxbuffer;
+       u8 *slot_info = state->messages;
 
        put_checksum(&slot_command[0], 7);
        if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_info, GET_REPLY)) < 0) {
-               dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
                return -1;
        }
-       if (verbose > 1)
-               dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_INFO, 1, " -->dst_put_ci SUCCESS !");
 
        /*      Will implement the rest soon            */
 
-       if (verbose > 1) {
-               dprintk("%s: Slot info = [%d]\n", __FUNCTION__, slot_info[3]);
-               dprintk("===================================\n");
-               for (i = 0; i < 8; i++)
-                       dprintk(" %d", slot_info[i]);
-               dprintk("\n");
-       }
+       dprintk(verbose, DST_CA_INFO, 1, " Slot info = [%d]", slot_info[3]);
+       dprintk(verbose, DST_CA_INFO, 0, "===================================\n");
+       for (i = 0; i < 8; i++)
+               dprintk(verbose, DST_CA_INFO, 0, " %d", slot_info[i]);
+       dprintk(verbose, DST_CA_INFO, 0, "\n");
 
        if (slot_info[4] & 0x80) {
                p_ca_slot_info->flags = CA_CI_MODULE_PRESENT;
                p_ca_slot_info->num = 1;
                p_ca_slot_info->type = CA_CI;
-       }
-       else if (slot_info[4] & 0x40) {
+       } else if (slot_info[4] & 0x40) {
                p_ca_slot_info->flags = CA_CI_MODULE_READY;
                p_ca_slot_info->num = 1;
                p_ca_slot_info->type = CA_CI;
-       }
-       else {
+       } else
                p_ca_slot_info->flags = 0;
-       }
 
-       if (copy_to_user((struct ca_slot_info *)arg, p_ca_slot_info, sizeof (struct ca_slot_info))) {
+       if (copy_to_user(arg, p_ca_slot_info, sizeof (struct ca_slot_info)))
                return -EFAULT;
-       }
 
        return 0;
 }
 
 
-
-
-static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
        u8 i = 0;
        u32 command = 0;
 
-       if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
+       if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg)))
                return -EFAULT;
 
-
        if (p_ca_message->msg) {
-               if (verbose > 3)
-                       dprintk("Message = [%02x %02x %02x]\n", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]);
+               dprintk(verbose, DST_CA_NOTICE, 1, " Message = [%02x %02x %02x]", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]);
 
                for (i = 0; i < 3; i++) {
                        command = command | p_ca_message->msg[i];
                        if (i < 2)
                                command = command << 8;
                }
-               if (verbose > 3)
-                       dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
+               dprintk(verbose, DST_CA_NOTICE, 1, " Command=[0x%x]", command);
 
                switch (command) {
-                       case CA_APP_INFO:
-                               memcpy(p_ca_message->msg, state->messages, 128);
-                               if (copy_to_user((void *)arg, p_ca_message, sizeof (struct ca_msg)) )
-                                       return -EFAULT;
+               case CA_APP_INFO:
+                       memcpy(p_ca_message->msg, state->messages, 128);
+                       if (copy_to_user(arg, p_ca_message, sizeof (struct ca_msg)) )
+                               return -EFAULT;
                        break;
                }
        }
@@ -295,273 +266,100 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message,
        return 0;
 }
 
-static int handle_en50221_tag(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer)
+static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer, u32 length)
 {
        if (state->dst_hw_cap & DST_TYPE_HAS_SESSION) {
-               hw_buffer->msg[2] = p_ca_message->msg[1];               /*              MSB                     */
-               hw_buffer->msg[3] = p_ca_message->msg[2];               /*              LSB                     */
-       }
-       else {
+               hw_buffer->msg[2] = p_ca_message->msg[1];       /*      MSB     */
+               hw_buffer->msg[3] = p_ca_message->msg[2];       /*      LSB     */
+       } else {
+               if (length > 247) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " Message too long ! *** Bailing Out *** !");
+                       return -1;
+               }
+               hw_buffer->msg[0] = (length & 0xff) + 7;
+               hw_buffer->msg[1] = 0x40;
                hw_buffer->msg[2] = 0x03;
                hw_buffer->msg[3] = 0x00;
-       }
-       return 0;
-}
-
-static int debug_8820_buffer(struct ca_msg *hw_buffer)
-{
-       unsigned int i;
+               hw_buffer->msg[4] = 0x03;
+               hw_buffer->msg[5] = length & 0xff;
+               hw_buffer->msg[6] = 0x00;
 
-       dprintk("%s:Debug=[", __FUNCTION__);
-       for (i = 0; i < (hw_buffer->msg[0] + 1); i++)
-               dprintk(" %02x", hw_buffer->msg[i]);
-       dprintk("]\n");
+               /*
+                *      Need to compute length for EN50221 section 8.3.2, for the time being
+                *      assuming 8.3.2 is not applicable
+                */
+               memcpy(&hw_buffer->msg[7], &p_ca_message->msg[4], length);
+       }
 
        return 0;
 }
 
-static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 reply)
+static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 length, u8 reply)
 {
-       if ((dst_put_ci(state, hw_buffer->msg, (hw_buffer->length + 1), hw_buffer->msg, reply)) < 0) {
-               dprintk("%s: DST-CI Command failed.\n", __FUNCTION__);
-               dprintk("%s: Resetting DST.\n", __FUNCTION__);
+       if ((dst_put_ci(state, hw_buffer->msg, length, hw_buffer->msg, reply)) < 0) {
+               dprintk(verbose, DST_CA_ERROR, 1, " DST-CI Command failed.");
+               dprintk(verbose, DST_CA_NOTICE, 1, " Resetting DST.");
                rdc_reset_state(state);
                return -1;
        }
-       if (verbose > 2)
-               dprintk("%s: DST-CI Command succes.\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_NOTICE, 1, " DST-CI Command succes.");
 
        return 0;
 }
 
-
-static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer, u8 reply, u8 query)
+static u32 asn_1_decode(u8 *asn_1_array)
 {
-       u32 hw_offset, buf_offset, i, k;
-       u32 program_info_length = 0, es_info_length = 0, length = 0, words = 0;
-       u8 found_prog_ca_desc = 0, found_stream_ca_desc = 0, error_condition = 0, hw_buffer_length = 0;
-
-       if (verbose > 3)
-               dprintk("%s, p_ca_message length %d (0x%x)\n", __FUNCTION__,p_ca_message->length,p_ca_message->length );
-
-       handle_en50221_tag(state, p_ca_message, hw_buffer);                     /*      EN50221 tag             */
-
-       /*      Handle the length field (variable)      */
-       if (!(p_ca_message->msg[3] & 0x80)) {                           /*      Length = 1              */
-               length = p_ca_message->msg[3] & 0x7f;
-               words = 0;                                              /*      domi's suggestion       */
-       }
-       else {                                                          /*      Length = words          */
-               words = p_ca_message->msg[3] & 0x7f;
-               for (i = 0; i < words; i++) {
-                       length = length << 8;
-                       length = length | p_ca_message->msg[4 + i];
+       u8 length_field = 0, word_count = 0, count = 0;
+       u32 length = 0;
+
+       length_field = asn_1_array[0];
+       dprintk(verbose, DST_CA_DEBUG, 1, " Length field=[%02x]", length_field);
+       if (length_field < 0x80) {
+               length = length_field & 0x7f;
+               dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%02x]\n", length);
+       } else {
+               word_count = length_field & 0x7f;
+               for (count = 0; count < word_count; count++) {
+                       length = length  << 8;
+                       length += asn_1_array[count + 1];
+                       dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%04x]", length);
                }
        }
-       if (verbose > 4) {
-               dprintk("%s:Length=[%d (0x%x)], Words=[%d]\n", __FUNCTION__, length,length, words);
-
-               /*      Debug Input string              */
-               for (i = 0; i < length; i++)
-                       dprintk(" %02x", p_ca_message->msg[i]);
-               dprintk("]\n");
-       }
-
-       hw_offset = 7;
-       buf_offset = words + 4;
-
-       /*              Program Header                  */
-       if (verbose > 4)
-               dprintk("\n%s:Program Header=[", __FUNCTION__);
-       for (i = 0; i < 6; i++) {
-               hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
-               if (verbose > 4)
-                       dprintk(" %02x", p_ca_message->msg[buf_offset]);
-               hw_offset++, buf_offset++, hw_buffer_length++;
-       }
-       if (verbose > 4)
-               dprintk("]\n");
-
-       program_info_length = 0;
-       program_info_length = (((program_info_length | p_ca_message->msg[words + 8]) & 0x0f) << 8) | p_ca_message->msg[words + 9];
-       if (verbose > 4)
-               dprintk("%s:Program info Length=[%d][%02x], hw_offset=[%d], buf_offset=[%d] \n",
-                       __FUNCTION__, program_info_length, program_info_length, hw_offset, buf_offset);
-
-       if (program_info_length && (program_info_length < 256)) {       /*      If program_info_length          */
-               hw_buffer->msg[11] = hw_buffer->msg[11] & 0x0f;         /*      req only 4 bits                 */
-               hw_buffer->msg[12] = hw_buffer->msg[12] + 1;            /*      increment! ASIC bug!            */
-
-               if (p_ca_message->msg[buf_offset + 1] == 0x09) {        /*      Check CA descriptor             */
-                       found_prog_ca_desc = 1;
-                       if (verbose > 4)
-                               dprintk("%s: Found CA descriptor @ Program level\n", __FUNCTION__);
-               }
-
-               if (found_prog_ca_desc) {                               /*      Command only if CA descriptor   */
-                       hw_buffer->msg[13] = p_ca_message->msg[buf_offset];     /*      CA PMT command ID       */
-                       hw_offset++, buf_offset++, hw_buffer_length++;
-               }
-
-               /*                      Program descriptors                             */
-               if (verbose > 4) {
-                       dprintk("%s:**********>buf_offset=[%d], hw_offset=[%d]\n", __FUNCTION__, buf_offset, hw_offset);
-                       dprintk("%s:Program descriptors=[", __FUNCTION__);
-               }
-               while (program_info_length && !error_condition) {               /*      Copy prog descriptors   */
-                       if (program_info_length > p_ca_message->length) {       /*      Error situation         */
-                               dprintk ("%s:\"WARNING\" Length error, line=[%d], prog_info_length=[%d]\n",
-                                                               __FUNCTION__, __LINE__, program_info_length);
-                               dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
-                               error_condition = 1;
-                               break;
-                       }
-
-                       hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
-                       dprintk(" %02x", p_ca_message->msg[buf_offset]);
-                       hw_offset++, buf_offset++, hw_buffer_length++, program_info_length--;
-               }
-               if (verbose > 4) {
-                       dprintk("]\n");
-                       dprintk("%s:**********>buf_offset=[%d], hw_offset=[%d]\n", __FUNCTION__, buf_offset, hw_offset);
-               }
-               if (found_prog_ca_desc) {
-                       if (!reply) {
-                               hw_buffer->msg[13] = 0x01;              /*      OK descrambling                 */
-                               if (verbose > 1)
-                                       dprintk("CA PMT Command = OK Descrambling\n");
-                       }
-                       else {
-                               hw_buffer->msg[13] = 0x02;              /*      Ok MMI                          */
-                               if (verbose > 1)
-                                       dprintk("CA PMT Command = Ok MMI\n");
-                       }
-                       if (query) {
-                               hw_buffer->msg[13] = 0x03;              /*      Query                           */
-                               if (verbose > 1)
-                                       dprintk("CA PMT Command = CA PMT query\n");
-                       }
-               }
-       }
-       else {
-               hw_buffer->msg[11] = hw_buffer->msg[11] & 0xf0;         /*      Don't write to ASIC             */
-               hw_buffer->msg[12] = hw_buffer->msg[12] = 0x00;
-       }
-       if (verbose > 4)
-               dprintk("%s:**********>p_ca_message->length=[%d], buf_offset=[%d], hw_offset=[%d]\n",
-                                       __FUNCTION__, p_ca_message->length, buf_offset, hw_offset);
-
-       while ((buf_offset  < p_ca_message->length)  && !error_condition) {
-               /*      Bail out in case of an indefinite loop          */
-               if ((es_info_length > p_ca_message->length) || (buf_offset > p_ca_message->length)) {
-                       dprintk("%s:\"WARNING\" Length error, line=[%d], prog_info_length=[%d], buf_offset=[%d]\n",
-                                                       __FUNCTION__, __LINE__, program_info_length, buf_offset);
-
-                       dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
-                       error_condition = 1;
-                       break;
-               }
-
-               /*              Stream Header                           */
-
-               for (k = 0; k < 5; k++) {
-                       hw_buffer->msg[hw_offset + k] = p_ca_message->msg[buf_offset + k];
-               }
-
-               es_info_length = 0;
-               es_info_length = (es_info_length | (p_ca_message->msg[buf_offset + 3] & 0x0f)) << 8 | p_ca_message->msg[buf_offset + 4];
-
-               if (verbose > 4) {
-                       dprintk("\n%s:----->Stream header=[%02x %02x %02x %02x %02x]\n", __FUNCTION__,
-                               p_ca_message->msg[buf_offset + 0], p_ca_message->msg[buf_offset + 1],
-                               p_ca_message->msg[buf_offset + 2], p_ca_message->msg[buf_offset + 3],
-                               p_ca_message->msg[buf_offset + 4]);
-
-                       dprintk("%s:----->Stream type=[%02x], es length=[%d (0x%x)], Chars=[%02x] [%02x], buf_offset=[%d]\n", __FUNCTION__,
-                               p_ca_message->msg[buf_offset + 0], es_info_length, es_info_length,
-                               p_ca_message->msg[buf_offset + 3], p_ca_message->msg[buf_offset + 4], buf_offset);
-               }
-
-               hw_buffer->msg[hw_offset + 3] &= 0x0f;                  /*      req only 4 bits                 */
-
-               if (found_prog_ca_desc) {
-                       hw_buffer->msg[hw_offset + 3] = 0x00;
-                       hw_buffer->msg[hw_offset + 4] = 0x00;
-               }
-
-               hw_offset += 5, buf_offset += 5, hw_buffer_length += 5;
+       return length;
+}
 
-               /*              Check for CA descriptor                 */
-               if (p_ca_message->msg[buf_offset + 1] == 0x09) {
-                       if (verbose > 4)
-                               dprintk("%s:Found CA descriptor @ Stream level\n", __FUNCTION__);
-                       found_stream_ca_desc = 1;
-               }
+static int debug_string(u8 *msg, u32 length, u32 offset)
+{
+       u32 i;
 
-               /*              ES descriptors                          */
-
-               if (es_info_length && !error_condition && !found_prog_ca_desc && found_stream_ca_desc) {
-//                     if (!ca_pmt_done) {
-                               hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];      /*      CA PMT cmd(es)  */
-                               if (verbose > 4)
-                                       printk("%s:----->CA PMT Command ID=[%02x]\n", __FUNCTION__, p_ca_message->msg[buf_offset]);
-//                             hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--, ca_pmt_done = 1;
-                               hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--;
-//                     }
-                       if (verbose > 4)
-                               dprintk("%s:----->ES descriptors=[", __FUNCTION__);
-
-                       while (es_info_length && !error_condition) {    /*      ES descriptors                  */
-                               if ((es_info_length > p_ca_message->length) || (buf_offset > p_ca_message->length)) {
-                                       if (verbose > 4) {
-                                               dprintk("%s:\"WARNING\" ES Length error, line=[%d], es_info_length=[%d], buf_offset=[%d]\n",
-                                                                               __FUNCTION__, __LINE__, es_info_length, buf_offset);
-
-                                               dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
-                                       }
-                                       error_condition = 1;
-                                       break;
-                               }
-
-                               hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
-                               if (verbose > 3)
-                                       dprintk("%02x ", hw_buffer->msg[hw_offset]);
-                               hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--;
-                       }
-                       found_stream_ca_desc = 0;                       /*      unset for new streams           */
-                       dprintk("]\n");
-               }
-       }
+       dprintk(verbose, DST_CA_DEBUG, 0, " String=[ ");
+       for (i = offset; i < length; i++)
+               dprintk(verbose, DST_CA_DEBUG, 0, "%02x ", msg[i]);
+       dprintk(verbose, DST_CA_DEBUG, 0, "]\n");
 
-       /*              MCU Magic words                                 */
+       return 0;
+}
 
-       hw_buffer_length += 7;
-       hw_buffer->msg[0] = hw_buffer_length;
-       hw_buffer->msg[1] = 64;
-       hw_buffer->msg[4] = 3;
-       hw_buffer->msg[5] = hw_buffer->msg[0] - 7;
-       hw_buffer->msg[6] = 0;
+static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer, u8 reply, u8 query)
+{
+       u32 length = 0;
+       u8 tag_length = 8;
 
+       length = asn_1_decode(&p_ca_message->msg[3]);
+       dprintk(verbose, DST_CA_DEBUG, 1, " CA Message length=[%d]", length);
+       debug_string(&p_ca_message->msg[4], length, 0); /*      length is excluding tag & length        */
 
-       /*      Fix length      */
-       hw_buffer->length = hw_buffer->msg[0];
+       memset(hw_buffer->msg, '\0', length);
+       handle_dst_tag(state, p_ca_message, hw_buffer, length);
+       put_checksum(hw_buffer->msg, hw_buffer->msg[0]);
 
-       put_checksum(&hw_buffer->msg[0], hw_buffer->msg[0]);
-       /*      Do the actual write     */
-       if (verbose > 4) {
-               dprintk("%s:======================DEBUGGING================================\n", __FUNCTION__);
-               dprintk("%s: Actual Length=[%d]\n", __FUNCTION__, hw_buffer_length);
-       }
-       /*      Only for debugging!     */
-       if (verbose > 2)
-               debug_8820_buffer(hw_buffer);
-       if (verbose > 3)
-               dprintk("%s: Reply = [%d]\n", __FUNCTION__, reply);
-       write_to_8820(state, hw_buffer, reply);
+       debug_string(hw_buffer->msg, (length + tag_length), 0); /*      tags too        */
+       write_to_8820(state, hw_buffer, (length + tag_length), reply);
 
        return 0;
 }
 
+
 /*     Board supports CA PMT reply ?           */
 static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer)
 {
@@ -570,49 +368,50 @@ static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message
        /*      Do test board                   */
        /*      Not there yet but soon          */
 
-
        /*      CA PMT Reply capable            */
        if (ca_pmt_reply_test) {
                if ((ca_set_pmt(state, p_ca_message, hw_buffer, 1, GET_REPLY)) < 0) {
-                       dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__);
+                       dprintk(verbose, DST_CA_ERROR, 1, " ca_set_pmt.. failed !");
                        return -1;
                }
 
        /*      Process CA PMT Reply            */
        /*      will implement soon             */
-               dprintk("%s: Not there yet\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " Not there yet");
        }
        /*      CA PMT Reply not capable        */
        if (!ca_pmt_reply_test) {
                if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, NO_REPLY)) < 0) {
-                       dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__);
+                       dprintk(verbose, DST_CA_ERROR, 1, " ca_set_pmt.. failed !");
                        return -1;
                }
-               if (verbose > 3)
-                       dprintk("%s: ca_set_pmt.. success !\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_NOTICE, 1, " ca_set_pmt.. success !");
        /*      put a dummy message             */
 
        }
        return 0;
 }
 
-static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
        int i = 0;
        unsigned int ca_message_header_len;
 
        u32 command = 0;
        struct ca_msg *hw_buffer;
+       int result = 0;
 
        if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
-               printk("%s: Memory allocation failure\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
                return -ENOMEM;
        }
-       if (verbose > 3)
-               dprintk("%s\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_DEBUG, 1, " ");
+
+       if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) {
+               result = -EFAULT;
+               goto free_mem_and_exit;
+       }
 
-       if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
-               return -EFAULT;
 
        if (p_ca_message->msg) {
                ca_message_header_len = p_ca_message->length;   /*      Restore it back when you are done       */
@@ -624,178 +423,150 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
                        if (i < 2)
                                command = command << 8;
                }
-               if (verbose > 3)
-                       dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
+               dprintk(verbose, DST_CA_DEBUG, 1, " Command=[0x%x]\n", command);
 
                switch (command) {
-                       case CA_PMT:
-                               if (verbose > 3)
-                                       dprintk("Command = SEND_CA_PMT\n");
-                               if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) {
-                                       dprintk("%s: -->CA_PMT Failed !\n", __FUNCTION__);
-                                       return -1;
-                               }
-                               if (verbose > 3)
-                                       dprintk("%s: -->CA_PMT Success !\n", __FUNCTION__);
-//                             retval = dummy_set_pmt(state, p_ca_message, hw_buffer, 0, 0);
-
-                               break;
-
-                       case CA_PMT_REPLY:
-                               if (verbose > 3)
-                                       dprintk("Command = CA_PMT_REPLY\n");
-                               /*      Have to handle the 2 basic types of cards here  */
-                               if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) {
-                                       dprintk("%s: -->CA_PMT_REPLY Failed !\n", __FUNCTION__);
-                                       return -1;
-                               }
-                               if (verbose > 3)
-                                       dprintk("%s: -->CA_PMT_REPLY Success !\n", __FUNCTION__);
-
-                               /*      Certain boards do behave different ?            */
-//                             retval = ca_set_pmt(state, p_ca_message, hw_buffer, 1, 1);
-
-                       case CA_APP_INFO_ENQUIRY:               // only for debugging
-                               if (verbose > 3)
-                                       dprintk("%s: Getting Cam Application information\n", __FUNCTION__);
-
-                               if ((ca_get_app_info(state)) < 0) {
-                                       dprintk("%s: -->CA_APP_INFO_ENQUIRY Failed !\n", __FUNCTION__);
-                                       return -1;
-                               }
-                               if (verbose > 3)
-                                       printk("%s: -->CA_APP_INFO_ENQUIRY Success !\n", __FUNCTION__);
-
-                               break;
+               case CA_PMT:
+                       dprintk(verbose, DST_CA_DEBUG, 1, "Command = SEND_CA_PMT");
+                       if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) {   // code simplification started
+                               dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT Failed !");
+                               result = -1;
+                               goto free_mem_and_exit;
+                       }
+                       dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT Success !");
+                       break;
+               case CA_PMT_REPLY:
+                       dprintk(verbose, DST_CA_INFO, 1, "Command = CA_PMT_REPLY");
+                       /*      Have to handle the 2 basic types of cards here  */
+                       if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) {
+                               dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT_REPLY Failed !");
+                               result = -1;
+                               goto free_mem_and_exit;
+                       }
+                       dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT_REPLY Success !");
+                       break;
+               case CA_APP_INFO_ENQUIRY:               // only for debugging
+                       dprintk(verbose, DST_CA_INFO, 1, " Getting Cam Application information");
+
+                       if ((ca_get_app_info(state)) < 0) {
+                               dprintk(verbose, DST_CA_ERROR, 1, " -->CA_APP_INFO_ENQUIRY Failed !");
+                               result = -1;
+                               goto free_mem_and_exit;
+                       }
+                       dprintk(verbose, DST_CA_INFO, 1, " -->CA_APP_INFO_ENQUIRY Success !");
+                       break;
                }
        }
-       return 0;
+free_mem_and_exit:
+       kfree (hw_buffer);
+
+       return result;
 }
 
-static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)
+static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long ioctl_arg)
 {
        struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
        struct dst_state* state = (struct dst_state*) dvbdev->priv;
        struct ca_slot_info *p_ca_slot_info;
        struct ca_caps *p_ca_caps;
        struct ca_msg *p_ca_message;
+       void __user *arg = (void __user *)ioctl_arg;
+       int result = 0;
 
        if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
-               printk("%s: Memory allocation failure\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
                return -ENOMEM;
        }
-
        if ((p_ca_slot_info = (struct ca_slot_info *) kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL)) == NULL) {
-               printk("%s: Memory allocation failure\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
                return -ENOMEM;
        }
-
        if ((p_ca_caps = (struct ca_caps *) kmalloc(sizeof (struct ca_caps), GFP_KERNEL)) == NULL) {
-               printk("%s: Memory allocation failure\n", __FUNCTION__);
+               dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
                return -ENOMEM;
        }
-
        /*      We have now only the standard ioctl's, the driver is upposed to handle internals.       */
        switch (cmd) {
-               case CA_SEND_MSG:
-                       if (verbose > 1)
-                               dprintk("%s: Sending message\n", __FUNCTION__);
-                       if ((ca_send_message(state, p_ca_message, arg)) < 0) {
-                               dprintk("%s: -->CA_SEND_MSG Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-
-                       break;
-
-               case CA_GET_MSG:
-                       if (verbose > 1)
-                               dprintk("%s: Getting message\n", __FUNCTION__);
-                       if ((ca_get_message(state, p_ca_message, arg)) < 0) {
-                               dprintk("%s: -->CA_GET_MSG Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_GET_MSG Success !\n", __FUNCTION__);
-
-                       break;
-
-               case CA_RESET:
-                       if (verbose > 1)
-                               dprintk("%s: Resetting DST\n", __FUNCTION__);
-                       dst_error_bailout(state);
-                       msleep(4000);
-
-                       break;
-
-               case CA_GET_SLOT_INFO:
-                       if (verbose > 1)
-                               dprintk("%s: Getting Slot info\n", __FUNCTION__);
-                       if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) {
-                               dprintk("%s: -->CA_GET_SLOT_INFO Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_GET_SLOT_INFO Success !\n", __FUNCTION__);
-
-                       break;
-
-               case CA_GET_CAP:
-                       if (verbose > 1)
-                               dprintk("%s: Getting Slot capabilities\n", __FUNCTION__);
-                       if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) {
-                               dprintk("%s: -->CA_GET_CAP Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_GET_CAP Success !\n", __FUNCTION__);
-
-                       break;
-
-               case CA_GET_DESCR_INFO:
-                       if (verbose > 1)
-                               dprintk("%s: Getting descrambler description\n", __FUNCTION__);
-                       if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) {
-                               dprintk("%s: -->CA_GET_DESCR_INFO Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_GET_DESCR_INFO Success !\n", __FUNCTION__);
-
-                       break;
-
-               case CA_SET_DESCR:
-                       if (verbose > 1)
-                               dprintk("%s: Setting descrambler\n", __FUNCTION__);
-                       if ((ca_set_slot_descr()) < 0) {
-                               dprintk("%s: -->CA_SET_DESCR Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_SET_DESCR Success !\n", __FUNCTION__);
-
-                       break;
-
-               case CA_SET_PID:
-                       if (verbose > 1)
-                               dprintk("%s: Setting PID\n", __FUNCTION__);
-                       if ((ca_set_pid()) < 0) {
-                               dprintk("%s: -->CA_SET_PID Failed !\n", __FUNCTION__);
-                               return -1;
-                       }
-                       if (verbose > 1)
-                               dprintk("%s: -->CA_SET_PID Success !\n", __FUNCTION__);
-
-               default:
-                       return -EOPNOTSUPP;
-               };
-
-       return 0;
+       case CA_SEND_MSG:
+               dprintk(verbose, DST_CA_INFO, 1, " Sending message");
+               if ((ca_send_message(state, p_ca_message, arg)) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SEND_MSG Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               break;
+       case CA_GET_MSG:
+               dprintk(verbose, DST_CA_INFO, 1, " Getting message");
+               if ((ca_get_message(state, p_ca_message, arg)) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_MSG Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_MSG Success !");
+               break;
+       case CA_RESET:
+               dprintk(verbose, DST_CA_ERROR, 1, " Resetting DST");
+               dst_error_bailout(state);
+               msleep(4000);
+               break;
+       case CA_GET_SLOT_INFO:
+               dprintk(verbose, DST_CA_INFO, 1, " Getting Slot info");
+               if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_SLOT_INFO Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_SLOT_INFO Success !");
+               break;
+       case CA_GET_CAP:
+               dprintk(verbose, DST_CA_INFO, 1, " Getting Slot capabilities");
+               if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_CAP Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_CAP Success !");
+               break;
+       case CA_GET_DESCR_INFO:
+               dprintk(verbose, DST_CA_INFO, 1, " Getting descrambler description");
+               if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_DESCR_INFO Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_DESCR_INFO Success !");
+               break;
+       case CA_SET_DESCR:
+               dprintk(verbose, DST_CA_INFO, 1, " Setting descrambler");
+               if ((ca_set_slot_descr()) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_DESCR Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_DESCR Success !");
+               break;
+       case CA_SET_PID:
+               dprintk(verbose, DST_CA_INFO, 1, " Setting PID");
+               if ((ca_set_pid()) < 0) {
+                       dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_PID Failed !");
+                       result = -1;
+                       goto free_mem_and_exit;
+               }
+               dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
+       default:
+               result = -EOPNOTSUPP;
+       };
+ free_mem_and_exit:
+       kfree (p_ca_message);
+       kfree (p_ca_slot_info);
+       kfree (p_ca_caps);
+
+       return result;
 }
 
 static int dst_ca_open(struct inode *inode, struct file *file)
 {
-       if (verbose > 4)
-               dprintk("%s:Device opened [%p]\n", __FUNCTION__, file);
+       dprintk(verbose, DST_CA_DEBUG, 1, " Device opened [%p] ", file);
        try_module_get(THIS_MODULE);
 
        return 0;
@@ -803,34 +574,31 @@ static int dst_ca_open(struct inode *inode, struct file *file)
 
 static int dst_ca_release(struct inode *inode, struct file *file)
 {
-       if (verbose > 4)
-               dprintk("%s:Device closed.\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_DEBUG, 1, " Device closed.");
        module_put(THIS_MODULE);
 
        return 0;
 }
 
-static int dst_ca_read(struct file *file, char __user * buffer, size_t length, loff_t * offset)
+static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
        int bytes_read = 0;
 
-       if (verbose > 4)
-               dprintk("%s:Device read.\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_DEBUG, 1, " Device read.");
 
        return bytes_read;
 }
 
-static int dst_ca_write(struct file *file, const char __user * buffer, size_t length, loff_t * offset)
+static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
 {
-       if (verbose > 4)
-               dprintk("%s:Device write.\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
 
        return 0;
 }
 
 static struct file_operations dst_ca_fops = {
        .owner = THIS_MODULE,
-       .ioctl = (void *)dst_ca_ioctl,
+       .ioctl = dst_ca_ioctl,
        .open = dst_ca_open,
        .release = dst_ca_release,
        .read = dst_ca_read,
@@ -848,8 +616,7 @@ static struct dvb_device dvbdev_ca = {
 int dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter)
 {
        struct dvb_device *dvbdev;
-       if (verbose > 4)
-               dprintk("%s:registering DST-CA device\n", __FUNCTION__);
+       dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device");
        dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA);
        return 0;
 }