Merge branch 'core/xen' into x86/xen
[safe/jmp/linux-2.6] / drivers / media / dvb / siano / smscoreapi.h
index 601bdb8..8d973f7 100644 (file)
@@ -6,7 +6,7 @@
  *  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"
@@ -26,7 +26,8 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+#include <linux/types.h>
 #include <asm/page.h>
 
 #include "dmxdev.h"
 
 #include <linux/mutex.h>
 
-typedef struct mutex kmutex_t;
-
 #define kmutex_init(_p_) mutex_init(_p_)
 #define kmutex_lock(_p_) mutex_lock(_p_)
 #define kmutex_trylock(_p_) mutex_trylock(_p_)
 #define kmutex_unlock(_p_) mutex_unlock(_p_)
 
-
 #ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 
 #define SMS_ALLOC_ALIGNMENT                                    128
 #define SMS_DMA_ALIGNMENT                                      16
-#define SMS_ALIGN_ADDRESS(addr) ((((u32)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1))
+#define SMS_ALIGN_ADDRESS(addr) \
+       ((((uintptr_t)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1))
 
 #define SMS_DEVICE_FAMILY2                                     1
 #define SMS_ROM_NO_RESPONSE                                    2
 #define SMS_DEVICE_NOT_READY                           0x8000000
 
-typedef enum {
-       SMS_STELLAR= 0,
+enum sms_device_type_st {
+       SMS_STELLAR = 0,
        SMS_NOVA_A0,
        SMS_NOVA_B0,
        SMS_VEGA,
        SMS_NUM_OF_DEVICE_TYPES
-} sms_device_type_st;
+};
 
-typedef struct _smscore_device smscore_device_t;
-typedef struct _smscore_client smscore_client_t;
-typedef struct _smscore_buffer smscore_buffer_t;
+struct smscore_device_t;
+struct smscore_client_t;
+struct smscore_buffer_t;
 
-typedef int (*hotplug_t)(smscore_device_t *coredev, struct device *device, int arrival);
+typedef int (*hotplug_t)(struct smscore_device_t *coredev,
+                        struct device *device, int arrival);
 
 typedef int (*setmode_t)(void *context, int mode);
 typedef void (*detectmode_t)(void *context, int *mode);
@@ -77,24 +77,22 @@ typedef int (*loadfirmware_t)(void *context, void *buffer, size_t size);
 typedef int (*preload_t)(void *context);
 typedef int (*postload_t)(void *context);
 
-typedef int (*onresponse_t)(void *context, smscore_buffer_t *cb);
+typedef int (*onresponse_t)(void *context, struct smscore_buffer_t *cb);
 typedef void (*onremove_t)(void *context);
 
-typedef struct _smscore_buffer
-{
-       // public members, once passed to clients can be changed freely
+struct smscore_buffer_t {
+       /* public members, once passed to clients can be changed freely */
        struct list_head entry;
        int                             size;
        int                             offset;
 
-       // private members, read-only for clients
+       /* private members, read-only for clients */
        void                    *p;
        dma_addr_t              phys;
        unsigned long   offset_in_common;
-} *psmscore_buffer_t;
+};
 
-typedef struct _smsdevice_params
-{
+struct smsdevice_params_t {
        struct device   *device;
 
        int                             buffer_size;
@@ -110,20 +108,19 @@ typedef struct _smsdevice_params
        postload_t              postload_handler;
 
        void                    *context;
-       sms_device_type_st device_type;
-} smsdevice_params_t;
+       enum sms_device_type_st device_type;
+};
 
-typedef struct _smsclient_params
-{
+struct smsclient_params_t {
        int                             initial_id;
        int                             data_type;
        onresponse_t    onresponse_handler;
        onremove_t              onremove_handler;
 
        void                    *context;
-} smsclient_params_t;
+};
 
-// GPIO definitions for antenna frequency domain control (SMS8021)
+/* GPIO definitions for antenna frequency domain control (SMS8021) */
 #define SMS_ANTENNA_GPIO_0                                     1
 #define SMS_ANTENNA_GPIO_1                                     0
 
@@ -196,10 +193,10 @@ typedef struct _smsclient_params
        (ptr)->msgType = type; (ptr)->msgSrcId = src; (ptr)->msgDstId = dst; \
        (ptr)->msgLength = len; (ptr)->msgFlags = 0; \
 } while (0)
