QNX: Modification for QNX 6.5 compilation

This patch introduces the changes needed so that
the QNX IPC can be compiled against QNX SDP 6.5.0.

Where needed, a check is made to make one call
when compiling against QNX SDP 6.6 and another
call when compiling against QNX SDP 6.5 in order
to take advantage of the newer functionality of
QNX SDP 6.6.

Signed-off-by: Buddy Liong <a0270631@ti.com>
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>

diff --git a/qnx/src/ipc3x_dev/ti/syslink/Std.h b/qnx/src/ipc3x_dev/ti/syslink/Std.h
index f6804b55c969df8a05d01c33cae3ed8fe599b5ee..b04f45c2e9db058d108c9a273c508011b8eaa553 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/Std.h
+++ b/qnx/src/ipc3x_dev/ti/syslink/Std.h
@@ -65,7 +65,6 @@ typedef unsigned int      uint;
 typedef unsigned int      UINT32;
 typedef unsigned long     ULONG;
 typedef unsigned long     DWORD;
-typedef void             * HANDLE;
 typedef unsigned int     atomic_t;
 
 typedef unsigned short    BOOL;

diff --git a/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c b/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
index c226c9820af4bedb4cdadb990a5eb32eed834063..5508a7b3196d3f4321c6ef80cb23e04312249172 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
@@ -146,7 +146,11 @@ Void VirtQueue_kick(VirtQueue_Handle vq)
      * We need to expose available array entries before sending an
      * interrupt.
      */
+#if _NTO_VERSION >= 660
     asm("   DSB ST");
+#else
+    asm("   DSB  ");
+#endif
 
     GT_2trace(curTrace, GT_2CLASS,
             "VirtQueue_kick: Sending interrupt to proc %d with payload 0x%x",
@@ -226,7 +230,11 @@ Int VirtQueue_addAvailBuf(VirtQueue_Handle vq, Void *buf, UInt32 len, Int16 head
          * Descriptors and available array need to be set before we expose the
          * new available array entries.
          */
+#if _NTO_VERSION >= 660
         asm("   DMB ST");
+#else
+        asm("   DMB  ");
+#endif
 
         vq->vring.avail->idx++;
     }