Moved radio.h and types.h to samsung-ipc.h (API) and protocol.h (IPC protocol).

Also some minor headers cosmetics.

Change-Id: Id2b988b118d956e91827b9b840e3f384424593ae
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

29 files changed, 354 insertions, 254 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 62dbbc8..1ffde56 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,20 +2,22 @@ NULL =
 
 samsung_ipcincludedir = $(includedir)/samsung-ipc-1.0/
 samsung_ipcinclude_HEADERS = \
+	samsung-ipc.h \
+	protocol.h \
+	pwr.h \
 	call.h \
+	sms.h \
+	sec.h \
+	pb.h \
 	disp.h \
-	gen.h \
-	misc.h \
 	net.h \
-	radio.h \
-	sec.h \
-	sms.h \
+	snd.h \
+	misc.h \
 	ss.h \
-	pwr.h \
-	types.h \
 	gprs.h \
-	snd.h \
+	sat.h \
+	imei.h \
 	rfs.h \
+	gen.h \
 	wakelock.h \
-	samsung-ipc.h \
 	$(NULL)
diff --git a/include/imei.h b/include/imei.h
new file mode 100644
index 0000000..18410ab
--- /dev/null
+++ b/include/imei.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of libsamsung-ipc.
+ *
+ * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
+ *
+ * libsamsung-ipc is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libsamsung-ipc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <samsung-ipc.h>
+
+#ifndef __SAMSUNG_IPC_IMEI_H__
+#define __SAMSUNG_IPC_IMEI_H__
+
+/*
+ * Types
+ */
+
+#define IPC_IMEI_START                                          0x1001
+#define IPC_IMEI_CHECK_DEVICE_INFO                              0x1002
+
+#endif
+
+// vim:ts=4:sw=4:expandtab
diff --git a/include/pb.h b/include/pb.h
new file mode 100644
index 0000000..88d9432
--- /dev/null
+++ b/include/pb.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of libsamsung-ipc.
+ *
+ * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
+ *
+ * libsamsung-ipc is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libsamsung-ipc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <samsung-ipc.h>
+
+#ifndef __SAMSUNG_IPC_PB_H__
+#define __SAMSUNG_IPC_PB_H__
+
+/*
+ * Types
+ */
+
+#define IPC_PB_ACCESS                               	        0x0601
+#define IPC_PB_STORAGE                                          0x0602
+#define IPC_PB_STORAGE_LIST                                     0x0603
+#define IPC_PB_ENTRY_INFO                                       0x0604
+#define IPC_PB_CAPABILITY_INFO                                  0x0605
+
+#endif
+
+// vim:ts=4:sw=4:expandtab
diff --git a/include/protocol.h b/include/protocol.h
new file mode 100644
index 0000000..5a9c2cc
--- /dev/null
+++ b/include/protocol.h
@@ -0,0 +1,89 @@
+/*
+ * This file is part of libsamsung-ipc.
+ *
+ * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
+ *
+ * libsamsung-ipc is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libsamsung-ipc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <samsung-ipc.h>
+
+#ifndef __SAMSUNG_IPC_PROTOCOL_H__
+#define __SAMSUNG_IPC_PROTOCOL_H__
+
+/*
+ * Types
+ */
+
+/* AP -> Baseband */
+#define IPC_TYPE_EXEC                                           0x01
+#define IPC_TYPE_GET                                            0x02
+#define IPC_TYPE_SET                                            0x03
+#define IPC_TYPE_CFRM                                           0x04
+#define IPC_TYPE_EVENT                                          0x05
+
+/* Baseband -> AP */
+#define IPC_TYPE_INDI                                           0x01
+#define IPC_TYPE_RESP                                           0x02
+#define IPC_TYPE_NOTI                                           0x03
+
+/*
+ * Groups
+ */
+
+#define IPC_GROUP_PWR                                           0x01
+#define IPC_GROUP_CALL                                          0x02
+#define IPC_GROUP_SMS                                           0x04
+#define IPC_GROUP_SEC                                           0x05
+#define IPC_GROUP_PB                                            0x06
+#define IPC_GROUP_DISP                                          0x07
+#define IPC_GROUP_NET                                           0x08
+#define IPC_GROUP_SND                                           0x09
+#define IPC_GROUP_MISC                                          0x0A
+#define IPC_GROUP_SVC                                           0x0B
+#define IPC_GROUP_SS                                            0x0C
+#define IPC_GROUP_GPRS                                          0x0D
+#define IPC_GROUP_SAT                                           0x0E
+#define IPC_GROUP_CFG                                           0x0F
+#define IPC_GROUP_IMEI                                          0x10
+#define IPC_GROUP_GPS                                           0x11
+#define IPC_GROUP_SAP                                           0x12
+#define IPC_GROUP_RFS                                           0x42
+#define IPC_GROUP_GEN                                           0x80
+
+/*
+ * Macros
+ */
+
+#define IPC_COMMAND(f)                          ((f->group << 8) | f->index)
+#define IPC_GROUP(m)                            (m >> 8)
+#define IPC_INDEX(m)                            (m & 0xff)
+
+/*
+ * Structures
+ */
+
+struct ipc_header {
+    unsigned short length;
+    unsigned char mseq;
+    unsigned char aseq;
+    unsigned char group;
+    unsigned char index;
+    unsigned char type;
+} __attribute__((__packed__));
+
+#endif
+
+// vim:ts=4:sw=4:expandtab
diff --git a/include/pwr.h b/include/pwr.h
index 1256bfe..51901bf 100644
--- a/include/pwr.h
+++ b/include/pwr.h
@@ -48,7 +48,7 @@
  * Macros
  */
 
