X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.h;h=f452c74846876bb81d5e507b08710fdcb02a3b6f;hb=5af666a94e67e8a18c0dfa1f4314e1c3e93aa993;hp=d8b00b47c149f6c1bf317977e0cd7ebb9aafd7a6;hpb=69890f7399f086c38670961dc72166f00de89af6;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/ols.h b/hardware/openbench-logic-sniffer/ols.h
index d8b00b47..f452c748 100644
--- a/hardware/openbench-logic-sniffer/ols.h
+++ b/hardware/openbench-logic-sniffer/ols.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OLS_H_
-#define OLS_H_
+#ifndef LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
+#define LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
 
 #define NUM_PROBES             32
 #define NUM_TRIGGER_STAGES     4
@@ -59,7 +59,8 @@
 #define FLAG_CLOCK_INVERTED        0x80
 #define FLAG_RLE                   0x0100
 
-struct ols_device {
+/* Private, per-device-instance driver context. */
+struct context {
 	uint32_t max_samplerate;
 	uint32_t max_samples;
 	uint32_t protocol_version;
@@ -67,7 +68,6 @@ struct ols_device {
 
 	uint64_t cur_samplerate;
 	uint32_t cur_samplerate_divider;
-	uint64_t period_ps;
 	uint64_t limit_samples;
 	/* Current state of the flag register */
 	uint32_t flag_reg;
@@ -89,7 +89,7 @@ struct ols_device {
 	unsigned char tmp_sample[4];
 	unsigned char *raw_sample_buf;
 
-	struct sr_serial_device_instance *serial;
+	struct sr_serial_dev_inst *serial;
 };
 
-#endif /* OLS_H_ */
+#endif