Correct enumeration of files and devices

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

7 files changed, 50 insertions, 47 deletions

diff --git a/Android.mk b/Android.mk
index 9c499ed..7f84a04 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,10 @@ ifneq (,$(filter galaxysmtd galaxytab,$(TARGET_DEVICE)))
 	ipc_device_name := aries
 endif
 
+ifneq (,$(filter i9100 galaxys2 n7000,$(TARGET_DEVICE)))
+	ipc_device_name := galaxys2
+endif
+
 ifneq (,$(filter maguro,$(TARGET_DEVICE)))
 	ipc_device_name := maguro
 endif
@@ -35,10 +39,6 @@ ifneq (,$(filter p5100 p3100,$(TARGET_DEVICE)))
 	ipc_device_name := piranha
 endif
 
-ifneq (,$(filter i9100 galaxys2 n7000,$(TARGET_DEVICE)))
-	ipc_device_name := galaxys2
-endif
-
 ifneq (,$(filter i9300,$(TARGET_DEVICE)))
 	ipc_device_name := i9300
 endif
@@ -49,17 +49,8 @@ endif
 
 LOCAL_SRC_FILES := \
 	samsung-ipc/ipc.c \
-	samsung-ipc/ipc_util.c \
 	samsung-ipc/ipc_devices.c \
-	samsung-ipc/call.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/sms.c \
-	samsung-ipc/util.c \
+	samsung-ipc/ipc_util.c \
 	samsung-ipc/device/xmm6160/xmm6160.c \
 	samsung-ipc/device/xmm6260/xmm6260.c \
 	samsung-ipc/device/xmm6260/xmm6260_hsic.c \
@@ -68,10 +59,19 @@ LOCAL_SRC_FILES := \
 	samsung-ipc/device/crespo/crespo_ipc.c \
 	samsung-ipc/device/aries/aries_ipc.c \
 	samsung-ipc/device/galaxys2/galaxys2_ipc.c \
-	samsung-ipc/device/i9300/i9300_ipc.c \
 	samsung-ipc/device/maguro/maguro_ipc.c \
 	samsung-ipc/device/piranha/piranha_ipc.c \
-	samsung-ipc/device/n7100/n7100_ipc.c
+	samsung-ipc/device/i9300/i9300_ipc.c \
+	samsung-ipc/device/n7100/n7100_ipc.c \
+	samsung-ipc/util.c \
+	samsung-ipc/call.c \
+	samsung-ipc/sms.c \
+	samsung-ipc/sec.c \
+	samsung-ipc/net.c \
+	samsung-ipc/misc.c \
+	samsung-ipc/gprs.c \
+	samsung-ipc/rfs.c \
+	samsung-ipc/gen.c
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include \
diff --git a/include/Makefile.am b/include/Makefile.am
index 3ea4b55..51ebb84 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,6 +13,7 @@ samsung_ipcinclude_HEADERS = \
 	net.h \
 	snd.h \
 	misc.h \
+	svc.h \
 	ss.h \
 	gprs.h \
 	sat.h \
