From 70fb05c6503dbda036e070d5f86b4c2e632a6a7a Mon Sep 17 00:00:00 2001
From: chenyf <1343619937@qq.com>
Date: Thu, 21 Nov 2024 00:26:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(simple=20cmd)=20=E5=AE=8C=E6=88=90=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=E9=80=9A=E8=AE=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erpc_core.c   | 116 +++++++++++++++++++++++++++-----------------------
 erpc_core.o   | Bin 6260 -> 6276 bytes
 port_self.c   |   1 +
 port_self.exe | Bin 70831 -> 70831 bytes
 port_self.o   | Bin 10021 -> 10099 bytes
 5 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/erpc_core.c b/erpc_core.c
index 570de48..2bd711c 100644
--- a/erpc_core.c
+++ b/erpc_core.c
@@ -173,25 +173,26 @@ u32 erpc_send(u8 hw, u8 dest_id, u16 port, u8 *data, u16 len)
   u32 ret = ERPC_NO_ERROR;
   do
   {
-      if(wait_time == 0){
-        ret = ERPC_ERR_SEND_TIMEOUT;
-        break;
-      }
-      if(hw_cfg->send_cache[cache_ord].state == ERPC_CMD_SEND_ONCE){
-        ret = ERPC_ERR_DEST_NO_RESPONSE;
-        break;
-      }
-      if(hw_cfg->send_cache[cache_ord].state == ERPC_CMD_SEND_REPEAT){
-        ret = ERPC_ERR_DEST_NO_RESPONSE;
-        break;
-      }
+    if (wait_time == 0)
+    {
+      ret = ERPC_ERR_SEND_TIMEOUT;
+      break;
+    }
+    if (hw_cfg->send_cache[cache_ord].state == ERPC_CMD_SEND_ONCE)
+    {
+      ret = ERPC_ERR_DEST_NO_RESPONSE;
+      break;
+    }
+    if (hw_cfg->send_cache[cache_ord].state == ERPC_CMD_SEND_REPEAT)
+    {
+      ret = ERPC_ERR_DEST_NO_RESPONSE;
+      break;
+    }
   } while (0);
   hw_cfg->send_cache[cache_ord].state = ERPC_CMD_NO_ERROR;
   return ret;
 }
 
