From 360db066bd49b2514669dac7f401932c018db073 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 05:22:04 +0800
Subject: [PATCH] Next try to correct avr-libc detection

---
 libscpi/inc/scpi/config.h |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 3b8ccda..48ad3e9 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -42,11 +42,31 @@
 #endif
 
 /* Compiler specific */
+/* 8bit PIC - PIC16, etc */
+#if defined(_MPC_)
+#define HAVE_STRNLEN            0
+#define HAVE_STRNCASECMP        0
+#define HAVE_STRNICMP           1
+#endif
 
 /* PIC24 */
 #if defined(__C30__)
 #define HAVE_STRNLEN            0
 #define HAVE_STRNCASECMP        0
+#define HAVE_STRNICMP           0
+#endif
+
+/* PIC32mx */
+#if defined(__C32__)
+#define HAVE_STRNLEN            0
+#define HAVE_STRNCASECMP        1
+#define HAVE_STRNICMP           0
+#endif
+
+/* AVR libc */
+#if defined(__AVR__)
+#include <stdlib.h>
+#define HAVE_DTOSTRE            1
 #endif
 
 /* ======== test strnlen ======== */
@@ -57,6 +77,10 @@
 #ifndef HAVE_STRNCASECMP
 #define HAVE_STRNCASECMP        1
 #endif
+/* ======== test strnicmp ======== */
+#ifndef HAVE_STRNICMP
+#define HAVE_STRNICMP           0
+#endif
 
 /* define local macros depending on existance of strnlen */
 #if HAVE_STRNLEN
@@ -65,13 +89,22 @@
 #define SCPI_strnlen(s, l)	BSD_strnlen((s), (l))
 #endif
 
-/* define local macros depending on existance of strncasecmp */
+/* define local macros depending on existance of strncasecmp and strnicmp */
 #if HAVE_STRNCASECMP
 #define SCPI_strncasecmp(s1, s2, l)	strncasecmp((s1), (s2), (l))
+#elif HAVE_STRNICMP
+#define SCPI_strncasecmp(s1, s2, l)     strnicmp((s1), (s2), (l))
 #else
-#define SCPI_strncasecmp(s1, s2, l)	strcasecmp((s1), (s2))
+#define SCPI_strncasecmp(s1, s2, l)	OUR_strncasecmp((s1), (s2), (l))
 #endif
 
+#if HAVE_DTOSTRE
+#define SCPI_doubleToStr(v, s, l) strlen(dtostre((v), (s), 6, DTOSTR_PLUS_SIGN | DTOSTR_ALWAYS_SIGN | DTOSTR_UPPERCASE))
+#else
+#define SCPI_doubleToStr(v, s, l) snprintf((s), (l), "%lg", (v))
+#endif
+
+
 #ifdef	__cplusplus
 }
 #endif

--
Gitblit v1.9.1