-#define SMS_INIT_MSG(ptr, type, len) SMS_INIT_MSG_EX(ptr, type, 0, HIF_TASK, len)
+#define SMS_INIT_MSG(ptr, type, len) \
+       SMS_INIT_MSG_EX(ptr, type, 0, HIF_TASK, len)
 
-typedef enum
-{
+enum SMS_DEVICE_MODE {
        DEVICE_MODE_NONE = -1,
        DEVICE_MODE_DVBT = 0,
        DEVICE_MODE_DVBH,
@@ -211,296 +208,159 @@ typedef enum
        DEVICE_MODE_CMMB,
        DEVICE_MODE_RAW_TUNER,
        DEVICE_MODE_MAX,
-} SMS_DEVICE_MODE;
-
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef int INT32;
-
-typedef struct SmsMsgHdr_S
-{
-       UINT16  msgType;
-       UINT8   msgSrcId;
-       UINT8   msgDstId;
-       UINT16  msgLength;      // Length is of the entire message, including header
-       UINT16  msgFlags;
-} SmsMsgHdr_ST;
-
-typedef struct SmsMsgData_S
-{
-       SmsMsgHdr_ST    xMsgHeader;
-       UINT32                  msgData[1];
-} SmsMsgData_ST;
-
-typedef struct SmsDataDownload_S
-{
-       SmsMsgHdr_ST    xMsgHeader;
-       UINT32                  MemAddr;
-       UINT8                   Payload[SMS_MAX_PAYLOAD_SIZE];
-} SmsDataDownload_ST;
-
-typedef struct SmsVersionRes_S
-{
-       SmsMsgHdr_ST    xMsgHeader;
-
-       UINT16                  ChipModel;                    // e.g. 0x1102 for SMS-1102 "Nova"
-       UINT8                   Step;                         // 0 - Step A
-       UINT8                   MetalFix;                     // 0 - Metal 0
-
-       UINT8                   FirmwareId;                   // 0xFF � ROM, otherwise the value indicated by SMSHOSTLIB_DEVICE_MODES_E
-       UINT8                   SupportedProtocols;           // Bitwise OR combination of supported protocols
-
-       UINT8                   VersionMajor;
-       UINT8                   VersionMinor;
-       UINT8                   VersionPatch;
-       UINT8                   VersionFieldPatch;
-
-       UINT8                   RomVersionMajor;
-       UINT8                   RomVersionMinor;
-       UINT8                   RomVersionPatch;
-       UINT8                   RomVersionFieldPatch;
-
-       UINT8                   TextLabel[34];
-} SmsVersionRes_ST;
-
-typedef struct SmsFirmware_S
-{
-       UINT32                  CheckSum;
-       UINT32                  Length;
-       UINT32                  StartAddress;
-       UINT8                   Payload[1];
-} SmsFirmware_ST;
-
-typedef struct SMSHOSTLIB_STATISTICS_S
-{
-       UINT32 Reserved;                                //!< Reserved
-
-       /// Common parameters
-       UINT32 IsRfLocked;                              //!< 0 - not locked, 1 - locked
-       UINT32 IsDemodLocked;                   //!< 0 - not locked, 1 - locked
-       UINT32 IsExternalLNAOn;                 //!< 0 - external LNA off, 1 - external LNA on
-
-       /// Reception quality
-       INT32  SNR;                                             //!< dB
-       UINT32 BER;                                             //!< Post Viterbi BER [1E-5]
-       UINT32 FIB_CRC;                                 //!< CRC errors percentage, valid only for DAB
-       UINT32 TS_PER;                                  //!< Transport stream PER, 0xFFFFFFFF indicate N/A, valid only for DVB-T/H
-       UINT32 MFER;                                    //!< DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H
-       INT32  RSSI;                                    //!< dBm
-       INT32  InBandPwr;                               //!< In band power in dBM
-       INT32  CarrierOffset;                   //!< Carrier Offset in bin/1024
-
-       /// Transmission parameters
-       UINT32 Frequency;                               //!< Frequency in Hz
-       UINT32 Bandwidth;                               //!< Bandwidth in MHz, valid only for DVB-T/H
-       UINT32 TransmissionMode;                //!< Transmission Mode, for DAB modes 1-4, for DVB-T/H FFT mode carriers in Kilos
-       UINT32 ModemState;                              //!< from SMS_DvbModemState_ET , valid only for DVB-T/H
-       UINT32 GuardInterval;                   //!< Guard Interval, 1 divided by value , valid only for DVB-T/H
-       UINT32 CodeRate;                                //!< Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H
-       UINT32 LPCodeRate;                              //!< Low Priority Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H
-       UINT32 Hierarchy;                               //!< Hierarchy from SMS_Hierarchy_ET, valid only for DVB-T/H
-       UINT32 Constellation;                   //!< Constellation from SMS_Constellation_ET, valid only for DVB-T/H
-
-       /// Burst parameters, valid only for DVB-H
-       UINT32 BurstSize;                               //!< Current burst size in bytes, valid only for DVB-H
-       UINT32 BurstDuration;                   //!< Current burst duration in mSec, valid only for DVB-H
-       UINT32 BurstCycleTime;                  //!< Current burst cycle time in mSec, valid only for DVB-H
-       UINT32 CalculatedBurstCycleTime;//!< Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H
-       UINT32 NumOfRows;                               //!< Number of rows in MPE table, valid only for DVB-H
-       UINT32 NumOfPaddCols;                   //!< Number of padding columns in MPE table, valid only for DVB-H
-       UINT32 NumOfPunctCols;                  //!< Number of puncturing columns in MPE table, valid only for DVB-H
-       UINT32 ErrorTSPackets;                  //!< Number of erroneous transport-stream packets
-       UINT32 TotalTSPackets;                  //!< Total number of transport-stream packets
-       UINT32 NumOfValidMpeTlbs;               //!< Number of MPE tables which do not include errors after MPE RS decoding
-       UINT32 NumOfInvalidMpeTlbs;             //!< Number of MPE tables which include errors after MPE RS decoding
-       UINT32 NumOfCorrectedMpeTlbs;   //!< Number of MPE tables which were corrected by MPE RS decoding
-       /// Common params
-       UINT32 BERErrorCount;                   //!< Number of errornous SYNC bits.
-       UINT32 BERBitCount;                             //!< Total number of SYNC bits.
-
-       /// Interface information
-       UINT32 SmsToHostTxErrors;               //!< Total number of transmission errors.
-
-       /// DAB/T-DMB
-       UINT32 PreBER;                                  //!< DAB/T-DMB only: Pre Viterbi BER [1E-5]
-
-       /// DVB-H TPS parameters
-       UINT32 CellId;                                  //!< TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered
-
-} SMSHOSTLIB_STATISTICS_ST;
-
-typedef struct
-{
-       UINT32 RequestResult;
-
-       SMSHOSTLIB_STATISTICS_ST Stat;
-
-       // Split the calc of the SNR in DAB
-       UINT32 Signal;                          //!< dB
-       UINT32 Noise;                           //!< dB
-
-} SmsMsgStatisticsInfo_ST;
-
-typedef struct SMSHOSTLIB_ISDBT_LAYER_STAT_S
-{
-       // Per-layer information
-       UINT32 CodeRate;                        //!< Code Rate from SMSHOSTLIB_CODE_RATE_ET, 255 means layer does not exist
-       UINT32 Constellation;           //!< Constellation from SMSHOSTLIB_CONSTELLATION_ET, 255 means layer does not exist
-       UINT32 BER;                                     //!< Post Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A
-       UINT32 BERErrorCount;           //!< Post Viterbi Error Bits Count
-       UINT32 BERBitCount;                     //!< Post Viterbi Total Bits Count
-       UINT32 PreBER;                          //!< Pre Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A
-       UINT32 TS_PER;                          //!< Transport stream PER [%], 0xFFFFFFFF indicate N/A
-       UINT32 ErrorTSPackets;          //!< Number of erroneous transport-stream packets
-       UINT32 TotalTSPackets;          //!< Total number of transport-stream packets
-       UINT32 TILdepthI;                       //!< Time interleaver depth I parameter, 255 means layer does not exist
-       UINT32 NumberOfSegments;        //!< Number of segments in layer A, 255 means layer does not exist
-       UINT32 TMCCErrors;                      //!< TMCC errors
-} SMSHOSTLIB_ISDBT_LAYER_STAT_ST;
-
-typedef struct SMSHOSTLIB_STATISTICS_ISDBT_S
-{
-       UINT32 StatisticsType;                  //!< Enumerator identifying the type of the structure.  Values are the same as SMSHOSTLIB_DEVICE_MODES_E
-                                                                       //!< This fiels MUST always first in any statistics structure
-
-       UINT32 FullSize;                                //!< Total size of the structure returned by the modem.  If the size requested by
-                                                                       //!< the host is smaller than FullSize, the struct will be truncated
-
-       // Common parameters
-       UINT32 IsRfLocked;                              //!< 0 - not locked, 1 - locked
-       UINT32 IsDemodLocked;                   //!< 0 - not locked, 1 - locked
-       UINT32 IsExternalLNAOn;                 //!< 0 - external LNA off, 1 - external LNA on
-
-       // Reception quality
-       INT32  SNR;                                             //!< dB
-       INT32  RSSI;                                    //!< dBm
-       INT32  InBandPwr;                               //!< In band power in dBM
-       INT32  CarrierOffset;                   //!< Carrier Offset in Hz
-
-       // Transmission parameters
-       UINT32 Frequency;                               //!< Frequency in Hz
-       UINT32 Bandwidth;                               //!< Bandwidth in MHz
-       UINT32 TransmissionMode;                //!< ISDB-T transmission mode
-       UINT32 ModemState;                              //!< 0 - Acquisition, 1 - Locked
-       UINT32 GuardInterval;                   //!< Guard Interval, 1 divided by value
-       UINT32 SystemType;                              //!< ISDB-T system type (ISDB-T / ISDB-Tsb)
-       UINT32 PartialReception;                //!< TRUE - partial reception, FALSE otherwise
-       UINT32 NumOfLayers;                             //!< Number of ISDB-T layers in the network
-
-       // Per-layer information
-       // Layers A, B and C
-       SMSHOSTLIB_ISDBT_LAYER_STAT_ST  LayerInfo[3];   //!< Per-layer statistics, see SMSHOSTLIB_ISDBT_LAYER_STAT_ST
-
-       // Interface information
-       UINT32 SmsToHostTxErrors;               //!< Total number of transmission errors.
-
-} SMSHOSTLIB_STATISTICS_ISDBT_ST;
-
-typedef struct SMSHOSTLIB_STATISTICS_DVB_S
-{
-       UINT32 StatisticsType;                  //!< Enumerator identifying the type of the structure.  Values are the same as SMSHOSTLIB_DEVICE_MODES_E
-                                                               //!< This fiels MUST always first in any statistics structure
-
-       UINT32 FullSize;                                //!< Total size of the structure returned by the modem.  If the size requested by
-                                                                       //!< the host is smaller than FullSize, the struct will be truncated
-       // Common parameters
-       UINT32 IsRfLocked;                              //!< 0 - not locked, 1 - locked
-       UINT32 IsDemodLocked;                   //!< 0 - not locked, 1 - locked
-       UINT32 IsExternalLNAOn;                 //!< 0 - external LNA off, 1 - external LNA on
-
-       // Reception quality
-       INT32  SNR;                                             //!< dB
-       UINT32 BER;                                             //!< Post Viterbi BER [1E-5]
-       UINT32 BERErrorCount;                   //!< Number of errornous SYNC bits.
-       UINT32 BERBitCount;                             //!< Total number of SYNC bits.
-       UINT32 TS_PER;                                  //!< Transport stream PER, 0xFFFFFFFF indicate N/A
-       UINT32 MFER;                                    //!< DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H
-       INT32  RSSI;                                    //!< dBm
-       INT32  InBandPwr;                               //!< In band power in dBM
-       INT32  CarrierOffset;                   //!< Carrier Offset in bin/1024
-
-       // Transmission parameters
-       UINT32 Frequency;                               //!< Frequency in Hz
-       UINT32 Bandwidth;                               //!< Bandwidth in MHz
-       UINT32 ModemState;                              //!< from SMSHOSTLIB_DVB_MODEM_STATE_ET
-       UINT32 TransmissionMode;                //!< FFT mode carriers in Kilos
-       UINT32 GuardInterval;                   //!< Guard Interval, 1 divided by value
-       UINT32 CodeRate;                                //!< Code Rate from SMSHOSTLIB_CODE_RATE_ET
-       UINT32 LPCodeRate;                              //!< Low Priority Code Rate from SMSHOSTLIB_CODE_RATE_ET
-       UINT32 Hierarchy;                               //!< Hierarchy from SMSHOSTLIB_HIERARCHY_ET
-       UINT32 Constellation;                   //!< Constellation from SMSHOSTLIB_CONSTELLATION_ET
-
-       // Burst parameters, valid only for DVB-H
-       UINT32 BurstSize;                               //!< Current burst size in bytes, valid only for DVB-H
-       UINT32 BurstDuration;                   //!< Current burst duration in mSec, valid only for DVB-H
-       UINT32 BurstCycleTime;                  //!< Current burst cycle time in mSec, valid only for DVB-H
-       UINT32 CalculatedBurstCycleTime;//!< Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H
-       UINT32 NumOfRows;                               //!< Number of rows in MPE table, valid only for DVB-H
-       UINT32 NumOfPaddCols;                   //!< Number of padding columns in MPE table, valid only for DVB-H
-       UINT32 NumOfPunctCols;                  //!< Number of puncturing columns in MPE table, valid only for DVB-H
-       UINT32 ErrorTSPackets;                  //!< Number of erroneous transport-stream packets
-       UINT32 TotalTSPackets;                  //!< Total number of transport-stream packets
-       UINT32 NumOfValidMpeTlbs;               //!< Number of MPE tables which do not include errors after MPE RS decoding, valid only for DVB-H
-       UINT32 NumOfInvalidMpeTlbs;             //!< Number of MPE tables which include errors after MPE RS decoding, valid only for DVB-H
-       UINT32 NumOfCorrectedMpeTlbs;   //!< Number of MPE tables which were corrected by MPE RS decoding, valid only for DVB-H
-       UINT32 NumMPEReceived;                  //!< DVB-H, Num MPE section received
-
-       // DVB-H TPS parameters
-       UINT32 CellId;                                  //!< TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered
-       UINT32 DvbhSrvIndHP;                    //!< DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator
-       UINT32 DvbhSrvIndLP;                    //!< DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator
-
-       // Interface information
-       UINT32 SmsToHostTxErrors;               //!< Total number of transmission errors.
-
-} SMSHOSTLIB_STATISTICS_DVB_ST;
-
-typedef struct SMSHOSTLIB_GPIO_CONFIG_S
-{
-       UINT8   Direction;                              //!< GPIO direction: Input - 0, Output - 1
-       UINT8   PullUpDown;                             //!< PullUp/PullDown: None - 0, PullDown - 1, PullUp - 2, Keeper - 3
-       UINT8   InputCharacteristics;   //!< Input Characteristics: Normal - 0, Schmitt trigger - 1
-       UINT8   OutputSlewRate;                 //!< Output Slew Rate:  Fast slew rate - 0, Slow slew rate - 1
-       UINT8   OutputDriving;                  //!< Output driving capability: 4mA - 0, 8mA - 1, 12mA - 2, 16mA - 3
-} SMSHOSTLIB_GPIO_CONFIG_ST;
-
-typedef struct SMSHOSTLIB_I2C_REQ_S
-{
-       UINT32  DeviceAddress;                  // I2c device address
-       UINT32  WriteCount;                             // number of bytes to write
-       UINT32  ReadCount;                              // number of bytes to read
-       UINT8   Data[1];
-} SMSHOSTLIB_I2C_REQ_ST;
-
-typedef struct SMSHOSTLIB_I2C_RES_S
-{
-       UINT32  Status;                                 // non-zero value in case of failure
-       UINT32  ReadCount;                              // number of bytes read
-       UINT8   Data[1];
-} SMSHOSTLIB_I2C_RES_ST;
-
-typedef struct _smsdvb_client
-{
+};
+
+struct SmsMsgHdr_ST {
+       u16     msgType;
+       u8      msgSrcId;
+       u8      msgDstId;
+       u16     msgLength; /* Length of entire message, including header */
+       u16     msgFlags;
+};
+
+struct SmsMsgData_ST {
+       struct SmsMsgHdr_ST     xMsgHeader;
+       u32                     msgData[1];
+};
+
+struct SmsDataDownload_ST {
+       struct SmsMsgHdr_ST     xMsgHeader;
+       u32                     MemAddr;
+       u8                      Payload[SMS_MAX_PAYLOAD_SIZE];
+};
+
+struct SmsVersionRes_ST {
+       struct SmsMsgHdr_ST     xMsgHeader;
+
+       u16             ChipModel; /* e.g. 0x1102 for SMS-1102 "Nova" */
+       u8              Step; /* 0 - Step A */
+       u8              MetalFix; /* 0 - Metal 0 */
+
+       u8              FirmwareId; /* 0xFF � ROM, otherwise the
+                                    * value indicated by
+                                    * SMSHOSTLIB_DEVICE_MODES_E */
+       u8              SupportedProtocols; /* Bitwise OR combination of
+                                            * supported protocols */
+
+       u8              VersionMajor;
+       u8              VersionMinor;
+       u8              VersionPatch;
+       u8              VersionFieldPatch;
+
+       u8              RomVersionMajor;
+       u8              RomVersionMinor;
+       u8              RomVersionPatch;
+       u8              RomVersionFieldPatch;
+
+       u8              TextLabel[34];
+};
+
+struct SmsFirmware_ST {
+       u32                     CheckSum;
+       u32                     Length;
+       u32                     StartAddress;
+       u8                      Payload[1];
+};
+
+struct SMSHOSTLIB_STATISTICS_ST {
+       u32 Reserved; /* Reserved */
+
+       /* Common parameters */
+       u32 IsRfLocked; /* 0 - not locked, 1 - locked */
+       u32 IsDemodLocked; /* 0 - not locked, 1 - locked */
+       u32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
+
+       /* Reception quality */
+       s32  SNR; /* dB */
+       u32 BER; /* Post Viterbi BER [1E-5] */
+       u32 FIB_CRC;    /* CRC errors percentage, valid only for DAB */
+       u32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A,
+                    * valid only for DVB-T/H */
+       u32 MFER; /* DVB-H frame error rate in percentage,
+                  * 0xFFFFFFFF indicate N/A, valid only for DVB-H */
+       s32  RSSI; /* dBm */
+       s32  InBandPwr; /* In band power in dBM */
+       s32  CarrierOffset; /* Carrier Offset in bin/1024 */
+
+       /* Transmission parameters, valid only for DVB-T/H */
+       u32 Frequency; /* Frequency in Hz */
+       u32 Bandwidth; /* Bandwidth in MHz */
+       u32 TransmissionMode; /* Transmission Mode, for DAB modes 1-4,
+                              * for DVB-T/H FFT mode carriers in Kilos */
+       u32 ModemState; /* from SMS_DvbModemState_ET */
+       u32 GuardInterval; /* Guard Interval, 1 divided by value */
+       u32 CodeRate; /* Code Rate from SMS_DvbModemState_ET */
+       u32 LPCodeRate; /* Low Priority Code Rate from SMS_DvbModemState_ET */
+       u32 Hierarchy; /* Hierarchy from SMS_Hierarchy_ET */
+       u32 Constellation; /* Constellation from SMS_Constellation_ET */
+
+       /* Burst parameters, valid only for DVB-H */
+       u32 BurstSize; /* Current burst size in bytes */
+       u32 BurstDuration; /* Current burst duration in mSec */
+       u32 BurstCycleTime; /* Current burst cycle time in mSec */
+       u32 CalculatedBurstCycleTime; /* Current burst cycle time in mSec,
+                                      * as calculated by demodulator */
+       u32 NumOfRows; /* Number of rows in MPE table */
+       u32 NumOfPaddCols; /* Number of padding columns in MPE table */
+       u32 NumOfPunctCols; /* Number of puncturing columns in MPE table */
+       /* Burst parameters */
+       u32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
+       u32 TotalTSPackets; /* Total number of transport-stream packets */
+       u32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include
+                               * errors after MPE RS decoding */
+       u32 NumOfInvalidMpeTlbs; /* Number of MPE tables which include errors
+                                 * after MPE RS decoding */
+       u32 NumOfCorrectedMpeTlbs; /* Number of MPE tables which were corrected
+                                   * by MPE RS decoding */
+
+       /* Common params */
+       u32 BERErrorCount; /* Number of errornous SYNC bits. */
+       u32 BERBitCount; /* Total number of SYNC bits. */
+
+       /* Interface information */
+       u32 SmsToHostTxErrors; /* Total number of transmission errors. */
+
+       /* DAB/T-DMB */
+       u32 PreBER; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */
+
+       /* DVB-H TPS parameters */
+       u32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero;
+                    * if set to 0xFFFFFFFF cell_id not yet recovered */
+
+};
+
+struct SmsMsgStatisticsInfo_ST {
+       u32 RequestResult;
+
+       struct SMSHOSTLIB_STATISTICS_ST Stat;
+
+       /* Split the calc of the SNR in DAB */
+       u32 Signal; /* dB */
+       u32 Noise; /* dB */
+
+};
+
+
+struct smsdvb_client_t {
        struct list_head entry;
 
-       smscore_device_t        *coredev;
-       smscore_client_t        *smsclient;
+       struct smscore_device_t *coredev;
+       struct smscore_client_t *smsclient;
 
        struct dvb_adapter      adapter;
        struct dvb_demux        demux;
        struct dmxdev           dmxdev;
        struct dvb_frontend     frontend;
 
-       fe_status_t                     fe_status;
-       int                                     fe_ber, fe_snr, fe_signal_strength;
+       fe_status_t             fe_status;
+       int                     fe_ber, fe_snr, fe_signal_strength;
 
        struct completion       tune_done, stat_done;
 
-       // todo: save freq/band instead whole struct
+       /* todo: save freq/band instead whole struct */
        struct dvb_frontend_parameters fe_params;
 
-} smsdvb_client_t;
+};
 
 extern void smscore_registry_setmode(char *devpath, int mode);
 extern int smscore_registry_getmode(char *devpath);
