From 7f3d9c0c0238b1fec92fff04f87730668100b73b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 04 8月 2015 00:39:04 +0800
Subject: [PATCH] Cleanup of macros and defines
---
libscpi/inc/scpi/config.h | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index bb59d4f..e301c56 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file config.h
* @date Wed Mar 20 12:21:26 UTC 2013
- *
+ *
* @brief SCPI Configuration
- *
- *
+ *
+ *
*/
#ifndef __SCPI_CONFIG_H_
@@ -41,24 +41,41 @@
extern "C" {
#endif
-/* set the termination character(s) */
-#define ENDCODE_CR 1 /* use a <CR> carriage return aka '\r' as termination charcter */
-#define ENDCODE_LF 2 /* use a <LF> line feed aka '\n' as termination charcter */
-#define ENDCODE_CRLF 3 /* use <CR><LF> carriage return + line feed aka "\r\n" as termination charcters */
-
-#define USED_ENDCODE ENDCODE_LF
-
-/* select the error list(s) */
-#define ERR_SCPI_MINIMUM 1
-#define ERR_SCPI_FULL 2
-#define ERR_SCPI_MIN_PLUS_USER 3
-#define ERR_SCPI_FULL_PLUS_USER 4
+#ifdef SCPI_USER_CONFIG
+#include "scpi_user_config.h"
+#endif
-#define USED_SCPI_ERROR_LIST ERR_SCPI_MIN_PLUS_USER
-
+/* set the termination character(s) */
+#define LINE_ENDING_CR "\r" /* use a <CR> carriage return as termination charcter */
+#define LINE_ENDING_LF "\n" /* use a <LF> line feed as termination charcter */
+#define LINE_ENDING_CRLF "\r\n" /* use <CR><LF> carriage return + line feed as termination charcters */
+
+#ifndef SCPI_LINE_ENDING
+#define SCPI_LINE_ENDING LINE_ENDING_CRLF
+#endif
+
+/* Enable full error list
+ * 0 = Minimal set of errors
+ * 1 = Full set of errors
+ *
+ * For small systems, full set of errors will occupy large ammount of data
+ */
+#ifndef USE_FULL_ERROR_LIST
+#define USE_FULL_ERROR_LIST 0
+#endif
+
+/**
+ * Enable also LIST_OF_USER_ERRORS to be included
+ * 0 = Use only library defined errors
+ * 1 = Use also LIST_OF_USER_ERRORS
+ */
+#ifndef USE_USER_ERROR_LIST
+#define USE_USER_ERROR_LIST 0
+#endif
+
/* Compiler specific */
-/* ARM, e.g. Cortex-M CPUs */
-#if defined(__arm__)
+/* RealView/Keil ARM Compiler, e.g. Cortex-M CPUs */
+#if defined(__CC_ARM)
#define HAVE_STRNLEN 0
#define HAVE_STRNCASECMP 1
#define HAVE_STRNICMP 0
@@ -68,7 +85,8 @@
#if defined(_CVI_)
#define HAVE_STRNLEN 0
#define HAVE_STRNCASECMP 0
-#define HAVE_STRNICMP 0
+#define HAVE_STRNICMP 1
+#define HAVE_STDBOOL 0
#endif
/* 8bit PIC - PIC16, etc */
@@ -111,6 +129,10 @@
#define HAVE_STRNICMP 0
#endif
+#ifndef HAVE_STDBOOL
+#define HAVE_STDBOOL 1
+#endif
+
/* define local macros depending on existance of strnlen */
#if HAVE_STRNLEN
#define SCPIDEFINE_strnlen(s, l) strnlen((s), (l))
--
Gitblit v1.9.1