include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / media / dvb / siano / smscoreapi.c
index 41c63e5..0c87a3c 100644 (file)
@@ -3,12 +3,12 @@
  *
  *  This file contains implementation for the interface to sms core component
  *
- *  author: Anatoly Greenblat
+ *  author: Uri Shkolnik
  *
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
 #include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
+#include <linux/slab.h>
 
 #include <linux/firmware.h>
+#include <linux/wait.h>
+#include <asm/byteorder.h>
 
 #include "smscoreapi.h"
+#include "sms-cards.h"
+#include "smsir.h"
+#include "smsendian.h"
 
-#define PERROR(fmt, args...) printk( KERN_ERR "smscore error: line %d- %s(): " fmt,__LINE__,  __func__, ## args)
+static int sms_dbg;
+module_param_named(debug, sms_dbg, int, 0644);
+MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 
-#ifdef SMSCORE_DEBUG
-
-#undef PWARNING
-#  define PWARNING(fmt, args...) printk( KERN_INFO "smscore warning: line %d- %s(): " fmt,__LINE__,  __func__, ## args)
-#undef PDEBUG                                  /* undef it, just in case */
-#  define PDEBUG(fmt, args...) printk( KERN_INFO "smscore - %s(): " fmt, __func__, ## args)
-
-#else /*SMSCORE_DEBUG*/
-
-#define PDEBUG(fmt, args...)
-#define PWARNING(fmt, args...)
-
-#endif
-
-
-typedef struct _smscore_device_notifyee
-{
+struct smscore_device_notifyee_t {
        struct list_head entry;
        hotplug_t hotplug;
-} smscore_device_notifyee_t;
+};
 
-typedef struct _smscore_subclient
-{
+struct smscore_idlist_t {
        struct list_head entry;
        int             id;
        int             data_type;
-} smscore_idlist_t;
+};
 
-typedef struct _smscore_client
-{
+struct smscore_client_t {
        struct list_head entry;
-       smscore_device_t *coredev;
+       struct smscore_device_t *coredev;
        void                    *context;
        struct list_head        idlist;
        onresponse_t    onresponse_handler;
        onremove_t              onremove_handler;
-} *psmscore_client_t;
-
-
+};
 
-typedef struct _smscore_device
+void smscore_set_board_id(struct smscore_device_t *core, int id)
 {
-       struct list_head entry;
-
-       struct list_head clients;
-       struct list_head subclients;
-       spinlock_t              clientslock;
-
-       struct list_head buffers;
-       spinlock_t              bufferslock;
-       int                             num_buffers;
-
-       void                    *common_buffer;
-       int                             common_buffer_size;
-       dma_addr_t              common_buffer_phys;
-
-       void                    *context;
-       struct device   *device;
-
-       char                    devpath[32];
-       unsigned long   device_flags;
-
-       setmode_t               setmode_handler;
-       detectmode_t    detectmode_handler;
-       sendrequest_t   sendrequest_handler;
-       preload_t               preload_handler;
-       postload_t              postload_handler;
-
-       int                             mode, modes_supported;
+       core->board_id = id;
+}
 
-       struct completion version_ex_done, data_download_done, trigger_done;
-       struct completion init_device_done, reload_start_done, resume_done;
-} *psmscore_device_t;
+int smscore_led_state(struct smscore_device_t *core, int led)
+{
+       if (led >= 0)
+               core->led_state = led;
+       return core->led_state;
+}
+EXPORT_SYMBOL_GPL(smscore_set_board_id);
 
-typedef struct _smscore_registry_entry
+int smscore_get_board_id(struct smscore_device_t *core)
 {
+       return core->board_id;
+}
+EXPORT_SYMBOL_GPL(smscore_get_board_id);
+
+struct smscore_registry_entry_t {
        struct list_head entry;
        char                    devpath[32];
        int                             mode;
-       sms_device_type_st      type;
-} smscore_registry_entry_t;
+       enum sms_device_type_st type;
+};
 
-struct list_head g_smscore_notifyees;
-struct list_head g_smscore_devices;
-kmutex_t g_smscore_deviceslock;
+static struct list_head g_smscore_notifyees;
+static struct list_head g_smscore_devices;
+static struct mutex g_smscore_deviceslock;
 
-struct list_head g_smscore_registry;
-kmutex_t g_smscore_registrylock;
+static struct list_head g_smscore_registry;
+static struct mutex g_smscore_registrylock;
 
-static int default_mode = 1;
+static int default_mode = 4;
 
 module_param(default_mode, int, 0644);
 MODULE_PARM_DESC(default_mode, "default firmware id (device mode)");
 
