Add missing transport header files to Linux install command

Added new transport interface header files to top-level install
goal. Promoted Std.h to top-level install goal. Also added
TransportRpmsg.h because application needs to call the create
method. Moved location of interface files and transport files to
respective folders under ti/ipc for better name recognition.

diff --git a/Makefile.am b/Makefile.am
index 5e125bed1aea78c0e1cc05024692e8ef23f8f1be..a025329d53b5e6bd6bf83b572772a8e8e5cec811 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ##
-##  Copyright (c) 2013-2014, Texas Instruments Incorporated
+##  Copyright (c) 2013-2015 Texas Instruments Incorporated - http://www.ti.com
 ##
 ##  Redistribution and use in source and binary forms, with or without
 ##  modification, are permitted provided that the following conditions
@@ -37,10 +37,18 @@ SUBDIRS =  linux/etc linux/src/utils linux/src/api linux/src/transport \
 
 # where to install common headers on the system
 ipcincludedir = $(includedir)/ti/ipc
+ipcincludeinterfacesdir = $(includedir)/ti/ipc/interfaces
 
 # the list of common header files (to be installed later)
-ipcinclude_HEADERS = $(top_srcdir)/packages/ti/ipc/Ipc.h \
-                $(top_srcdir)/packages/ti/ipc/GateMP.h \
-                $(top_srcdir)/packages/ti/ipc/MessageQ.h \
-                $(top_srcdir)/packages/ti/ipc/MultiProc.h \
-                $(top_srcdir)/packages/ti/ipc/NameServer.h
+ipcinclude_HEADERS = \
+        $(top_srcdir)/linux/include/ti/ipc/Std.h \
+        $(top_srcdir)/packages/ti/ipc/Ipc.h \
+        $(top_srcdir)/packages/ti/ipc/GateMP.h \
+        $(top_srcdir)/packages/ti/ipc/MessageQ.h \
+        $(top_srcdir)/packages/ti/ipc/MultiProc.h \
+        $(top_srcdir)/packages/ti/ipc/NameServer.h
+
+ipcincludeinterfaces_HEADERS = \
+        $(top_srcdir)/linux/include/ti/ipc/interfaces/IMessageQTransport.h \
+        $(top_srcdir)/linux/include/ti/ipc/interfaces/INetworkTransport.h \
+        $(top_srcdir)/linux/include/ti/ipc/interfaces/ITransport.h

diff --git a/linux/include/IMessageQTransport.h b/linux/include/ti/ipc/interfaces/IMessageQTransport.h
similarity index 51%
rename from linux/include/IMessageQTransport.h
rename to linux/include/ti/ipc/interfaces/IMessageQTransport.h
index 81cff9155acd5fb6c94d1cba88fa76c2293f36c4..d003c5e7eb87eb985561d073ec4b4728aa2240ff 100644 (file)
--- a/linux/include/IMessageQTransport.h
+++ b/linux/include/ti/ipc/interfaces/IMessageQTransport.h
@@ -1,3 +1,35 @@
+/*
+ * Copyright (c) 2014-2015 Texas Instruments Incorporated - http://www.ti.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * *  Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * *  Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * *  Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /*
  *  ======== IMessageQTransport.h ========
  */
@@ -5,7 +37,7 @@
 #ifndef IMESSAGEQTRANSPORT_H
 #define IMESSAGEQTRANSPORT_H
 
-#include <ITransport.h>
+#include <ti/ipc/interfaces/ITransport.h>
 
 /* opaque instance handle */
 typedef struct IMessageQTransport_Object *IMessageQTransport_Handle;
@@ -62,4 +94,3 @@ IMessageQTransport_Handle IMessageQTransport_downCast(ITransport_Handle base)
 }
 
 #endif /* IMESSAGEQTRANSPORT_H */
-

diff --git a/linux/include/INetworkTransport.h b/linux/include/ti/ipc/interfaces/INetworkTransport.h
similarity index 98%
rename from linux/include/INetworkTransport.h
rename to linux/include/ti/ipc/interfaces/INetworkTransport.h
index f92b4459b7a693077d86c7f9fbe11c9a15f781b2..7834032880f7de23d5d0497b47261e77cc623ff9 100644 (file)
--- a/linux/include/INetworkTransport.h
+++ b/linux/include/ti/ipc/interfaces/INetworkTransport.h
@@ -37,7 +37,7 @@
 #ifndef INETWORKTRANSPORT_H
 #define INETWORKTRANSPORT_H
 
