X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=d93f4af3da915a5d1954a2c7a09929595e2c1d67;hb=88d2037bcac00ba081ad450434acd2bee7beedfc;hp=2285c193b266a098cad64e0073be38df66cdff70;hpb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;p=libsigrok.git diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c index 2285c193..d93f4af3 100644 --- a/src/hardware/beaglelogic/api.c +++ b/src/hardware/beaglelogic/api.c @@ -21,16 +21,15 @@ #include "protocol.h" #include "beaglelogic.h" -SR_PRIV struct sr_dev_driver beaglelogic_driver_info; - -/* Scan options */ static const uint32_t scanopts[] = { SR_CONF_NUM_LOGIC_CHANNELS, }; -/* Hardware capabilities */ -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET, @@ -39,8 +38,7 @@ static const uint32_t devopts[] = { SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET, }; -/* Trigger matching capabilities */ -static const int32_t soft_trigger_matches[] = { +static const int32_t trigger_matches[] = { SR_TRIGGER_ZERO, SR_TRIGGER_ONE, SR_TRIGGER_RISING, @@ -60,11 +58,6 @@ static const uint64_t samplerates[] = { SR_HZ(1), }; -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static struct dev_context *beaglelogic_devc_alloc(void) { struct dev_context *devc; @@ -80,79 +73,45 @@ static struct dev_context *beaglelogic_devc_alloc(void) static GSList *scan(struct sr_dev_driver *di, GSList *options) { - struct drv_context *drvc; - GSList *devices, *l; + GSList *l; struct sr_config *src; struct sr_dev_inst *sdi; struct dev_context *devc; int i, maxch; - devices = NULL; - drvc = di->context; - drvc->instances = NULL; - /* Probe for /dev/beaglelogic */ if (!g_file_test(BEAGLELOGIC_DEV_NODE, G_FILE_TEST_EXISTS)) return NULL; - sdi = g_malloc0(sizeof(struct sr_dev_inst)); - sdi->status = SR_ST_INACTIVE; - sdi->model = g_strdup("BeagleLogic"); - sdi->version = g_strdup("1.0"); - sdi->driver = di; - - /* Unless explicitly specified, keep max channels to 8 only */ - maxch = 8; + maxch = NUM_CHANNELS; for (l = options; l; l = l->next) { src = l->data; if (src->key == SR_CONF_NUM_LOGIC_CHANNELS) maxch = g_variant_get_int32(src->data); } - /* We need to test for number of channels by opening the node */ - devc = beaglelogic_devc_alloc(); - - if (beaglelogic_open_nonblock(devc) != SR_OK) { - g_free(devc); - sr_dev_inst_free(sdi); - - return NULL; - } - - if (maxch > 8) { + if (maxch > 8) maxch = NUM_CHANNELS; - devc->sampleunit = BL_SAMPLEUNIT_16_BITS; - } else { + else maxch = 8; - devc->sampleunit = BL_SAMPLEUNIT_8_BITS; - } - beaglelogic_set_sampleunit(devc); - beaglelogic_close(devc); + sdi = g_new0(struct sr_dev_inst, 1); + sdi->status = SR_ST_INACTIVE; + sdi->model = g_strdup("BeagleLogic"); + sdi->version = g_strdup("1.0"); - /* Signal */ - sr_info("BeagleLogic device found at "BEAGLELOGIC_DEV_NODE); + devc = beaglelogic_devc_alloc(); - /* Fill the channels */ for (i = 0; i < maxch; i++) sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_names[i]); sdi->priv = devc; - drvc->instances = g_slist_append(drvc->instances, sdi); - devices = g_slist_append(devices, sdi); - return devices; -} + /* Signal */ + sr_info("BeagleLogic device found at "BEAGLELOGIC_DEV_NODE); -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - -static int dev_clear(const struct sr_dev_driver *di) -{ - return std_dev_clear(di, NULL); + return std_scan_complete(di, g_slist_append(NULL, sdi)); } static int dev_open(struct sr_dev_inst *sdi) @@ -171,10 +130,14 @@ static int dev_open(struct sr_dev_inst *sdi) /* Get the default attributes */ beaglelogic_get_samplerate(devc); beaglelogic_get_sampleunit(devc); - beaglelogic_get_triggerflags(devc); beaglelogic_get_buffersize(devc); beaglelogic_get_bufunitsize(devc); + /* Set the triggerflags to default for continuous capture unless we + * explicitly limit samples using SR_CONF_LIMIT_SAMPLES */ + devc->triggerflags = BL_TRIGGERFLAGS_CONTINUOUS; + beaglelogic_set_triggerflags(devc); + /* Map the kernel capture FIFO for reads, saves 1 level of memcpy */ if (beaglelogic_mmap(devc) != SR_OK) { sr_err("Unable to map capture buffer"); @@ -182,8 +145,6 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; } - /* We're good to go now */ - sdi->status = SR_ST_ACTIVE; return SR_OK; } @@ -191,17 +152,15 @@ static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - if (sdi->status == SR_ST_ACTIVE) { - /* Close the memory mapping and the file */ - beaglelogic_munmap(devc); - beaglelogic_close(devc); - } - sdi->status = SR_ST_INACTIVE; + /* Close the memory mapping and the file */ + beaglelogic_munmap(devc); + beaglelogic_close(devc); + return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc = sdi->priv; @@ -227,17 +186,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc = sdi->priv; uint64_t tmp_u64; (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - switch (key) { case SR_CONF_SAMPLERATE: devc->cur_samplerate = g_variant_get_uint64(data); @@ -253,7 +209,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd sr_warn("Insufficient buffer space has been allocated."); sr_warn("Please use \'echo > "\ BEAGLELOGIC_SYSFS_ATTR(memalloc) \ - "\' as root to increase the buffer size, this"\ + "\' to increase the buffer size, this"\ " capture is now truncated to %d Msamples", devc->buffersize / (SAMPLEUNIT_TO_BYTES(devc->sampleunit) * 1000000)); @@ -261,9 +217,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return beaglelogic_set_triggerflags(devc); case SR_CONF_CAPTURE_RATIO: devc->capture_ratio = g_variant_get_uint64(data); - if (devc->capture_ratio > 100) - return SR_ERR; - return SR_OK; + break; default: return SR_ERR_NA; } @@ -271,43 +225,24 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret; - GVariant *gvar; - GVariantBuilder gvb; - - (void)sdi; - (void)cg; - - ret = SR_OK; switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_SAMPLERATE: - 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}", "samplerate-steps", gvar); - *data = g_variant_builder_end(&gvb); + *data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates)); break; case SR_CONF_TRIGGER_MATCH: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches), - sizeof(int32_t)); + *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); break; default: return SR_ERR_NA; } - return ret; + return SR_OK; } /* get a sane timeout for poll() */ @@ -317,32 +252,36 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; + GSList *l; struct sr_trigger *trigger; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + struct sr_channel *channel; /* Clear capture state */ devc->bytes_read = 0; devc->offset = 0; /* Configure channels */ - devc->sampleunit = g_slist_length(sdi->channels) > 8 ? - BL_SAMPLEUNIT_16_BITS : BL_SAMPLEUNIT_8_BITS; + devc->sampleunit = BL_SAMPLEUNIT_8_BITS; + + for (l = sdi->channels; l; l = l->next) { + channel = l->data; + if (channel->index >= 8 && channel->enabled) + devc->sampleunit = BL_SAMPLEUNIT_16_BITS; + } beaglelogic_set_sampleunit(devc); /* Configure triggers & send header packet */ if ((trigger = sr_session_trigger_get(sdi->session))) { int pre_trigger_samples = 0; if (devc->limit_samples > 0) - pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100; + pre_trigger_samples = (devc->capture_ratio * devc->limit_samples) / 100; devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples); if (!devc->stl) return SR_ERR_MALLOC; devc->trigger_fired = FALSE; } else devc->trigger_fired = TRUE; - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* Trigger and add poll on file */ beaglelogic_start(devc); @@ -357,9 +296,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - /* Execute a stop on BeagleLogic */ beaglelogic_stop(devc); @@ -368,20 +304,20 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) /* Remove session source and send EOT packet */ sr_session_source_remove_pollfd(sdi->session, &devc->pollfd); - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); return SR_OK; } -SR_PRIV struct sr_dev_driver beaglelogic_driver_info = { +static struct sr_dev_driver beaglelogic_driver_info = { .name = "beaglelogic", .longname = "BeagleLogic", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list, @@ -391,3 +327,4 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(beaglelogic_driver_info);