From f73b07e6aeddf13923c51a413ba69889fd593d32 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 04 12月 2012 18:14:17 +0800
Subject: [PATCH] Code cleanup - remove "(void) context;"
---
scpi/scpi_ieee488.c | 158 +++++++++++++++++++++++++---------------------------
1 files changed, 77 insertions(+), 81 deletions(-)
diff --git a/scpi/scpi_ieee488.c b/scpi/scpi_ieee488.c
index 809ae33..0c3fcc0 100644
--- a/scpi/scpi_ieee488.c
+++ b/scpi/scpi_ieee488.c
@@ -34,22 +34,17 @@
*
*/
-#include "scpi.h"
+#include "scpi_parser.h"
#include "scpi_ieee488.h"
#include "scpi_error.h"
#include "scpi_constants.h"
-#include <string.h>
-#include <stdint.h>
-
-/* register array */
-static scpi_reg_val_t regs[SCPI_REG_COUNT];
/**
* Update register value
* @param name - register name
*/
-static void SCPI_RegUpdate(scpi_reg_name_t name) {
- SCPI_RegSet(name, SCPI_RegGet(name));
+static void SCPI_RegUpdate(scpi_t * context, scpi_reg_name_t name) {
+ SCPI_RegSet(context, name, SCPI_RegGet(context, name));
}
/**
@@ -57,9 +52,9 @@
* @param name - register name
* @return register value
*/
-scpi_reg_val_t SCPI_RegGet(scpi_reg_name_t name) {
- if (name < SCPI_REG_COUNT) {
- return regs[name];
+scpi_reg_val_t SCPI_RegGet(scpi_t * context, scpi_reg_name_t name) {
+ if ((name < SCPI_REG_COUNT) && (context->registers != NULL)) {
+ return context->registers[name];
} else {
return 0;
}
@@ -70,54 +65,61 @@
* @param name - register name
* @param val - new value
*/
-void SCPI_RegSet(scpi_reg_name_t name, scpi_reg_val_t val) {
- if (name >= SCPI_REG_COUNT) {
+void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val) {
+ bool_t srq = FALSE;
+ scpi_reg_val_t mask;
+
+ if ((name >= SCPI_REG_COUNT) || (context->registers == NULL)) {
return;
}
+
// set register value
- regs[name] = val;
+ context->registers[name] = val;
switch (name) {
case SCPI_REG_STB:
- if (val & (SCPI_RegGet(SCPI_REG_SRE) &~STB_SRQ)) {
+ mask = SCPI_RegGet(context, SCPI_REG_SRE);
+ mask &= ~STB_SRQ;
+ if (val & mask) {
val |= STB_SRQ;
+ srq = TRUE;
} else {
val &= ~STB_SRQ;
}
break;
case SCPI_REG_SRE:
- SCPI_RegUpdate(SCPI_REG_STB);
+ SCPI_RegUpdate(context, SCPI_REG_STB);
break;
case SCPI_REG_ESR:
- if (val & SCPI_RegGet(SCPI_REG_ESE)) {
- SCPI_RegSetBits(SCPI_REG_STB, STB_ESR);
+ if (val & SCPI_RegGet(context, SCPI_REG_ESE)) {
+ SCPI_RegSetBits(context, SCPI_REG_STB, STB_ESR);
} else {
- SCPI_RegClearBits(SCPI_REG_STB, STB_ESR);
+ SCPI_RegClearBits(context, SCPI_REG_STB, STB_ESR);
}
break;
case SCPI_REG_ESE:
- SCPI_RegUpdate(SCPI_REG_ESR);
+ SCPI_RegUpdate(context, SCPI_REG_ESR);
break;
case SCPI_REG_QUES:
- if (val & SCPI_RegGet(SCPI_REG_QUESE)) {
- SCPI_RegSetBits(SCPI_REG_STB, STB_QES);
+ if (val & SCPI_RegGet(context, SCPI_REG_QUESE)) {
+ SCPI_RegSetBits(context, SCPI_REG_STB, STB_QES);
} else {
- SCPI_RegClearBits(SCPI_REG_STB, STB_QES);
+ SCPI_RegClearBits(context, SCPI_REG_STB, STB_QES);
}
break;
case SCPI_REG_QUESE:
- SCPI_RegUpdate(SCPI_REG_QUES);
+ SCPI_RegUpdate(context, SCPI_REG_QUES);
break;
case SCPI_REG_OPER:
- if (val & SCPI_RegGet(SCPI_REG_OPERE)) {
- SCPI_RegSetBits(SCPI_REG_STB, STB_OPS);
+ if (val & SCPI_RegGet(context, SCPI_REG_OPERE)) {
+ SCPI_RegSetBits(context, SCPI_REG_STB, STB_OPS);
} else {
- SCPI_RegClearBits(SCPI_REG_STB, STB_OPS);
+ SCPI_RegClearBits(context, SCPI_REG_STB, STB_OPS);
}
break;
case SCPI_REG_OPERE:
- SCPI_RegUpdate(SCPI_REG_OPER);
+ SCPI_RegUpdate(context, SCPI_REG_OPER);
break;
@@ -127,8 +129,11 @@
}
// set updated register value
- regs[name] = val;
+ context->registers[name] = val;
+ if (srq && context->interface && context->interface->srq) {
+ context->interface->srq(context);
+ }
}
/**
@@ -136,8 +141,8 @@
* @param name - register name
* @param bits bit mask
*/
-void SCPI_RegSetBits(scpi_reg_name_t name, scpi_reg_val_t bits) {
- SCPI_RegSet(name, SCPI_RegGet(name) | bits);
+void SCPI_RegSetBits(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t bits) {
+ SCPI_RegSet(context, name, SCPI_RegGet(context, name) | bits);
}
/**
@@ -145,15 +150,15 @@
* @param name - register name
* @param bits bit mask
*/
-void SCPI_RegClearBits(scpi_reg_name_t name, scpi_reg_val_t bits) {
- SCPI_RegSet(name, SCPI_RegGet(name) & ~bits);
+void SCPI_RegClearBits(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t bits) {
+ SCPI_RegSet(context, name, SCPI_RegGet(context, name) & ~bits);
}
/* ============ */
-void SCPI_EventClear(void) {
+void SCPI_EventClear(scpi_t * context) {
// TODO
- SCPI_RegSet(SCPI_REG_ESR, 0);
+ SCPI_RegSet(context, SCPI_REG_ESR, 0);
}
/**
@@ -162,13 +167,12 @@
* @param context
* @return
*/
-int SCPI_CoreCls(scpi_t * context) {
- (void) context;
- SCPI_EventClear();
+scpi_result_t SCPI_CoreCls(scpi_t * context) {
+ SCPI_EventClear(context);
SCPI_ErrorClear(context);
- SCPI_RegSet(SCPI_REG_OPER, 0);
- SCPI_RegSet(SCPI_REG_QUES, 0);
- return 0;
+ SCPI_RegSet(context, SCPI_REG_OPER, 0);
+ SCPI_RegSet(context, SCPI_REG_QUES, 0);
+ return SCPI_RES_OK;
}
/**
@@ -176,12 +180,12 @@
* @param context
* @return
*/
-int SCPI_CoreEse(scpi_t * context) {
+scpi_result_t SCPI_CoreEse(scpi_t * context) {
int32_t new_ESE;
if (SCPI_ParamInt(context, &new_ESE, TRUE)) {
- SCPI_RegSet(SCPI_REG_ESE, new_ESE);
+ SCPI_RegSet(context, SCPI_REG_ESE, new_ESE);
}
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -189,10 +193,9 @@
* @param context
* @return
*/
-int SCPI_CoreEseQ(scpi_t * context) {
- (void) context;
- SCPI_ResultInt(context, SCPI_RegGet(SCPI_REG_ESE));
- return 0;
+scpi_result_t SCPI_CoreEseQ(scpi_t * context) {
+ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_ESE));
+ return SCPI_RES_OK;
}
/**
@@ -200,11 +203,10 @@
* @param context
* @return
*/
-int SCPI_CoreEsrQ(scpi_t * context) {
- (void) context;
- SCPI_ResultInt(context, SCPI_RegGet(SCPI_REG_ESR));
- SCPI_RegSet(SCPI_REG_ESR, 0);
- return 0;
+scpi_result_t SCPI_CoreEsrQ(scpi_t * context) {
+ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_ESR));
+ SCPI_RegSet(context, SCPI_REG_ESR, 0);
+ return SCPI_RES_OK;
}
/**
@@ -212,12 +214,11 @@
* @param context
* @return
*/
-int SCPI_CoreIdnQ(scpi_t * context) {
- (void) context;
+scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
SCPI_ResultString(context, SCPI_MANUFACTURE);
SCPI_ResultString(context, SCPI_DEV_NAME);
SCPI_ResultString(context, SCPI_DEV_VERSION);
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -225,10 +226,9 @@
* @param context
* @return
*/
-int SCPI_CoreOpc(scpi_t * context) {
- (void) context;
- SCPI_RegSetBits(SCPI_REG_ESR, ESR_OPC);
- return 0;
+scpi_result_t SCPI_CoreOpc(scpi_t * context) {
+ SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_OPC);
+ return SCPI_RES_OK;
}
/**
@@ -236,11 +236,10 @@
* @param context
* @return
*/
-int SCPI_CoreOpcQ(scpi_t * context) {
- (void) context;
+scpi_result_t SCPI_CoreOpcQ(scpi_t * context) {
// Operation is always completed
SCPI_ResultInt(context, 1);
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -248,11 +247,11 @@
* @param context
* @return
*/
-int SCPI_CoreRst(scpi_t * context) {
+scpi_result_t SCPI_CoreRst(scpi_t * context) {
if (context && context->interface && context->interface->reset) {
return context->interface->reset(context);
}
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -260,12 +259,12 @@
* @param context
* @return
*/
-int SCPI_CoreSre(scpi_t * context) {
+scpi_result_t SCPI_CoreSre(scpi_t * context) {
int32_t new_SRE;
if (SCPI_ParamInt(context, &new_SRE, TRUE)) {
- SCPI_RegSet(SCPI_REG_SRE, new_SRE);
+ SCPI_RegSet(context, SCPI_REG_SRE, new_SRE);
}
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -273,10 +272,9 @@
* @param context
* @return
*/
-int SCPI_CoreSreQ(scpi_t * context) {
- (void) context;
- SCPI_ResultInt(context, SCPI_RegGet(SCPI_REG_SRE));
- return 0;
+scpi_result_t SCPI_CoreSreQ(scpi_t * context) {
+ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_SRE));
+ return SCPI_RES_OK;
}
/**
@@ -284,10 +282,9 @@
* @param context
* @return
*/
-int SCPI_CoreStbQ(scpi_t * context) {
- (void) context;
- SCPI_ResultInt(context, SCPI_RegGet(SCPI_REG_STB));
- return 0;
+scpi_result_t SCPI_CoreStbQ(scpi_t * context) {
+ SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_STB));
+ return SCPI_RES_OK;
}
/**
@@ -295,14 +292,13 @@
* @param context
* @return
*/
-int SCPI_CoreTstQ(scpi_t * context) {
- (void) context;
+scpi_result_t SCPI_CoreTstQ(scpi_t * context) {
int result = 0;
if (context && context->interface && context->interface->test) {
result = context->interface->test(context);
}
SCPI_ResultInt(context, result);
- return 0;
+ return SCPI_RES_OK;
}
/**
@@ -310,9 +306,9 @@
* @param context
* @return
*/
-int SCPI_CoreWai(scpi_t * context) {
+scpi_result_t SCPI_CoreWai(scpi_t * context) {
(void) context;
// NOP
- return 0;
+ return SCPI_RES_OK;
}
--
Gitblit v1.9.1