From bbf0b958cf68f4762c608b6a1aa31df1ec61623f Mon Sep 17 00:00:00 2001
From: "lishuang.xie" <lishuang.xie@smartlogictech.com>
Date: Wed, 6 Sep 2023 15:48:54 +0800
Subject: [PATCH]  merge branch dev_ck_v2.1_bug#1038# to dev_ck_v2.1

1. update libhwque.a and hwque.h
2. pet_rfm1/ecs_rfm0/ecs_rfm1 main.c add call smart_hq_debug_init()
3. spu(case14)+arm(case3): pass
4. spu(case21)+arm(case21):pass
5. spu(case34)+arm(case0): pass
6. spu(case44)+arm(case0): pass
---
 public/ecs_rfm_spu0/top/src/main.s.c |  10 +
 public/ecs_rfm_spu1/top/src/main.s.c | 263 ++++++++++++++-------------
 public/pet_rfm_spu1/top/src/main.s.c |  10 +
 public/rtos/common/libhwque.a        | Bin 7040 -> 8252 bytes
 public/rtos/inc/hwque.h              | 261 ++++++++++++--------------
 5 files changed, 274 insertions(+), 270 deletions(-)

diff --git a/public/ecs_rfm_spu0/top/src/main.s.c b/public/ecs_rfm_spu0/top/src/main.s.c
index a122b6b..1ad2318 100644
--- a/public/ecs_rfm_spu0/top/src/main.s.c
+++ b/public/ecs_rfm_spu0/top/src/main.s.c
@@ -18,12 +18,22 @@
 #include "log_client.h"
 #include "ucp_utility.h"
 #include "spu_shell.h"
