- Minor corrections to visio diagram to correct a

  spelling mistake, and minor document update.
- Example and test main files and mutli & single
  instance header files updated to be consistent
  for naming of K2X TCP3D instance names.

diff --git a/docs/TCP3D_DriverSDS.doc b/docs/TCP3D_DriverSDS.doc
index a988ba737f558010ca6bb8fe8a1ae246428a87f1..5a386ebb904fad254c831e2dfa043a7ab066de2d 100644 (file)
Binary files a/docs/TCP3D_DriverSDS.doc and b/docs/TCP3D_DriverSDS.doc differ

diff --git a/docs/TCP3D_DriverSDS.pdf b/docs/TCP3D_DriverSDS.pdf
index ab4c3c77469246a995f612c13d864eb03dcb2c05..58f3fa40d37509fc2e0f9f6c4dd8f60543f0affc 100644 (file)
Binary files a/docs/TCP3D_DriverSDS.pdf and b/docs/TCP3D_DriverSDS.pdf differ

diff --git a/docs/TCP3D_Driver_Design.vsd b/docs/TCP3D_Driver_Design.vsd
index 1dea64973eea7b496bb376c3e17c0ddb8cca6abb..e1427f111407a6d7dbfa8f240f6fffdbf9e65940 100644 (file)
Binary files a/docs/TCP3D_Driver_Design.vsd and b/docs/TCP3D_Driver_Design.vsd differ

diff --git a/example/src/tcp3d_example_main.c b/example/src/tcp3d_example_main.c
index 34716606cc5171559a57557e7e174b7e4d3112f8..c2be5448b0fc9ba22a8002d69297bdc07b160232 100644 (file)
--- a/example/src/tcp3d_example_main.c
+++ b/example/src/tcp3d_example_main.c
@@ -126,7 +126,7 @@ cbTestDesc              codeBlockSet;
 \r
 Char                    *strMode[4] = {"3GPP(0)","LTE(1)","WIMAX(2)","WCDMA Split(3)"};\r
 Char                    *strDBuf[2] = {"Disable(0)","Enable(1)"};\r
-Char                    *strInst[2] = {"TCP3D_A(0)","TCP3D_B(1)"};\r
+Char                    *strInst[2] = {"TCP3D_0(0)","TCP3D_1(1)"};\r
 \r
 UInt32                  keepTestVectMem = 0;\r
 UInt32                  firstTime = 1;\r
@@ -360,14 +360,7 @@ Void testerTaskFunc(Void)
     dspCoreID           = CSL_chipReadDNUM();\r
 \r
     /******** Select the TCP3D Instance Number **********/\r
-#if 0\r
-    if ( dspCoreID == 0 ) // Core 0\r
-        instNum = CSL_TCP3D_A;\r
-    else\r
-        instNum = CSL_TCP3D_B;\r
-#else\r
     instNum = getTcp3dInstNum(dspCoreID);\r
-#endif\r
 \r
     /* Initialize the default Task parameters */\r
     Task_Params_init(&taskParams);\r

diff --git a/example/src/tcp3d_multi_inst.h b/example/src/tcp3d_multi_inst.h
index 946697de46e932953334b6099fac3bbcf2ce9df6..feff0288444f1ea86f440740c86121791c9636fb 100644 (file)
--- a/example/src/tcp3d_multi_inst.h
+++ b/example/src/tcp3d_multi_inst.h
@@ -39,17 +39,18 @@
 /**\r
  * Test TCP3D Notification Events\r
  */\r
-#define TCP3D_A_TEST_EVENT              7\r
-#define TCP3D_B_TEST_EVENT              23\r
+#define TCP3D_0_TEST_EVENT              7\r
+#define TCP3D_1_TEST_EVENT              23\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
- * ((per spec intc_1.3.4.12.xlsx, TPCC2)\r
+ * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
+ * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
-#define TCP3D_A_REVT0_CH_NUMBER         34\r
-#define TCP3D_A_REVT1_CH_NUMBER         35\r
-#define TCP3D_B_REVT0_CH_NUMBER         36\r
-#define TCP3D_B_REVT1_CH_NUMBER         37\r
+#define TCP3D_0_REVT0_CH_NUMBER         34\r
+#define TCP3D_0_REVT1_CH_NUMBER         35\r
+#define TCP3D_1_REVT0_CH_NUMBER         36\r
+#define TCP3D_1_REVT1_CH_NUMBER         37\r
 \r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
@@ -64,9 +65,9 @@ INLINE UInt32 getNotifyEventNum(UInt8 instNum)
     UInt32 testEvt;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        testEvt = TCP3D_A_TEST_EVENT; //  First instance\r
+        testEvt = TCP3D_0_TEST_EVENT; //  First instance\r
     else\r
-        testEvt = TCP3D_B_TEST_EVENT; //  Second instance\r
+        testEvt = TCP3D_1_TEST_EVENT; //  Second instance\r
 \r
     return testEvt;\r
 }\r
