X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fnexus-osciprime%2Fprotocol.h;h=579639dd9d6c13b4b494eb0eeeac5908e5efb056;hb=decfe89d4e8c0902c1ca56933f2da30b97e9fa72;hp=539924c3cf0c707ef6ed220574f6e1b45151c88a;hpb=35a078bce5cff9b8ff221a9930d271ec90e20ec4;p=libsigrok.git

diff --git a/hardware/nexus-osciprime/protocol.h b/hardware/nexus-osciprime/protocol.h
index 539924c3..579639dd 100644
--- a/hardware/nexus-osciprime/protocol.h
+++ b/hardware/nexus-osciprime/protocol.h
@@ -24,14 +24,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "nexus-osciprime: "
-#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 "nexus-osciprime: "
+#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 {
@@ -46,6 +46,9 @@ struct dev_context {
 
 	/** The current number of already received samples. */
 	uint64_t num_samples;
+	struct sr_usb_dev_inst *usb;
+	int usbfd[10];
+	int64_t fw_updated;
 };
 
 SR_PRIV int nexus_osciprime_receive_data(int fd, int revents, void *cb_data);