From c49b34ae42b691518a1100346d7c749e35bc3ba3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 02:22:07 +0800
Subject: [PATCH] Make public SCPI_LongToStr, SCPI_DoubleToStr
---
libscpi/inc/scpi/types.h | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index ade80cf..3ce30ab 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -161,14 +161,14 @@
struct _scpi_token_t {
scpi_token_type_t type;
- const char * ptr;
+ char * ptr;
int len;
};
typedef struct _scpi_token_t scpi_token_t;
struct _lex_state_t {
- const char * buffer;
- const char * pos;
+ char * buffer;
+ char * pos;
int len;
};
typedef struct _lex_state_t lex_state_t;
@@ -190,7 +190,6 @@
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;
@@ -225,7 +224,8 @@
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;
@@ -244,10 +244,13 @@
typedef struct _scpi_param_list_t scpi_param_list_t;
struct _scpi_number_parameter_t {
- double value;
+ scpi_bool_t special;
+ union {
+ double value;
+ int32_t tag;
+ };
scpi_unit_t unit;
int8_t base;
- scpi_special_number_t type;
};
typedef struct _scpi_number_parameter_t scpi_number_t;
@@ -271,7 +274,6 @@
scpi_write_control_t control;
scpi_command_callback_t flush;
scpi_command_callback_t reset;
- scpi_test_command_callback_t test;
};
struct _scpi_t {
--
Gitblit v1.9.1