-#define IPC_PWR_R(f)    (f & 0xff)
+#define IPC_PWR_R(f)                            (f & 0xff)
 
 #endif
 
diff --git a/include/radio.h b/include/radio.h
deleted file mode 100644
index 7581aa9..0000000
--- a/include/radio.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * This file is part of libsamsung-ipc.
- *
- * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
- *
- * libsamsung-ipc is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * libsamsung-ipc is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __RADIO_H__
-#define __RADIO_H__
-
-#include <stdint.h>
-
-#define IPC_CLIENT_TYPE_FMT     0
-#define IPC_CLIENT_TYPE_RFS     1
-
-#define IPC_COMMAND(f)  ((f->group << 8) | f->index)
-#define IPC_GROUP(m)    (m >> 8)
-#define IPC_INDEX(m)    (m & 0xff)
-
-struct ipc_header {
-    unsigned short length;
-    unsigned char mseq, aseq;
-    unsigned char group, index, type;
-} __attribute__((__packed__));
-
-struct ipc_message_info {
-    unsigned char mseq;
-    unsigned char aseq;
-    unsigned char group;
-    unsigned char index;
-    unsigned short cmd;
-    unsigned char type;
-    unsigned int length;
-    unsigned char *data;
-};
-
-struct ipc_client;
-struct ipc_handlers;
-
-struct ipc_client_gprs_capabilities {
-    int port_list;
-    int cid_max;
-};
-
-#include "types.h"
-
-typedef void (*ipc_client_log_handler_cb)(const char *message, void *user_data);
-
-typedef int (*ipc_io_handler_cb)(void *data, unsigned int size, void *io_data);
-typedef int (*ipc_handler_cb)(void *io_data);
-
-struct ipc_client* ipc_client_new(int client_type);
-struct ipc_client *ipc_client_new_for_device(int device_type, int client_type);
-int ipc_client_free(struct ipc_client *client);
-
-int ipc_client_set_log_handler(struct ipc_client *client, ipc_client_log_handler_cb log_handler_cb, void *user_data);
-
-int ipc_client_set_handlers(struct ipc_client *client, struct ipc_handlers *handlers);
-int ipc_client_set_io_handlers(struct ipc_client *client,
-                               ipc_io_handler_cb read, void *read_data,
-                               ipc_io_handler_cb write, void *write_data);
-
-int ipc_client_set_handlers_common_data(struct ipc_client *client, void *data);
-void *ipc_client_get_handlers_common_data(struct ipc_client *client);
-int ipc_client_create_handlers_common_data(struct ipc_client *client);
-int ipc_client_destroy_handlers_common_data(struct ipc_client *client);
-int ipc_client_set_handlers_common_data_fd(struct ipc_client *client, int fd);
-int ipc_client_get_handlers_common_data_fd(struct ipc_client *client);
-
-int ipc_client_bootstrap_modem(struct ipc_client *client);
-int ipc_client_open(struct ipc_client *client);
-int ipc_client_close(struct ipc_client *client);
-int ipc_client_power_on(struct ipc_client *client);
-int ipc_client_power_off(struct ipc_client *client);
-int ipc_client_gprs_handlers_available(struct ipc_client *client);
-int ipc_client_gprs_activate(struct ipc_client *client, int cid);
-int ipc_client_gprs_deactivate(struct ipc_client *client, int cid);
-char *ipc_client_gprs_get_iface(struct ipc_client *client, int cid);
-int ipc_client_gprs_get_capabilities(struct ipc_client *client, struct ipc_client_gprs_capabilities *cap);
-
-int ipc_client_recv(struct ipc_client *client, struct ipc_message_info *response);
-void ipc_client_response_free(struct ipc_client *client, struct ipc_message_info *response);
-
-/* Convenience functions for ipc_send */
-void ipc_client_send(struct ipc_client *client, const unsigned short command, const char type, unsigned char *data,
-                     const int length, unsigned char mseq);
-void ipc_client_send_get(struct ipc_client *client, const unsigned short command, unsigned char mseq);
-void ipc_client_send_exec(struct ipc_client *client, const unsigned short command, unsigned char mseq);
-
-/* Utility functions */
-void ipc_client_log_recv(struct ipc_client *client,
-    struct ipc_message_info *response, const char *prefix);
-void ipc_client_log_send(struct ipc_client *client,
-    struct ipc_message_info *request, const char *prefix);
-const char *ipc_response_type_to_str(int type);
-const char *ipc_request_type_to_str(int type);
-const char *ipc_command_to_str(int command);
-
-void ipc_client_hex_dump(struct ipc_client *client, void *data, int size);
-void *ipc_client_mtd_read(struct ipc_client *client, char *mtd_name, int size, int block_size);
-void *ipc_client_file_read(struct ipc_client *client, char *file_name, int size, int block_size);
-
-#endif
-
-// vim:ts=4:sw=4:expandtab
diff --git a/include/rfs.h b/include/rfs.h
index 523fb23..7523ee1 100644
--- a/include/rfs.h
+++ b/include/rfs.h
@@ -34,16 +34,17 @@
  * Values
  */
 
