Multiproc: Remove internal API MultiProc_rprocSetId

- MultiProc_rprocSetId and LAD_RPROC_SETID are no longer needed
  as the out of order download issue is taken care in the
  Remoteproc/RPMSG kernel driver

Signed-off-by: Sam Nelson <sam.nelson@ti.com>

diff --git a/linux/include/_lad.h b/linux/include/_lad.h
index b0a9c821cf15391df93732dc9c92897d04ae656e..d4bf3fee13c3e2e75efbe68d2d0f66510574e1cf 100644 (file)
--- a/linux/include/_lad.h
+++ b/linux/include/_lad.h
@@ -163,7 +163,6 @@ extern struct timeval start_tv;
 typedef enum {
     LAD_CONNECT = 0,
     LAD_DISCONNECT,
 typedef enum {
     LAD_CONNECT = 0,
     LAD_DISCONNECT,

-    LAD_RPROC_SETID,

     LAD_IPC_GETCONFIG,
     LAD_NAMESERVER_SETUP,
     LAD_NAMESERVER_DESTROY,
     LAD_IPC_GETCONFIG,
     LAD_NAMESERVER_SETUP,
     LAD_NAMESERVER_DESTROY,

diff --git a/linux/src/api/MultiProc.c b/linux/src/api/MultiProc.c
index 015955abed9fac4f6f3d631ebdc2da0fbb40147c..0a8435f1d1bacf67e4406ef911fe5746ac634137 100644 (file)
--- a/linux/src/api/MultiProc.c
+++ b/linux/src/api/MultiProc.c
@@ -102,51 +102,3 @@ Void MultiProc_getConfig (MultiProc_Config * cfg)
 
     return;
 }
 
     return;
 }

-
-/*
- *  ======== MultiProc_rprocSetId ========
- */
-Int MultiProc_rprocSetId(UInt16 procId, UInt rprocId)
-{
-    Int status;
-    LAD_ClientHandle handle;
-    struct LAD_CommandObj cmd;
-    union LAD_ResponseObj rsp;
-    UInt16 clusterId;
-
-
-    handle = LAD_findHandle();
-
-    if (handle == LAD_MAXNUMCLIENTS) {
-        PRINTVERBOSE1("MultiProc_rprocSetId: can't find connection to daemon "
-                "for pid %d\n", getpid())
-        return (-1);
-    }
-
-    cmd.cmd = LAD_RPROC_SETID;
-    cmd.clientId = handle;
-    cmd.args.rprocSetId.procId = procId;
-    cmd.args.rprocSetId.rprocId = rprocId;
-
-    if ((status = LAD_putCommand(&cmd)) != LAD_SUCCESS) {
-        PRINTVERBOSE1("MultiProc_rprocSetId: sending LAD command failed, "
-                "status=%d\n", status)
-        return (status);
-    }
-
-    if ((status = LAD_getResponse(handle, &rsp)) != LAD_SUCCESS) {
-        PRINTVERBOSE1("MultiProc_rprocSetId: no LAD response, status=%d\n",
-                status)
-        return (status);
-    }
-    status = rsp.status;
-
-    PRINTVERBOSE2("MultiProc_rprocSetId: got LAD response for client %d, "
-            "status=%d\n", handle, status)
-
-    /* update configuration in api state */
-    clusterId = procId - _MultiProc_cfg.baseIdOfCluster;
-    _MultiProc_cfg.rprocList[clusterId] = rprocId;
-
-    return (status);
-}

diff --git a/linux/src/daemon/MultiProc_daemon.c b/linux/src/daemon/MultiProc_daemon.c
index 6570996c3760c2b4a5e95dbd3df686ec7ecb594b..a551a4d3480f1094c42ed51c63fa466cbef1c078 100644 (file)
--- a/linux/src/daemon/MultiProc_daemon.c
+++ b/linux/src/daemon/MultiProc_daemon.c
@@ -76,27 +76,3 @@ Void MultiProc_getConfig (MultiProc_Config * cfg)
         LOG2("\tProcId %d - \"%s\"\n", baseId + i, _MultiProc_cfg.nameList[i]);
     }
 }
         LOG2("\tProcId %d - \"%s\"\n", baseId + i, _MultiProc_cfg.nameList[i]);
     }
 }

