From 8e04e1c959ed282f81c96c7b4cd69a72f20174bc Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: 周六, 15 10月 2016 19:37:11 +0800
Subject: [PATCH] align parser test to last commits
---
libscpi/inc/scpi/types.h | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 01611be..1a49402 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -201,12 +201,29 @@
typedef scpi_result_t(*scpi_command_callback_t)(scpi_t *);
+ struct _scpi_error_info_heap_t {
+ size_t wr;
+ /* size_t rd; */
+ size_t count;
+ size_t size;
+ char * data;
+ };
+ typedef struct _scpi_error_info_heap_t scpi_error_info_heap_t;
+
+ struct _scpi_error_t {
+ int16_t error_code;
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ char * device_dependent_info;
+#endif
+ };
+ typedef struct _scpi_error_t scpi_error_t;
+
struct _scpi_fifo_t {
int16_t wr;
int16_t rd;
int16_t count;
int16_t size;
- int16_t * data;
+ scpi_error_t * data;
};
typedef struct _scpi_fifo_t scpi_fifo_t;
@@ -311,7 +328,7 @@
union {
double value;
int32_t tag;
- };
+ } content;
scpi_unit_t unit;
int8_t base;
};
@@ -350,6 +367,9 @@
int_fast16_t input_count;
scpi_bool_t cmd_error;
scpi_fifo_t error_queue;
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+ scpi_error_info_heap_t error_info_heap;
+#endif
scpi_reg_val_t registers[SCPI_REG_COUNT];
const scpi_unit_def_t * units;
void * user_context;
--
Gitblit v1.9.1