From 932061c92277c46278b2b4027e1fdb873e1bc19b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 04 12月 2012 18:28:17 +0800
Subject: [PATCH] Update README - file structure
---
scpi/scpi_ieee488.h | 53 ++++++++++++++++++-----------------------------------
1 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/scpi/scpi_ieee488.h b/scpi/scpi_ieee488.h
index 845d88e..2cffcde 100644
--- a/scpi/scpi_ieee488.h
+++ b/scpi/scpi_ieee488.h
@@ -37,38 +37,21 @@
#ifndef SCPI_IEEE488_H
#define SCPI_IEEE488_H
-#include "scpi.h"
-#include <stdint.h>
+#include "scpi_types.h"
-typedef uint16_t scpi_reg_val_t;
-
-typedef enum {
- SCPI_REG_STB = 0, // Status Byte
- SCPI_REG_SRE, // Service Request Enable Register
- SCPI_REG_ESR, // Standard Event Status Register (ESR, SESR)
- SCPI_REG_ESE, // Event Status Enable Register
- SCPI_REG_OPER, // OPERation Status Register
- SCPI_REG_OPERE, // OPERation Status Enable Register
- SCPI_REG_QUES, // QUEStionable status register
- SCPI_REG_QUESE, // QUEStionable status Enable Register
-
- /* last definition - number of registers */
- SCPI_REG_COUNT,
-} scpi_reg_name_t;
-
-int SCPI_CoreCls(scpi_t * context);
-int SCPI_CoreEse(scpi_t * context);
-int SCPI_CoreEseQ(scpi_t * context);
-int SCPI_CoreEsrQ(scpi_t * context);
-int SCPI_CoreIdnQ(scpi_t * context);
-int SCPI_CoreOpc(scpi_t * context);
-int SCPI_CoreOpcQ(scpi_t * context);
-int SCPI_CoreRst(scpi_t * context);
-int SCPI_CoreSre(scpi_t * context);
-int SCPI_CoreSreQ(scpi_t * context);
-int SCPI_CoreStbQ(scpi_t * context);
-int SCPI_CoreTstQ(scpi_t * context);
-int SCPI_CoreWai(scpi_t * context);
+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
@@ -91,10 +74,10 @@
#define ESR_PON 0x80 // Power On
-scpi_reg_val_t SCPI_RegGet(scpi_reg_name_t name);
-void SCPI_RegSet(scpi_reg_name_t name, scpi_reg_val_t val);
-void SCPI_RegSetBits(scpi_reg_name_t name, scpi_reg_val_t bits);
-void SCPI_RegClearBits(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);
#endif /* SCPI_IEEE488_H */
--
Gitblit v1.9.1