From e7d3092dd149ce455eaa934cc63104b6273302f5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 22 2月 2016 08:19:09 +0800
Subject: [PATCH] Add all possible units from IEEE488.2 to address some points of #26
---
libscpi/inc/scpi/parser.h | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index 4cc088d..84a433d 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -43,19 +43,25 @@
#ifdef __cplusplus
extern "C" {
#endif
- void SCPI_Init(scpi_t * context);
+ void SCPI_Init(scpi_t * context,
+ const scpi_command_t * commands,
+ scpi_interface_t * interface,
+ const scpi_unit_def_t * units,
+ const char * idn1, const char * idn2, const char * idn3, const char * idn4,
+ char * input_buffer, size_t input_buffer_length,
+ int16_t * error_queue_data, int16_t error_queue_size);
scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len);
scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len);
size_t SCPI_ResultCharacters(scpi_t * context, const char * data, size_t len);
#define SCPI_ResultMnemonic(context, data) SCPI_ResultCharacters((context), (data), strlen(data))
-#define SCPI_ResultUInt8Base SCPI_ResultUInt32Base
-#define SCPI_ResultUInt8(c, v) SCPI_ResultUInt32Base((c), (v), 10)
-#define SCPI_ResultInt8 SCPI_ResultInt32
-#define SCPI_ResultUInt16Base SCPI_ResultUInt32Base
-#define SCPI_ResultUInt16(c, v) SCPI_ResultUInt32Base((c), (v), 10)
-#define SCPI_ResultInt16 SCPI_ResultInt32
+#define SCPI_ResultUInt8Base(c, v, b) SCPI_ResultUInt32Base((c), (v), (uint8_t)(b))
+#define SCPI_ResultUInt8(c, v) SCPI_ResultUInt32Base((c), (uint8_t)(v), 10)
+#define SCPI_ResultInt8(c, v) SCPI_ResultInt32((c), (int8_t)(v))
+#define SCPI_ResultUInt16Base(c, v, b) SCPI_ResultUInt32Base((c), (uint16_t)(v), (b))
+#define SCPI_ResultUInt16(c, v) SCPI_ResultUInt32Base((c), (uint16_t)(v), 10)
+#define SCPI_ResultInt16(c, v) SCPI_ResultInt32((c), (int16_t)(v))
size_t SCPI_ResultUInt32Base(scpi_t * context, uint32_t val, int8_t base);
#define SCPI_ResultUInt32(c, v) SCPI_ResultUInt32Base((c), (v), 10)
size_t SCPI_ResultInt32(scpi_t * context, int32_t val);
--
Gitblit v1.9.1