X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=5b39f0a25a27c9f18f3b7fb6e122eee4c0238048;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=125f9cd9f47383c3f1cad249af51f01546f0e67e;hpb=50c604f50bf33e68ac67caa8ebad20b87b3aacc1;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 125f9cd9..5b39f0a2 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -42,7 +42,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info; static struct sr_dev_driver *di = &asix_sigma_driver_info; -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); static const uint64_t samplerates[] = { SR_KHZ(200), @@ -81,7 +81,7 @@ static uint8_t suicide[] = { }; /* Prepare to upload firmware (FPGA specific). */ -static uint8_t init[] = { +static uint8_t init_array[] = { 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, }; @@ -380,40 +380,26 @@ static int bin2bitbang(const char *filename, return SR_OK; } -static int clear_instances(void) +static void clear_helper(void *priv) { - GSList *l; - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - drvc = di->priv; + devc = priv; - /* Properly close all devices. */ - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi was NULL, continuing", __func__); - continue; - } - if (sdi->priv) { - devc = sdi->priv; - ftdi_deinit(&devc->ftdic); - } - sr_dev_inst_free(sdi); - } - g_slist_free(drvc->instances); - drvc->instances = NULL; + ftdi_deinit(&devc->ftdic); +} - return SR_OK; +static int dev_clear(void) +{ + return std_dev_clear(di, clear_helper); } -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { struct sr_dev_inst *sdi; struct sr_probe *probe; @@ -499,7 +485,7 @@ free: return NULL; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { return ((struct drv_context *)(di->priv))->instances; } @@ -541,7 +527,7 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) sigma_write(suicide, sizeof(suicide), devc); /* Prepare to upload firmware (FPGA specific). */ - sigma_write(init, sizeof(init), devc); + sigma_write(init_array, sizeof(init_array), devc); ftdi_usb_purge_buffers(&devc->ftdic); @@ -598,7 +584,7 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) return SR_OK; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; int ret; @@ -738,7 +724,7 @@ static int configure_probes(const struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -753,20 +739,18 @@ static int hw_dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - if (!di->priv) - return SR_OK; - - clear_instances(); - - return SR_OK; + return dev_clear(); } -static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; + (void)cg; + switch (id) { case SR_CONF_SAMPLERATE: if (sdi) { @@ -782,11 +766,14 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) return SR_OK; } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; int ret; + (void)cg; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -813,12 +800,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) return ret; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { GVariant *gvar; GVariantBuilder gvb; (void)sdi; + (void)cg; switch (key) { case SR_CONF_DEVICE_OPTIONS: @@ -1044,7 +1033,7 @@ static int receive_data(int fd, int revents, void *cb_data) if (running_msec < devc->limit_msec && numchunks < 32767) return TRUE; /* While capturing... */ else - hw_dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi, sdi); } @@ -1072,7 +1061,7 @@ static int receive_data(int fd, int revents, void *cb_data) /* Find first ts. */ if (devc->state.chunks_downloaded == 0) { - devc->state.lastts = *(uint16_t *) buf - 1; + devc->state.lastts = RL16(buf) - 1; devc->state.lastsample = 0; } @@ -1262,8 +1251,7 @@ static int build_basic_trigger(struct triggerlut *lut, struct dev_context *devc) return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; struct clockselect_50 clockselect; @@ -1363,7 +1351,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->cb_data = cb_data; /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Add capture source. */ sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi); @@ -1373,7 +1361,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; uint8_t modestatus; @@ -1414,17 +1402,17 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .name = "asix-sigma", .longname = "ASIX SIGMA/SIGMA2", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };