From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73
---
libscpi/inc/scpi/config.h | 4 +++-
libscpi/src/error.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 85cd07f..94bf67d 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -199,8 +199,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 */
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index bc370a9..fedf795 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -134,7 +134,7 @@
struct error_reg {
int16_t from;
int16_t to;
- scpi_reg_val_t bit;
+ scpi_reg_val_t esrBit;
};
#define ERROR_DEFS_N 9
@@ -170,7 +170,7 @@
for (i = 0; i < ERROR_DEFS_N; i++) {
if ((err <= errs[i].from) && (err >= errs[i].to)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
+ SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].esrBit);
}
}
--
Gitblit v1.9.1