From ace1bf8a4ae70605aece03b9cea28fa37c6b1c1c Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: ćšć, 26 11æ 2015 04:58:18 +0800 Subject: [PATCH] Add test for ResultArray --- libscpi/inc/scpi/ieee488.h | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/libscpi/inc/scpi/ieee488.h b/libscpi/inc/scpi/ieee488.h index b3693a1..08d2752 100644 --- a/libscpi/inc/scpi/ieee488.h +++ b/libscpi/inc/scpi/ieee488.h @@ -39,19 +39,23 @@ #include "scpi/types.h" -scpi_result_t SCPI_CoreCls(scpi_t * context); -scpi_result_t SCPI_CoreEse(scpi_t * context); -scpi_result_t SCPI_CoreEseQ(scpi_t * context); -scpi_result_t SCPI_CoreEsrQ(scpi_t * context); -scpi_result_t SCPI_CoreIdnQ(scpi_t * context); -scpi_result_t SCPI_CoreOpc(scpi_t * context); -scpi_result_t SCPI_CoreOpcQ(scpi_t * context); -scpi_result_t SCPI_CoreRst(scpi_t * context); -scpi_result_t SCPI_CoreSre(scpi_t * context); -scpi_result_t SCPI_CoreSreQ(scpi_t * context); -scpi_result_t SCPI_CoreStbQ(scpi_t * context); -scpi_result_t SCPI_CoreTstQ(scpi_t * context); -scpi_result_t SCPI_CoreWai(scpi_t * context); +#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); + scpi_result_t SCPI_CoreEsrQ(scpi_t * context); + scpi_result_t SCPI_CoreIdnQ(scpi_t * context); + scpi_result_t SCPI_CoreOpc(scpi_t * context); + scpi_result_t SCPI_CoreOpcQ(scpi_t * context); + scpi_result_t SCPI_CoreRst(scpi_t * context); + scpi_result_t SCPI_CoreSre(scpi_t * context); + scpi_result_t SCPI_CoreSreQ(scpi_t * context); + scpi_result_t SCPI_CoreStbQ(scpi_t * context); + scpi_result_t SCPI_CoreTstQ(scpi_t * context); + scpi_result_t SCPI_CoreWai(scpi_t * context); #define STB_R01 0x01 /* Not used */ @@ -74,11 +78,16 @@ #define ESR_PON 0x80 /* Power On */ -scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name); -void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val); -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); + scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name); + void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val); + 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); + void SCPI_EventClear(scpi_t * context); + +#ifdef __cplusplus +} +#endif #endif /* SCPI_IEEE488_H */ -- Gitblit v1.9.1