realtime_demo_bios: remove the reference to the mcasp_osal.c k2g_cmb_rt
authorMing Wei <a0868762@ti.com>
Mon, 13 Mar 2017 23:04:28 +0000 (18:04 -0500)
committerMing Wei <a0868762@ti.com>
Mon, 13 Mar 2017 23:04:28 +0000 (18:04 -0500)
Signed-off-by: Ming Wei <a0868762@ti.com>
realtime_demo_bios/k2g/build/makefile
realtime_demo_bios/k2g/build/src/subdir_rules.mk
realtime_demo_bios/k2g/build/src/subdir_vars.mk
realtime_demo_bios/k2g/ccs/.project
realtime_demo_bios/k2g/src/makefile.libs
realtime_demo_bios/k2g/src/mcasp_osal.c [deleted file]

index 685c0a11226a70efa3d1d42eeeb666d0b828d150..ea3d818873483f0267637573a1be0c5fd537fc60 100644 (file)
@@ -30,7 +30,6 @@ ORDERED_OBJS += \
 "./src/edma_cfg.obj" \
 "./src/main.obj" \
 "./src/mcasp_cfg.obj" \
-"./src/mcasp_osal.obj" \
 "./src/sample_cs.obj" \
 "./src/sample_k2g_cfg.obj" \
 "./src/sample_k2g_int_reg.obj" \
@@ -203,8 +202,8 @@ K2G_bf_rt.hex: $(EXE_OUTPUTS)
 clean:\r
        -$(RM) $(GEN_MISC_FILES__QUOTED)$(EXE_OUTPUTS__QUOTED)$(GEN_FILES__QUOTED)$(BIN_OUTPUTS__QUOTED)$(GEN_OPTS__QUOTED)$(GEN_CMDS__QUOTED)\r
        -$(RMDIR) $(GEN_MISC_DIRS__QUOTED)\r
-       -$(RM) "fil.d" "mhm.d" "mss.d" "mssproc.d" "sys.d" "sysasnr.d" "sysbf.d" "sysbfflt.d" "sysdrc.d" "syseram.d" "sysiram.d" "sysmss.d" "src\audio_cfg.d" "src\edma_cfg.d" "src\main.d" "src\mcasp_cfg.d" "src\mcasp_osal.d" "src\sample_cs.d" "src\sample_k2g_cfg.d" "src\sample_k2g_int_reg.d" "src\test_exit.d" \r
-       -$(RM) "fil.obj" "mhm.obj" "mss.obj" "mssproc.obj" "sys.obj" "sysasnr.obj" "sysbf.obj" "sysbfflt.obj" "sysdrc.obj" "syseram.obj" "sysiram.obj" "sysmss.obj" "src\audio_cfg.obj" "src\edma_cfg.obj" "src\main.obj" "src\mcasp_cfg.obj" "src\mcasp_osal.obj" "src\sample_cs.obj" "src\sample_k2g_cfg.obj" "src\sample_k2g_int_reg.obj" "src\test_exit.obj" \r
+       -$(RM) "fil.d" "mhm.d" "mss.d" "mssproc.d" "sys.d" "sysasnr.d" "sysbf.d" "sysbfflt.d" "sysdrc.d" "syseram.d" "sysiram.d" "sysmss.d" "src\audio_cfg.d" "src\edma_cfg.d" "src\main.d" "src\mcasp_cfg.d" "src\sample_cs.d" "src\sample_k2g_cfg.d" "src\sample_k2g_int_reg.d" "src\test_exit.d" \r
+       -$(RM) "fil.obj" "mhm.obj" "mss.obj" "mssproc.obj" "sys.obj" "sysasnr.obj" "sysbf.obj" "sysbfflt.obj" "sysdrc.obj" "syseram.obj" "sysiram.obj" "sysmss.obj" "src\audio_cfg.obj" "src\edma_cfg.obj" "src\main.obj" "src\mcasp_cfg.obj" "src\sample_cs.obj" "src\sample_k2g_cfg.obj" "src\sample_k2g_int_reg.obj" "src\test_exit.obj" \r
        -@echo 'Finished clean'\r
        -@echo ' '\r
 \r
