PASDK-477:Move McaspDevice_init() from asitSelectDevices() to main()

McaspDevice_init() is run-once driver initialization code.

diff --git a/pasdk/test_dsp/application/main.c b/pasdk/test_dsp/application/main.c
index a9530ea4dab4c26a9fd9d0cb0fff13911c74ae7a..c9ab1c385eadcd9bbe12a2fb7fa97880a066aca6 100644 (file)
--- a/pasdk/test_dsp/application/main.c
+++ b/pasdk/test_dsp/application/main.c
@@ -108,11 +108,11 @@ Int main()
     /* initialize board */
     cfg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK;
     Board_init(cfg);
-       evmI2CInit(I2C_PORT_0);
-       evmI2CInit(I2C_PORT_1);
-       evmI2CInit(I2C_PORT_2);
+    evmI2CInit(I2C_PORT_0);
+    evmI2CInit(I2C_PORT_1);
+    evmI2CInit(I2C_PORT_2);
 
-    Log_info0("exit Platform Setup");
+    Log_info0("exit Board init");
 
     Log_info0("Configure EDMA");
     /* Configure eDMA module */
@@ -130,8 +130,8 @@ Int main()
 #endif
 
 #ifdef IO_LOOPBACK_TEST
-       /* Initialize McASP HW details */
-       McaspDevice_init();
+    /* Initialize McASP HW details */
+    McaspDevice_init();
 
     D10_init();
 
@@ -148,16 +148,16 @@ Int main()
     }
     aud_delay(50000); // Without delay between these 2 calls system aborts.
 
-       /* Initialize McASP module */
-       status = mcaspAudioConfig();
-       if(status != Aud_EOK)
-       {
-               Log_info0("McASP Configuration Failed!\n");
-       }
+    /* Initialize McASP module */
+    status = mcaspAudioConfig();
+    if(status != Aud_EOK)
+    {
+        Log_info0("McASP Configuration Failed!\n");
+    }
 
-       ioSemaphoreCreate();
+    ioSemaphoreCreate();
 
-       audioIoCreate();
+    audioIoCreate();
 
     Task_setPri(TaskAfp, -1);
     Task_setPri(TaskAip, -1);
@@ -166,8 +166,12 @@ Int main()
     Task_setPri(TaskAsop, 5);
 #endif
 
+    Log_info0("McASP device init");
+    /* Initialize McASP SOC level configuration */
+    McaspDevice_init();
+
     Log_info0("IPC start");
-    // Initialize IPC
+    /* Initialize IPC */
     status = Ipc_start();
     if (status < 0) 
     {

diff --git a/pasdk/test_dsp/framework/audioStreamInpProcNewIO.c b/pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
index fb84c34dbdd7dac15c8e199ff7cebec253dcbf3b..c60d5b059fdb302fc0a6227743bb40c12960452d 100644 (file)
--- a/pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
+++ b/pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
@@ -1107,7 +1107,7 @@ void asitPhyTransferStart(PAF_AST_IoInp *pInpIo)
 
 Int d10Initialized = 0;
 //extern Aud_STATUS mcaspAudioConfig(void);
-extern void McaspDevice_init(void);
+//extern void McaspDevice_init(void);
 
 /*======================================================================================
  *  This function initializes HW interface and selects the right device for input
@@ -1186,7 +1186,7 @@ Int asitSelectDevices(
                 // FL: probably no harm in calling this for every new i/f request.
                 //     However, it can probably be moved to main() or sys init task.
                 // Initialize McASP HW details
-                McaspDevice_init();
+                //McaspDevice_init();
                 
                 // Initialize Rx hardware
                 D10_init((void *)pD10Params);