V4L/DVB (11555): Siano: core - move and update the main core structure declaration

smscoreapi - move the main core structure declaration
to the header, in order to enable other components
(such as IR) to use it.

Signed-off-by: Uri Shkolnik <uris@siano-ms.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 54 insertions, 36 deletions

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 7bd4d1dee2b3..f3e1cc733fe7 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -58,42 +58,6 @@ struct smscore_client_t {
         onremove_t              onremove_handler;
 };
 
-struct smscore_device_t {
-        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;
-
-        struct completion version_ex_done, data_download_done, trigger_done;
-        struct completion init_device_done, reload_start_done, resume_done;
-
-        int board_id;
-        int led_state;
-};
-
 void smscore_set_board_id(struct smscore_device_t *core, int id)
 {
         core->board_id = id;
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index 26749b0e4624..bb52d876b4b3 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -121,6 +121,60 @@ struct smsclient_params_t {
         void                    *context;
 };
 
+struct smscore_device_t {
+        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;
+
+        /* host <--> device messages */
+        struct completion version_ex_done, data_download_done, trigger_done;
+        struct completion init_device_done, reload_start_done, resume_done;
+        struct completion gpio_configuration_done, gpio_set_level_done;
+        struct completion gpio_get_level_done, ir_init_done;
+
+        /* Buffer management */
+        wait_queue_head_t buffer_mng_waitq;
+
+        /* GPIO */
+        int gpio_get_res;
+
+        /* Target hardware board */
+        int board_id;
+
+        /* Firmware */
+        u8 *fw_buf;
+        u32 fw_buf_size;
+
+        /* Infrared (IR) */
+        /* struct ir_t ir; */
+
+        int led_state;
+};
+
 /* GPIO definitions for antenna frequency domain control (SMS8021) */
 #define SMS_ANTENNA_GPIO_0                                      1
 #define SMS_ANTENNA_GPIO_1                                      0