From 4d39507183e0ace2d73f04817a398e858b66b677 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 22 3月 2013 01:40:22 +0800
Subject: [PATCH] Update lexer, start of implementing parser

---
 libscpi/src/ieee488.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 6b4e62e..e3f4629 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -84,7 +84,7 @@
  * @param ctrl number of controll message
  * @param value value of related register
  */
-static size_t writeControl(scpi_t * context, int ctrl, scpi_reg_val_t val) {
+static size_t writeControl(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
     if (context && context->interface && context->interface->control) {
         return context->interface->control(context, ctrl, val);
     } else {
@@ -145,11 +145,11 @@
             
             
         case SCPI_REG_COUNT:
-            // nothing to do
+            /* nothing to do */
             break;
     }
 
-    // set updated register value
+    /* set updated register value */
     context->registers[name] = val;
 
     if (srq) {
@@ -180,7 +180,7 @@
  * @param context
  */
 void SCPI_EventClear(scpi_t * context) {
-    // TODO
+    /* TODO */
     SCPI_RegSet(context, SCPI_REG_ESR, 0);
 }
 
@@ -260,7 +260,7 @@
  * @return 
  */
 scpi_result_t SCPI_CoreOpcQ(scpi_t * context) {
-    // Operation is always completed
+    /* Operation is always completed */
     SCPI_ResultInt(context, 1);
     return SCPI_RES_OK;
 }
@@ -319,7 +319,7 @@
     int result = 0;
     if (context && context->interface && context->interface->test) {
         result = context->interface->test(context);
-    }    
+    }
     SCPI_ResultInt(context, result);
     return SCPI_RES_OK;
 }
@@ -331,7 +331,7 @@
  */
 scpi_result_t SCPI_CoreWai(scpi_t * context) {
     (void) context;
-    // NOP
+    /* NOP */
     return SCPI_RES_OK;
 }
 

--
Gitblit v1.9.1