From a8a386b18d3507e2d84278094b262745758d4951 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 02 6月 2016 04:16:08 +0800
Subject: [PATCH] Fix formating to cc.h, add stdbool.h detection

---
 examples/test-LwIP-netconn/scpi_server.c |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
index 191a8e9..1b300de 100644
--- a/examples/test-LwIP-netconn/scpi_server.c
+++ b/examples/test-LwIP-netconn/scpi_server.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2012-2013 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:
@@ -11,7 +11,7 @@
  * 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.
- * 
+ *
  * 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
@@ -28,10 +28,10 @@
 /**
  * @file   scpi_server.c
  * @date   Thu Nov 15 10:58:45 UTC 2012
- * 
+ *
  * @brief  TCP/IP SCPI Server
- * 
- * 
+ *
+ *
  */
 
 #include <stdio.h>
@@ -69,8 +69,8 @@
     struct netconn *io;
     struct netconn *control_io;
     xQueueHandle evtQueue;
-    //FILE * fio;
-    //fd_set fds;
+    /* FILE * fio; */
+    /* fd_set fds; */
 } user_data_t;
 
 struct _queue_event_t {
@@ -112,7 +112,7 @@
 
 int SCPI_Error(scpi_t * context, int_fast16_t err) {
     (void) context;
-    // BEEP
+    /* BEEP */
     iprintf("**ERROR: %ld, \"%s\"\r\n", (int32_t) err, SCPI_ErrorTranslate(err));
     if (err != 0) {
         /* New error */
@@ -167,7 +167,7 @@
     queue_event_t msg;
     msg.cmd = SCPI_MSG_SET_ESE_REQ;
 
-    /* Avoid sending evtQueue message if ESR_REQ is already set 
+    /* Avoid sending evtQueue message if ESR_REQ is already set
     if((SCPI_RegGet(&scpi_context, SCPI_REG_ESR) & ESR_REQ) == 0) {
         xQueueSend(user_data.evtQueue, &msg, 1000);
     }
@@ -237,11 +237,11 @@
 
     if (netconn_accept(user_data->io_listen, &newconn) == ERR_OK) {
         if (user_data->io) {
-            // Close unwanted connection
+            /* Close unwanted connection */
             netconn_close(newconn);
             netconn_delete(newconn);
         } else {
-            // connection established
+            /* connection established */
             iprintf("***Connection established %s\r\n", inet_ntoa(newconn->pcb.ip->remote_ip));
             user_data->io = newconn;
         }
@@ -258,7 +258,7 @@
             netconn_close(newconn);
             netconn_delete(newconn);
         } else {
-            // control connection established
+            /* control connection established */
             iprintf("***Control Connection established %s\r\n", inet_ntoa(newconn->pcb.ip->remote_ip));
             user_data->control_io = newconn;
         }
@@ -268,7 +268,7 @@
 }
 
 static void closeIo(user_data_t * user_data) {
-    // connection closed
+    /* connection closed */
     netconn_close(user_data->io);
     netconn_delete(user_data->io);
     user_data->io = NULL;
@@ -276,7 +276,7 @@
 }
 
 static void closeSrqIo(user_data_t * user_data) {
-    // control connection closed
+    /* control connection closed */
     netconn_close(user_data->control_io);
     netconn_delete(user_data->control_io);
     user_data->control_io = NULL;
@@ -300,7 +300,7 @@
     if (buflen > 0) {
         SCPI_Input(&scpi_context, buf, buflen);
     } else {
-        //goto fail2;
+        /* goto fail2; */
     }
 
     netbuf_delete(inbuf);
@@ -330,9 +330,9 @@
     netbuf_data(inbuf, (void**) &buf, &buflen);
 
     if (buflen > 0) {
-        // TODO process control
+        /* TODO process control */
     } else {
-        //goto fail2;
+        /* goto fail2; */
     }
 
     netbuf_delete(inbuf);
@@ -348,7 +348,7 @@
 }
 
 /*
- * 
+ *
  */
 static void scpi_server_thread(void *arg) {
     queue_event_t evt;
@@ -357,10 +357,16 @@
 
     user_data.evtQueue = xQueueCreate(10, sizeof (queue_event_t));
 
-    // user_context will be pointer to socket
-    scpi_context.user_context = &user_data;
+    /* user_context will be pointer to socket */
+    SCPI_Init(&scpi_context,
+            scpi_commands,
+            &scpi_interface,
+            scpi_units_def,
+            SCPI_IDN1, SCPI_IDN2, SCPI_IDN3, SCPI_IDN4,
+            scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
+            scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
 
-    SCPI_Init(&scpi_context);
+    scpi_context.user_context = &user_data;
 
     user_data.io_listen = createServer(DEVICE_PORT);
     user_data.control_io_listen = createServer(CONTROL_PORT);
@@ -368,7 +374,7 @@
     while (1) {
         waitServer(&user_data, &evt);
 
-        if (evt.cmd == SCPI_MSG_TIMEOUT) { // timeout
+        if (evt.cmd == SCPI_MSG_TIMEOUT) { /* timeout */
             SCPI_Input(&scpi_context, NULL, 0);
         }
 

--
Gitblit v1.9.1