X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fapi.c;h=791fd5d67c026bc44a7a677cdde5cc54069f37ee;hb=8a63a4064eb5a759dd438e5d1fe9e9d21d7a3e69;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..791fd5d6 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"
@@ -229,11 +230,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
return devices;
}
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
-}
-
static void clear_private(void *priv)
{
struct dev_context *devc = priv;
@@ -310,18 +306,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- struct drv_context *drvc = di->context;
- int ret;
-
- ret = dev_clear(di);
-
- g_free(drvc);
-
- return ret;
-}
-
static int find_in_array(GVariant *data, const GVariantType *type,
const void *arr, int n)
{
@@ -685,8 +669,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 +685,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 +694,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 = {
@@ -746,9 +724,9 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
.longname = "Hung-Chang DSO-2100",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,