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/error.h | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libscpi/inc/scpi/error.h b/libscpi/inc/scpi/error.h
index bf486b9..27ad31b 100644
--- a/libscpi/inc/scpi/error.h
+++ b/libscpi/inc/scpi/error.h
@@ -52,17 +52,19 @@
/* http://en.wikipedia.org/wiki/X_Macro */
#define LIST_OF_ERRORS \
+ X(SCPI_ERROR_INVALID_CHARACTER, -101, "Invalid character") \
X(SCPI_ERROR_SYNTAX, -102, "Syntax error") \
X(SCPI_ERROR_INVALID_SEPARATOR, -103, "Invalid separator") \
- X(SCPI_ERROR_UNDEFINED_HEADER, -113, "Undefined header") \
+ X(SCPI_ERROR_DATA_TYPE_ERROR, -104, "Data type error") \
X(SCPI_ERROR_PARAMETER_NOT_ALLOWED,-108, "Parameter not allowed") \
X(SCPI_ERROR_MISSING_PARAMETER, -109, "Missing parameter") \
+ X(SCPI_ERROR_UNDEFINED_HEADER, -113, "Undefined header") \
X(SCPI_ERROR_INVALID_SUFFIX, -131, "Invalid suffix") \
X(SCPI_ERROR_SUFFIX_NOT_ALLOWED, -138, "Suffix not allowed") \
- X(SCPI_ERROR_UNKNOWN_PARAMETER, -199, "Unknown parameter") \
- X(SCPI_ERROR_INVALID_PARAMETER, -198, "Invalid parameter") \
- X(SCPI_ERROR_UNEXPECTED_CHARACTER, -197, "Unexpected character") \
+ X(SCPI_ERROR_INVALID_STRING_DATA, -151, "Invalid string data") \
X(SCPI_ERROR_EXECUTION_ERROR, -200, "Execution error") \
+ X(SCPI_ERROR_ILLEGAL_PARAMETER_VALUE,-224,"Illegal parameter value") \
+ X(SCPI_ERROR_SYSTEM_ERROR, -310, "System error") \
enum {
--
Gitblit v1.9.1