FreeCalypso > hg > freecalypso-citrine

changeset 22:fc33e796507a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
L1/dyn_dwl_cfile: new code compiles
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 10 Jun 2016 09:13:00 +0000
parents dfc7b0bc468a
children 7155882cc49d
files L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c L1/dyn_dwl_cfile/l1_dyn_dwl_async.c L1/dyn_dwl_cfile/l1_dyn_dwl_func.c L1/dyn_dwl_cfile/l1_dyn_dwl_init.c L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c
diffstat 6 files changed, 26 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c	Fri Jun 10 09:13:00 2016 +0000
@@ -7,10 +7,11 @@
  *
  ************* Revision Controle System Header *************/
 
+#include "config.h"
 #include "l1_confg.h"
 #include "l1_types.h"
 #include "sys_types.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1_macro.h"
 #include "l1_const.h"
 #if TESTMODE
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c	Fri Jun 10 09:13:00 2016 +0000
@@ -9,9 +9,12 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "nucleus.h"
+
+#include "config.h"
 #include "l1_confg.h"
 #include "sys_types.h"
+#include "../../riviera/rv/rv_general.h"
+#include "../../nucleus/nucleus.h"
 #include "l1_types.h"
 #include "l1audio_cust.h"
 #include "l1audio_defty.h"
@@ -41,7 +44,7 @@
 #endif
 
 #include "l1_defty.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 /* #include "nu_main.h" */
 #include "l1audio_signa.h"
 #include "l1audio_cust.h"
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_async.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_async.c	Fri Jun 10 09:13:00 2016 +0000
@@ -8,11 +8,14 @@
  ************* Revision Controle System Header *************/
 #include <stdio.h>
 #include <string.h>
-#include "nucleus.h"
+
+#include "config.h"
 #include "l1_confg.h"
+#include "sys_types.h"
+#include "../../riviera/rv/rv_general.h"
+#include "../../nucleus/nucleus.h"
 #include "l1_types.h"
-#include "sys_types.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1audio_signa.h"
 #include "l1audio_const.h"
 #include "l1audio_cust.h"
@@ -44,11 +47,7 @@
 #include "l1_defty.h"
 #include "l1_varex.h"
 #include "l1_trace.h"
-#include "sys_dma.h"
-
-#if (OP_RIV_AUDIO == 1)
-  #include "rv/rv_general.h"
-#endif
+/* #include "sys_dma.h" */
 
 
 #if (L1_DYN_DSP_DWNLD == 1)
@@ -696,7 +695,7 @@
                   l1a_apihisr_com.dyn_dwnld.command.restart = TRUE;
 
                   /********** WORKAROUND *************/
-                #if (OP_RIV_AUDIO == 1)
+                #if 1 //(OP_RIV_AUDIO == 1)
                   {
                     // WARNING: temporary until os_activate_hisr() is declared in L3 functions
                     extern NU_HISR apiHISR;
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_func.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_func.c	Fri Jun 10 09:13:00 2016 +0000
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "config.h"
 #include "l1_confg.h"
 #include "l1_types.h"
 #include "l1_const.h"        
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_init.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_init.c	Fri Jun 10 09:13:00 2016 +0000
@@ -6,9 +6,11 @@
  *  Copyright 2004 (C) Texas Instruments
  *
  ************* Revision Controle System Header *************/
-#include "nucleus.h"
+#include "config.h"
 #include "l1_confg.h"
 #include "sys_types.h"
+#include "../../riviera/rv/rv_general.h"
+#include "../../nucleus/nucleus.h"
 #include "l1_types.h"
 #include "l1audio_const.h"
 #include "l1audio_cust.h"
@@ -37,7 +39,7 @@
 #endif //L1_AAC
 
 #include "l1_defty.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 /* #include "nu_main.h" */
 #include "l1audio_signa.h"
 #include "l1_varex.h"
--- a/L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c	Fri Jun 10 08:59:53 2016 +0000
+++ b/L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c	Fri Jun 10 09:13:00 2016 +0000
@@ -10,11 +10,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "nucleus.h"
+#include "config.h"
 #include "l1_confg.h"
+#include "sys_types.h"
+#include "../../riviera/rv/rv_general.h"
+#include "../../nucleus/nucleus.h"
 #include "l1_types.h"
-#include "sys_types.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1audio_signa.h"
 #include "l1audio_const.h"
 #include "l1audio_cust.h"
@@ -46,7 +48,7 @@
 #include "l1_defty.h"
 #include "l1_varex.h"
 #include "l1_trace.h"
-#include "sys_dma.h"
+/* #include "sys_dma.h" */
 
 #if (L1_DYN_DSP_DWNLD == 1)