@@ -88,9 +89,9 @@ INLINE UInt32 getRevt0ChannelNum(UInt8 instNum)
     UInt32 chNum;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        chNum = TCP3D_A_REVT0_CH_NUMBER; //  First instance\r
+        chNum = TCP3D_0_REVT0_CH_NUMBER; //  First instance\r
     else\r
-        chNum = TCP3D_B_REVT0_CH_NUMBER; //  Second instance\r
+        chNum = TCP3D_1_REVT0_CH_NUMBER; //  Second instance\r
 \r
     return chNum;\r
 }\r
@@ -100,9 +101,9 @@ INLINE UInt32 getRevt1ChannelNum(UInt8 instNum)
     UInt32 chNum;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        chNum = TCP3D_A_REVT1_CH_NUMBER; //  First instance\r
+        chNum = TCP3D_0_REVT1_CH_NUMBER; //  First instance\r
     else\r
-        chNum = TCP3D_B_REVT1_CH_NUMBER; //  Second instance\r
+        chNum = TCP3D_1_REVT1_CH_NUMBER; //  Second instance\r
 \r
     return chNum;\r
 }\r

diff --git a/example/src/tcp3d_single_inst.h b/example/src/tcp3d_single_inst.h
index 2d535196e26523d5061d75e90c5a9530c086b2d7..9e0563bbd7151b289247475cc38b3fcdb9f245a1 100644 (file)
--- a/example/src/tcp3d_single_inst.h
+++ b/example/src/tcp3d_single_inst.h
@@ -39,26 +39,27 @@
 /**\r
  * Test TCP3D Notification Events\r
  */\r
-#define TCP3D_A_TEST_EVENT              23\r
+#define TCP3D_0_TEST_EVENT              7\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
- * (as per spec nysh_INTERNAL_1_0_7.pdf)\r
+ * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
+ * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
-#define TCP3D_A_REVT0_CH_NUMBER         0\r
-#define TCP3D_A_REVT1_CH_NUMBER         1\r
+#define TCP3D_0_REVT0_CH_NUMBER         34\r
+#define TCP3D_0_REVT1_CH_NUMBER         35\r
 \r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
     /* Host Interrupts for CPINTC0 (per spec - 0.0.1) */\r
-    UInt32  hostIntr[] = {6u, 26u, 46u, 66u};\r
+    UInt32  hostIntr[] = {13u, 29u, 45u, 61u};\r
 \r
     return hostIntr[dspCoreID];\r
 }\r
 \r
 INLINE UInt32 getNotifyEventNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_TEST_EVENT;\r
+    return TCP3D_0_TEST_EVENT;\r
 }\r
 \r
 INLINE CSL_TPCC_ShadowRegs * getEdma3ShadowRegsBase(UInt32 regionNum)\r
@@ -75,27 +76,27 @@ INLINE UInt32 getCpIntc0RegsBase()
 \r
 INLINE UInt32 getRevt0ChannelNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_REVT0_CH_NUMBER;\r
+    return TCP3D_0_REVT0_CH_NUMBER;\r
 }\r
 \r
 INLINE UInt32 getRevt1ChannelNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_REVT1_CH_NUMBER;\r
+    return TCP3D_0_REVT1_CH_NUMBER;\r
 }\r
 \r
 INLINE UInt8 getTcp3dInstNum(UInt32 dspCoreID)\r
 {\r
-    return CSL_TCP3D_A;\r
+    return CSL_TCP3D_0;\r
 }\r
 \r
 INLINE UInt32 getTcp3dCfgRegsBase(UInt8 instNum)\r
 {\r
-    return CSL_TCP3D_A_CFG_REGS;\r
+    return CSL_TCP3D_0_CFG_REGS;\r
 }\r
 \r
 INLINE UInt32 getTcp3dDataRegsBase(UInt8 instNum)\r
 {\r
-    return CSL_TCP3D_A_DATA_REGS;\r
+    return CSL_TCP3D_0_DATA_REGS;\r
 }\r
 \r
 #endif  /* _TCP3D_SINGLE_INST_H_ */\r