diff --git a/include/samsung-ipc.h b/include/samsung-ipc.h
index 6e4ac4f..2cdc509 100644
--- a/include/samsung-ipc.h
+++ b/include/samsung-ipc.h
@@ -135,8 +135,8 @@ void ipc_rfs_message_fill(struct ipc_rfs_header *header, struct ipc_message_info
 #include "net.h"
 #include "snd.h"
 #include "misc.h"
-#include "ss.h"
 #include "svc.h"
+#include "ss.h"
 #include "gprs.h"
 #include "sat.h"
 #include "imei.h"
diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am
index 4bd0409..0cb672b 100644
--- a/samsung-ipc/Makefile.am
+++ b/samsung-ipc/Makefile.am
@@ -18,29 +18,19 @@ lib_LTLIBRARIES = \
 
 libsamsung_ipc_la_SOURCES = \
 	ipc.c \
-	ipc_util.c \
-	ipc_devices.c \
-	rfs.c \
-	misc.c \
-	sec.c \
-	sms.c \
-	gen.c \
-	gprs.c \
-	call.c \
-	net.c \
-	util.c \
 	ipc.h \
+	ipc_devices.c \
 	ipc_devices.h \
-	util.h \
+	ipc_util.c \
 	device/xmm6160/xmm6160.c \
 	device/xmm6160/xmm6160.h \
 	device/xmm6260/xmm6260.c \
-	device/xmm6260/xmm6260_hsic.c \
-	device/xmm6260/xmm6260_mipi.c \
-	device/xmm6260/xmm6260_sec_modem.c \
 	device/xmm6260/xmm6260.h \
+	device/xmm6260/xmm6260_hsic.c \
 	device/xmm6260/xmm6260_hsic.h \
+	device/xmm6260/xmm6260_mipi.c \
 	device/xmm6260/xmm6260_mipi.h \
+	device/xmm6260/xmm6260_sec_modem.c \
 	device/xmm6260/xmm6260_sec_modem.h \
 	device/xmm6260/modem.h \
 	device/xmm6260/modem_link_device_hsic.h \
@@ -50,17 +40,28 @@ libsamsung_ipc_la_SOURCES = \
 	device/crespo/crespo_modem_ctl.h \
 	device/aries/aries_ipc.c \
 	device/aries/aries_ipc.h \
-	device/aries/sipc4.h \
 	device/aries/onedram.h \
 	device/aries/phonet.h \
 	device/galaxys2/galaxys2_ipc.c \
 	device/galaxys2/galaxys2_ipc.h \
-	device/galaxys3/galaxys3_ipc.c \
-	device/galaxys3/galaxys3_ipc.h \
 	device/maguro/maguro_ipc.c \
 	device/maguro/maguro_ipc.h \
 	device/piranha/piranha_ipc.c \
 	device/piranha/piranha_ipc.h \
+	device/i9300/i9300_ipc.c \
+	device/i9300/i9300_ipc.h \
+	device/n7100/n7100_ipc.c \
+	device/n7100/n7100_ipc.h \
+	util.c \
+	util.h \
+	call.c \
+	sms.c \
+	sec.c \
+	net.c \
+	misc.c \
+	gprs.c \
+	rfs.c \
+	gen.c \
 	$(NULL)
 
 libsamsung_ipc_la_LIBADD = \
diff --git a/samsung-ipc/device/aries/phonet.h b/samsung-ipc/device/aries/phonet.h
index edf36ec..cda62c8 100644
--- a/samsung-ipc/device/aries/phonet.h
+++ b/samsung-ipc/device/aries/phonet.h
@@ -23,6 +23,7 @@
 #define NETPHONET_PHONET_H
 
 #include <sys/types.h>
+#include <stdint.h>
 
 #include <sys/socket.h>
 #ifndef AF_PHONET
diff --git a/samsung-ipc/ipc_devices.c b/samsung-ipc/ipc_devices.c
index c7ae110..13044c9 100644
--- a/samsung-ipc/ipc_devices.c
+++ b/samsung-ipc/ipc_devices.c
@@ -85,16 +85,6 @@ struct ipc_device_desc ipc_devices[] = {
         .nv_data_specs = NULL,
     },
     {
-        .name = "i9300",
-        .board_name = "smdk4x12",
-        .kernel_version = NULL,
-        .fmt_ops = &i9300_ipc_fmt_ops,
-        .rfs_ops = &i9300_ipc_rfs_ops,
-        .handlers = &i9300_ipc_handlers,
-        .gprs_specs = &i9300_ipc_gprs_specs,
-        .nv_data_specs = NULL,
-    },
-    {
         .name = "maguro",
         .board_name = "tuna",
         .kernel_version = NULL,
@@ -125,6 +115,16 @@ struct ipc_device_desc ipc_devices[] = {
         .nv_data_specs = NULL,
     },
     {
+        .name = "i9300",
+        .board_name = "smdk4x12",
+        .kernel_version = NULL,
+        .fmt_ops = &i9300_ipc_fmt_ops,
+        .rfs_ops = &i9300_ipc_rfs_ops,
+        .handlers = &i9300_ipc_handlers,
+        .gprs_specs = &i9300_ipc_gprs_specs,
+        .nv_data_specs = NULL,
+    },
+    {
         .name = "n7100",
         .board_name = "smdk4x12",
         .kernel_version = NULL,
diff --git a/samsung-ipc/ipc_devices.h b/samsung-ipc/ipc_devices.h
index ebcbac9..8fc238f 100644
--- a/samsung-ipc/ipc_devices.h
+++ b/samsung-ipc/ipc_devices.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of libsamsung-ipc.
  *
- * Copyright (C) 2012 Paul Kocialkowski <contact@paulk.fr>
+ * Copyright (C) 2012-2014 Paul Kocialkowski <contact@paulk.fr>
  *
  * 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
@@ -23,9 +23,9 @@
 #include "device/crespo/crespo_ipc.h"
 #include "device/aries/aries_ipc.h"
 #include "device/galaxys2/galaxys2_ipc.h"
-#include "device/i9300/i9300_ipc.h"
 #include "device/maguro/maguro_ipc.h"
 #include "device/piranha/piranha_ipc.h"
+#include "device/i9300/i9300_ipc.h"
 #include "device/n7100/n7100_ipc.h"
 
 #ifndef __IPC_DEVICES_H__