@@ -508,32 +368,36 @@ extern int smscore_registry_getmode(char *devpath);
 extern int smscore_register_hotplug(hotplug_t hotplug);
 extern void smscore_unregister_hotplug(hotplug_t hotplug);
 
-extern int smscore_register_device(smsdevice_params_t *params, smscore_device_t **coredev);
-extern void smscore_unregister_device(smscore_device_t *coredev);
+extern int smscore_register_device(struct smsdevice_params_t *params,
+                                  struct smscore_device_t **coredev);
+extern void smscore_unregister_device(struct smscore_device_t *coredev);
 
-extern int smscore_start_device(smscore_device_t *coredev);
-extern int smscore_load_firmware(smscore_device_t *coredev, char *filename,
-                                 loadfirmware_t loadfirmware_handler);
+extern int smscore_start_device(struct smscore_device_t *coredev);
+extern int smscore_load_firmware(struct smscore_device_t *coredev,
+                                char *filename,
+                                loadfirmware_t loadfirmware_handler);
 
-extern int smscore_load_firmware_from_buffer(smscore_device_t *coredev, u8 *buffer, int size, int new_mode);
+extern int smscore_set_device_mode(struct smscore_device_t *coredev, int mode);
+extern int smscore_get_device_mode(struct smscore_device_t *coredev);
 
