Revert "Rework of WireProtocol (nanoframework#1884)" (nanoframework#1897

)
Eclo · Aug 25, 2021 · 7b3b15d · 7b3b15d
1 parent 83d0612
commit 7b3b15d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/targets/ChibiOS/_common/WireProtocol_ReceiverThread.c b/targets/ChibiOS/_common/WireProtocol_ReceiverThread.c
@@ -8,6 +8,8 @@
 #include <cmsis_os.h>
 #include <WireProtocol_Message.h>
 
+extern WP_Message inboundMessage;
+
 #if (HAL_USE_SERIAL_USB == TRUE)
 extern SerialUSBDriver SDU1;
 #endif
@@ -21,8 +23,6 @@ __attribute__((noreturn)) void ReceiverThread(void const *argument)
 
     osDelay(500);
 
-    WP_Message_PrepareReception();
-
     // loop until thread receives a request to terminate
     while (1)
     {
@@ -33,7 +33,10 @@ __attribute__((noreturn)) void ReceiverThread(void const *argument)
         {
 #endif
 
-            WP_Message_Process();
+            WP_Message_Initialize(&inboundMessage);
+            WP_Message_PrepareReception(&inboundMessage);
+
+            WP_Message_Process(&inboundMessage);
 
 #if (HAL_USE_SERIAL_USB == TRUE)
             // pass control to the OS

diff --git a/targets/FreeRTOS/_common/WireProtocol_ReceiverThread.c b/targets/FreeRTOS/_common/WireProtocol_ReceiverThread.c
@@ -14,8 +14,6 @@ void ReceiverThread(void *argument)
 {
     (void)argument;
 
-    WP_Message_PrepareReception();
-
     // loop forever
     while (1)
     {

diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/common/WireProtocol_ReceiverThread.c b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/common/WireProtocol_ReceiverThread.c
@@ -13,8 +13,6 @@ void ReceiverThread(void const *argument)
 {
     (void)argument;
 
-    WP_Message_PrepareReception();
-
     // loop forever
     while (1)
     {

diff --git a/targets/TI_SimpleLink/_common/WireProtocol_ReceiverThread.c b/targets/TI_SimpleLink/_common/WireProtocol_ReceiverThread.c
@@ -15,12 +15,13 @@ void ReceiverThread(UArg arg0, UArg arg1)
     (void)arg0;
     (void)arg1;
 
-    WP_Message_PrepareReception();
-
     // loop forever
     while (1)
     {
-        WP_Message_Process();
+        WP_Message_Initialize(&inboundMessage);
+        WP_Message_PrepareReception(&inboundMessage);
+
+        WP_Message_Process(&inboundMessage);
 
         // Allow other tasks a chance to run
         Task_yield();