Test/Example code and projects cleanup

Signed-off-by: Eric Ruei <e-ruei1@ti.com>

diff --git a/example/sample/c6678/sample.h b/example/sample/c6678/sample.h
index f4e556c7ffb853f34b04c508f7d6d1c407fb2de3..fe42a7780031a11adb8326bc0bfbde6843b21149 100644 (file)
--- a/example/sample/c6678/sample.h
+++ b/example/sample/c6678/sample.h
@@ -69,7 +69,7 @@
 #include <ti/csl/csl_pscAux.h>\r
 #include <ti/csl/cslr_device.h>\r
 \r
-#ifdef DEVICE_K2E\r
+#if defined(DEVICE_K2E) || defined(SOC_K2E)\r
 #include <ti/csl/device/k2e/src/csl_device_interrupt.h>\r
 #endif\r
 \r

diff --git a/example/sample/c6678/sample_c6678.cfg b/example/sample/c6678/sample_c6678.cfg
index 76baf7e5273b6839d3f36a0e5bd7045dd2791a06..9258e32bb22058b25501f170524f1331c2145be1 100755 (executable)
--- a/example/sample/c6678/sample_c6678.cfg
+++ b/example/sample/c6678/sample_c6678.cfg
@@ -41,12 +41,12 @@ System.SupportProxy = SysStd;
 Memory.defaultHeapSize = 0x2000;\r
 Program.heap = 0x2000;\r
 \r
-/* Load and use the TSIP packages */\r
-var Tsip = xdc.loadPackage('ti.drv.tsip'); \r
-\r
 /*use CSL package*/\r
 var devType = "c6678";\r
 var cslSettings = xdc.useModule ('ti.csl.Settings');\r
 cslSettings.deviceType = devType;\r
 \r
+/* Load the TSIP package */\r
+var Tsip = xdc.useModule('ti.drv.tsip.Settings');\r
+Tsip.deviceType = devType;\r
 \r

diff --git a/example/sample/k2e/TSIP_K2E_exampleProject.txt b/example/sample/k2e/TSIP_K2E_C66ExampleProject.txt
similarity index 100%
rename from example/sample/k2e/TSIP_K2E_exampleProject.txt
rename to example/sample/k2e/TSIP_K2E_C66ExampleProject.txt

diff --git a/example/sample/k2e/sample.h b/example/sample/k2e/sample.h
index f4e556c7ffb853f34b04c508f7d6d1c407fb2de3..fe42a7780031a11adb8326bc0bfbde6843b21149 100644 (file)
--- a/example/sample/k2e/sample.h
+++ b/example/sample/k2e/sample.h
@@ -69,7 +69,7 @@
 #include <ti/csl/csl_pscAux.h>\r
 #include <ti/csl/cslr_device.h>\r
 \r
-#ifdef DEVICE_K2E\r
+#if defined(DEVICE_K2E) || defined(SOC_K2E)\r
 #include <ti/csl/device/k2e/src/csl_device_interrupt.h>\r
 #endif\r
 \r

diff --git a/example/sample/k2e/sample_k2e.cfg b/example/sample/k2e/sample_k2e.cfg
index c37356e19ee6359d4b68dfdc3c7c6d492f42d585..a67be99861436b56feb5399e314927eb632876f1 100644 (file)
--- a/example/sample/k2e/sample_k2e.cfg
+++ b/example/sample/k2e/sample_k2e.cfg
@@ -41,12 +41,12 @@ System.SupportProxy = SysStd;
 Memory.defaultHeapSize = 0x2000;\r
 Program.heap = 0x2000;\r
 \r
-/* Load and use the TSIP packages */\r
-var Tsip = xdc.loadPackage('ti.drv.tsip'); \r
-\r
 /*use CSL package*/\r
 var devType = "k2e";\r
 var cslSettings = xdc.useModule ('ti.csl.Settings');\r
 cslSettings.deviceType = devType;\r
 \r
+/* Load the TSIP package */\r
+var Tsip = xdc.useModule('ti.drv.tsip.Settings');\r
+Tsip.deviceType = devType;\r
 \r

diff --git a/test/c6678/test.c b/test/c6678/test.c
index c7b8148d63fa693a11f9536ea916d4cce6b5ecf7..e84b2a62a8fd4c172cbd045dfd45191cd0e786cc 100644 (file)
--- a/test/c6678/test.c
+++ b/test/c6678/test.c
@@ -471,9 +471,9 @@ void domainEnableTsip(UInt16 port)
   /* Determine the event ID */\r
 #ifdef CSL_TSIP_0\r
   if (port == CSL_TSIP_0)\r
