X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=154d154b7891977958c260349c5294feb80d69eb;hb=658636f1c934b5b865efd0b4a8202603c577dd0b;hp=e340e5408eb0b7a13c3a5d282ecb228dd2e9e26e;hpb=fbec8bd2f3ead02358df65240c2cf786c8267f54;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index e340e540..154d154b 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010-2012 Håvard Espeland , * Copyright (C) 2010 Martin Stensgård @@ -37,14 +37,14 @@ #define USB_VENDOR_NAME "ASIX" #define USB_MODEL_NAME "SIGMA" #define USB_MODEL_VERSION "" -#define TRIGGER_TYPES "rf10" +#define TRIGGER_TYPE "rf10" #define NUM_PROBES 16 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 supported_samplerates[] = { +static const uint64_t samplerates[] = { SR_KHZ(200), SR_KHZ(250), SR_KHZ(500), @@ -55,7 +55,6 @@ static const uint64_t supported_samplerates[] = { SR_MHZ(50), SR_MHZ(100), SR_MHZ(200), - 0, }; /* @@ -69,20 +68,11 @@ static const char *probe_names[NUM_PROBES + 1] = { NULL, }; -static const struct sr_samplerates samplerates = { - 0, - 0, - 0, - supported_samplerates, -}; - -static const int hwcaps[] = { +static const int32_t hwcaps[] = { SR_CONF_LOGIC_ANALYZER, SR_CONF_SAMPLERATE, SR_CONF_CAPTURE_RATIO, - SR_CONF_LIMIT_MSEC, - 0, }; /* Force the FPGA to reboot. */ @@ -91,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, }; @@ -408,7 +398,7 @@ static int clear_instances(void) } if (sdi->priv) { devc = sdi->priv; - ftdi_free(&devc->ftdic); + ftdi_deinit(&devc->ftdic); } sr_dev_inst_free(sdi); } @@ -418,21 +408,12 @@ static int clear_instances(void) return SR_OK; } -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - drvc->sr_ctx = sr_ctx; - di->priv = drvc; - - return SR_OK; + return std_hw_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; @@ -447,8 +428,8 @@ static GSList *hw_scan(GSList *options) (void)options; drvc = di->priv; + devices = NULL; - clear_instances(); if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { sr_err("%s: devc malloc failed", __func__); @@ -518,13 +499,9 @@ free: return NULL; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int upload_firmware(int firmware_idx, struct dev_context *devc) @@ -564,7 +541,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); @@ -621,7 +598,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; @@ -645,16 +622,18 @@ static int hw_dev_open(struct sr_dev_inst *sdi) static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) { - int i, ret; - struct dev_context *devc = sdi->priv; + struct dev_context *devc; + unsigned int i; + int ret; + devc = sdi->priv; ret = SR_OK; - for (i = 0; supported_samplerates[i]; i++) { - if (supported_samplerates[i] == samplerate) + for (i = 0; i < ARRAY_SIZE(samplerates); i++) { + if (samplerates[i] == samplerate) break; } - if (supported_samplerates[i] == 0) + if (samplerates[i] == 0) return SR_ERR_SAMPLERATE; if (samplerate <= SR_MHZ(50)) { @@ -759,14 +738,11 @@ 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; - if (!(devc = sdi->priv)) { - sr_err("%s: sdi->priv was NULL", __func__); - return SR_ERR_BUG; - } + devc = sdi->priv; /* TODO */ if (sdi->status == SR_ST_ACTIVE) @@ -777,7 +753,7 @@ 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; @@ -787,70 +763,80 @@ static int hw_cleanup(void) return SR_OK; } -static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; switch (id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_TRIGGER_TYPES: - *data = (char *)TRIGGER_TYPES; - break; - case SR_DI_CUR_SAMPLERATE: + case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; - *data = &devc->cur_samplerate; + *data = g_variant_new_uint64(devc->cur_samplerate); } else return SR_ERR; break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { struct dev_context *devc; int ret; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + devc = sdi->priv; if (id == SR_CONF_SAMPLERATE) { - ret = set_samplerate(sdi, *(const uint64_t *)value); + ret = set_samplerate(sdi, g_variant_get_uint64(data)); } else if (id == SR_CONF_LIMIT_MSEC) { - devc->limit_msec = *(const uint64_t *)value; + devc->limit_msec = g_variant_get_uint64(data); if (devc->limit_msec > 0) ret = SR_OK; else ret = SR_ERR; } else if (id == SR_CONF_CAPTURE_RATIO) { - devc->capture_ratio = *(const uint64_t *)value; + devc->capture_ratio = g_variant_get_uint64(data); if (devc->capture_ratio < 0 || devc->capture_ratio > 100) ret = SR_ERR; else ret = SR_OK; } else { - ret = SR_ERR; + ret = SR_ERR_NA; } return ret; } -static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { + GVariant *gvar; + GVariantBuilder gvb; (void)sdi; switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; case SR_CONF_SAMPLERATE: - *data = &samplerates; + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, + ARRAY_SIZE(samplerates), sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); + *data = g_variant_builder_end(&gvb); + break; + case SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; @@ -954,7 +940,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples + sent; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); sent += tosend; } @@ -997,7 +983,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); sent += tosend; } @@ -1005,7 +991,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, /* Only send trigger if explicitly enabled. */ if (devc->use_triggers) { packet.type = SR_DF_TRIGGER; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); } } @@ -1018,7 +1004,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples + sent; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); } *lastsample = samples[n - 1]; @@ -1058,7 +1044,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); } @@ -1066,7 +1052,7 @@ static int receive_data(int fd, int revents, void *cb_data) if (devc->state.chunks_downloaded >= numchunks) { /* End of samples. */ packet.type = SR_DF_END; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); devc->state.state = SIGMA_IDLE; @@ -1276,18 +1262,18 @@ 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 sr_datafeed_packet *packet; - struct sr_datafeed_header *header; struct clockselect_50 clockselect; int frac, triggerpin, ret; uint8_t triggerselect = 0; struct triggerinout triggerinout_conf; struct triggerlut lut; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + devc = sdi->priv; if (configure_probes(sdi) != SR_OK) { @@ -1373,37 +1359,20 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, gettimeofday(&devc->start_tv, 0); sigma_set_register(WRITE_MODE, 0x0d, devc); - devc->session_dev_id = cb_data; - - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("%s: packet malloc failed.", __func__); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("%s: header malloc failed.", __func__); - return SR_ERR_MALLOC; - } + devc->cb_data = cb_data; /* Send header packet to the session bus. */ - packet->type = SR_DF_HEADER; - packet->payload = header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(devc->session_dev_id, packet); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Add capture source. */ sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi); - g_free(header); - g_free(packet); - devc->state.state = SIGMA_CAPTURE; 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; @@ -1444,17 +1413,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, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, .dev_clear = clear_instances, .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, };