diff --git a/tcp3d_drv.h b/tcp3d_drv.h
index 3bb8b89de241dd647c2e570212bc07d52e732c92..a5fd80a01d52bd2d82df557a45034ce588688f71 100644 (file)
--- a/tcp3d_drv.h
+++ b/tcp3d_drv.h
@@ -438,7 +438,7 @@ typedef struct Tcp3d_InCfgParams
 /**\r
  * @brief Structure to store TCP3 decoder specific values to identify its\r
  *          instance configuration information. This is created to facilitate\r
- *          the application to choose TCP3 decoder (either TCP3D_A or TCP3D_B)\r
+ *          the application to choose TCP3 decoder (either TCP3D_0 or TCP3D_1)\r
  *          for which the driver will be configured.\r
  * \r
  *      This structure could be used for both PING and PONG specific values.\r
@@ -609,7 +609,7 @@ typedef struct Tcp3d_InitParams
 {\r
     /** \r
      * TCP3D Peripheral instance number to setup. Possible values are\r
-     *          CSL_TCP3D_A or CSL_TCP3D_B.\r
+     *          CSL_TCP3D_0 or CSL_TCP3D_1.\r
      */\r
     uint8_t                   instNum;\r
 \r

diff --git a/test/src/tcp3d_main.c b/test/src/tcp3d_main.c
index 4e9ce37338d995416d7fd3790bfeb2071d7644f6..3eb81de7d552d9e668a7c1e954ffc93372f311cf 100644 (file)
--- a/test/src/tcp3d_main.c
+++ b/test/src/tcp3d_main.c
@@ -126,7 +126,7 @@ cbTestDesc              codeBlockSet;
 \r
 Char                    *strMode[4] = {"3GPP(0)","LTE(1)","WIMAX(2)","WCDMA Split(3)"};\r
 Char                    *strDBuf[2] = {"Disable(0)","Enable(1)"};\r
-Char                    *strInst[2] = {"TCP3D_A(0)","TCP3D_B(1)"};\r
+Char                    *strInst[2] = {"TCP3D_0(0)","TCP3D_1(1)"};\r
 \r
 UInt32                  keepTestVectMem = 0;\r
 UInt32                  firstTime = 1;\r
@@ -402,14 +402,8 @@ Void testerTaskFunc(Void)
     dspCoreID           = CSL_chipReadDNUM();\r
 \r
     /******** Select the TCP3D Instance Number **********/\r
-#if 0\r
-    if ( dspCoreID == 0 ) // Core 0\r
-        instNum = CSL_TCP3D_A;\r
-    else\r
-        instNum = CSL_TCP3D_B;\r
-#else\r
     instNum = getTcp3dInstNum(dspCoreID);\r
-#endif\r
+\r
     /******** Clear TCP3D log file **********/\r
     PROF_LOG_INIT(instNum);\r
 \r
@@ -1189,11 +1183,7 @@ Void allInit(Void)
     EDMA3_DRV_Result    edmaResult = EDMA3_DRV_SOK;\r
 \r
 #if TEST_PROFILE_LOG\r
-#if 0\r
-    CSL_Tcp3d_cfgRegs   *tcp3dCfgRegs = (CSL_Tcp3d_cfgRegs *) ((instNum == CSL_TCP3D_A)? CSL_TCP3D_A_CFG_REGS: CSL_TCP3D_B_CFG_REGS);\r
-#else\r
     CSL_Tcp3d_cfgRegs   *tcp3dCfgRegs = (CSL_Tcp3d_cfgRegs *) getTcp3dCfgRegsBase(instNum);\r
-#endif\r
 #endif\r
 \r
     /* Initialize EDMA3 first */\r

diff --git a/test/src/tcp3d_multi_inst.h b/test/src/tcp3d_multi_inst.h
index 946697de46e932953334b6099fac3bbcf2ce9df6..feff0288444f1ea86f440740c86121791c9636fb 100644 (file)
--- a/test/src/tcp3d_multi_inst.h
+++ b/test/src/tcp3d_multi_inst.h
@@ -39,17 +39,18 @@
 /**\r
  * Test TCP3D Notification Events\r
  */\r
-#define TCP3D_A_TEST_EVENT              7\r
-#define TCP3D_B_TEST_EVENT              23\r
+#define TCP3D_0_TEST_EVENT              7\r
+#define TCP3D_1_TEST_EVENT              23\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
- * ((per spec intc_1.3.4.12.xlsx, TPCC2)\r
+ * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
+ * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
-#define TCP3D_A_REVT0_CH_NUMBER         34\r
-#define TCP3D_A_REVT1_CH_NUMBER         35\r
-#define TCP3D_B_REVT0_CH_NUMBER         36\r
-#define TCP3D_B_REVT1_CH_NUMBER         37\r
+#define TCP3D_0_REVT0_CH_NUMBER         34\r
+#define TCP3D_0_REVT1_CH_NUMBER         35\r
+#define TCP3D_1_REVT0_CH_NUMBER         36\r
+#define TCP3D_1_REVT1_CH_NUMBER         37\r
 \r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
@@ -64,9 +65,9 @@ INLINE UInt32 getNotifyEventNum(UInt8 instNum)
     UInt32 testEvt;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        testEvt = TCP3D_A_TEST_EVENT; //  First instance\r
+        testEvt = TCP3D_0_TEST_EVENT; //  First instance\r
     else\r
-        testEvt = TCP3D_B_TEST_EVENT; //  Second instance\r
+        testEvt = TCP3D_1_TEST_EVENT; //  Second instance\r
 \r
     return testEvt;\r
 }\r
