Fixed QNX build error due to transport header file changes
authorRamsey Harris <ramsey@ti.com>
Tue, 3 Feb 2015 18:48:45 +0000 (10:48 -0800)
committerRobert Tivy <rtivy@ti.com>
Wed, 4 Feb 2015 01:51:01 +0000 (17:51 -0800)
Updated the location of the transport header files to match
what is expected by MessageQ.h.

qnx/include/INetworkTransport.h [deleted file]
qnx/include/ti/ipc/interfaces/IMessageQTransport.h [moved from qnx/include/IMessageQTransport.h with 51% similarity]
qnx/include/ti/ipc/interfaces/INetworkTransport.h [new file with mode: 0644]
qnx/include/ti/ipc/interfaces/ITransport.h [moved from qnx/include/ITransport.h with 99% similarity]

diff --git a/qnx/include/INetworkTransport.h b/qnx/include/INetworkTransport.h
deleted file mode 100644 (file)
index 956fc67..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  ======== INetworkTransport.h ========
- */
-
-#ifndef INETWORKTRANSPORT_H
-#define INETWORKTRANSPORT_H
-
-#include <ITransport.h>
-
-/* opaque instance handle */
-typedef struct INetworkTransport_Object *INetworkTransport_Handle;
-
-#define INetworkTransport_TypeId 0x03
-
-/* virtual functions */
-typedef struct INetworkTransport_Fxns {
-    Int (*bind)(void *handle, UInt32 queueId);
-    Int (*unbind)(void *handle, UInt32 queueId);
-    Bool (*put)(void *handle, Ptr msg);
-} INetworkTransport_Fxns;
-
-/* abstract instance object */
-typedef struct INetworkTransport_Object {
-    ITransport_Object base;             /* inheritance */
-    INetworkTransport_Fxns *fxns;       /* virtual functions */
-} INetworkTransport_Object;
-
-/* function stubs */
-static inline
-Bool INetworkTransport_bind(INetworkTransport_Handle inst, UInt32 queueId)
-{
-    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
-    return obj->fxns->bind((void *)inst, queueId);
-}
-
-static inline
-Bool INetworkTransport_unbind(INetworkTransport_Handle inst, UInt32 queueId)
-{
-    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
-    return obj->fxns->unbind((void *)inst, queueId);
-}
-
-static inline
-Bool INetworkTransport_put(INetworkTransport_Handle inst, Ptr msg)
-{
-    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
-    return obj->fxns->put((void *)inst, msg);
-}
-
-/* instance convertors */
-ITransport_Handle INetworkTransport_upCast(INetworkTransport_Handle inst)
-{
-    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
-    return (ITransport_Handle)&obj->base;
-}
-
-INetworkTransport_Handle INetworkTransport_downCast(ITransport_Handle base)
-{
-    return (INetworkTransport_Handle)base;
-}
-
-#endif /* INETWORKTRANSPORT_H */
-
similarity index 51%
rename from qnx/include/IMessageQTransport.h
rename to qnx/include/ti/ipc/interfaces/IMessageQTransport.h
index 81cff9155acd5fb6c94d1cba88fa76c2293f36c4..d003c5e7eb87eb985561d073ec4b4728aa2240ff 100644 (file)
@@ -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/qnx/include/ti/ipc/interfaces/INetworkTransport.h b/qnx/include/ti/ipc/interfaces/INetworkTransport.h
new file mode 100644 (file)
index 0000000..7834032
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+/*
+ *  ======== INetworkTransport.h ========
+ */
+
+#ifndef INETWORKTRANSPORT_H
+#define INETWORKTRANSPORT_H
+
+#include <ti/ipc/interfaces/ITransport.h>
+
+
+/*
+ *  ======== INetworkTransport_Handle ========
+ *  Opaque handle to interface instance object
+ */
+typedef struct INetworkTransport_Object *INetworkTransport_Handle;
+
+/*
+ *  ======== INetworkTransport_TypeId ========
+ *  Unique identifier for this interface
+ */
+#define INetworkTransport_TypeId 0x03
+
+/*
+ *  ======== INetworkTransport_Fxns ========
+ *  Interface virtual function table
+ */
+typedef struct INetworkTransport_Fxns {
+    Int (*bind)(void *handle, UInt32 queueId);
+    Int (*unbind)(void *handle, UInt32 queueId);
+    Bool (*put)(void *handle, Ptr msg);
+} INetworkTransport_Fxns;
+
+/*
+ *  ======== INetworkTransport_Object ========
+ *  Abstract instance object
+ */
+typedef struct INetworkTransport_Object {
+    ITransport_Object base;             /* inheritance */
+    INetworkTransport_Fxns *fxns;       /* virtual functions */
+} INetworkTransport_Object;
+
+/*
+ *  ======== INetworkTransport_bind ========
+ *  Instance function stub
+ */
+static inline
+Bool INetworkTransport_bind(INetworkTransport_Handle inst, UInt32 queueId)
+{
+    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
+    return (obj->fxns->bind((void *)inst, queueId));
+}
+
+/*
+ *  ======== INetworkTransport_unbind ========
+ *  Instance function stub
+ */
+static inline
+Bool INetworkTransport_unbind(INetworkTransport_Handle inst, UInt32 queueId)
+{
+    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
+    return (obj->fxns->unbind((void *)inst, queueId));
+}
+
+/*
+ *  ======== INetworkTransport_put ========
+ *  Instance function stub
+ */
+static inline
+Bool INetworkTransport_put(INetworkTransport_Handle inst, Ptr msg)
+{
+    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
+    return (obj->fxns->put((void *)inst, msg));
+}
+
+/*
+ *  ======== INetworkTransport_upCast ========
+ *  Instance converter
+ */
+static inline
+ITransport_Handle INetworkTransport_upCast(INetworkTransport_Handle inst)
+{
+    INetworkTransport_Object *obj = (INetworkTransport_Object *)inst;
+    return ((ITransport_Handle)&obj->base);
+}
+
+/*
+ *  ======== INetworkTransport_downCast ========
+ *  Instance converter
+ */
+static inline
+INetworkTransport_Handle INetworkTransport_downCast(ITransport_Handle base)
+{
+    return ((INetworkTransport_Handle)base);
+}
+
+#endif /* INETWORKTRANSPORT_H */
similarity index 99%
rename from qnx/include/ITransport.h
rename to qnx/include/ti/ipc/interfaces/ITransport.h
index 42872420107712c00649c8bd512d151309982ca5..1ffa7055b1012bf3a78fd39fb687e56647e42c29 100644 (file)
@@ -24,4 +24,3 @@ Int ITransport_itype(ITransport_Handle inst)
 }
 
 #endif /* ITRANSPORT_H */
-