-extern int smscore_set_device_mode(smscore_device_t *coredev, int mode);
-extern int smscore_get_device_mode(smscore_device_t *coredev);
+extern int smscore_register_client(struct smscore_device_t *coredev,
+                                   struct smsclient_params_t *params,
+                                   struct smscore_client_t **client);
+extern void smscore_unregister_client(struct smscore_client_t *client);
 
-extern int smscore_register_client(smscore_device_t *coredev,
-                                   smsclient_params_t *params,
-                                   smscore_client_t **client);
-extern void smscore_unregister_client(smscore_client_t *client);
+extern int smsclient_sendrequest(struct smscore_client_t *client,
+                                void *buffer, size_t size);
+extern void smscore_onresponse(struct smscore_device_t *coredev,
+                              struct smscore_buffer_t *cb);
 
-extern int smsclient_sendrequest(smscore_client_t *client, void *buffer, size_t size);
-extern void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb);
 
-extern int smscore_get_common_buffer_size(smscore_device_t *coredev);
-extern int smscore_map_common_buffer(smscore_device_t *coredev,
-                                     struct vm_area_struct *vma);
+extern
+struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
+extern void smscore_putbuffer(struct smscore_device_t *coredev,
+                             struct smscore_buffer_t *cb);
 
-extern smscore_buffer_t *smscore_getbuffer(smscore_device_t *coredev);
-extern void smscore_putbuffer(smscore_device_t *coredev, smscore_buffer_t *cb);
+void smscore_set_board_id(struct smscore_device_t *core, int id);
+int smscore_get_board_id(struct smscore_device_t *core);
 
 /* smsdvb.c */
 int smsdvb_register(void);
@@ -543,4 +407,28 @@ void smsdvb_unregister(void);
 int smsusb_register(void);
 void smsusb_unregister(void);
 
-#endif // __smscoreapi_h__
+/* ------------------------------------------------------------------------ */
+
+extern int sms_debug;
+
+#define DBG_INFO 1
+#define DBG_ADV  2
+
+#define sms_printk(kern, fmt, arg...) \
+       printk(kern "%s: " fmt "\n", __func__, ##arg)
+
+#define dprintk(kern, lvl, fmt, arg...) do {\
+       if (sms_debug & lvl) \
+               sms_printk(kern, fmt, ##arg); } while (0)
+
+#define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg)
+#define sms_err(fmt, arg...) \
+       sms_printk(KERN_ERR, "line: %d: " fmt, __LINE__, ##arg)
+#define sms_warn(fmt, arg...)  sms_printk(KERN_WARNING, fmt, ##arg)
+#define sms_info(fmt, arg...) \
+       dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
+#define sms_debug(fmt, arg...) \
+       dprintk(KERN_DEBUG, DBG_ADV, fmt, ##arg)
+
+
+#endif /* __smscoreapi_h__ */