X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fkecheng-kc-330b%2Fprotocol.h;h=09152b9f9b6c0dbd11abc986c7cf4cb41c473a37;hb=c1bcb8cc633cc69ce4a872f59ec2b686bc00bd04;hp=8541a68be234820ba6bf2530b90c9c69971e3c3d;hpb=bc7be4a9f4940dd9708208bddab87bd190ef816f;p=libsigrok.git

diff --git a/hardware/kecheng-kc-330b/protocol.h b/hardware/kecheng-kc-330b/protocol.h
index 8541a68b..09152b9f 100644
--- a/hardware/kecheng-kc-330b/protocol.h
+++ b/hardware/kecheng-kc-330b/protocol.h
@@ -25,20 +25,13 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "kecheng-kc-330b: "
-#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)
+#define LOG_PREFIX "kecheng-kc-330b"
 
 #define EP_IN 0x80 | 1
 #define EP_OUT 2
 
 /* 500ms */
-#define DEFAULT_SAMPLE_INTERVAL 1
+#define DEFAULT_SAMPLE_INTERVAL 0
 #define DEFAULT_ALARM_LOW 40
 #define DEFAULT_ALARM_HIGH 120
 #define DEFAULT_WEIGHT_TIME SR_MQFLAG_SPL_TIME_WEIGHT_F
@@ -46,11 +39,20 @@
 /* Live */
 #define DEFAULT_DATA_SOURCE DATA_SOURCE_LIVE
 
+enum {
+	LIVE_SPL_IDLE,
+	LIVE_SPL_WAIT,
+	LOG_DATA_IDLE,
+	LOG_DATA_WAIT,
+};
 
 enum {
 	CMD_CONFIGURE = 0x01,
 	CMD_IDENTIFY = 0x02,
 	CMD_SET_DATE_TIME = 0x03,
+	CMD_GET_STATUS = 0x04,
+	CMD_GET_LOG_INFO = 0x05,
+	CMD_GET_LOG_DATA = 0x07,
 	CMD_GET_LIVE_SPL = 0x08,
 };
 
@@ -59,10 +61,13 @@ enum {
 	DATA_SOURCE_MEMORY,
 };
 
+enum {
+	DEVICE_ACTIVE,
+	DEVICE_INACTIVE,
+};
+
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Model-specific information */
-
 	/* Acquisition settings */
 	uint64_t limit_samples;
 	int sample_interval;
@@ -72,18 +77,28 @@ struct dev_context {
 	int data_source;
 
 	/* Operational state */
+	int state;
+	gboolean config_dirty;
 	uint64_t num_samples;
+	uint64_t stored_samples;
 	void *cb_data;
-	int usbfd[10];
+	struct libusb_transfer *xfer;
+	unsigned char buf[128];
 
 	/* Temporary state across callbacks */
+	gint64 last_live_request;
 
 };
 
 SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data);
+SR_PRIV void kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer);
 SR_PRIV int kecheng_kc_330b_configure(const struct sr_dev_inst *sdi);
 SR_PRIV int kecheng_kc_330b_set_date_time(struct sr_dev_inst *sdi);
 SR_PRIV int kecheng_kc_330b_recording_get(const struct sr_dev_inst *sdi,
 		gboolean *tmp);
+SR_PRIV int kecheng_kc_330b_status_get(const struct sr_dev_inst *sdi,
+		int *status);
+SR_PRIV int kecheng_kc_330b_log_info_get(const struct sr_dev_inst *sdi,
+		unsigned char *buf);
 
 #endif