summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3309cf)
raw | patch | inline | side by side (parent: a3309cf)
author | vwan@ti.com <vwan@ti.com> | |
Wed, 25 Sep 2013 22:45:23 +0000 (15:45 -0700) | ||
committer | Chris Ring <cring@ti.com> | |
Fri, 27 Sep 2013 18:54:51 +0000 (11:54 -0700) |
This patch updates the description that appears when calling 'use ipc'.
It also removes the command line options -f and -d that are obsolete,
and updates the error messages that comes up when wrong arguments
are passed, to guide people towards correct usage.
Signed-off-by: VW <vwan@ti.com>
It also removes the command line options -f and -d that are obsolete,
and updates the error messages that comes up when wrong arguments
are passed, to guide people towards correct usage.
Signed-off-by: VW <vwan@ti.com>
qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/ipc.use | patch | blob | history | |
qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/syslink_main.c | patch | blob | history |
diff --git a/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/ipc.use b/qnx/src/ipc3x_dev/ti/syslink/build/Qnx/resmgr/ipc.use
index ded50909bd6d3e5e3520115210c873b1d6c5295e..642cfbc7ea5df85498fe9625f8ef665668492532 100644 (file)
ipc - IPC Resource Manager
-ipc [-fHT]
+ipc: [-HTg] <core_id1> <executable1> [<core_id2> <executable2> ...]
+
+ <core_id#> should be set to a core name
+ followed by the path to the executable to load on that core.
Options:
- -f <file_name> Name of the Ducati firmware file to load. *Must be specified*
-H <option> Enable/Disable Ducati hibernation. Default: 1
where <option> is:
0: OFF
1: ON
+ Supported on: OMAP54xx
-T <timeout> Set the timeout value of the Ducati hibernation in ms.
- Default: 5000 ms
\ No newline at end of file
+ Default: 5000 ms
+ Supported on: OMAP54xx
+ -g Enable GateMP support on host
+ Supported on: DRA7xx
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 c87c3aae29de154fb0a75c6b01e82b1c69a73b5f..0cf0b509784d59c745b647db5e021f96bb9cbdf8 100644 (file)
@@ -723,7 +723,13 @@ int init_ipc(syslink_dev_t * dev, syslink_firmware_info * firmware, bool recover
for (i = 0; i < syslink_num_cores; i++) {
procId = firmware[i].proc_id = MultiProc_getId(firmware[i].proc);
- if (procId >= MultiProc_MAXPROCESSORS || procH[procId]) {
+ if (procId >= MultiProc_MAXPROCESSORS) {
+ status = -1;
+ fprintf(stderr, "Invalid processor name specified\n");
+ break;
+ }
+
+ if (procH[procId]) {
GT_setFailureReason (curTrace,
GT_4CLASS,
"init_ipc",
tiipcsetup_fail:
for (i-=1; i >= 0; i--) {
procId = firmware[i].proc_id;
+ if (procId >= MultiProc_MAXPROCESSORS) {
+ continue;
+ }
ProcMgr_unregisterNotify(procH[procId], syslink_error_cb,
(Ptr)dev, errStates);
ProcMgr_stop(procH[procId]);
/** print usage */
static Void printUsage (Char * app)
{
- printf ("\n%s: [-fHT]\n", app);
- printf (" -f specify the binary file to load to the remote cores)\n");
+ printf("\n\nUsage:\n");
#if defined(SYSLINK_PLATFORM_OMAP5430)
- printf (" -d specify the binary file to load to the dsp)\n");
-#endif
- printf (" -H enable/disable hibernation, 1: ON, 0: OFF, Default: 1)\n");
- printf (" -T specify the hibernation timeout in ms, Default: 5000 ms)\n");
-#if defined(SYSLINK_PLATFORM_VAYU)
- printf (" -g enable GateMP support on host\n");
+ printf("\n%s: [-HT] <core_id1> <executable1> [<core_id2> <executable2> ...]\n",
+ app);
+ printf(" <core_id#> should be set to a core name (e.g. IPU, DSP)\n");
+ printf(" followed by the path to the executable to load on that core.\n");
+ printf("Options:\n");
+ printf(" -H enable/disable hibernation, 1: ON, 0: OFF, Default: 1)\n");
+ printf(" -T specify the hibernation timeout in ms, Default: 5000 ms)\n");
+#else
+ printf("\n%s: [-g] <core_id1> <executable1> [<core_id2> <executable2> ...]\n",
+ app);
+ printf(" <core_id#> should be set to a core name (e.g. DSP1, IPU2)\n");
+ printf(" followed by the path to the executable to load on that core.\n");
+ printf("Options:\n");
+ printf(" -g enable GateMP support on host\n");
#endif
exit (EXIT_SUCCESS);
}
/* Parse the input args */
while (1)
{
- c = getopt (argc, argv, "f:d:H:T:U:gv:");
+ c = getopt (argc, argv, "H:T:U:gv:");
if (c == -1)
break;
switch (c)
{
- case 'f':
- /* for backward compatibility, "-f" option loaded Ducati/Benelli */
- syslink_firmware[syslink_num_cores].firmware = optarg;
-#if defined(SYSLINK_PLATFORM_OMAP4430)
- syslink_firmware[syslink_num_cores].proc = "SYSM3";
-#else
-#ifndef SYSLINK_SYSBIOS_SMP
- syslink_firmware[syslink_num_cores].proc = "CORE0";
-#else
- syslink_firmware[syslink_num_cores].proc = "IPU";
-#endif
-#endif
- syslink_num_cores++;
-#ifndef SYSLINK_SYSBIOS_SMP
- syslink_firmware[syslink_num_cores].firmware = NULL;
-#if defined(SYSLINK_PLATFORM_OMAP4430)
- syslink_firmware[syslink_num_cores].proc = "APPM3";
-#else
- syslink_firmware[syslink_num_cores].proc = "CORE1";
-#endif
- syslink_num_cores++;
-#endif
- break;
#if defined(SYSLINK_PLATFORM_OMAP5430)
- case 'd':
- syslink_firmware[syslink_num_cores].firmware = optarg;
- syslink_firmware[syslink_num_cores].proc = "DSP";
- syslink_num_cores++;
- break;
-#endif
case 'H':
hib_enable = atoi(optarg);
if (hib_enable != 0 && hib_enable != 1) {
case 'T':
hib_timeout = atoi(optarg);
break;
+#endif
case 'U':
user_parm = optarg;
break;
/* Get the name of the binary from the input args */
if (!syslink_num_cores) {
- fprintf(stderr, "-f or -d or <core_id> option must be specified");
+ fprintf(stderr, "At least one core_id and executable must be "\
+ "specified");
printUsage(argv[0]);
return (error);
}
return -1;
}
if (NULL == realpath(syslink_firmware[i].firmware, abs_path)) {
- fprintf (stderr, "realpath failed\n");
+ fprintf (stderr, "invalid path to executable\n");
return -1;
}
syslink_firmware[i].firmware = abs_path;