Style: Change //-style comments to /* */ style
authorChris Ring <cring@ti.com>
Wed, 22 May 2013 22:49:45 +0000 (15:49 -0700)
committerChris Ring <cring@ti.com>
Wed, 22 May 2013 22:49:45 +0000 (15:49 -0700)
Some users, especially those with MISRA-C requirements, don't
allow //-style comments.

Note that this addresses the files in packages/ti/ipc/*, there may
be more, but I didn't hunt further.

13 files changed:
packages/ti/grcm/RcmClient.h
packages/ti/grcm/RcmServer.c
packages/ti/grcm/RcmServer.h
packages/ti/grcm/RcmTypes.h
packages/ti/ipc/family/omap54xx/VirtQueue.c
packages/ti/ipc/family/vayu/VirtQueue.c
packages/ti/ipc/mm/MmServiceMgr.c
packages/ti/ipc/rpmsg/RPMessage.c
packages/ti/ipc/rpmsg/virtio_ring.h
packages/ti/ipc/tests/Mx.c
packages/ti/ipc/tests/mmrpc_test.c
packages/ti/ipc/tests/test_omx.c
packages/ti/srvmgr/omaprpc/OmapRpc.c

index 133a10a3c089b99ea16cf1232785147e0a5002ee..c27d1944ceb15da1cc0151e8df5cbf27f2331237 100644 (file)
@@ -248,7 +248,7 @@ extern "C" {
 #endif
 
 
-// -------- status codes --------
+/*   -------- status codes --------*/
 
 /*!
  *  @brief Success return code
@@ -393,7 +393,7 @@ extern "C" {
 #define RcmClient_E_JOBIDNOTFOUND (-17)
 
 
-// -------- constants and types --------
+/*   -------- constants and types --------*/
 
 /*!
  *  @brief Invalid function index
@@ -548,7 +548,7 @@ typedef struct {
 } RcmClient_Struct;
 
 
-// -------- functions --------
+/*   -------- functions --------*/
 
 /*
  *  ======== RcmClient_acquireJobId ========
index 168030b010824fa451008eed0e1d99f3e1e72022..40a6b54c7d11a9919413c3833a9d6d2afce810a0 100644 (file)
@@ -58,7 +58,7 @@
 #include <xdc/runtime/knl/Thread.h>
 #include <xdc/runtime/System.h>
 
-#define MSGBUFFERSIZE    512   // Make global and move to RPMessage.h
+#define MSGBUFFERSIZE    512   /* Make global and move to RPMessage.h */
 
 #if defined(RCM_ti_ipc)
 #include <ti/sdo/utils/List.h>
 #include <ti/srvmgr/rpmsg_omx.h>
 #endif
 
-#define _RCM_KeyResetValue 0x07FF       // key reset value
-#define _RCM_KeyMask 0x7FF00000         // key mask in function index
-#define _RCM_KeyShift 20                // key bit position in function index
+#define _RCM_KeyResetValue 0x07FF       /* key reset value*/
+#define _RCM_KeyMask 0x7FF00000         /* key mask in function index*/
+#define _RCM_KeyShift 20                /* key bit position in function index*/
 
-#define RcmServer_MAX_TABLES 9          // max number of function tables
-#define RcmServer_POOL_MAP_LEN 4        // pool map length
+#define RcmServer_MAX_TABLES 9          /* max number of function tables*/
+#define RcmServer_POOL_MAP_LEN 4        /* pool map length*/
 
 #define RcmServer_E_InvalidFxnIdx       (-101)
 #define RcmServer_E_JobIdNotFound       (-102)
 #define RcmServer_E_PoolIdNotFound      (-103)
 