-#define NV_DATA_PATH_DEFAULT                                    "/efs/nv_data.bin"
-#define NV_DATA_MD5_PATH_DEFAULT                                "/efs/nv_data.bin.md5"
-#define NV_DATA_BAK_PATH_DEFAULT                                "/efs/.nv_data.bak"
-#define NV_DATA_MD5_BAK_PATH_DEFAULT                            "/efs/.nv_data.bak.md5"
-#define NV_STATE_PATH_DEFAULT                                   "/efs/.nv_state"
-#define NV_DATA_SECRET_DEFAULT                                  "Samsung_Android_RIL"
 #define NV_DATA_SIZE_DEFAULT                                    0x200000
 #define NV_DATA_CHUNK_SIZE_DEFAULT                              0x1000
 
-#define MD5_STRING_SIZE                                         MD5_DIGEST_LENGTH * 2 + 1
+#define NV_DATA_PATH_DEFAULT                    "/efs/nv_data.bin"
+#define NV_DATA_MD5_PATH_DEFAULT                "/efs/nv_data.bin.md5"
+#define NV_DATA_BAK_PATH_DEFAULT                "/efs/.nv_data.bak"
+#define NV_DATA_MD5_BAK_PATH_DEFAULT            "/efs/.nv_data.bak.md5"
+#define NV_STATE_PATH_DEFAULT                   "/efs/.nv_state"
+#define NV_DATA_SECRET_DEFAULT                  "Samsung_Android_RIL"
+
+#define MD5_STRING_SIZE                         MD5_DIGEST_LENGTH * 2 + 1
 
 /*
  * Structures
@@ -64,7 +65,7 @@ struct ipc_rfs_io_confirm {
  * Helpers
  */
 
-void md5hash2string(char *out, uint8_t *in);
+void md5hash2string(char *out, unsigned char* in);
 char *nv_data_path(struct ipc_client *client);
 char *nv_data_md5_path(struct ipc_client *client);
 char *nv_data_bak_path(struct ipc_client *client);
