sr: Name all callback data 'cb_data'.

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

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index c3dc19bd934865109902f7d1d39f57a60d646158..0e44338f04f84bd87d5d51817f1c174600a5c0c2 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -48,6 +48,11 @@ static int hwcaps[] = {
        0,
 };
 
+/*
+ * Probes are numbered 0 to 7.
+ *
+ * See also: http://www.linkinstruments.com/images/mso19_1113.gif
+ */
 static const char *probe_names[NUM_PROBES + 1] = {
        "0",
        "1",
@@ -676,9 +681,9 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 #define MSO_TRIGGER_DATAREADY  '6'
 
 /* FIXME: Pass errors? */
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *cb_data)
 {
-       struct sr_dev_inst *sdi = user_data;
+       struct sr_dev_inst *sdi = cb_data;
        struct context *ctx = sdi->priv;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
@@ -726,7 +731,7 @@ static int receive_data(int fd, int revents, void *user_data)
        logic.length = 1024;
        logic.unitsize = 1;
        logic.data = logic_out;
-       sr_session_bus(ctx->session_id, &packet);
+       sr_session_send(ctx->session_id, &packet);
 
        // Dont bother fixing this yet, keep it "old style"
        /*
@@ -734,16 +739,16 @@ static int receive_data(int fd, int revents, void *user_data)
        packet.length = 1024;
        packet.unitsize = sizeof(double);
        packet.payload = analog_out;
-       sr_session_bus(ctx->session_id, &packet);
+       sr_session_send(ctx->session_id, &packet);
        */
 
        packet.type = SR_DF_END;
-       sr_session_bus(ctx->session_id, &packet);
+       sr_session_send(ctx->session_id, &packet);
 
        return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
@@ -811,25 +816,25 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
        header.samplerate = ctx->cur_rate;
        // header.num_analog_probes = 1;
        header.num_logic_probes = 8;
-       sr_session_bus(session_dev_id, &packet);
+       sr_session_send(session_dev_id, &packet);
 
        return ret;
 }
 
 /* FIXME */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id)
 {
        struct sr_datafeed_packet packet;
 
        dev_index = dev_index;
 
        packet.type = SR_DF_END;
-       sr_session_bus(session_dev_id, &packet);
+       sr_session_send(session_dev_id, &packet);
 
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = {
+SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
        .name = "link-mso19",
        .longname = "Link Instruments MSO-19",
        .api_version = 1,