summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 814073e)
raw | patch | inline | side by side (parent: 814073e)
| author | vwan@ti.com <vwan@ti.com> | |
| Tue, 27 Jan 2015 00:06:37 +0000 (16:06 -0800) | ||
| committer | Robert Tivy <rtivy@ti.com> | |
| Thu, 29 Jan 2015 00:44:04 +0000 (16:44 -0800) |
This commit removes all references to "SysLink" in the QNX IPC code base, with
the exception that it preserves the file and directory names. The decision was
made to preserve the path names to avoid breaking any existing apps that may
be including headers and/or libraries based on the existing directory
structure, and to ease git history lookup going forward.
Note that this does introduce a break in the naming of internal features such
as SYSLINK_DEBUG and SYSLINK_DEBUG_TRACE_LEVEL.
This helps address SDOCM00108142.
Signed-off-by: VW <vwan@ti.com>
the exception that it preserves the file and directory names. The decision was
made to preserve the path names to avoid breaking any existing apps that may
be including headers and/or libraries based on the existing directory
structure, and to ease git history lookup going forward.
Note that this does introduce a break in the naming of internal features such
as SYSLINK_DEBUG and SYSLINK_DEBUG_TRACE_LEVEL.
This helps address SDOCM00108142.
Signed-off-by: VW <vwan@ti.com>
131 files changed:
index 2604b3064e1de2f714cb26f7157d9822aaef13eb..09d6b05982fb0d128fd52fdb0a79b9b509da06d1 100644 (file)
/*
- * Copyright (c) 2012-2014, Texas Instruments Incorporated
+ * Copyright (c) 2012-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#undef _linux_
#endif
-#elif defined(SYSLINK_BUILDOS_QNX)
+#elif defined(IPC_BUILDOS_QNX)
#include <ti/ipc/rpmsg_rpc.h>
stat = MmRpc_bufHandle(handle, RPPC_IOC_BUFUNREGISTER, num, desc);
break;
-#elif defined(SYSLINK_BUILDOS_QNX)
+#elif defined(IPC_BUILDOS_QNX)
case MmRpc_BufType_Ptr:
break;
#endif
stat = MmRpc_bufHandle(handle, RPPC_IOC_BUFREGISTER, num, desc);
break;
-#elif defined(SYSLINK_BUILDOS_QNX)
+#elif defined(IPC_BUILDOS_QNX)
case MmRpc_BufType_Ptr:
break;
#endif
index 83062a641cbe5951f824670694dc08cd7f74ab2e..6f3e7139f3ad129a9dee34b5dbf3f01e1cc97f8d 100644 (file)
/*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ti/ipc/mm/MmRpc.h>
#include <ti/ipc/MultiProc.h>
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
#include <ti/shmemallocator/SharedMemoryAllocatorUsr.h>
#endif
/*
* ======== Mx_compute ========
*/
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
int32_t Mx_compute_QnX(Mx_Compute *compute)
#else
int32_t Mx_compute_Linux(Mx_Compute *compute, int fd, int fdIn, int fdOut)
int num = 0;
/* make the output buffer persistent */
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
desc[0].ptr.addr = (size_t)compute->outBuf;
desc[0].ptr.size = compute->size * sizeof(uint32_t);
num = 1;
fxnCtx->params[0].type = MmRpc_ParamType_Ptr;
fxnCtx->params[0].param.ptr.size = sizeof(Mx_Compute);
fxnCtx->params[0].param.ptr.addr = (size_t)compute;
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
fxnCtx->params[0].param.ptr.handle = NULL;
#else
fxnCtx->params[0].param.ptr.handle = fd;
fxnCtx->xltAry[0].index = 0;
fxnCtx->xltAry[0].offset = MmRpc_OFFSET(compute, &compute->inBuf);
fxnCtx->xltAry[0].base = (size_t)compute->inBuf;
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
fxnCtx->xltAry[0].handle = NULL;
#else
fxnCtx->xltAry[0].handle = fdIn;
fxnCtx->xltAry[1].index = 0;
fxnCtx->xltAry[1].offset = MmRpc_OFFSET(compute, &compute->outBuf);
fxnCtx->xltAry[1].base = (size_t)compute->outBuf;
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
fxnCtx->xltAry[1].handle = NULL;
#else
fxnCtx->xltAry[1].handle = fdOut;
leave:
/* release the output buffer */
if (num > 0) {
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
status = MmRpc_release(Mx_rpcIpu, MmRpc_BufType_Ptr, num, desc);
#else
status = MmRpc_release(Mx_rpcIpu, MmRpc_BufType_Handle, num, desc);
index 532d923e2c9e6883f9efd70f29c3ef274b7fc261..303ba2100c520c5880a6d9277d3c198c81dce723 100644 (file)
/*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
+ * Copyright (c) 2012-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*/
int32_t Mx_add(int32_t a, int32_t b);
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
/*!
* @brief Sample function which has pointer parameter to
* a structure with two embedded pointers.
index 605446b0dd1b911838560663d32f2d5a33e1ce07..7ddc499314f6057ee0861e6585d91d9fa65da2c7 100644 (file)
/*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/* IPC Headers */
#include <ti/ipc/Std.h>
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
#include <ti/ipc/Ipc.h>
#include <ti/shmemallocator/SharedMemoryAllocatorUsr.h>
#else /* Linux HLOS */
* HLOS specific shared memory buffer allocation methods.
*/
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
static int callCompute_QnX()
{
exit(0);
}
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
/* Need to start IPC for MultiProc */
status = Ipc_start();
if (status < 0) {
goto leave;
}
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
ret = callCompute_QnX();
#else
ret = callCompute_Linux();
/* finalize Mx module (destroy rpc connection) */
Mx_finalize();
-#if defined(SYSLINK_BUILDOS_QNX)
+#if defined(IPC_BUILDOS_QNX)
Ipc_stop();
#endif
diff --git a/qnx/Makefile b/qnx/Makefile
index 59fdf66f69f654362fd75b1bc85cdf6213cb0175..4e808ce899987ce329b7141a19d968a8c5e837ca 100644 (file)
--- a/qnx/Makefile
+++ b/qnx/Makefile
#
-# Copyright (c) 2013-2014, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
#
ifeq ("$(PLATFORM)","OMAP54XX")
- SYSLINK_PLATFORM=omap5430
+ IPC_PLATFORM=omap5430
else ifeq ("$(PLATFORM)","DRA7XX")
- SYSLINK_PLATFORM=vayu
+ IPC_PLATFORM=vayu
else ifeq ("$(PLATFORM)","")
$(error Empty PLATFORM variable. Did you forget to set in it products.mak?)
else
all: utils ipc3x_dev libs tests
libs: ipc3x_dev
- @cd src/api; make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM)
+ @cd src/api; make IPC_PLATFORM=$(IPC_PLATFORM)
@cd src/mm; make
utils:
ipc3x_dev: utils
@cd src/ipc3x_dev; \
- make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1 QNX_CFLAGS=$(QNX_CFLAGS)
+ make IPC_PLATFORM=$(IPC_PLATFORM) SMP=1 QNX_CFLAGS=$(QNX_CFLAGS)
install:
- @cd src/ipc3x_dev; make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) \
+ @cd src/ipc3x_dev; make IPC_PLATFORM=$(IPC_PLATFORM) \
SMP=1 USE_INSTALL_ROOT=1 \
INSTALL_ROOT_nto=$(DESTDIR) install
@cd src/mm; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
@cd src/utils; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
INSTALL_ROOT_nto=$(DESTDIR) install
@cd src/tests; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
- SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) \
+ IPC_PLATFORM=$(IPC_PLATFORM) \
INSTALL_ROOT_nto=$(DESTDIR) install
@cd src/utils; make clean
@cd src/tests; make clean
@cd src/ipc3x_dev; \
- make clean SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1
+ make clean IPC_PLATFORM=$(IPC_PLATFORM) SMP=1
index 63adabf7ac3fd0482d3fcc4060fe58785d6f791f..c848d2ada02925e66a02cffa28f427c08d997954 100644 (file)
--- a/qnx/include/ti/ipc/Std.h
+++ b/qnx/include/ti/ipc/Std.h
/*
- * Copyright (c) 2008-2013, Texas Instruments Incorporated
+ * Copyright (c) 2008-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#if !defined(STD_H)
#define STD_H
-#ifdef SYSLINK_BUILDOS_LINUX
-#include <std_linux.h>
-#endif
#include <unistd.h>
#include <stdbool.h>
diff --git a/qnx/src/api/common.mk b/qnx/src/api/common.mk
index 03f1fd5c809d1e1691ea4e1480139ad137f4f68f..7b5b983adf6d5c1a1a2394e19881bfe8edc0b4cb 100644 (file)
--- a/qnx/src/api/common.mk
+++ b/qnx/src/api/common.mk
#
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
INSTALLDIR = /usr/lib
-CCOPTS += -DSYSLINK_BUILDOS_QNX
+CCOPTS += -DIPC_BUILDOS_QNX
-ifeq ("$(SYSLINK_PLATFORM)", "vayu")
+ifeq ("$(IPC_PLATFORM)", "vayu")
CCOPTS += -DGATEMP_SUPPORT
endif
index 353916147d6a165a80b516185869174cb0d1c842..4a73960db19dcf0ae5ad3a7cfb22ba6c6fb24d07 100644 (file)
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>syslink_3_0</name>
+ <name>ipc_3_0</name>
<comment></comment>
<projects>
</projects>
index cb08896bb04b900c686567b6f29a48f9108f3a61..fe9f95ffcc8a4bad27698506e299350626d9704f 100644 (file)
#
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
EARLY_DIRS=perfutils
LATE_DIRS=ti
-SYSLINK_BUILDOS=Qnx
+IPC_BUILDOS=Qnx
include recurse.mk
diff --git a/qnx/src/ipc3x_dev/sharedmemallocator/samples/sharedMemAllocator/usr/SharedMemoryAllocatorTestApp.use b/qnx/src/ipc3x_dev/sharedmemallocator/samples/sharedMemAllocator/usr/SharedMemoryAllocatorTestApp.use
index fd5b684e77d7327b37e19d10b950f20d2438fcbc..9a7bcf1c6d41aa836df21f3ff579f65c32f764e9 100644 (file)
--- a/qnx/src/ipc3x_dev/sharedmemallocator/samples/sharedMemAllocator/usr/SharedMemoryAllocatorTestApp.use
+++ b/qnx/src/ipc3x_dev/sharedmemallocator/samples/sharedMemAllocator/usr/SharedMemoryAllocatorTestApp.use
-SharedMemoryAllocatorTestApp Test for Syslink SharedMemAllocator (must launch the 'shmemallocator' resource manager prior to running this test)
+SharedMemoryAllocatorTestApp Test for SharedMemAllocator (must launch the 'shmemallocator' resource manager prior to running this test)
Syntax:
sharedmemallocator
index 33532832ecf8072442b5ed4f70bd7c069bc8c196..0d29c8ff20aebb896552bd1d5fdc00b0024adb51 100644 (file)
#
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
EARLY_DIRS=build
LATE_DIRS=samples
-SYSLINK_ROOT=$(CURDIR)
+IPC_ROOT=$(CURDIR)
include recurse.mk
index c3b8bc91604546bd39b13798c150bd51cca4531c..037cdc3c1dd6fc796139e90cad6645b1c0b9c115 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2008-2009, Texas Instruments Incorporated
+ * Copyright (c) 2008-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#if !defined(STD_H)
#define STD_H
-#ifdef SYSLINK_BUILDOS_LINUX
-#include <std_linux.h>
-#elif SYSLINK_BUILDOS_QNX
#include <std_qnx.h>
-#endif
#if defined (__cplusplus)
extern "C" {
index f87ee4c3d246817dd764694f44811bf2d584bae1..a1830b3aeed9ea47b6b01c13b9606a41bc78e75b 100644 (file)
* @file SysLink.h
*
* @brief This module contains common definitions, types, structures and
- * functions used by SysLink.
+ * functions used by IPC.
*
*
*/
/*
* ============================================================================
*
- * Copyright (c) 2008-2014, Texas Instruments Incorporated
+ * Copyright (c) 2008-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
/**
* @brief Maximum number of mem entries for each core for one platform.
*/
-#define SYSLINK_MAX_MEMENTRIES 32
+#define IPC_MAX_MEMENTRIES 32
/**
* @brief Max name length.
*/
-#define SYSLINK_MAX_NAMELENGTH 32
+#define IPC_MAX_NAMELENGTH 32
/* =============================================================================
* Structures & Enums
* =============================================================================
*/
-typedef UInt32 SysLink_MapMask;
+typedef UInt32 Ipc_MapMask;
/**
* @brief Kernel Virtual address on master processor
*/
-#define SysLink_MASTERKNLVIRT (SysLink_MapMask)(1 << 0)
+#define Ipc_MASTERKNLVIRT (Ipc_MapMask)(1 << 0)
/**
* @brief User Virtual address on master processor
*/
-#define SysLink_MASTERUSRVIRT (SysLink_MapMask)(1 << 1)
+#define Ipc_MASTERUSRVIRT (Ipc_MapMask)(1 << 1)
/**
* @brief Virtual address on slave processor
*/
-#define SysLink_SLAVEVIRT (SysLink_MapMask)(1 << 2)
-
-/**
- * @brief Enumeration of Client notifyMgr notification types.
- */
-typedef enum SysLink_NotifyType_tag {
- SysLink_NOTIFICATION_NONE = 0,
- /*!< No notification required*/
- SysLink_NOTIFICATION_ALWAYS = 1,
- /*!< Notify whenever the other client sends data/frees up space.*/
- SysLink_NOTIFICATION_ONCE = 2,
- /*!< Notify when the other side sends data/frees up buffer. Once the
- * notification is done, the notification is disabled until it is
- * enabled again.
- */
- SysLink_NOTIFICATION_HDWRFIFO_ALWAYS = 3,
- /*!< Notify whenever the other side sends data/frees up space.
- * This notification is never disabled.
- */
- SysLink_NOTIFICATION_HDWRFIFO_ONCE = 4
- /*!< Notify when the other side sends data/frees up buffer. Once the
- * notification is done, the notification is disabled until it is enabled
- * again. The notification is enabled once the watermark is crossed and
- * does not require buffer to get full/empty.
- */
-} SysLink_NotifyType;
+#define Ipc_SLAVEVIRT (Ipc_MapMask)(1 << 2)
/**
* @brief Structure for memEntry.
*/
-typedef struct SysLink_MemEntry_tag {
+typedef struct Ipc_MemEntry_tag {
UInt32 slaveVirtAddr; /**< Virtual address */
UInt32 masterPhysAddr; /**< Physical address */
UInt32 size; /**< Size of the entry */
- SysLink_MapMask mapMask; /**< Used for entries for which map is TRUE */
+ Ipc_MapMask mapMask; /**< Used for entries for which map is TRUE */
Bool map; /**< Flag indicating whether this region should
* be mapped to the slave MMU.
*/
* for this region
*/
Bool isValid; /**< Specifies if the memEntry is valid */
-} SysLink_MemEntry;
+} Ipc_MemEntry;
/**
* @brief Structure for memEntry block for one core.
*/
-typedef struct SysLink_MemEntry_Block_tag {
- Char procName[SYSLINK_MAX_NAMELENGTH];
+typedef struct Ipc_MemEntry_Block_tag {
+ Char procName[IPC_MAX_NAMELENGTH];
/*!< Processor name for which entries are being defined*/
UInt32 numEntries;
/*!< Max memEntries for one core*/
- SysLink_MemEntry memEntries [SYSLINK_MAX_MEMENTRIES];
+ Ipc_MemEntry memEntries [IPC_MAX_MEMENTRIES];
/*!< Entire memory map (p->v) for one code*/
-} SysLink_MemEntry_Block;
+} Ipc_MemEntry_Block;
/**
* @brief Structure for memEntry block for one core.
*/
-typedef struct SysLink_MemoryMap_tag {
+typedef struct Ipc_MemoryMap_tag {
UInt16 numBlocks;
/*!< Number of memory blocks in the memory map */
- SysLink_MemEntry_Block * memBlocks;
+ Ipc_MemEntry_Block * memBlocks;
/*!< Poninter to entire system memory map */
-} SysLink_MemoryMap;
-
-/** @endcond */
-
-/* =============================================================================
- * APIs
- * =============================================================================
- */
-/**
- * @brief Function to initialize SysLink.
- *
- * This function must be called in every user process before making
- * calls to any other SysLink APIs.
- *
- * @sa SysLink_destroy()
- */
-Void SysLink_setup (Void);
-
-/**
- * @brief Function to finalize SysLink.
- *
- * This function must be called in every user process at the end
- * after all usage of SysLink in that process is complete.
- *
- * @sa SysLink_setup()
- */
-Void SysLink_destroy (Void);
-
+} Ipc_MemoryMap;
#if defined (__cplusplus)
}
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/lib/common.mk b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/lib/common.mk
index 38ebfa34bb562d258d1bce726e01b599c23d2aec..1a447d8813d3a8ad07004ed7974f0c06f999d514 100644 (file)
# ---------------------------------------------------------------------------- #
# Override definitions in base Makefile if required
-#To Over ride the usage of syslink memory manager
-SYSLINK_USE_SYSMGR := 0
+#To Over ride the usage of ipc memory manager
+IPC_USE_SYSMGR := 0
#To Over ride the build optimization flag
-SYSLINK_BUILD_OPTIMIZE := 0
+IPC_BUILD_OPTIMIZE := 0
#To override the debug build flag
-SYSLINK_BUILD_DEBUG := 0
+IPC_BUILD_DEBUG := 0
#To override the TRACE flag
-SYSLINK_TRACE_ENABLE := 0
+IPC_TRACE_ENABLE := 0
-ifeq ("$(SYSLINK_PLATFORM)", "omap5430")
-CCOPTS += -DSYSLINK_PLATFORM_OMAP5430
-endif # ifeq ("$(SYSLINK_PLATFORM)", "omap5430")
+ifeq ("$(IPC_PLATFORM)", "omap5430")
+CCOPTS += -DIPC_PLATFORM_OMAP5430
+endif # ifeq ("$(IPC_PLATFORM)", "omap5430")
-#default SYSLINK Product root path and can be overridden from commandline
-SYSLINK_ROOT = $(PROJECT_ROOT)/../../../../..
-SYSLINK_BUILDOS = Qnx
+#default IPC Product root path and can be overridden from commandline
+IPC_ROOT = $(PROJECT_ROOT)/../../../../..
+IPC_BUILDOS = Qnx
#For SOURCE and include paths
-#-include $(SYSLINK_ROOT)/ti/syslink/buildutils/hlos/usr/Makefile.inc
+#-include $(IPC_ROOT)/ti/syslink/buildutils/hlos/usr/Makefile.inc
#Add Resource Manager include path
-#EXTRA_INCVPATH+=$(SYSLINK_ROOT)/ti/syslink/utils/hlos/knl/Qnx/resMgr
+#EXTRA_INCVPATH+=$(IPC_ROOT)/ti/syslink/utils/hlos/knl/Qnx/resMgr
#Add extra include path
-EXTRA_INCVPATH+=$(SYSLINK_ROOT) \
- $(SYSLINK_ROOT)/ti/syslink/inc \
- $(SYSLINK_ROOT)/ti/syslink/inc/usr/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/inc/usr \
- $(SYSLINK_ROOT)/ti/syslink/inc/$(SYSLINK_BUILDOS) \
+EXTRA_INCVPATH+=$(IPC_ROOT) \
+ $(IPC_ROOT)/ti/syslink/inc \
+ $(IPC_ROOT)/ti/syslink/inc/usr/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/inc/usr \
+ $(IPC_ROOT)/ti/syslink/inc/$(IPC_BUILDOS) \
$(IPC_REPO)/packages \
$(IPC_REPO)/qnx/include \
$(IPC_REPO)/hlos_common/include
#SRCDIRS=$(sort $(foreach i,$(CSRCS),$(shell dirname $i)))
#EXTRA_SRCVPATH+=$(SRCDIRS)
-EXTRA_SRCVPATH+=$(SYSLINK_ROOT)/ti/syslink/ipc/hlos/usr \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/usr/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/usr \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/usr/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/usr/osal/$(SYSLINK_BUILDOS)
+EXTRA_SRCVPATH+=$(IPC_ROOT)/ti/syslink/ipc/hlos/usr \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/usr/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/utils/hlos \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/usr \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/usr/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/usr/osal/$(IPC_BUILDOS)
#Using the default build rules TODO: to selective pick and choose the compiler/linker/archiver & build rules
include $(MKFILES_ROOT)/qtargets.mk
-CCOPTS += -DSYSLINK_BUILDOS_QNX -DSYSLINK_BUILD_DEBUG $(QNX_CFLAGS)
-ifeq ("$(SYSLINK_DEBUG)", "1")
+CCOPTS += -DIPC_BUILDOS_QNX -DIPC_BUILD_DEBUG $(QNX_CFLAGS)
+ifeq ("$(IPC_DEBUG)", "1")
#enable debug build
CCOPTS += -g -O0
-endif # ifeq ("$(SYSLINK_DEBUG)", "")
+endif # ifeq ("$(IPC_DEBUG)", "")
CCFLAGS += $(COMPILE_FLAGS)
CCFLAGS += -fPIC
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/common.mk b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/common.mk
index 5b34d2511e5cf532353b0842000fe6ebfd862774..2765ab3d55ecedaad5c39875a5a4c84e0d841a64 100644 (file)
#
-# Copyright (c) 2013-2014, Texas Instruments Incorporated
+# Copyright (c) 2013-2015, Texas Instruments Incorporated
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
endef
NAME=ipc
-CCOPTS += -DSYSLINK_BUILDOS_QNX -DSYSLINK_BUILD_DEBUG -DSYSLINK_BUILD_HLOS $(QNX_CFLAGS)
+CCOPTS += -DIPC_BUILDOS_QNX -DIPC_BUILD_DEBUG -DIPC_BUILD_HLOS $(QNX_CFLAGS)
-ifeq ("$(SYSLINK_DEBUG)", "1")
+ifeq ("$(IPC_DEBUG)", "1")
#enable debug build
CCOPTS += -g -O0
-endif # ifeq ("$(SYSLINK_DEBUG)", "1")
+endif # ifeq ("$(IPC_DEBUG)", "1")
-ifeq ("$(SYSLINK_PLATFORM)", "omap5430")
+ifeq ("$(IPC_PLATFORM)", "omap5430")
ifeq ("$(SMP)", "1")
-CCOPTS += -DSYSLINK_SYSBIOS_SMP
+CCOPTS += -DIPC_SYSBIOS_SMP
endif # ifeq ("$(SMP)", "1")
-CCOPTS += -DSYSLINK_PLATFORM_OMAP5430 -DARM_TARGET -DC60_TARGET -DSYSLINK_USE_IPU_PM
-endif # ifeq ("$(SYSLINK_PLATFORM)", "omap5430")
+CCOPTS += -DIPC_PLATFORM_OMAP5430 -DARM_TARGET -DC60_TARGET -DIPC_USE_IPU_PM
+endif # ifeq ("$(IPC_PLATFORM)", "omap5430")
-ifeq ("$(SYSLINK_PLATFORM)", "vayu")
+ifeq ("$(IPC_PLATFORM)", "vayu")
ifeq ("$(SMP)", "1")
-CCOPTS += -DSYSLINK_SYSBIOS_SMP
+CCOPTS += -DIPC_SYSBIOS_SMP
endif # ifeq ("$(SMP)", "1")
-CCOPTS += -DSYSLINK_PLATFORM_VAYU -DARM_TARGET -DC60_TARGET
-endif # ifeq ("$(SYSLINK_PLATFORM)", "vayu")
+CCOPTS += -DIPC_PLATFORM_VAYU -DARM_TARGET -DC60_TARGET
+endif # ifeq ("$(IPC_PLATFORM)", "vayu")
-#SYSLINK Product root path
-SYSLINK_ROOT = $(PROJECT_ROOT)/../../../../..
-SYSLINK_BUILDOS = Qnx
+#IPC Product root path
+IPC_ROOT = $(PROJECT_ROOT)/../../../../..
+IPC_BUILDOS = Qnx
#PUBLIC_INCVPATH = $(PROJECT_ROOT)/public
-EXTRA_INCVPATH = $(SYSLINK_ROOT) \
- $(SYSLINK_ROOT)/ti/syslink/inc \
- $(SYSLINK_ROOT)/ti/syslink/inc/ti/ipc \
- $(SYSLINK_ROOT)/ti/syslink/inc/knl \
- $(SYSLINK_ROOT)/ti/syslink/inc/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/inc/knl/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl/family/$(SYSLINK_PLATFORM) \
- $(SYSLINK_PKGPATH) \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/rprc \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/DLOAD_API \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/DLOAD \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/C60_DLOAD_DYN \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/C60_DLOAD_REL \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/TMS470_DLOAD_DYN \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/TMS470_DLOAD_REL \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/DLOAD_SYM \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/dlw_client \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(SYSLINK_BUILDOS)/family \
- $(SYSLINK_ROOT)/ti/syslink/resources \
- $(SYSLINK_ROOT)/ti/syslink/family/common \
+EXTRA_INCVPATH = $(IPC_ROOT) \
+ $(IPC_ROOT)/ti/syslink/inc \
+ $(IPC_ROOT)/ti/syslink/inc/ti/ipc \
+ $(IPC_ROOT)/ti/syslink/inc/knl \
+ $(IPC_ROOT)/ti/syslink/inc/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/inc/knl/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl/family/$(IPC_PLATFORM) \
+ $(IPC_PKGPATH) \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/rprc \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/DLOAD_API \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/DLOAD \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/C60_DLOAD_DYN \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/C60_DLOAD_REL \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/TMS470_DLOAD_DYN \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/TMS470_DLOAD_REL \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/DLOAD_SYM \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/dlw_client \
+ $(IPC_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(IPC_BUILDOS)/family \
+ $(IPC_ROOT)/ti/syslink/resources \
+ $(IPC_ROOT)/ti/syslink/family/common \
$(IPC_REPO)/qnx/include \
$(IPC_REPO)/hlos_common/include \
$(IPC_REPO)/packages \
#devctl for ipc, procmgr, utils
-EXTRA_SRCVPATH+=$(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/rprc \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/DLOAD \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/TMS470_DLOAD_DYN \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/TMS470_DLOAD_REL \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/C60_DLOAD_REL \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/C60_DLOAD_DYN \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/DLOAD/DLOAD_SYM \
- $(SYSLINK_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(SYSLINK_BUILDOS)/dlw_client \
- $(SYSLINK_ROOT)/ti/syslink/resources \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl/transports/virtio \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl/arch \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl/arch/$(SYSLINK_PLATFORM) \
- $(SYSLINK_ROOT)/ti/syslink/ipc/hlos/knl/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/utils/common \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/knl \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/knl/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/utils/hlos/knl/osal/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-omx/hlos/knl/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-dce/hlos/knl/$(SYSLINK_BUILDOS) \
- $(SYSLINK_ROOT)/ti/syslink/ti-ipc \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-rpc \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(SYSLINK_BUILDOS)/family/$(SYSLINK_PLATFORM) \
- $(SYSLINK_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(SYSLINK_BUILDOS)
-
-ifeq ("$(SYSLINK_PLATFORM)", "omap5430")
-EXTRA_SRCVPATH+=$(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM) \
- $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM)/ipu
+EXTRA_SRCVPATH+=$(IPC_ROOT)/ti/syslink/procMgr/hlos/knl \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/rprc \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/DLOAD \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/TMS470_DLOAD_DYN \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/TMS470_DLOAD_REL \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/C60_DLOAD_REL \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/C60_DLOAD_DYN \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/DLOAD/DLOAD_SYM \
+ $(IPC_ROOT)/ti/syslink/procMgr/hlos/knl/loaders/Elf/$(IPC_BUILDOS)/dlw_client \
+ $(IPC_ROOT)/ti/syslink/resources \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl/transports/virtio \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl/arch \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl/arch/$(IPC_PLATFORM) \
+ $(IPC_ROOT)/ti/syslink/ipc/hlos/knl/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/utils/common \
+ $(IPC_ROOT)/ti/syslink/utils/hlos \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/knl \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/knl/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/utils/hlos/knl/osal/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/rpmsg-omx/hlos/knl/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/rpmsg-dce/hlos/knl/$(IPC_BUILDOS) \
+ $(IPC_ROOT)/ti/syslink/ti-ipc \
+ $(IPC_ROOT)/ti/syslink/rpmsg-rpc \
+ $(IPC_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(IPC_BUILDOS)/family/$(IPC_PLATFORM) \
+ $(IPC_ROOT)/ti/syslink/rpmsg-resmgr/hlos/knl/$(IPC_BUILDOS)
+
+ifeq ("$(IPC_PLATFORM)", "omap5430")
+EXTRA_SRCVPATH+=$(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM) \
+ $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM)/ipu
EXCLUDE_OBJS = GateMP_daemon.o gatemp_devctl.o
endif
-ifeq ("$(SYSLINK_PLATFORM)", "vayu")
-EXTRA_SRCVPATH+=$(SYSLINK_ROOT)/ti/syslink/family/common \
- $(SYSLINK_ROOT)/ti/syslink/family/common/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)dsp \
- $(SYSLINK_ROOT)/ti/syslink/family/common/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)ipu \
- $(SYSLINK_ROOT)/ti/syslink/family/common/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)ipu/$(SYSLINK_PLATFORM)core0 \
- $(SYSLINK_ROOT)/ti/syslink/family/common/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)ipu/$(SYSLINK_PLATFORM)core1 \
- $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM) \
- $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)dsp \
- $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)ipu \
- $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM)/$(SYSLINK_PLATFORM)ipu/$(SYSLINK_PLATFORM)core1 \
+ifeq ("$(IPC_PLATFORM)", "vayu")
+EXTRA_SRCVPATH+=$(IPC_ROOT)/ti/syslink/family/common \
+ $(IPC_ROOT)/ti/syslink/family/common/$(IPC_PLATFORM)/$(IPC_PLATFORM)dsp \
+ $(IPC_ROOT)/ti/syslink/family/common/$(IPC_PLATFORM)/$(IPC_PLATFORM)ipu \
+ $(IPC_ROOT)/ti/syslink/family/common/$(IPC_PLATFORM)/$(IPC_PLATFORM)ipu/$(IPC_PLATFORM)core0 \
+ $(IPC_ROOT)/ti/syslink/family/common/$(IPC_PLATFORM)/$(IPC_PLATFORM)ipu/$(IPC_PLATFORM)core1 \
+ $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM) \
+ $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM)/$(IPC_PLATFORM)dsp \
+ $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM)/$(IPC_PLATFORM)ipu \
+ $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM)/$(IPC_PLATFORM)ipu/$(IPC_PLATFORM)core1 \
$(IPC_REPO)/qnx/src/api/gates
EXCLUDE_OBJS = GateMP.o
EXTRA_LIBVPATH += $(INSTALL_ROOT_nto)/usr/lib
-ifeq ("$(SYSLINK_DEBUG)", "1")
+ifeq ("$(IPC_DEBUG)", "1")
EXTRA_LIBVPATH += $(IPC_REPO)/qnx/src/utils/arm/a.g.le.v7
LIBS += utils_g
else
EXTRA_LIBVPATH += $(IPC_REPO)/qnx/src/utils/arm/a.le.v7
LIBS += utils
-endif # ifeq ("$(SYSLINK_DEBUG)", "1")
+endif # ifeq ("$(IPC_DEBUG)", "1")
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/dcmd_syslink.h b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/dcmd_syslink.h
index b047c20038106a1db848886b6caa34d60bb8abb7..e43c6873229cca1145e98c9fe9d2cf157d1fbc74 100644 (file)
/*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
extern "C" {
#endif
-#define _DCMD_SYSLINK _DCMD_MISC
+#define _DCMD_IPC _DCMD_MISC
typedef enum {
- _DCMD_SYSLINK_NAMESERVER = 0x2A,
- _DCMD_SYSLINK_MESSAGEQ,
- _DCMD_SYSLINK_MULTIPROC,
- _DCMD_SYSLINK_GATEMP
+ _DCMD_IPC_NAMESERVER = 0x2A,
+ _DCMD_IPC_MESSAGEQ,
+ _DCMD_IPC_MULTIPROC,
+ _DCMD_IPC_GATEMP
} dcmd_class_t_val;
/* ----------------------------------------------------------------------------
/*!
* @brief Command for NameServer_setup
*/
-#define DCMD_NAMESERVER_SETUP __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_SETUP __DIOTF(_DCMD_IPC_NAMESERVER,\
2,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_setup
*/
-#define DCMD_NAMESERVER_DESTROY __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_DESTROY __DIOTF(_DCMD_IPC_NAMESERVER,\
3,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_destroy
*/
-#define DCMD_NAMESERVER_PARAMS_INIT __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_PARAMS_INIT __DIOTF(_DCMD_IPC_NAMESERVER,\
4,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_create
*/
-#define DCMD_NAMESERVER_CREATE __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_CREATE __DIOTF(_DCMD_IPC_NAMESERVER,\
5,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_delete
*/
-#define DCMD_NAMESERVER_DELETE __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_DELETE __DIOTF(_DCMD_IPC_NAMESERVER,\
6,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_addUInt32
*/
-#define DCMD_NAMESERVER_ADDUINT32 __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_ADDUINT32 __DIOTF(_DCMD_IPC_NAMESERVER,\
7,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_remove
*/
-#define DCMD_NAMESERVER_REMOVE __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_REMOVE __DIOTF(_DCMD_IPC_NAMESERVER,\
8,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_removeEntry
*/
-#define DCMD_NAMESERVER_REMOVEENTRY __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_REMOVEENTRY __DIOTF(_DCMD_IPC_NAMESERVER,\
9,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_getUInt32
*/
-#define DCMD_NAMESERVER_GETUINT32 __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_GETUINT32 __DIOTF(_DCMD_IPC_NAMESERVER,\
10, \
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_add
*/
-#define DCMD_NAMESERVER_ADD __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_ADD __DIOTF(_DCMD_IPC_NAMESERVER,\
11,\
NameServerDrv_CmdArgs)
/*!
* @brief Command for NameServer_get
*/
-#define DCMD_NAMESERVER_GET __DIOTF(_DCMD_SYSLINK_NAMESERVER,\
+#define DCMD_NAMESERVER_GET __DIOTF(_DCMD_IPC_NAMESERVER,\
12, \
NameServerDrv_CmdArgs)
/*!
* @brief Command for MessageQ_getConfig
*/
-#define DCMD_MESSAGEQ_GETCONFIG __DIOTF(_DCMD_SYSLINK_MESSAGEQ,\
+#define DCMD_MESSAGEQ_GETCONFIG __DIOTF(_DCMD_IPC_MESSAGEQ,\
1,\
MessageQDrv_CmdArgs)
/*!
* @brief Command for MessageQ_setup
*/
-#define DCMD_MESSAGEQ_SETUP __DIOTF(_DCMD_SYSLINK_MESSAGEQ,\
+#define DCMD_MESSAGEQ_SETUP __DIOTF(_DCMD_IPC_MESSAGEQ,\
2,\
MessageQDrv_CmdArgs)
/*!
* @brief Command for MessageQ_setup
*/
-#define DCMD_MESSAGEQ_DESTROY __DIOTF(_DCMD_SYSLINK_MESSAGEQ,\
+#define DCMD_MESSAGEQ_DESTROY __DIOTF(_DCMD_IPC_MESSAGEQ,\
3,\
MessageQDrv_CmdArgs)
/*!
* @brief Command for MessageQ_create
*/
-#define DCMD_MESSAGEQ_CREATE __DIOTF(_DCMD_SYSLINK_MESSAGEQ,\
+#define DCMD_MESSAGEQ_CREATE __DIOTF(_DCMD_IPC_MESSAGEQ,\
4,\
MessageQDrv_CmdArgs)
/*!
* @brief Command for MessageQ_delete
*/
-#define DCMD_MESSAGEQ_DELETE __DIOTF(_DCMD_SYSLINK_MESSAGEQ,\
+#define DCMD_MESSAGEQ_DELETE __DIOTF(_DCMD_IPC_MESSAGEQ,\
5,\
MessageQDrv_CmdArgs)
/*!
* @brief Command for MultiProc_getConfig
*/
-#define DCMD_MULTIPROC_GETCONFIG __DIOTF(_DCMD_SYSLINK_MULTIPROC,\
+#define DCMD_MULTIPROC_GETCONFIG __DIOTF(_DCMD_IPC_MULTIPROC,\
1,\
MultiProcDrv_CmdArgs)
/*!
* @brief Command for GateMP_getFreeResource
*/
-#define DCMD_GATEMP_GETFREERES __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_GETFREERES __DIOTF(_DCMD_IPC_GATEMP,\
1,\
GateMPDrv_CmdArgs)
/*!
* @brief Command for GateMP_releaseResource
*/
-#define DCMD_GATEMP_RELRES __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_RELRES __DIOTF(_DCMD_IPC_GATEMP,\
2,\
GateMPDrv_CmdArgs)
/*!
* @brief Command for GateMP_getNumResources
*/
-#define DCMD_GATEMP_GETNUMRES __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_GETNUMRES __DIOTF(_DCMD_IPC_GATEMP,\
3,\
GateMPDrv_CmdArgs)
/*!
* @brief Command for GateMP_start
*/
-#define DCMD_GATEMP_START __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_START __DIOTF(_DCMD_IPC_GATEMP,\
4,\
GateMPDrv_CmdArgs)
/*!
* @brief Command for GateMP_stop
*/
-#define DCMD_GATEMP_STOP __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_STOP __DIOTF(_DCMD_IPC_GATEMP,\
5,\
GateMPDrv_CmdArgs)
/*!
* @brief Command for GateMP_isSetup
*/
-#define DCMD_GATEMP_ISSETUP __DIOTF(_DCMD_SYSLINK_GATEMP,\
+#define DCMD_GATEMP_ISSETUP __DIOTF(_DCMD_IPC_GATEMP,\
6,\
GateMPDrv_CmdArgs)
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/proto.h b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/proto.h
index 2e7fb3b66a45c69e7c2a0f42db742ae0d43dc228..61dac95b4b43c6de7213dcc14941a629c6682977 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2010-2014, Texas Instruments Incorporated
+ * Copyright (c) 2010-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*/
-#ifndef _SYSLINK_PROTO_H_INCLUDED
-#define _SYSLINK_PROTO_H_INCLUDED
+#ifndef _IPC_PROTO_H_INCLUDED
+#define _IPC_PROTO_H_INCLUDED
struct _iofunc_attr;
#define RESMGR_HANDLE_T struct _iofunc_attr
-struct syslink_ocb;
-#define IOFUNC_OCB_T struct syslink_ocb
-#define RESMGR_OCB_T struct syslink_ocb
+struct ipc_ocb;
+#define IOFUNC_OCB_T struct ipc_ocb
+#define RESMGR_OCB_T struct ipc_ocb
#define THREAD_POOL_PARAM_T dispatch_context_t
-struct syslink_attr;
-#define IOFUNC_ATTR_T struct syslink_attr
+struct ipc_attr;
+#define IOFUNC_ATTR_T struct ipc_attr
/* QNX specific header files */
* Define our device attributes structure.
*/
-typedef struct syslink_attr {
+typedef struct ipc_attr {
iofunc_attr_t attr;
uint16_t procid;
Ptr dev;
-} syslink_attr_t;
+} ipc_attr_t;
typedef struct named_device {
iofunc_mount_t mattr;
iofunc_attr_t cattr;
- syslink_attr_t cattr_trace[MultiProc_MAXPROCESSORS];
- syslink_attr_t cattr_slave[MultiProc_MAXPROCESSORS];
+ ipc_attr_t cattr_trace[MultiProc_MAXPROCESSORS];
+ ipc_attr_t cattr_slave[MultiProc_MAXPROCESSORS];
int resmgr_id;
int resmgr_id_trace[MultiProc_MAXPROCESSORS];
int resmgr_id_state[MultiProc_MAXPROCESSORS];
char device_name[_POSIX_PATH_MAX];
} named_device_t;
-typedef struct syslink_dev {
+typedef struct ipc_dev {
dispatch_t * dpp;
thread_pool_t * tpool;
- named_device_t syslink;
+ named_device_t ipc;
void * da_virt;
void * da_tesla_virt;
pthread_mutex_t firmwareLock; /* lock for load/unload firmware */
pthread_mutex_t lock;
Bool recover;
OsalThread_Handle ipc_recovery_work;
-} syslink_dev_t;
+} ipc_dev_t;
-typedef struct syslink_ocb {
+typedef struct ipc_ocb {
iofunc_ocb_t ocb;
pid_t pid;
uint32_t ridx;
uint32_t widx;
-} syslink_ocb_t;
+} ipc_ocb_t;
-int syslink_devctl(resmgr_context_t *ctp, io_devctl_t *msg, syslink_ocb_t *ocb);
+int ipc_devctl(resmgr_context_t *ctp, io_devctl_t *msg, ipc_ocb_t *ocb);
#endif
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/syslink_devctl.c b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/syslink_devctl.c
index b66cdb749870461134b281e76ad73dab3473e594..036e793dd6f21c15f02b3728c3e2500bad4d637f 100644 (file)
/*
* @file syslink_devctl.c
*
- * @brief devctl handler for the syslink resource manager
+ * @brief devctl handler for the ipc resource manager
*
*
* @ver 02.00.00.46_alpha1
*
* ============================================================================
*
- * Copyright (c) 2010-2013, Texas Instruments Incorporated
+ * Copyright (c) 2010-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#include <ti/syslink/utils/Trace.h>
extern Int MessageQCopyDrv_devctl (resmgr_context_t *ctp, io_devctl_t *msg,
- syslink_ocb_t *ocb);
+ ipc_ocb_t *ocb);
extern Int GateHWSpinlockDrv_devctl (resmgr_context_t * ctp, io_devctl_t * msg,
- syslink_ocb_t * ocb);
-extern int syslink_messageq_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
- syslink_ocb_t *ocb);
-extern int syslink_nameserver_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
- syslink_ocb_t * ocb);
-extern int syslink_multiproc_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
- syslink_ocb_t * ocb);
-extern int syslink_gatemp_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
- syslink_ocb_t * ocb);
+ ipc_ocb_t * ocb);
+extern int ipc_messageq_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
+ ipc_ocb_t *ocb);
+extern int ipc_nameserver_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
+ ipc_ocb_t * ocb);
+extern int ipc_multiproc_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
+ ipc_ocb_t * ocb);
+extern int ipc_gatemp_devctl(resmgr_context_t *ctp, io_devctl_t *msg,
+ ipc_ocb_t * ocb);
/**
* Handler for devctl() messages.
* \retval EOK Success.
* \retval ENOTSUP Unsupported devctl().
*/
-int syslink_devctl(resmgr_context_t *ctp, io_devctl_t *msg, syslink_ocb_t *ocb)
+int ipc_devctl(resmgr_context_t *ctp, io_devctl_t *msg, ipc_ocb_t *ocb)
{
int status = 0;
int commandClass = 0;
@@ -120,23 +120,23 @@ int syslink_devctl(resmgr_context_t *ctp, io_devctl_t *msg, syslink_ocb_t *ocb)
case MESSAGEQCOPY_BASE_CMD:
status = MessageQCopyDrv_devctl( ctp, msg, ocb);
break;
-#ifndef SYSLINK_PLATFORM_VAYU
+#ifndef IPC_PLATFORM_VAYU
case HWSPINLOCKDRV_BASE_CMD:
status = GateHWSpinlockDrv_devctl(ctp, msg, ocb);
break;
#endif
- case _DCMD_SYSLINK_NAMESERVER:
- status = syslink_nameserver_devctl(ctp, msg, ocb);
+ case _DCMD_IPC_NAMESERVER:
+ status = ipc_nameserver_devctl(ctp, msg, ocb);
break;
- case _DCMD_SYSLINK_MESSAGEQ:
- status = syslink_messageq_devctl(ctp, msg, ocb);
+ case _DCMD_IPC_MESSAGEQ:
+ status = ipc_messageq_devctl(ctp, msg, ocb);
break;
- case _DCMD_SYSLINK_MULTIPROC:
- status = syslink_multiproc_devctl(ctp, msg, ocb);
+ case _DCMD_IPC_MULTIPROC:
+ status = ipc_multiproc_devctl(ctp, msg, ocb);
break;
-#ifdef SYSLINK_PLATFORM_VAYU
- case _DCMD_SYSLINK_GATEMP:
- status = syslink_gatemp_devctl(ctp, msg, ocb);
+#ifdef IPC_PLATFORM_VAYU
+ case _DCMD_IPC_GATEMP:
+ status = ipc_gatemp_devctl(ctp, msg, ocb);
break;
#endif
default:
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/syslink_main.c b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/syslink_main.c
index f182884042473a517bad7e1440a2421852eeb104..8025b935448a13fbf12f0b1a0ef8f92d037e63c7 100644 (file)
/*
* @file syslink_main.c
*
- * @brief syslink main
+ * @brief ipc main
*
*
* @ver 02.00.00.46_alpha1
*
* ============================================================================
*
- * Copyright (c) 2011-2014, Texas Instruments Incorporated
+ * Copyright (c) 2011-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#include <_GateMP_daemon.h>
#include <OsalSemaphore.h>
#include <ti/syslink/utils/OsalPrint.h>
-#if defined(SYSLINK_PLATFORM_OMAP5430)
+#if defined(IPC_PLATFORM_OMAP5430)
#include <_ipu_pm.h>
#endif
#include <ti/syslink/utils/Trace.h>
/* Number of cores to attach to */
static int numAttach = 0;
-#if defined(SYSLINK_PLATFORM_VAYU)
+#if defined(IPC_PLATFORM_VAYU)
/* DSP2 is invalid on Vayu */
#define INVALID_PROC "DSP2"
#define INVALID_PROC ""
#endif
-// Syslink hibernation global variables
-Bool syslink_hib_enable = TRUE;
-#if !defined(SYSLINK_PLATFORM_OMAP5430)
+// IPC hibernation global variables
+Bool ipc_hib_enable = TRUE;
+#if !defined(IPC_PLATFORM_OMAP5430)
#define PM_HIB_DEFAULT_TIME 5000
#endif
-uint32_t syslink_hib_timeout = PM_HIB_DEFAULT_TIME;
-Bool syslink_hib_hibernating = FALSE;
-pthread_mutex_t syslink_hib_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t syslink_hib_cond = PTHREAD_COND_INITIALIZER;
+uint32_t ipc_hib_timeout = PM_HIB_DEFAULT_TIME;
+Bool ipc_hib_hibernating = FALSE;
+pthread_mutex_t ipc_hib_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t ipc_hib_cond = PTHREAD_COND_INITIALIZER;
extern Int rpmsg_rpc_setup (Void);
extern Void rpmsg_rpc_destroy (Void);
extern Void GateHWSpinlock_LeaveLockForPID(int pid);
-typedef struct syslink_firmware_info_t {
+typedef struct ipc_firmware_info_t {
uint16_t proc_id;
char * proc;
char * firmware;
int readProcState; /* state that is currently being printed */
bool reload; /* reload core during recovery */
bool freeString; /* Need to free previously allocated firmware string */
-} syslink_firmware_info;
-static syslink_firmware_info syslink_firmware[MultiProc_MAXPROCESSORS];
+} ipc_firmware_info;
+static ipc_firmware_info ipc_firmware[MultiProc_MAXPROCESSORS];
-/* Number of valid entries in syslink_firmware array */
-static unsigned int syslink_num_cores = 0;
+/* Number of valid entries in ipc_firmware array */
+static unsigned int ipc_num_cores = 0;
-int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware,
+int init_ipc(ipc_dev_t * dev, ipc_firmware_info * firmware,
bool recover);
-int deinit_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware,
+int deinit_ipc(ipc_dev_t * dev, ipc_firmware_info * firmware,
bool recover);
-int init_syslink_trace_device(syslink_dev_t *dev);
-int deinit_syslink_trace_device(syslink_dev_t *dev);
+int init_ipc_trace_device(ipc_dev_t *dev);
+int deinit_ipc_trace_device(ipc_dev_t *dev);
-Int syslink_error_cb (UInt16 procId, ProcMgr_Handle handle,
+Int ipc_error_cb (UInt16 procId, ProcMgr_Handle handle,
ProcMgr_State fromState, ProcMgr_State toState,
ProcMgr_EventStatus status, Ptr args);
static String procStateNames[] = { "In reset\n",
"Running\n" };
-typedef struct syslink_trace_info_t {
+typedef struct ipc_trace_info_t {
uintptr_t va;
uint32_t len;
uint32_t * widx;
uint32_t * ridx;
Bool firstRead;
-} syslink_trace_info;
+} ipc_trace_info;
-static syslink_trace_info proc_traces[MultiProc_MAXPROCESSORS];
+static ipc_trace_info proc_traces[MultiProc_MAXPROCESSORS];
-static int runSlave(syslink_dev_t *dev, uint16_t procId,
- syslink_firmware_info * firmware_info)
+static int runSlave(ipc_dev_t *dev, uint16_t procId,
+ ipc_firmware_info * firmware_info)
{
int status = 0;
ProcMgr_AttachParams attachParams;
goto ipcattach_fail;
}
- status = ProcMgr_registerNotify(procH[procId], syslink_error_cb, (Ptr)dev,
+ status = ProcMgr_registerNotify(procH[procId], ipc_error_cb, (Ptr)dev,
-1, errStates);
if (status < 0) {
goto procmgrreg_fail;
return 0;
procmgrstart_fail:
- ProcMgr_unregisterNotify(procH[procId], syslink_error_cb,
+ ProcMgr_unregisterNotify(procH[procId], ipc_error_cb,
(Ptr)dev, errStates);
procmgrreg_fail:
Ipc_detach(procId);
return -1;
}
-static int resetSlave(syslink_dev_t *dev, uint16_t procId)
+static int resetSlave(ipc_dev_t *dev, uint16_t procId)
{
if ((procH[procId]) && (procH_fileId[procId])) {
GT_1trace(curTrace, GT_4CLASS, "stopping %s", MultiProc_getName(procId));
}
if (procH[procId]) {
- ProcMgr_unregisterNotify(procH[procId], syslink_error_cb, (Ptr)dev,
+ ProcMgr_unregisterNotify(procH[procId], ipc_error_cb, (Ptr)dev,
errStates);
Ipc_detach(procId);
if (procH_fileId[procId]) {
/* Add firmware entry after IPC is setup */
static void addFirmware(uint16_t procId)
{
- syslink_firmware[syslink_num_cores].proc =
+ ipc_firmware[ipc_num_cores].proc =
MultiProc_getName(procId);
- syslink_firmware[syslink_num_cores].proc_id = procId;
- syslink_firmware[syslink_num_cores].attachOnly = false;
- syslink_firmware[syslink_num_cores].reload = false;
- syslink_firmware[syslink_num_cores].procState = RESET_STATE;
- syslink_firmware[syslink_num_cores].freeString = false;
- syslink_firmware[syslink_num_cores++].firmware = NULL;
+ ipc_firmware[ipc_num_cores].proc_id = procId;
+ ipc_firmware[ipc_num_cores].attachOnly = false;
+ ipc_firmware[ipc_num_cores].reload = false;
+ ipc_firmware[ipc_num_cores].procState = RESET_STATE;
+ ipc_firmware[ipc_num_cores].freeString = false;
+ ipc_firmware[ipc_num_cores++].firmware = NULL;
return;
}
static int slave_state_read(resmgr_context_t *ctp, io_read_t *msg,
- syslink_ocb_t *ocb)
+ ipc_ocb_t *ocb)
{
int nbytes;
int nparts;
int nleft;
int i;
uint16_t procId = ocb->ocb.attr->procid;
- syslink_dev_t * dev = ocb->ocb.attr->dev;
+ ipc_dev_t * dev = ocb->ocb.attr->dev;
if ((status = iofunc_read_verify(ctp, msg, &ocb->ocb, NULL)) != EOK) {
return (status);
pthread_mutex_lock(&dev->firmwareLock);
- for (i = 0; i < syslink_num_cores; i++) {
- if (syslink_firmware[i].proc_id == procId) {
+ for (i = 0; i < ipc_num_cores; i++) {
+ if (ipc_firmware[i].proc_id == procId) {
break;
}
}
- if (i == syslink_num_cores) {
- if ((syslink_num_cores < MultiProc_MAXPROCESSORS)) {
+ if (i == ipc_num_cores) {
+ if ((ipc_num_cores < MultiProc_MAXPROCESSORS)) {
addFirmware(procId);
}
else {
if (ocb->ocb.offset == 0) {
/* latch onto new state, so that we print out complete strings */
- syslink_firmware[i].readProcState = syslink_firmware[i].procState;
+ ipc_firmware[i].readProcState = ipc_firmware[i].procState;
}
- nleft = strlen(procStateNames[syslink_firmware[i].readProcState])
+ nleft = strlen(procStateNames[ipc_firmware[i].readProcState])
- ocb->ocb.offset; /* the state is expressed in one byte */
nbytes = min(msg->i.nbytes, nleft);
if (nbytes > 0) {
/* set up the return data IOV */
SETIOV(ctp->iov,
- (char *)procStateNames[syslink_firmware[i].readProcState]
+ (char *)procStateNames[ipc_firmware[i].readProcState]
+ ocb->ocb.offset, nbytes);
pthread_mutex_unlock(&dev->firmwareLock);
}
static int slave_state_write(resmgr_context_t *ctp, io_write_t *msg,
- syslink_ocb_t *ocb)
+ ipc_ocb_t *ocb)
{
int status;
char * buf;
uint16_t procId = ocb->ocb.attr->procid;
int i;
char * ptr;
- syslink_dev_t * dev = ocb->ocb.attr->dev;
+ ipc_dev_t * dev = ocb->ocb.attr->dev;
Int32 sr0ProcId;
if ((status = iofunc_write_verify(ctp, msg, &ocb->ocb, NULL)) != EOK) {
}
pthread_mutex_lock(&dev->firmwareLock);
- for (i = 0; i < syslink_num_cores; i++) {
- if (syslink_firmware[i].proc_id == procId) {
+ for (i = 0; i < ipc_num_cores; i++) {
+ if (ipc_firmware[i].proc_id == procId) {
break;
}
}
- if (i == syslink_num_cores) {
- if ((syslink_num_cores < MultiProc_MAXPROCESSORS)) {
+ if (i == ipc_num_cores) {
+ if ((ipc_num_cores < MultiProc_MAXPROCESSORS)) {
addFirmware(procId);
}
else {
}
if (strcmp("1", buf) == 0) {
- if ((syslink_firmware[i].procState == RESET_STATE) &&
- (syslink_firmware[i].firmware != NULL)) {
- runSlave(ocb->ocb.attr->dev, procId, &syslink_firmware[i]);
-#if defined(SYSLINK_PLATFORM_VAYU)
+ if ((ipc_firmware[i].procState == RESET_STATE) &&
+ (ipc_firmware[i].firmware != NULL)) {
+ runSlave(ocb->ocb.attr->dev, procId, &ipc_firmware[i]);
+#if defined(IPC_PLATFORM_VAYU)
if (gatempEnabled) {
if (sr0OwnerProcId == -1) {
/* Set up GateMP */
}
#endif
printf("Core is now running with image '%s'\n",
- syslink_firmware[i].firmware);
- syslink_firmware[i].procState = RUNNING_STATE;
- syslink_firmware[i].reload = true;
- status = init_syslink_trace_device(dev);
+ ipc_firmware[i].firmware);
+ ipc_firmware[i].procState = RUNNING_STATE;
+ ipc_firmware[i].reload = true;
+ status = init_ipc_trace_device(dev);
if (status < 0) {
pthread_mutex_unlock(&dev->firmwareLock);
free(buf);
}
}
else if (strcmp("0", buf) == 0) {
- if (syslink_firmware[i].procState == RUNNING_STATE) {
-#if defined(SYSLINK_PLATFORM_VAYU)
+ if (ipc_firmware[i].procState == RUNNING_STATE) {
+#if defined(IPC_PLATFORM_VAYU)
if ((gatempEnabled) && (procId == sr0OwnerProcId)) {
sr0OwnerProcId = -1;
status = GateMP_destroy(FALSE);
}
#endif
resetSlave(ocb->ocb.attr->dev, procId);
- syslink_firmware[i].procState = RESET_STATE;
- syslink_firmware[i].reload = false;
- status = deinit_syslink_trace_device(dev);
+ ipc_firmware[i].procState = RESET_STATE;
+ ipc_firmware[i].reload = false;
+ status = deinit_ipc_trace_device(dev);
if (status < 0) {
pthread_mutex_unlock(&dev->firmwareLock);
free(buf);
- Osal_printf("IPC: deinit_syslink_trace_device failed %d",
+ Osal_printf("IPC: deinit_ipc_trace_device failed %d",
status);
return (EIO);
}
}
static int slave_file_read(resmgr_context_t *ctp, io_read_t *msg,
- syslink_ocb_t *ocb)
+ ipc_ocb_t *ocb)
{
int nbytes;
int nparts;
int nleft;
int i;
uint16_t procId = ocb->ocb.attr->procid;
- syslink_dev_t * dev = ocb->ocb.attr->dev;
+ ipc_dev_t * dev = ocb->ocb.attr->dev;
if ((status = iofunc_read_verify (ctp, msg, &ocb->ocb, NULL)) != EOK) {
return (status);
}
pthread_mutex_lock(&dev->firmwareLock);
- for (i = 0; i < syslink_num_cores; i++) {
- if (syslink_firmware[i].proc_id == procId) {
+ for (i = 0; i < ipc_num_cores; i++) {
+ if (ipc_firmware[i].proc_id == procId) {
break;
}
}
- if (i == syslink_num_cores) {
- if ((syslink_num_cores < MultiProc_MAXPROCESSORS)) {
+ if (i == ipc_num_cores) {
+ if ((ipc_num_cores < MultiProc_MAXPROCESSORS)) {
addFirmware(procId);
}
else {
}
}
- if (syslink_firmware[i].firmware == NULL) {
+ if (ipc_firmware[i].firmware == NULL) {
nbytes = 0;
}
else {
- nleft = strlen(syslink_firmware[i].firmware)
+ nleft = strlen(ipc_firmware[i].firmware)
- ocb->ocb.offset + 1; /* Add one byte for carriage return */
nbytes = min(msg->i.nbytes, nleft);
}
if (nbytes > 0) {
if (nbytes == nleft) {
/* set up the return data IOV */
- SETIOV(&ctp->iov[0], (char *)syslink_firmware[i].firmware
+ SETIOV(&ctp->iov[0], (char *)ipc_firmware[i].firmware
+ ocb->ocb.offset, nbytes - 1);
/* add a carriage return */
}
else {
/* set up the return data IOV */
- SETIOV(ctp->iov, (char *)syslink_firmware[i].firmware
+ SETIOV(ctp->iov, (char *)ipc_firmware[i].firmware
+ ocb->ocb.offset, nbytes);
nparts = 1;
}
static int slave_file_write(resmgr_context_t *ctp, io_write_t *msg,
- syslink_ocb_t *ocb)
+ ipc_ocb_t *ocb)
{
int status;
char * buf;
int i;
char * absPath;
char * ptr;
- syslink_dev_t * dev = ocb->ocb.attr->dev;
+ ipc_dev_t * dev = ocb->ocb.attr->dev;
if ((status = iofunc_write_verify(ctp, msg, &ocb->ocb, NULL)) != EOK) {
return (status);
pthread_mutex_lock(&dev->firmwareLock);
/*
- * Check if an entry in syslink_firmware already exists for this core.
+ * Check if an entry in ipc_firmware already exists for this core.
* If not, create one. Otherwise just update the firmware path.
*/
- for (i = 0; i < syslink_num_cores; i++) {
- if (syslink_firmware[i].proc_id == procId) {
+ for (i = 0; i < ipc_num_cores; i++) {
+ if (ipc_firmware[i].proc_id == procId) {
break;
}
}
- if (i == syslink_num_cores) {
- if (syslink_num_cores < MultiProc_MAXPROCESSORS) {
+ if (i == ipc_num_cores) {
+ if (ipc_num_cores < MultiProc_MAXPROCESSORS) {
addFirmware(procId);
- syslink_firmware[syslink_num_cores - 1].freeString = true;
- syslink_firmware[syslink_num_cores - 1].firmware = absPath;
+ ipc_firmware[ipc_num_cores - 1].freeString = true;
+ ipc_firmware[ipc_num_cores - 1].firmware = absPath;
}
else {
pthread_mutex_unlock(&dev->firmwareLock);
}
else {
/* Free previously allocated string */
- if ((syslink_firmware[i].freeString) &&
- (syslink_firmware[i].firmware)) {
- free(syslink_firmware[i].firmware);
+ if ((ipc_firmware[i].freeString) &&
+ (ipc_firmware[i].firmware)) {
+ free(ipc_firmware[i].firmware);
}
- syslink_firmware[i].firmware = absPath;
+ ipc_firmware[i].firmware = absPath;
}
pthread_mutex_unlock(&dev->firmwareLock);
return (_RESMGR_NPARTS(0));
}
-int syslink_read(resmgr_context_t *ctp, io_read_t *msg, syslink_ocb_t *ocb)
+int ipc_read(resmgr_context_t *ctp, io_read_t *msg, ipc_ocb_t *ocb)
{
int nbytes;
int nparts;
extern OsalSemaphore_Handle mqcopy_test_sem;
-int syslink_unblock(resmgr_context_t *ctp, io_pulse_t *msg, syslink_ocb_t *ocb)
+int ipc_unblock(resmgr_context_t *ctp, io_pulse_t *msg, ipc_ocb_t *ocb)
{
int status = _RESMGR_NOREPLY;
struct _msg_info info;
@@ -841,12 +841,12 @@ int syslink_unblock(resmgr_context_t *ctp, io_pulse_t *msg, syslink_ocb_t *ocb)
}
IOFUNC_OCB_T *
-syslink_ocb_calloc (resmgr_context_t * ctp, IOFUNC_ATTR_T * device)
+ipc_ocb_calloc (resmgr_context_t * ctp, IOFUNC_ATTR_T * device)
{
- syslink_ocb_t *ocb = NULL;
+ ipc_ocb_t *ocb = NULL;
/* Allocate the OCB */
- ocb = (syslink_ocb_t *) calloc (1, sizeof (syslink_ocb_t));
+ ocb = (ipc_ocb_t *) calloc (1, sizeof (ipc_ocb_t));
if (ocb == NULL){
errno = ENOMEM;
return (NULL);
}
void
-syslink_ocb_free (IOFUNC_OCB_T * i_ocb)
+ipc_ocb_free (IOFUNC_OCB_T * i_ocb)
{
- syslink_ocb_t * ocb = (syslink_ocb_t *)i_ocb;
+ ipc_ocb_t * ocb = (ipc_ocb_t *)i_ocb;
if (ocb) {
-#ifndef SYSLINK_PLATFORM_VAYU
+#ifndef IPC_PLATFORM_VAYU
GateHWSpinlock_LeaveLockForPID(ocb->pid);
#endif
free (ocb);
}
}
-int init_slave_devices(syslink_dev_t *dev)
+int init_slave_devices(ipc_dev_t *dev)
{
resmgr_attr_t resmgr_attr;
int i;
- syslink_attr_t * slave_attr;
+ ipc_attr_t * slave_attr;
int status = 0;
memset(&resmgr_attr, 0, sizeof resmgr_attr);
/* Populate the /dev/ipc-state namespace */
for (i = 1; i < MultiProc_getNumProcessors(); i++) {
- iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->syslink.cfuncs_state[i],
- _RESMGR_IO_NFUNCS, &dev->syslink.iofuncs_state[i]);
- slave_attr = &dev->syslink.cattr_slave[i];
+ iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->ipc.cfuncs_state[i],
+ _RESMGR_IO_NFUNCS, &dev->ipc.iofuncs_state[i]);
+ slave_attr = &dev->ipc.cattr_slave[i];
iofunc_attr_init(&slave_attr->attr,
S_IFCHR | 0777, NULL, NULL);
- slave_attr->attr.mount = &dev->syslink.mattr;
+ slave_attr->attr.mount = &dev->ipc.mattr;
slave_attr->procid = i;
slave_attr->dev = (Ptr)dev;
iofunc_time_update(&slave_attr->attr);
- snprintf(dev->syslink.device_name, _POSIX_PATH_MAX,
+ snprintf(dev->ipc.device_name, _POSIX_PATH_MAX,
"%s-state/%s", IPC_DEVICE_PATH, MultiProc_getName(i));
- dev->syslink.iofuncs_state[i].read = slave_state_read;
- dev->syslink.iofuncs_state[i].write = slave_state_write;
+ dev->ipc.iofuncs_state[i].read = slave_state_read;
+ dev->ipc.iofuncs_state[i].write = slave_state_write;
- if (-1 == (dev->syslink.resmgr_id_state[i] =
+ if (-1 == (dev->ipc.resmgr_id_state[i] =
resmgr_attach(dev->dpp, &resmgr_attr,
- dev->syslink.device_name, _FTYPE_ANY, 0,
- &dev->syslink.cfuncs_state[i],
- &dev->syslink.iofuncs_state[i],
+ dev->ipc.device_name, _FTYPE_ANY, 0,
+ &dev->ipc.cfuncs_state[i],
+ &dev->ipc.iofuncs_state[i],
&slave_attr->attr))) {
GT_setFailureReason(curTrace, GT_4CLASS, "init_slave_devices",
status, "resmgr_attach failed");
/* Populate the /dev/ipc-file namespace */
for (i = 1; i < MultiProc_getNumProcessors(); i++) {
- iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->syslink.cfuncs_file[i],
- _RESMGR_IO_NFUNCS, &dev->syslink.iofuncs_file[i]);
- slave_attr = &dev->syslink.cattr_slave[i];
+ iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->ipc.cfuncs_file[i],
+ _RESMGR_IO_NFUNCS, &dev->ipc.iofuncs_file[i]);
+ slave_attr = &dev->ipc.cattr_slave[i];
iofunc_attr_init(&slave_attr->attr,
S_IFCHR | 0777, NULL, NULL);
- slave_attr->attr.mount = &dev->syslink.mattr;
+ slave_attr->attr.mount = &dev->ipc.mattr;
slave_attr->procid = i;
slave_attr->dev = (Ptr)dev;
iofunc_time_update(&slave_attr->attr);
- snprintf(dev->syslink.device_name, _POSIX_PATH_MAX,
+ snprintf(dev->ipc.device_name, _POSIX_PATH_MAX,
"%s-file/%s", IPC_DEVICE_PATH, MultiProc_getName(i));
- dev->syslink.iofuncs_file[i].read = slave_file_read;
- dev->syslink.iofuncs_file[i].write = slave_file_write;
+ dev->ipc.iofuncs_file[i].read = slave_file_read;
+ dev->ipc.iofuncs_file[i].write = slave_file_write;
- if (-1 == (dev->syslink.resmgr_id_file[i] =
+ if (-1 == (dev->ipc.resmgr_id_file[i] =
resmgr_attach(dev->dpp, &resmgr_attr,
- dev->syslink.device_name, _FTYPE_ANY, 0,
- &dev->syslink.cfuncs_file[i],
- &dev->syslink.iofuncs_file[i],
+ dev->ipc.device_name, _FTYPE_ANY, 0,
+ &dev->ipc.cfuncs_file[i],
+ &dev->ipc.iofuncs_file[i],
&slave_attr->attr))) {
GT_setFailureReason(curTrace, GT_4CLASS, "init_slave_devices",
status, "resmgr_attach failed");
return (status);
}
-int deinit_slave_devices(syslink_dev_t *dev)
+int deinit_slave_devices(ipc_dev_t *dev)
{
int status = EOK;
int i = 0;
for (i = 1; i < MultiProc_getNumProcessors(); i++) {
- status = resmgr_detach(dev->dpp, dev->syslink.resmgr_id_state[i], 0);
+ status = resmgr_detach(dev->dpp, dev->ipc.resmgr_id_state[i], 0);
if (status < 0) {
Osal_printf("IPC: resmgr_detach of state device %d failed: %d",
i, errno);
}
- status = resmgr_detach(dev->dpp, dev->syslink.resmgr_id_file[i], 0);
+ status = resmgr_detach(dev->dpp, dev->ipc.resmgr_id_file[i], 0);
if (status < 0) {
Osal_printf("IPC: resmgr_detach of file device %d failed: %d",
i, errno);
return (status);
}
-int init_syslink_trace_device(syslink_dev_t *dev)
+int init_ipc_trace_device(ipc_dev_t *dev)
{
resmgr_attr_t resmgr_attr;
int i;
- syslink_attr_t * trace_attr;
+ ipc_attr_t * trace_attr;
char trace_name[_POSIX_PATH_MAX];
int status = 0;
unsigned int da = 0, pa = 0;
resmgr_attr.nparts_max = 10;
resmgr_attr.msg_max_size = 2048;
- for (i = 0; i < syslink_num_cores; i++) {
+ for (i = 0; i < ipc_num_cores; i++) {
/*
* Initialize trace device only for cores that are running and their
* device is not yet setup.
*/
- if ((syslink_firmware[i].procState == RUNNING_STATE) &&
+ if ((ipc_firmware[i].procState == RUNNING_STATE) &&
(proc_traces[i].va == NULL)) {
iofunc_func_init(_RESMGR_CONNECT_NFUNCS,
- &dev->syslink.cfuncs_trace[i],
- _RESMGR_IO_NFUNCS, &dev->syslink.iofuncs_trace[i]);
- trace_attr = &dev->syslink.cattr_trace[i];
+ &dev->ipc.cfuncs_trace[i],
+ _RESMGR_IO_NFUNCS, &dev->ipc.iofuncs_trace[i]);
+ trace_attr = &dev->ipc.cattr_trace[i];
iofunc_attr_init(&trace_attr->attr,
S_IFCHR | 0777, NULL, NULL);
- trace_attr->attr.mount = &dev->syslink.mattr;
+ trace_attr->attr.mount = &dev->ipc.mattr;
trace_attr->procid = i;
iofunc_time_update(&trace_attr->attr);
- snprintf(dev->syslink.device_name, _POSIX_PATH_MAX,
+ snprintf(dev->ipc.device_name, _POSIX_PATH_MAX,
"%s-trace/%s", IPC_DEVICE_PATH,
- MultiProc_getName(syslink_firmware[i].proc_id));
- dev->syslink.iofuncs_trace[i].read = syslink_read;
+ MultiProc_getName(ipc_firmware[i].proc_id));
+ dev->ipc.iofuncs_trace[i].read = ipc_read;
snprintf (trace_name, _POSIX_PATH_MAX, "%d", 0);
pa = 0;
- status = RscTable_getInfo(syslink_firmware[i].proc_id, TYPE_TRACE,
+ status = RscTable_getInfo(ipc_firmware[i].proc_id, TYPE_TRACE,
0, &da, &pa, &len);
if (status == 0) {
/* last 8 bytes are for writeIdx/readIdx */
if (da && !pa) {
/* need to translate da->pa */
status = ProcMgr_translateAddr(
- procH[syslink_firmware[i].proc_id],
+ procH[ipc_firmware[i].proc_id],
(Ptr *) &pa,
ProcMgr_AddrType_MasterPhys,
(Ptr) da,
}
else {
GT_setFailureReason(curTrace, GT_4CLASS,
- "init_syslink_trace_device",
+ "init_ipc_trace_device",
status, "not performing ProcMgr_translate");
}
/* map length aligned to page size */
+ sizeof(uint32_t));
if (proc_traces[i].va == MAP_DEVICE_FAILED) {
GT_setFailureReason(curTrace, GT_4CLASS,
- "init_syslink_trace_device",
+ "init_ipc_trace_device",
status, "mmap_device_io failed");
GT_1trace(curTrace, GT_4CLASS, "errno %d", errno);
proc_traces[i].va = NULL;
}
else {
GT_setFailureReason(curTrace, GT_4CLASS,
- "init_syslink_trace_device",
+ "init_ipc_trace_device",
status, "RscTable_getInfo failed");
proc_traces[i].va = NULL;
}
- if (-1 == (dev->syslink.resmgr_id_trace[i] =
+ if (-1 == (dev->ipc.resmgr_id_trace[i] =
resmgr_attach(dev->dpp, &resmgr_attr,
- dev->syslink.device_name, _FTYPE_ANY, 0,
- &dev->syslink.cfuncs_trace[i],
- &dev->syslink.iofuncs_trace[i],
+ dev->ipc.device_name, _FTYPE_ANY, 0,
+ &dev->ipc.cfuncs_trace[i],
+ &dev->ipc.iofuncs_trace[i],
&trace_attr->attr))) {
GT_setFailureReason(curTrace, GT_4CLASS,
- "init_syslink_trace_device",
+ "init_ipc_trace_device",
status, "resmgr_attach failed");
return(-1);
}
return (status);
}
-int deinit_syslink_trace_device(syslink_dev_t *dev)
+int deinit_ipc_trace_device(ipc_dev_t *dev)
{
int status = EOK;
int i = 0;
- for (i = 0; i < syslink_num_cores; i++) {
+ for (i = 0; i < ipc_num_cores; i++) {
/* Only disable trace device on cores in RESET state */
- if ((syslink_firmware[i].procState == RESET_STATE) &&
+ if ((ipc_firmware[i].procState == RESET_STATE) &&
(proc_traces[i].va != NULL)) {
- status = resmgr_detach(dev->dpp, dev->syslink.resmgr_id_trace[i],
+ status = resmgr_detach(dev->dpp, dev->ipc.resmgr_id_trace[i],
0);
if (status < 0) {
Osal_printf("IPC: resmgr_detach of trace device %d failed: %d",
return (status);
}
-/* Initialize the syslink device */
-int init_syslink_device(syslink_dev_t *dev)
+/* Initialize the ipc device */
+int init_ipc_device(ipc_dev_t *dev)
{
iofunc_attr_t * attr;
resmgr_attr_t resmgr_attr;
resmgr_attr.nparts_max = 10;
resmgr_attr.msg_max_size = 2048;
- memset(&dev->syslink.mattr, 0, sizeof(iofunc_mount_t));
- dev->syslink.mattr.flags = ST_NOSUID | ST_NOEXEC;
- dev->syslink.mattr.conf = IOFUNC_PC_CHOWN_RESTRICTED |
+ memset(&dev->ipc.mattr, 0, sizeof(iofunc_mount_t));
+ dev->ipc.mattr.flags = ST_NOSUID | ST_NOEXEC;
+ dev->ipc.mattr.conf = IOFUNC_PC_CHOWN_RESTRICTED |
IOFUNC_PC_NO_TRUNC |
IOFUNC_PC_SYNC_IO;
- dev->syslink.mattr.funcs = &dev->syslink.mfuncs;
+ dev->ipc.mattr.funcs = &dev->ipc.mfuncs;
- memset(&dev->syslink.mfuncs, 0, sizeof(iofunc_funcs_t));
- dev->syslink.mfuncs.nfuncs = _IOFUNC_NFUNCS;
+ memset(&dev->ipc.mfuncs, 0, sizeof(iofunc_funcs_t));
+ dev->ipc.mfuncs.nfuncs = _IOFUNC_NFUNCS;
- iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->syslink.cfuncs,
- _RESMGR_IO_NFUNCS, &dev->syslink.iofuncs);
+ iofunc_func_init(_RESMGR_CONNECT_NFUNCS, &dev->ipc.cfuncs,
+ _RESMGR_IO_NFUNCS, &dev->ipc.iofuncs);
- iofunc_attr_init(attr = &dev->syslink.cattr, S_IFCHR | 0777, NULL, NULL);
+ iofunc_attr_init(attr = &dev->ipc.cattr, S_IFCHR | 0777, NULL, NULL);
- dev->syslink.mfuncs.ocb_calloc = syslink_ocb_calloc;
- dev->syslink.mfuncs.ocb_free = syslink_ocb_free;
- dev->syslink.iofuncs.devctl = syslink_devctl;
- dev->syslink.iofuncs.unblock = syslink_unblock;
+ dev->ipc.mfuncs.ocb_calloc = ipc_ocb_calloc;
+ dev->ipc.mfuncs.ocb_free = ipc_ocb_free;
+ dev->ipc.iofuncs.devctl = ipc_devctl;
+ dev->ipc.iofuncs.unblock = ipc_unblock;
- attr->mount = &dev->syslink.mattr;
+ attr->mount = &dev->ipc.mattr;
iofunc_time_update(attr);
- if (-1 == (dev->syslink.resmgr_id =
+ if (-1 == (dev->ipc.resmgr_id =
resmgr_attach(dev->dpp, &resmgr_attr,
IPC_DEVICE_PATH, _FTYPE_ANY, 0,
- &dev->syslink.cfuncs,
- &dev->syslink.iofuncs, attr))) {
+ &dev->ipc.cfuncs,
+ &dev->ipc.iofuncs, attr))) {
return(-1);
}
return status;
}
- status = init_syslink_trace_device(dev);
+ status = init_ipc_trace_device(dev);
if (status < 0) {
return status;
}
return(0);
}
-/* De-initialize the syslink device */
-int deinit_syslink_device(syslink_dev_t *dev)
+/* De-initialize the ipc device */
+int deinit_ipc_device(ipc_dev_t *dev)
{
int status = EOK;
- status = resmgr_detach(dev->dpp, dev->syslink.resmgr_id, 0);
+ status = resmgr_detach(dev->dpp, dev->ipc.resmgr_id, 0);
if (status < 0) {
Osal_printf("IPC: resmgr_detach of %s failed: %d",
IPC_DEVICE_PATH, errno);
status = errno;
}
- status = deinit_syslink_trace_device(dev);
+ status = deinit_ipc_trace_device(dev);
if (status < 0) {
- Osal_printf("IPC: deinit_syslink_trace_device failed %d", status);
+ Osal_printf("IPC: deinit_ipc_trace_device failed %d", status);
}
status = deinit_slave_devices(dev);
/* Initialize the devices */
-int init_devices(syslink_dev_t *dev)
+int init_devices(ipc_dev_t *dev)
{
- if (init_syslink_device(dev) < 0) {
+ if (init_ipc_device(dev) < 0) {
Osal_printf("IPC: device init failed");
return(-1);
}
/* De-initialize the devices */
-int deinit_devices(syslink_dev_t *dev)
+int deinit_devices(ipc_dev_t *dev)
{
int status = EOK;
- if ((status = deinit_syslink_device(dev)) < 0) {
+ if ((status = deinit_ipc_device(dev)) < 0) {
fprintf( stderr, "IPC: device de-init failed %d\n", status);
status = errno;
}
static void ipc_recover(Ptr args)
{
- syslink_dev_t * dev = (syslink_dev_t *)args;
+ ipc_dev_t * dev = (ipc_dev_t *)args;
if (!disableRecovery) {
- /* Protect the syslink_firmware array as we recover */
+ /* Protect the ipc_firmware array as we recover */
pthread_mutex_lock(&dev->firmwareLock);
- deinit_ipc(dev, syslink_firmware, TRUE);
- deinit_syslink_trace_device(dev);
- init_ipc(dev, syslink_firmware, TRUE);
- init_syslink_trace_device(dev);
+ deinit_ipc(dev, ipc_firmware, TRUE);
+ deinit_ipc_trace_device(dev);
+ init_ipc(dev, ipc_firmware, TRUE);
+ init_ipc_trace_device(dev);
pthread_mutex_unlock(&dev->firmwareLock);
}
else {
}
}
-Int syslink_error_cb (UInt16 procId, ProcMgr_Handle handle,
+Int ipc_error_cb (UInt16 procId, ProcMgr_Handle handle,
ProcMgr_State fromState, ProcMgr_State toState,
ProcMgr_EventStatus status, Ptr args)
{
Int ret = 0;
String errString = NULL;
- syslink_dev_t * dev = (syslink_dev_t *)args;
+ ipc_dev_t * dev = (ipc_dev_t *)args;
if (status == ProcMgr_EventStatus_Event) {
switch (toState) {
break;
}
GT_2trace (curTrace, GT_4CLASS,
- "syslink_error_cb: Received Error Callback for %s : %s\n",
+ "ipc_error_cb: Received Error Callback for %s : %s\n",
MultiProc_getName(procId), errString);
/* Don't allow re-schedule of recovery until complete */
pthread_mutex_lock(&dev->lock);
dev->recover = TRUE;
/* Activate a thread to handle the recovery. */
GT_0trace (curTrace, GT_4CLASS,
- "syslink_error_cb: Scheduling recovery...");
+ "ipc_error_cb: Scheduling recovery...");
OsalThread_activate(dev->ipc_recovery_work);
}
else {
GT_0trace (curTrace, GT_4CLASS,
- "syslink_error_cb: Recovery already scheduled.");
+ "ipc_error_cb: Recovery already scheduled.");
}
pthread_mutex_unlock(&dev->lock);
}
else if (status == ProcMgr_EventStatus_Canceled) {
GT_1trace (curTrace, GT_3CLASS,
- "SysLink Error Callback Cancelled for %s",
+ "Ipc Error Callback Cancelled for %s",
MultiProc_getName(procId));
}
else {
GT_1trace (curTrace, GT_4CLASS,
- "SysLink Error Callback Unexpected Event for %s",
+ "Ipc Error Callback Unexpected Event for %s",
MultiProc_getName(procId));
}
}
/*
- * Initialize the syslink ipc
+ * Initialize ipc
*
* This function sets up the "kernel"-side IPC modules, and does any special
* initialization required for QNX and the platform being used. This function
* also registers for error notifications and initializes the recovery thread.
*/
-int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware, bool recover)
+int init_ipc(ipc_dev_t * dev, ipc_firmware_info * firmware, bool recover)
{
int status = 0;
Ipc_Config iCfg;
@@ -1317,7 +1317,7 @@ int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware, bool recover
memset(procH_fileId, 0, sizeof(procH_fileId));
- for (i = 0; i < syslink_num_cores; i++) {
+ for (i = 0; i < ipc_num_cores; i++) {
procId = firmware[i].proc_id = MultiProc_getId(firmware[i].proc);
if (procId >= MultiProc_MAXPROCESSORS) {
status = -1;
@@ -1374,7 +1374,7 @@ int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware, bool recover
if (status < 0)
goto rpcsetup_fail;
-#if defined(SYSLINK_PLATFORM_VAYU)
+#if defined(IPC_PLATFORM_VAYU)
if (gatempEnabled) {
Int32 sr0ProcId;
@@ -1405,7 +1405,7 @@ int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware, bool recover
goto exit;
}
-#if defined(SYSLINK_PLATFORM_VAYU)
+#if defined(IPC_PLATFORM_VAYU)
gatempsetup_fail:
NameServer_destroy();
nameserversetup_fail:
if (procId >= MultiProc_MAXPROCESSORS) {
continue;
}
- ProcMgr_unregisterNotify(procH[procId], syslink_error_cb,
+ ProcMgr_unregisterNotify(procH[procId], ipc_error_cb,
(Ptr)dev, errStates);
if (!firmware[i].attachOnly) {
ProcMgr_stop(procH[procId]);
return status;
}
-int deinit_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware,
+int deinit_ipc(ipc_dev_t * dev, ipc_firmware_info * firmware,
bool recover)
{
int status = EOK;
}
}
-#if defined(SYSLINK_PLATFORM_VAYU)
+#if defined(IPC_PLATFORM_VAYU)
if (gatempEnabled) {
GateMP_destroy(TRUE);
Osal_printf("IPC: printing remote core trace dump");
log = fopen(logFilename, "a+");
if (log) {
- for (id = 0; id < syslink_num_cores; id++) {
+ for (id = 0; id < ipc_num_cores; id++) {
if (firmware[id].procState == RUNNING_STATE) {
if (proc_traces[id].va) {
/* print traces */
}
/* After printing trace, set all processor states to RESET */
- for (id = 0; id < syslink_num_cores; id++) {
+ for (id = 0; id < ipc_num_cores; id++) {
firmware[id].procState = RESET_STATE;
}
static Void printUsage (Char * app)
{
printf("\n\nUsage:\n");
-#if defined(SYSLINK_PLATFORM_OMAP5430)
+#if defined(IPC_PLATFORM_OMAP5430)
printf("\n%s: [-HTdca] <core_id1> <executable1> [<core_id2> <executable2> ...]\n",
app);
printf(" <core_id#> should be set to a core name (e.g. IPU, DSP)\n");
exit (EXIT_SUCCESS);
}
-dispatch_t * syslink_dpp = NULL;
+dispatch_t * ipc_dpp = NULL;
int main(int argc, char *argv[])
{
- syslink_dev_t * dev = NULL;
+ ipc_dev_t * dev = NULL;
thread_pool_attr_t tattr;
int status;
int error = EOK;
switch (c)
{
-#if defined(SYSLINK_PLATFORM_OMAP5430)
+#if defined(IPC_PLATFORM_OMAP5430)
case 'H':
hib_enable = atoi(optarg);
if (hib_enable != 0 && hib_enable != 1) {
case 'v':
verbosity++;
break;
-#if defined(SYSLINK_PLATFORM_VAYU)
+#if defined(IPC_PLATFORM_VAYU)
case 'g':
printf("GateMP support enabled on host\n");
gatempEnabled = true;
/* Now parse the operands, which should be in the format:
* "<multiproc_name> <firmware_file> ..*/
for (; optind + 1 < argc; optind+=2) {
- if (syslink_num_cores == MultiProc_MAXPROCESSORS) {
+ if (ipc_num_cores == MultiProc_MAXPROCESSORS) {
printUsage(argv[0]);
return (error);
}
return (error);
}
- syslink_firmware[syslink_num_cores].proc = argv [optind];
- syslink_firmware[syslink_num_cores].attachOnly =
+ ipc_firmware[ipc_num_cores].proc = argv [optind];
+ ipc_firmware[ipc_num_cores].attachOnly =
((numAttach-- > 0) ? true : false);
- syslink_firmware[syslink_num_cores].reload = true;
- syslink_firmware[syslink_num_cores].freeString = false;
- syslink_firmware[syslink_num_cores++].firmware = argv [optind+1];
+ ipc_firmware[ipc_num_cores].reload = true;
+ ipc_firmware[ipc_num_cores].freeString = false;
+ ipc_firmware[ipc_num_cores++].firmware = argv [optind+1];
}
/* Validate hib_enable args */
return (error);
}
- syslink_hib_enable = (Bool)hib_enable;
- syslink_hib_timeout = hib_timeout;
+ ipc_hib_enable = (Bool)hib_enable;
+ ipc_hib_timeout = hib_timeout;
- /* Init logging for syslink */
+ /* Init logging for ipc */
if (Osal_initlogging(verbosity) != 0) {
return -1;
}
}
/* Get the abs path for all firmware files */
- for (i = 0; i < syslink_num_cores; i++) {
+ for (i = 0; i < ipc_num_cores; i++) {
abs_path = calloc(1, PATH_MAX + 1);
if (abs_path == NULL) {
return -1;
}
- if (NULL == realpath(syslink_firmware[i].firmware, abs_path)) {
+ if (NULL == realpath(ipc_firmware[i].firmware, abs_path)) {
fprintf (stderr, "invalid path to executable\n");
return -1;
}
- syslink_firmware[i].firmware = abs_path;
+ ipc_firmware[i].firmware = abs_path;
}
/* allocate the device structure */
- if (NULL == (dev = calloc(1, sizeof(syslink_dev_t)))) {
+ if (NULL == (dev = calloc(1, sizeof(ipc_dev_t)))) {
Osal_printf("IPC: calloc() failed");
return (-1);
}
}
/* create the dispatch structure */
- if (NULL == (dev->dpp = syslink_dpp = dispatch_create_channel (channelid, 0))) {
+ if (NULL == (dev->dpp = ipc_dpp = dispatch_create_channel (channelid, 0))) {
Osal_printf("IPC: dispatch_create() failed");
return(-1);
}
return(-1);
}
- /* init syslink */
- status = init_ipc(dev, syslink_firmware, FALSE);
+ /* init ipc */
+ status = init_ipc(dev, ipc_firmware, FALSE);
if (status < 0) {
Osal_printf("IPC: init failed");
return(-1);
}
- /* init the syslink device */
+ /* init the ipc device */
status = init_devices(dev);
if (status < 0) {
Osal_printf("IPC: device init failed");
if (error < 0) {
Osal_printf("IPC: thread_pool_destroy returned an error");
}
- deinit_ipc(dev, syslink_firmware, FALSE);
+ deinit_ipc(dev, ipc_firmware, FALSE);
deinit_devices(dev);
free(dev);
/* Free the abs path of firmware files if necessary */
- for (i = 0; i < syslink_num_cores; i++) {
- if ((syslink_firmware[i].freeString) &&
- (syslink_firmware[i].firmware)) {
- free(syslink_firmware[i].firmware);
+ for (i = 0; i < ipc_num_cores; i++) {
+ if ((ipc_firmware[i].freeString) &&
+ (ipc_firmware[i].firmware)) {
+ free(ipc_firmware[i].firmware);
}
}
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/traceDaemon/common.mk b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/traceDaemon/common.mk
index 32e1ae3db105da885898f987f2f85fa41fdd6df3..ecaacf53921ecfe88af3b6e88ee60eed6c4c4848 100644 (file)
-# Copyright (c) 2014, Texas Instruments Incorporated
+# Copyright (c) 2014-2015, Texas Instruments Incorporated
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
NAME = ipc_trace_daemon
INSTALLDIR = bin
-#SYSLINK Product root path
-SYSLINK_ROOT = $(PROJECT_ROOT)/../../../../..
+#IPC Product root path
+IPC_ROOT = $(PROJECT_ROOT)/../../../../..
-EXTRA_INCVPATH = $(SYSLINK_ROOT) \
- $(SYSLINK_ROOT)/ti/syslink/inc \
- $(IPC_REPO)/qnx/include
+EXTRA_INCVPATH = $(IPC_ROOT) \
+ $(IPC_ROOT)/ti/syslink/inc \
+ $(IPC_REPO)/qnx/include \
+ $(IPC_ROOT)/ti/syslink/inc/Qnx
CCOPTS+=-g
CCOPTS+= -O0
LDFLAGS += -M
-EXTRA_SRCVPATH += $(SYSLINK_ROOT)/ti/syslink/family/$(SYSLINK_PLATFORM)
-SRCS += SystemCfg_$(SYSLINK_PLATFORM).c IpcTraceDaemon.c
+EXTRA_SRCVPATH += $(IPC_ROOT)/ti/syslink/family/$(IPC_PLATFORM)
+SRCS += SystemCfg_$(IPC_PLATFORM).c IpcTraceDaemon.c
EXTRA_LIBVPATH += $(IPC_REPO)/qnx/src/utils/arm/a.g.le.v7
LIBS += utils_g
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHal.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHal.c
index 664209cefcfcdbf8f438f7ba36345d29369c9670..32b3b0b09902e4bc2476b740337ebd94a47fa4be 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
halObject->procId = halParams->procId;
status = VAYUDSP_phyShmemInit (*halObj);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
Memory_free (NULL, *halObj, sizeof (VAYUDSP_HalObject));
*halObj = NULL;
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
GT_1trace(curTrace, GT_LEAVE, "VAYUDSP_halInit", status);
GT_assert (curTrace, (halObj != NULL));
status = VAYUDSP_phyShmemExit (halObj);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"VAYUDSP_phyShmemExit failed!");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
if (halObj != NULL) {
/* Free the memory for the HAL object. */
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHalBoot.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHalBoot.c
index 7f772622f09b63e9c9daa292529a37780c97ba14..68069cf9ed0ecf7e35061a6b4439c03f045d884b 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*/
-#if defined(SYSLINK_BUILD_RTOS)
-#include <xdc/std.h>
-#include <xdc/runtime/Error.h>
-#endif /* #if defined(SYSLINK_BUILD_RTOS) */
-
-#if defined(SYSLINK_BUILD_HLOS)
#include <ti/syslink/Std.h>
-#endif /* #if defined(SYSLINK_BUILD_HLOS) */
/* OSAL & Utils headers */
#include <ti/syslink/utils/Trace.h>
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHalReset.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspHalReset.c
index d0de52b4c9ba7934ab8486041457102286e7f203..f976a7277f68b735976216b4b2641b386c10ca53 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(SYSLINK_BUILD_RTOS)
-#include <xdc/std.h>
-#include <xdc/runtime/Error.h>
-#endif /* #if defined(SYSLINK_BUILD_RTOS) */
-
-#if defined(SYSLINK_BUILD_HLOS)
#include <ti/syslink/Std.h>
-#endif /* #if defined(SYSLINK_BUILD_HLOS) */
/* OSAL & Utils headers */
#include <ti/syslink/utils/Trace.h>
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c
index 9554562fbd8647e17e3de17b3dd0405e997c3807..97646d16ebb90a115e1d41e18d7928bcd5ac477d 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*
* @brief VAYUDSPPROC state object variable
*/
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
VAYUDSPPROC_ModuleObject VAYUDSPPROC_state =
{
.isSetup = FALSE,
.defInstParams.numMemEntries = 0
};
-/* config override specified in SysLinkCfg.c, defined in ProcMgr.c */
-extern String ProcMgr_sysLinkCfgParams;
/* =============================================================================
* APIs directly called by applications
GT_assert (curTrace, (cfg != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (cfg == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
Memory_copy (cfg,
&(VAYUDSPPROC_state.defCfg),
sizeof (VAYUDSPPROC_Config));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUDSPPROC_getConfig");
}
/* Create a default gate handle for local module protection. */
VAYUDSPPROC_state.gateHandle = (IGateProvider_Handle)
GateMutex_create ((GateMutex_Params *)NULL, &eb);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUDSPPROC_state.gateHandle == NULL) {
/*! @retval PROCESSOR_E_FAIL Failed to create GateMutex! */
status = PROCESSOR_E_FAIL;
"Failed to create GateMutex!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Copy the user provided values into the state object. */
Memory_copy (&VAYUDSPPROC_state.cfg,
cfg,
0,
(sizeof (VAYUDSPPROC_Handle) * MultiProc_MAXPROCESSORS));
VAYUDSPPROC_state.isSetup = TRUE;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_setup", status);
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (params == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
/* return updated VAYUDSPPROC instance specific parameters */
Memory_copy(params, &(procObject->params), sizeof(VAYUDSPPROC_Params));
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_assert (curTrace, IS_VALID_PROCID (procId));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (!IS_VALID_PROCID (procId)) {
/* Not setting status here since this function does not return status.*/
GT_setFailureReason (curTrace,
"params passed is NULL!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUDSPPROC_state.gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
/* Check if the Processor already exists for specified procId. */
if (VAYUDSPPROC_state.procHandles [procId] != NULL) {
status = PROCESSOR_E_ALREADYEXIST;
"Processor already exists for specified procId!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Allocate memory for the handle */
handle = (Processor_Object *) Memory_calloc (NULL,
sizeof (Processor_Object),
List_Params_init(&listParams);
handle->registeredNotifiers = List_create(&listParams);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->registeredNotifiers == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed */
status = PROCESSOR_E_FAIL;
"List_create failed");
}
else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
handle->notifiersLock =
OsalMutex_create(OsalMutex_Type_Interruptible);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->notifiersLock == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed*/
status = PROCESSOR_E_FAIL;
"OsalMutex_create failed");
}
}
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Leave critical section protection. */
IGateProvider_leave (VAYUDSPPROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status < 0) {
if (handle != NULL) {
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
handle = (Processor_Object *) (*handlePtr);
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUDSPPROC_state.gateHandle);
/* Leave critical section protection. */
IGateProvider_leave (VAYUDSPPROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_delete", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, IS_VALID_PROCID (procId));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid NULL handlePtr specified */
status = PROCESSOR_E_HANDLE;
"Invalid procId specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Initialize return parameter handle. */
*handlePtr = NULL;
else {
*handlePtr = VAYUDSPPROC_state.procHandles [procId];
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_open", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Nothing to be done for close. */
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_close", status);
UInt32 i = 0;
UInt32 index = 0;
ProcMgr_AddrInfo * me;
- SysLink_MemEntry * entry;
- SysLink_MemEntry_Block memBlock;
+ Ipc_MemEntry * entry;
+ Ipc_MemEntry_Block memBlock;
VAYUDSP_HalMmuCtrlArgs_Enable mmuEnableArgs;
VAYUDSP_HalParams halParams;
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
&memBlock.numEntries,
procHandle,
procHandle->bootMode);
- if (status < 0 || memBlock.numEntries > SYSLINK_MAX_MEMENTRIES) {
+ if (status < 0 || memBlock.numEntries > IPC_MAX_MEMENTRIES) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid argument */
status = PROCESSOR_E_INVALIDARG;
GT_setFailureReason (curTrace,
halParams.procId = procHandle->procId;
status = VAYUDSP_halInit(&(object->halObject), &halParams);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUDSPPROC_attach", status,
if ((procHandle->bootMode == ProcMgr_BootMode_Boot)
|| (procHandle->bootMode == ProcMgr_BootMode_NoLoad_Pwr)) {
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUDSPPROC_attach", status,
status = VAYUDSP_halMmuCtrl(object->halObject,
Processor_MmuCtrlCmd_Enable, &mmuEnableArgs);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUDSPPROC_attach", status,
status,
"Reset MMU_Release failed");
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
}
#endif
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
status = VAYUDSP_halResetCtrl(object->halObject,
Processor_ResetCtrlCmd_MMU_Reset);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
/*! @retval status */
GT_setFailureReason (curTrace,
status,
"Reset MMU failed");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
status = VAYUDSP_halMmuCtrl(object->halObject,
Processor_MmuCtrlCmd_Disable, NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUDSPPROC_detach", status,
GT_0trace(curTrace, GT_2CLASS,
"VAYUDSPPROC_detach: Slave processor is now in reset");*/
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if ((tmpStatus < 0) && (status >= 0)) {
status = tmpStatus;
GT_setFailureReason(curTrace,
" VAYUDSPPROC_detach: Unmapping memory regions\n");
tmpStatus = VAYUDSP_halExit (object->halObject);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if ((tmpStatus < 0) && (status >= 0)) {
status = tmpStatus;
GT_setFailureReason (curTrace,
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid params specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUDSPPROC_Object *) procHandle->object;
GT_assert (curTrace, (object != NULL));
if ( (procHandle->bootMode == ProcMgr_BootMode_Boot)
status = VAYUDSP_halBootCtrl (object->halObject,
Processor_BootCtrlCmd_SetEntryPoint,
(Ptr) entryPt);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Failed to set slave boot entry point");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
status = rproc_dsp_setup(object->halObject,
object->params.memEntries,
object->params.numMemEntries);
if (status >= 0) {
status = VAYUDSP_halResetCtrl(object->halObject,
Processor_ResetCtrlCmd_Release);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"Failed to release slave from reset");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status >= 0) {
GT_0trace (curTrace,
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
GT_0trace (curTrace,
GT_1CLASS,
" VAYUDSPPROC_stop: Slave is now in reset!\n");
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"Failed to place slave in reset");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
rproc_dsp_destroy(object->halObject);
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_stop", status);
/*! @retval PROCESSOR_SUCCESS Operation successful */
GT_assert (curTrace, (numBytes != NULL));
GT_assert (curTrace, (buffer != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid buffer specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
procPtr8 = (UInt8 *) procAddr ;
buffer = Memory_copy (buffer, procPtr8, *numBytes);
GT_assert (curTrace, (buffer != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (buffer == (UInt32) NULL) {
/*! @retval PROCESSOR_E_FAIL Failed in memcpy */
status = PROCESSOR_E_FAIL;
*numBytes = 0;
}
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_read",status);
GT_assert (curTrace, (numBytes != NULL));
GT_assert (curTrace, (buffer != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid buffer specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (*numBytes != sizeof (UInt32)) {
procPtr8 = (UInt8 *) procAddr ;
procAddr = (UInt32) Memory_copy (procPtr8,
buffer,
*numBytes);
GT_assert (curTrace, (procAddr != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (procAddr == (UInt32) NULL) {
/*! @retval PROCESSOR_E_FAIL Failed in Memory_copy */
status = PROCESSOR_E_FAIL;
"Failed in Memory_copy");
*numBytes = 0;
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
else {
/* For 4 bytes, directly write as a UInt32 */
| ((UInt32) temp8_1));
*((UInt32*) procAddr) = temp;
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_write",status);
GT_assert (curTrace, (handle != NULL));
/* cmd and arg can be 0/NULL, so cannot check for validity. */
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* No control operations currently implemented. */
/*! @retval PROCESSOR_E_NOTSUPPORTED No control operations are supported
for this device. */
status = PROCESSOR_E_NOTSUPPORTED;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPROC_control",status);
/*! @retval PROCESSOR_SUCCESS Operation successful */
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (dstAddr != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"VAYUDSPPROC_translate", status,
"srcAddr not found in slave address space");
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_1trace(curTrace, GT_LEAVE,
GT_assert (curTrace, (sglist != NULL));
GT_assert (curTrace, (nSegs > 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
}
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_1trace(curTrace, GT_LEAVE, "VAYUDSPPROC_map", status);
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (size != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
status = VAYUDSP_halMmuCtrl(object->halObject,
Processor_MmuCtrlCmd_DeleteEntry, &deleteEntryArgs);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUDSPPROC_unmap", status,
}
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_1trace(curTrace, GT_LEAVE, "VAYUDSPPROC_unmap", status);
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspPwr.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspPwr.c
index a801bfafa987233c7a386f027cc2a70176355545..aeb71597fac9a1dce9338776674931d8181c5fcf 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
/* Standard headers */
-#if defined(SYSLINK_BUILD_RTOS)
-#include <xdc/std.h>
-#include <string.h>
-#include <xdc/runtime/Error.h>
-#include <xdc/runtime/Memory.h>
-#include <xdc/runtime/System.h>
-#include <xdc/runtime/IGateProvider.h>
-#include <ti/sysbios/gates/GateMutex.h>
-#include <ti/syslink/utils/_Memory.h>
-#include <ti/syslink/inc/VAYUClock.h>
-#endif /* #if defined(SYSLINK_BUILD_RTOS) */
-
-#if defined(SYSLINK_BUILD_HLOS)
#include <ti/syslink/Std.h>
/* OSAL & Utils headers */
#include <ti/syslink/utils/String.h>
#include <ti/syslink/utils/GateMutex.h>
#include <ti/syslink/utils/Memory.h>
#include <_MultiProc.h>
-#if defined(__KERNEL__)
-#include <linux/string.h>
-#else
#include <string.h>
-#endif
-#if defined (SYSLINK_BUILDOS_LINUX)
-#include <ti/syslink/inc/knl/Linux/LinuxClock.h>
-#endif /* #if defined(SYSLINK_BUILDOS_LINUX) */
-#endif /* #if defined(SYSLINK_BUILD_HLOS) */
+
#include <ti/syslink/utils/Trace.h>
#include <Bitops.h>
*
* @brief VAYUDSPPWR state object variable
*/
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
VAYUDSPPWR_ModuleObject VAYUDSPPWR_state =
{
.isSetup = FALSE,
GT_assert (curTrace, (cfg != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (cfg == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
memcpy (cfg,
&VAYUDSPPWR_state.defCfg,
sizeof (VAYUDSPPWR_Config));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUDSPPWR_getConfig");
}
/* Create a default gate handle for local module protection. */
VAYUDSPPWR_state.gateHandle = (IGateProvider_Handle)
GateMutex_create ((GateMutex_Params*)NULL, &eb);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUDSPPWR_state.gateHandle == NULL) {
/*! @retval PWRMGR_E_FAIL Failed to create GateMutex! */
status = PWRMGR_E_FAIL;
"Failed to create GateMutex!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Copy the user provided values into the state object. */
Memory_copy (&VAYUDSPPWR_state.cfg,
cfg,
0,
(sizeof (VAYUDSPPWR_Handle) * MultiProc_MAXPROCESSORS));
VAYUDSPPWR_state.isSetup = TRUE;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_setup", status);
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (params == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"passed is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Return updated VAYUDSPPWR instance specific parameters. */
params->reserved = 0;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUDSPPWR_Params_init");
}
GT_assert (curTrace, IS_VALID_PROCID (procId));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (!IS_VALID_PROCID (procId)) {
status = PWRMGR_E_INVALIDARG;
GT_setFailureReason (curTrace,
"params passed is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUDSPPWR_state.gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
/* Check if the PwrMgr already exists for specified procId. */
if (VAYUDSPPWR_state.pwrHandles [procId] != NULL) {
status = PWRMGR_E_ALREADYEXIST;
"PwrMgr already exists for specified procId!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Allocate memory for the handle */
handle = (PwrMgr_Object *) Memory_calloc (NULL,
sizeof (PwrMgr_Object),
"Memory allocation failed for handle!");
}
else {
-#if defined (SYSLINK_BUILDOS_LINUX)
- ((VAYUDSPPWR_Object *)(handle->object))->clockHandle
- = (ClockOps_Handle) LinuxClock_create();
-#endif/* #if defined (SYSLINK_BUILDOS_LINUX) */
-#if defined (SYSLINK_BUILD_RTOS)
- ((VAYUDSPPWR_Object *)(handle->object))->clockHandle
- = (ClockOps_Handle) VAYUCLOCK_create();
-#endif/* #if defined (SYSLINK_BUILD_RTOS) */
handle->procId = procId;
VAYUDSPPWR_state.pwrHandles [procId] =
(VAYUDSPPWR_Handle) handle;
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Leave critical section protection. */
IGateProvider_leave (VAYUDSPPWR_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status < 0) {
if (handle != NULL) {
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PWRMGR_E_INVALIDARG Invalid NULL handlePtr specified*/
status = PWRMGR_E_INVALIDARG;
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
handle = (PwrMgr_Object *) (*handlePtr);
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUDSPPWR_state.gateHandle);
/* Free memory used for the VAYUDSPPWR object. */
if (handle->object != NULL) {
/* Free memory used for the clock handle */
-#if defined (SYSLINK_BUILDOS_LINUX)
- LinuxClock_delete(((VAYUDSPPWR_Object *)(handle->object))->clockHandle);
-#endif /* #if defined (SYSLINK_BUILDOS_LINUX) */
-#if defined (SYSLINK_BUILD_RTOS)
- VAYUCLOCK_delete(((VAYUDSPPWR_Object *)(handle->object))->clockHandle);
-#endif /* #if defined (SYSLINK_BUILD_RTOS) */
Memory_free (NULL,
object,
sizeof (VAYUDSPPWR_Object));
/* Leave critical section protection. */
IGateProvider_leave (VAYUDSPPWR_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_delete", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, IS_VALID_PROCID (procId));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid NULL handlePtr specified */
status = PWRMGR_E_HANDLE;
"Invalid procId specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Initialize return parameter handle. */
*handlePtr = NULL;
else {
*handlePtr = VAYUDSPPWR_state.pwrHandles [procId];
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_open", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PWRMGR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Nothing to be done for close. */
*handlePtr = NULL;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_close", status);
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUDSPPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
/* Map and get the virtual address for system control module */
mapInfo.size = PRCM_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping prcm module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object->prcmVA = mapInfo.dst;
/* Map and get the virtual address for system control module */
mapInfo.size = CTRL_MODULE_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping prcm module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object->controlVA = mapInfo.dst;
/* Map and get the virtual address for system l2 ram */
mapInfo.size = GEM_L2RAM_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping prcm module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object->l2baseVA = mapInfo.dst;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
}
}
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/*! @retval PWRMGR_SUCCESS Operation successful */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_attach", status);
return (status);
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUDSPPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping prcm module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
}
if (object->prcmVA != 0x0) {
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping prcm module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
}
if (object->l2baseVA != 0x0) {
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUDSPPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping prcm module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_detach", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUDSPPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
/* Enable spinlocks, mailbox and timers before powering on dsp */
object->dspSpinlockHandle = ClockOps_get(object->clockHandle, "spinbox_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspSpinlockHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspSpinlockHandle);
if (status < 0) {
"ClockOps_enable failed");
}
object->dspMailboxHandle = ClockOps_get(object->clockHandle, "mailbox_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspMailboxHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspMailboxHandle);
GT_assert (curTrace, (status >= 0));
*/
object->dspTimerIclkHandle = ClockOps_get(object->clockHandle, "gpt4_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspTimerIclkHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspTimerIclkHandle);
GT_assert (curTrace, (status >= 0));
object->dspTimerFclkHandle = ClockOps_get(object->clockHandle, "gpt4_fck");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspTimerFclkHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspTimerFclkHandle);
GT_assert (curTrace, (status >= 0));
/* Enable Dsp MMU clocks */
object->dspMmuCfgClkHandle = ClockOps_get(object->clockHandle, "mmu_cfg_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspMmuCfgClkHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspMmuCfgClkHandle);
GT_assert (curTrace, (status >= 0));
object->dspMmuClkHandle = ClockOps_get(object->clockHandle, "mmu_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (object->dspMmuClkHandle != NULL));
status = ClockOps_enable(object->clockHandle, object->dspMmuClkHandle);
GT_assert (curTrace, (status >= 0));
status = ClockOps_enable(object->clockHandle, object->dspClkHandle);
GT_assert (curTrace, (status >= 0));
- /* Warm Reset to access Internal RAM of DSP - to access internal RAM */
-// REG((object->prcmVA) + RM_ACTIVE_RSTCTRL) = 0x01;
+ /* Warm Reset to access Internal RAM of DSP - to access internal RAM */
+// REG((object->prcmVA) + RM_ACTIVE_RSTCTRL) = 0x01;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_on", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
#endif /*#if !defined (NETRA_SIMULATOR)*/
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUDSPPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
ClockOps_put(object->clockHandle, object->dspSpinlockHandle);
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUDSPPWR_off", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
return (status);
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuHal.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuHal.c
index 2b6199bf4491900203263d05f656f3b6d0c0a39a..ac41e3af5e2946517fdb6dc0e85d1f109e2f730d 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
halObject->procId = halParams->procId;
status = VAYUIPU_phyShmemInit (*halObj);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
Memory_free (NULL, *halObj, sizeof (VAYUIPU_HalObject));
*halObj = NULL;
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
GT_1trace (curTrace, GT_LEAVE, "VAYUIPU_halInit", status);
GT_assert (curTrace, (halObj != NULL));
status = VAYUIPU_phyShmemExit (halObj);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"VAYUIPU_phyShmemExit failed!");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
if (halObj != NULL) {
/* Free the memory for the HAL object. */
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuHalBoot.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuHalBoot.c
index f9bf778f5b0c450f1c650417e4db80cb701c2770..66fd2a292bdb66734b6468f2c575ec31bfaa93b8 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*/
-#if defined(SYSLINK_BUILD_RTOS)
-#include <xdc/std.h>
-#include <xdc/runtime/Error.h>
-#endif /* #if defined(SYSLINK_BUILD_RTOS) */
-
-#if defined(SYSLINK_BUILD_HLOS)
#include <ti/syslink/Std.h>
-#endif /* #if defined(SYSLINK_BUILD_HLOS) */
/* OSAL & Utils headers */
#include <ti/syslink/utils/Trace.h>
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuMmu.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuMmu.c
index d29fe98d339091b75d40d0bd5864f49aa88cde9e..b4ed0ae876bac5dc2bc4a4ad5add5999679a5580 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
GT_setFailureReason (curTrace,
"Invalid handle specified");
}
else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
#if 0 // TODO: move enabling of MMU to this phase?
/* M4_0 and M4_1 should be taken out of reset after this
and that is done is reset code*/
#endif
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUMMU_enable");
}
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
GT_setFailureReason (curTrace,
"Invalid handle specified");
}
else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
#if 0 // TODO: Move disabling of MMU to here?
/* DO NOT Disable the Ipu Logic*/
#endif
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUMMU_disable");
}
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuPwr.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/VAYUIpuPwr.c
index 46d6747c3dbff254d2783fb541d5172b833b906e..07bf6b2a3c9e6bf2778bdc2ad895e37dc8af3a72 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*
* @brief VAYUIPUPWR state object variable
*/
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
VAYUIPUPWR_ModuleObject VAYUIPUPWR_state =
{
.isSetup = FALSE,
GT_assert (curTrace, (cfg != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (cfg == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (VAYUIPUPWR_state.refCount == 0) {
memcpy (cfg,
&VAYUIPUPWR_state.cfg,
sizeof (VAYUIPUPWR_Config));
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUPWR_getConfig");
}
IArg key;
Error_Block eb;
-#if defined(SYSLINK_BUILD_RTOS)
- Error_init(&eb);
-#endif /* #if defined(SYSLINK_BUILD_RTOS) */
-#if defined(SYSLINK_BUILD_HLOS)
eb = 0;
-#endif /* #if defined(SYSLINK_BUILD_HLOS) */
GT_1trace (curTrace, GT_ENTER, "VAYUIPUPWR_setup", cfg);
if (cfg == NULL) {
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
status = VAYUIPUPWR_E_INVALIDSTATE;
GT_setFailureReason (curTrace,
"Module was not initialized!");
}
else {
-#endif /* !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
key = Gate_enterSystem();
VAYUIPUPWR_state.refCount--;
Gate_leaveSystem(key);
}
VAYUIPUPWR_state.isSetup = FALSE;
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_destroy", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
GT_assert (curTrace, (params != NULL));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"passed is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
params->reserved = 0;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUPWR_Params_init");
}
GT_assert (curTrace, (params != NULL));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"params passed is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUPWR_state.gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
/* Check if the PwrMgr already exists for specified procId. */
if (VAYUIPUPWR_state.pwrHandles [procId] != NULL) {
status = PWRMGR_E_ALREADYEXIST;
"PwrMgr already exists for specified procId!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Allocate memory for the handle */
handle = (PwrMgr_Object *) Memory_calloc (NULL,
sizeof (PwrMgr_Object),
"Memory allocation failed for handle!");
}
else {
-#if defined (SYSLINK_BUILDOS_LINUX)
- ((VAYUIPUPWR_Object *)handle->object)->clockHandle
- = (ClockOps_Handle) LinuxClock_create();
-#endif/* #if defined (SYSLINK_BUILDOS_LINUX) */
-#if defined (SYSLINK_BUILD_RTOS)
- ((VAYUIPUPWR_Object *)handle->object)->clockHandle
- = (ClockOps_Handle) VAYUCLOCK_create();
-#endif/* #if defined (SYSLINK_BUILD_RTOS) */
handle->procId = procId;
VAYUIPUPWR_state.pwrHandles [procId] =
(VAYUIPUPWR_Handle) handle;
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUPWR_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status < 0) {
if (handle != NULL) {
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
handle = (PwrMgr_Object *) (*handlePtr);
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUPWR_state.gateHandle);
/* Free memory used for the VAYUIPUPWR object. */
if (handle->object != NULL) {
/* Free memory used for the clock handle */
-#if defined (SYSLINK_BUILDOS_LINUX)
- LinuxClock_delete(((VAYUIPUPWR_Object *)handle->object)->clockHandle);
-#endif /* #if defined (SYSLINK_BUILDOS_LINUX) */
-#if defined (SYSLINK_BUILD_RTOS)
- VAYUCLOCK_delete(((VAYUIPUPWR_Object *)handle->object)->clockHandle);
-#endif /* #if defined (SYSLINK_BUILD_RTOS) */
Memory_free (NULL,
object,
sizeof (VAYUIPUPWR_Object));
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUPWR_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_delete", status);
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid procId specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Initialize return parameter handle. */
*handlePtr = NULL;
else {
*handlePtr = VAYUIPUPWR_state.pwrHandles [procId];
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_open", status);
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
/* Nothing to be done for close. */
*handlePtr = NULL;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_close", status);
GT_assert (curTrace, (params != NULL));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
/* Map and get the virtual address for PRCM registers */
mapInfo.size = PRCM_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping prcm module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object->prcmVA = mapInfo.dst;
/* Map and get the virtual address for MMU registers */
if (handle->procId == ipu1ProcId) {
mapInfo.size = MMU_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping ipummu module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object->ipuMmuVA = mapInfo.dst;
/* Map and get the virtual address for the control module */
if (handle->procId == ipu1ProcId) {
mapInfo.size = CM_SIZE;
mapInfo.isCached = FALSE;
status = Memory_map (&mapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
"Failure in mapping ipubase module");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object->ipubaseVA = mapInfo.dst;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
}
}
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_attach", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping prcm module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
}
/* Unmap the virtual address for mmu base*/
unmapInfo.addr = object->ipuMmuVA;
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping ipuMmu module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
}
/* Unmap the virtual address for ipu control base */
unmapInfo.isCached = FALSE;
if (unmapInfo.addr != 0) {
status = Memory_unmap (&unmapInfo);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (status < 0) {
status = VAYUIPUPWR_E_FAIL;
GT_setFailureReason (curTrace,
status,
"Failure in mapping ipuMmu module");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_detach", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Module was not initialized!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* This sets the refCount variable is not initialized, upper 16 bits is
* written with module Id to ensure correctness of refCount variable.
*/
}
else {
Gate_leaveSystem(key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)&& defined(SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE)&& defined(IPC_BUILD_HLOS)
if (handle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
GT_assert (curTrace, (object != NULL));
VAYUIPUPWR_state.ipuSpinlockHandle
= ClockOps_get(object->clockHandle, "spinbox_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace,
(VAYUIPUPWR_state.ipuSpinlockHandle != NULL));
status = ClockOps_enable(object->clockHandle,
VAYUIPUPWR_state.ipuMailboxHandle
= ClockOps_get(object->clockHandle, "mailbox_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
GT_assert (curTrace, (VAYUIPUPWR_state.ipuMailboxHandle != NULL));
status = ClockOps_enable(object->clockHandle,
VAYUIPUPWR_state.ipuMailboxHandle);
/* poer on ipu */
VAYUIPUPWR_state.ipuClkHandle
= ClockOps_get(object->clockHandle, "ipu_ick");
- /* Do not put this check under SYSLINK_BUILD_OPTIMIZE */
+ /* Do not put this check under IPC_BUILD_OPTIMIZE */
if (VAYUIPUPWR_state.ipuClkHandle == NULL) {
/*! @retval PWRMGR_E_HANDLE Invalid argument */
status = PWRMGR_E_HANDLE;
/* Complete the remaining power sequence here*/
VAYUIPUMMU_enable(pwrMgrHandle);
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS)*/
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS)*/
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)*/
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)*/
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_on", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
return (status);
GT_assert (curTrace, (VAYUIPUPWR_state.refCount != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUPWR_state.refCount == 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
object = (VAYUIPUPWR_Object *) pwrMgrHandle->object;
key = Gate_enterSystem();
VAYUIPUPWR_state.pwrstateRefCount--;
VAYUIPUPWR_state.ipuClkHandle);
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined(SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined(IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUPWR_off", status);
/*! @retval PWRMGR_SUCCESS Operation successful */
return (status);
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0HalReset.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0HalReset.c
index 06dd59f5b268427ac8e4048cdf6b9704d8c6681f..0119342362fa4aa04ddabf1b4e46d004241cfa56 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
switch (cmd) {
case Processor_ResetCtrlCmd_Reset:
{
-#ifdef SYSLINK_SYSBIOS_SMP
+#ifdef IPC_SYSBIOS_SMP
/*Put Benelli M4_0 and M4_1 to Reset*/
/* Put IPU core 0 and core 1 into reset */
SETBITREG32(prmBase + RM_IPU_RSTCTRL_OFFSET, 1);
case Processor_ResetCtrlCmd_Release:
{
-#ifdef SYSLINK_SYSBIOS_SMP
+#ifdef IPC_SYSBIOS_SMP
/*Bring Benelli M4_0 and M4_1 out of Reset*/
/* De-assert RST1 and RST2, and clear the Reset status */
Osal_printf("De-assert RST1\n");
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c
index 0c13a7e9dd52d533c6ce47e89ea4d1149699b1f8..7e596a6cf7a91a18137e0d64263c99f6b31dec0a 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*
* @brief VAYUIPUCORE0PROC state object variable
*/
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
VAYUIPUCORE0PROC_ModuleObject VAYUIPUCORE0PROC_state =
{
.isSetup = FALSE,
.defInstParams.numMemEntries = 0,
};
-/* config override specified in SysLinkCfg.c, defined in ProcMgr.c */
-extern String ProcMgr_sysLinkCfgParams;
/* =============================================================================
* APIs directly called by applications
GT_assert (curTrace, (cfg != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (cfg == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
Memory_copy (cfg,
&(VAYUIPUCORE0PROC_state.defCfg),
sizeof (VAYUIPUCORE0PROC_Config));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_getConfig");
}
/* Create a default gate handle for local module protection. */
VAYUIPUCORE0PROC_state.gateHandle = (IGateProvider_Handle)
GateMutex_create ((GateMutex_Params*)NULL, &eb);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (VAYUIPUCORE0PROC_state.gateHandle == NULL) {
/*! @retval PROCESSOR_E_FAIL Failed to create GateMutex! */
status = PROCESSOR_E_FAIL;
"Failed to create GateMutex!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Copy the user provided values into the state object. */
Memory_copy (&VAYUIPUCORE0PROC_state.cfg,
cfg,
VAYUIPUCORE0PROC_state.ipu1ProcId = MultiProc_getId("IPU1");
VAYUIPUCORE0PROC_state.isSetup = TRUE;
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_setup", status);
GT_assert(curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (params == NULL) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE0PROC_Params_init",
Memory_copy(params, &(procObject->params),
sizeof(VAYUIPUCORE0PROC_Params));
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_assert (curTrace, IS_VALID_PROCID (procId));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (!IS_VALID_PROCID (procId)) {
/* Not setting status here since this function does not return status.*/
GT_setFailureReason (curTrace,
"params passed is NULL!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUCORE0PROC_state.gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
/* Check if the Processor already exists for specified procId. */
if (VAYUIPUCORE0PROC_state.procHandles [procId] != NULL) {
status = PROCESSOR_E_ALREADYEXIST;
"Processor already exists for specified procId!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Allocate memory for the handle */
handle = (Processor_Object *) Memory_calloc (NULL,
sizeof (Processor_Object),
List_Params_init(&listParams);
handle->registeredNotifiers = List_create(&listParams);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->registeredNotifiers == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed */
status = PROCESSOR_E_FAIL;
"List_create failed");
}
else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
handle->notifiersLock =
OsalMutex_create(OsalMutex_Type_Interruptible);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->notifiersLock == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed*/
status = PROCESSOR_E_FAIL;
"OsalMutex_create failed");
}
}
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUCORE0PROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status < 0) {
if (handle != NULL) {
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
handle = (Processor_Object *) (*handlePtr);
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUCORE0PROC_state.gateHandle);
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUCORE0PROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_delete", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, IS_VALID_PROCID (procId));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid NULL handlePtr specified */
status = PROCESSOR_E_HANDLE;
"Invalid procId specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
/* Initialize return parameter handle. */
*handlePtr = NULL;
else {
*handlePtr = VAYUIPUCORE0PROC_state.procHandles [procId];
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_open", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
/* Nothing to be done for close. */
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_close", status);
UInt32 i = 0;
UInt32 index = 0;
ProcMgr_AddrInfo * me;
- SysLink_MemEntry * entry;
- SysLink_MemEntry_Block memBlock;
+ Ipc_MemEntry * entry;
+ Ipc_MemEntry_Block memBlock;
VAYUIPU_HalMmuCtrlArgs_Enable mmuEnableArgs;
VAYUIPU_HalParams halParams;
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
&memBlock.numEntries,
procHandle,
procHandle->bootMode);
- if (status < 0 || memBlock.numEntries > SYSLINK_MAX_MEMENTRIES) {
+ if (status < 0 || memBlock.numEntries > IPC_MAX_MEMENTRIES) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid argument */
status = PROCESSOR_E_INVALIDARG;
GT_setFailureReason (curTrace,
if ((procHandle->bootMode == ProcMgr_BootMode_Boot)
|| (procHandle->bootMode == ProcMgr_BootMode_NoLoad_Pwr)) {
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE0PROC_attach", status,
status,
"Reset MMU_Release failed");
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
}
*/
rproc_enable_fault_interrupt(object->halObject);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE0PROC_attach", status,
GT_0trace(curTrace, GT_1CLASS,
"VAYUIPUCORE0PROC_attach: Slave MMU interrupt is "
"configured");
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
GT_1trace (curTrace, GT_ENTER, "VAYUIPUCORE0PROC_detach", handle);
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
status = VAYUIPUCORE0_halResetCtrl(object->halObject,
Processor_ResetCtrlCmd_MMU_Reset);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
/*! @retval status */
GT_setFailureReason (curTrace,
status,
"Reset MMU failed");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
else {
status = rproc_disable_fault_interrupt(object->halObject);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
/*! @retval status */
GT_setFailureReason (curTrace,
status,
"rproc_disable_fault_interrupt failed");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
if (status >= 0) {
status = VAYUIPU_halMmuCtrl(object->halObject,
Processor_MmuCtrlCmd_Disable, NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE0PROC_detach", status,
GT_0trace(curTrace, GT_2CLASS,
"VAYUIPUCORE0PROC_detach: Slave processor is now in reset");*/
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if ((tmpStatus < 0) && (status >= 0)) {
status = tmpStatus;
GT_setFailureReason (curTrace,
" VAYUIPUCORE0PROC_detach: Unmapping memory regions\n");
tmpStatus = VAYUIPU_halExit (object->halObject);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if ((tmpStatus < 0) && (status >= 0)) {
status = tmpStatus;
GT_setFailureReason (curTrace,
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid params specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
object = (VAYUIPUCORE0PROC_Object *) procHandle->object;
GT_assert (curTrace, (object != NULL));
if ( (procHandle->bootMode == ProcMgr_BootMode_Boot)
status = VAYUIPU_halBootCtrl (object->halObject,
Processor_BootCtrlCmd_SetEntryPoint,
(Ptr) entryPt);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"Failed to set slave boot entry point");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
status = rproc_ipu_setup(object->halObject,
object->params.memEntries,
object->params.numMemEntries);
if (status >= 0) {
status = VAYUIPUCORE0_halResetCtrl(object->halObject,
Processor_ResetCtrlCmd_Release);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"Failed to release slave from reset");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
if (status >= 0) {
GT_0trace (curTrace,
GT_assert (curTrace, (handle != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
object = (VAYUIPUCORE0PROC_Object *) procHandle->object;
GT_assert (curTrace, (object != NULL));
if ( (procHandle->bootMode == ProcMgr_BootMode_Boot)
GT_0trace (curTrace,
GT_1CLASS,
" VAYUIPUCORE0PROC_stop: Slave is now in reset!\n");
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason (curTrace,
GT_4CLASS,
status,
"Failed to place slave in reset");
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
rproc_ipu_destroy(object->halObject);
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_stop", status);
/*! @retval PROCESSOR_SUCCESS Operation successful */
GT_assert (curTrace, (numBytes != NULL));
GT_assert (curTrace, (buffer != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid buffer specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
procPtr8 = (UInt8 *) procAddr ;
buffer = memcpy (buffer, procPtr8, *numBytes);
GT_assert (curTrace, (buffer != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (buffer == (UInt32) NULL) {
/*! @retval PROCESSOR_E_FAIL Failed in memcpy */
status = PROCESSOR_E_FAIL;
*numBytes = 0;
}
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_read",status);
GT_assert (curTrace, (numBytes != NULL));
GT_assert (curTrace, (buffer != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid buffer specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
if (*numBytes != sizeof (UInt32)) {
procPtr8 = (UInt8 *) procAddr ;
procAddr = (UInt32) Memory_copy (procPtr8,
buffer,
*numBytes);
GT_assert (curTrace, (procAddr != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (procAddr == (UInt32) NULL) {
/*! @retval PROCESSOR_E_FAIL Failed in Memory_copy */
status = PROCESSOR_E_FAIL;
"Failed in Memory_copy");
*numBytes = 0;
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
}
else {
/* For 4 bytes, directly write as a UInt32 */
| ((UInt32) temp8_1));
*((UInt32*) procAddr) = temp;
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_write", status);
GT_assert (curTrace, (handle != NULL));
/* cmd and arg can be 0/NULL, so cannot check for validity. */
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"Invalid handle specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
/* No control operations currently implemented. */
/*! @retval PROCESSOR_E_NOTSUPPORTED No control operations are supported
for this device. */
status = PROCESSOR_E_NOTSUPPORTED;
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_control",status);
/*! @retval PROCESSOR_SUCCESS Operation successful */
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (dstAddr != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"VAYUIPUCORE0PROC_translate", status,
"srcAddr not found in slave address space");
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
GT_1trace(curTrace, GT_LEAVE,
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (dstAddr != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
"VAYUIPUCORE0PROC_translateFromPte", status,
"srcAddr not found in slave address space");
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
GT_1trace(curTrace, GT_LEAVE,
GT_assert (curTrace, (sglist != NULL));
GT_assert (curTrace, (nSegs > 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
}
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
GT_1trace(curTrace, GT_LEAVE, "VAYUIPUCORE0PROC_map", status);
GT_assert (curTrace, (handle != NULL));
GT_assert (curTrace, (size != 0));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid argument */
status = PROCESSOR_E_HANDLE;
status = VAYUIPU_halMmuCtrl(object->halObject,
Processor_MmuCtrlCmd_DeleteEntry, &deleteEntryArgs);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (status < 0) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE0PROC_unmap", status,
}
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
}
#endif
GT_1trace(curTrace, GT_LEAVE,
diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore1/VAYUIpuCore1Proc.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore1/VAYUIpuCore1Proc.c
index 677def152d151e19ab3d181f603e997392c9fbb3..fa298e6420877eee1e8569d4ec6b0cd8244a0c1d 100644 (file)
*
* ============================================================================
*
- * Copyright (c) 2013-2014, Texas Instruments Incorporated
+ * Copyright (c) 2013-2015, Texas Instruments Incorporated
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*
* @brief VAYUIPUCORE1PROC state object variable
*/
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
VAYUIPUCORE1PROC_ModuleObject VAYUIPUCORE1PROC_state =
{
.isSetup = FALSE,
.defInstParams.numMemEntries = 0,
};
-/* config override specified in SysLinkCfg.c, defined in ProcMgr.c */
-extern String ProcMgr_sysLinkCfgParams;
/* =============================================================================
* APIs directly called by applications
GT_assert (curTrace, (cfg != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (cfg == NULL) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"is null!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
Memory_copy (cfg,
&(VAYUIPUCORE1PROC_state.defCfg),
sizeof (VAYUIPUCORE1PROC_Config));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_0trace (curTrace, GT_LEAVE, "VAYUIPUCORE1PROC_getConfig");
}
/* Create a default gate handle for local module protection. */
VAYUIPUCORE1PROC_state.gateHandle = (IGateProvider_Handle)
GateMutex_create ((GateMutex_Params*)NULL, &eb);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (VAYUIPUCORE1PROC_state.gateHandle == NULL) {
/*! @retval PROCESSOR_E_FAIL Failed to create GateMutex! */
status = PROCESSOR_E_FAIL;
"Failed to create GateMutex!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Copy the user provided values into the state object. */
Memory_copy (&VAYUIPUCORE1PROC_state.cfg,
cfg,
VAYUIPUCORE1PROC_state.ipu1ProcId = MultiProc_getId("IPU1");
VAYUIPUCORE1PROC_state.isSetup = TRUE;
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE1PROC_setup", status);
GT_assert(curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (params == NULL) {
GT_setFailureReason(curTrace, GT_4CLASS,
"VAYUIPUCORE1PROC_Params_init",
Memory_copy(params, &(procObject->params),
sizeof (VAYUIPUCORE1PROC_Params));
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
#endif
GT_assert (curTrace, IS_VALID_PROCID (procId));
GT_assert (curTrace, (params != NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (!IS_VALID_PROCID (procId)) {
/* Not setting status here since this function does not return status.*/
GT_setFailureReason (curTrace,
"params passed is NULL!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUCORE1PROC_state.gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
/* Check if the Processor already exists for specified procId. */
if (VAYUIPUCORE1PROC_state.procHandles [procId] != NULL) {
status = PROCESSOR_E_ALREADYEXIST;
"Processor already exists for specified procId!");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Allocate memory for the handle */
handle = (Processor_Object *) Memory_calloc (NULL,
sizeof (Processor_Object),
List_Params_init(&listParams);
handle->registeredNotifiers = List_create(&listParams);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->registeredNotifiers == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed */
status = PROCESSOR_E_FAIL;
"List_create failed");
}
else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
handle->notifiersLock =
OsalMutex_create(OsalMutex_Type_Interruptible);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
if (handle->notifiersLock == NULL) {
/*! @retval PROCESSOR_E_FAIL OsalIsr_create failed*/
status = PROCESSOR_E_FAIL;
"OsalMutex_create failed");
}
}
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
}
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUCORE1PROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
if (status < 0) {
if (handle != NULL) {
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
handle = (Processor_Object *) (*handlePtr);
/* Enter critical section protection. */
key = IGateProvider_enter (VAYUIPUCORE1PROC_state.gateHandle);
/* Leave critical section protection. */
IGateProvider_leave (VAYUIPUCORE1PROC_state.gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE1PROC_delete", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, IS_VALID_PROCID (procId));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_HANDLE Invalid NULL handlePtr specified */
status = PROCESSOR_E_HANDLE;
"Invalid procId specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
/* Initialize return parameter handle. */
*handlePtr = NULL;
else {
*handlePtr = VAYUIPUCORE1PROC_state.procHandles [procId];
}
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
}
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS) */
+#endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
GT_1trace (curTrace, GT_LEAVE, "VAYUIPUCORE1PROC_open", status);
GT_assert (curTrace, (handlePtr != NULL));
GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
-#if !defined(SYSLINK_BUILD_OPTIMIZE) && defined (SYSLINK_BUILD_HLOS)
+#if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
if (handlePtr == NULL) {
/*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
specified*/
"Invalid NULL *handlePtr specified");
}
else {
-#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE)