index a89903281645b3bb5963d0224ad9ccfc7fac8658..c39a1e74f17fcaced1465adfbad7b5ea938129eb 100644 (file)
#define ti_srvmgr_OmapRpc__include
#include <ti/grcm/RcmServer.h>
#define ti_srvmgr_OmapRpc__include
#include <ti/grcm/RcmServer.h>
+#include <ti/ipc/mm/MmType.h>
#if defined (__cplusplus)
#if defined (__cplusplus)
* @def OmapRpc_S_SUCCESS
* @brief Operation is successful.
*/
* @def OmapRpc_S_SUCCESS
* @brief Operation is successful.
*/
-#define OmapRpc_S_SUCCESS 0
+#define OmapRpc_S_SUCCESS (0)
/*!
* @def OmapRpc_E_FAIL
* @brief Operation is not successful.
*/
/*!
* @def OmapRpc_E_FAIL
* @brief Operation is not successful.
*/
-#define OmapRpc_E_FAIL -1
+#define OmapRpc_E_FAIL (-1)
#define OmapRpc_NUM_PARAMETERS(size) \
#define OmapRpc_NUM_PARAMETERS(size) \
- (size/sizeof(struct OmapRpc_Parameter))
+ ((size)/sizeof(struct OmapRpc_Parameter))
#define OmapRpc_PAYLOAD(ptr, type) \
((struct type *)&(ptr)[sizeof(struct OmapRpc_MsgHeader)])
#define OmapRpc_PAYLOAD(ptr, type) \
((struct type *)&(ptr)[sizeof(struct OmapRpc_MsgHeader)])
-#define OmapRpc_PARAM(param, type) (param.size == sizeof(type) ? (type)param.data : 0)
+#define OmapRpc_PARAM(param, type) ((param).size == sizeof(type) ? (type)(param).data : 0)
#define OmapRpc_Stringerize(func) #func
#define OmapRpc_Stringerize(func) #func
-#define OmapRpc_dimof(x) (sizeof(x)/sizeof(x[0]))
+#define OmapRpc_dimof(x) (sizeof(x)/sizeof((x)[0]))
#define OmapRpc_DESC_EXEC_SYNC (0x0100)
#define OmapRpc_DESC_EXEC_ASYNC (0x0200)
#define OmapRpc_DESC_EXEC_SYNC (0x0100)
#define OmapRpc_DESC_EXEC_ASYNC (0x0200)
#define OmapRpc_JOBID_DISCRETE (0)
#define OmapRpc_POOLID_DEFAULT (0x8000)
#define OmapRpc_JOBID_DISCRETE (0)
#define OmapRpc_POOLID_DEFAULT (0x8000)
-#define OmapRpc_SET_FXN_IDX(idx) (idx | 0x80000000)
-#define OmapRpc_FXN_MASK(idx) (idx & 0x7FFFFFFF)
+#define OmapRpc_SET_FXN_IDX(idx) ((idx) | 0x80000000)
+#define OmapRpc_FXN_MASK(idx) ((idx) & 0x7FFFFFFF)
#define OMAPRPC_MAX_CHANNEL_NAMELEN (64)
#define OMAPRPC_MAX_FUNC_NAMELEN (64)
#define OMAPRPC_MAX_CHANNEL_NAMELEN (64)
#define OMAPRPC_MAX_FUNC_NAMELEN (64)
OmapRpc_MsgType_FUNCTION_INFO = 3,
/** Ask the ServiceMgr to create a new instance of the service.
* No secondary data is needed. */
OmapRpc_MsgType_FUNCTION_INFO = 3,
/** Ask the ServiceMgr to create a new instance of the service.
* No secondary data is needed. */
- OmapRpc_MsgType_CREATE_INSTANCE = 4,
+ OmapRpc_MsgType_CREATE_INSTANCE = 6,
/** The return message from OMAPRPC_CREATE_INSTANCE,
* contains the new endpoint address in the OmapRpc_InstanceHandle */
/** The return message from OMAPRPC_CREATE_INSTANCE,
* contains the new endpoint address in the OmapRpc_InstanceHandle */
- OmapRpc_MsgType_INSTANCE_CREATED = 5,
+ OmapRpc_MsgType_INSTANCE_CREATED = 8,
/** Ask the Service Mgr to destroy an instance */
/** Ask the Service Mgr to destroy an instance */
- OmapRpc_MsgType_DESTROY_INSTANCE = 6,
+ OmapRpc_MsgType_DESTROY_INSTANCE = 4,
/** The return message from OMAPRPC_DESTROY_INSTANCE.
* contains the old endpoint address in the OmapRpc_InstanceHandle */
OmapRpc_MsgType_INSTANCE_DESTROYED = 7,
/** Ask the Service Instance to call a particular function */
/** The return message from OMAPRPC_DESTROY_INSTANCE.
* contains the old endpoint address in the OmapRpc_InstanceHandle */
OmapRpc_MsgType_INSTANCE_DESTROYED = 7,
/** Ask the Service Instance to call a particular function */
- OmapRpc_MsgType_CALL_FUNCTION = 8,
+ OmapRpc_MsgType_CALL_FUNCTION = 5,
/** The return values from a function call */
OmapRpc_MsgType_FUNCTION_RETURN = 9,
/** Returned from either the ServiceMgr or Service Instance
/** The return values from a function call */
OmapRpc_MsgType_FUNCTION_RETURN = 9,
/** Returned from either the ServiceMgr or Service Instance
OmapRpc_Param_MAX
} OmapRpc_Param_Type;
OmapRpc_Param_MAX
} OmapRpc_Param_Type;
-#define OmapRpc_PtrType(type) (type | OmapRpc_Param_PTR)
+#define OmapRpc_PtrType(type) ((type) | OmapRpc_Param_PTR)
typedef struct OmapRpc_ParamSignature {
UInt32 direction; /**< @see OmapRpc_Direction */
typedef struct OmapRpc_ParamSignature {
UInt32 direction; /**< @see OmapRpc_Direction */
typedef struct OmapRpc_Object *OmapRpc_Handle;
typedef Void (*OmapRpc_SrvDelNotifyFxn)(Void);
typedef struct OmapRpc_Object *OmapRpc_Handle;
typedef Void (*OmapRpc_SrvDelNotifyFxn)(Void);
-OmapRpc_Handle OmapRpc_createChannel(String channelName,
- UInt16 dstProc,
- UInt32 port,
- UInt32 numFuncs,
- OmapRpc_FuncDeclaration* fxns,
- OmapRpc_SrvDelNotifyFxn func);
+#if 0
+OmapRpc_Handle OmapRpc_createChannel(String channelName, UInt16 dstProc,
+ UInt32 port, UInt32 numFuncs, OmapRpc_FuncDeclaration* fxns,
+ OmapRpc_SrvDelNotifyFxn func);
+#else
+OmapRpc_Handle OmapRpc_createChannel(String channelName, UInt16 dstProc,
+ UInt32 port, RcmServer_Params *rcmParams, MmType_FxnSigTab *fxnSigTab,
+ OmapRpc_SrvDelNotifyFxn srvDelCBFunc);
+#endif
Int OmapRpc_deleteChannel(OmapRpc_Handle handle);
Int OmapRpc_deleteChannel(OmapRpc_Handle handle);