-
-/*
- *  ======== MultiProc_rprocSetId ========
- */
-Int MultiProc_rprocSetId(UInt16 procId, UInt rprocId)
-{
-    UInt16 clusterId;
-
-
-    if (procId >= _MultiProc_cfg.numProcessors) {
-        return (MultiProc_E_INVALIDARG);
-    }
-
-    if (rprocId >= _MultiProc_cfg.numProcsInCluster) {
-        return (MultiProc_E_INVALIDARG);
-    }
-
-    clusterId = procId - _MultiProc_cfg.baseIdOfCluster;
-    _MultiProc_cfg.rprocList[clusterId] = rprocId;
-    LOG2("MultiProc_rprocSetId: clusterId=%d, rprocId=%d\n", clusterId,
-            _MultiProc_cfg.rprocList[clusterId]);
-
-    return (MultiProc_S_SUCCESS);
-}

diff --git a/linux/src/daemon/lad.c b/linux/src/daemon/lad.c
index 87fcbdefaaf846ea96458561a966283b602f079c..11dc1a79c58e64613bfd494f85bd63a57113b2cd 100644 (file)
--- a/linux/src/daemon/lad.c
+++ b/linux/src/daemon/lad.c
@@ -420,11 +420,6 @@ opencommandFIFO:
 
             break;
 
 
             break;
 

-          case LAD_RPROC_SETID:
-            rsp.status = MultiProc_rprocSetId(cmd.args.rprocSetId.procId,
-                    cmd.args.rprocSetId.rprocId);
-            break;
-

           case LAD_IPC_GETCONFIG:
             Ipc_getConfig(&rsp.ipcConfig);
             break;
           case LAD_IPC_GETCONFIG:
             Ipc_getConfig(&rsp.ipcConfig);
             break;


@@ -803,7 +798,6 @@ opencommandFIFO:
           case LAD_DISCONNECT:
             break;
 
           case LAD_DISCONNECT:
             break;
 

-          case LAD_RPROC_SETID:

           case LAD_IPC_GETCONFIG:
           case LAD_NAMESERVER_SETUP:
           case LAD_NAMESERVER_DESTROY:
           case LAD_IPC_GETCONFIG:
           case LAD_NAMESERVER_SETUP:
           case LAD_NAMESERVER_DESTROY:

diff --git a/packages/ti/ipc/MultiProc.h b/packages/ti/ipc/MultiProc.h
index 8d4659f36e632e38d1f8cc4cef25ce2c229a99db..951b52e6cd5092921c9a8cc4c5900a8b2813ea19 100644 (file)
--- a/packages/ti/ipc/MultiProc.h
+++ b/packages/ti/ipc/MultiProc.h
@@ -272,20 +272,6 @@ Int MultiProc_setLocalId(UInt16 id);
  */
 Int MultiProc_setBaseIdOfCluster(UInt16 id);
 
  */
 Int MultiProc_setBaseIdOfCluster(UInt16 id);
 

-/*
- *  ======== MultiProc_rprocSetId ========
- *  Update processor ID mapping at run-time
- *
- *  Internal use only. This function is temporary and will be
- *  removed in a future build.
- *
- *  When using remoteproc to load a DSP processor, the VirtIO channel
- *  ID is non-deterministic. This function is part of a larger hack to
- *  update the mapping from ProcID to VirtIO Channel ID each time a DSP
- *  is loaded.
- */
-Int MultiProc_rprocSetId(UInt16 procId, UInt rprocId);
-

 #if defined (__cplusplus)
 }
 #endif /* defined (__cplusplus) */
 #if defined (__cplusplus)
 }
 #endif /* defined (__cplusplus) */