-static smscore_registry_entry_t *smscore_find_registry ( char *devpath )
+static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
 {
-       smscore_registry_entry_t *entry;
+       struct smscore_registry_entry_t *entry;
        struct list_head *next;
 
        kmutex_lock(&g_smscore_registrylock);
-       for (next = g_smscore_registry.next; next != &g_smscore_registry; next = next->next)
-       {
-               entry = (smscore_registry_entry_t *) next;
-               if (!strcmp(entry->devpath, devpath))
-               {
+       for (next = g_smscore_registry.next;
+            next != &g_smscore_registry;
+            next = next->next) {
+               entry = (struct smscore_registry_entry_t *) next;
+               if (!strcmp(entry->devpath, devpath)) {
                        kmutex_unlock(&g_smscore_registrylock);
                        return entry;
                }
        }
-       entry = (smscore_registry_entry_t *) kmalloc(sizeof(smscore_registry_entry_t), GFP_KERNEL);
-       if (entry)
-       {
+       entry = (struct smscore_registry_entry_t *)
+                       kmalloc(sizeof(struct smscore_registry_entry_t),
+                               GFP_KERNEL);
+       if (entry) {
                entry->mode = default_mode;
                strcpy(entry->devpath, devpath);
                list_add(&entry->entry, &g_smscore_registry);
-       }
-       else
-               printk ( KERN_ERR "%s failed to create smscore_registry.\n", __func__ );
+       } else
+               sms_err("failed to create smscore_registry.");
        kmutex_unlock(&g_smscore_registrylock);
        return entry;
 }
 
-int smscore_registry_getmode ( char *devpath )
+int smscore_registry_getmode(char *devpath)
 {
-       smscore_registry_entry_t *entry;
+       struct smscore_registry_entry_t *entry;
 
-       entry = smscore_find_registry ( devpath );
-       if ( entry )
-       {
+       entry = smscore_find_registry(devpath);
+       if (entry)
                return entry->mode;
-       }
        else
-       {
-               printk ( KERN_ERR "%s No registry found.\n", __func__ );
-       }
+               sms_err("No registry found.");
+
        return default_mode;
 }
+EXPORT_SYMBOL_GPL(smscore_registry_getmode);
 
-sms_device_type_st smscore_registry_gettype ( char *devpath )
+static enum sms_device_type_st smscore_registry_gettype(char *devpath)
 {
-       smscore_registry_entry_t *entry;
+       struct smscore_registry_entry_t *entry;
 
-       entry = smscore_find_registry ( devpath );
-       if ( entry )
-       {
+       entry = smscore_find_registry(devpath);
+       if (entry)
                return entry->type;
-       }
        else
-       {
-               printk ( KERN_ERR "%s No registry found.\n", __func__ );
-       }
+               sms_err("No registry found.");
+
        return -1;
 }
 
-void smscore_registry_setmode ( char *devpath, int mode )
-       {
-       smscore_registry_entry_t *entry;
+void smscore_registry_setmode(char *devpath, int mode)
+{
+       struct smscore_registry_entry_t *entry;
 
-       entry = smscore_find_registry ( devpath );
-       if ( entry )
-               {
-                       entry->mode = mode;
-       }
+       entry = smscore_find_registry(devpath);
+       if (entry)
+               entry->mode = mode;
        else
-       {
-               printk ( KERN_ERR "%s No registry found.\n", __func__ );
-               }
-       }
+               sms_err("No registry found.");
+}
 
-void smscore_registry_settype ( char *devpath, sms_device_type_st type )
+static void smscore_registry_settype(char *devpath,
+                                    enum sms_device_type_st type)
 {
-       smscore_registry_entry_t *entry;
+       struct smscore_registry_entry_t *entry;
 
-       entry = smscore_find_registry ( devpath );
-       if ( entry )
-       {
+       entry = smscore_find_registry(devpath);
+       if (entry)
                entry->type = type;
-       }
        else
-       {
-               printk ( KERN_ERR "%s No registry found.\n", __func__ );
+               sms_err("No registry found.");
 }
-}
-
 
 
-void list_add_locked(struct list_head *new, struct list_head *head,
-                     spinlock_t *lock)
+static void list_add_locked(struct list_head *new, struct list_head *head,
+                           spinlock_t *lock)
 {
        unsigned long flags;
 
@@ -243,38 +202,38 @@ void list_add_locked(struct list_head *new, struct list_head *head,
  */
 int smscore_register_hotplug(hotplug_t hotplug)
 {
-       smscore_device_notifyee_t *notifyee;
+       struct smscore_device_notifyee_t *notifyee;
        struct list_head *next, *first;
        int rc = 0;
 
        kmutex_lock(&g_smscore_deviceslock);
 
-       notifyee = kmalloc(sizeof(smscore_device_notifyee_t), GFP_KERNEL);
-       if (notifyee)
-       {
-               // now notify callback about existing devices
+       notifyee = kmalloc(sizeof(struct smscore_device_notifyee_t),
+                          GFP_KERNEL);
+       if (notifyee) {
+               /* now notify callback about existing devices */
                first = &g_smscore_devices;
-               for (next = first->next; next != first && !rc; next = next->next)
-               {
-                       smscore_device_t *coredev = (smscore_device_t *) next;
+               for (next = first->next;
+                    next != first && !rc;
+                    next = next->next) {
+                       struct smscore_device_t *coredev =
+                               (struct smscore_device_t *) next;
                        rc = hotplug(coredev, coredev->device, 1);
                }
 
-               if (rc >= 0)
-               {
+               if (rc >= 0) {
                        notifyee->hotplug = hotplug;
                        list_add(&notifyee->entry, &g_smscore_notifyees);
-               }
-               else
+               } else
                        kfree(notifyee);
-       }
-       else
+       } else
                rc = -ENOMEM;
 
        kmutex_unlock(&g_smscore_deviceslock);
 
        return rc;
 }
+EXPORT_SYMBOL_GPL(smscore_register_hotplug);
 
 /**
  * unregister a client callback that called when device plugged in/unplugged
@@ -290,13 +249,12 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
 
        first = &g_smscore_notifyees;
 
-       for (next = first->next; next != first;)
-       {
-               smscore_device_notifyee_t *notifyee = (smscore_device_notifyee_t *) next;
+       for (next = first->next; next != first;) {
+               struct smscore_device_notifyee_t *notifyee =
+                       (struct smscore_device_notifyee_t *) next;
                next = next->next;
 
-               if (notifyee->hotplug == hotplug)
-               {
+               if (notifyee->hotplug == hotplug) {
                        list_del(&notifyee->entry);
                        kfree(notifyee);
                }
@@ -304,31 +262,32 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
 
        kmutex_unlock(&g_smscore_deviceslock);
 }
+EXPORT_SYMBOL_GPL(smscore_unregister_hotplug);
 
-void smscore_notify_clients(smscore_device_t *coredev)
+static void smscore_notify_clients(struct smscore_device_t *coredev)
 {
-       smscore_client_t *client;
+       struct smscore_client_t *client;
 
-       // the client must call smscore_unregister_client from remove handler
-       while (!list_empty(&coredev->clients))
-       {
-               client = (smscore_client_t *) coredev->clients.next;
+       /* the client must call smscore_unregister_client from remove handler */
+       while (!list_empty(&coredev->clients)) {
+               client = (struct smscore_client_t *) coredev->clients.next;
                client->onremove_handler(client->context);
        }
 }
 
-int smscore_notify_callbacks(smscore_device_t *coredev, struct device *device, int arrival)
+static int smscore_notify_callbacks(struct smscore_device_t *coredev,
+                                   struct device *device, int arrival)
 {
        struct list_head *next, *first;
        int rc = 0;
 
-       // note: must be called under g_deviceslock
+       /* note: must be called under g_deviceslock */
 
        first = &g_smscore_notifyees;
 
-       for (next = first->next; next != first; next = next->next)
-       {
-               rc = ((smscore_device_notifyee_t *) next)->hotplug(coredev, device, arrival);
+       for (next = first->next; next != first; next = next->next) {
+               rc = ((struct smscore_device_notifyee_t *) next)->
+                               hotplug(coredev, device, arrival);
                if (rc < 0)
                        break;
        }
@@ -336,13 +295,14 @@ int smscore_notify_callbacks(smscore_device_t *coredev, struct device *device, i
        return rc;
 }
 
+static struct
 smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
                                       dma_addr_t common_buffer_phys)
 {
-       smscore_buffer_t *cb = kmalloc(sizeof(smscore_buffer_t), GFP_KERNEL);
-       if (!cb)
-       {
-               printk(KERN_INFO "%s kmalloc(...) failed\n", __func__);
+       struct smscore_buffer_t *cb =
+               kmalloc(sizeof(struct smscore_buffer_t), GFP_KERNEL);
+       if (!cb) {
+               sms_info("kmalloc(...) failed");
                return NULL;
        }
 
@@ -354,60 +314,71 @@ smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
 }
 
 /**
- * creates coredev object for a device, prepares buffers, creates buffer mappings, notifies
- * registered hotplugs about new device.
+ * creates coredev object for a device, prepares buffers,
+ * creates buffer mappings, notifies registered hotplugs about new device.
  *
- * @param params device pointer to struct with device specific parameters and handlers
+ * @param params device pointer to struct with device specific parameters
+ *               and handlers
  * @param coredev pointer to a value that receives created coredev object
  *
  * @return 0 on success, <0 on error.
  */
-int smscore_register_device(smsdevice_params_t *params, smscore_device_t **coredev)
+int smscore_register_device(struct smsdevice_params_t *params,
+                           struct smscore_device_t **coredev)
 {
-       smscore_device_t *dev;
+       struct smscore_device_t *dev;
        u8 *buffer;
 
-       dev = kzalloc(sizeof(smscore_device_t), GFP_KERNEL);
-       if (!dev)
-       {
-               printk(KERN_INFO "%s kzalloc(...) failed\n", __func__);
+       dev = kzalloc(sizeof(struct smscore_device_t), GFP_KERNEL);
+       if (!dev) {
+               sms_info("kzalloc(...) failed");
                return -ENOMEM;
        }
 
-       // init list entry so it could be safe in smscore_unregister_device
+       /* init list entry so it could be safe in smscore_unregister_device */
        INIT_LIST_HEAD(&dev->entry);
 
-       // init queues
+       /* init queues */
        INIT_LIST_HEAD(&dev->clients);
        INIT_LIST_HEAD(&dev->buffers);
 
-       // init locks
+       /* init locks */
        spin_lock_init(&dev->clientslock);
        spin_lock_init(&dev->bufferslock);
 
-       // init completion events
+       /* init completion events */
        init_completion(&dev->version_ex_done);
        init_completion(&dev->data_download_done);
        init_completion(&dev->trigger_done);
        init_completion(&dev->init_device_done);
        init_completion(&dev->reload_start_done);
        init_completion(&dev->resume_done);
+       init_completion(&dev->gpio_configuration_done);
+       init_completion(&dev->gpio_set_level_done);
+       init_completion(&dev->gpio_get_level_done);
+       init_completion(&dev->ir_init_done);
 
-       // alloc common buffer
+       /* Buffer management */
+       init_waitqueue_head(&dev->buffer_mng_waitq);
+
+       /* alloc common buffer */
        dev->common_buffer_size = params->buffer_size * params->num_buffers;
-       dev->common_buffer = dma_alloc_coherent(NULL, dev->common_buffer_size, &dev->common_buffer_phys, GFP_KERNEL | GFP_DMA);
-       if (!dev->common_buffer)
-       {
+       dev->common_buffer = dma_alloc_coherent(NULL, dev->common_buffer_size,
+                                               &dev->common_buffer_phys,
+                                               GFP_KERNEL | GFP_DMA);
+       if (!dev->common_buffer) {
                smscore_unregister_device(dev);
                return -ENOMEM;
        }
 
-       // prepare dma buffers
-       for (buffer = dev->common_buffer; dev->num_buffers < params->num_buffers; dev->num_buffers ++, buffer += params->buffer_size)
-       {
-               smscore_buffer_t *cb = smscore_createbuffer(buffer, dev->common_buffer, dev->common_buffer_phys);
-               if (!cb)
-               {
+       /* prepare dma buffers */
+       for (buffer = dev->common_buffer;
+            dev->num_buffers < params->num_buffers;
+            dev->num_buffers++, buffer += params->buffer_size) {
+               struct smscore_buffer_t *cb =
+                       smscore_createbuffer(buffer, dev->common_buffer,
+                                            dev->common_buffer_phys);
+               if (!cb) {
                        smscore_unregister_device(dev);
                        return -ENOMEM;
                }
@@ -415,7 +386,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
                smscore_putbuffer(dev, cb);
        }
 
-       printk(KERN_INFO "%s allocated %d buffers\n", __func__, dev->num_buffers);
+       sms_info("allocated %d buffers", dev->num_buffers);
 
        dev->mode = DEVICE_MODE_NONE;
        dev->context = params->context;
@@ -429,16 +400,82 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
        dev->device_flags = params->flags;
        strcpy(dev->devpath, params->devpath);
 
-       smscore_registry_settype ( dev->devpath, params->device_type );
+       smscore_registry_settype(dev->devpath, params->device_type);
 
-       // add device to devices list
+       /* add device to devices list */
        kmutex_lock(&g_smscore_deviceslock);
        list_add(&dev->entry, &g_smscore_devices);
        kmutex_unlock(&g_smscore_deviceslock);
 
        *coredev = dev;
 
-       printk(KERN_INFO "%s device %p created\n", __func__, dev);
+       sms_info("device %p created", dev);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(smscore_register_device);
+
+
+static int smscore_sendrequest_and_wait(struct smscore_device_t *coredev,
+               void *buffer, size_t size, struct completion *completion) {
+       int rc = coredev->sendrequest_handler(coredev->context, buffer, size);
+       if (rc < 0) {
+               sms_info("sendrequest returned error %d", rc);
+               return rc;
+       }
+
+       return wait_for_completion_timeout(completion,
+                       msecs_to_jiffies(SMS_PROTOCOL_MAX_RAOUNDTRIP_MS)) ?
+                       0 : -ETIME;
+}
+
+/**
+ * Starts & enables IR operations
+ *
+ * @return 0 on success, < 0 on error.
+ */
+static int smscore_init_ir(struct smscore_device_t *coredev)
+{
+       int ir_io;
+       int rc;
+       void *buffer;
+
+       coredev->ir.input_dev = NULL;
+       ir_io = sms_get_board(smscore_get_board_id(coredev))->board_cfg.ir;
+       if (ir_io) {/* only if IR port exist we use IR sub-module */
+               sms_info("IR loading");
+               rc = sms_ir_init(coredev);
+
+               if      (rc != 0)
+                       sms_err("Error initialization DTV IR sub-module");
+               else {
+                       buffer = kmalloc(sizeof(struct SmsMsgData_ST2) +
+                                               SMS_DMA_ALIGNMENT,
+                                               GFP_KERNEL | GFP_DMA);
+                       if (buffer) {
+                               struct SmsMsgData_ST2 *msg =
+                               (struct SmsMsgData_ST2 *)
+                               SMS_ALIGN_ADDRESS(buffer);
+
+                               SMS_INIT_MSG(&msg->xMsgHeader,
+                                               MSG_SMS_START_IR_REQ,
+                                               sizeof(struct SmsMsgData_ST2));
+                               msg->msgData[0] = coredev->ir.controller;
+                               msg->msgData[1] = coredev->ir.timeout;
+
+                               smsendian_handle_tx_message(
+                                       (struct SmsMsgHdr_ST2 *)msg);
+                               rc = smscore_sendrequest_and_wait(coredev, msg,
+                                               msg->xMsgHeader. msgLength,
+                                               &coredev->ir_init_done);
+
+                               kfree(buffer);
+                       } else
+                               sms_err
+                               ("Sending IR initialization message failed");
+               }
+       } else
+               sms_info("IR port has not been detected");
 
        return 0;
 }
@@ -446,124 +483,136 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored
 /**
  * sets initial device mode and notifies client hotplugs that device is ready
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *               smscore_register_device
  *
  * @return 0 on success, <0 on error.
  */
-int smscore_start_device(smscore_device_t *coredev)
+int smscore_start_device(struct smscore_device_t *coredev)
 {
-       int rc = smscore_set_device_mode(coredev, smscore_registry_getmode(coredev->devpath));
-       if (rc < 0)
-       {
-               printk ( KERN_INFO "%s set device mode faile , rc %d\n", __func__, rc );
+       int rc = smscore_set_device_mode(
+                       coredev, smscore_registry_getmode(coredev->devpath));
+       if (rc < 0) {
+               sms_info("set device mode faile , rc %d", rc);
                return rc;
        }
 
        kmutex_lock(&g_smscore_deviceslock);
 
        rc = smscore_notify_callbacks(coredev, coredev->device, 1);
+       smscore_init_ir(coredev);
 
-       printk(KERN_INFO "%s device %p started, rc %d\n", __func__, coredev, rc);
+       sms_info("device %p started, rc %d", coredev, rc);
 
        kmutex_unlock(&g_smscore_deviceslock);
 
        return rc;
 }
+EXPORT_SYMBOL_GPL(smscore_start_device);
 
-int smscore_sendrequest_and_wait(smscore_device_t *coredev, void *buffer,
-                                 size_t size, struct completion *completion)
-{
-       int rc = coredev->sendrequest_handler(coredev->context, buffer, size);
-       if (rc < 0)
-       {
-               printk(KERN_INFO "%s sendrequest returned error %d\n", __func__, rc);
-               return rc;
-       }
 
-       return wait_for_completion_timeout(completion, msecs_to_jiffies(10000)) ? 0 : -ETIME;
-}
-
-int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer, size_t size)
+static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
+                                        void *buffer, size_t size)
 {
-       SmsFirmware_ST* firmware = (SmsFirmware_ST*) buffer;
-       SmsMsgHdr_ST *msg;
-       UINT32 mem_address = firmware->StartAddress;
+       struct SmsFirmware_ST *firmware = (struct SmsFirmware_ST *) buffer;
+       struct SmsMsgHdr_ST *msg;
+       u32 mem_address;
        u8 *payload = firmware->Payload;
        int rc = 0;
+       firmware->StartAddress = le32_to_cpu(firmware->StartAddress);
+       firmware->Length = le32_to_cpu(firmware->Length);
+
+       mem_address = firmware->StartAddress;
 
-       printk(KERN_INFO "%s loading FW to addr 0x%x size %d\n", __func__, mem_address,firmware->Length);
-       if (coredev->preload_handler)
-       {
+       sms_info("loading FW to addr 0x%x size %d",
+                mem_address, firmware->Length);
+       if (coredev->preload_handler) {
                rc = coredev->preload_handler(coredev->context);
                if (rc < 0)
                        return rc;
        }
 
-       // PAGE_SIZE buffer shall be enough and dma aligned
-       msg = (SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);
+       /* PAGE_SIZE buffer shall be enough and dma aligned */
+       msg = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);
        if (!msg)
                return -ENOMEM;
 
-       if (coredev->mode != DEVICE_MODE_NONE)
-       {
-               PDEBUG("Sending reload command\n");
-               SMS_INIT_MSG(msg, MSG_SW_RELOAD_START_REQ, sizeof(SmsMsgHdr_ST));
-               rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->reload_start_done);
-               mem_address = *(UINT32*) &payload[20];
+       if (coredev->mode != DEVICE_MODE_NONE) {
+               sms_debug("sending reload command.");
+               SMS_INIT_MSG(msg, MSG_SW_RELOAD_START_REQ,
+                            sizeof(struct SmsMsgHdr_ST));
+               rc = smscore_sendrequest_and_wait(coredev, msg,
+                                                 msg->msgLength,
+                                                 &coredev->reload_start_done);
+               mem_address = *(u32 *) &payload[20];
        }
 
-       while (size && rc >= 0)
-       {
-               SmsDataDownload_ST *DataMsg = (SmsDataDownload_ST *) msg;
+       while (size && rc >= 0) {
+               struct SmsDataDownload_ST *DataMsg =
+                       (struct SmsDataDownload_ST *) msg;
                int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);
 
-               SMS_INIT_MSG(msg, MSG_SMS_DATA_DOWNLOAD_REQ, (UINT16)(sizeof(SmsMsgHdr_ST) + sizeof(UINT32) + payload_size));
+               SMS_INIT_MSG(msg, MSG_SMS_DATA_DOWNLOAD_REQ,
+                            (u16)(sizeof(struct SmsMsgHdr_ST) +
+                                     sizeof(u32) + payload_size));
 
                DataMsg->MemAddr = mem_address;
                memcpy(DataMsg->Payload, payload, payload_size);
 
-               if (coredev->device_flags & SMS_ROM_NO_RESPONSE && coredev->mode == DEVICE_MODE_NONE)
-                       rc = coredev->sendrequest_handler(coredev->context, DataMsg, DataMsg->xMsgHeader.msgLength);
+               if ((coredev->device_flags & SMS_ROM_NO_RESPONSE) &&
+                   (coredev->mode == DEVICE_MODE_NONE))
+                       rc = coredev->sendrequest_handler(
+                               coredev->context, DataMsg,
+                               DataMsg->xMsgHeader.msgLength);
                else
-                       rc = smscore_sendrequest_and_wait(coredev, DataMsg, DataMsg->xMsgHeader.msgLength, &coredev->data_download_done);
+                       rc = smscore_sendrequest_and_wait(
+                               coredev, DataMsg,
+                               DataMsg->xMsgHeader.msgLength,
+                               &coredev->data_download_done);
 
                payload += payload_size;
                size -= payload_size;
                mem_address += payload_size;
        }
 
-       if (rc >= 0)
-       {
-               if (coredev->mode == DEVICE_MODE_NONE)
-               {
-                       SmsMsgData_ST* TriggerMsg = (SmsMsgData_ST*) msg;
-
-                       SMS_INIT_MSG(msg, MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, sizeof(SmsMsgHdr_ST) + sizeof(UINT32) * 5);
-
-                       TriggerMsg->msgData[0] = firmware->StartAddress;        // Entry point
-                       TriggerMsg->msgData[1] = 5;                                                     // Priority
-                       TriggerMsg->msgData[2] = 0x200;                                         // Stack size
-                       TriggerMsg->msgData[3] = 0;                                                     // Parameter
-                       TriggerMsg->msgData[4] = 4;                                                     // Task ID
-
-                       if (coredev->device_flags & SMS_ROM_NO_RESPONSE)
-                       {
-                               rc = coredev->sendrequest_handler(coredev->context, TriggerMsg, TriggerMsg->xMsgHeader.msgLength);
+       if (rc >= 0) {
+               if (coredev->mode == DEVICE_MODE_NONE) {
+                       struct SmsMsgData_ST *TriggerMsg =
+                               (struct SmsMsgData_ST *) msg;
+
+                       SMS_INIT_MSG(msg, MSG_SMS_SWDOWNLOAD_TRIGGER_REQ,
+                                    sizeof(struct SmsMsgHdr_ST) +
+                                    sizeof(u32) * 5);
+
+                       TriggerMsg->msgData[0] = firmware->StartAddress;
+                                               /* Entry point */
+                       TriggerMsg->msgData[1] = 5; /* Priority */
+                       TriggerMsg->msgData[2] = 0x200; /* Stack size */
+                       TriggerMsg->msgData[3] = 0; /* Parameter */
+                       TriggerMsg->msgData[4] = 4; /* Task ID */
+
+                       if (coredev->device_flags & SMS_ROM_NO_RESPONSE) {
+                               rc = coredev->sendrequest_handler(
+                                       coredev->context, TriggerMsg,
+                                       TriggerMsg->xMsgHeader.msgLength);
                                msleep(100);
-                       }
-                       else
-                               rc = smscore_sendrequest_and_wait(coredev, TriggerMsg, TriggerMsg->xMsgHeader.msgLength, &coredev->trigger_done);
-               }
-               else
-               {
-                       SMS_INIT_MSG(msg, MSG_SW_RELOAD_EXEC_REQ, sizeof(SmsMsgHdr_ST));
-
-                       rc = coredev->sendrequest_handler(coredev->context, msg, msg->msgLength);
+                       } else
+                               rc = smscore_sendrequest_and_wait(
+                                       coredev, TriggerMsg,
+                                       TriggerMsg->xMsgHeader.msgLength,
+                                       &coredev->trigger_done);
+               } else {
+                       SMS_INIT_MSG(msg, MSG_SW_RELOAD_EXEC_REQ,
+                                    sizeof(struct SmsMsgHdr_ST));
+
+                       rc = coredev->sendrequest_handler(coredev->context,
+                                                         msg, msg->msgLength);
                }
-               msleep ( 500 );
+               msleep(500);
        }
 
-       printk("%s rc=%d, postload=%p \n", __func__, rc, coredev->postload_handler);
+       sms_debug("rc=%d, postload=%p ", rc,
+                 coredev->postload_handler);
 
        kfree(msg);
 
@@ -575,43 +624,46 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer, size_
 /**
  * loads specified firmware into a buffer and calls device loadfirmware_handler
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  * @param filename null-terminated string specifies firmware file name
  * @param loadfirmware_handler device handler that loads firmware
  *
  * @return 0 on success, <0 on error.
  */
-int smscore_load_firmware_from_file(smscore_device_t *coredev, char *filename, loadfirmware_t loadfirmware_handler)
+static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
+                                          char *filename,
+                                          loadfirmware_t loadfirmware_handler)
 {
        int rc = -ENOENT;
-
        const struct firmware *fw;
        u8 *fw_buffer;
 
-       if (loadfirmware_handler == NULL && !(coredev->device_flags & SMS_DEVICE_FAMILY2))
+       if (loadfirmware_handler == NULL && !(coredev->device_flags &
+                                             SMS_DEVICE_FAMILY2))
                return -EINVAL;
 
        rc = request_firmware(&fw, filename, coredev->device);
-       if (rc < 0)
-       {
-               printk(KERN_INFO "%s failed to open \"%s\"\n", __func__, filename);
+       if (rc < 0) {
+               sms_info("failed to open \"%s\"", filename);
                return rc;
        }
-       printk(KERN_INFO "%s read FW %s, size=%d\"\n", __func__, filename, fw->size);
-       fw_buffer = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT), GFP_KERNEL | GFP_DMA);
-       if (fw_buffer)
-       {
+       sms_info("read FW %s, size=%zd", filename, fw->size);
+       fw_buffer = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT),
+                           GFP_KERNEL | GFP_DMA);
+       if (fw_buffer) {
                memcpy(fw_buffer, fw->data, fw->size);
 
                rc = (coredev->device_flags & SMS_DEVICE_FAMILY2) ?
-                       smscore_load_firmware_family2(coredev, fw_buffer, fw->size) :
-                       loadfirmware_handler(coredev->context, fw_buffer, fw->size);
+                     smscore_load_firmware_family2(coredev,
+                                                   fw_buffer,
+                                                   fw->size) :
+                     loadfirmware_handler(coredev->context,
+                                          fw_buffer, fw->size);
 
                kfree(fw_buffer);
-       }
-       else
-       {
-               printk(KERN_INFO "%s failed to allocate firmware buffer\n", __func__);
+       } else {
+               sms_info("failed to allocate firmware buffer");
                rc = -ENOMEM;
        }
 
@@ -620,90 +672,98 @@ int smscore_load_firmware_from_file(smscore_device_t *coredev, char *filename, l
        return rc;
 }
 
-int smscore_load_firmware_from_buffer(smscore_device_t *coredev, u8 *buffer, int size, int new_mode)
-{
-       PERROR("Feature not implemented yet\n");
-       return -EFAULT;
-}
-
 /**
- * notifies all clients registered with the device, notifies hotplugs, frees all buffers and coredev object
+ * notifies all clients registered with the device, notifies hotplugs,
+ * frees all buffers and coredev object
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  *
  * @return 0 on success, <0 on error.
  */
-void smscore_unregister_device(smscore_device_t *coredev)
+void smscore_unregister_device(struct smscore_device_t *coredev)
 {
-       smscore_buffer_t *cb;
+       struct smscore_buffer_t *cb;
        int num_buffers = 0;
        int retry = 0;
 
        kmutex_lock(&g_smscore_deviceslock);
 
+       /* Release input device (IR) resources */
+       sms_ir_exit(coredev);
+
        smscore_notify_clients(coredev);
        smscore_notify_callbacks(coredev, NULL, 0);
 
-       // at this point all buffers should be back
-       // onresponse must no longer be called
+       /* at this point all buffers should be back
+        * onresponse must no longer be called */
 
-       while (1)
-       {
-               while ((cb = smscore_getbuffer(coredev)))
-               {
+       while (1) {
+               while (!list_empty(&coredev->buffers)) {
+                       cb = (struct smscore_buffer_t *) coredev->buffers.next;
+                       list_del(&cb->entry);
                        kfree(cb);
-                       num_buffers ++;
+                       num_buffers++;
                }
                if (num_buffers == coredev->num_buffers)
                        break;
-               if (++retry > 10)
-               {
-                       printk(KERN_INFO "%s exiting although not all buffers released.\n", __func__);
+               if (++retry > 10) {
+                       sms_info("exiting although "
+                                "not all buffers released.");
                        break;
                }
 
-               printk(KERN_INFO "%s waiting for %d buffer(s)\n", __func__, coredev->num_buffers - num_buffers);
+               sms_info("waiting for %d buffer(s)",
+                        coredev->num_buffers - num_buffers);
                msleep(100);
        }
 
-       printk(KERN_INFO "%s freed %d buffers\n", __func__, num_buffers);
+       sms_info("freed %d buffers", num_buffers);
 
        if (coredev->common_buffer)
-               dma_free_coherent(NULL, coredev->common_buffer_size, coredev->common_buffer, coredev->common_buffer_phys);
+               dma_free_coherent(NULL, coredev->common_buffer_size,
+                       coredev->common_buffer, coredev->common_buffer_phys);
+
+       if (coredev->fw_buf != NULL)
+               kfree(coredev->fw_buf);
 
        list_del(&coredev->entry);
        kfree(coredev);
 
        kmutex_unlock(&g_smscore_deviceslock);
 
-       printk(KERN_INFO "%s device %p destroyed\n", __func__, coredev);
+       sms_info("device %p destroyed", coredev);
 }
+EXPORT_SYMBOL_GPL(smscore_unregister_device);
 
-int smscore_detect_mode(smscore_device_t *coredev)
+static int smscore_detect_mode(struct smscore_device_t *coredev)
 {
-       void *buffer = kmalloc(sizeof(SmsMsgHdr_ST) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);
-       SmsMsgHdr_ST *msg = (SmsMsgHdr_ST *) SMS_ALIGN_ADDRESS(buffer);
+       void *buffer = kmalloc(sizeof(struct SmsMsgHdr_ST) + SMS_DMA_ALIGNMENT,
+                              GFP_KERNEL | GFP_DMA);
+       struct SmsMsgHdr_ST *msg =
+               (struct SmsMsgHdr_ST *) SMS_ALIGN_ADDRESS(buffer);
        int rc;
 
        if (!buffer)
                return -ENOMEM;
 
-       SMS_INIT_MSG(msg, MSG_SMS_GET_VERSION_EX_REQ, sizeof(SmsMsgHdr_ST));
+       SMS_INIT_MSG(msg, MSG_SMS_GET_VERSION_EX_REQ,
+                    sizeof(struct SmsMsgHdr_ST));
 
-       rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done);
-       if (rc == -ETIME)
-       {
-               printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", __func__);
+       rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength,
+                                         &coredev->version_ex_done);
+       if (rc == -ETIME) {
+               sms_err("MSG_SMS_GET_VERSION_EX_REQ failed first try");
 
-               if (wait_for_completion_timeout(&coredev->resume_done, msecs_to_jiffies(5000)))
-               {
-                       rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done);
+               if (wait_for_completion_timeout(&coredev->resume_done,
+                                               msecs_to_jiffies(5000))) {
+                       rc = smscore_sendrequest_and_wait(
+                               coredev, msg, msg->msgLength,
+                               &coredev->version_ex_done);
                        if (rc < 0)
-                       {
-                               printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d\n", __func__, rc);
-                       }
-               }
-               else
+                               sms_err("MSG_SMS_GET_VERSION_EX_REQ failed "
+                                       "second try, rc %d", rc);
+               } else
                        rc = -ETIME;
        }
 
@@ -712,147 +772,177 @@ int smscore_detect_mode(smscore_device_t *coredev)
        return rc;
 }
 
-char *smscore_fw_lkup[][SMS_NUM_OF_DEVICE_TYPES] =
-{
-       /*Stellar                       NOVA A0                 Nova B0                         VEGA*/
-       /*DVBT*/  {"none",                      "dvb_nova_12mhz.inp",   "dvb_nova_12mhz_b0.inp",        "none"},
-       /*DVBH*/  {"none",                      "dvb_nova_12mhz.inp",   "dvb_nova_12mhz_b0.inp",        "none"},
-       /*TDMB*/  {"none",                      "tdmb_nova_12mhz.inp",  "none"                          "none"},
-       /*DABIP*/ {"none",                      "none",                 "none",                         "none"},
-       /*BDA*/   {"none",                      "dvb_nova_12mhz.inp",   "dvb_nova_12mhz_b0.inp",        "none"},
-       /*ISDBT*/ {"none",                      "isdbt_nova_12mhz.inp", "dvb_nova_12mhz.inp",           "none"},
-       /*ISDBTBDA*/{"none",                    "isdbt_nova_12mhz.inp", "isdbt_nova_12mhz_b0.inp",      "none"},
-       /*CMMB*/  {"none",                      "none",                 "none",                         "cmmb_vega_12mhz.inp"}
+static char *smscore_fw_lkup[][SMS_NUM_OF_DEVICE_TYPES] = {
+       /*Stellar               NOVA A0         Nova B0         VEGA*/
+       /*DVBT*/
+       {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"},
+       /*DVBH*/
+       {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"},
+       /*TDMB*/
+       {"none", "tdmb_nova_12mhz.inp", "tdmb_nova_12mhz_b0.inp", "none"},
+       /*DABIP*/
+       {"none", "none", "none", "none"},
+       /*BDA*/
+       {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"},
+       /*ISDBT*/
+       {"none", "isdbt_nova_12mhz.inp", "isdbt_nova_12mhz_b0.inp", "none"},
+       /*ISDBTBDA*/
+       {"none", "isdbt_nova_12mhz.inp", "isdbt_nova_12mhz_b0.inp", "none"},
+       /*CMMB*/
+       {"none", "none", "none", "cmmb_vega_12mhz.inp"}
 };
 
+static inline char *sms_get_fw_name(struct smscore_device_t *coredev,
+                                   int mode, enum sms_device_type_st type)
+{
+       char **fw = sms_get_board(smscore_get_board_id(coredev))->fw;
+       return (fw && fw[mode]) ? fw[mode] : smscore_fw_lkup[mode][type];
+}
 
 /**
  * calls device handler to change mode of operation
  * NOTE: stellar/usb may disconnect when changing mode
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  * @param mode requested mode of operation
  *
  * @return 0 on success, <0 on error.
  */
-int smscore_set_device_mode(smscore_device_t *coredev, int mode)
+int smscore_set_device_mode(struct smscore_device_t *coredev, int mode)
 {
        void *buffer;
        int rc = 0;
-       sms_device_type_st type;
+       enum sms_device_type_st type;
 
-       PDEBUG("set device mode to %d\n", mode );
-       if (coredev->device_flags & SMS_DEVICE_FAMILY2)
-       {
-               if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_RAW_TUNER)
-               {
-                       printk(KERN_INFO "%s invalid mode specified %d\n", __func__, mode);
+       sms_debug("set device mode to %d", mode);
+       if (coredev->device_flags & SMS_DEVICE_FAMILY2) {
+               if (mode < DEVICE_MODE_DVBT || mode >= DEVICE_MODE_RAW_TUNER) {
+                       sms_err("invalid mode specified %d", mode);
                        return -EINVAL;
                }
 
                smscore_registry_setmode(coredev->devpath, mode);
 
-               if (!(coredev->device_flags & SMS_DEVICE_NOT_READY))
-               {
+               if (!(coredev->device_flags & SMS_DEVICE_NOT_READY)) {
                        rc = smscore_detect_mode(coredev);
-                       if (rc < 0)
-                       {
-                               printk(KERN_INFO "%s mode detect failed %d\n", __func__, rc);
+                       if (rc < 0) {
+                               sms_err("mode detect failed %d", rc);
                                return rc;
-               }
+                       }
                }
 
-               if (coredev->mode == mode)
-               {
-                       printk(KERN_INFO "%s device mode %d already set\n", __func__, mode);
+               if (coredev->mode == mode) {
+                       sms_info("device mode %d already set", mode);
                        return 0;
                }
 
-               if (!(coredev->modes_supported & (1 << mode)))
-               {
-                       type = smscore_registry_gettype ( coredev->devpath );
-                       rc = smscore_load_firmware_from_file ( coredev, smscore_fw_lkup[mode][type], NULL );
-                       if (rc < 0)
-                       {
-                               printk(KERN_INFO "%s load firmware failed %d\n", __func__, rc);
-                               return rc;
-               }
-               }
-               else
-               {
-                       printk(KERN_INFO "%s mode %d supported by running firmware\n", __func__, mode);
-               }
-
-               buffer = kmalloc(sizeof(SmsMsgData_ST) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);
-               if (buffer)
-               {
-                       SmsMsgData_ST *msg = (SmsMsgData_ST *) SMS_ALIGN_ADDRESS(buffer);
-
-                       SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_INIT_DEVICE_REQ, sizeof(SmsMsgData_ST));
+               if (!(coredev->modes_supported & (1 << mode))) {
+                       char *fw_filename;
+
+                       type = smscore_registry_gettype(coredev->devpath);
+                       fw_filename = sms_get_fw_name(coredev, mode, type);
+
+                       rc = smscore_load_firmware_from_file(coredev,
+                                                            fw_filename, NULL);
+                       if (rc < 0) {
+                               sms_warn("error %d loading firmware: %s, "
+                                        "trying again with default firmware",
+                                        rc, fw_filename);
+
+                               /* try again with the default firmware */
+                               fw_filename = smscore_fw_lkup[mode][type];
+                               rc = smscore_load_firmware_from_file(coredev,
+                                                            fw_filename, NULL);
+
+                               if (rc < 0) {
+                                       sms_warn("error %d loading "
+                                                "firmware: %s", rc,
+                                                fw_filename);
+                                       return rc;
+                               }
+                       }
+                       sms_log("firmware download success: %s", fw_filename);
+               } else
+                       sms_info("mode %d supported by running "
+                                "firmware", mode);
+
+               buffer = kmalloc(sizeof(struct SmsMsgData_ST) +
+                                SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);
+               if (buffer) {
+                       struct SmsMsgData_ST *msg =
+                               (struct SmsMsgData_ST *)
+                                       SMS_ALIGN_ADDRESS(buffer);
+
+                       SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_INIT_DEVICE_REQ,
+                                    sizeof(struct SmsMsgData_ST));
                        msg->msgData[0] = mode;
 
-                       rc = smscore_sendrequest_and_wait(coredev, msg, msg->xMsgHeader.msgLength, &coredev->init_device_done);
+                       rc = smscore_sendrequest_and_wait(
+                               coredev, msg, msg->xMsgHeader.msgLength,
+                               &coredev->init_device_done);
 
                        kfree(buffer);
-               }
-               else
-               {
-                       printk(KERN_INFO "%s Could not allocate buffer for init device message.\n", __func__);
+               } else {
+                       sms_err("Could not allocate buffer for "
+                               "init device message.");
                        rc = -ENOMEM;
-       }
-       }
-       else
-       {
-               if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA)
-               {
-                       printk(KERN_INFO "%s invalid mode specified %d\n", __func__, mode);
+               }
+       } else {
+               if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) {
+                       sms_err("invalid mode specified %d", mode);
                        return -EINVAL;
                }
 
                smscore_registry_setmode(coredev->devpath, mode);
 
                if (coredev->detectmode_handler)
-                       coredev->detectmode_handler(coredev->context, &coredev->mode);
+                       coredev->detectmode_handler(coredev->context,
+                                                   &coredev->mode);
 
                if (coredev->mode != mode && coredev->setmode_handler)
                        rc = coredev->setmode_handler(coredev->context, mode);
        }
 
-       if (rc >= 0)
-       {
+       if (rc >= 0) {
                coredev->mode = mode;
                coredev->device_flags &= ~SMS_DEVICE_NOT_READY;
        }
 
-       if (rc != 0)
-               printk(KERN_INFO "%s return error code %d.\n", __func__, rc);
+       if (rc < 0)
+               sms_err("return error code %d.", rc);
        return rc;
 }
 
 /**
  * calls device handler to get current mode of operation
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  *
  * @return current mode
  */
-int smscore_get_device_mode(smscore_device_t *coredev)
+int smscore_get_device_mode(struct smscore_device_t *coredev)
 {
        return coredev->mode;
 }
+EXPORT_SYMBOL_GPL(smscore_get_device_mode);
 
 /**
  * find client by response id & type within the clients list.
  * return client handle or NULL.
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  * @param data_type client data type (SMS_DONT_CARE for all types)
- * @param id client id (SMS_DONT_CARE for all id )
+ * @param id client id (SMS_DONT_CARE for all id)
  *
  */
-smscore_client_t *smscore_find_client(smscore_device_t *coredev, int data_type, int id)
+static struct
+smscore_client_t *smscore_find_client(struct smscore_device_t *coredev,
+                                     int data_type, int id)
 {
-       smscore_client_t *client = NULL;
+       struct smscore_client_t *client = NULL;
        struct list_head *next, *first;
        unsigned long flags;
        struct list_head *firstid, *nextid;
@@ -860,20 +950,21 @@ smscore_client_t *smscore_find_client(smscore_device_t *coredev, int data_type,
 
        spin_lock_irqsave(&coredev->clientslock, flags);
        first = &coredev->clients;
-       for (next = first->next; (next != first) && !client; next = next->next)
-       {
-               firstid = &((smscore_client_t*)next )->idlist;
-               for (nextid = firstid->next ; nextid != firstid ; nextid = nextid->next)
-       {
-                       if ((((smscore_idlist_t*)nextid)->id  == id) &&
-                           (((smscore_idlist_t*)nextid)->data_type  == data_type ||
-                           (((smscore_idlist_t*)nextid)->data_type  == 0)))
-               {
-                       client = (smscore_client_t*) next;
-                       break;
+       for (next = first->next;
+            (next != first) && !client;
+            next = next->next) {
+               firstid = &((struct smscore_client_t *)next)->idlist;
+               for (nextid = firstid->next;
+                    nextid != firstid;
+                    nextid = nextid->next) {
+                       if ((((struct smscore_idlist_t *)nextid)->id == id) &&
+                           (((struct smscore_idlist_t *)nextid)->data_type == data_type ||
+                           (((struct smscore_idlist_t *)nextid)->data_type == 0))) {
+                               client = (struct smscore_client_t *) next;
+                               break;
+                       }
                }
        }
-       }
        spin_unlock_irqrestore(&coredev->clientslock, flags);
        return client;
 }
@@ -882,156 +973,206 @@ smscore_client_t *smscore_find_client(smscore_device_t *coredev, int data_type,
  * find client by response id/type, call clients onresponse handler
  * return buffer to pool on error
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  * @param cb pointer to response buffer descriptor
  *
  */
-void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
-{
-       SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *)((u8 *) cb->p + cb->offset);
-       smscore_client_t *client = smscore_find_client(coredev, phdr->msgType, phdr->msgDstId);
+void smscore_onresponse(struct smscore_device_t *coredev,
+               struct smscore_buffer_t *cb) {
+       struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) ((u8 *) cb->p
+                       + cb->offset);
+       struct smscore_client_t *client;
        int rc = -EBUSY;
-
-       static unsigned long last_sample_time = 0;
-       static int data_total = 0;
+       static unsigned long last_sample_time; /* = 0; */
+       static int data_total; /* = 0; */
        unsigned long time_now = jiffies_to_msecs(jiffies);
 
        if (!last_sample_time)
                last_sample_time = time_now;
 
-       if (time_now - last_sample_time > 10000)
-       {
-               printk("\n%s data rate %d bytes/secs\n", __func__, (int)((data_total * 1000) / (time_now - last_sample_time)));
+       if (time_now - last_sample_time > 10000) {
+               sms_debug("\ndata rate %d bytes/secs",
+                         (int)((data_total * 1000) /
+                               (time_now - last_sample_time)));
 
                last_sample_time = time_now;
                data_total = 0;
        }
 
        data_total += cb->size;
-       /* If no client registered for type & id, check for control client where type is not registered*/
-//     if (!client)
-//             client = smscore_find_client( coredev, 0, phdr->msgDstId);
-       if (client)
-               rc = client->onresponse_handler(client->context, cb);
-
-       if (rc < 0)
-       {
-               switch (phdr->msgType)
-               {
-                       case MSG_SMS_GET_VERSION_EX_RES:
-                       {
-                               SmsVersionRes_ST *ver = (SmsVersionRes_ST*) phdr;
-                               printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d prots 0x%x ver %d.%d\n", __func__, ver->FirmwareId, ver->SupportedProtocols, ver->RomVersionMajor, ver->RomVersionMinor);
-
-                               coredev->mode = ver->FirmwareId == 255 ? DEVICE_MODE_NONE : ver->FirmwareId;
-                               coredev->modes_supported = ver->SupportedProtocols;
-
-                               complete(&coredev->version_ex_done);
-                               break;
-                       }
-
-                       case MSG_SMS_INIT_DEVICE_RES:
-                               printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __func__);
-                               complete(&coredev->init_device_done);
-                               break;
-
-                       case MSG_SW_RELOAD_START_RES:
-                               printk("%s: MSG_SW_RELOAD_START_RES\n", __func__);
-                               complete(&coredev->reload_start_done);
-                               break;
-
-                       case MSG_SMS_DATA_DOWNLOAD_RES:
-                               complete(&coredev->data_download_done);
-                               break;
+       /* Do we need to re-route? */
+       if ((phdr->msgType == MSG_SMS_HO_PER_SLICES_IND) ||
+                       (phdr->msgType == MSG_SMS_TRANSMISSION_IND)) {
+               if (coredev->mode == DEVICE_MODE_DVBT_BDA)
+                       phdr->msgDstId = DVBT_BDA_CONTROL_MSG_ID;
+       }
 
-                       case MSG_SW_RELOAD_EXEC_RES:
-                               printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __func__);
-                               break;
 
-                       case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
-                               printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", __func__);
-                               complete(&coredev->trigger_done);
-                               break;
+       client = smscore_find_client(coredev, phdr->msgType, phdr->msgDstId);
 
-                       case MSG_SMS_SLEEP_RESUME_COMP_IND:
-                               complete(&coredev->resume_done);
-                               break;
+       /* If no client registered for type & id,
+        * check for control client where type is not registered */
+       if (client)
+               rc = client->onresponse_handler(client->context, cb);
 
-                       default:
-                               //printk(KERN_INFO "%s no client (%p) or error (%d), type:%d dstid:%d\n", __func__, client, rc, phdr->msgType, phdr->msgDstId);
-                               break;
+       if (rc < 0) {
+               switch (phdr->msgType) {
+               case MSG_SMS_GET_VERSION_EX_RES:
+               {
+                       struct SmsVersionRes_ST *ver =
+                               (struct SmsVersionRes_ST *) phdr;
+                       sms_debug("MSG_SMS_GET_VERSION_EX_RES "
+                                 "id %d prots 0x%x ver %d.%d",
+                                 ver->FirmwareId, ver->SupportedProtocols,
+                                 ver->RomVersionMajor, ver->RomVersionMinor);
+
+                       coredev->mode = ver->FirmwareId == 255 ?
+                               DEVICE_MODE_NONE : ver->FirmwareId;
+                       coredev->modes_supported = ver->SupportedProtocols;
+
+                       complete(&coredev->version_ex_done);
+                       break;
                }
+               case MSG_SMS_INIT_DEVICE_RES:
+                       sms_debug("MSG_SMS_INIT_DEVICE_RES");
+                       complete(&coredev->init_device_done);
+                       break;
+               case MSG_SW_RELOAD_START_RES:
+                       sms_debug("MSG_SW_RELOAD_START_RES");
+                       complete(&coredev->reload_start_done);
+                       break;
+               case MSG_SMS_DATA_DOWNLOAD_RES:
+                       complete(&coredev->data_download_done);
+                       break;
+               case MSG_SW_RELOAD_EXEC_RES:
+                       sms_debug("MSG_SW_RELOAD_EXEC_RES");
+                       break;
+               case MSG_SMS_SWDOWNLOAD_TRIGGER_RES:
+                       sms_debug("MSG_SMS_SWDOWNLOAD_TRIGGER_RES");
+                       complete(&coredev->trigger_done);
+                       break;
+               case MSG_SMS_SLEEP_RESUME_COMP_IND:
+                       complete(&coredev->resume_done);
+                       break;
+               case MSG_SMS_GPIO_CONFIG_EX_RES:
+                       sms_debug("MSG_SMS_GPIO_CONFIG_EX_RES");
+                       complete(&coredev->gpio_configuration_done);
+                       break;
+               case MSG_SMS_GPIO_SET_LEVEL_RES:
+                       sms_debug("MSG_SMS_GPIO_SET_LEVEL_RES");
+                       complete(&coredev->gpio_set_level_done);
+                       break;
+               case MSG_SMS_GPIO_GET_LEVEL_RES:
+               {
+                       u32 *msgdata = (u32 *) phdr;
+                       coredev->gpio_get_res = msgdata[1];
+                       sms_debug("MSG_SMS_GPIO_GET_LEVEL_RES gpio level %d",
+                                       coredev->gpio_get_res);
+                       complete(&coredev->gpio_get_level_done);
+                       break;
+               }
+               case MSG_SMS_START_IR_RES:
+                       complete(&coredev->ir_init_done);
+                       break;
+               case MSG_SMS_IR_SAMPLES_IND:
+                       sms_ir_event(coredev,
+                               (const char *)
+                               ((char *)phdr
+                               + sizeof(struct SmsMsgHdr_ST)),
+                               (int)phdr->msgLength
+                               - sizeof(struct SmsMsgHdr_ST));
+                       break;
 
+               default:
+                       break;
+               }
                smscore_putbuffer(coredev, cb);
        }
 }
+EXPORT_SYMBOL_GPL(smscore_onresponse);
 
 /**
  * return pointer to next free buffer descriptor from core pool
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  *
  * @return pointer to descriptor on success, NULL on error.
  */
-smscore_buffer_t *smscore_getbuffer(smscore_device_t *coredev)
+struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev)
 {
-       smscore_buffer_t *cb = NULL;
+       struct smscore_buffer_t *cb = NULL;
        unsigned long flags;
 
+       DEFINE_WAIT(wait);
+
        spin_lock_irqsave(&coredev->bufferslock, flags);
 
-       if (!list_empty(&coredev->buffers))
-       {
-               cb = (smscore_buffer_t *) coredev->buffers.next;
-               list_del(&cb->entry);
-       }
+       /* This function must return a valid buffer, since the buffer list is
+        * finite, we check that there is an available buffer, if not, we wait
+        * until such buffer become available.
+        */
+
+       prepare_to_wait(&coredev->buffer_mng_waitq, &wait, TASK_INTERRUPTIBLE);
+
+       if (list_empty(&coredev->buffers))
+               schedule();
+
+       finish_wait(&coredev->buffer_mng_waitq, &wait);
+
+       cb = (struct smscore_buffer_t *) coredev->buffers.next;
+       list_del(&cb->entry);
 
        spin_unlock_irqrestore(&coredev->bufferslock, flags);
 
        return cb;
 }
+EXPORT_SYMBOL_GPL(smscore_getbuffer);
 
 /**
  * return buffer descriptor to a pool
  *
- * @param coredev pointer to a coredev object returned by smscore_register_device
+ * @param coredev pointer to a coredev object returned by
+ *                smscore_register_device
  * @param cb pointer buffer descriptor
  *
  */
-void smscore_putbuffer(smscore_device_t *coredev, smscore_buffer_t *cb)
-{
+void smscore_putbuffer(struct smscore_device_t *coredev,
+               struct smscore_buffer_t *cb) {
+       wake_up_interruptible(&coredev->buffer_mng_waitq);
        list_add_locked(&cb->entry, &coredev->buffers, &coredev->bufferslock);
 }
+EXPORT_SYMBOL_GPL(smscore_putbuffer);
 
-int smscore_validate_client(smscore_device_t *coredev, smscore_client_t *client, int data_type, int id)
+static int smscore_validate_client(struct smscore_device_t *coredev,
+                                  struct smscore_client_t *client,
+                                  int data_type, int id)
 {
-       smscore_idlist_t *listentry;
-       smscore_client_t *registered_client;
+       struct smscore_idlist_t *listentry;
+       struct smscore_client_t *registered_client;
 
-       if ( !client )
-       {
-               PERROR("bad parameter.\n");
+       if (!client) {
+               sms_err("bad parameter.");
                return -EFAULT;
        }
        registered_client = smscore_find_client(coredev, data_type, id);
        if (registered_client == client)
-       {
                return 0;
-       }
-       if (registered_client)
-       {
-               PERROR("The msg ID already registered to another client.\n");
+
+       if (registered_client) {
+               sms_err("The msg ID already registered to another client.");
                return -EEXIST;
        }
-       listentry = kzalloc ( sizeof ( smscore_idlist_t ), GFP_KERNEL );
-       if ( !listentry )
-       {
-               PERROR("Can't allocate memory for client id.\n");
+       listentry = kzalloc(sizeof(struct smscore_idlist_t), GFP_KERNEL);
+       if (!listentry) {
+               sms_err("Can't allocate memory for client id.");
                return -ENOMEM;
        }
        listentry->id = id;
        listentry->data_type = data_type;
-       list_add_locked ( &listentry->entry, &client->idlist, &coredev->clientslock );
+       list_add_locked(&listentry->entry, &client->idlist,
+                       &coredev->clientslock);
        return 0;
 }
 
@@ -1041,157 +1182,428 @@ int smscore_validate_client(smscore_device_t *coredev, smscore_client_t *client,
  * @param coredev pointer to a coredev object from clients hotplug
  * @param initial_id all messages with this id would be sent to this client
  * @param data_type all messages of this type would be sent to this client
- * @param onresponse_handler client handler that is called to process incoming messages
+ * @param onresponse_handler client handler that is called to
+ *                           process incoming messages
  * @param onremove_handler client handler that is called when device is removed
  * @param context client-specific context
  * @param client pointer to a value that receives created smsclient object
  *
  * @return 0 on success, <0 on error.
  */
-int smscore_register_client(smscore_device_t *coredev, smsclient_params_t *params, smscore_client_t **client)
+int smscore_register_client(struct smscore_device_t *coredev,
+                           struct smsclient_params_t *params,
+                           struct smscore_client_t **client)
 {
-       smscore_client_t *newclient;
-       // check that no other channel with same parameters exists
-       if (smscore_find_client(coredev, params->data_type, params->initial_id))
-       {
-               PERROR("Client already exist.\n");
+       struct smscore_client_t *newclient;
+       /* check that no other channel with same parameters exists */
+       if (smscore_find_client(coredev, params->data_type,
+                               params->initial_id)) {
+               sms_err("Client already exist.");
                return -EEXIST;
        }
 
-       newclient = kzalloc(sizeof(smscore_client_t), GFP_KERNEL);
-       if (!newclient)
-       {
-               PERROR("Failed to allocate memory for client.\n");
+       newclient = kzalloc(sizeof(struct smscore_client_t), GFP_KERNEL);
+       if (!newclient) {
+               sms_err("Failed to allocate memory for client.");
                return -ENOMEM;
        }
 
-       INIT_LIST_HEAD ( &newclient->idlist);
+       INIT_LIST_HEAD(&newclient->idlist);
        newclient->coredev = coredev;
        newclient->onresponse_handler = params->onresponse_handler;
        newclient->onremove_handler = params->onremove_handler;
        newclient->context = params->context;
-       list_add_locked(&newclient->entry, &coredev->clients, &coredev->clientslock);
-       smscore_validate_client(coredev, newclient, params->data_type, params->initial_id);
+       list_add_locked(&newclient->entry, &coredev->clients,
+                       &coredev->clientslock);
+       smscore_validate_client(coredev, newclient, params->data_type,
+                               params->initial_id);
        *client = newclient;
-       PDEBUG ( "%p %d %d\n", params->context, params->data_type, params->initial_id );
+       sms_debug("%p %d %d", params->context, params->data_type,
+                 params->initial_id);
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(smscore_register_client);
 
 /**
  * frees smsclient object and all subclients associated with it
  *
- * @param client pointer to smsclient object returned by smscore_register_client
+ * @param client pointer to smsclient object returned by
+ *               smscore_register_client
  *
  */
-void smscore_unregister_client(smscore_client_t *client)
+void smscore_unregister_client(struct smscore_client_t *client)
 {
-       smscore_device_t *coredev = client->coredev;
+       struct smscore_device_t *coredev = client->coredev;
        unsigned long flags;
 
        spin_lock_irqsave(&coredev->clientslock, flags);
 
 
-       while (!list_empty( &client->idlist))
-               {
-               smscore_idlist_t *identry = (smscore_idlist_t*)client->idlist.next;
-               list_del ( &identry->entry );
-               kfree ( identry );
+       while (!list_empty(&client->idlist)) {
+               struct smscore_idlist_t *identry =
+                       (struct smscore_idlist_t *) client->idlist.next;
+               list_del(&identry->entry);
+               kfree(identry);
        }
 
-       printk(KERN_INFO "%s %p\n", __func__, client->context);
+       sms_info("%p", client->context);
 
        list_del(&client->entry);
        kfree(client);
 
        spin_unlock_irqrestore(&coredev->clientslock, flags);
 }
+EXPORT_SYMBOL_GPL(smscore_unregister_client);
 
 /**
  * verifies that source id is not taken by another client,
  * calls device handler to send requests to the device
  *
- * @param client pointer to smsclient object returned by smscore_register_client
+ * @param client pointer to smsclient object returned by
+ *               smscore_register_client
  * @param buffer pointer to a request buffer
  * @param size size (in bytes) of request buffer
  *
  * @return 0 on success, <0 on error.
  */
-int smsclient_sendrequest(smscore_client_t *client, void *buffer, size_t size)
+int smsclient_sendrequest(struct smscore_client_t *client,
+                         void *buffer, size_t size)
 {
-       smscore_device_t *coredev;
-       SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *) buffer;
+       struct smscore_device_t *coredev;
+       struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) buffer;
        int rc;
 
-       if ( client == NULL )
-       {
-               printk(KERN_ERR "%s Got NULL client\n", __func__ );
+       if (client == NULL) {
+               sms_err("Got NULL client");
                return -EINVAL;
        }
 
        coredev = client->coredev;
 
-       // check that no other channel with same id exists
-       if ( coredev == NULL )
-       {
-               printk(KERN_ERR "%s Got NULL coredev\n", __func__ );
+       /* check that no other channel with same id exists */
+       if (coredev == NULL) {
+               sms_err("Got NULL coredev");
                return -EINVAL;
        }
 
-       rc = smscore_validate_client(client->coredev, client, 0, phdr->msgSrcId);
+       rc = smscore_validate_client(client->coredev, client, 0,
+                                    phdr->msgSrcId);
        if (rc < 0)
                return rc;
 
        return coredev->sendrequest_handler(coredev->context, buffer, size);
 }
+EXPORT_SYMBOL_GPL(smsclient_sendrequest);
 
-/**
- * return the size of large (common) buffer
- *
- * @param coredev pointer to a coredev object from clients hotplug
- *
- * @return size (in bytes) of the buffer
- */
-int smscore_get_common_buffer_size(smscore_device_t *coredev)
+
+/* old GPIO managments implementation */
+int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
+                          struct smscore_config_gpio *pinconfig)
 {
-       return coredev->common_buffer_size;
+       struct {
+               struct SmsMsgHdr_ST hdr;
+               u32 data[6];
+       } msg;
+
+       if (coredev->device_flags & SMS_DEVICE_FAMILY2) {
+               msg.hdr.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
+               msg.hdr.msgDstId = HIF_TASK;
+               msg.hdr.msgFlags = 0;
+               msg.hdr.msgType  = MSG_SMS_GPIO_CONFIG_EX_REQ;
+               msg.hdr.msgLength = sizeof(msg);
+
+               msg.data[0] = pin;
+               msg.data[1] = pinconfig->pullupdown;
+
+               /* Convert slew rate for Nova: Fast(0) = 3 / Slow(1) = 0; */
+               msg.data[2] = pinconfig->outputslewrate == 0 ? 3 : 0;
+
+               switch (pinconfig->outputdriving) {
+               case SMS_GPIO_OUTPUTDRIVING_16mA:
+                       msg.data[3] = 7; /* Nova - 16mA */
+                       break;
+               case SMS_GPIO_OUTPUTDRIVING_12mA:
+                       msg.data[3] = 5; /* Nova - 11mA */
+                       break;
+               case SMS_GPIO_OUTPUTDRIVING_8mA:
+                       msg.data[3] = 3; /* Nova - 7mA */
+                       break;
+               case SMS_GPIO_OUTPUTDRIVING_4mA:
+               default:
+                       msg.data[3] = 2; /* Nova - 4mA */
+                       break;
+               }
+
+               msg.data[4] = pinconfig->direction;
+               msg.data[5] = 0;
+       } else /* TODO: SMS_DEVICE_FAMILY1 */
+               return -EINVAL;
+
+       return coredev->sendrequest_handler(coredev->context,
+                                           &msg, sizeof(msg));
 }
 
-/**
- * maps common buffer (if supported by platform)
- *
- * @param coredev pointer to a coredev object from clients hotplug
- * @param vma pointer to vma struct from mmap handler
- *
- * @return 0 on success, <0 on error.
- */
-int smscore_map_common_buffer(smscore_device_t *coredev,
-                              struct vm_area_struct *vma)
+int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level)
 {
-       unsigned long end = vma->vm_end, start = vma->vm_start, size = PAGE_ALIGN(coredev->common_buffer_size);
+       struct {
+               struct SmsMsgHdr_ST hdr;
+               u32 data[3];
+       } msg;
+
+       if (pin > MAX_GPIO_PIN_NUMBER)
+               return -EINVAL;
+
+       msg.hdr.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
+       msg.hdr.msgDstId = HIF_TASK;
+       msg.hdr.msgFlags = 0;
+       msg.hdr.msgType  = MSG_SMS_GPIO_SET_LEVEL_REQ;
+       msg.hdr.msgLength = sizeof(msg);
+
+       msg.data[0] = pin;
+       msg.data[1] = level ? 1 : 0;
+       msg.data[2] = 0;
+
+       return coredev->sendrequest_handler(coredev->context,
+                                           &msg, sizeof(msg));
+}
+
+/* new GPIO management implementation */
+static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum,
+               u32 *pGroupNum, u32 *pGroupCfg) {
+
+       *pGroupCfg = 1;
+
+       if (PinNum <= 1)        {
+               *pTranslatedPinNum = 0;
+               *pGroupNum = 9;
+               *pGroupCfg = 2;
+       } else if (PinNum >= 2 && PinNum <= 6) {
+               *pTranslatedPinNum = 2;
+               *pGroupNum = 0;
+               *pGroupCfg = 2;
+       } else if (PinNum >= 7 && PinNum <= 11) {
+               *pTranslatedPinNum = 7;
+               *pGroupNum = 1;
+       } else if (PinNum >= 12 && PinNum <= 15) {
+               *pTranslatedPinNum = 12;
+               *pGroupNum = 2;
+               *pGroupCfg = 3;
+       } else if (PinNum == 16) {
+               *pTranslatedPinNum = 16;
+               *pGroupNum = 23;
+       } else if (PinNum >= 17 && PinNum <= 24) {
+               *pTranslatedPinNum = 17;
+               *pGroupNum = 3;
+       } else if (PinNum == 25) {
+               *pTranslatedPinNum = 25;
+               *pGroupNum = 6;
+       } else if (PinNum >= 26 && PinNum <= 28) {
+               *pTranslatedPinNum = 26;
+               *pGroupNum = 4;
+       } else if (PinNum == 29) {
+               *pTranslatedPinNum = 29;
+               *pGroupNum = 5;
+               *pGroupCfg = 2;
+       } else if (PinNum == 30) {
+               *pTranslatedPinNum = 30;
+               *pGroupNum = 8;
+       } else if (PinNum == 31) {
+               *pTranslatedPinNum = 31;
+               *pGroupNum = 17;
+       } else
+               return -1;
+
+       *pGroupCfg <<= 24;
+
+       return 0;
+}
+
+int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
+               struct smscore_gpio_config *pGpioConfig) {
+
+       u32 totalLen;
+       u32 TranslatedPinNum = 0;
+       u32 GroupNum = 0;
+       u32 ElectricChar;
+       u32 groupCfg;
+       void *buffer;
+       int rc;
+
+       struct SetGpioMsg {
+               struct SmsMsgHdr_ST xMsgHeader;
+               u32 msgData[6];
+       } *pMsg;
 
-       if (!(vma->vm_flags & (VM_READ | VM_SHARED)) || (vma->vm_flags & VM_WRITE))
-       {
-               printk(KERN_INFO "%s invalid vm flags\n", __func__);
+
+       if (PinNum > MAX_GPIO_PIN_NUMBER)
+               return -EINVAL;
+
+       if (pGpioConfig == NULL)
                return -EINVAL;
+
+       totalLen = sizeof(struct SmsMsgHdr_ST) + (sizeof(u32) * 6);
+
+       buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT,
+                       GFP_KERNEL | GFP_DMA);
+       if (!buffer)
+               return -ENOMEM;
+
+       pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer);
+
+       pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
+       pMsg->xMsgHeader.msgDstId = HIF_TASK;
+       pMsg->xMsgHeader.msgFlags = 0;
+       pMsg->xMsgHeader.msgLength = (u16) totalLen;
+       pMsg->msgData[0] = PinNum;
+
+       if (!(coredev->device_flags & SMS_DEVICE_FAMILY2)) {
+               pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_CONFIG_REQ;
+               if (GetGpioPinParams(PinNum, &TranslatedPinNum, &GroupNum,
+                               &groupCfg) != 0) {
+                       rc = -EINVAL;
+                       goto free;
+               }
+
+               pMsg->msgData[1] = TranslatedPinNum;
+               pMsg->msgData[2] = GroupNum;
+               ElectricChar = (pGpioConfig->PullUpDown)
+                               | (pGpioConfig->InputCharacteristics << 2)
+                               | (pGpioConfig->OutputSlewRate << 3)
+                               | (pGpioConfig->OutputDriving << 4);
+               pMsg->msgData[3] = ElectricChar;
+               pMsg->msgData[4] = pGpioConfig->Direction;
+               pMsg->msgData[5] = groupCfg;
+       } else {
+               pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_CONFIG_EX_REQ;
+               pMsg->msgData[1] = pGpioConfig->PullUpDown;
+               pMsg->msgData[2] = pGpioConfig->OutputSlewRate;
+               pMsg->msgData[3] = pGpioConfig->OutputDriving;
+               pMsg->msgData[4] = pGpioConfig->Direction;
+               pMsg->msgData[5] = 0;
+       }
+
+       smsendian_handle_tx_message((struct SmsMsgHdr_ST *)pMsg);
+       rc = smscore_sendrequest_and_wait(coredev, pMsg, totalLen,
+                       &coredev->gpio_configuration_done);
+
+       if (rc != 0) {
+               if (rc == -ETIME)
+                       sms_err("smscore_gpio_configure timeout");
+               else
+                       sms_err("smscore_gpio_configure error");
        }
+free:
+       kfree(buffer);
 
-       if ((end - start) != size)
-       {
-               printk(KERN_INFO "%s invalid size %d expected %d\n", __func__, (int)(end - start), (int) size);
+       return rc;
+}
+
+int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum,
+               u8 NewLevel) {
+
+       u32 totalLen;
+       int rc;
+       void *buffer;
+
+       struct SetGpioMsg {
+               struct SmsMsgHdr_ST xMsgHeader;
+               u32 msgData[3]; /* keep it 3 ! */
+       } *pMsg;
+
+       if ((NewLevel > 1) || (PinNum > MAX_GPIO_PIN_NUMBER) ||
+                       (PinNum > MAX_GPIO_PIN_NUMBER))
                return -EINVAL;
+
+       totalLen = sizeof(struct SmsMsgHdr_ST) +
+                       (3 * sizeof(u32)); /* keep it 3 ! */
+
+       buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT,
+                       GFP_KERNEL | GFP_DMA);
+       if (!buffer)
+               return -ENOMEM;
+
+       pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer);
+
+       pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
+       pMsg->xMsgHeader.msgDstId = HIF_TASK;
+       pMsg->xMsgHeader.msgFlags = 0;
+       pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_SET_LEVEL_REQ;
+       pMsg->xMsgHeader.msgLength = (u16) totalLen;
+       pMsg->msgData[0] = PinNum;
+       pMsg->msgData[1] = NewLevel;
+
+       /* Send message to SMS */
+       smsendian_handle_tx_message((struct SmsMsgHdr_ST *)pMsg);
+       rc = smscore_sendrequest_and_wait(coredev, pMsg, totalLen,
+                       &coredev->gpio_set_level_done);
+
+       if (rc != 0) {
+               if (rc == -ETIME)
+                       sms_err("smscore_gpio_set_level timeout");
+               else
+                       sms_err("smscore_gpio_set_level error");
        }
+       kfree(buffer);
+
+       return rc;
+}
+
+int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 PinNum,
+               u8 *level) {
+
+       u32 totalLen;
+       int rc;
+       void *buffer;
+
+       struct SetGpioMsg {
+               struct SmsMsgHdr_ST xMsgHeader;
+               u32 msgData[2];
+       } *pMsg;
+
+
+       if (PinNum > MAX_GPIO_PIN_NUMBER)
+               return -EINVAL;
+
+       totalLen = sizeof(struct SmsMsgHdr_ST) + (2 * sizeof(u32));
 
-       if (remap_pfn_range(vma, start, coredev->common_buffer_phys >> PAGE_SHIFT, size, pgprot_noncached(vma->vm_page_prot)))
-       {
-               printk(KERN_INFO "%s remap_page_range failed\n", __func__);
-               return -EAGAIN;
+       buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT,
+                       GFP_KERNEL | GFP_DMA);
+       if (!buffer)
+               return -ENOMEM;
+
+       pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer);
+
+       pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID;
+       pMsg->xMsgHeader.msgDstId = HIF_TASK;
+       pMsg->xMsgHeader.msgFlags = 0;
+       pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_GET_LEVEL_REQ;
+       pMsg->xMsgHeader.msgLength = (u16) totalLen;
+       pMsg->msgData[0] = PinNum;
+       pMsg->msgData[1] = 0;
+
+       /* Send message to SMS */
+       smsendian_handle_tx_message((struct SmsMsgHdr_ST *)pMsg);
+       rc = smscore_sendrequest_and_wait(coredev, pMsg, totalLen,
+                       &coredev->gpio_get_level_done);
+
+       if (rc != 0) {
+               if (rc == -ETIME)
+                       sms_err("smscore_gpio_get_level timeout");
+               else
+                       sms_err("smscore_gpio_get_level error");
        }
+       kfree(buffer);
 
-       return 0;
+       /* Its a race between other gpio_get_level() and the copy of the single
+        * global 'coredev->gpio_get_res' to  the function's variable 'level'
+        */
+       *level = coredev->gpio_get_res;
+
+       return rc;
 }
 
-int smscore_module_init(void)
+static int __init smscore_module_init(void)
 {
        int rc = 0;
 
@@ -1202,24 +1614,16 @@ int smscore_module_init(void)
        INIT_LIST_HEAD(&g_smscore_registry);
        kmutex_init(&g_smscore_registrylock);
 
-       /* USB Register */
-       rc = smsusb_register();
-
-       /* DVB Register */
-       rc = smsdvb_register();
-
-       printk(KERN_INFO "%s, rc %d\n", __func__, rc);
-
        return rc;
 }
 
-void smscore_module_exit(void)
+static void __exit smscore_module_exit(void)
 {
-
        kmutex_lock(&g_smscore_deviceslock);
-       while (!list_empty(&g_smscore_notifyees))
-       {
-               smscore_device_notifyee_t *notifyee = (smscore_device_notifyee_t *) g_smscore_notifyees.next;
+       while (!list_empty(&g_smscore_notifyees)) {
+               struct smscore_device_notifyee_t *notifyee =
+                       (struct smscore_device_notifyee_t *)
+                               g_smscore_notifyees.next;
 
                list_del(&notifyee->entry);
                kfree(notifyee);
@@ -1227,28 +1631,22 @@ void smscore_module_exit(void)
        kmutex_unlock(&g_smscore_deviceslock);
 
        kmutex_lock(&g_smscore_registrylock);
-       while (!list_empty(&g_smscore_registry))
-       {
-               smscore_registry_entry_t *entry = (smscore_registry_entry_t *) g_smscore_registry.next;
+       while (!list_empty(&g_smscore_registry)) {
+               struct smscore_registry_entry_t *entry =
+                       (struct smscore_registry_entry_t *)
+                               g_smscore_registry.next;
 
                list_del(&entry->entry);
                kfree(entry);
        }
        kmutex_unlock(&g_smscore_registrylock);
 
-       /* DVB UnRegister */
-       smsdvb_unregister();
-
-       /* Unregister USB */
-       smsusb_unregister();
-
-       printk(KERN_INFO "%s\n", __func__);
+       sms_debug("");
 }
 
 module_init(smscore_module_init);
 module_exit(smscore_module_exit);
 
-MODULE_DESCRIPTION("smscore");
-MODULE_AUTHOR ( "Siano Mobile Silicon,,, (doronc@siano-ms.com)" );
+MODULE_DESCRIPTION("Siano MDTV Core module");
+MODULE_AUTHOR("Siano Mobile Silicon, Inc. (uris@siano-ms.com)");
 MODULE_LICENSE("GPL");
-