-
-
 u32 erpc_send_data(erpc_hw_cfg_t *hw)
 {
   for (int i = 0; i < MAX_SEND_CMD_CACHE_NUM; i++)
@@ -367,49 +368,58 @@ void erpc_rev_deal_core()
   while (list != NULL)
   {
     erpc_hw_cfg_t *hw = (erpc_hw_cfg_t *)list->data;
-
-    for (int j = 0; j < MAX_REC_CMD_CACHE_NUM; j++)
-    {
-      // 发现等待处理的数据包
-      if (hw->rec_cache[j].state == ERPC_CMD_WAIT_TASK_DEAL)
+    { // 遍历接收缓存
+      for (int j = 0; j < MAX_REC_CMD_CACHE_NUM; j++)
       {
-        // 多线程处理
-        hw->deal_lock();
-        if (hw->rec_cache[j].state == ERPC_CMD_WAIT_TASK_DEAL)
-        {
-          // 获取指令的处理权限
-          hw->rec_cache[j].state = ERPC_CMD_WAIT_TASK_DEAL_FINISH;
-        }
-        else
-        {
-          // 已经有线程抢先执行了
-          hw->deal_unlock();
-          continue;
-        }
-        hw->deal_unlock();
-        // 搜索指令列表
-        list_t *cmd_list = &hw->cmd_list;
-        // 链表是空的
-        if (cmd_list->data == NULL)
-        {
-          continue;
-        }
-        while (cmd_list != NULL)
-        {
-          erpc_cmd_list_t *cmd_obj = (erpc_cmd_list_t *)cmd_list->data;
-          erpc_cmd_def_t *cmd_def = (erpc_cmd_def_t *)hw->rec_cache[j].data;
-          if (cmd_obj->cmd == cmd_def->head.port)
+        { // 发现等待处理的数据包
+          if (hw->rec_cache[j].state != ERPC_CMD_WAIT_TASK_DEAL)
           {
-            if (cmd_obj->handle != NULL)
-            {
-              // 指令调用
-              cmd_obj->handle(hw->ord, cmd_def->head.src_id, cmd_def->head.dest_id, cmd_def->head.port, cmd_def->data, cmd_def->head.msg_len);
-            }
-            // 处理完成 丢弃缓存
-            hw->rec_cache[j].state = ERPC_CMD_NO_ERROR;
+            continue;
           }
-          cmd_list = cmd_list->next;
         }
+        { // 多线程下，抢占处理权限
+          hw->deal_lock();
+          if (hw->rec_cache[j].state == ERPC_CMD_WAIT_TASK_DEAL)
+          {
+            // 获取指令的处理权限
+            hw->rec_cache[j].state = ERPC_CMD_WAIT_TASK_DEAL_FINISH;
+          }
+          else
+          {
+            // 已经有线程抢先执行了
+            hw->deal_unlock();
+            continue;
+          }
+          hw->deal_unlock();
+        }
+        { // 处理指令
+          // 搜索指令列表
+          list_t *cmd_list = &hw->cmd_list;
+          // 链表是空的
+          if (cmd_list->data == NULL)
+          {
+            continue;
+          }
+          // 获取指令指针
+          erpc_cmd_def_t *cmd_def = (erpc_cmd_def_t *)hw->rec_cache[j].data;
+          while (cmd_list != NULL)
+          { // 搜索指令列表
+            erpc_cmd_list_t *cmd_obj = (erpc_cmd_list_t *)cmd_list->data;
+            if (cmd_obj->cmd == cmd_def->head.port)
+            {
+              if (cmd_obj->handle != NULL)
+              {
+                // 指令调用
+                cmd_obj->handle(hw->ord, cmd_def->head.src_id, cmd_def->head.dest_id, cmd_def->head.port, cmd_def->data, cmd_def->head.msg_len);
+              }
+
+              break;
+            }
+            cmd_list = cmd_list->next;
+          }
+        }
+        // 处理完成 丢弃缓存 , 无论是否执行指令，都需要把数据包丢弃
+        hw->rec_cache[j].state = ERPC_CMD_NO_ERROR;
       }
     }
     list = list->next;
diff --git a/erpc_core.o b/erpc_core.o
index d9d50ac2cbe424258a49de7477193b386e931a5a..f4ec43652f5900f2c1abc5a755018f5cc29cc63f 100644
GIT binary patch
delta 378
zcmexj&|=7$(#FmJ0(uiUr8xum7#MUI85lw)>J~HBOkAkWY9PSCkTdbDGUJnpAJrK}
zHcK*w@yLDwDtUPVNO*L+{_yB#@aS}XaNP9^$e5S2C-?BGG8RnU#B0dtHMyTxdh&l>
z4arjRmp_2AK=ltix*Hrs7#RLvc=-${GTEO`Df7n5eu(4?h+!9i>Mrna7XVT>__sT7
zq*)#+O#z8{bUSc(v>qra0C9Y}1317cwmER|Z#w~E`gBLYHM#I_2aEA<b6|Ag-*x~b
zKlvP=oXl%UAQNa4(5Oxz-CX;Efxk8F|NsB587F`otbL4u0my82{leH>`-PLgFZ$pA
z|3EE3pMtgg0BZRG)S?R%o~+BOz?Tqvcme`!&g4&KWOUkmR-l@ZTL~DT;y}N#Fz9U#
O7BXfAinoitWdZ;$CyY)2

delta 344
zcmZoM{9?eF(#FmJ0&){Mr8yn=7#MUI85mq9>J~HROkAkWsvy9?5Hs<tGUJtrAJrLI
zHcK*w@yNahDtUPrNO*L+{_yB#@aS}XaNP9^$e5SYCin2FGUiO)#B0dtH@Tlzdh&l>
z4GsR*mmtaaKmw@efk$_Pg9rn|{|hhgLPTCbOt~@Hfln#+0#L~f{_O%l>H`0E2aYt$
zL;S4`5QR59x*a$?S`U<jf)x352XKH@ZFAt_-*y7T^y!X(Yjok?4i@9z=D_H}zwH1>
ze)4HPIgqndkAa;6v>0e!r|S!k=Gqqw{H@CW|Nn1x{leH>`-PLgFJZDFzZi?rzyJRy
u>+&ivC&V7!T*;rz$Y{Iyu0S;-w=6KY#DVT&VbI*1EM&|K6rV2omI(m6d3K!u

diff --git a/port_self.c b/port_self.c
index 7ccedb9..36f6f70 100644
--- a/port_self.c
+++ b/port_self.c
@@ -93,6 +93,7 @@ DWORD WINAPI test_task(LPVOID lpParam)
     {
         // printf("[test_task]send\n");
         u32 ret = erpc_send(self_hw_cfg.ord, self_hw_cfg.local_id, 0x01, NULL, 0);
+        ret = erpc_send(self_hw_cfg.ord, self_hw_cfg.local_id, 0x02, NULL, 0);
         printf("[test_task]send ret:%d\n", ret);
         sys_sleep(1000);
     }
diff --git a/port_self.exe b/port_self.exe
index 0ea715d5bc6d22dd2666b30ad5679ccf16d3eb52..364981f7047306221cc72e78ce6a0797d8f0b506 100644
GIT binary patch
delta 6368
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
Gk^ctS!1Rm&

delta 6262
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
TuKwcE*%%mq{yI;0oQnBh>A1vY

diff --git a/port_self.o b/port_self.o
index ed6933e66ff8de2cb692adabcadfa9ab2becd9c1..bd191e2046f652d90681843b7a9b707465b9726d 100644
GIT binary patch
delta 596
zcmX}pODIH97zglk&fH5LQx<5r6EkL-k;kC%+6*BzQR5M^A&;?DO0&=u3zRgA+gV6i
z5O!AX(nhk76l-e>QzEa08gu>cIXQQ6&#(V?zVn^iJxzQjij&(##Ch8NW^r}fhDJ!5
z5|Z<Zki@X~$mm=oIlnqDBk|rS#~z)KS#xrjrp==;YckB+kbYwja$<f5Xp&daFg@da
zG+gk4!y5e7GJT`G(G{eOkGg_IKHIjlX}tKFYdVz5+xG5YZs#hVaW7)Tvoj{XixF5d
z6^AItcglD|8|OpXDtrIsms*tFJBx?Ab%UKt_Ul{Lojy_Njxs_v(d?`#tJ%9x*PrlV
zxHr+rt5PY-ogy<JkB|@Q5*mOSg~n8M3ThSE3?$E6fVxGtqV}aAdCH#5)-m`%g~w1>
zv|K|?LJv?t=us&PHH+*Ek{A4e<k8ix|K1Q36#H70dLh|61eM6<5wMG2)KtYjponNG
m!Edh@@+oyF4MHuVI;pf|71n+;7G*r|@6l7pV^&|?llBKw$7Rs~

delta 529
zcmX}mKS%;m90%~<JMV=FhC_c$B`*z6D9tD+B!X*AL<*yZ{un}=Q=?!*M4KFMDT1KE
zsUhMTgO;Xnt*Nm;giu6CL!o_rS9im`58wB`zxO_~wXCPO-%XwGSu;I>iJVGQW<>Rn
z3@MF8quge)SlB7pk^JxW;tVJ9nfV2lF;8{nCt%*j_+gM}*=$DHlo(_>D+`0^T~`?P
zpjjpM&P3HU(6!iZw;LDY+_l2agj*eAcS2X|N~|R|xL<gAP*H8p^B{W>>-@y};;a4M
z79O^T>pQDqt%Z(Q<rVZJQt1tvmg-T6Mx{cKy*mu0WEO|;cr+5wjMS`i&VcMGTTZs^
zWF<(KjVd%oRKb{IFe<~Eqf00uvuntH!VP4Peu7X&_X8S{`gY`T{dfByyBmP)?h=%g
tjRQ!y!@kLTATFbZBh3EGe9*Yu)f}a)e7LD7EhaLNIc^|NTh+*;`U@A|QAq#*