X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fprotocol.h;h=64fca8090ca6f2f4bef7d1d797e38171d2c525a6;hb=61c39f54bbcae7bdde86ddb11b2fd0ff308d319b;hp=e2c5d9e31baf1eef7f85ca2af1463f6a5b7c0455;hpb=58c5f2ed1785ead87d1398c28b5dbe60ba4610dd;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/protocol.h b/hardware/zeroplus-logic-cube/protocol.h
index e2c5d9e3..64fca809 100644
--- a/hardware/zeroplus-logic-cube/protocol.h
+++ b/hardware/zeroplus-logic-cube/protocol.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -28,36 +28,32 @@
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "zeroplus: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "zeroplus: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /* Private, per-device-instance driver context. */
 struct dev_context {
 	uint64_t cur_samplerate;
 	uint64_t max_samplerate;
 	uint64_t limit_samples;
-	int num_channels; /* TODO: This isn't initialized before it's needed :( */
+	int num_channels;
 	int memory_size;
-	unsigned int max_memory_size;
+	unsigned int max_sample_depth;
 	//uint8_t probe_mask;
 	//uint8_t trigger_mask[NUM_TRIGGER_STAGES];
 	//uint8_t trigger_value[NUM_TRIGGER_STAGES];
 	// uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
 	int trigger;
 	unsigned int capture_ratio;
-
-	/* TODO: this belongs in the device instance */
-	struct sr_usb_dev_inst *usb;
+	const struct zp_model *prof;
 };
 
-extern const uint64_t zp_supported_samplerates[];
-
 SR_PRIV unsigned int get_memory_size(int type);
 SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate);
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples);