From 6fedcce7ebdb7fae4d1f11af5194f919352235bf Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 05:33:12 +0800
Subject: [PATCH] Next try to correct avr-libc detection

---
 libscpi/inc/scpi/types.h |   88 ++++++++++++++++++++++---------------------
 1 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 29d8bf4..4851d9e 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -105,7 +105,7 @@
 
     typedef struct _scpi_command_t scpi_command_t;
 
-#define SCPI_CMD_LIST_END       {NULL, NULL, }
+#define SCPI_CMD_LIST_END       {NULL, NULL, 0}
 
     /* scpi interface */
     typedef struct _scpi_t scpi_t;
@@ -117,6 +117,13 @@
         char * data;
     };
     typedef struct _scpi_buffer_t scpi_buffer_t;
+    
+    struct _scpi_const_buffer_t {
+        size_t length;
+        size_t position;
+        const char * data;
+    };
+    typedef struct _scpi_const_buffer_t scpi_const_buffer_t;
 
     typedef size_t(*scpi_write_t)(scpi_t * context, const char * data, size_t len);
     typedef scpi_result_t(*scpi_write_control_t)(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val);
@@ -124,31 +131,31 @@
 
     /* scpi lexer */
     enum _scpi_token_type_t {
-        TokComma,
-        TokSemicolon,
-        TokQuiestion,
-        TokNewLine,
-        TokHexnum,
-        TokOctnum,
-        TokBinnum,
-        TokProgramMnemonic,
-        TokDecimalNumericProgramData,
-        TokDecimalNumericProgramDataWithSuffix,
-        TokSuffixProgramData,
-        TokArbitraryBlockProgramData,
-        TokSingleQuoteProgramData,
-        TokDoubleQuoteProgramData,
-        TokProgramExpression,
-        TokCompoundProgramHeader,
-        TokIncompleteCompoundProgramHeader,
-        TokCommonProgramHeader,
-        TokIncompleteCommonProgramHeader,
-        TokCompoundQueryProgramHeader,
-        TokCommonQueryProgramHeader,
-        TokWhiteSpace,
-        TokAllProgramData,
-        TokInvalid,
-        TokUnknown,
+        SCPI_TOKEN_COMMA,
+        SCPI_TOKEN_SEMICOLON,
+        SCPI_TOKEN_QUESTION,
+        SCPI_TOKEN_NL,
+        SCPI_TOKEN_HEXNUM,
+        SCPI_TOKEN_OCTNUM,
+        SCPI_TOKEN_BINNUM,
+        SCPI_TOKEN_PROGRAM_MNEMONIC,
+        SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA,
+        SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX,
+        SCPI_TOKEN_SUFFIX_PROGRAM_DATA,
+        SCPI_TOKEN_ARBITRARY_BLOCK_PROGRAM_DATA,
+        SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA,
+        SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA,
+        SCPI_TOKEN_PROGRAM_EXPRESSION,
+        SCPI_TOKEN_COMPOUND_PROGRAM_HEADER,
+        SCPI_TOKEN_INCOMPLETE_COMPOUND_PROGRAM_HEADER,
+        SCPI_TOKEN_COMMON_PROGRAM_HEADER,
+        SCPI_TOKEN_INCOMPLETE_COMMON_PROGRAM_HEADER,
+        SCPI_TOKEN_COMPOUND_QUERY_PROGRAM_HEADER,
+        SCPI_TOKEN_COMMON_QUERY_PROGRAM_HEADER,
+        SCPI_TOKEN_WS,
+        SCPI_TOKEN_ALL_PROGRAM_DATA,
+        SCPI_TOKEN_INVALID,
+        SCPI_TOKEN_UNKNOWN,
     };
     typedef enum _scpi_token_type_t scpi_token_type_t;
 
@@ -168,9 +175,9 @@
 
     /* scpi parser */   
     enum _message_termination_t {
-        PmutNone,
-        PmutNewLine,
-        PmutSemicolon,                
+        SCPI_MESSAGE_TERMINATION_NONE,
+        SCPI_MESSAGE_TERMINATION_NL,
+        SCPI_MESSAGE_TERMINATION_SEMICOLON,                
     };
     typedef enum _message_termination_t message_termination_t;
     
@@ -217,21 +224,22 @@
         SCPI_NUM_DOWN,
         SCPI_NUM_NAN,
         SCPI_NUM_INF,
-        SCPI_NUM_NINF
+        SCPI_NUM_NINF,
+        SCPI_NUM_AUTO
     };
     typedef enum _scpi_special_number_t scpi_special_number_t;
 
-    struct _scpi_special_number_def_t {
+    struct _scpi_choice_def_t {
         const char * name;
-        scpi_special_number_t type;
+        int32_t tag;
     };
-#define SCPI_SPECIAL_NUMBERS_LIST_END   {NULL, SCPI_NUM_NUMBER}    
-    typedef struct _scpi_special_number_def_t scpi_special_number_def_t;
+#define SCPI_CHOICE_LIST_END   {NULL, -1}
+    typedef struct _scpi_choice_def_t scpi_choice_def_t;
 
     struct _scpi_param_list_t {
         const scpi_command_t * cmd;
         lex_state_t lex_state;
-        scpi_buffer_t cmd_raw;
+        scpi_const_buffer_t cmd_raw;
     };
     typedef struct _scpi_param_list_t scpi_param_list_t;  
     
@@ -249,16 +257,12 @@
     };
     typedef struct _scpi_data_parameter_t scpi_data_parameter_t;
     
-    struct _scpi_parameter_t {
-        scpi_token_type_t type;
-        scpi_data_parameter_t data;
-        scpi_number_t number;
-    };
-    typedef struct _scpi_parameter_t scpi_parameter_t;
+    typedef scpi_token_t scpi_parameter_t;
     
     struct _scpi_command_t {
         const char * pattern;
         scpi_command_callback_t callback;
+        int32_t tag;
     };
 
     struct _scpi_interface_t {
@@ -267,7 +271,6 @@
         scpi_write_control_t control;
         scpi_command_callback_t flush;
         scpi_command_callback_t reset;
-        scpi_command_callback_t test;
     };
 
     struct _scpi_t {
@@ -281,7 +284,6 @@
         scpi_error_queue_t error_queue;
         scpi_reg_val_t * registers;
         const scpi_unit_def_t * units;
-        const scpi_special_number_def_t * special_numbers;
         void * user_context;
         scpi_parser_state_t parser_state;
         const char * idn[4];

--
Gitblit v1.9.1