Various updates regarding better vala integration

Signed-off-by: Simon Busch <morphis@gravedo.de>

1 files changed, 16 insertions, 476 deletions

diff --git a/vapi/samsung-ipc-1.0.vapi b/vapi/samsung-ipc-1.0.vapi
index b79f035..aee665c 100644
--- a/vapi/samsung-ipc-1.0.vapi
+++ b/vapi/samsung-ipc-1.0.vapi
@@ -40,33 +40,7 @@ namespace SamsungIpc
         EVENT,
     }
 
-    public string request_type_to_string( int type )
-    {
-        string result = "unknown";
-
-        switch ( (RequestType) type )
-        {
-            case RequestType.EXEC:
-                result = "EXEC";
-                break;
-            case RequestType.GET:
-                result = "GET";
-                break;
-            case RequestType.SET:
-                result = "SET";
-                break;
-            case RequestType.CFRM:
-                result = "CFRM";
-                break;
-            case RequestType.EVENT:
-                result = "EVENT";
-                break;
-        }
-
-        return result;
-    }
-
-    [CCode (cname = "int", cprefix = "IPC_TYPE_", has_type_id = false)]
+    [CCode (cname = "unsigned char", cprefix = "IPC_TYPE_", has_type_id = false)]
     public enum ResponseType
     {
         INDICATION,
@@ -74,26 +48,6 @@ namespace SamsungIpc
         NOTIFICATION,
     }
 
-    public string response_type_to_string( ResponseType type )
-    {
-        string result = "unknown";
-
-        switch ( type )
-        {
-            case ResponseType.INDICATION:
-                result = "INDICATION";
-                break;
-            case ResponseType.RESPONSE:
-                result = "RESPONSE";
-                break;
-            case ResponseType.NOTIFICATION:
-                result = "NOTIFICATION";
-                break;
-        }
-
-        return result;
-    }
-
     [CCode (cname = "int", cprefix = "IPC_GROUP_", has_type_id = false)]
     public enum MessageGroup
     {
@@ -117,71 +71,6 @@ namespace SamsungIpc
         GEN,
     }
 
-    public string message_group_to_string( int group )
-    {
-        string result = "unknown";
-
-        switch ( (MessageGroup) group )
-        {
-            case MessageGroup.PWR:
-                result = "PWR";
-                break;
-            case MessageGroup.CALL:
-                result = "CALL";
-                break;
-            case MessageGroup.SMS:
-                result = "SMS";
-                break;
-            case MessageGroup.SEC:
-                result = "SEC";
-                break;
-            case MessageGroup.PB:
-                result = "PB";
-                break;
-            case MessageGroup.DISP:
-                result = "DISP";
-                break;
-            case MessageGroup.NET:
-                result = "NET";
-                break;
-            case MessageGroup.SND:
-                result = "SND";
-                break;
-            case MessageGroup.MISC:
-                result = "MISC";
-                break;
-            case MessageGroup.SVC:
-                result = "SVC";
-                break;
-            case MessageGroup.SS:
-                result = "SS";
-                break;
-            case MessageGroup.GPRS:
-                result = "GPRS";
-                break;
-            case MessageGroup.SAT:
-                result = "SAT";
-                break;
-            case MessageGroup.CFG:
-                result = "CFG";
-                break;
-            case MessageGroup.IMEI:
-                result = "IMEI";
-                break;
-            case MessageGroup.GPS:
-                result = "GPS";
-                break;
-            case MessageGroup.SAP:
-                result = "SAP";
-                break;
-            case MessageGroup.GEN:
-                result = "GEN";
-                break;
-        }
-
-        return result;
-    }
-
     [CCode (cname = "int", cprefix = "IPC_PWR_", has_type_id = false)]
     public enum GenericMessageType
     {
@@ -197,7 +86,7 @@ namespace SamsungIpc
         public uint16 code;
     }
 
-    [CCode (cname = "int", cprefix = "IPC_", has_type_id = false)]
+    [CCode (cname = "unsigned short", cprefix = "IPC_", has_type_id = false)]
     public enum MessageType
     {
         PWR_PHONE_PWR_OFF,
@@ -309,338 +198,6 @@ namespace SamsungIpc
         SMS_PARAM,
     }
 
