From 39fdcb0c57bfeba598f00d77f190e731f26b25a1 Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu@greentest.com.cn>
Date: 周四, 24 4月 2025 18:25:01 +0800
Subject: [PATCH] 1.修改一下，把当前库改为刚从origin仓库拉去下来，然后添加了cmake构建文件的状态。
---
libscpi/src/ieee488.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index d03708e..c5f2665 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -73,7 +73,7 @@
SCPI_REG_NONE,
SCPI_REG_NONE,
0
- }, //SCPI_REG_GROUP_STB
+ }, /* SCPI_REG_GROUP_STB */
{
SCPI_REG_ESR,
SCPI_REG_ESE,
@@ -82,7 +82,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_ESR
- }, //SCPI_REG_GROUP_ESR
+ }, /* SCPI_REG_GROUP_ESR */
{
SCPI_REG_OPER,
SCPI_REG_OPERE,
@@ -91,7 +91,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_OPS
- }, //SCPI_REG_GROUP_OPER
+ }, /* SCPI_REG_GROUP_OPER */
{
SCPI_REG_QUES,
SCPI_REG_QUESE,
@@ -100,7 +100,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_QES
- }, //SCPI_REG_GROUP_QUES
+ }, /* SCPI_REG_GROUP_QUES */
#if USE_CUSTOM_REGISTERS
#ifndef USER_REGISTER_GROUP_DETAILS
@@ -169,7 +169,7 @@
switch (register_type) {
case SCPI_REG_CLASS_STB:
case SCPI_REG_CLASS_SRE:
- ;
+ {
scpi_reg_val_t stb = context->registers[SCPI_REG_STB] & ~STB_SRQ;
scpi_reg_val_t sre = context->registers[SCPI_REG_SRE] & ~STB_SRQ;
@@ -183,8 +183,9 @@
context->registers[SCPI_REG_STB] &= ~STB_SRQ;
}
break;
+ }
case SCPI_REG_CLASS_EVEN:
- ;
+ {
scpi_reg_val_t enable;
if(register_group.enable != SCPI_REG_NONE) {
enable = SCPI_RegGet(context, register_group.enable);
@@ -202,7 +203,9 @@
val &= ~(register_group.parent_bit);
}
break;
+ }
case SCPI_REG_CLASS_COND:
+ {
name = register_group.event;
if(register_group.ptfilt == SCPI_REG_NONE && register_group.ntfilt == SCPI_REG_NONE) {
@@ -227,6 +230,7 @@
val = ((ptrans & ptfilt) | (ntrans & ntfilt)) | SCPI_RegGet(context, register_group.event);
}
break;
+ }
case SCPI_REG_CLASS_ENAB:
case SCPI_REG_CLASS_NTR:
case SCPI_REG_CLASS_PTR:
@@ -261,9 +265,12 @@
*/
scpi_result_t SCPI_CoreCls(scpi_t * context) {
SCPI_ErrorClear(context);
- for (int i = 0; i < SCPI_REG_GROUP_COUNT; ++i) {
+ int i;
+ for (i = 0; i < SCPI_REG_GROUP_COUNT; ++i) {
scpi_reg_name_t event_reg = scpi_reg_group_details[i].event;
- SCPI_RegSet(context, event_reg, 0);
+ if (event_reg != SCPI_REG_STB) {
+ SCPI_RegSet(context, event_reg, 0);
+ }
}
return SCPI_RES_OK;
}
--
Gitblit v1.9.1