From db0bfe56689d8ca9bd2f716836db04d4cd252588 Mon Sep 17 00:00:00 2001
From: Jack <jack.barraclough.1@gmail.com>
Date: 周三, 22 2月 2017 00:59:26 +0800
Subject: [PATCH] Fix compiler warning with USE_COMMAND_TAGS 0
---
examples/test-LwIP-netconn/scpi_server.c | 100 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
index e6dee56..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,16 +69,15 @@
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
-{
+struct _queue_event_t {
uint8_t cmd;
uint8_t param1;
int16_t param2;
-} __attribute__ ((__packed__));
+} __attribute__((__packed__));
typedef struct _queue_event_t queue_event_t;
@@ -92,7 +91,7 @@
size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->io) {
return (netconn_write(u->io, data, len, NETCONN_NOCOPY) == ERR_OK) ? len : 0;
}
@@ -102,7 +101,7 @@
scpi_result_t SCPI_Flush(scpi_t * context) {
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->io) {
/* flush not implemented */
return SCPI_RES_OK;
@@ -113,14 +112,14 @@
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 */
+ /* New error */
/* Beep */
- /* Error LED ON */
+ /* Error LED ON */
} else {
- /* No more errors in the queue */
+ /* No more errors in the queue */
/* Error LED OFF */
}
return 0;
@@ -134,20 +133,14 @@
} else {
iprintf("**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
}
-
+
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->control_io) {
- snprintf(b, sizeof(b), "SRQ%d\r\n", val);
+ snprintf(b, sizeof (b), "SRQ%d\r\n", val);
return netconn_write(u->control_io, b, strlen(b), NETCONN_NOCOPY) == ERR_OK ? SCPI_RES_OK : SCPI_RES_ERR;
}
}
- return SCPI_RES_OK;
-}
-
-scpi_result_t SCPI_Test(scpi_t * context) {
- (void) context;
- iprintf("**Test\r\n");
return SCPI_RES_OK;
}
@@ -162,7 +155,6 @@
return SCPI_RES_OK;
}
-
static void setEseReq(void) {
SCPI_RegSetBits(&scpi_context, SCPI_REG_ESR, ESR_REQ);
}
@@ -174,14 +166,14 @@
void SCPI_RequestControl(void) {
queue_event_t msg;
msg.cmd = SCPI_MSG_SET_ESE_REQ;
-
- /* 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);
- }
- */
- xQueueSend(user_data.evtQueue, &msg, 1000);
+ /* 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);
+ }
+ */
+
+ xQueueSend(user_data.evtQueue, &msg, 1000);
}
void SCPI_AddError(int16_t err) {
@@ -189,7 +181,7 @@
msg.cmd = SCPI_MSG_SET_ERROR;
msg.param2 = err;
- xQueueSend(user_data.evtQueue, &msg, 1000);
+ xQueueSend(user_data.evtQueue, &msg, 1000);
}
void scpi_netconn_callback(struct netconn * conn, enum netconn_evt evt, u16_t len) {
@@ -245,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;
}
@@ -266,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;
}
@@ -276,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;
@@ -284,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;
@@ -308,7 +300,7 @@
if (buflen > 0) {
SCPI_Input(&scpi_context, buf, buflen);
} else {
- //goto fail2;
+ /* goto fail2; */
}
netbuf_delete(inbuf);
@@ -338,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);
@@ -356,27 +348,33 @@
}
/*
- *
+ *
*/
static void scpi_server_thread(void *arg) {
queue_event_t evt;
- (void)arg;
+ (void) arg;
- user_data.evtQueue = xQueueCreate(10, sizeof(queue_event_t));
+ user_data.evtQueue = xQueueCreate(10, sizeof (queue_event_t));
- // user_context will be pointer to socket
+ /* 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_context.user_context = &user_data;
-
- SCPI_Init(&scpi_context);
user_data.io_listen = createServer(DEVICE_PORT);
user_data.control_io_listen = createServer(CONTROL_PORT);
- while(1) {
+ 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);
}
@@ -399,7 +397,7 @@
if (evt.cmd == SCPI_MSG_SET_ESE_REQ) {
setEseReq();
}
-
+
if (evt.cmd == SCPI_MSG_SET_ERROR) {
setError(evt.param2);
}
--
Gitblit v1.9.1