From 5a5250218db5ecf87ff03106b7575419865d07ba Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周三, 16 4月 2025 18:59:28 +0800
Subject: [PATCH] scpi修改
---
libscpi/src/parser.c | 475 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 368 insertions(+), 107 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 23d214c..37ca85c 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.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.
*/
/**
@@ -49,11 +50,15 @@
* Write data to SCPI output
* @param context
* @param data
- * @param len - lenght of data to be written
+ * @param len - length of data to be written
* @return number of bytes written
*/
static size_t writeData(scpi_t * context, const char * data, size_t len) {
- return context->interface->write(context, data, len);
+ if ((len > 0) && (data != NULL)) {
+ return context->interface->write(context, data, len);
+ } else {
+ return 0;
+ }
}
/**
@@ -88,7 +93,7 @@
* @return number of characters written
*/
static size_t writeNewLine(scpi_t * context) {
- if (context->output_count > 0) {
+ if (!context->first_output) {
size_t len;
#ifndef SCPI_LINE_ENDING
#error no termination character defined
@@ -118,20 +123,28 @@
* Process command
* @param context
*/
+
+ //璐熷懡浠ゅ洖璋冪殑鎵ц銆佸弬鏁板鐞嗗拰閿欒绠＄悊
static scpi_bool_t processCommand(scpi_t * context) {
const scpi_command_t * cmd = context->param_list.cmd;
lex_state_t * state = &context->param_list.lex_state;
scpi_bool_t result = TRUE;
+ // 鍏堟娴嬫槸鍚︿负鏌ヨ鍛戒护(浠�?缁撳熬)
+ scpi_bool_t is_query = context->param_list.cmd_raw.data[context->param_list.cmd_raw.length - 1] == '?';
- /* conditionaly write ; */
- writeSemicolon(context);
-
+ /* conditionally write ; */
+ //杈撳嚭鍒嗛殧绗�
+ if(!context->first_output && is_query) {
+ writeData(context, ";", 1);
+ }
+ //閲嶇疆context涓婁笅鏂囩姸鎬�
context->cmd_error = FALSE;
context->output_count = 0;
context->input_count = 0;
- context->arbitrary_reminding = 0;
+ context->arbitrary_remaining = 0;
/* if callback exists - call command callback */
+ //鍛戒护鍥炶皟鎵ц scpi_commands[]鏌ユ壘杩欓噷闈㈢殑鍛戒护绫诲瀷
if (cmd->callback != NULL) {
if ((cmd->callback(context) != SCPI_RES_OK)) {
if (!context->cmd_error) {
@@ -141,11 +154,16 @@
} else {
if (context->cmd_error) {
result = FALSE;
+ } else {
+ if(context->first_output && is_query) {
+ context->first_output = FALSE;
+ }
}
}
}
/* set error if command callback did not read all parameters */
+ //妫�鏌ュ弬鏁板畬鏁存��
if (state->pos < (state->buffer + state->len) && !context->cmd_error) {
SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
result = FALSE;
@@ -180,6 +198,15 @@
* @param len - command line length
* @return FALSE if there was some error during evaluation of commands
*/
+
+ /*
+ 鎸囦护瑙ｆ瀽鍑芥暟
+ 瑙ｆ瀽娴佺▼锛�
+ 1.鍏堟鏌ュ懡浠ゅご鏄惁鍚堟硶锛屾鏌ュ叕鍏卞懡浠� 鎴栬�呭鍚堝懡浠� 浠ュ強鏅�氬懡浠ゆ垨鑰呮煡璇㈠懡浠�
+ 2.鍛戒护鍚堟硶鍚庣粍鍚堝鍚堝懡浠� 濡�* :: ? 涓夌绫诲瀷
+ 3.閫氳繃瀹屾暣鐨勫懡浠ゆ煡鎵� 鏄惁鏈夌浉瀵瑰簲鐨勭被鍨�
+
+ */
scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len) {
scpi_bool_t result = TRUE;
scpi_parser_state_t * state;
@@ -190,19 +217,25 @@
return FALSE;
}
+ //鍒濆鍖朿ontext鐨勮В鏋愬櫒鐘舵��
state = &context->parser_state;
context->output_count = 0;
+ context->first_output = TRUE;
while (1) {
+
+ //鍒濇鐨勬鏌ュ懡浠ゆ槸鍚﹀悎娉�
r = scpiParser_detectProgramMessageUnit(state, data, len);
if (state->programHeader.type == SCPI_TOKEN_INVALID) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_CHARACTER);
result = FALSE;
- } else if (state->programHeader.len > 0) {
-
+ }
+ else if (state->programHeader.len > 0)
+ {
+ //鍛戒护鏈夋晥寮�濮嬪鐞�
composeCompoundCommand(&cmd_prev, &state->programHeader);
-
+ //鏌ユ壘鍛戒护鍚庡苟涓旇缃В鏋愮姸鎬佸苟涓旀墽琛屽懡浠�
if (findCommandHeader(context, state->programHeader.ptr, state->programHeader.len)) {
context->param_list.lex_state.buffer = state->programData.ptr;
@@ -211,11 +244,16 @@
context->param_list.cmd_raw.data = state->programHeader.ptr;
context->param_list.cmd_raw.position = 0;
context->param_list.cmd_raw.length = state->programHeader.len;
-
+ //鍛戒护鏌ユ壘
result &= processCommand(context);
cmd_prev = state->programHeader;
} else {
- SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
+ //濡傛灉鍛戒护娌℃湁瀹氫箟鍒欐姏鍑洪敊璇�
+ /* place undefined header with error */
+ /* calculate length of errorenous header and trim \r\n */
+ size_t r2 = r;
+ while (r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
+ SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
result = FALSE;
}
}
@@ -229,7 +267,8 @@
}
- /* conditionaly write new line */
+ /* conditionally write new line */
+ //瑙ｆ瀽瀹屾瘯浠ュ悗绛夊緟涓嬩竴鏉℃寚浠ょ殑杈撳叆
writeNewLine(context);
return result;
@@ -238,27 +277,58 @@
/**
* Initialize SCPI context structure
* @param context
- * @param command_list
- * @param buffer
+ * @param commands
* @param interface
- */
-void SCPI_Init(scpi_t * context) {
- if (context->idn[0] == NULL) {
- context->idn[0] = SCPI_DEFAULT_1_MANUFACTURE;
- }
- if (context->idn[1] == NULL) {
- context->idn[1] = SCPI_DEFAULT_2_MODEL;
- }
- if (context->idn[2] == NULL) {
- context->idn[2] = SCPI_DEFAULT_3;
- }
- if (context->idn[3] == NULL) {
- context->idn[3] = SCPI_DEFAULT_4_REVISION;
- }
+ * @param unitsfind_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
+set(project_link_libraries Qt::Widgets)
+ * @param idn1
+ * @param idn2
+ * @param idn3
+ * @param idn4
+ * @param input_buffer
+ * @param input_buffer_length
+ * @param error_queue_data
+ * @param error_queue_size
+ */
+void SCPI_Init(scpi_t * context,
+ const scpi_command_t * commands,
+ scpi_interface_t * interface,
+ const scpi_unit_def_t * units,
+ const char * idn1, const char * idn2, const char * idn3, const char * idn4,
+ char * input_buffer, size_t input_buffer_length,
+ scpi_error_t * error_queue_data, int16_t error_queue_size) {
+ memset(context, 0, sizeof (*context));
+ context->cmdlist = commands;
+ context->interface = interface;
+ context->units = units;
+ context->idn[0] = idn1;
+
+ context->idn[1] = idn2;
+ context->idn[2] = idn3;
+ context->idn[3] = idn4;
+ context->buffer.data = input_buffer;
+ context->buffer.length = input_buffer_length;
context->buffer.position = 0;
- SCPI_ErrorInit(context);
+ SCPI_ErrorInit(context, error_queue_data, error_queue_size);
}
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+
+/**
+ * Initialize context's
+ * @param context
+ * @param data
+ * @param len
+ * @return
+ */find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
+ set(project_link_libraries Qt::Widgets)
+
+void SCPI_InitHeap(scpi_t * context,
+ char * error_info_heap, size_t error_info_heap_length) {
+ scpiheap_init(&context->error_info_heap, error_info_heap, error_info_heap_length);
+}
+#endif
/**
* Interface to the application. Adds data to system buffer and try to search
@@ -270,19 +340,32 @@
* @param len - length of data
* @return
*/
+
+ /*
+ 杈撳叆澶勭悊鍑芥暟锛岃緭鍏ユ暟鎹苟涓斿鐞嗗畬鏁寸殑SCPI鍛戒护
+ context:涓婁笅鏂囩殑context
+ data锛氳緭鍏ョ殑鏁版嵁
+ len锛氳緭鍏ユ暟鎹殑闀垮害
+ */
scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len) {
- scpi_bool_t result = TRUE;
+ scpi_bool_t result = FALSE;
size_t totcmdlen = 0;
int cmdlen = 0;
-
+ //褰撻暱搴︿负0鏃� 瑙ｆ瀽褰撳墠鐨勬暟鎹� 骞朵笖娓呯┖context鐨刡uff鏍囪浣�
if (len == 0) {
context->buffer.data[context->buffer.position] = 0;
+ //SCPI_Parse 瑙ｆ瀽瀹屾垚鍚庝細杩斿洖鐘舵��
result = SCPI_Parse(context, context->buffer.data, context->buffer.position);
context->buffer.position = 0;
} else {
+ /*
+ 濡傛灉闀垮害婧㈠嚭鍒欐寚浠ゆ棤鏁�
+ 姝ｅ父鎯呭喌涓嬩細灏嗚緭鍏ョ殑鎸囦护浼犵粰context鍐�
+ */
int buffer_free;
buffer_free = context->buffer.length - context->buffer.position;
+
if (len > (buffer_free - 1)) {
/* Input buffer overrun - invalidate buffer */
context->buffer.position = 0;
@@ -296,16 +379,18 @@
while (1) {
+ //鍒濇妫�鏌ュ懡浠ゆ槸鍚﹀悎娉�
cmdlen = scpiParser_detectProgramMessageUnit(&context->parser_state, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
totcmdlen += cmdlen;
-
+ //濡傛灉鍛戒护鍚堟硶鍒欏皢鍛戒护瑙ｆ瀽,鍚屾椂鍒犻櫎context鍐呯殑宸茬粡澶勭悊瀹屾垚鐨勫懡浠�
if (context->parser_state.termination == SCPI_MESSAGE_TERMINATION_NL) {
result = SCPI_Parse(context, context->buffer.data, totcmdlen);
memmove(context->buffer.data, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
context->buffer.position -= totcmdlen;
totcmdlen = 0;
} else {
- if (context->parser_state.programHeader.type == SCPI_TOKEN_UNKNOWN) break;
+ if (context->parser_state.programHeader.type == SCPI_TOKEN_UNKNOWN
+ && context->parser_state.termination == SCPI_MESSAGE_TERMINATION_NONE) break;
if (totcmdlen >= context->buffer.position) break;
}
}
@@ -404,6 +489,7 @@
*/
size_t SCPI_ResultInt32(scpi_t * context, int32_t val) {
return resultUInt32BaseSign(context, val, 10, TRUE);
+
}
/**
@@ -470,19 +556,96 @@
}
/**
- * Write string withn " to the result
+ * Write string within "" to the result
* @param context
* @param data
* @return
*/
size_t SCPI_ResultText(scpi_t * context, const char * data) {
size_t result = 0;
+ size_t len = strlen(data);
+ const char * quote;
result += writeDelimiter(context);
result += writeData(context, "\"", 1);
- // TODO: convert " to ""
- result += writeData(context, data, strlen(data));
+ while ((quote = strnpbrk(data, len, "\""))) {
+ result += writeData(context, data, quote - data + 1);
+ result += writeData(context, "\"", 1);
+ len -= quote - data + 1;
+ data = quote + 1;
+ }
+ result += writeData(context, data, len);
result += writeData(context, "\"", 1);
context->output_count++;
+ return result;
+}
+
+/**
+ * SCPI-99:21.8 Device-dependent error information.
+ * Write error information with the following syntax:
+ * <Error/event_number>,"<Error/event_description>[;<Device-dependent_info>]"
+ * The maximum string length of <Error/event_description> plus <Device-dependent_info>
+ * is SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH (255) characters.
+ *
+ * @param context
+ * @param error
+ * @return
+ */
+size_t SCPI_ResultError(scpi_t * context, scpi_error_t * error) {
+ size_t result = 0;
+ size_t outputlimit = SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH;
+ size_t step = 0;
+ const char * quote;
+
+ const char * data[SCPIDEFINE_DESCRIPTION_MAX_PARTS];
+ size_t len[SCPIDEFINE_DESCRIPTION_MAX_PARTS];
+ size_t i;
+
+ data[0] = SCPI_ErrorTranslate(error->error_code);
+ len[0] = strlen(data[0]);
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ data[1] = error->device_dependent_info;
+#if USE_MEMORY_ALLOCATION_FREE
+ len[1] = error->device_dependent_info ? strlen(data[1]) : 0;
+#else
+ SCPIDEFINE_get_parts(&context->error_info_heap, data[1], &len[1], &data[2], &len[2]);
+#endif
+#endif
+
+ result += SCPI_ResultInt32(context, error->error_code);
+ result += writeDelimiter(context);
+ result += writeData(context, "\"", 1);
+
+ for (i = 0; (i < SCPIDEFINE_DESCRIPTION_MAX_PARTS) && data[i] && outputlimit; i++) {
+ if (i == 1) {
+ result += writeSemicolon(context);
+ outputlimit -= 1;
+ }
+ if (len[i] > outputlimit) {
+ len[i] = outputlimit;
+ }
+
+ while ((quote = strnpbrk(data[i], len[i], "\""))) {
+ if ((step = quote - data[i] + 1) >= outputlimit) {
+ len[i] -= 1;
+ outputlimit -= 1;
+ break;
+ }
+ result += writeData(context, data[i], step);
+ result += writeData(context, "\"", 1);
+ len[i] -= step;
+ outputlimit -= step + 1;
+ data[i] = quote + 1;
+ if (len[i] > outputlimit) {
+ len[i] = outputlimit;
+ }
+ }
+
+ result += writeData(context, data[i], len[i]);
+ outputlimit -= len[i];
+ }
+ result += writeData(context, "\"", 1);
+
return result;
}
@@ -493,6 +656,7 @@
* @return
*/
size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len) {
+ size_t result = 0;
char block_header[12];
size_t header_len;
block_header[0] = '#';
@@ -501,8 +665,10 @@
header_len = strlen(block_header + 2);
block_header[1] = (char) (header_len + '0');
- context->arbitrary_reminding = len;
- return writeData(context, block_header, header_len + 2);
+ context->arbitrary_remaining = len;
+ result = writeDelimiter(context);
+ result += writeData(context, block_header, header_len + 2);
+ return result;
}
/**
@@ -514,14 +680,14 @@
*/
size_t SCPI_ResultArbitraryBlockData(scpi_t * context, const void * data, size_t len) {
- if (context->arbitrary_reminding < len) {
+ if (context->arbitrary_remaining < len) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
return 0;
}
- context->arbitrary_reminding -= len;
+ context->arbitrary_remaining -= len;
- if (context->arbitrary_reminding == 0) {
+ if (context->arbitrary_remaining == 0) {
context->output_count++;
}
@@ -588,7 +754,7 @@
if (mandatory) {
SCPI_ErrorPush(context, SCPI_ERROR_MISSING_PARAMETER);
} else {
- parameter->type = SCPI_TOKEN_PROGRAM_MNEMONIC; // TODO: select something different
+ parameter->type = SCPI_TOKEN_PROGRAM_MNEMONIC; /* TODO: select something different */
}
return FALSE;
}
@@ -1023,7 +1189,7 @@
break;
}
- // TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData
+ /* TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData */
}
return result;
@@ -1159,6 +1325,15 @@
return FALSE;
}
+/*
+ * Definition of BOOL choice list
+ */
+const scpi_choice_def_t scpi_bool_def[] = {
+ {"OFF", 0},
+ {"ON", 1},
+ SCPI_CHOICE_LIST_END /* termination of option list */
+};
+
/**
* Read BOOL parameter (0,1,ON,OFF)
* @param context
@@ -1170,12 +1345,6 @@
scpi_bool_t result;
scpi_parameter_t param;
int32_t intval;
-
- scpi_choice_def_t bool_options[] = {
- {"OFF", 0},
- {"ON", 1},
- SCPI_CHOICE_LIST_END /* termination of option list */
- };
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -1189,7 +1358,7 @@
SCPI_ParamToInt32(context, ¶m, &intval);
*value = intval ? TRUE : FALSE;
} else {
- result = SCPI_ParamToChoice(context, ¶m, bool_options, &intval);
+ result = SCPI_ParamToChoice(context, ¶m, scpi_bool_def, &intval);
if (result) {
*value = intval ? TRUE : FALSE;
}
@@ -1283,13 +1452,6 @@
for (result = 1; result != 0; result = scpiLex_Comma(state, &tmp)) {
token->len += result;
- if (result == 0) {
- token->type = SCPI_TOKEN_UNKNOWN;
- token->len = 0;
- paramCount = -1;
- break;
- }
-
result = scpiParser_parseProgramData(state, &tmp);
if (tmp.type != SCPI_TOKEN_UNKNOWN) {
token->len += result;
@@ -1300,10 +1462,6 @@
break;
}
paramCount++;
- }
-
- if (token->len == -1) {
- token->len = 0;
}
if (numberOfParameters != NULL) {
@@ -1319,25 +1477,36 @@
* @param len
* @return
*/
+ //璇嗗埆瀹屾暣鐨凷CPI鍛戒护
int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, char * buffer, int len) {
lex_state_t lex_state;
scpi_token_t tmp;
int result = 0;
-
+ // 鍒濆鍖栬瘝娉曞垎鏋�
lex_state.buffer = lex_state.pos = buffer;
lex_state.len = len;
+ // 閲嶇疆鍙傛暟璁℃暟鍣�
state->numberOfParameters = 0;
/* ignore whitespace at the begginig */
+ //棰勫鐞� 璺宠繃绌虹櫧瀛楃
scpiLex_WhiteSpace(&lex_state, &tmp);
-
- if (scpiLex_ProgramHeader(&lex_state, &state->programHeader) >= 0) {
- if (scpiLex_WhiteSpace(&lex_state, &tmp) > 0) {
+ //鎵惧埌鍛戒护澶村悗瑙ｆ瀽鎵�鏈夊懡浠�
+ if (scpiLex_ProgramHeader(&lex_state, &state->programHeader) >= 0)
+ {
+ if (scpiLex_WhiteSpace(&lex_state, &tmp) > 0)
+ {
scpiParser_parseAllProgramData(&lex_state, &state->programData, &state->numberOfParameters);
- } else {
+ }
+ else
+ {
+ //鏃犳晥鍛戒护鏍囪
invalidateToken(&state->programData, lex_state.pos);
}
- } else {
+ }
+ else
+ {
+ //澶勭悊瑙ｆ瀽澶辫触鐨勫懡浠ゅご
invalidateToken(&state->programHeader, lex_state.buffer);
invalidateToken(&state->programData, lex_state.buffer);
}
@@ -1345,15 +1514,17 @@
if (result == 0) result = scpiLex_NewLine(&lex_state, &tmp);
if (result == 0) result = scpiLex_Semicolon(&lex_state, &tmp);
+ //鏃犳晥瀛楃澶勭悊
if (!scpiLex_IsEos(&lex_state) && (result == 0)) {
+ // 璺宠繃鏃犳晥瀛楃
lex_state.pos++;
-
+ //鏍囪浣嶅懡浠ゅご瑙ｆ瀽澶辫触
state->programHeader.len = 1;
state->programHeader.type = SCPI_TOKEN_INVALID;
invalidateToken(&state->programData, lex_state.buffer);
}
-
+ //璁剧疆缁堟绗�
if (SCPI_TOKEN_SEMICOLON == tmp.type) {
state->termination = SCPI_MESSAGE_TERMINATION_SEMICOLON;
} else if (SCPI_TOKEN_NL == tmp.type) {
@@ -1433,9 +1604,9 @@
* @param count
* @param item_size
* @param format
- * @return
+ * @return
*/
-static size_t parserResultArrayBinary(scpi_t * context, const void * array, size_t count, size_t item_size, scpi_array_format_t format) {
+static size_t produceResultArrayBinary(scpi_t * context, const void * array, size_t count, size_t item_size, scpi_array_format_t format) {
if (SCPI_GetNativeFormat() == format) {
switch (item_size) {
@@ -1457,6 +1628,7 @@
case 4:
case 8:
result += SCPI_ResultArbitraryBlockHeader(context, count * item_size);
+ break;
default:
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
return 0;
@@ -1468,19 +1640,19 @@
break;
case 2:
for (i = 0; i < count; i++) {
- uint16_t val = SCPI_Swap16(((uint16_t*)array)[i]);
+ uint16_t val = SCPI_Swap16(((uint16_t*) array)[i]);
result += SCPI_ResultArbitraryBlockData(context, &val, item_size);
}
break;
case 4:
for (i = 0; i < count; i++) {
- uint32_t val = SCPI_Swap32(((uint32_t*)array)[i]);
+ uint32_t val = SCPI_Swap32(((uint32_t*) array)[i]);
result += SCPI_ResultArbitraryBlockData(context, &val, item_size);
}
break;
case 8:
for (i = 0; i < count; i++) {
- uint64_t val = SCPI_Swap64(((uint64_t*)array)[i]);
+ uint64_t val = SCPI_Swap64(((uint64_t*) array)[i]);
result += SCPI_ResultArbitraryBlockData(context, &val, item_size);
}
break;
@@ -1498,11 +1670,8 @@
for (i = 0; i < count; i++) {\
result += func(context, array[i]);\
}\
- if (count > 0) {\
- result += count - 1; /* add length of commas */\
- }\
} else {\
- result = parserResultArrayBinary(context, array, count, sizeof(*array), format);\
+ result = produceResultArrayBinary(context, array, count, sizeof(*array), format);\
}\
return result;\
} while(0)
@@ -1537,7 +1706,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayInt16(scpi_t * context, const int16_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultInt16);
@@ -1549,7 +1718,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayUInt16(scpi_t * context, const uint16_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultUInt16);
@@ -1561,7 +1730,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayInt32(scpi_t * context, const int32_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultInt32);
@@ -1573,7 +1742,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayUInt32(scpi_t * context, const uint32_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultUInt32);
@@ -1585,7 +1754,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayInt64(scpi_t * context, const int64_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultInt64);
@@ -1597,7 +1766,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayUInt64(scpi_t * context, const uint64_t * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultUInt64);
@@ -1609,7 +1778,7 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayFloat(scpi_t * context, const float * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultFloat);
@@ -1621,8 +1790,100 @@
* @param array
* @param count
* @param format
- * @return
+ * @return
*/
size_t SCPI_ResultArrayDouble(scpi_t * context, const double * array, size_t count, scpi_array_format_t format) {
RESULT_ARRAY(SCPI_ResultDouble);
}
+
+/*
+ * Template macro to generate all SCPI_ParamArrayXYZ function
+ */
+#define PARAM_ARRAY_TEMPLATE(func) do{\
+ if (format != SCPI_FORMAT_ASCII) return FALSE;\
+ for (*o_count = 0; *o_count < i_count; (*o_count)++) {\
+ if (!func(context, &data[*o_count], mandatory)) {\
+ break;\
+ }\
+ mandatory = FALSE;\
+ }\
+ return mandatory ? FALSE : TRUE;\
+}while(0)
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayInt32(scpi_t * context, int32_t *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamInt32);
+}
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayUInt32(scpi_t * context, uint32_t *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamUInt32);
+}
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayInt64(scpi_t * context, int64_t *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamInt64);
+}
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayUInt64(scpi_t * context, uint64_t *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamUInt64);
+}
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayFloat(scpi_t * context, float *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamFloat);
+}
+
+/**
+ * Read list of values up to i_count
+ * @param context
+ * @param data - array to fill
+ * @param i_count - number of elements of data
+ * @param o_count - real number of filled elements
+ * @param mandatory
+ * @return TRUE on success
+ */
+scpi_bool_t SCPI_ParamArrayDouble(scpi_t * context, double *data, size_t i_count, size_t *o_count, scpi_array_format_t format, scpi_bool_t mandatory) {
+ PARAM_ARRAY_TEMPLATE(SCPI_ParamDouble);
+}
--
Gitblit v1.9.1