X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=9175a1cb3d21462322c6b2a246c853055f3cfd2e;hb=0ca21631dda3d948f8a67de5d48a2198b1efa425;hp=d5f9d5549b7577772f5e286bd092cfea9d25f965;hpb=c09f0b578c0e9c03590cb814f66004bb3f6815ff;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index d5f9d554..9175a1cb 100644 --- a/session_driver.c +++ b/session_driver.c @@ -120,7 +120,7 @@ static int feed_chunk(int fd, int revents, void *session_data) logic.unitsize = vdev->unitsize; logic.data = buf; vdev->bytes_read += ret; - sr_session_bus(session_data, &packet); + sr_session_send(session_data, &packet); } else { /* done with this capture file */ zip_fclose(vdev->capfile); @@ -132,7 +132,7 @@ static int feed_chunk(int fd, int revents, void *session_data) if (!got_data) { packet.type = SR_DF_END; - sr_session_bus(session_data, &packet); + sr_session_send(session_data, &packet); } return TRUE; @@ -157,7 +157,6 @@ static int hw_init(const char *devinfo) /** * TODO. - * */ static int hw_cleanup(void) { @@ -269,7 +268,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) return SR_OK; } -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 zip_stat zs; struct session_vdev *vdev; @@ -324,7 +323,7 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id) gettimeofday(&header->starttime, NULL); header->samplerate = vdev->samplerate; header->num_logic_probes = vdev->num_probes; - sr_session_bus(session_dev_id, packet); + sr_session_send(session_dev_id, packet); g_free(header); g_free(packet);