diff --git a/include/samsung-ipc.h b/include/samsung-ipc.h
index 2a15317..3dd9e3c 100644
--- a/include/samsung-ipc.h
+++ b/include/samsung-ipc.h
@@ -2,6 +2,7 @@
  * This file is part of libsamsung-ipc.
  *
  * Copyright (C) 2012 Simon Busch <morphis@gravedo.de>
+ * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  *
  * libsamsung-ipc is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +22,111 @@
 #ifndef __SAMSUNG_IPC_H__
 #define __SAMSUNG_IPC_H__
 
-#include <radio.h>
+/*
+ * Values
+ */
+
+#define IPC_CLIENT_TYPE_FMT                                     0x00
+#define IPC_CLIENT_TYPE_RFS                                     0x01
+
+/*
+ * Structures
+ */
+
+struct ipc_client;
+struct ipc_handlers;
+
+struct ipc_message_info {
+    unsigned char mseq;
+    unsigned char aseq;
+    unsigned char group;
+    unsigned char index;
+    unsigned short cmd;
+    unsigned char type;
+    unsigned int length;
+    unsigned char *data;
+};
+
+struct ipc_client_gprs_capabilities {
+    int port_list;
+    int cid_max;
+};
+
+/*
+ * Helpers
+ */
+
+typedef void (*ipc_client_log_handler_cb)(const char *message, void *user_data);
+
+typedef int (*ipc_io_handler_cb)(void *data, unsigned int size, void *io_data);
+typedef int (*ipc_handler_cb)(void *io_data);
+
+struct ipc_client* ipc_client_new(int client_type);
+struct ipc_client *ipc_client_new_for_device(int device_type, int client_type);
+int ipc_client_free(struct ipc_client *client);
+
+int ipc_client_set_log_handler(struct ipc_client *client, ipc_client_log_handler_cb log_handler_cb, void *user_data);
+
+int ipc_client_set_handlers(struct ipc_client *client, struct ipc_handlers *handlers);
+int ipc_client_set_io_handlers(struct ipc_client *client, ipc_io_handler_cb read, void *read_data, ipc_io_handler_cb write, void *write_data);
+
+int ipc_client_set_handlers_common_data(struct ipc_client *client, void *data);
+void *ipc_client_get_handlers_common_data(struct ipc_client *client);
+int ipc_client_create_handlers_common_data(struct ipc_client *client);
+int ipc_client_destroy_handlers_common_data(struct ipc_client *client);
+int ipc_client_set_handlers_common_data_fd(struct ipc_client *client, int fd);
+int ipc_client_get_handlers_common_data_fd(struct ipc_client *client);
+
+int ipc_client_bootstrap_modem(struct ipc_client *client);
+int ipc_client_open(struct ipc_client *client);
+int ipc_client_close(struct ipc_client *client);
+int ipc_client_power_on(struct ipc_client *client);
+int ipc_client_power_off(struct ipc_client *client);
+int ipc_client_gprs_handlers_available(struct ipc_client *client);
+int ipc_client_gprs_activate(struct ipc_client *client, int cid);
+int ipc_client_gprs_deactivate(struct ipc_client *client, int cid);
+char *ipc_client_gprs_get_iface(struct ipc_client *client, int cid);
+int ipc_client_gprs_get_capabilities(struct ipc_client *client, struct ipc_client_gprs_capabilities *cap);
+
+int ipc_client_recv(struct ipc_client *client, struct ipc_message_info *response);
+void ipc_client_response_free(struct ipc_client *client, struct ipc_message_info *response);
+
+/* Convenience functions for ipc_send */
+void ipc_client_send(struct ipc_client *client, const unsigned short command, const char type, unsigned char *data, const int length, unsigned char mseq);
+void ipc_client_send_get(struct ipc_client *client, const unsigned short command, unsigned char mseq);
+void ipc_client_send_exec(struct ipc_client *client, const unsigned short command, unsigned char mseq);
+
+/* Utility functions */
+void ipc_client_log_recv(struct ipc_client *client, struct ipc_message_info *response, const char *prefix);
+void ipc_client_log_send(struct ipc_client *client, struct ipc_message_info *request, const char *prefix);
+const char *ipc_response_type_to_str(int type);
+const char *ipc_request_type_to_str(int type);
+const char *ipc_command_to_str(int command);
+
+void ipc_client_hex_dump(struct ipc_client *client, void *data, int size);
+void *ipc_client_mtd_read(struct ipc_client *client, char *mtd_name, int size, int block_size);
+void *ipc_client_file_read(struct ipc_client *client, char *file_name, int size, int block_size);
+
+/*
+ * Samsung-IPC protocol
+ */
+
+#include "protocol.h"
+#include "pwr.h"
+#include "call.h"
+#include "sms.h"
+#include "sec.h"
+#include "pb.h"
+#include "disp.h"
+#include "net.h"
+#include "snd.h"
+#include "misc.h"
+#include "ss.h"
+#include "gprs.h"
+#include "sat.h"
+#include "imei.h"
+#include "rfs.h"
+#include "gen.h"
 
 #endif
 
