From 59d4618036c85dafc9026d0f84ab00fcb900acc9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 23 10月 2013 21:46:41 +0800
Subject: [PATCH] merge functionality from 'master' branch
---
libscpi/inc/scpi/parser.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index d42f9bd..1a6966e 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -37,6 +37,7 @@
#ifndef SCPI_PARSER_H
#define SCPI_PARSER_H
+#include <string.h>
#include "scpi/types.h"
#include "scpi/debug.h"
#include "scpi/lexer.h"
@@ -51,6 +52,7 @@
size_t SCPI_ResultCharacters(scpi_t * context, const char * data, size_t len);
+#define SCPI_ResultMnemonic(context, data) SCPI_ResultCharacters((context), (data), strlen(data))
size_t SCPI_ResultInt(scpi_t * context, int32_t val);
size_t SCPI_ResultIntBase(scpi_t * context, int32_t val, int8_t base);
size_t SCPI_ResultDouble(scpi_t * context, double val);
@@ -64,6 +66,7 @@
#define SCPI_ParamGetCharactersVal SCPI_ParamGetTextVal
#define SCPI_ParamGetArbitraryBlockVal SCPI_ParamGetTextVal
bool_t SCPI_ParamGetBoolVal(scpi_t * context, scpi_parameter_t * parameter);
+ int32_t SCPI_ParamGetChoiceVal(scpi_t * context, scpi_parameter_t * parameter, const char * options[]);
bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, bool_t mandatory);
--
Gitblit v1.9.1