-    public string message_type_to_string( MessageType type )
-    {
-        string result = "unknown";
-
-        switch ( type )
-        {
-            case MessageType.PWR_PHONE_PWR_OFF:
-                result = "PWR_PHONE_PWR_OFF";
-                break;
-            case MessageType.PWR_PHONE_PWR_UP:
-                result = "PWR_PHONE_PWR_UP";
-                break;
-            case MessageType.PWR_PHONE_RESET:
-                result = "PWR_PHONE_RESET";
-                break;
-            case MessageType.PWR_BATT_STATUS:
-                result = "PWR_BATT_STATUS";
-                break;
-            case MessageType.PWR_BATT_TYPE:
-                result = "PWR_BATT_TYPE";
-                break;
-            case MessageType.PWR_BATT_COMP:
-                result = "PWR_BATT_COMP";
-                break;
-            case MessageType.PWR_PHONE_STATE:
-                result = "PWR_PHONE_STATE";
-                break;
-            case MessageType.PB_ACCESS:
-                result = "PB_ACCESS";
-                break;
-            case MessageType.PB_STORAGE:
-                result = "PB_STORAGE";
-                break;
-            case MessageType.PB_STORAGE_LIST:
-                result = "PB_STORAGE_LIST";
-                break;
-            case MessageType.PB_ENTRY_INFO:
-                result = "PB_ENTRY_INFO";
-                break;
-            case MessageType.PB_CAPABILITY_INFO:
-                result = "PB_CAPABILITY_INFO";
-                break;
-            case MessageType.SS_WAITING:
-                result = "SS_WAITING";
-                break;
-            case MessageType.SS_CLI:
-                result = "SS_CLI";
-                break;
-            case MessageType.SS_BARRING:
-                result = "SS_BARRING";
-                break;
-            case MessageType.SS_BARRING_PW:
-                result = "SS_BARRING_PW";
-                break;
-            case MessageType.SS_FORWARDING:
-                result = "SS_FORWARDING";
-                break;
-            case MessageType.SS_INFO:
-                result = "SS_INFO";
-                break;
-            case MessageType.SS_MANAGE_CALL:
-                result = "SS_MANAGE_CALL";
-                break;
-            case MessageType.SS_USSD:
-                result = "SS_USSD";
-                break;
-            case MessageType.SS_AOC:
-                result = "SS_AOC";
-                break;
-            case MessageType.SS_RELEASE_COMPLETE:
-                result = "SS_RELEASE_COMPLETE";
-                break;
-            case MessageType.GPRS_DEFINE_PDP_CONTEXT:
-                result = "GPRS_DEFINE_PDP_CONTEXT";
-                break;
-            case MessageType.GPRS_QOS:
-                result = "GPRS_QOS";
-                break;
-            case MessageType.GPRS_PS:
-                result = "GPRS_PS";
-                break;
-            case MessageType.GPRS_PDP_CONTEXT:
-                result = "GPRS_PDP_CONTEXT";
-                break;
-            case MessageType.GPRS_SHOW_PDP_ADDR:
-                result = "GPRS_SHOW_PDP_ADDR";
-                break;
-            case MessageType.GPRS_3G_QUAL_SERVICE_PROFILE:
-                result = "GPRS_3G_QUAL_SERVICE_PROFILE";
-                break;
-            case MessageType.GPRS_IP_CONFIGURATION:
-                result = "GPRS_IP_CONFIGURATION";
-                break;
-            case MessageType.GPRS_DEFINE_SEC_PDP_CONTEXT:
-                result = "GPRS_DEFINE_SEC_PDP_CONTEXT";
-                break;
-            case MessageType.GPRS_TFT:
-                result = "GPRS_TFT";
-                break;
-            case MessageType.GPRS_HSDPA_STATUS:
-                result = "GPRS_HSDPA_STATUS";
-                break;
-            case MessageType.GPRS_CURRENT_SESSION_DATA_COUNT:
-                result = "GPRS_CURRENT_SESSION_DATA_COUNT";
-                break;
-            case MessageType.GPRS_DATA_DORMANT:
-                result = "GPRRS_DATA_DORMANT";
-                break;
-            case MessageType.GPRS_DUN_PIN_CTRL:
-                result = "GPRS_DUN_PIN_CTRL";
-                break;
-            case MessageType.GPRS_CALL_STATUS:
-                result = "GPRS_CALL_STATUS";
-                break;
-            case MessageType.SAT_PROFILE_DOWNLOAD:
-                result = "SAT_PROFILE_DOWNLOAD";
-                break;
-            case MessageType.SAT_ENVELOPE_CMD:
-                result = "SAT_ENVELOPE_CMD";
-                break;
-            case MessageType.SAT_PROACTIVE_CMD:
-                result = "SAT_PROACTIVE_CMD";
-                break;
-            case MessageType.SAT_TERMINATE_USAT_SESSION:
-                result = "SAT_TERMINATE_USAT_SESSION";
-                break;
-            case MessageType.SAT_EVENT_DOWNLOAD:
-                result = "SAT_EVENT_DOWNLOAD";
-                break;
-            case MessageType.SAT_PROVIDE_LOCAL_INFO:
-                result = "SAT_PROVIDE_LOCAL_INFO";
-                break;
-            case MessageType.SAT_POLLING:
-                result = "SAT_POLLING";
-                break;
-            case MessageType.SAT_REFRESH:
-                result = "SAT_REFRESH";
-                break;
-            case MessageType.SAT_SETUP_EVENT_LIST:
-                result = "SAT_SETUP_EVENT_LIST";
-                break;
-            case MessageType.SAT_CALL_CONTROL_RESULT:
-                result = "SAT_CALL_CONTROL_RESULT";
-                break;
-            case MessageType.SAT_IMAGE_CLUT:
-                result = "SAT_IMAGE_CLUT";
-                break;
-            case MessageType.SAT_CALL_PROCESSING:
-                result = "SAT_CALL_PROCESSING";
-                break;
-            case MessageType.IMEI_START:
-                result = "IMEI_START";
-                break;
-            case MessageType.IMEI_CHECK_DEVICE_INFO:
-                result = "IMEI_CHECK_DEVICE_INFO";
-                break;
-            case MessageType.CALL_OUTGOING:
-                result = "CALL_OUTGOING";
-                break;
-            case MessageType.CALL_INCOMING:
-                result = "CALL_INCOMING";
-                break;
-            case MessageType.CALL_RELEASE:
-                result = "CALL_RELEASE";
-                break;
-            case MessageType.CALL_ANSWER:
-                result = "CALL_ANSWER";
-                break;
-            case MessageType.CALL_STATUS:
-                result = "CALL_STATUS";
-                break;
-            case MessageType.CALL_LIST:
-                result = "CALL_LIST";
-                break;
-            case MessageType.CALL_BURST_DTMF:
-                result = "CALL_BURST_DTMF";
-                break;
-            case MessageType.CALL_CONT_DTMF:
-                result = "CALL_CONT_DTMF";
-                break;
-            case MessageType.CALL_WAITING:
-                result = "CALL_WAITING";
-                break;
-            case MessageType.CALL_LINE_ID:
-                result = "CALL_LINE_ID";
-                break;
-            case MessageType.DISP_ICON_INFO:
-                result = "DISP_ICON_INFO";
-                break;
-            case MessageType.DISP_HOMEZONE_INFO:
-                result = "DISP_HOMEZONE_INFO";
-                break;
-            case MessageType.DISP_RSSI_INFO:
-                result = "DISP_RSSI_INFO";
-                break;
-            case MessageType.SEC_PIN_STATUS:
-                result = "SEC_PIN_STATUS";
-                break;
-            case MessageType.SEC_PHONE_LOCK:
-                result = "SEC_PHONE_LOCK";
-                break;
-            case MessageType.SEC_CHANGE_LOCKING_PW:
-                result = "SEC_CHANGE_LOCKING_PW";
-                break;
-            case MessageType.SEC_SIM_LANG:
-                result = "SEC_SIM_LANG";
-                break;
-            case MessageType.SEC_RSIM_ACCESS:
-                result = "SEC_RSIM_ACCESS";
-                break;
-            case MessageType.SEC_GSIM_ACCESS:
-                result = "SEC_GSIM_ACCESS";
-                break;
-            case MessageType.SEC_SIM_ICC_TYPE:
-                result = "SEC_SIM_ICC_TYPE";
-                break;
-            case MessageType.SEC_LOCK_INFO:
-                result = "SEC_LOCK_INFO";
-                break;
-            case MessageType.SEC_ISIM_AUTH:
-                result = "SEC_ISIM_AUTH";
-                break;
-            case MessageType.NET_PREF_PLMN:
-                result = "NET_PREF_PLMN";
-                break;
-            case MessageType.NET_PLMN_SEL:
-                result = "NET_PLMN_SEL";
-                break;
-            case MessageType.NET_CURRENT_PLMN:
-                result = "NET_CURRENT_PLMN";
-                break;
-            case MessageType.NET_PLMN_LIST:
-                result = "NET_PLMN_LIST";
-                break;
-            case MessageType.NET_REGIST:
-                result = "NET_REGIST";
-                break;
-            case MessageType.NET_SUBSCRIBER_NUM:
-                result = "NET_SUBSCRIBER_NUM";
-                break;
-            case MessageType.NET_BAND_SEL:
-                result = "NET_BAND_SEL";
-                break;
-            case MessageType.NET_SERVICE_DOMAIN_CONFIG:
-                result = "NET_SERVICE_DOMAIN_CONFIG";
-                break;
-            case MessageType.NET_POWERON_ATTACH:
-                result = "NET_POWERON_ATTACH";
-                break;
-            case MessageType.NET_MODE_SEL:
-                result = "NET_MODE_SEL";
-                break;
-            case MessageType.NET_ACQ_ORDER:
-                result = "NET_ACQ_ORDER";
-                break;
-            case MessageType.NET_IDENTITY:
-                result = "NET_IDENTITY";
-                break;
-            case MessageType.NET_CURRENT_RRC_STATUS:
-                result = "NET_CURRENT_RRC_STATUS";
-                break;
-            case MessageType.GEN_PHONE_RES:
-                result = "GEN_PHONE_RES";
-                break;
-            case MessageType.MISC_ME_VERSION:
-                result = "MISC_ME_VERSION";
-                break;
-            case MessageType.MISC_ME_IMSI:
-                result = "MISC_ME_IMSI";
-                break;
-            case MessageType.MISC_ME_SN:
-                result = "MISC_ME_SN";
-                break;
-            case MessageType.MISC_TIME_INFO:
-                result = "MISC_TIME_INFO";
-                break;
-            case MessageType.SMS_SEND_MSG:
-                result = "SMS_SEND_MSG";
-                break;
-            case MessageType.SMS_INCOMING_MSG:
-                result = "SMS_INCOMING_MSG";
-                break;
-            case MessageType.SMS_READ_MSG:
-                result = "SMS_READ_MSG";
-                break;
-            case MessageType.SMS_SAVE_MSG:
-                result = "SMS_SAVE_MSG";
-                break;
-            case MessageType.SMS_DEL_MSG:
-                result = "SMS_DEL_MSG";
-                break;
-            case MessageType.SMS_DELIVER_REPORT:
-                result = "SMS_DELIVER_REPORT";
-                break;
-            case MessageType.SMS_DEVICE_READY:
-                result = "SMS_DEVICE_READY";
-                break;
-            case MessageType.SMS_SEL_MEM:
-                result = "SMS_SEL_MEM";
-                break;
-            case MessageType.SMS_STORED_MSG_COUNT:
-                result = "SMS_STORED_MSG_COUNT";
-                break;
-            case MessageType.SMS_SVC_CENTER_ADDR:
-                result = "SMS_SVC_CENTER_ADDR";
-                break;
-            case MessageType.SMS_SVC_OPTION:
-                result = "SMS_SVC_OPTION";
-                break;
-            case MessageType.SMS_MEM_STATUS:
-                result = "SMS_MEM_STATUS";
-                break;
-            case MessageType.SMS_CBS_MSG:
-                result = "SMS_CBS_MSG";
-                break;
-            case MessageType.SMS_CBS_CONFIG:
-                result = "SMS_CBS_CONFIG";
-                break;
-            case MessageType.SMS_STORED_MSG_STATUS:
-                result = "SMS_STORED_MSG_STATUS";
-                break;
-            case MessageType.SMS_PARAM_COUNT:
-                result = "SMS_PARAM_COUNT";
-                break;
-            case MessageType.SMS_PARAM:
-                result = "SMS_PARAM";
-                break;
-        }
-
-        return result;
-    }
-
     /* ******************************************************************************** */
 
     namespace Power