diff --git a/include/sat.h b/include/sat.h
new file mode 100644
index 0000000..8119f0c
--- /dev/null
+++ b/include/sat.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of libsamsung-ipc.
+ *
+ * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
+ *
+ * libsamsung-ipc is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libsamsung-ipc is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <samsung-ipc.h>
+
+#ifndef __SAMSUNG_IPC_SAT_H__
+#define __SAMSUNG_IPC_SAT_H__
+
+/*
+ * Types
+ */
+
+#define IPC_SAT_PROFILE_DOWNLOAD                                0x0E01
+#define IPC_SAT_ENVELOPE_CMD                                    0x0E02
+#define IPC_SAT_PROACTIVE_CMD                                   0x0E03
+#define IPC_SAT_TERMINATE_USAT_SESSION                          0x0E04
+#define IPC_SAT_EVENT_DOWNLOAD                                  0x0E05
+#define IPC_SAT_PROVIDE_LOCAL_INFO                              0x0E06
+#define IPC_SAT_POLLING                                         0x0E07
+#define IPC_SAT_REFRESH                                         0x0E08
+#define IPC_SAT_SETUP_EVENT_LIST                                0x0E09
+#define IPC_SAT_CALL_CONTROL_RESULT                             0x0E0A
+#define IPC_SAT_IMAGE_CLUT                                      0x0E0B
+#define IPC_SAT_CALL_PROCESSING                                 0x0E0C
+
+#endif
+
+// vim:ts=4:sw=4:expandtab
diff --git a/include/types.h b/include/types.h
deleted file mode 100644
index bbd596b..0000000
--- a/include/types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * This file is part of libsamsung-ipc.
- *
- * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
- *
- * libsamsung-ipc is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * libsamsung-ipc is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with libsamsung-ipc.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __TYPES_H__
-#define __TYPES_H__
-
-#include "call.h"
-#include "disp.h"
-#include "gen.h"
-#include "misc.h"
-#include "net.h"
-#include "sec.h"
-#include "sms.h"
-#include "pwr.h"
-#include "rfs.h"
-#include "snd.h"
-#include "gprs.h"
-#include "ss.h"
-
-/* AP -> Baseband */
-#define IPC_TYPE_EXEC                               0x01
-#define IPC_TYPE_GET                                0x02
-#define IPC_TYPE_SET                                0x03
-#define IPC_TYPE_CFRM                               0x04
-#define IPC_TYPE_EVENT                              0x05
-
-/* Baseband -> AP */
-#define IPC_TYPE_INDI                               0x01
-#define IPC_TYPE_RESP                               0x02
-#define IPC_TYPE_NOTI                               0x03
-
-/* Message groups */
-#define IPC_GROUP_PWR                               0x01
-#define IPC_GROUP_CALL                              0x02
-#define IPC_GROUP_SMS                               0x04
-#define IPC_GROUP_SEC                               0x05
-#define IPC_GROUP_PB                                0x06
-#define IPC_GROUP_DISP                              0x07
-#define IPC_GROUP_NET                               0x08
-#define IPC_GROUP_SND                               0x09
-#define IPC_GROUP_MISC                              0x0A
-#define IPC_GROUP_SVC                               0x0B
-#define IPC_GROUP_SS                                0x0C
-#define IPC_GROUP_GPRS                              0x0D
-#define IPC_GROUP_SAT                               0x0E
-#define IPC_GROUP_CFG                               0x0F
-#define IPC_GROUP_IMEI                              0x10
-#define IPC_GROUP_GPS                               0x11
-#define IPC_GROUP_SAP                               0x12
-#define IPC_GROUP_RFS                               0x42
-#define IPC_GROUP_GEN                               0x80
-
-/* Pb */
-#define IPC_PB_ACCESS                               0x0601
-#define IPC_PB_STORAGE                              0x0602
-#define IPC_PB_STORAGE_LIST                         0x0603
-#define IPC_PB_ENTRY_INFO                           0x0604
-#define IPC_PB_CAPABILITY_INFO                      0x0605
-
-/* Sat */
-#define IPC_SAT_PROFILE_DOWNLOAD                    0x0E01
-#define IPC_SAT_ENVELOPE_CMD                        0x0E02
-#define IPC_SAT_PROACTIVE_CMD                       0x0E03
-#define IPC_SAT_TERMINATE_USAT_SESSION              0x0E04
-#define IPC_SAT_EVENT_DOWNLOAD                      0x0E05
-#define IPC_SAT_PROVIDE_LOCAL_INFO                  0x0E06
-#define IPC_SAT_POLLING                             0x0E07
-#define IPC_SAT_REFRESH                             0x0E08
-#define IPC_SAT_SETUP_EVENT_LIST                    0x0E09
-#define IPC_SAT_CALL_CONTROL_RESULT                 0x0E0A
-#define IPC_SAT_IMAGE_CLUT                          0x0E0B
-#define IPC_SAT_CALL_PROCESSING                     0x0E0C
-
-/* IMEI */
-#define IPC_IMEI_START                              0x1001
-#define IPC_IMEI_CHECK_DEVICE_INFO                  0x1002
-
-#endif
-
-// vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/call.c b/samsung-ipc/call.c
index 62c391c..a12bbde 100644
--- a/samsung-ipc/call.c
+++ b/samsung-ipc/call.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/samsung-ipc/device/aries/aries_ipc.c b/samsung-ipc/device/aries/aries_ipc.c
index cf49272..4f5bf42 100644
--- a/samsung-ipc/device/aries/aries_ipc.c
+++ b/samsung-ipc/device/aries/aries_ipc.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #include "aries_ipc.h"
 #include "ipc_private.h"
