From d6f4a5106bebb23826c0867494ade7f4d7ebd1f3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 19:40:33 +0800
Subject: [PATCH] Correct *TST? callback in header file

---
 libscpi/inc/scpi/types.h |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 3791c9d..0ebe055 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -55,8 +55,8 @@
 #endif
 
     /* basic data types */
-    typedef bool bool_t;
-    /* typedef enum { FALSE = 0, TRUE } bool_t; */
+    typedef bool scpi_bool_t;
+    /* typedef enum { FALSE = 0, TRUE } scpi_bool_t; */
 
     /* IEEE 488.2 registers */
     enum _scpi_reg_name_t {
@@ -117,13 +117,20 @@
         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);
     typedef int (*scpi_error_callback_t)(scpi_t * context, int_fast16_t error);
 
     /* scpi lexer */
-    enum _token_type_t {
+    enum _scpi_token_type_t {
         TokComma,
         TokSemicolon,
         TokQuiestion,
@@ -150,14 +157,14 @@
         TokInvalid,
         TokUnknown,
     };
-    typedef enum _token_type_t token_type_t;
+    typedef enum _scpi_token_type_t scpi_token_type_t;
 
-    struct _token_t {
-        token_type_t type;
+    struct _scpi_token_t {
+        scpi_token_type_t type;
         const char * ptr;
         int len;
     };
-    typedef struct _token_t token_t;
+    typedef struct _scpi_token_t scpi_token_t;
 
     struct _lex_state_t {
         const char * buffer;
@@ -175,14 +182,15 @@
     typedef enum _message_termination_t message_termination_t;
     
     struct _scpi_parser_state_t {
-        token_t programHeader;
-        token_t programData;
+        scpi_token_t programHeader;
+        scpi_token_t programData;
         int numberOfParameters;
         message_termination_t termination;
     };
     typedef struct _scpi_parser_state_t scpi_parser_state_t;
 
     typedef scpi_result_t(*scpi_command_callback_t)(scpi_t *);
+    typedef int32_t(*scpi_test_command_callback_t)(scpi_t *);
 
     /* scpi error queue */
     typedef void * scpi_error_queue_t;
@@ -231,6 +239,7 @@
     struct _scpi_param_list_t {
         const scpi_command_t * cmd;
         lex_state_t lex_state;
+        scpi_const_buffer_t cmd_raw;
     };
     typedef struct _scpi_param_list_t scpi_param_list_t;  
     
@@ -240,7 +249,7 @@
         int8_t base;
         scpi_special_number_t type;
     };
-    typedef struct _scpi_number_parameter_t scpi_number_parameter_t;
+    typedef struct _scpi_number_parameter_t scpi_number_t;
 
     struct _scpi_data_parameter_t {
         const char * ptr;
@@ -249,9 +258,9 @@
     typedef struct _scpi_data_parameter_t scpi_data_parameter_t;
     
     struct _scpi_parameter_t {
-        token_type_t type;
+        scpi_token_type_t type;
         scpi_data_parameter_t data;
-        scpi_number_parameter_t number;
+        scpi_number_t number;
     };
     typedef struct _scpi_parameter_t scpi_parameter_t;
     
@@ -266,7 +275,7 @@
         scpi_write_control_t control;
         scpi_command_callback_t flush;
         scpi_command_callback_t reset;
-        scpi_command_callback_t test;
+        scpi_test_command_callback_t test;
     };
 
     struct _scpi_t {
@@ -276,7 +285,7 @@
         scpi_interface_t * interface;
         int_fast16_t output_count;
         int_fast16_t input_count;
-        bool_t cmd_error;
+        scpi_bool_t cmd_error;
         scpi_error_queue_t error_queue;
         scpi_reg_val_t * registers;
         const scpi_unit_def_t * units;

--
Gitblit v1.9.1