From b9c30cdba636faf528b4599b62628857303ef583 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 15 3月 2021 15:59:34 +0800
Subject: [PATCH] Merge pull request #121 from ferdymercury/patch-1

---
 examples/test-LwIP-netconn/scpi_server.c |   67 +++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
index 1b300de..309dd38 100644
--- a/examples/test-LwIP-netconn/scpi_server.c
+++ b/examples/test-LwIP-netconn/scpi_server.c
@@ -1,28 +1,29 @@
 /*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
  *
- * All Rights Reserved
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
@@ -164,6 +165,7 @@
 }
 
 void SCPI_RequestControl(void) {
+    BaseType_t xReturned;
     queue_event_t msg;
     msg.cmd = SCPI_MSG_SET_ESE_REQ;
 
@@ -173,18 +175,24 @@
     }
      */
 
-    xQueueSend(user_data.evtQueue, &msg, 1000);
+    xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+    /* @fixme: replace by real error handling code */
+    LWIP_ASSERT("SCPI_RequestControl failed", xReturned == pdPASS);
 }
 
 void SCPI_AddError(int16_t err) {
+    BaseType_t xReturned;
     queue_event_t msg;
     msg.cmd = SCPI_MSG_SET_ERROR;
     msg.param2 = err;
 
-    xQueueSend(user_data.evtQueue, &msg, 1000);
+    xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+    /* @fixme: replace by real error handling code */
+    LWIP_ASSERT("SCPI_AddError failed", xReturned == pdPASS);
 }
 
 void scpi_netconn_callback(struct netconn * conn, enum netconn_evt evt, u16_t len) {
+    BaseType_t xReturned;
     queue_event_t msg;
     (void) len;
 
@@ -200,7 +208,9 @@
         } else if (conn == user_data.control_io_listen) {
             msg.cmd = SCPI_MSG_CONTROL_IO_LISTEN;
         }
-        xQueueSend(user_data.evtQueue, &msg, 1000);
+        xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+        /* @fixme: replace by real error handling code */
+        LWIP_ASSERT("scpi_netconn_callback failed", xReturned == pdPASS);
     }
 }
 
@@ -356,6 +366,7 @@
     (void) arg;
 
     user_data.evtQueue = xQueueCreate(10, sizeof (queue_event_t));
+    LWIP_ASSERT("user_data.evtQueue != NULL", user_data.evtQueue != NULL);
 
     /* user_context will be pointer to socket */
     SCPI_Init(&scpi_context,
@@ -369,7 +380,10 @@
     scpi_context.user_context = &user_data;
 
     user_data.io_listen = createServer(DEVICE_PORT);
+    LWIP_ASSERT("user_data.io_listen != NULL", user_data.io_listen != NULL);
+
     user_data.control_io_listen = createServer(CONTROL_PORT);
+    LWIP_ASSERT("user_data.control_io_listen != NULL", user_data.control_io_listen != NULL);
 
     while (1) {
         waitServer(&user_data, &evt);
@@ -408,5 +422,8 @@
 }
 
 void scpi_server_init(void) {
-    sys_thread_new("SCPI", scpi_server_thread, NULL, 2 * DEFAULT_THREAD_STACKSIZE, SCPI_THREAD_PRIO);
-}
\ No newline at end of file
+    TaskHandle_t xHandle = NULL;
+    BaseType_t xReturned;
+    xReturned = xTaskCreate(scpi_server_thread, "SCPI", DEFAULT_THREAD_STACKSIZE, NULL, SCPI_THREAD_PRIO, &xHandle);
+    LWIP_ASSERT("scpi_server_init failed", xReturned == pdPASS);
+}

--
Gitblit v1.9.1