#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;
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"
/*
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;
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;
}