X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fapi.c;h=fecd593c375f4b4803cc378fef3ef30eca0ff575;hb=67ea60e03db3a4e0fe83f841e81e7e061e9761a6;hp=1fd4df0b8e9388f346540ca6fe6af80b50e58559;hpb=c9404469185faf035390aeb6ced077a70601b756;p=libsigrok.git
diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index 1fd4df0b..fecd593c 100644
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "protocol.h"
@@ -685,8 +686,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
int ret;
@@ -702,7 +702,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
devc->factor /= relays[(devc->cctl[devc->channel - 1] >> 4) & 0x03];
}
devc->frame = 0;
- devc->cb_data = cb_data;
devc->state_known = TRUE;
devc->step = 0;
devc->adc2 = FALSE;
@@ -712,33 +711,29 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
if (ret != SR_OK)
return ret;
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
- sr_session_source_add(sdi->session, 0, 0, 8,
+ sr_session_source_add(sdi->session, -1, 0, 8,
hung_chang_dso_2100_poll, (void *)sdi);
return SR_OK;
}
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi,
- void *cb_data)
+SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi)
{
- struct sr_datafeed_packet packet = { .type = SR_DF_END };
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- sr_session_send(cb_data, &packet);
- sr_session_source_remove(sdi->session, 0);
-
+ std_session_send_df_end(sdi, LOG_PREFIX);
+ sr_session_source_remove(sdi->session, -1);
hung_chang_dso_2100_move_to(sdi, 1);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- return hung_chang_dso_2100_dev_acquisition_stop(sdi, cb_data);
+ return hung_chang_dso_2100_dev_acquisition_stop(sdi);
}
SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {