zeroplus: Cosmetics, small fixes, drop unneeded stuff.

[libsigrok.git] / hardware / chronovu-la8 / protocol.c

diff --git a/hardware/chronovu-la8/protocol.c b/hardware/chronovu-la8/protocol.c
index 9b25cd7f2aca7cda43998ead73e37cde42b78ba4..5de7cf1761c5a1b7a1df0d58ff7e580c557bad38 100644 (file)
--- a/hardware/chronovu-la8/protocol.c
+++ b/hardware/chronovu-la8/protocol.c
@@ -26,18 +26,11 @@
 
 /* Probes are numbered 0-7. */
 SR_PRIV const char *probe_names[NUM_PROBES + 1] = {
-       "0",
-       "1",
-       "2",
-       "3",
-       "4",
-       "5",
-       "6",
-       "7",
+       "0", "1", "2", "3", "4", "5", "6", "7",
        NULL,
 };
 
-/* This will be initialized via hw_info_get()/SR_DI_SAMPLERATES. */
+/* This will be initialized via config_list()/SR_CONF_SAMPLERATE. */
 SR_PRIV uint64_t supported_samplerates[255 + 1] = { 0 };
 
 /*
@@ -53,10 +46,10 @@ const struct sr_samplerates samplerates = {
 
 /* Note: Continuous sampling is not supported by the hardware. */
 SR_PRIV const int hwcaps[] = {
-       SR_HWCAP_LOGIC_ANALYZER,
-       SR_HWCAP_SAMPLERATE,
-       SR_HWCAP_LIMIT_MSEC, /* TODO: Not yet implemented. */
-       SR_HWCAP_LIMIT_SAMPLES, /* TODO: Not yet implemented. */
+       SR_CONF_LOGIC_ANALYZER,
+       SR_CONF_SAMPLERATE,
+       SR_CONF_LIMIT_MSEC, /* TODO: Not yet implemented. */
+       SR_CONF_LIMIT_SAMPLES, /* TODO: Not yet implemented. */
        0,
 };
 
@@ -495,7 +488,7 @@ SR_PRIV void send_block_to_session_bus(struct dev_context *devc, int block)
                logic.length = BS;
                logic.unitsize = 1;
                logic.data = devc->final_buf + (block * BS);
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
                return;
        }
 
@@ -518,7 +511,7 @@ SR_PRIV void send_block_to_session_bus(struct dev_context *devc, int block)
                logic.length = trigger_point;
                logic.unitsize = 1;
                logic.data = devc->final_buf + (block * BS);
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
        }
 
        /* Send the SR_DF_TRIGGER packet to the session bus. */
@@ -526,7 +519,7 @@ SR_PRIV void send_block_to_session_bus(struct dev_context *devc, int block)
                (block * BS) + trigger_point);
        packet.type = SR_DF_TRIGGER;
        packet.payload = NULL;
-       sr_session_send(devc->session_dev_id, &packet);
+       sr_session_send(devc->cb_data, &packet);
 
        /* If at least one sample is located after the trigger... */
        if (trigger_point < (BS - 1)) {
@@ -539,6 +532,6 @@ SR_PRIV void send_block_to_session_bus(struct dev_context *devc, int block)
                logic.length = BS - trigger_point;
                logic.unitsize = 1;
                logic.data = devc->final_buf + (block * BS) + trigger_point;
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
        }
 }