sr: remove unused argument from hardware driver function init()

[libsigrok.git] / hardware / link-mso19 / link-mso19.h

diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
index 506b34697e159891d1627777072ead38d4143988..53112bef320081aa43ea3794c81b875c8d1bdca6 100644 (file)
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_LINK_MSO19_H
-#define SIGROK_LINK_MSO19_H
+#ifndef LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
+#define LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
 
 /* Structure for the pattern generator state */
 struct mso_patgen {
@@ -51,7 +51,7 @@ struct mso_prototrig {
        uint8_t spimode;
 };
 
-/* our private per-instance data */
+/* Private, per-device-instance driver context. */
 struct mso {
        /* info */
        uint8_t hwmodel;
@@ -71,14 +71,14 @@ struct mso {
        uint8_t dso_probe_attn;
        uint8_t trigger_chan;
        uint8_t trigger_slope;
-       uint8_t trigger_spimode;
        uint8_t trigger_outsrc;
        uint8_t trigger_state;
        uint8_t la_trigger;
        uint8_t la_trigger_mask;
        double dso_trigger_voltage;
        uint16_t dso_trigger_width;
-       gpointer session_id;
+       struct mso_prototrig protocol_trigger;
+       void *session_dev_id;
        uint16_t buffer_n;
        char buffer[4096];
 };
@@ -150,7 +150,7 @@ static struct rate_map rate_map[] = {
 };
 
 /* FIXME: Determine corresponding voltages */
-uint16_t la_threshold_map[] = {
+static uint16_t la_threshold_map[] = {
        0x8600,
        0x8770,
        0x88ff,