From ff313c0120473615323c81d1b8cc1ab1e026cfac Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 22:22:11 +0800
Subject: [PATCH] Add "No error" to error list

---
 libscpi/inc/scpi/config.h |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 75b9731..0abb9c2 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -90,13 +90,14 @@
 #endif
 
 #ifndef USE_DEVICE_DEPENDENT_ERROR_INFORMATION
-#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION 1
-	#ifndef USE_MEMORY_ALLOCATION_FREE
-	#define USE_MEMORY_ALLOCATION_FREE 1
-	#endif
+#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION SYSTEM_TYPE
 #endif
 
-
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+#ifndef USE_MEMORY_ALLOCATION_FREE
+#define USE_MEMORY_ALLOCATION_FREE 1
+#endif
+#endif
 
 #ifndef USE_COMMAND_TAGS
 #define USE_COMMAND_TAGS 1
@@ -199,8 +200,10 @@
 /* PIC32mx */
 #if defined(__C32__)
 #define HAVE_STRNLEN            0
-#define HAVE_STRNCASECMP        1
+#define HAVE_STRNCASECMP        0
 #define HAVE_STRNICMP           0
+#define isfinite                finite
+#define signbit(x)              ((x)<0)
 #endif
 
 /* AVR libc */
@@ -259,21 +262,23 @@
 #endif
 
 #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
-	#if USE_MEMORY_ALLOCATION_FREE
-		#include <stdlib.h>
-		#include <string.h>
-		#include <malloc.h>
-		#define SCPIDEFINE_strdup(h,s)			strdup((s))
-		#define SCPIDEFINE_free(h,s)			free((s))
-	#else
-		#define SCPIDEFINE_strdup(h,s)			OUR_strdup((h), (s))
-		#define SCPIDEFINE_free(h,s)			OUR_free((h), (s))
-		#define SCPIDEFINE_get_1st_part(s,l)	OUR_get_1st_part((s),(l))
-		#define SCPIDEFINE_get_2st_part(s,l)	OUR_get_2nd_part((s),(l))
-	#endif
+
+#if USE_MEMORY_ALLOCATION_FREE
+#include <stdlib.h>
+#include <string.h>
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS		2
+#define SCPIDEFINE_strndup(h, s, l)                     strndup((s), (l))
+#define SCPIDEFINE_free(h, s, r)                        free((s))
 #else
-	#define SCPIDEFINE_strdup(h,s)				(void)(s)
-	#define SCPIDEFINE_free(h,s)				(void)(s)
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS                3
+#define SCPIDEFINE_strndup(h, s, l)                     scpiheap_strndup((h), (s), (l))
+#define SCPIDEFINE_free(h, s, r)                        scpiheap_free((h), (s), (r))
+#define SCPIDEFINE_get_parts(h, s, l1, s2, l2)          scpiheap_get_parts((h), (s), (l1), (s2), (l2))
+#endif
+#else
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS                1
+#define SCPIDEFINE_strndup(h, s, l)                     NULL
+#define SCPIDEFINE_free(h, s, r)
 #endif
 
 #ifdef	__cplusplus

--
Gitblit v1.9.1