index 3616fd9c17126daecc4c372605f43f13a6338830..c3fb0776e51405c1c524c083895fc0cea1f62d3b 100644 (file)
@@ -31,13 +31,6 @@ src/mcasp_cfg.obj: ../../../realtime_demo_bios/k2g/src/mcasp_cfg.c $(GEN_OPTS) $
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
-src/mcasp_osal.obj: ../../../realtime_demo_bios/k2g/src/mcasp_osal.c $(GEN_OPTS) $(GEN_HDRS)\r
-       @echo 'Building file: $<'\r
-       @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/mcasp_osal.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
-       @echo 'Finished building: $<'\r
-       @echo ' '\r
-\r
 src/sample_cs.obj: ../../../realtime_demo_bios/k2g/src/sample_cs.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
index 82d068ecc8cf263e26d604636c42a13342e403eb..61ccec3450d33b8447d371574c311bf8c6a57000 100644 (file)
@@ -8,7 +8,6 @@ C_SRCS += \
 ../src/edma_cfg.c \
 ../src/main.c \
 ../src/mcasp_cfg.c \
-../src/mcasp_osal.c \
 ../src/sample_cs.c \
 ../src/sample_k2g_cfg.c \
 ../src/sample_k2g_int_reg.c \
@@ -19,7 +18,6 @@ OBJS += \
 ./src/edma_cfg.obj \
 ./src/main.obj \
 ./src/mcasp_cfg.obj \
-./src/mcasp_osal.obj \
 ./src/sample_cs.obj \
 ./src/sample_k2g_cfg.obj \
 ./src/sample_k2g_int_reg.obj \
@@ -30,7 +28,6 @@ C_DEPS += \
 ./src/edma_cfg.d \
 ./src/main.d \
 ./src/mcasp_cfg.d \
-./src/mcasp_osal.d \
 ./src/sample_cs.d \
 ./src/sample_k2g_cfg.d \
 ./src/sample_k2g_int_reg.d \
@@ -41,7 +38,6 @@ C_DEPS__QUOTED += \
 "src\edma_cfg.d" \
 "src\main.d" \
 "src\mcasp_cfg.d" \
-"src\mcasp_osal.d" \
 "src\sample_cs.d" \
 "src\sample_k2g_cfg.d" \
 "src\sample_k2g_int_reg.d" \
@@ -52,7 +48,6 @@ OBJS__QUOTED += \
 "src\edma_cfg.obj" \
 "src\main.obj" \
 "src\mcasp_cfg.obj" \
-"src\mcasp_osal.obj" \
 "src\sample_cs.obj" \
 "src\sample_k2g_cfg.obj" \
 "src\sample_k2g_int_reg.obj" \
@@ -63,7 +58,6 @@ C_SRCS__QUOTED += \
 "../src/edma_cfg.c" \
 "../src/main.c" \
 "../src/mcasp_cfg.c" \
-"../src/mcasp_osal.c" \
 "../src/sample_cs.c" \
 "../src/sample_k2g_cfg.c" \
 "../src/sample_k2g_int_reg.c" \
index 23e713d6a4a77fed176ad698c3e892dff476b966..d033ea54d28a933dcee3c3577b2c3e6d42956701 100644 (file)
                        <type>1</type>\r
                        <locationURI>PARENT-1-PROJECT_LOC/src/mcasp_cfg.c</locationURI>\r
                </link>\r
-               <link>\r
-                       <name>mcasp_osal.c</name>\r
-                       <type>1</type>\r
-                       <locationURI>PARENT-1-PROJECT_LOC/src/mcasp_osal.c</locationURI>\r
-               </link>\r
                <link>\r
                        <name>mhm.c</name>\r
                        <type>1</type>\r