@@ -653,7 +210,6 @@ namespace SamsungIpc
         }
     }
 
-
     /* ******************************************************************************** */
 
     namespace Security
@@ -793,9 +349,10 @@ namespace SamsungIpc
 
     namespace Network
     {
-        [CCode (cname = "gint8", cprefix = "IPC_NET_SERVICE_TYPE_", has_type_id = false)]
-        public enum ServiceType
+        [CCode (cname = "gint8", cprefix = "IPC_NET_ACCESS_TECHNOLOGY_", has_type_id = false)]
+        public enum AccessTechnology
         {
+            UNKNOWN,
             GSM,
             GSM2,
             GPRS,
@@ -803,14 +360,14 @@ namespace SamsungIpc
             UMTS,
         }
 
-        [CCode (cname = "gint8", cprefix = "IPC_NET_SERVICE_LEVEL_", has_type_id = false)]
-        public enum ServiceLevel
+        [CCode (cname = "gint8", cprefix = "IPC_NET_REGISTRATION_STATE_", has_type_id = false)]
+        public enum RegistrationState
         {
             NONE,
             HOME,
             SEARCHING,
             EMERGENCY,
-            NONE2,
+            UNKNOWN,
             ROAMING,
         }
 
@@ -833,8 +390,8 @@ namespace SamsungIpc
         public struct RegistrationMessage
         {
             public uint8 act;
-            public uint8 domain;
-            public uint8 status;
+            public uint8 reg_state;
+            public uint8 unk;
             public uint8 edge;
             public uint16 lac;
             public uint32 cid;
@@ -887,23 +444,6 @@ namespace SamsungIpc
             DATA,
         }
 
-        public string call_type_to_string( Type type )
-        {
-            string result = "unknown";
-
-            switch ( type )
-            {
-                case Type.VOICE:
-                    result = "VOICE";
-                    break;
-                case Type.DATA:
-                    result = "DATA";
-                    break;
-            }
-
-            return result;
-        }
-
         [CCode (cname = "gint8", cprefix = "IPC_CALL_IDENTITY_", has_type_id = false)]
         public enum Identity
         {
@@ -1045,7 +585,7 @@ namespace SamsungIpc
         public uint8 aseq;
         public uint8 group;
         public uint8 index;
-        public uint8 type;
+        public RequestType type;
         public uint32 length;
         public uint8[] data;
     }
@@ -1055,8 +595,8 @@ namespace SamsungIpc
     {
         public uint8 mseq;
         public uint8 aseq;
-        public uint16 command;
-        public uint8 type;
+        public MessageType command;
+        public ResponseType type;
         public uint32 data_length;
         [CCode (array_length_cname = "data_length")]
         public uint8[] data;
@@ -1077,8 +617,8 @@ namespace SamsungIpc
         public void open();
         public void close();
         public int recv(out Response response);
-        public void send(int command, int type, uint8[] data, uint8 mseq);
-        public void send_get(int command, uint8 aseq);
-        public void send_exec(int command, uint8 aseq);
+        public void send(MessageType command, RequestType type, uint8[] data, uint8 mseq);
+        public void send_get(MessageType command, uint8 aseq);
+        public void send_exec(MessageType command, uint8 aseq);
     }
 }