From be3350c620036306fb5f2db3535cb110f187d5e8 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 24 9月 2014 23:46:36 +0800
Subject: [PATCH] Refactor token_t and token_type_t to have scpi_ prefix
---
libscpi/inc/scpi/ieee488.h | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/libscpi/inc/scpi/ieee488.h b/libscpi/inc/scpi/ieee488.h
index b7eee81..f9c02ce 100644
--- a/libscpi/inc/scpi/ieee488.h
+++ b/libscpi/inc/scpi/ieee488.h
@@ -39,6 +39,10 @@
#include "scpi/types.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
scpi_result_t SCPI_CoreCls(scpi_t * context);
scpi_result_t SCPI_CoreEse(scpi_t * context);
scpi_result_t SCPI_CoreEseQ(scpi_t * context);
@@ -54,24 +58,24 @@
scpi_result_t SCPI_CoreWai(scpi_t * context);
-#define STB_R01 0x01 // Not used
-#define STB_PRO 0x02 // Protection Event Flag
-#define STB_QMA 0x04 // Error/Event queue message available
-#define STB_QES 0x08 // Questionable status
-#define STB_MAV 0x10 // Message Available
-#define STB_ESR 0x20 // Standard Event Status Register
-#define STB_SRQ 0x40 // Service Request
-#define STB_OPS 0x80 // Operation Status Flag
+#define STB_R01 0x01 /* Not used */
+#define STB_PRO 0x02 /* Protection Event Flag */
+#define STB_QMA 0x04 /* Error/Event queue message available */
+#define STB_QES 0x08 /* Questionable status */
+#define STB_MAV 0x10 /* Message Available */
+#define STB_ESR 0x20 /* Standard Event Status Register */
+#define STB_SRQ 0x40 /* Service Request */
+#define STB_OPS 0x80 /* Operation Status Flag */
-#define ESR_OPC 0x01 // Operation complete
-#define ESR_REQ 0x02 // Request Control
-#define ESR_QER 0x04 // Query Error
-#define ESR_DER 0x08 // Device Dependent Error
-#define ESR_EER 0x10 // Execution Error (e.g. range error)
-#define ESR_CER 0x20 // Command error (e.g. syntax error)
-#define ESR_URQ 0x40 // User Request
-#define ESR_PON 0x80 // Power On
+#define ESR_OPC 0x01 /* Operation complete */
+#define ESR_REQ 0x02 /* Request Control */
+#define ESR_QER 0x04 /* Query Error */
+#define ESR_DER 0x08 /* Device Dependent Error */
+#define ESR_EER 0x10 /* Execution Error (e.g. range error) */
+#define ESR_CER 0x20 /* Command error (e.g. syntax error) */
+#define ESR_URQ 0x40 /* User Request */
+#define ESR_PON 0x80 /* Power On */
scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name);
@@ -79,6 +83,9 @@
void SCPI_RegSetBits(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t bits);
void SCPI_RegClearBits(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t bits);
+#ifdef __cplusplus
+}
+#endif
#endif /* SCPI_IEEE488_H */
--
Gitblit v1.9.1