From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73
---
libscpi/inc/scpi/types.h | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 085ca00..fb9d438 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -201,21 +201,21 @@
typedef scpi_result_t(*scpi_command_callback_t)(scpi_t *);
- struct _scpi_error_info_heap_t {
- int16_t wr;
- //int16_t rd;
- int16_t count;
- int16_t size;
+ 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;
- const char * device_dependent_info;
- };
- typedef struct _scpi_error_t scpi_error_t;
-
+ };
+ typedef struct _scpi_error_info_heap_t scpi_error_info_heap_t;
+
+ struct _scpi_error_t {
+ int16_t error_code;
+ const char * device_dependent_info;
+ };
+ typedef struct _scpi_error_t scpi_error_t;
+
struct _scpi_fifo_t {
int16_t wr;
int16_t rd;
@@ -365,7 +365,7 @@
int_fast16_t input_count;
scpi_bool_t cmd_error;
scpi_fifo_t error_queue;
- scpi_error_info_heap_t error_info_heap;
+ scpi_error_info_heap_t error_info_heap;
scpi_reg_val_t registers[SCPI_REG_COUNT];
const scpi_unit_def_t * units;
void * user_context;
--
Gitblit v1.9.1