index 1204f7772935ff92f01c1c723a3831e1c7c97efc..423b57fb68588100be6e814e5bc4e5fc7790c54d 100644 (file)
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\processor_sdk_rtos_k2g_3_03_00_01\demos\audio-preprocessing\realtime_demo_bios\k2g\src
 #
-GEN_SRC_DIR ?= ../../src
+GEN_SRC_DIR ?= ../src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
diff --git a/realtime_demo_bios/k2g/src/mcasp_osal.c b/realtime_demo_bios/k2g/src/mcasp_osal.c
deleted file mode 100644 (file)
index 16186f9..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-#include <mcasp_osal.h>\r
-#include <mcasp_drv.h>\r
-#include <ti/csl/cslr_device.h>\r
-#include <include/McaspLocal.h>\r
-extern Mcasp_Module_State Mcasp_module;\r
-#ifdef _TMS320C6X\r
-#include <ti/sysbios/family/c64p/Hwi.h>\r
-#include <ti/sysbios/family/c66/tci66xx/CpIntc.h>\r
-#include <ti/sysbios/family/c64p/EventCombiner.h>\r
-#else\r
-#include <ti/sysbios/hal/Hwi.h>\r
-#endif\r
-\r
-#include <ti/sysbios/BIOS.h>\r
-#include <ti/sysbios/hal/Cache.h>\r
-\r
-#include <ti/sysbios/knl/Queue.h>\r
-#include <ti/sysbios/knl/Task.h>\r
-#include <ti/sysbios/knl/Swi.h>\r
-#include <ti/osal/osal.h>\r
-\r
-\r
-void * osal_Queue_handle(void *structPtr)\r
-{\r
-       return(Queue_handle(structPtr));\r
-}\r
-\r
-void osal_Queue_construct(void * ptr, int32_t arg)\r
-{\r
-       Queue_construct((Queue_Struct*)ptr, NULL);\r
-}\r
-\r
-void osal_Task_sleep(int32_t msec)\r
-{\r
-       int i,j;\r
-       //Task_sleep(msec);\r
-        for (i=0; i < msec; i++) {\r
-               for (j=0; j < 1000; j++) {\r
-#ifdef _TMS320C6X\r
-                       asm("* Comment to maintain loops through compiler optimization");\r
-#endif\r
-               }\r
-        }\r
-}\r
-int32_t osal_getThreadType()\r
-{\r
-       return BIOS_getThreadType() == BIOS_ThreadType_Task;\r
-\r
-}\r
-#ifdef _TMS320C6X\r
-int hostintArr[6]={33,34,35,36,37,38};\r
-int eventIdArr[6]={0x33,0x34,0x35,0x36,0x37,0x38};\r
-void osal_EventCombiner_disableEvent(int32_t cpuEventNum)\r
-{\r
-\r
-       EventCombiner_disableEvent(eventIdArr[cpuEventNum- CSL_CIC_McASP_0_XINT]);\r
-\r
-\r
-}\r
-void osal_EventCombiner_enableEvent(int32_t cpuEventNum)\r
-{\r
-\r
-       EventCombiner_enableEvent(eventIdArr[cpuEventNum- CSL_CIC_McASP_0_XINT]);\r
-\r
-}\r
-\r
-void osal_EventCombiner_dispatchPlug(uint32_t evt, void * intIsr, void *arg, int32_t flag )\r
-{\r
-       int hostint,eventId;\r
-         CpIntc_dispatchPlug(evt, (CpIntc_FuncPtr)intIsr, 0, TRUE);\r
-         hostint=hostintArr[evt- CSL_CIC_McASP_0_XINT];\r
-                                  /* The configuration is for CPINTC0. We map system interrupt 0x88 to Host Interrupt 32. */\r
-                                  CpIntc_mapSysIntToHostInt(0, evt, hostint);\r
-\r
-                                  /* Enable the Host Interrupt. */\r
-                                  CpIntc_enableHostInt(0, hostint);\r
-\r
-                                  /* Enable the System Interrupt */\r
-                                  CpIntc_enableSysInt(0, evt);\r
-\r
-                                  /* Get the event id associated with the host interrupt. */\r
-                                  eventId = eventIdArr[evt- CSL_CIC_McASP_0_XINT];\r
-                                  /* enable the 'global' switch */\r
-\r
-                                 /* Enable the Xfer Completion Event Interrupt */\r
-                                      EventCombiner_dispatchPlug(eventId,\r
-                                                                               (EventCombiner_FuncPtr)(&CpIntc_dispatch),\r
-                                                               hostint, 1);\r
-\r
-\r
-       //EventCombiner_dispatchPlug(evt, (EventCombiner_FuncPtr)intIsr, arg, flag);\r
-}\r
-#endif\r
-\r
-\r
-#if 0\r
-int gDebug=0;\r
-\r
-void assert(int in)\r
-{\r
-if(in <=0)\r
-       gDebug++;\r
-}\r
-#endif\r
-\r
-void osal_Swi_post(void * obj)\r
-{\r
-       Swi_post((Swi_Handle)obj);\r
-\r
-}\r
-int32_t osal_Queue_empty(void * handle)\r
-{\r
-return Queue_empty(Queue_handle(handle));\r
-//     return ((Mcasp_QueueElem*)handle->next == &((Mcasp_QueueElem*)handle));\r
-\r
-}\r
-\r
-MCASP_Packet * osal_Queue_get(void * handle)\r
-{\r
-return Queue_get(Queue_handle(handle));\r
-}\r
-\r
-void osal_Queue_put(void * handle,Ptr ptr)\r
-               {\r
-       Queue_put(Queue_handle(handle),(Ptr)ptr);\r
-               }\r
-\r
-\r
-McaspOsal_IntrHandle McaspOsal_registerIntr(\r
-    uint32_t              intNum,\r
-    McaspOsal_IntrFuncPtr fxn,\r
-    const void         *arg0)\r
-{\r
-    Hwi_Params hwiParams = {0};\r
-\r
-    Hwi_Params_init(&hwiParams);\r
-    hwiParams.arg = (uint32_t) arg0;\r
-    return (McaspOsal_IntrHandle) Hwi_create(\r
-               (int32_t) intNum,\r
-               (Hwi_FuncPtr) fxn,\r
-               &hwiParams,\r
-               0U);\r
-}\r
-void McaspOsal_unRegisterIntr(McaspOsal_IntrHandle  handle)\r
-{\r
-    Hwi_delete(handle);\r
-}\r
-\r
-/* OSAL functions for Platform Library */\r
-uint8_t *Osal_platformMalloc (uint32_t num_bytes, uint32_t alignment)\r
-{\r
-       return malloc(num_bytes);\r
-}\r
-\r
-void Osal_platformFree (uint8_t *dataPtr, uint32_t num_bytes)\r
-{\r
-    /* Free up the memory */\r
-    if (dataPtr)\r
-    {\r
-        free(dataPtr);\r
-    }\r
-}\r
-\r
-void Osal_platformSpiCsEnter(void)\r
-{\r
-    /* Get the hardware semaphore.\r
-     *\r
-     * Acquire Multi core CPPI synchronization lock\r
-     */\r
-    //while ((CSL_semAcquireDirect (PLATFORM_SPI_HW_SEM)) == 0);\r
-\r
-    return;\r
-}\r
-\r
-void Osal_platformSpiCsExit (void)\r
-{\r
-    /* Release the hardware semaphore\r
-     *\r
-     * Release multi-core lock.\r
-     */\r
-    //CSL_semReleaseSemaphore (PLATFORM_SPI_HW_SEM);\r
-\r
-    return;\r
-}\r