diff --git a/samsung-ipc/device/crespo/crespo_ipc.c b/samsung-ipc/device/crespo/crespo_ipc.c
index e932587..026bb1f 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.c
+++ b/samsung-ipc/device/crespo/crespo_ipc.c
@@ -33,7 +33,7 @@
 #include <mtd/mtd-abi.h>
 #include <assert.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <wakelock.h>
 
 #include "crespo_modem_ctl.h"
diff --git a/samsung-ipc/device/xmm6260/xmm6260_ipc.c b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
index 1052dce..99d4727 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_ipc.c
+++ b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
@@ -37,7 +37,7 @@
 #include <mtd/mtd-abi.h>
 #include <assert.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <wakelock.h>
 
 #include "ipc_private.h"
diff --git a/samsung-ipc/device/xmm6260/xmm6260_modemctl.h b/samsung-ipc/device/xmm6260/xmm6260_modemctl.h
index 76ef3fd..aab2acb 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_modemctl.h
+++ b/samsung-ipc/device/xmm6260/xmm6260_modemctl.h
@@ -23,7 +23,7 @@
 #ifndef __XMM6260_MODEMCTL_H__
 #define __XMM6260_MODEMCTL_H__
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #define MODEM_DEVICE(x) ("/dev/" #x)
 #define LINK_PM MODEM_DEVICE(link_pm)
diff --git a/samsung-ipc/gen.c b/samsung-ipc/gen.c
index 40345a1..26af233 100644
--- a/samsung-ipc/gen.c
+++ b/samsung-ipc/gen.c
@@ -19,7 +19,7 @@
  */
 
 #include <stdio.h>
