From ef1b8d06a9f5e87d6abb217e9b056257ecdd508a Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 06 8月 2015 01:18:00 +0800
Subject: [PATCH] Add LabWindows/CVI example by lhoerl

---
 libscpi/src/parser.c |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 21ac60a..ef779bc 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -44,7 +44,6 @@
 #include "scpi/error.h"
 #include "scpi/constants.h"
 #include "scpi/utils.h"
-#include "scpi/scpi_debug.h"
 
 /**
  * Write data to SCPI output
@@ -91,15 +90,10 @@
 static size_t writeNewLine(scpi_t * context) {
     if (context->output_count > 0) {
         size_t len;
-#if   (USED_ENDCODE == ENDCODE_CR)
-         len = writeData(context, "\r", 1);
-#elif (USED_ENDCODE == ENDCODE_LF)
-         len = writeData(context, "\n", 1);
-#elif (USED_ENDCODE == ENDCODE_CRLF)
-        len = writeData(context, "\r\n", 2);
-#else
+#ifndef SCPI_LINE_ENDING
 #error no termination character defined
 #endif
+        len = writeData(context, SCPI_LINE_ENDING, strlen(SCPI_LINE_ENDING));
         flushData(context);
         return len;
     } else {
@@ -135,7 +129,6 @@
     context->output_count = 0;
     context->input_count = 0;
 
-    SCPI_DEBUG_COMMAND(context);
     /* if callback exists - call command callback */
     if (cmd->callback != NULL) {
         if ((cmd->callback(context) != SCPI_RES_OK) && !context->cmd_error) {
@@ -336,7 +329,7 @@
 /**
  * Return prefix of nondecimal base
  * @param base
- * @return 
+ * @return
  */
 static const char * getBasePrefix(int8_t base) {
     switch (base) {
@@ -352,7 +345,7 @@
  * @param context
  * @param val
  * @param base
- * @return 
+ * @return
  */
 size_t SCPI_ResultIntBase(scpi_t * context, int32_t val, int8_t base) {
     char buffer[33];
@@ -411,7 +404,7 @@
  * @param context
  * @param data
  * @param len
- * @return 
+ * @return
  */
 size_t SCPI_ResultArbitraryBlock(scpi_t * context, const char * data, size_t len) {
     size_t result = 0;
@@ -458,7 +451,7 @@
  * @param context
  * @param parameter
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory) {
     lex_state_t * state;
@@ -516,7 +509,7 @@
  * Detect if parameter is number
  * @param parameter
  * @param suffixAllowed
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamIsNumber(scpi_parameter_t * parameter, scpi_bool_t suffixAllowed) {
     switch (parameter->type) {
@@ -596,7 +589,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -627,7 +620,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -659,7 +652,7 @@
  * @param value
  * @param len
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamCharacters(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -687,7 +680,7 @@
  * @param value result pointer to data
  * @param len result length of data
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamArbitraryBlock(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -757,7 +750,7 @@
  * @param parameter - should be PROGRAM_MNEMONIC
  * @param options - NULL terminated list of choices
  * @param value - index to options
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamToChoice(scpi_t * context, scpi_parameter_t * parameter, const scpi_choice_def_t * options, int32_t * value) {
     size_t res;
@@ -792,7 +785,7 @@
  * @param options specifications of choices numbers (patterns)
  * @param tag numerical representatio of choice
  * @param text result text
- * @return TRUE if succesfule, else false
+ * @return TRUE if succesfule, else FALSE
  */
 scpi_bool_t SCPI_ChoiceToName(const scpi_choice_def_t * options, int32_t tag, const char ** text) {
     int i;
@@ -812,7 +805,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -853,7 +846,7 @@
  * @param options
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamChoice(scpi_t * context, const scpi_choice_def_t * options, int32_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -876,7 +869,7 @@
  * Parse one parameter and detect type
  * @param state
  * @param token
- * @return 
+ * @return
  */
 int scpiParser_parseProgramData(lex_state_t * state, scpi_token_t * token) {
     scpi_token_t tmp;
@@ -915,7 +908,7 @@
  * @param state
  * @param token
  * @param numberOfParameters
- * @return 
+ * @return
  */
 int scpiParser_parseAllProgramData(lex_state_t * state, scpi_token_t * token, int * numberOfParameters) {
 
@@ -965,7 +958,7 @@
  * @param state
  * @param buffer
  * @param len
- * @return 
+ * @return
  */
 int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, char * buffer, int len) {
     lex_state_t lex_state;
@@ -1018,7 +1011,7 @@
  *  - suitable for one handle to multiple commands
  * @param context
  * @param cmd
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_IsCmd(scpi_t * context, const char * cmd) {
     const char * pattern;

--
Gitblit v1.9.1