libdvr: inconsistent DMX_MEM_SEC_LEVEL3 definitions [1/1]
PD#SWPL-109423
Problem:
DMX_MEM_SEC_LEVEL3 definitions are not consistent among user/driver codes.
Solution:
Make them identical.
Verify:
Locally tested OK in Yocto environment.
Signed-off-by: Wentao.MA <wentao.ma@amlogic.com>
Change-Id: I26a8630fa665c9e2ddb4854957412f0f17c33219
diff --git a/include/dmx.h b/include/dmx.h
index 329694f..c443978 100644
--- a/include/dmx.h
+++ b/include/dmx.h
@@ -112,8 +112,12 @@
/*bit 8~15 for mem sec_level*/
#define DMX_MEM_SEC_LEVEL1 (1 << 10)
-#define DMX_MEM_SEC_LEVEL2 (1 << 11)
-#define DMX_MEM_SEC_LEVEL3 (1 << 12)
+#define DMX_MEM_SEC_LEVEL2 (2 << 10)
+#define DMX_MEM_SEC_LEVEL3 (3 << 10)
+#define DMX_MEM_SEC_LEVEL4 (4 << 10)
+#define DMX_MEM_SEC_LEVEL5 (5 << 10)
+#define DMX_MEM_SEC_LEVEL6 (6 << 10)
+#define DMX_MEM_SEC_LEVEL7 (7 << 10)
#endif
};
@@ -213,8 +217,12 @@
#ifdef CONFIG_AMLOGIC_DVB_COMPAT
/*bit 8~15 for mem sec_level*/
#define DMX_MEM_SEC_LEVEL1 (1 << 10)
-#define DMX_MEM_SEC_LEVEL2 (1 << 11)
-#define DMX_MEM_SEC_LEVEL3 (1 << 12)
+#define DMX_MEM_SEC_LEVEL2 (2 << 10)
+#define DMX_MEM_SEC_LEVEL3 (3 << 10)
+#define DMX_MEM_SEC_LEVEL4 (4 << 10)
+#define DMX_MEM_SEC_LEVEL5 (5 << 10)
+#define DMX_MEM_SEC_LEVEL6 (6 << 10)
+#define DMX_MEM_SEC_LEVEL7 (7 << 10)
/*bit 16~23 for output */
#define DMX_ES_OUTPUT (1 << 16)
diff --git a/test/am_ca_test/dmx.h b/test/am_ca_test/dmx.h
index ef97a48..75d22c1 100644
--- a/test/am_ca_test/dmx.h
+++ b/test/am_ca_test/dmx.h
@@ -215,8 +215,12 @@
#ifdef CONFIG_AMLOGIC_DVB_COMPAT
/*bit 8~15 for mem sec_level*/
#define DMX_MEM_SEC_LEVEL1 (1 << 10)
-#define DMX_MEM_SEC_LEVEL2 (1 << 11)
-#define DMX_MEM_SEC_LEVEL3 (1 << 12)
+#define DMX_MEM_SEC_LEVEL2 (2 << 10)
+#define DMX_MEM_SEC_LEVEL3 (3 << 10)
+#define DMX_MEM_SEC_LEVEL4 (4 << 10)
+#define DMX_MEM_SEC_LEVEL5 (5 << 10)
+#define DMX_MEM_SEC_LEVEL6 (6 << 10)
+#define DMX_MEM_SEC_LEVEL7 (7 << 10)
/*bit 16~23 for output */
#define DMX_ES_OUTPUT (1 << 16)