aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-24 01:44:32 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-30 03:53:02 +0100
commit4e03e1b2cc2e1a0e7493c054bb458099423db604 (patch)
treed9d061ad864c975009740d37bc5bd1aa60c0cbc7
parentd755da2fa53f3a037b81a94abdc9a2ad5563a271 (diff)
downloadhardware_replicant_libsamsung-ipc-4e03e1b2cc2e1a0e7493c054bb458099423db604.tar.gz
hardware_replicant_libsamsung-ipc-4e03e1b2cc2e1a0e7493c054bb458099423db604.tar.bz2
hardware_replicant_libsamsung-ipc-4e03e1b2cc2e1a0e7493c054bb458099423db604.zip
ipc_devices.c: move it in the devices directory
As the various devices are in devices/, it also makes sense to move there the structs that define which device specific implementation to use. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--Android.mk3
-rw-r--r--samsung-ipc/Makefile.am5
-rw-r--r--samsung-ipc/devices/ipc_devices.c (renamed from samsung-ipc/ipc_devices.c)0
-rw-r--r--samsung-ipc/devices/ipc_devices.h (renamed from samsung-ipc/ipc_devices.h)0
4 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index a2ccfe7..63388f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,13 +51,13 @@ endif
libsamsung_ipc_local_src_files := \
samsung-ipc/ipc.c \
- samsung-ipc/ipc_devices.c \
samsung-ipc/ipc_utils.c \
samsung-ipc/modems/xmm616/xmm616.c \
samsung-ipc/modems/xmm626/xmm626.c \
samsung-ipc/modems/xmm626/xmm626_hsic.c \
samsung-ipc/modems/xmm626/xmm626_mipi.c \
samsung-ipc/modems/xmm626/xmm626_sec_modem.c \
+ samsung-ipc/devices/ipc_devices.c \
samsung-ipc/devices/crespo/crespo.c \
samsung-ipc/devices/aries/aries.c \
samsung-ipc/devices/galaxys2/galaxys2.c \
@@ -80,6 +80,7 @@ libsamsung_ipc_local_src_files := \
libsamsung_ipc_local_c_includes := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/samsung-ipc \
+ $(LOCAL_PATH)/samsung-ipc/devices/ \
$(LOCAL_PATH)/samsung-ipc/modems/xmm616/ \
$(LOCAL_PATH)/samsung-ipc/modems/xmm626/ \
external/openssl/include
diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am
index 6ab058d..d0fd9f8 100644
--- a/samsung-ipc/Makefile.am
+++ b/samsung-ipc/Makefile.am
@@ -3,6 +3,7 @@ NULL =
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/samsung-ipc \
+ -I$(top_srcdir)/samsung-ipc/devices \
-I$(top_srcdir)/samsung-ipc/modems/xmm616 \
-I$(top_srcdir)/samsung-ipc/modems/xmm626 \
$(OPENSSL_CFLAGS) \
@@ -19,8 +20,6 @@ lib_LTLIBRARIES = \
libsamsung_ipc_la_SOURCES = \
ipc.c \
ipc.h \
- ipc_devices.c \
- ipc_devices.h \
ipc_utils.c \
modems/xmm616/xmm616.c \
modems/xmm616/xmm616.h \
@@ -35,6 +34,8 @@ libsamsung_ipc_la_SOURCES = \
modems/xmm626/modem.h \
modems/xmm626/modem_link_device_hsic.h \
modems/xmm626/modem_prj.h \
+ devices/ipc_devices.c \
+ devices/ipc_devices.h \
devices/crespo/crespo.c \
devices/crespo/crespo.h \
devices/crespo/crespo_modem_ctl.h \
diff --git a/samsung-ipc/ipc_devices.c b/samsung-ipc/devices/ipc_devices.c
index ad7d23c..ad7d23c 100644
--- a/samsung-ipc/ipc_devices.c
+++ b/samsung-ipc/devices/ipc_devices.c
diff --git a/samsung-ipc/ipc_devices.h b/samsung-ipc/devices/ipc_devices.h
index a7a6098..a7a6098 100644
--- a/samsung-ipc/ipc_devices.h
+++ b/samsung-ipc/devices/ipc_devices.h