From a6dedec1adeeb974bceb1930cb63178d6165c7f6 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周三, 16 4月 2025 09:53:34 +0800
Subject: [PATCH] 使用了scpi-def的cpp版本

---
 libscpi/src/ieee488.c |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index d03708e..6e20a4c 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -38,8 +38,6 @@
 #include "scpi/parser.h"
 #include "scpi/ieee488.h"
 #include "scpi/error.h"
-#include "scpi/constants.h"
-
 #include <stdio.h>
 
 static const scpi_reg_info_t scpi_reg_details[SCPI_REG_COUNT] = {
@@ -73,7 +71,7 @@
         SCPI_REG_NONE,
         SCPI_REG_NONE,
         0
-    }, //SCPI_REG_GROUP_STB
+    }, /* SCPI_REG_GROUP_STB */
     { 
         SCPI_REG_ESR,
         SCPI_REG_ESE,
@@ -82,7 +80,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 +89,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 +98,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 +167,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 +181,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 +201,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 +228,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 +263,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;
 }
@@ -273,7 +278,8 @@
  * @param context
  * @return 
  */
-scpi_result_t SCPI_CoreEse(scpi_t * context) {
+scpi_result_t SCPI_CoreEse(scpi_t * context)
+{
     int32_t new_ESE;
     if (SCPI_ParamInt32(context, &new_ESE, TRUE)) {
         SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t) new_ESE);
@@ -415,3 +421,4 @@
     return SCPI_RES_OK;
 }
 
+

--
Gitblit v1.9.1