-    pscID = CSL_PSC_LPSC_TSIP0;\r
+    pscID = CSL_PSC_LPSC_TSIP; /*CSL_PSC_LPSC_TSIP0 for Tomahawk*/\r
   else\r
-    pscID = CSL_PSC_LPSC_TSIP1;\r
+    pscID = CSL_PSC_LPSC_TSIP; /*CSL_PSC_LPSC_TSIP1 for Tomahawk*/\r
 #else\r
 #ifdef CSL_TSIP\r
   pscID = CSL_PSC_LPSC_TSIP;\r

diff --git a/test/c6678/test.h b/test/c6678/test.h
index 0936dd2d7c7e2ff730dfd978fadda514d1dabe9b..59430b9054f4124980ed67c47a93888706b62af1 100644 (file)
--- a/test/c6678/test.h
+++ b/test/c6678/test.h
@@ -74,7 +74,7 @@
 #include <ti/drv/tsip/tsip_cfg.h>\r
 \r
 \r
-#ifdef DEVICE_K2E\r
+#if defined(DEVICE_K2E) || defined(SOC_K2E)\r
 #include <ti/csl/device/k2e/src/csl_device_interrupt.h>\r
 #endif\r
 \r

diff --git a/test/c6678/test_c6678.cfg b/test/c6678/test_c6678.cfg
index 165511e99655ec001a833b8978396c3f1f44a159..9258e32bb22058b25501f170524f1331c2145be1 100755 (executable)
--- a/test/c6678/test_c6678.cfg
+++ b/test/c6678/test_c6678.cfg
@@ -41,12 +41,12 @@ System.SupportProxy = SysStd;
 Memory.defaultHeapSize = 0x2000;\r
 Program.heap = 0x2000;\r
 \r
-/* Load and use the TSIP packages */\r
-var Tsip = xdc.loadPackage('ti.drv.tsip');\r
-\r
 /*use CSL package*/\r
 var devType = "c6678";\r
 var cslSettings = xdc.useModule ('ti.csl.Settings');\r
 cslSettings.deviceType = devType;\r
 \r
+/* Load the TSIP package */\r
+var Tsip = xdc.useModule('ti.drv.tsip.Settings');\r
+Tsip.deviceType = devType;\r
 \r

diff --git a/test/k2e/TSIP_K2E_testProject.txt b/test/k2e/TSIP_K2E_C66TestProject.txt
similarity index 100%
rename from test/k2e/TSIP_K2E_testProject.txt
rename to test/k2e/TSIP_K2E_C66TestProject.txt

diff --git a/test/k2e/test.h b/test/k2e/test.h
index 0936dd2d7c7e2ff730dfd978fadda514d1dabe9b..59430b9054f4124980ed67c47a93888706b62af1 100644 (file)
--- a/test/k2e/test.h
+++ b/test/k2e/test.h
@@ -74,7 +74,7 @@
 #include <ti/drv/tsip/tsip_cfg.h>\r
 \r
 \r
-#ifdef DEVICE_K2E\r
+#if defined(DEVICE_K2E) || defined(SOC_K2E)\r
 #include <ti/csl/device/k2e/src/csl_device_interrupt.h>\r
 #endif\r
 \r

diff --git a/test/k2e/test_k2e.cfg b/test/k2e/test_k2e.cfg
index 5a7954337aeb7050ee54870c4d0f19738035965f..a67be99861436b56feb5399e314927eb632876f1 100644 (file)
--- a/test/k2e/test_k2e.cfg
+++ b/test/k2e/test_k2e.cfg
@@ -41,12 +41,12 @@ System.SupportProxy = SysStd;
 Memory.defaultHeapSize = 0x2000;\r
 Program.heap = 0x2000;\r
 \r
-/* Load and use the TSIP packages */\r
-var Tsip = xdc.loadPackage('ti.drv.tsip');\r
-\r
 /*use CSL package*/\r
 var devType = "k2e";\r
 var cslSettings = xdc.useModule ('ti.csl.Settings');\r
 cslSettings.deviceType = devType;\r
 \r
+/* Load the TSIP package */\r
+var Tsip = xdc.useModule('ti.drv.tsip.Settings');\r
+Tsip.deviceType = devType;\r
 \r