aboutsummaryrefslogtreecommitdiffstats
path: root/samsung-ipc
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-02-08 14:07:30 +0100
committerPaul Kocialkowski <contact@paulk.fr>2014-02-08 14:07:30 +0100
commit20e1ea02a3a9c3801fe3dfdc6c6d52d0263c7a02 (patch)
treefb7d0a28ffd29c05d522ff5fb036e8aae4f62d5a /samsung-ipc
parent0b3a6b4838e4ba55c79387bf7314e6dffb33bf42 (diff)
downloadexternal_libsamsung-ipc-20e1ea02a3a9c3801fe3dfdc6c6d52d0263c7a02.zip
external_libsamsung-ipc-20e1ea02a3a9c3801fe3dfdc6c6d52d0263c7a02.tar.gz
external_libsamsung-ipc-20e1ea02a3a9c3801fe3dfdc6c6d52d0263c7a02.tar.bz2
Correct enumeration of files and devices
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'samsung-ipc')
-rw-r--r--samsung-ipc/Makefile.am37
-rw-r--r--samsung-ipc/device/aries/phonet.h1
-rw-r--r--samsung-ipc/ipc_devices.c20
-rw-r--r--samsung-ipc/ipc_devices.h4
4 files changed, 32 insertions, 30 deletions
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__