diff options
author | PaulK <contact@paulk.fr> | 2012-01-28 11:31:59 +0100 |
---|---|---|
committer | PaulK <contact@paulk.fr> | 2012-01-28 11:45:03 +0100 |
commit | af1854b3be3410f3090a967cfee8b387d6ad3950 (patch) | |
tree | afafcf8dc8409764edf2bca6d5f6f18e68b99323 | |
parent | db817efb93fd1818871d3daf454ab329677b11bd (diff) | |
download | external_libsamsung-ipc-af1854b3be3410f3090a967cfee8b387d6ad3950.zip external_libsamsung-ipc-af1854b3be3410f3090a967cfee8b387d6ad3950.tar.gz external_libsamsung-ipc-af1854b3be3410f3090a967cfee8b387d6ad3950.tar.bz2 |
Switched crespo headers to ipc-v4 as these are shared between multiple devices
-rw-r--r-- | Android.mk | 62 | ||||
-rw-r--r-- | include/call.h | 4 | ||||
-rw-r--r-- | include/device/ipc-v4/call.h (renamed from include/device/crespo/call.h) | 4 | ||||
-rw-r--r-- | include/device/ipc-v4/gen.h (renamed from include/device/crespo/gen.h) | 4 | ||||
-rw-r--r-- | include/device/ipc-v4/misc.h (renamed from include/device/crespo/misc.h) | 4 | ||||
-rw-r--r-- | include/device/ipc-v4/net.h (renamed from include/device/crespo/net.h) | 4 | ||||
-rw-r--r-- | include/device/ipc-v4/sms.h (renamed from include/device/crespo/sms.h) | 4 | ||||
-rw-r--r-- | include/gen.h | 4 | ||||
-rw-r--r-- | include/misc.h | 4 | ||||
-rw-r--r-- | include/net.h | 4 | ||||
-rw-r--r-- | include/sms.h | 4 |
11 files changed, 60 insertions, 42 deletions
@@ -7,30 +7,22 @@ include $(CLEAR_VARS) LOCAL_MODULE := libsamsung-ipc LOCAL_MODULE_TAGS := optional -samsung-ipc_files := \ - samsung-ipc/ipc.c \ - samsung-ipc/ipc_util.c \ - samsung-ipc/util.c \ - samsung-ipc/rfs.c \ - samsung-ipc/gen.c \ - samsung-ipc/gprs.c \ - samsung-ipc/misc.c \ - samsung-ipc/net.c \ - samsung-ipc/sec.c \ - samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_ipc.c - LOCAL_CFLAGS += -Iexternal/openssl/include LOCAL_LDFLAGS += -lcrypto ifeq ($(TARGET_DEVICE),crespo) - LOCAL_CFLAGS += -DDEVICE_CRESPO + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := crespo endif ifeq ($(TARGET_DEVICE),galaxysmtd) - device_files := samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_nv_data.c - LOCAL_CFLAGS += -Iexternal/openssl/include - LOCAL_LDFLAGS += -lcrypto - LOCAL_CFLAGS += -DDEVICE_CRESPO + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := aries +endif + +ifeq ($(TARGET_DEVICE),galaxytab) + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := aries endif ifeq ($(TARGET_DEVICE),h1) @@ -42,7 +34,19 @@ ifeq ($(DEBUG),true) LOCAL_CFLAGS += -DLOG_STDOUT endif -LOCAL_SRC_FILES := $(samsung-ipc_files) $(device_files) +samsung-ipc_files := \ + samsung-ipc/ipc.c \ + samsung-ipc/ipc_util.c \ + samsung-ipc/util.c \ + samsung-ipc/rfs.c \ + samsung-ipc/gen.c \ + samsung-ipc/gprs.c \ + samsung-ipc/misc.c \ + samsung-ipc/net.c \ + samsung-ipc/sec.c \ + samsung-ipc/device/$(samsung-ipc_device)/$(samsung-ipc_device)_ipc.c + +LOCAL_SRC_FILES := $(samsung-ipc_files) LOCAL_SHARED_LIBRARIES := libutils LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \ @@ -57,18 +61,32 @@ include $(CLEAR_VARS) LOCAL_MODULE := ipc-modemctrl LOCAL_MODULE_TAGS := optional -modemctrl_files := tools/modemctrl.c - ifeq ($(TARGET_DEVICE),crespo) - LOCAL_CFLAGS += -DDEVICE_CRESPO + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := crespo endif + ifeq ($(TARGET_DEVICE),galaxysmtd) - LOCAL_CFLAGS += -DDEVICE_CRESPO + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := aries +endif + +ifeq ($(TARGET_DEVICE),galaxytab) + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := aries endif + ifeq ($(TARGET_DEVICE),h1) LOCAL_CFLAGS += -DDEVICE_H1 endif +ifeq ($(DEBUG),true) + LOCAL_CFLAGS += -DDEBUG + LOCAL_CFLAGS += -DLOG_STDOUT +endif + +modemctrl_files := tools/modemctrl.c + LOCAL_SRC_FILES := $(modemctrl_files) LOCAL_STATIC_LIBRARIES := libsamsung-ipc diff --git a/include/call.h b/include/call.h index bc34227..e9377e8 100644 --- a/include/call.h +++ b/include/call.h @@ -21,8 +21,8 @@ #ifndef __CALL_H__ #define __CALL_H__ -#if defined(DEVICE_CRESPO) -#include "device/crespo/call.h" +#if defined(DEVICE_IPC_V4) +#include "device/ipc-v4/call.h" #elif defined(DEVICE_H1) #include "device/h1/call.h" #endif diff --git a/include/device/crespo/call.h b/include/device/ipc-v4/call.h index 778698e..dd0d4bb 100644 --- a/include/device/crespo/call.h +++ b/include/device/ipc-v4/call.h @@ -19,8 +19,8 @@ * */ -#ifndef __DEVICE_CRESPO_CALL_H__ -#define __DEVICE_CRESPO_CALL_H__ +#ifndef __DEVICE_IPC_V4_CALL_H__ +#define __DEVICE_IPC_V4_CALL_H__ struct ipc_call_incoming { unsigned char unk; diff --git a/include/device/crespo/gen.h b/include/device/ipc-v4/gen.h index 0e69260..cfe5e69 100644 --- a/include/device/crespo/gen.h +++ b/include/device/ipc-v4/gen.h @@ -19,8 +19,8 @@ * */ -#ifndef __DEVICE_CRESPO_GEN_H__ -#define __DEVICE_CRESPO_GEN_H__ +#ifndef __DEVICE_IPC_V4_GEN_H__ +#define __DEVICE_IPC_V4_GEN_H__ struct ipc_gen_phone_res { unsigned char group; diff --git a/include/device/crespo/misc.h b/include/device/ipc-v4/misc.h index 20fb276..ec69c7a 100644 --- a/include/device/crespo/misc.h +++ b/include/device/ipc-v4/misc.h @@ -18,8 +18,8 @@ * */ -#ifndef __DEVICE_CRESPO_MISC_H__ -#define __DEVICE_CRESPO_MISC_H__ +#ifndef __DEVICE_IPC_V4_MISC_H__ +#define __DEVICE_IPC_V4_MISC_H__ struct ipc_misc_me_version { unsigned char unk; diff --git a/include/device/crespo/net.h b/include/device/ipc-v4/net.h index ec0b910..a3c54f3 100644 --- a/include/device/crespo/net.h +++ b/include/device/ipc-v4/net.h @@ -19,8 +19,8 @@ * */ -#ifndef __DEVICE_CRESPO_NET_H__ -#define __DEVICE_CRESPO_NET_H__ +#ifndef __DEVICE_IPC_V4_NET_H__ +#define __DEVICE_IPC_V4_NET_H__ #define IPC_NET_ACCESS_TECHNOLOGY_UNKNOWN 0xff #define IPC_NET_ACCESS_TECHNOLOGY_GSM 0x00 diff --git a/include/device/crespo/sms.h b/include/device/ipc-v4/sms.h index 9b80ab6..99cf9c6 100644 --- a/include/device/crespo/sms.h +++ b/include/device/ipc-v4/sms.h @@ -18,8 +18,8 @@ * */ -#ifndef __DEVICE_CRESPO_SMS_H__ -#define __DEVICE_CRESPO_SMS_H__ +#ifndef __DEVICE_IPC_V4_SMS_H__ +#define __DEVICE_IPC_V4_SMS_H__ #define IPC_SMS_ACK_NO_ERROR 0x0000 #define IPC_SMS_ACK_PDA_FULL_ERROR 0x8080 diff --git a/include/gen.h b/include/gen.h index 0a83104..26bfade 100644 --- a/include/gen.h +++ b/include/gen.h @@ -21,8 +21,8 @@ #ifndef __GEN_H__ #define __GEN_H__ -#if defined(DEVICE_CRESPO) -#include "device/crespo/gen.h" +#if defined(DEVICE_IPC_V4) +#include "device/ipc-v4/gen.h" #elif defined(DEVICE_H1) #include "device/h1/gen.h" #endif diff --git a/include/misc.h b/include/misc.h index bccc9b4..e8c4923 100644 --- a/include/misc.h +++ b/include/misc.h @@ -21,8 +21,8 @@ #ifndef __MISC_H__ #define __MISC_H__ -#if defined(DEVICE_CRESPO) -#include "device/crespo/misc.h" +#if defined(DEVICE_IPC_V4) +#include "device/ipc-v4/misc.h" #elif defined(DEVICE_H1) #include "device/h1/misc.h" #endif diff --git a/include/net.h b/include/net.h index 5c8d36d..1d74a27 100644 --- a/include/net.h +++ b/include/net.h @@ -21,8 +21,8 @@ #ifndef __NET_H__ #define __NET_H__ -#if defined(DEVICE_CRESPO) -#include "device/crespo/net.h" +#if defined(DEVICE_IPC_V4) +#include "device/ipc-v4/net.h" #elif defined(DEVICE_H1) #include "device/h1/net.h" #endif diff --git a/include/sms.h b/include/sms.h index bb42596..9a169a1 100644 --- a/include/sms.h +++ b/include/sms.h @@ -21,8 +21,8 @@ #ifndef __SMS_H__ #define __SMS_H__ -#if defined(DEVICE_CRESPO) -#include "device/crespo/sms.h" +#if defined(DEVICE_IPC_V4) +#include "device/ipc-v4/sms.h" #elif defined(DEVICE_H1) #include "device/h1/sms.h" #endif |