-typedef struct {                        // function table element
+typedef struct {                        /* function table element*/
     String                      name;
 #if USE_RPMESSAGE
     union  {
@@ -112,53 +112,53 @@ typedef struct {
 } RcmServer_FxnTabElemAry;
 
 typedef struct {
-    String                      name;       // pool name
-    Int                         count;      // thread count (at create time)
-    Thread_Priority             priority;   // thread priority
+    String                      name;       /* pool name*/
+    Int                         count;      /* thread count (at create time)*/
+    Thread_Priority             priority;   /* thread priority*/
     Int                         osPriority;
-    SizeT                       stackSize;  // thread stack size
-    String                      stackSeg;   // thread stack placement
-    ISemaphore_Handle           sem;        // message semaphore (counting)
-    List_Struct                 threadList; // list of worker threads
-    List_Struct                 readyQueue; // queue of messages
+    SizeT                       stackSize;  /* thread stack size*/
+    String                      stackSeg;   /* thread stack placement*/
+    ISemaphore_Handle           sem;        /* message semaphore (counting)*/
+    List_Struct                 threadList; /* list of worker threads*/
+    List_Struct                 readyQueue; /* queue of messages*/
 } RcmServer_ThreadPool;
 
 typedef struct RcmServer_Object_tag {
-    GateThread_Struct           gate;       // instance gate
-    Ptr                         run;        // run semaphore for the server
+    GateThread_Struct           gate;       /* instance gate*/
+    Ptr                         run;        /* run semaphore for the server*/
 #if USE_RPMESSAGE
-    RPMessage_Handle         serverQue;  // inbound message queue
-    UInt32                      localAddr;  // inbound message queue address
-    UInt32                      replyAddr;  // Reply address (same per inst.)
-    UInt32                      dstProc;    // Reply processor.
+    RPMessage_Handle         serverQue;  /* inbound message queue */
+    UInt32                      localAddr;  /* inbound message queue address */
+    UInt32                      replyAddr;  /* Reply address (same per inst.) */
+    UInt32                      dstProc;    /* Reply processor. */
 #else
-    MessageQ_Handle             serverQue;  // inbound message queue
+    MessageQ_Handle             serverQue;  /* inbound message queue*/
 #endif
-    Thread_Handle               serverThread; // server thread object
-    RcmServer_FxnTabElemAry     fxnTabStatic; // static function table
-    RcmServer_FxnTabElem *      fxnTab[RcmServer_MAX_TABLES]; // base pointers
-    UInt16                      key;        // function index key
-    UInt16                      jobId;      // job id tracker
-    Bool                        shutdown;   // server shutdown flag
-    Int                         poolMap0Len;// length of static table
+    Thread_Handle               serverThread; /* server thread object*/
+    RcmServer_FxnTabElemAry     fxnTabStatic; /* static function table*/
+    RcmServer_FxnTabElem *      fxnTab[RcmServer_MAX_TABLES]; /* base pointers*/
+    UInt16                      key;        /* function index key*/
+    UInt16                      jobId;      /* job id tracker*/
+    Bool                        shutdown;   /* server shutdown flag*/
+    Int                         poolMap0Len;/* length of static table*/
     RcmServer_ThreadPool *      poolMap[RcmServer_POOL_MAP_LEN];
-    List_Handle                 jobList;    // list of job stream queues
+    List_Handle                 jobList;    /* list of job stream queues*/
 } RcmServer_Object;
 
 typedef struct {
     List_Elem                   elem;
-    UInt16                      jobId;      // current job stream id
-    Thread_Handle               thread;     // server thread object
-    Bool                        terminate;  // thread terminate flag
-    RcmServer_ThreadPool*       pool;       // worker pool
-    RcmServer_Object *          server;     // server instance
+    UInt16                      jobId;      /* current job stream id*/
+    Thread_Handle               thread;     /* server thread object*/
+    Bool                        terminate;  /* thread terminate flag*/
+    RcmServer_ThreadPool*       pool;       /* worker pool*/
+    RcmServer_Object *          server;     /* server instance*/
 } RcmServer_WorkerThread;
 
 typedef struct {
     List_Elem                   elem;
-    UInt16                      jobId;      // job stream id
-    Bool                        empty;      // true if no messages on server
-    List_Struct                 msgQue;     // queue of messages
+    UInt16                      jobId;      /* job stream id*/
+    Bool                        empty;      /* true if no messages on server*/
+    List_Struct                 msgQue;     /* queue of messages*/
 } RcmServer_JobStream;
 
 typedef struct RcmServer_Module_tag {
@@ -288,7 +288,7 @@ Void RcmServer_init(Void)
     }
 
     /* register with xdc.runtime to get a diags mask */
-//  result = Registry_addModule(&Registry_CURDESC, MODULE_NAME);
+/*  result = Registry_addModule(&Registry_CURDESC, MODULE_NAME);*/
     result = Registry_addModule(&Registry_CURDESC, ti_grcm_RcmServer_Name);
     Assert_isTrue(result == Registry_SUCCESS, (Assert_Id)NULL);
 
@@ -304,7 +304,7 @@ Void RcmServer_init(Void)
  */
 Void RcmServer_exit(Void)
 {
-//  Registry_Result result;
+/*  Registry_Result result;*/
 
 
     if (--curInit != 0) {
@@ -312,8 +312,8 @@ Void RcmServer_exit(Void)
     }
 
     /* unregister from xdc.runtime */
-//  result = Registry_removeModule(MODULE_NAME);
-//  Assert_isTrue(result == Registry_SUCCESS, (Assert_Id)NULL);
+/*  result = Registry_removeModule(MODULE_NAME);*/
+/*  Assert_isTrue(result == Registry_SUCCESS, (Assert_Id)NULL);*/
 }
 
 
@@ -325,7 +325,7 @@ Void RcmServer_Params_init(RcmServer_Params *params)
     /* server thread */
     params->priority = Thread_Priority_HIGHEST;
     params->osPriority = Thread_INVALID_OS_PRIORITY;
-    params->stackSize = 0;  // use system default
+    params->stackSize = 0;  /* use system default*/
     params->stackSeg = "";
 
     /* default pool */
@@ -333,7 +333,7 @@ Void RcmServer_Params_init(RcmServer_Params *params)
     params->defaultPool.count = 0;
     params->defaultPool.priority = Thread_Priority_NORMAL;
     params->defaultPool.osPriority = Thread_INVALID_OS_PRIORITY;
-    params->defaultPool.stackSize = 0;  // use system default
+    params->defaultPool.stackSize = 0;  /* use system default*/
     params->defaultPool.stackSeg = "";
 
     /* worker pools */
@@ -1138,7 +1138,7 @@ Int RcmServer_addSymbol(RcmServer_Object *obj, String funcName,
         if (obj->fxnTab[i] != NULL) {
             for (j = 0; j < (1 << (i + 4)); j++) {
                 if (((obj->fxnTab[i])+j)->addr.fxn == 0) {
-                    slot = (obj->fxnTab[i]) + j;  // found empty slot
+                    slot = (obj->fxnTab[i]) + j;  /* found empty slot*/
                     break;
                 }
             }
index 8ee84fb14cc4bd26e6a1113824ef9cc5441acc2f..b3b9e21c629cc3197952e37b2ee157a4394c8d92 100644 (file)
@@ -121,7 +121,7 @@ extern "C" {
 #define RcmServer_E_SYMBOLTABLEFULL (-5)
 
 
-// -------- constants and types --------
+/* -------- constants and types --------*/
 
 /*!
  *  @brief Remote function type
@@ -400,7 +400,7 @@ typedef struct {
 } RcmServer_Struct;
 
 
-// -------- functions --------
+/* -------- functions --------*/
 
 /*
  *  ======== RcmServer_addSymbol ========
index 5d16cc0d499988cd30516743e4cc93649f6a0087..cf91afc4daf08f8f4e76f4f8095cf2f985ac571f 100644 (file)
  */
 
 /* message type values */
-#define RcmClient_Desc_RCM_MSG    0x1       // client exec message
-#define RcmClient_Desc_DPC        0x2       // deferred procedure call
-#define RcmClient_Desc_SYM_ADD    0x3       // symbol add message
-#define RcmClient_Desc_SYM_IDX    0x4       // query symbox index
-#define RcmClient_Desc_CMD        0x5       // cmd message (one-way)
-#define RcmClient_Desc_JOB_ACQ    0x6       // acquire a job id
-#define RcmClient_Desc_JOB_REL    0x7       // release a job id
-#define RcmClient_Desc_TYPE_MASK  0x0F00    // field mask
-#define RcmClient_Desc_TYPE_SHIFT 8         // field shift width
+#define RcmClient_Desc_RCM_MSG    0x1       /* client exec message*/
+#define RcmClient_Desc_DPC        0x2       /* deferred procedure call*/
+#define RcmClient_Desc_SYM_ADD    0x3       /* symbol add message*/
+#define RcmClient_Desc_SYM_IDX    0x4       /* query symbox index*/
+#define RcmClient_Desc_CMD        0x5       /* cmd message (one-way)*/
+#define RcmClient_Desc_JOB_ACQ    0x6       /* acquire a job id*/
+#define RcmClient_Desc_JOB_REL    0x7       /* release a job id*/
+#define RcmClient_Desc_TYPE_MASK  0x0F00    /* field mask*/
+#define RcmClient_Desc_TYPE_SHIFT 8         /* field shift width*/
 
 /* server status codes must be 0 - 15, it has to fit in a 4-bit field */
-#define RcmServer_Status_SUCCESS          ((UInt16)0) // success
-#define RcmServer_Status_INVALID_FXN      ((UInt16)1) // invalid fxn index
-#define RcmServer_Status_SYMBOL_NOT_FOUND ((UInt16)2) // symbol not found
-#define RcmServer_Status_INVALID_MSG_TYPE ((UInt16)3) // invalid msg type
-#define RcmServer_Status_MSG_FXN_ERR      ((UInt16)4) // msg function error
-#define RcmServer_Status_Error            ((UInt16)5) // general failure
-#define RcmServer_Status_Unprocessed      ((UInt16)6) // unprocessed message
-#define RcmServer_Status_JobNotFound      ((UInt16)7) // job id not found
-#define RcmServer_Status_PoolNotFound     ((UInt16)8) // pool id not found
+#define RcmServer_Status_SUCCESS          ((UInt16)0) /* success*/
+#define RcmServer_Status_INVALID_FXN      ((UInt16)1) /* invalid fxn index*/
+#define RcmServer_Status_SYMBOL_NOT_FOUND ((UInt16)2) /* symbol not found*/
+#define RcmServer_Status_INVALID_MSG_TYPE ((UInt16)3) /* invalid msg type*/
+#define RcmServer_Status_MSG_FXN_ERR      ((UInt16)4) /* msg function error*/
+#define RcmServer_Status_Error            ((UInt16)5) /* general failure*/
+#define RcmServer_Status_Unprocessed      ((UInt16)6) /* unprocessed message*/
+#define RcmServer_Status_JobNotFound      ((UInt16)7) /* job id not found*/
+#define RcmServer_Status_PoolNotFound     ((UInt16)8) /* pool id not found*/
 
 /* the packet structure (actual message send to server) */
 
@@ -115,15 +115,17 @@ struct rpmsg_omx_hdr {
     UInt32 len;
 };
 
-// Warning: This packet cannot be placed on RCMServer job queues, so can't use
-// that capability for now.
+/*
+ * Warning: This packet cannot be placed on RCMServer job queues, so can't use
+ * that capability for now.
+ */
 typedef struct {
-    Bits32             reserved0; // reserved for List.elem->next
-    Bits32             reserved1; // reserved for List.elem->prev
+    Bits32             reserved0; /* reserved for List.elem->next */
+    Bits32             reserved1; /* reserved for List.elem->prev */
     struct rpmsg_omx_hdr hdr;
-    UInt16             desc;      // protocol, descriptor, status
-    UInt16             msgId;     // message id
-    RcmClient_Message  message;   // client message body (5 words + payload)
+    UInt16             desc;      /* protocol, descriptor, status */
+    UInt16             msgId;     /* message id */
+    RcmClient_Message  message;   /* client message body (5 words + payload) */
 } RcmClient_Packet;
 
 /*
@@ -136,14 +138,14 @@ typedef struct {
 /* To test on BIOS side only, uncomment and rebuild anything that
  * calls RPMessage()
  */
-//#define  BIOS_ONLY_TEST
+/* #define  BIOS_ONLY_TEST */
 
 #else
 typedef struct {
-    MessageQ_MsgHeader msgqHeader;  // MessageQ header (8 words)
-    UInt16 desc;                    // protocol, descriptor, status
-    UInt16 msgId;                   // message id
-    RcmClient_Message message;      // client message body (5 words + payload)
+    MessageQ_MsgHeader msgqHeader;  /* MessageQ header (8 words)*/
+    UInt16 desc;                    /* protocol, descriptor, status*/
+    UInt16 msgId;                   /* message id*/
+    RcmClient_Message message;      /* client message body (5 words + payload)*/
 } RcmClient_Packet;
 
 #endif
index 8c7dd5579828192ecd00f40484a158f0d240dc27..6c2220427e66e40e3071d8ec476f7218bda28688 100644 (file)
@@ -357,7 +357,7 @@ Int16 VirtQueue_getAvailBuf(VirtQueue_Handle vq, Void **buf, Int *len)
  */
 Void VirtQueue_disableCallback(VirtQueue_Object *vq)
 {
-    //TODO
+    /* TODO */
     Log_print0(Diags_USER1, "VirtQueue_disableCallback called.");
 }
 
@@ -368,7 +368,7 @@ Bool VirtQueue_enableCallback(VirtQueue_Object *vq)
 {
     Log_print0(Diags_USER1, "VirtQueue_enableCallback called.");
 
-    //TODO
+    /* TODO */
     return (FALSE);
 }
 
@@ -396,10 +396,10 @@ Void VirtQueue_isr(UArg msg)
             case (UInt)RP_MBOX_ABORT_REQUEST:
                 {
                     /* Suppress Coverity Error: FORWARD_NULL: */
-                    // coverity[assign_zero]
+                    /* coverity[assign_zero] */
                     Fxn f = (Fxn)0x0;
                     Log_print0(Diags_USER1, "Crash on demand ...\n");
-                    // coverity[var_deref_op]
+                    /* coverity[var_deref_op] */
                     f();
                 }
                 return;
@@ -546,7 +546,7 @@ VirtQueue_Handle VirtQueue_create(UInt16 remoteProcId, VirtQueue_Params *params,
             RP_MSG_RING_SIZE);
 
     /* See coverity related comment in vring_init() */
-    // coverity[overrun-call]
+    /* coverity[overrun-call] */
     vring_init(&(vq->vring), RP_MSG_NUM_BUFS, vringAddr, RP_MSG_VRING_ALIGN);
 
     /*
index 8d3b4c4a8824a16926c3b8211d181ec0f61a5b2d..781179773b06fa92ed94ae37848e34c1f17e527d 100644 (file)
@@ -365,7 +365,7 @@ Int16 VirtQueue_getAvailBuf(VirtQueue_Handle vq, Void **buf, Int *len)
  */
 Void VirtQueue_disableCallback(VirtQueue_Object *vq)
 {
-    //TODO
+    /* TODO */
     Log_print0(Diags_USER1, "VirtQueue_disableCallback called.");
 }
 
@@ -376,7 +376,7 @@ Bool VirtQueue_enableCallback(VirtQueue_Object *vq)
 {
     Log_print0(Diags_USER1, "VirtQueue_enableCallback called.");
 
-    //TODO
+    /* TODO */
     return (FALSE);
 }
 
@@ -407,10 +407,10 @@ Void VirtQueue_isr(UArg msg)
             case (UInt)RP_MBOX_ABORT_REQUEST:
                 {
                     /* Suppress Coverity Error: FORWARD_NULL: */
-                    // coverity[assign_zero]
+                    /* coverity[assign_zero] */
                     Fxn f = (Fxn)0x0;
                     Log_print0(Diags_USER1, "Crash on demand ...\n");
-                    // coverity[var_deref_op]
+                    /* coverity[var_deref_op] */
                     f();
                 }
                 return;
@@ -555,7 +555,7 @@ VirtQueue_Handle VirtQueue_create(UInt16 remoteProcId, VirtQueue_Params *params,
             RP_MSG_RING_SIZE);
 
     /* See coverity related comment in vring_init() */
-    // coverity[overrun-call]
+    /* coverity[overrun-call] */
     vring_init(&(vq->vring), RP_MSG_NUM_BUFS, vringAddr, RP_MSG_VRING_ALIGN);
 
     /*
index 042b08da2dfbe9b090e6a963082e3f34eb2e48fd..8e55a3dd1db320d464212afe1b2ee1288a4fe7d6 100644 (file)
@@ -71,7 +71,7 @@ Int MmServiceMgr_init(Void)
     }
 
     RcmServer_init();
-//  ServiceMgr_init();
+/*  ServiceMgr_init(); */
 
     return(MmServiceMgr_S_SUCCESS);
 }
index 8ee9dd1f63e1517435db98fb7674c2f195aca3da..aa7008c87a574210a21dad11d43d4f57fc02893c 100644 (file)
 /* Various arbitrary limits: */
 #define MAXMESSAGEQOBJECTS     256
 #define MAXMESSAGEBUFFERS      512
-#define MSGBUFFERSIZE          512   // Max payload + sizeof(ListElem)
+#define MSGBUFFERSIZE          512   /* Max payload + sizeof(ListElem) */
 #define MAXHEAPSIZE            (MAXMESSAGEBUFFERS * MSGBUFFERSIZE)
 #define HEAPALIGNMENT          8
 
index be722a9e8e06efc8820ee0de7a897c91d68f9773..cc0a7e06f73174f8e348df3a05725474293f921e 100644 (file)
@@ -57,7 +57,7 @@ struct vring_desc
 
     /* Length. */
     UInt32 len;
-    /* The flags as indicated above. */  //Optional for now!
+    /* The flags as indicated above. */  /* Optional for now! */
     UInt16 flags;
     /* We chain unused descriptors via this, too */
     UInt16 next;
@@ -136,7 +136,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
      * Suppress Coverity Error: Indexing "vr->avail->ring" with "num".
      * This should be OK, because this is just address calculation:
      */
-    // coverity[index_parm]
+    /* coverity[index_parm] */
     vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + pagesize-1)
                 & ~(pagesize - 1));
 }
index 6e65df3b647160fc83d2dc4dde0f9566d0590af3..6952a14883113f638125b5af5244fcf3577c550c 100644 (file)
@@ -176,7 +176,7 @@ int32_t Mx_compute(Mx_Compute *compute)
 #if defined(SYSLINK_BUILDOS_QNX)
     fxnCtx->params[0].param.ptr.handle = NULL;
 #else
-//  fxnCtx->params[0].param.ptr.handle = ...;
+/*  fxnCtx->params[0].param.ptr.handle = ...; */
 #endif
 
     fxnCtx->num_xlts = 2;
@@ -188,7 +188,7 @@ int32_t Mx_compute(Mx_Compute *compute)
 #if defined(SYSLINK_BUILDOS_QNX)
     fxnCtx->xltAry[0].handle = NULL;
 #else
-//  fxnCtx->xltAry[0].handle = ...;
+/*  fxnCtx->xltAry[0].handle = ...; */
 #endif
 
     fxnCtx->xltAry[1].index = 0;
@@ -197,7 +197,7 @@ int32_t Mx_compute(Mx_Compute *compute)
 #if defined(SYSLINK_BUILDOS_QNX)
     fxnCtx->xltAry[1].handle = NULL;
 #else
-//  fxnCtx->xltAry[1].handle = ...;
+/*  fxnCtx->xltAry[1].handle = ...; */
 #endif
 
     /* invoke the remote function call */
index 6fb7f183a476ec298b7161819538ff029e3f4b4c..6cd7c4a53fcd99a2a3aea107a62f10946bf03092 100644 (file)
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
     SHM_alloc(compute->size * sizeof(uint32_t), &shmInBuf);
     compute->inBuf = (uint32_t *)(shmInBuf.vir_addr);
 #else
-//  compute->inBuf = ...;
+/*  compute->inBuf = ...; */
 #endif
 
     if (compute->inBuf == NULL) {
@@ -133,7 +133,7 @@ int main(int argc, char **argv)
     SHM_alloc(compute->size * sizeof(uint32_t), &shmOutBuf);
     compute->outBuf = (uint32_t *)(shmOutBuf.vir_addr);
 #else
-//  compute->outBuf = ...;
+/*  compute->outBuf = ...; */
 #endif
 
     if (compute->outBuf == NULL) {
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
     SHM_release(&shmInBuf);
     SHM_release(&shmCompute);
 #else
-//  ...
+/*  ... */
 #endif
 
 leave:
index 16fd2799dc4144f2f722098f12d78a014edcaf37..baa8e0a643535a44632a48f0e607dce85b67ef0d 100644 (file)
@@ -110,8 +110,7 @@ static RPC_OMX_ERRORTYPE RPC_SKEL_GetParameter(UInt32 size, UInt32 *data);
 
 /* RcmServer static function table */
 static RcmServer_FxnDesc OMXServerFxnAry[] = {
-//    {"RPC_SKEL_GetHandle"   , RPC_SKEL_GetHandle},  // Set at runtime.
-    {"RPC_SKEL_GetHandle"   , NULL},
+    {"RPC_SKEL_GetHandle"   , NULL}, /* Set at runtime to RPC_SKEL_GetHandle */
     {"RPC_SKEL_SetParameter", RPC_SKEL_SetParameter},
     {"RPC_SKEL_GetParameter", RPC_SKEL_GetParameter},
     {"fxnDouble", fxnDouble },
@@ -162,9 +161,11 @@ static RPC_OMX_ERRORTYPE RPC_SKEL_GetHandle(Void *srvc, UInt32 size,
     struct omx_packet  * packet = (struct omx_packet *)hdr->data;
 
 
-    //Marshalled:[>offset(cParameterName)|>pAppData|>offset(RcmServerName)|>pid|
-    //>--cComponentName--|>--CallingCorercmServerName--|
-    //<hComp]
+    /*
+     * Marshalled:[>offset(cParameterName)|>pAppData|>offset(RcmServerName)|>pid|
+     * >--cComponentName--|>--CallingCorercmServerName--|
+     * <hComp]
+     */
 
     strcpy(cComponentName, (char *)data + sizeof(map_info_type));
 
@@ -176,8 +177,8 @@ static RPC_OMX_ERRORTYPE RPC_SKEL_GetHandle(Void *srvc, UInt32 size,
     /* Simulate sending an async OMX callback message, passing an omx_packet
      * structure.
      */
-    packet->msg_id  = 99;   // Set to indicate callback instance, buffer id, etc.
-    packet->fxn_idx = 5;    // Set to indicate callback fxn
+    packet->msg_id  = 99;   /* Indicates callback instance, buffer id, etc. */
+    packet->fxn_idx = 5;    /* Indicate callback fxn */
     packet->data_size = PAYLOAD_SIZE;
     strcpy((char *)packet->data, CALLBACK_DATA);
 
@@ -189,7 +190,7 @@ static RPC_OMX_ERRORTYPE RPC_SKEL_GetHandle(Void *srvc, UInt32 size,
     ServiceMgr_send(srvc, cb_data, CALLBACK_DATA_SIZE);
 
     /* Call OMX_Get_Handle() and return handle for future calls. */
-    //eCompReturn = OMX_GetHandle(&hComp, (OMX_STRING)&cComponentName[0], pAppData,&rpcCallBackInfo);
+    /*eCompReturn = OMX_GetHandle(&hComp, (OMX_STRING)&cComponentName[0], pAppData,&rpcCallBackInfo); */
     hComp = 0x5C0FFEE5;
     data[0] = hComp;
 
index 2bab1eca26e6983a221a8200af1d20c5ad2b71f8..e7b1ab0029a5098369d4dc48cfe4209e46d0da49 100644 (file)
@@ -306,7 +306,7 @@ OmapRpc_Handle OmapRpc_createChannel(String channelName, UInt16 dstProc,
     }
 #endif
 
-    // setup other variables...
+    /* setup other variables... */
     obj->shutdown = FALSE;
     obj->dstProc = dstProc;
     obj->port = port;
@@ -324,7 +324,7 @@ OmapRpc_Handle OmapRpc_createChannel(String channelName, UInt16 dstProc,
     /* setup the RCM functions and Signatures */
     for (func = 0; func < obj->numFuncs; func++) {
         if (func == 0) {
-            // assign the "first function"
+            /* assign the "first function" */
             obj->rcmParams.fxns.elem[func].name =
                     OmapRpc_Stringerize(OmapRpc_GetSvrMgrHandle);
             obj->rcmParams.fxns.elem[func].addr.createFxn =
@@ -335,18 +335,18 @@ OmapRpc_Handle OmapRpc_createChannel(String channelName, UInt16 dstProc,
             obj->funcSigs[func].numParam = 0;
         }
         else {
-            // assign the other functions
-//          obj->rcmParams.fxns.elem[func].name = fxns[func-1].signature.name;
+            /* assign the other functions */
+/*          obj->rcmParams.fxns.elem[func].name = fxns[func-1].signature.name; */
             obj->rcmParams.fxns.elem[func].name =
                     rcmParams->fxns.elem[func-1].name;
-//          obj->rcmParams.fxns.elem[func].addr.fxn =
-//                  (RcmServer_MsgFxn)fxns[func-1].function;
+/*          obj->rcmParams.fxns.elem[func].addr.fxn =
+                    (RcmServer_MsgFxn)fxns[func-1].function; */
             obj->rcmParams.fxns.elem[func].addr.fxn =
                     rcmParams->fxns.elem[func-1].addr.fxn;
 
-            // copy the signature
-//          memcpy(&obj->funcSigs[func], &fxns[func-1].signature,
-//                  sizeof(OmapRpc_FuncSignature));
+            /* copy the signature */
+/*          memcpy(&obj->funcSigs[func], &fxns[func-1].signature,
+                    sizeof(OmapRpc_FuncSignature)); */
             memcpy(&obj->funcSigs[func], &fxnSigTab->table[func - 1],
                     sizeof(MmType_FxnSig));
         }
@@ -463,16 +463,16 @@ Int OmapRpc_start(const String name, Int port, Int aryLen,
     /* setup the functions and signatures */
     for (func = 0; func < obj->numFuncs; func++) {
         if (func == 0) {
-            // assign the "first function"
-//          strncpy(obj->funcSigs[func].name, obj->rcmParams.fxns.elem[0].name,
-//                  OMAPRPC_MAX_CHANNEL_NAMELEN);
+            /* assign the "first function" */
+/*          strncpy(obj->funcSigs[func].name, obj->rcmParams.fxns.elem[0].name,
+                    OMAPRPC_MAX_CHANNEL_NAMELEN); */
             strncpy(obj->funcSigs[func].name,
                     OmapRpc_Stringerize(OmapRpc_GetSvrMgrHandle),
                     OMAPRPC_MAX_CHANNEL_NAMELEN);
             obj->funcSigs[func].numParam = 0;
         }
         else {
-            // copy the signature
+            /* copy the signature */
             memcpy(&obj->funcSigs[func], &fxns[func-1].signature,
                     sizeof(OmapRpc_FuncSignature));
         }