From 3b055655422a555e4bdf5046ac26946e6730b21e Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Wed, 3 Jul 2013 18:03:59 +0200
Subject: ipc devices: Include structures definitions from devices headers

Change-Id: I5a5efc12e72b8026bfc779aef89e2227eea5d23c
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 samsung-ipc/device/aries/aries_ipc.h       |  5 ++++
 samsung-ipc/device/crespo/crespo_ipc.h     |  6 +++++
 samsung-ipc/device/galaxys2/galaxys2_ipc.h |  5 ++++
 samsung-ipc/device/maguro/maguro_ipc.h     |  6 +++++
 samsung-ipc/device/piranha/piranha_ipc.h   |  6 +++++
 samsung-ipc/ipc_devices.h                  | 43 ++++++------------------------
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/samsung-ipc/device/aries/aries_ipc.h b/samsung-ipc/device/aries/aries_ipc.h
index abaff03..362141d 100644
--- a/samsung-ipc/device/aries/aries_ipc.h
+++ b/samsung-ipc/device/aries/aries_ipc.h
@@ -55,6 +55,11 @@ struct aries_ipc_transport_data {
     int fd;
 };
 
+extern struct ipc_ops aries_ipc_fmt_ops;
+extern struct ipc_ops aries_ipc_rfs_ops;
+extern struct ipc_handlers aries_ipc_handlers;
+extern struct ipc_gprs_specs aries_ipc_gprs_specs;
+
 #endif
 
 // vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/device/crespo/crespo_ipc.h b/samsung-ipc/device/crespo/crespo_ipc.h
index f06fd5e..73b53a5 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.h
+++ b/samsung-ipc/device/crespo/crespo_ipc.h
@@ -39,6 +39,12 @@ struct crespo_ipc_transport_data {
     int fd;
 };
 
+extern struct ipc_ops crespo_ipc_fmt_ops;
+extern struct ipc_ops crespo_ipc_rfs_ops;
+extern struct ipc_handlers crespo_ipc_handlers;
+extern struct ipc_gprs_specs crespo_ipc_gprs_specs_single;
+extern struct ipc_gprs_specs crespo_ipc_gprs_specs;
+
 #endif
 
 // vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/device/galaxys2/galaxys2_ipc.h b/samsung-ipc/device/galaxys2/galaxys2_ipc.h
index a7e17c2..1e6c89d 100644
--- a/samsung-ipc/device/galaxys2/galaxys2_ipc.h
+++ b/samsung-ipc/device/galaxys2/galaxys2_ipc.h
@@ -39,6 +39,11 @@ struct galaxys2_ipc_transport_data {
     int fd;
 };
 
+extern struct ipc_ops galaxys2_ipc_fmt_ops;
+extern struct ipc_ops galaxys2_ipc_rfs_ops;
+extern struct ipc_handlers galaxys2_ipc_handlers;
+extern struct ipc_gprs_specs galaxys2_ipc_gprs_specs;
+
 #endif
 
 // vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/device/maguro/maguro_ipc.h b/samsung-ipc/device/maguro/maguro_ipc.h
index eb4b500..884f699 100644
--- a/samsung-ipc/device/maguro/maguro_ipc.h
+++ b/samsung-ipc/device/maguro/maguro_ipc.h
@@ -47,6 +47,12 @@ struct maguro_ipc_transport_data {
     int fd;
 };
 
+extern struct ipc_ops maguro_ipc_fmt_ops;
+extern struct ipc_ops maguro_ipc_rfs_ops;
+extern struct ipc_handlers maguro_ipc_handlers;
+extern struct ipc_gprs_specs maguro_ipc_gprs_specs;
+extern struct ipc_nv_data_specs maguro_ipc_nv_data_specs;
+
 #endif
 
 // vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/device/piranha/piranha_ipc.h b/samsung-ipc/device/piranha/piranha_ipc.h
index f915297..ccbc4ce 100644
--- a/samsung-ipc/device/piranha/piranha_ipc.h
+++ b/samsung-ipc/device/piranha/piranha_ipc.h
@@ -39,6 +39,12 @@ struct piranha_ipc_transport_data {
     int fd;
 };
 
+extern struct ipc_ops piranha_ipc_fmt_ops;
+extern struct ipc_ops piranha_ipc_rfs_ops;
+extern struct ipc_handlers piranha_ipc_handlers;
+extern struct ipc_gprs_specs piranha_ipc_gprs_specs;
+extern struct ipc_nv_data_specs piranha_ipc_nv_data_specs;
+
 #endif
 
 // vim:ts=4:sw=4:expandtab
diff --git a/samsung-ipc/ipc_devices.h b/samsung-ipc/ipc_devices.h
index b8f4007..4777dc3 100644
--- a/samsung-ipc/ipc_devices.h
+++ b/samsung-ipc/ipc_devices.h
@@ -18,11 +18,17 @@
  *
  */
 
+#include <samsung-ipc.h>
+
+#include "device/crespo/crespo_ipc.h"
+#include "device/aries/aries_ipc.h"
+#include "device/galaxys2/galaxys2_ipc.h"
+#include "device/maguro/maguro_ipc.h"
+#include "device/piranha/piranha_ipc.h"
+
 #ifndef __IPC_DEVICES_H__
 #define __IPC_DEVICES_H__
 
-#include <samsung-ipc.h>
-
 struct ipc_device_desc {
     char *name;
     char *board_name;
@@ -38,39 +44,6 @@ struct ipc_device_desc {
 extern struct ipc_device_desc ipc_devices[];
 extern int ipc_devices_count;
 
-/* crespo */
-extern struct ipc_ops crespo_ipc_fmt_ops;
-extern struct ipc_ops crespo_ipc_rfs_ops;
-extern struct ipc_handlers crespo_ipc_handlers;
-extern struct ipc_gprs_specs crespo_ipc_gprs_specs_single;
-extern struct ipc_gprs_specs crespo_ipc_gprs_specs;
-
-/* aries */
-extern struct ipc_ops aries_ipc_fmt_ops;
-extern struct ipc_ops aries_ipc_rfs_ops;
-extern struct ipc_handlers aries_ipc_handlers;
-extern struct ipc_gprs_specs aries_ipc_gprs_specs;
-
-/* galaxys2 */
-extern struct ipc_ops galaxys2_ipc_fmt_ops;
-extern struct ipc_ops galaxys2_ipc_rfs_ops;
-extern struct ipc_handlers galaxys2_ipc_handlers;
-extern struct ipc_gprs_specs galaxys2_ipc_gprs_specs;
-
-/* maguro */
-extern struct ipc_ops maguro_ipc_fmt_ops;
-extern struct ipc_ops maguro_ipc_rfs_ops;
-extern struct ipc_handlers maguro_ipc_handlers;
-extern struct ipc_gprs_specs maguro_ipc_gprs_specs;
-extern struct ipc_nv_data_specs maguro_ipc_nv_data_specs;
-
-/* piranha */
-extern struct ipc_ops piranha_ipc_fmt_ops;
-extern struct ipc_ops piranha_ipc_rfs_ops;
-extern struct ipc_handlers piranha_ipc_handlers;
-extern struct ipc_gprs_specs piranha_ipc_gprs_specs;
-extern struct ipc_nv_data_specs piranha_ipc_nv_data_specs;
-
 #endif
 
 // vim:ts=4:sw=4:expandtab
-- 
cgit v1.2.3