@@ -88,9 +89,9 @@ INLINE UInt32 getRevt0ChannelNum(UInt8 instNum)
     UInt32 chNum;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        chNum = TCP3D_A_REVT0_CH_NUMBER; //  First instance\r
+        chNum = TCP3D_0_REVT0_CH_NUMBER; //  First instance\r
     else\r
-        chNum = TCP3D_B_REVT0_CH_NUMBER; //  Second instance\r
+        chNum = TCP3D_1_REVT0_CH_NUMBER; //  Second instance\r
 \r
     return chNum;\r
 }\r
@@ -100,9 +101,9 @@ INLINE UInt32 getRevt1ChannelNum(UInt8 instNum)
     UInt32 chNum;\r
 \r
     if ( instNum == CSL_TCP3D_0 )\r
-        chNum = TCP3D_A_REVT1_CH_NUMBER; //  First instance\r
+        chNum = TCP3D_0_REVT1_CH_NUMBER; //  First instance\r
     else\r
-        chNum = TCP3D_B_REVT1_CH_NUMBER; //  Second instance\r
+        chNum = TCP3D_1_REVT1_CH_NUMBER; //  Second instance\r
 \r
     return chNum;\r
 }\r

diff --git a/test/src/tcp3d_single_inst.h b/test/src/tcp3d_single_inst.h
index 2d535196e26523d5061d75e90c5a9530c086b2d7..9e0563bbd7151b289247475cc38b3fcdb9f245a1 100644 (file)
--- a/test/src/tcp3d_single_inst.h
+++ b/test/src/tcp3d_single_inst.h
@@ -39,26 +39,27 @@
 /**\r
  * Test TCP3D Notification Events\r
  */\r
-#define TCP3D_A_TEST_EVENT              23\r
+#define TCP3D_0_TEST_EVENT              7\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
- * (as per spec nysh_INTERNAL_1_0_7.pdf)\r
+ * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
+ * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
-#define TCP3D_A_REVT0_CH_NUMBER         0\r
-#define TCP3D_A_REVT1_CH_NUMBER         1\r
+#define TCP3D_0_REVT0_CH_NUMBER         34\r
+#define TCP3D_0_REVT1_CH_NUMBER         35\r
 \r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
     /* Host Interrupts for CPINTC0 (per spec - 0.0.1) */\r
-    UInt32  hostIntr[] = {6u, 26u, 46u, 66u};\r
+    UInt32  hostIntr[] = {13u, 29u, 45u, 61u};\r
 \r
     return hostIntr[dspCoreID];\r
 }\r
 \r
 INLINE UInt32 getNotifyEventNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_TEST_EVENT;\r
+    return TCP3D_0_TEST_EVENT;\r
 }\r
 \r
 INLINE CSL_TPCC_ShadowRegs * getEdma3ShadowRegsBase(UInt32 regionNum)\r
@@ -75,27 +76,27 @@ INLINE UInt32 getCpIntc0RegsBase()
 \r
 INLINE UInt32 getRevt0ChannelNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_REVT0_CH_NUMBER;\r
+    return TCP3D_0_REVT0_CH_NUMBER;\r
 }\r
 \r
 INLINE UInt32 getRevt1ChannelNum(UInt8 instNum)\r
 {\r
-    return TCP3D_A_REVT1_CH_NUMBER;\r
+    return TCP3D_0_REVT1_CH_NUMBER;\r
 }\r
 \r
 INLINE UInt8 getTcp3dInstNum(UInt32 dspCoreID)\r
 {\r
-    return CSL_TCP3D_A;\r
+    return CSL_TCP3D_0;\r
 }\r
 \r
 INLINE UInt32 getTcp3dCfgRegsBase(UInt8 instNum)\r
 {\r
-    return CSL_TCP3D_A_CFG_REGS;\r
+    return CSL_TCP3D_0_CFG_REGS;\r
 }\r
 \r
 INLINE UInt32 getTcp3dDataRegsBase(UInt8 instNum)\r
 {\r
-    return CSL_TCP3D_A_DATA_REGS;\r
+    return CSL_TCP3D_0_DATA_REGS;\r
 }\r
 \r
 #endif  /* _TCP3D_SINGLE_INST_H_ */\r