From f4d3fcc03f61df6becf302f555b27da7e361eae5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 21 10月 2013 17:00:47 +0800
Subject: [PATCH] Merge branch 'master' of git://github.com/andrey-nakin/scpi-parser into andrey-nakin-master
---
examples/common/scpi-def.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index c49eb44..485cd85 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -143,12 +143,12 @@
};
static scpi_interface_t scpi_interface = {
- .write = SCPI_Write,
.error = SCPI_Error,
- .reset = SCPI_Reset,
- .test = SCPI_Test,
+ .write = SCPI_Write,
.control = SCPI_Control,
.flush = SCPI_Flush,
+ .reset = SCPI_Reset,
+ .test = SCPI_Test,
};
#define SCPI_INPUT_BUFFER_LENGTH 256
--
Gitblit v1.9.1