summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02d6bc1)
raw | patch | inline | side by side (parent: 02d6bc1)
author | vwan@ti.com <vwan@ti.com> | |
Sat, 25 May 2013 00:20:21 +0000 (17:20 -0700) | ||
committer | Chris Ring <cring@ti.com> | |
Thu, 30 May 2013 18:38:04 +0000 (11:38 -0700) |
Signed-off-by: VW <vwan@ti.com>
hlos_common/src/utils/MultiProc.c | [moved from qnx/src/utils/MultiProc.c with 100% similarity] | patch | blob | history |
linux/src/utils/Makefile.am | patch | blob | history | |
linux/src/utils/Makefile.in | patch | blob | history | |
linux/src/utils/MultiProc.c | [deleted file] | patch | blob | history |
qnx/src/utils/common.mk | patch | blob | history |
similarity index 100%
rename from qnx/src/utils/MultiProc.c
rename to hlos_common/src/utils/MultiProc.c
rename from qnx/src/utils/MultiProc.c
rename to hlos_common/src/utils/MultiProc.c
index 53f24249daf449803e72cb97b23cf2e3306a936d..938c44ec4dfd16218044e47d095b26098437cef3 100644 (file)
$(top_srcdir)/linux/include/ti/ipc/Std.h \
$(top_srcdir)/packages/ti/ipc/MultiProc.h \
LAD_client.c \
- MultiProc.c \
+ $(top_srcdir)/hlos_common/src/utils/MultiProc.c \
SocketFxns.c
# Add version info to the shared library
index be1abed38bdfebece19de1083b318a7d6b1d390a..fa58e14428db312bd0a571efc67351f00c1b9dc2 100644 (file)
$(top_srcdir)/linux/include/ti/ipc/Std.h \
$(top_srcdir)/packages/ti/ipc/MultiProc.h \
LAD_client.c \
- MultiProc.c \
+ $(top_srcdir)/hlos_common/src/utils/MultiProc.c \
SocketFxns.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+MultiProc.lo: $(top_srcdir)/hlos_common/src/utils/MultiProc.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MultiProc.lo -MD -MP -MF "$(DEPDIR)/MultiProc.Tpo" -c -o MultiProc.lo `test -f '$(top_srcdir)/hlos_common/src/utils/MultiProc.c' || echo '$(srcdir)/'`$(top_srcdir)/hlos_common/src/utils/MultiProc.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/MultiProc.Tpo" "$(DEPDIR)/MultiProc.Plo"; else rm -f "$(DEPDIR)/MultiProc.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/hlos_common/src/utils/MultiProc.c' object='MultiProc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MultiProc.lo `test -f '$(top_srcdir)/hlos_common/src/utils/MultiProc.c' || echo '$(srcdir)/'`$(top_srcdir)/hlos_common/src/utils/MultiProc.c
+
mostlyclean-libtool:
-rm -f *.lo
diff --git a/linux/src/utils/MultiProc.c b/linux/src/utils/MultiProc.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2012, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of Texas Instruments Incorporated nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * ======== MultiProc.c ========
- *
- * Implementation of functions to access processor IDs configured on BIOS side.
- */
-
-#include <ti/ipc/Std.h>
-
-#include <assert.h>
-#include <string.h>
-
-#include <ti/ipc/MultiProc.h>
-#include <_MultiProc.h>
-
-/*
- * ======== MultiProc_getId ========
- */
-UInt16 MultiProc_getId(String name)
-{
- Int i;
- UInt16 id;
-
- assert(name != NULL);
-
- id = MultiProc_INVALIDID;
- for (i = 0; i < _MultiProc_cfg.numProcessors; i++) {
- if ((_MultiProc_cfg.nameList[i] != NULL) &&
- (strcmp(name, _MultiProc_cfg.nameList[i]) == 0)) {
- id = i;
- }
- }
- return (id);
-}
-
-/*
- * ======== MultiProc_getName ========
- */
-String MultiProc_getName(UInt16 id)
-{
- assert(id < _MultiProc_cfg.numProcessors);
-
- return (_MultiProc_cfg.nameList[id]);
-}
-
-/*
- * ======== MultiProc_getNumProcessors ========
- */
-UInt16 MultiProc_getNumProcessors()
-{
- return (_MultiProc_cfg.numProcessors);
-}
-
-
-/*
- * ======== MultiProc_self ========
- */
-UInt16 MultiProc_self()
-{
- return (_MultiProc_cfg.id);
-}
-
-/*
- * ======== MultiProc_setLocalId ========
- */
-Int MultiProc_setLocalId(UInt16 id)
-{
- /* id must be less than the number of processors */
- assert(id < _MultiProc_cfg.numProcessors);
-
- /*
- * Check the following
- * 1. Make sure the statically configured constant was invalid.
- * To call setLocalId, the id must have been set to invalid.
- * 2. Make sure the call is made before module startup
- */
- if ((_MultiProc_cfg.id == MultiProc_INVALIDID) /* &&
- (Startup_rtsDone() == FALSE) */ ) {
- /* It is ok to set the id */
- _MultiProc_cfg.id = id;
- return (MultiProc_S_SUCCESS);
- }
-
- return (MultiProc_E_FAIL);
-}
index 8c7395f27b5edb2e49e176f919994a50ee212df8..d78398d14c97c049bb31c95434b0278290615049 100644 (file)
--- a/qnx/src/utils/common.mk
+++ b/qnx/src/utils/common.mk
# source path
EXTRA_SRCVPATH += \
$(IPC_REPO)/qnx/src/utils \
+ $(IPC_REPO)/hlos_common/src/utils
EXCLUDE_OBJS =