-#include <ITransport.h>
+#include <ti/ipc/interfaces/ITransport.h>
 
 
 /*

diff --git a/linux/include/ITransport.h b/linux/include/ti/ipc/interfaces/ITransport.h
similarity index 99%
rename from linux/include/ITransport.h
rename to linux/include/ti/ipc/interfaces/ITransport.h
index 42872420107712c00649c8bd512d151309982ca5..1ffa7055b1012bf3a78fd39fb687e56647e42c29 100644 (file)
--- a/linux/include/ITransport.h
+++ b/linux/include/ti/ipc/interfaces/ITransport.h
@@ -24,4 +24,3 @@ Int ITransport_itype(ITransport_Handle inst)
 }
 
 #endif /* ITRANSPORT_H */
-

diff --git a/linux/include/TransportRpmsg.h b/linux/include/ti/ipc/transports/TransportRpmsg.h
similarity index 97%
rename from linux/include/TransportRpmsg.h
rename to linux/include/ti/ipc/transports/TransportRpmsg.h
index 83a5050037b59d38e077e5b140d887747ce0b7c1..81505e04c87cfc0e9f92acb483f253c7e4ef9fc8 100644 (file)
--- a/linux/include/TransportRpmsg.h
+++ b/linux/include/ti/ipc/transports/TransportRpmsg.h
@@ -49,9 +49,8 @@
 extern "C" {
 #endif
 
-#include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
-#include <IMessageQTransport.h>
+#include <ti/ipc/interfaces/IMessageQTransport.h>
 
 extern Ipc_TransportFactoryFxns TransportRpmsg_Factory;
 

diff --git a/linux/src/api/MessageQ.c b/linux/src/api/MessageQ.c
index c55015c449c58940548e94e126f2cab0ce9ddff1..b236277175613807ba1cb5d12711dbb34f07006e 100644 (file)
--- a/linux/src/api/MessageQ.c
+++ b/linux/src/api/MessageQ.c
@@ -50,9 +50,9 @@
 #define MessageQ_internal 1     /* must be defined before include file */
 #include <ti/ipc/MessageQ.h>
 #include <_MessageQ.h>
-#include <ITransport.h>
-#include <IMessageQTransport.h>
-#include <INetworkTransport.h>
+#include <ti/ipc/interfaces/ITransport.h>
+#include <ti/ipc/interfaces/IMessageQTransport.h>
+#include <ti/ipc/interfaces/INetworkTransport.h>
 
 /* Socket Headers */
 #include <sys/select.h>

diff --git a/linux/src/tests/MessageQApp.c b/linux/src/tests/MessageQApp.c
index addfb11e130741eb19b9c86f95a13bfdbc78d71d..908e0d648f88f500a73ca40152d1d86d144ae951 100644 (file)
--- a/linux/src/tests/MessageQApp.c
+++ b/linux/src/tests/MessageQApp.c
@@ -45,7 +45,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 /* App defines:  Must match on remote proc side: */
 #define HEAPID              0u

diff --git a/linux/src/tests/MessageQBench.c b/linux/src/tests/MessageQBench.c
index ded204fdee9652c90ec7ebb929c7e73be4d2a9e1..5fbfcbef3de3b098b7c7b52109fada825b392cef 100644 (file)
--- a/linux/src/tests/MessageQBench.c
+++ b/linux/src/tests/MessageQBench.c
@@ -47,7 +47,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 #define MINPAYLOADSIZE      (2 * sizeof(UInt32))
 

diff --git a/linux/src/tests/MessageQMulti.c b/linux/src/tests/MessageQMulti.c
index d123f175cc9a3919834a949069df21aa352cced0..05f6997a09c2519809146599057d2cd9ddc792e4 100644 (file)
--- a/linux/src/tests/MessageQMulti.c
+++ b/linux/src/tests/MessageQMulti.c
@@ -48,7 +48,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 /* App defines: Must match on remote proc side: */
 #define MSGSIZE                     64u

diff --git a/linux/src/tests/MessageQMultiMulti.c b/linux/src/tests/MessageQMultiMulti.c
index 446b9021832b5bce091f86dcec624a81de4163fe..64668ae2a4daf0034548de043f63439294c8911f 100644 (file)
--- a/linux/src/tests/MessageQMultiMulti.c
+++ b/linux/src/tests/MessageQMultiMulti.c
@@ -48,7 +48,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 /* App defines: Must match on remote proc side: */
 #define MSGSIZE                     64u

diff --git a/linux/src/tests/Msgq100.c b/linux/src/tests/Msgq100.c
index 69b86af49f5fd4a928698856ec0da123535cf9a4..ca821bef986de98606c360730d3b522608bdc63f 100644 (file)
--- a/linux/src/tests/Msgq100.c
+++ b/linux/src/tests/Msgq100.c
@@ -45,7 +45,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 #define HEAPID                  0               /* not actually used */
 #define SLAVE_MSGQNAME          "SLAVE"

diff --git a/linux/src/tests/main_host.c b/linux/src/tests/main_host.c
index d650ea0d2400885989fcd02d8e9a7e58690f995d..90cd77ae812f4444403a1b00cd59dfc6016a8467 100644 (file)
--- a/linux/src/tests/main_host.c
+++ b/linux/src/tests/main_host.c
@@ -43,7 +43,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MultiProc.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 #include <ti/cmem.h>
 

diff --git a/linux/src/tests/nano_test.c b/linux/src/tests/nano_test.c
index 7425962c0721864e78751ecabc3369b579230be1..79fecce37dd79d1a8f95166c64c6f1934241e613 100644 (file)
--- a/linux/src/tests/nano_test.c
+++ b/linux/src/tests/nano_test.c
@@ -52,7 +52,7 @@
 #include <ti/ipc/Std.h>
 #include <ti/ipc/Ipc.h>
 #include <ti/ipc/MessageQ.h>
-#include <TransportRpmsg.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
 
 #include <ti/cmem.h>
 

diff --git a/linux/src/transport/Makefile.am b/linux/src/transport/Makefile.am
index 656e009f8840f92cfd188b7b89886fd5e0b0bab0..c4ff034d7bf02e9a1751804700e48a4a2f1e320c 100644 (file)
--- a/linux/src/transport/Makefile.am
+++ b/linux/src/transport/Makefile.am
@@ -48,10 +48,11 @@ AM_CFLAGS = -I$(top_srcdir)/linux/include -I$(top_srcdir)/hlos_common/include \
 lib_LTLIBRARIES = libtitransportrpmsg.la
 
 # where to install the headers on the system
-libtitransportrpmsg_ladir = $(includedir)/ti/ipc
+libtitransportrpmsg_ladir = $(includedir)/ti/ipc/transports
 
 # the list of header files that belong to the library (to be installed later)
-libtitransportrpmsg_la_HEADERS = $(top_srcdir)/linux/include/ti/ipc/Std.h
+libtitransportrpmsg_la_HEADERS = \
+        $(top_srcdir)/linux/include/ti/ipc/transports/TransportRpmsg.h
 
 # the sources to add to the library and to add to the source distribution
 libtitransportrpmsg_la_SOURCES =    \

diff --git a/linux/src/transport/TransportRpmsg.c b/linux/src/transport/TransportRpmsg.c
index 8c3d902a9f36fe891aedecca64a60ac9a72f312a..cbc602e211974d785401ac2dd034fcd10732406f 100644 (file)
--- a/linux/src/transport/TransportRpmsg.c
+++ b/linux/src/transport/TransportRpmsg.c
@@ -34,13 +34,6 @@
  *  Implementation of functions specified in the IMessageQTransport interface.
  */
 
-#include <ti/ipc/Std.h>
-
-#include <ti/ipc/Ipc.h>
-#include <ti/ipc/MessageQ.h>
-#include <ti/ipc/MultiProc.h>
-#include <_MessageQ.h>
-
 /* Socket Headers */
 #include <sys/socket.h>
 #include <sys/select.h>
@@ -56,14 +49,17 @@
 /* Socket Protocol Family */
 #include <net/rpmsg.h>
 
-/* Socket utils: */
-#include <SocketFxns.h>
 
+/* IPC headers */
+#include <ti/ipc/Std.h>
+#include <SocketFxns.h>         /* Socket utils: */
+#include <ti/ipc/Ipc.h>
+#include <ti/ipc/MessageQ.h>
+#include <ti/ipc/MultiProc.h>
+#include <ti/ipc/transports/TransportRpmsg.h>
+#include <_MessageQ.h>
 #include <_lad.h>
 
-#include <TransportRpmsg.h>
-
-
 /* More magic rpmsg port numbers: */
 #define MESSAGEQ_RPMSG_PORT       61
 #define MESSAGEQ_RPMSG_MAXSIZE   512

diff --git a/packages/ti/ipc/MessageQ.h b/packages/ti/ipc/MessageQ.h
index feb0d9890e4043a9878dc7e7191bdb15b1f32523..6076189ef7dee4bcc18585ba814ab741a38ff099 100644 (file)
--- a/packages/ti/ipc/MessageQ.h
+++ b/packages/ti/ipc/MessageQ.h
@@ -592,8 +592,8 @@ typedef Void (*MessageQ_FreeHookFxn)(Bits16 heapId, Bits16 msgId);
 typedef Void (*MessageQ_PutHookFxn)(MessageQ_QueueId queueId, MessageQ_Msg msg);
 
 #ifdef STD_H
-#include <ITransport.h>
-#include <IMessageQTransport.h>
+#include <ti/ipc/interfaces/ITransport.h>
+#include <ti/ipc/interfaces/IMessageQTransport.h>
 #else
 #include <ti/sdo/ipc/interfaces/ITransport.h>
 #include <ti/sdo/ipc/interfaces/IMessageQTransport.h>