+#include "hwque.h"
 
 int32_t main(int32_t argc, char* argv[])
 {
     UCP_PRINT_EMPTY("Hello world from ECS RFM SPU0,coreId[0x%x]", get_core_id());
     debug_write(DBG_DDR_COMMON_IDX(get_core_id(), 0), PLATFORM_BUILD_DATA);
 
+    /* hw_debug_init  */
+    int32_t core_id = get_core_id();
+    int ret = 0;
+    ret = smart_hq_debug_init((DBG_DDR_HW_ADDR_BASE+DBG_DDR_HW_LEN*core_id), DBG_DDR_HW_LEN);  // 推荐384，实际512
+    if (0 != ret)
+    {
+        debug_write(DBG_DDR_ERR_IDX(core_id, 46), ret);
+    }
+
     spu_log_client_init();
 
     ecs_rfm_spu0_drv_init();
diff --git a/public/ecs_rfm_spu1/top/src/main.s.c b/public/ecs_rfm_spu1/top/src/main.s.c
index de45e96..ad1d4c1 100644
--- a/public/ecs_rfm_spu1/top/src/main.s.c
+++ b/public/ecs_rfm_spu1/top/src/main.s.c
@@ -1,141 +1,148 @@
-// +FHDR------------------------------------------------------------
-//                 Copyright (c) 2022 SmartLogic.
-//                       ALL RIGHTS RESERVED
-// -----------------------------------------------------------------
-// Filename      : main.c
-// Author        : xianfeng.du
-// Created On    : 2022-06-25
-// Last Modified :
-// -----------------------------------------------------------------
-// Description:
-//
-//
-// -FHDR------------------------------------------------------------
-
-#include "ucp_printf.h"
-#include "rfm1_drv.h"
-#include "ucp_heartbeat.h"
-#include "ecs_rfm_spu1_top.h"
-#include "msg_transfer_queue.h"
+// +FHDR------------------------------------------------------------
+//                 Copyright (c) 2022 SmartLogic.
+//                       ALL RIGHTS RESERVED
+// -----------------------------------------------------------------
+// Filename      : main.c
+// Author        : xianfeng.du
+// Created On    : 2022-06-25
+// Last Modified :
+// -----------------------------------------------------------------
+// Description:
+//
+//
+// -FHDR------------------------------------------------------------
+
+#include "ucp_printf.h"
+#include "rfm1_drv.h"
+#include "ucp_heartbeat.h"
+#include "ecs_rfm_spu1_top.h"
+#include "msg_transfer_queue.h"
 #include "log_server.h"
 #include "ucp_utility.h"
 #include "phy_queue_proc.h"
-#include "cpri_test_mode.h"
-#include "spu_shell.h"
-#include "gtimer_drv.h"
-#include "rfm1_gtimer2.h"
-#include "ecs_rfm_spu1_oam.h"
-#include "phy_para.h"
-#include "hw_cpri.h"
-
-#ifdef TEST_ENABLE
-#include "fh_test.h"
-#endif
-
-extern void ecs_rfm1_build_cell(uint32_t scsId, uint32_t flag);
-extern void ecs_rfm1_delete_cell(uint32_t scsId, uint32_t nflag);
-
-#ifdef DDR_MONITOR
-void spu_ddr_monitor()
-{
-    if (1 == do_read_volatile(DDR_MONITOR_ENABLE))
-    {
-        clear_rfm1_gtimer2_1_intcnt();
-        gtimer2_int_enable(0);
-        do_write(DDR_MONITOR_ENABLE, 0);
-    }
-    volatile uint32_t nMonitorCnt = do_read_volatile(DDR_MONITOR_CNT);
-    __ucps2_synch(0);
-    if (nMonitorCnt < get_rfm1_gtimer2_1_intcnt())
-    {
-        gtimer2_int_disable(0);
-        do_write(DDR_MONITOR_CNT, 0);
-    }
-}
-#endif
-
-extern uint32_t     gCpriCsuDummyFlag;
-
-int32_t main(int32_t argc, char* argv[])
-{
-    UCP_PRINT_EMPTY("Hello world from ECS RFM SPU1,coreId[0x%x]",  get_core_id());
-    debug_write(DBG_DDR_COMMON_IDX(get_core_id(), 0), PLATFORM_BUILD_DATA);
+#include "cpri_test_mode.h"
+#include "spu_shell.h"
+#include "gtimer_drv.h"
+#include "rfm1_gtimer2.h"
+#include "ecs_rfm_spu1_oam.h"
+#include "phy_para.h"
+#include "hw_cpri.h"
+#include "hwque.h"
 
-    spu_log_client_init();
+#ifdef TEST_ENABLE
+#include "fh_test.h"
+#endif
+
+#ifdef DDR_MONITOR
+void spu_ddr_monitor()
+{
+    if (1 == do_read_volatile(DDR_MONITOR_ENABLE))
+    {
+        clear_rfm1_gtimer2_1_intcnt();
+        gtimer2_int_enable(0);
+        do_write(DDR_MONITOR_ENABLE, 0);
+    }
+    volatile uint32_t nMonitorCnt = do_read_volatile(DDR_MONITOR_CNT);
+    __ucps2_synch(0);
+    if (nMonitorCnt < get_rfm1_gtimer2_1_intcnt())
+    {
+        gtimer2_int_disable(0);
+        do_write(DDR_MONITOR_CNT, 0);
+    }
+}
+#endif
+
+extern uint32_t     gCpriCsuDummyFlag;
+
+int32_t main(int32_t argc, char* argv[])
+{
+    UCP_PRINT_EMPTY("Hello world from ECS RFM SPU1,coreId[0x%x]",  get_core_id());
+    debug_write(DBG_DDR_COMMON_IDX(get_core_id(), 0), PLATFORM_BUILD_DATA);
+
+    /* hw_debug_init  */
+    int32_t core_id = get_core_id();
+    int ret = 0;
+    ret = smart_hq_debug_init((DBG_DDR_HW_ADDR_BASE+DBG_DDR_HW_LEN*core_id), DBG_DDR_HW_LEN);  // 推荐384，实际512
+    if (0 != ret)
+    {
+        debug_write(DBG_DDR_ERR_IDX(core_id, 46), ret);
+    }
+
+    spu_log_client_init();
 
     spu_log_server_init();
-
-    ecs_rfm_spu1_drv_init();
-
-    ecs_rfm_spu1_msg_transfer_init();
-
-    spu_shell_init();
-
-    spu_shell_cpri_cmd();
-
-    oam_msg_init();
-    
-    while (1)
-    {
+
+    ecs_rfm_spu1_drv_init();
+
+    ecs_rfm_spu1_msg_transfer_init();
+
+    spu_shell_init();
+
+    spu_shell_cpri_cmd();
+
+    oam_msg_init();
+    
+    while (1)
+    {
 #ifdef TEST_ENABLE
-		do_write(CSU_TX_ADVANCE_SAMPLE, 10000);		// 10us
-		do_write(CSU_RX_TD_SAMPLE, 10000);
-		
-		check_test_outcome(0);
+		do_write(CSU_TX_ADVANCE_SAMPLE, 10000);		// 10us
+		do_write(CSU_RX_TD_SAMPLE, 10000);
+		
+		check_test_outcome(0);
 #endif
-#if 0
-		if (1 == do_read_volatile(0x0A4D726C))
-		{
-#ifdef CPRI_TIMING_7D2U_TEST
-	        ecs_rfm1_build_cell(NR_SCS_30K, 1);
-#endif
-#ifdef CPRI_TIMING_LTE_FDD_TEST
-	        ecs_rfm1_build_cell(LTE_SCS_ID, 1);
-#endif
-			do_write(0x0A4D726C, 2);
-		}
-		if (2 == do_read_volatile(0x0A4D726C))
-		{
-			check_phy_cell();
-		}
-		if (3 == do_read_volatile(0x0A4D726C))
-		{
-#ifdef CPRI_TIMING_7D2U_TEST
-			ecs_rfm1_delete_cell(NR_SCS_30K, 0);
-#endif
-			
-#ifdef CPRI_TIMING_LTE_FDD_TEST
-			ecs_rfm1_delete_cell(LTE_SCS_ID, 0);
-#endif
-			do_write(0x0A4D726C, 0);
-		}
-		if (4 == do_read_volatile(0x0A4D726C))
-		{
-#ifdef CPRI_TIMING_7D2U_TEST
-			ecs_rfm1_delete_cell(NR_SCS_30K, 1);
-#endif
-			
-#ifdef CPRI_TIMING_LTE_FDD_TEST
-			ecs_rfm1_delete_cell(LTE_SCS_ID, 1);
-#endif
-			do_write(0x0A4D726C, 0);
-		}
-#endif		
-		
+#if 0
+		if (1 == do_read_volatile(0x0A4D726C))
+		{
+#ifdef CPRI_TIMING_7D2U_TEST
+	        ecs_rfm1_build_cell(NR_SCS_30K, 1);
+#endif
+#ifdef CPRI_TIMING_LTE_FDD_TEST
+	        ecs_rfm1_build_cell(LTE_SCS_ID, 1);
+#endif
+			do_write(0x0A4D726C, 2);
+		}
+		if (2 == do_read_volatile(0x0A4D726C))
+		{
+			check_phy_cell();
+		}
+		if (3 == do_read_volatile(0x0A4D726C))
+		{
+#ifdef CPRI_TIMING_7D2U_TEST
+			ecs_rfm1_delete_cell(NR_SCS_30K, 0);
+#endif
+			
+#ifdef CPRI_TIMING_LTE_FDD_TEST
+			ecs_rfm1_delete_cell(LTE_SCS_ID, 0);
+#endif
+			do_write(0x0A4D726C, 0);
+		}
+		if (4 == do_read_volatile(0x0A4D726C))
+		{
+#ifdef CPRI_TIMING_7D2U_TEST
+			ecs_rfm1_delete_cell(NR_SCS_30K, 1);
+#endif
+			
+#ifdef CPRI_TIMING_LTE_FDD_TEST
+			ecs_rfm1_delete_cell(LTE_SCS_ID, 1);
+#endif
+			do_write(0x0A4D726C, 0);
+		}
+#endif		
+		
         phy_queue_polling();
 
-#ifdef DISTRIBUTED_BS
-        check_cpri();
+#ifdef DISTRIBUTED_BS
+        check_cpri();
 
         check_10ms_offset();
-#endif
+#endif
         spu_log_server_proc();
-        spu_shell_task();
-#ifdef DDR_MONITOR
-        spu_ddr_monitor();
-#endif
-    }
-
-    return 0;
-}
-
+        spu_shell_task();
+#ifdef DDR_MONITOR
+        spu_ddr_monitor();
+#endif
+    }
+
+    return 0;
+}
+
diff --git a/public/pet_rfm_spu1/top/src/main.s.c b/public/pet_rfm_spu1/top/src/main.s.c
index 4f9ee20..0820230 100644
--- a/public/pet_rfm_spu1/top/src/main.s.c
+++ b/public/pet_rfm_spu1/top/src/main.s.c
@@ -19,12 +19,22 @@
 #include "ucp_utility.h"
 #include "spu_shell.h"
 #include "pet_rfm_spu1_oam.h"
+#include "hwque.h"
 
 int32_t main(int32_t argc, char* argv[])
 {
     UCP_PRINT_EMPTY("Hello world from PET RFM SPU1,coreId[0x%x]", get_core_id());
     debug_write(DBG_DDR_COMMON_IDX(get_core_id(), 0), PLATFORM_BUILD_DATA);
 
+    /* hw_debug_init  */
+    int32_t core_id = get_core_id();
+    int ret = 0;
+    ret = smart_hq_debug_init((DBG_DDR_HW_ADDR_BASE+DBG_DDR_HW_LEN*core_id), DBG_DDR_HW_LEN);  // 推荐384，实际512
+    if (0 != ret)
+    {
+        debug_write(DBG_DDR_ERR_IDX(core_id, 46), ret);
+    }
+
     spu_log_client_init();
 
     pet_rfm_spu1_drv_init();
diff --git a/public/rtos/common/libhwque.a b/public/rtos/common/libhwque.a
index 1f6474e62cad22c24ac4c83d5513610ba080e985..243408a98912f445a9c5e0573a3df34f2def7a82 100644
GIT binary patch
literal 8252
zcmdT}Uu;v?89)A$#0jCh&}eg7Iy(?r2SMVbfu=3nAfpgf*2)9b{E*6VY{PX4v56g;
zN|6Xl=qTdhKA_2skbpI4nbb*D#X}#Mgc=BWutc>dH1Uv-QrwjX7?o;GX|vz&-gBIr
zP{IJIT90&me&;*i`ObH~@4MeU*Qai4v@fRrx~j>)xCCuo3)_GF{w>WdlB26i2=SZ{
z&ha0+b|-t|kyyGv85gnCfry@n#uI&!XguC0_C;c;z61vJcMeA4iSGV=BH0_+8%_2k
zFr_!kUZy`5OJp);H`SlDkFskYmNG2as*~uAcK0NN>Lz>lrbI@!^bnZ?(Y|aXp3IOZ
zaxl`HIFQc1E6LW(rPO_iY(zg8Ih2THQ+<+?v}EtW{)AmSOZLK0YQMRM1v1os;1oG_
z-yBY`wqR-wMNG4Smdr|JK(qB=LCldu$=+-q2A5K3#|5UvJuXNON(turnTXv?lC-zK
zr-y#*Pc)`VVfvu>+|t@=#^p<!Re*L?9eype)8TL+Os(P&FO)6xgqV8PqPLn&KvW5b
zsQv!%8>hZ5_<Y|+5*J*#d!zp<_@3$Ue)ji$xrtiw%WY0iS{rs0=gP$V8*VW$H#2|u
zYVD1JFLvzOWbJgp=N8`3`sZus%0)U<A@0nTt<{Zkp@nALgGFacK=Tj(^U`x^?`OWR
z3chD`Z~LileK$u71>dww%r3XKOALhCJ#XD9d$kyfV}0my(Ive3k&)aa)<5m?>PELG
zH}Pk!OLGe`eZ*M|VOulMHD6a9zJh&EJ6y&5c6V;V;n6jYnYvFGPA{v|cMrA)b#lL2
z96Ua&`zrq(xmhj-2C3HuM>tR2%3+JzS^adGSJ&2g-nw|MIyZ4N&}FzAbfdzrYxSa-
z_XKsrvnqVW1AA4v?#y{$tA_gKyPj<U!?WI)sAwP8ZjE1?tbqPU8+5Hg4CE^y+qpqE
zoIzbntnuDz*TTETwA?+~+~c}47;lRjW#SIj*FtrE$ih11!GJO8HZo`Zol_$(2F(3)
zei`=g<^19KGRWKq-5_g`E_L<I2S?h{##i(2T!l_rye53BqRhzD)k4lI0i$+?d-vTu
zKBF&h$7SLQb~Noqd%$iX`V+Ba`ZNZ8oK+8rn`M0D7AIrtM3M5hRYETJ3xAy+srK%o
zZx}1sJ7Q&bcRk{(9PtJJ&6Ndo<D8b8xE$!x;8*%GUqQdM!C&;*%Efki6rUZX&#J?_
zKCE8w+3-VrHvD415W={@xTU`T=equ2eEpH}g=f(o>x{3MExv|r@imP2QhQz+tB)h=
ze~#6;<)3-jK8;xNt+*SxiF{<n7GsLf{0BGCA{WIFJLkMz8e-eb1*DY+3dRKX??TME
ztY<m&yeQ6nJwJby&$I_Tt~T9R@wd^-F)#Vjn5*S0y#dYTx|82f-Mrle{)Pr);@Ios
zn!YkT>47Z7q~^go9>{oqTbFSQb1RSws*q1Am;(aM2PZqyh~0qpo<DqR#%)ZLuLu}N
z5YNbkhGVsr4`X<a7++4v<8w0nos}0%TSMkjzfHn#?|*0Ih4<jMbt^lk9A%JQ6)--S
z)_sm@Z~O7PzMCs#j#xI&E^G6XG318QGrR)%_Bd=G)4aP(d()oKm(TEe>lrTDJXVvN
zm|WtAieSN*ReoqTb7}}an7_{l$UTqagTK-Tn7h;mBhm+B(g$w(pt<COQmk_?KjD3t
z&%PB)R=%>w6>_N=SInn>2|oCJqvC4JyAW4y#8oLDAV!~5)+5L0GVd@a_Em@2bG=&3
zJFz#XrW-hGWNyqyu0}n`1CDUsQEB<Q?%3#SYw;Y{ReL9aFF($C=)vpFTkGLn`pD}o
z^B$$Gne!Tu`}pit;XPTv9(dlNFFi+b4nq#Cz`OCw`rO3M<}TzUoVi}sfARjBV#qUp
z_%L$|+BYh3eyck(dbzINI+q=Jr5LJw1+=y<BjC^dcBVde&$C)S7tf##7PK44kq(@B
z9P)Xw=km3%rvth$zc_K;d|Z3-oeKXk&s?Mrc@Ci;+mXw=aju+&O=Bb8Nzjnjk#ii@
z8Pnw~=GUDFPm(qZ92>E)3w!0BXL0T<(Y`-?wGQXN;fnu+)<fqw<enYrym(|}^ioud
z8a($bn<pO<gFp5jkeBBY*uxR*!7(y=<?P7l<tN?8ti$pFzA1K^XM5O{cHA!CPt1?}
z7QorNl;?T&{{!^+0^cJpt$_D$_zKRzA;;=*<E%C~^(1zc=SO^RJY$|s*PXa#`kFf3
zkUn+=i=j(6N4J|}=}?(So8Leld;`6JvpC-4plNf?Rh=C;m(Mvi1hk6k-8UUAI78#R
z$>H&S_9T91?qST<X<d&U|34)eqS#z1Vm;B`ef~p<zDzRJ>u+vp3^oS+fu>YC+mwta
zHf2+(o=nr*iQfIm-pnRFbs*97PO5KzCLN6>nm8EKqsiU{6zT3y_TaCSrc7VVMm^Nh
z)YEh5fJw<TS!=!=+|rt84Zau+wr-BLHb+}Fx9x3<wQlL|-rUv_1R>Vk+!Bnw+<+Ll
zulSq`B)7Obzt9uHC7i;E@fv)v;@d>5!tW;e(Qft2#7c~NY~v?@!=QD7e>LWRg0=&7
z8!G1~&`#O<9|9vcm&V@&K4$CxO3GI2f3awNw|E_WP4ZCw&#`v3txxtdE37rCj~D&x
z__yp5TJ~$fFbI57_OEk%r4T!0{{-5ct$z{y_)`nxS@iw3{_i1guF^^pl+Qmoiq+5o
zeC&UVmW6Awe;MQFq4RE3_WyxC_tSyO{wHYNWkO_Se+=zFxe#NL{~r1}<l``6@;9PA
zf%Vg}|2D?g*!mkme;WF-Y(uS)m_B+M>#*!Wt&unftoT17UGmd@)zIN{w0ViA(OyGc
z0s3vU1yu6fLAw!pC^=h+t3gEJK9$T6v7`@>2X<!}B3<Gfuqhwy8S*fAP-vGLi7${Y
z`SYYpTmYs%LFz;v{E@*@B#*>yjH$WgRdchXOWlS@mw1|VX%i$pQ@1g^e7_-&q}QOY
z=6ZqE+>NA5-C9YPI0Vc+h7k07$Rqa^CXd8v(k1^8=@Op-=G^O;OFfhhcwv-uxJ0_t
z{~GCX?lkEV7lA1!2RV4GN;<fKl@4o2m;4(^m$(C%wxbTa$s=tWCXd8%(j|Wn=@Op=
zR{EbJkK`XCkHjC7F8MztU1C3CR{3Hpu-f}>(q%mFAzk7)TCRmZ5JeBF^3edWvd;<9
zrF{I6Ra)y~V9s^pS^Shd{0AQ80(m5!B3;h?oOFqcz_bruzCxfX>;Zln&ngQ(C`66K
zYe<)K>q(dRJTP?_fn7c&kBqk|@<@D*bgaj6opgzB19NT%;^`am$aug(p|p4W!B<+B
zwpZ)60&{LB=58gA-0wE>NQ^&ROLO;-E_EIP=G@zuOTCrO26?2;XGoWNj*%|$d0@`n
zgSi*TBXzz+9u?1|%eAhPE;0UmFz1eAt{YY9>;YCfGp^O#HKfbAJAmmU>bx6O=^wVy
zyMUGNbYSJXEa_6tAn6j10V_Elkw^OaJb5I(NV?>oB3<G(j4QkC09JMzx6#kr=wA3l
z@wWmi{tz(t#oMD!)Te-l(56wT+ex%VR5jOw_o$j10Os6Qv_XmEXt$zru8y`t;yq}0
zqmrLIosvF;_5!Msp9fa*Zv&IRi1r(a1N1Q}<!?k=EwL9Z{ZD@K_$9pq?MaDGq0LD=
zhV~39`LCg6U+M5Mu+kv_dvmQI+Km#op>0Lw+$`E1s45OSh*4QW#L$~146Nd_lUVY^
zi6zf@V3p@DkPd&d6iJ6K&4TAc#l}`(6~jA7ho4x6NSFM_Z2a<u=aDYM7F`E5_9c3v
zjoHLNRy5+K??3_<c)U!qU(qeO(7W$4?7j;x>sn2cDQ)rXpsjbGtREbEz%||COS2!k
zR$F}UxAZ1c-NTvJnyO>FsN-zYSmyPkd3R^OH*4%oWfP6Ne)s04Og0+ZZ@Uj|<YC^t
z(aa?GNf#}?p))V_mXd7udG<>`rJ1}GwM<4u%qu?IO>OCBwsci$UG2q0V<y{|jdr7b
z_kh{<rQ*?S6#ec@rqQ~bvjXiQzc1kVz!9QUhH8b_1)3^2a+zf(eu?qgF$<R%N8GA{
z*SlG^<5yu4j;+G8ft=1zr&x~R(G|ZzhmQ`{*3gLSkmXg2p|51T1U{0LO5{^xoTqRI
zn0!GJQKrFn&VuGI$5;pP!&a4}KU2tR)!3f^T%q|Cs6!l~U0Bp3uK1dun9_~o$0$$g
KOuJG)Zt%Z|jCfW6

literal 7040
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
G!G8nq_f|*%

diff --git a/public/rtos/inc/hwque.h b/public/rtos/inc/hwque.h
index 4fffc28..076b7b2 100644
--- a/public/rtos/inc/hwque.h
+++ b/public/rtos/inc/hwque.h
@@ -34,7 +34,7 @@ typedef unsigned long long uint64_t;
 
 #define QUE_NR 16
 
-#define B_128_16BLCOKS  0     
+#define B_128_16BLCOKS  8     
 
 #define B_256_32BLOCKS  32   
 #define BLOCKS_64       64  
@@ -84,232 +84,209 @@ typedef struct{
     unsigned int in_failed_cnt;
     unsigned int out_success_cnt;
     unsigned int in_success_cnt;
+    unsigned int in_que_depth_val;
+    unsigned int out_que_depth_val;
 
 }hwq_db_info ;
 
 typedef struct{
-	hwq_db_info per_hwq[QUE_MAX_NR];
-	
+    hwq_db_info per_hwq[QUE_MAX_NR];
+
 }hwq_debug_t;
 
 
 
 /*
-	函数名称：smart_hq_init
-	输入参数: cpuid
-	返回类型: int
-	返回值：  小于0 表示失败
-	返回�?:      0 表示成功
-	函数功能�? 硬件队列初始�?
+    函数名称：smart_hq_init
+    输入参数: cpuid
+    返回类型: int
+    返回值：  小于0 表示失败
+    返回值：等于0 表示成功
+    函数功能：硬件队列初始化
 */
 
 extern int smart_hq_init(int cpuid);
 
 /*
-	函数名称：smart_get_hq_vector
-	输入参数: cpuid
-	输入参数：queid
-	返回类型: int
-	返回值：小于等于0 表示失败
-	函数功能�? 获取当前硬件队列中断�?
+    函数名称：smart_get_hq_vector
+    输入参数: cpuid
+    输入参数：queid
+    返回类型: int
+    返回值：小于等于0 表示失败
+    函数功能：获取当前硬件队列中断号
 
 */
 
 extern int smart_get_hq_vector(int cpuid,int queid);
 
 
-/***************
-函数名称：smart_in_que
-函数参数：queid 队列编号
-函数参数：val 入队值
-函数功能：硬件队列入队
-函数使用注意点1： 当前函数不能在中断处理函数中调用
-函数使用注意点2： 多核生产者入队时需要加锁
+/********************
+
+    函数名称：smart_in_que
+    函数参数：queid 队列编号
+    函数参数：val 入队值
+    函数功能：硬件队列入队
+    函数使用注意点1： 多核生产者入队时需要加锁
 
 ******************/
 
 
 extern int smart_in_que(int queid,uint32_t val);
 
-/***************
-函数名称：smart_intr_in_que
-函数参数：queid 队列编号
-函数参数：val 入队值
-函数功能：硬件队列入队
-函数使用注意点1： 当前函数只能在中断处理函数中调用
-函数使用注意点2： 多核生产者入队时需要加锁
-
-
-******************/
-extern int smart_intr_in_que(int queid,uint32_t val);
-
-/***************
-函数名称：smart_intr_out_que
-函数参数：queid 队列编号
-函数参数：val 入队值
-函数功能：硬件队列入队
-函数使用注意点1： 当前函数只能在中断处理函数中调用
-
-******************/
-
-extern int smart_intr_out_que(int queid,uint32_t *val);
-
-
 
 /*
-	函数名称：smart_que_is_full
-	输入参数: queid
-	返回类型：int
-	返回值：  1 表示 true
-	返回�?: 0 表示 false
-	说明：下�?版本返回值会更改enum  �?
-	enum hwque_status   smart_que_is_full(int queid);
-	返回值只能�?�择  hwque_false  和hwque_true
+    函数名称：smart_que_is_full
+    输入参数: queid
+    返回类型：int
+    返回值：  1 表示 true
+    返回值: 0 表示 false
 */
 
 extern int smart_que_is_full(int queid);
 
 /*********************
-函数名称：smart_out_que
-函数参数：queid 队列编号
-输出参数：idx 获取当前队列的索引值
-函数功能：队列出队获取当前队列的索引值
-函数使用注意点1：当前函数不能在中断处理函数中调用
-
+    函数名称：smart_out_que
+    函数参数：queid 队列编号
+    输出参数：idx 获取当前队列的索引值
+    函数功能：队列出队获取当前队列的索引值
 
 *********************/
 
-
 extern int smart_out_que(int queid,uint32_t *val);
 
 /*
-	函数名称：smart_que_is_empty
-	输入参数: queid
-	返回类型: int
-	返回值：  1 表示true
-	返回值：0     表示false 
+    函数名称：smart_que_is_empty
+    输入参数: queid
+    返回类型: int
+    返回值：  1 表示true
+    返回值：0     表示false 
 
 */
 extern int smart_que_is_empty(int queid);
 
 /*
-	函数名称：smart_get_que_info
-	输入参数: queid
-	输出参数      *dep
-	输出参数: *width
-	输出参数: *used
-	输出参数�?*cpuid
-	返回类型: int
-	返回值：  �?0 表示失败
-	返回�?:      0 表示成功
-	
+    函数名称：smart_get_que_info
+    输入参数: queid
+    输出参数      *dep
+    输出参数: *width
+    输出参数: *used
+    输出参数: *cpuid
+    返回类型: int
+    返回值:0 表示成功，非0 表示失败
+
 */
 
 extern int smart_get_que_info(int queid,int *dep,int *width,int *used,int *cpuid);
 
 /*
-	函数名称：smart_enable_q_nempty
-	输入参数: queid
-	返回值： �?
+//    函数名称：smart_enable_q_nempty
+    函数名称：smart_hq_nempty_int_enable
+    输入参数: queid
+    返回值：int
+    函数功能:使能非空中断
 	
 */
 
 extern void smart_enable_q_nempty(int queid);
+//extern void smart_hq_nempty_int_enable(int queid);
 
-/********************************
-	函数名称：smart_disable_q_nempty
-	输入参数: queid
-	返回值： �?
-	函数功能：使能非空中�?
-	
-************************************/
-
-extern void smart_disable_q_nempty(int queid);
 
 /*
-	函数名称：smart_que_bind
-	输入参数: queid
-	输入参数；cpuid
-	返回类型：int
-    返回�?  �?     �?0 表示失败
-	返回值：       0 表示成功
-	函数功能：去使能非空中断
-	
+//    函数名称：smart_disable_q_nempty
+    函数名称:smart_hq_nempty_int_disable
+    输入参数: queid
+    返回值：int
+    函数功能:去使能非空中断
+
+*/
+
+extern void smart_disable_q_nempty(int queid);
+//extern void smart_hq_nempty_int_disable(int queid);
+
+
+/*
+    函数名称：smart_que_bind
+    输入参数: queid
+    输入参数；cpuid
+    返回类型：int
+    返回值 : 0 表示返回成功，非0 表示返回失败
+
+    函数功能：去使能非空中断
+
 */
 
 extern int smart_que_bind(int cpuid,int queid);
 
 
 /*
-	函数名称：smart_hq_debug_init
-	输入参数: debug_base_addr
-	输入参数；len_bytes
-	返回类型：int
-	返回�?  �?  �?0 表示失败
-	返回值：0 表示成功
-	函数功能：调试初始化接口	
+    函数名称：smart_hq_debug_init
+    输入参数: debug_base_addr
+    输入参数；len_bytes
+    返回类型：int
+    返回值：0 表示成功
+    函数功能：调试初始化接口	
 
-	注意�?
-	通过地址与，长度指定相应的buf 数据空间，存放相应的中断调试信息�?
-	这些调试信息已经格式化，地址由用户指定，len_bytes  不能小于sizeof(hwq_debug_t)
-	数据格式化内容是     	 hwq_debug_t
+    注意:
+    通过地址与，长度指定相应的buf 数据空间，存放相应的中断调试信息
+    这些调试信息已经格式化，地址由用户指定，len_bytes  不能小于sizeof(hwq_debug_t)
+    数据格式化结构是:     hwq_debug_t
 
-	数据格式 example:
-	typedef struct{
-		unsigned int out_failed_cnt;
-		unsigned int in_failed_cnt;
-		unsigned int out_success_cnt;
-		unsigned int in_success_cnt;
-		unsigned int cur_que_depth;
-		unsigned int bind_cpuid;
-	
-	}hwq_db_info ;
-	
-	typedef struct{
-		hwq_db_info per_hwq[HW_QUE_NR];
-		
-	}hwq_debug_t;
+    数据格式 example:
+    typedef struct{
+        unsigned int out_failed_cnt;
+        unsigned int in_failed_cnt;
+        unsigned int out_success_cnt;
+        unsigned int in_success_cnt;
+        unsigned int cur_que_depth;
+        unsigned int bind_cpuid;
+
+    }hwq_db_info ;
+
+    typedef struct{
+        hwq_db_info per_hwq[HW_QUE_NR];
+
+    }hwq_debug_t;
 
 */
 
 extern int smart_hq_debug_init( uint32_t debug_base_addr, uint32_t len_bytes);
 
 /*
-	函数名称：smart_get_inque_ok_cnt
-	输入参数: queid
-	返回类型：int
-	返回�?  �?    小于等于0表示失败
-	函数功能：获取当前入队成功计�?
+    函数名称：smart_get_inque_ok_cnt
+    输入参数: queid
+    返回类型：int
+    返回值 :  小于等于0表示失败
+    函数功能：获取当前入队成功计数
 */
 
 extern int smart_get_inque_ok_cnt(int queid);
 
 /*
-	函数名称：smart_get_inque_failed_cnt
-	输入参数: queid
-	返回类型：int
-	返回�?  �?    小于等于0表示失败
-	函数功能：获取当前入队失败计�?
+    函数名称：smart_get_inque_failed_cnt
+    输入参数: queid
+    返回类型：int
+    返回值 :    小于等于0表示失败
+    函数功能：获取当前入队失败计数
 */
 
 extern int smart_get_inque_failed_cnt(int queid);
 
 /*
-	函数名称：smart_get_outque_ok_cnt
-	输入参数: queid
-	返回类型：int
-	返回�?  �?    小于等于0表示失败
-	函数功能：获取当前出队成功计�?
+    函数名称：smart_get_outque_ok_cnt
+    输入参数: queid
+    返回类型：int
+    返回值：小于等于0表示失败
+    函数功能：获取当前出队成功计数
 */
 
 extern int smart_get_outque_ok_cnt(int queid);
 
 /*
-	函数名称：smart_get_outque_failed_cnt
-	输入参数: queid
-	返回类型：int
-	返回�?  �?    小于等于0表示失败
-	函数功能：获取当前出队失败计�?
+    函数名称：smart_get_outque_failed_cnt
+    输入参数: queid
+    返回类型：int
+    返回值:     0表示成功，非0表示失败
+    函数功能：获取当前出队失败计数
 */
 
 extern int smart_get_outque_failed_cnt(int queid);