-#include <radio.h>
+#include <samsung-ipc.h>
 
 int ipc_gen_phone_res_check(struct ipc_gen_phone_res *res)
 {
diff --git a/samsung-ipc/gprs.c b/samsung-ipc/gprs.c
index a859f04..bb87674 100644
--- a/samsung-ipc/gprs.c
+++ b/samsung-ipc/gprs.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/samsung-ipc/ipc.c b/samsung-ipc/ipc.c
index efba73a..1201823 100644
--- a/samsung-ipc/ipc.c
+++ b/samsung-ipc/ipc.c
@@ -37,7 +37,7 @@
 #include <asm/types.h>
 #include <sys/utsname.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #include "ipc_private.h"
 #include "ipc_devices.h"
diff --git a/samsung-ipc/ipc_devices.c b/samsung-ipc/ipc_devices.c
index 9858136..c82374a 100644
--- a/samsung-ipc/ipc_devices.c
+++ b/samsung-ipc/ipc_devices.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #include "ipc_devices.h"
 
diff --git a/samsung-ipc/ipc_devices.h b/samsung-ipc/ipc_devices.h
index af62b0c..0e600ca 100644
--- a/samsung-ipc/ipc_devices.h
+++ b/samsung-ipc/ipc_devices.h
@@ -21,7 +21,7 @@
 #ifndef __IPC_DEVICES_H__
 #define __IPC_DEVICES_H__
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 struct ipc_device_desc {
     char *name;
diff --git a/samsung-ipc/ipc_private.h b/samsung-ipc/ipc_private.h
index 406bf9d..cf51d4f 100644
--- a/samsung-ipc/ipc_private.h
+++ b/samsung-ipc/ipc_private.h
@@ -21,7 +21,7 @@
 #ifndef __IPC_PRIVATE_H__
 #define __IPC_PRIVATE_H__
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 struct ipc_ops {
     int (*bootstrap)(struct ipc_client *client);
diff --git a/samsung-ipc/ipc_util.c b/samsung-ipc/ipc_util.c
index 63c0c6e..adfc99a 100644
--- a/samsung-ipc/ipc_util.c
+++ b/samsung-ipc/ipc_util.c
@@ -29,7 +29,7 @@
 #include <asm/types.h>
 #include <mtd/mtd-abi.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include "ipc_private.h"
 
 #define IPC_STR(f)  case f: return strdup(#f);
diff --git a/samsung-ipc/misc.c b/samsung-ipc/misc.c
index 0933336..96798cf 100644
--- a/samsung-ipc/misc.c
+++ b/samsung-ipc/misc.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <string.h>
 
 #define DEFAULT_IMSI_LENGTH         15
diff --git a/samsung-ipc/net.c b/samsung-ipc/net.c
index 9e4dfb5..8e1df03 100644
--- a/samsung-ipc/net.c
+++ b/samsung-ipc/net.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include <radio.h>
+#include <samsung-ipc.h>
 
 void ipc_net_regist_get_setup(struct ipc_net_regist_get *message, unsigned char domain)
 {
diff --git a/samsung-ipc/rfs.c b/samsung-ipc/rfs.c
index b2e97b3..aa38cff 100644
--- a/samsung-ipc/rfs.c
+++ b/samsung-ipc/rfs.c
@@ -29,11 +29,11 @@
 
 #include <openssl/md5.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #include "ipc_private.h"
 
-void md5hash2string(char *out, uint8_t *in)
+void md5hash2string(char *out, unsigned char *in)
 {
     int i;
 
diff --git a/samsung-ipc/sec.c b/samsung-ipc/sec.c
index bdf7174..7205936 100644
--- a/samsung-ipc/sec.c
+++ b/samsung-ipc/sec.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/samsung-ipc/sms.c b/samsung-ipc/sms.c
index 991bdca..a4c7855 100644
--- a/samsung-ipc/sms.c
+++ b/samsung-ipc/sms.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <radio.h>
+#include <samsung-ipc.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/tools/modemctrl.c b/tools/modemctrl.c
index 160f365..396536b 100644
--- a/tools/modemctrl.c
+++ b/tools/modemctrl.c
@@ -32,7 +32,7 @@
 #include <pthread.h>
 #include <getopt.h>
 
-#include <radio.h>
+#include <samsung-ipc.h>
 
 #define MODEM_STATE_LPM     0
 #define MODEM_STATE_NORMAL  2
diff --git a/vapi/samsung-ipc-1.0.vapi b/vapi/samsung-ipc-1.0.vapi
index 976e613..d43e1f0 100644
--- a/vapi/samsung-ipc-1.0.vapi
+++ b/vapi/samsung-ipc-1.0.vapi
@@ -18,7 +18,7 @@
  *
  */
 
-[CCode (cheader_filename = "radio.h")]
+[CCode (cheader_filename = "samsung-ipc.h")]
 namespace SamsungIpc
 {
     [CCode (cname = "int", cprefix = "IPC_CLIENT_TYPE_", has_type_id = false)]