From 3cf1b428ae61e6c47abaef1be41f0e2d01374303 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@mobatime.cz>
Date: 周一, 07 8月 2017 02:45:35 +0800
Subject: [PATCH] Remove dependency of parser.c to units.h
---
libscpi/inc/scpi/units.h | 1 -
libscpi/src/parser.c | 10 +++++++++-
libscpi/src/units.c | 9 ---------
libscpi/inc/scpi/parser.h | 1 +
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index f1d9e2a..fc75a4c 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -114,6 +114,7 @@
scpi_bool_t SCPI_ParamArbitraryBlock(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory);
scpi_bool_t SCPI_ParamCopyText(scpi_t * context, char * buffer, size_t buffer_len, size_t * copy_len, scpi_bool_t mandatory);
+ extern const scpi_choice_def_t scpi_bool_def[];
scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory);
scpi_bool_t SCPI_ParamChoice(scpi_t * context, const scpi_choice_def_t * options, int32_t * value, scpi_bool_t mandatory);
diff --git a/libscpi/inc/scpi/units.h b/libscpi/inc/scpi/units.h
index 11449db..975a644 100644
--- a/libscpi/inc/scpi/units.h
+++ b/libscpi/inc/scpi/units.h
@@ -45,7 +45,6 @@
extern const scpi_unit_def_t scpi_units_def[];
extern const scpi_choice_def_t scpi_special_numbers_def[];
- extern const scpi_choice_def_t scpi_bool_def[];
scpi_bool_t SCPI_ParamNumber(scpi_t * context, const scpi_choice_def_t * special, scpi_number_t * value, scpi_bool_t mandatory);
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index e3b9606..e2f0c2f 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -44,7 +44,6 @@
#include "scpi/error.h"
#include "scpi/constants.h"
#include "scpi/utils.h"
-#include "scpi/units.h"
/**
* Write data to SCPI output
@@ -1271,6 +1270,15 @@
return FALSE;
}
+/*
+ * Definition of BOOL choice list
+ */
+const scpi_choice_def_t scpi_bool_def[] = {
+ {"OFF", 0},
+ {"ON", 1},
+ SCPI_CHOICE_LIST_END /* termination of option list */
+};
+
/**
* Read BOOL parameter (0,1,ON,OFF)
* @param context
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index a8bb7f1..3274205 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -285,15 +285,6 @@
SCPI_CHOICE_LIST_END,
};
-/*
- * Special number values definition
- */
-const scpi_choice_def_t scpi_bool_def[] = {
- {"OFF", 0},
- {"ON", 1},
- SCPI_CHOICE_LIST_END /* termination of option list */
-};
-
/**
* Convert string describing unit to its representation
* @param units units patterns
--
Gitblit v1.9.1