X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=2d21f46d06e4afba451d4c40c3861850aab557e3;hb=9b2b3ef93e9821ffc9edc1c8bdd929c0143939dd;hp=f2cfce3dfd219118592a1ebeb125fcef53dfb85a;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c index f2cfce3d..2d21f46d 100644 --- a/src/hardware/beaglelogic/api.c +++ b/src/hardware/beaglelogic/api.c @@ -21,14 +21,16 @@ #include "protocol.h" #include "beaglelogic.h" -/* Scan options */ static const uint32_t scanopts[] = { + SR_CONF_CONN, 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, @@ -37,8 +39,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, @@ -67,6 +68,7 @@ static struct dev_context *beaglelogic_devc_alloc(void) /* Default non-zero values (if any) */ devc->fd = -1; devc->limit_samples = (uint64_t)-1; + devc->tcp_buffer = 0; return devc; } @@ -77,49 +79,66 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) struct sr_config *src; struct sr_dev_inst *sdi; struct dev_context *devc; + const char *conn = NULL; + gchar **params; int i, maxch; - /* 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"); - - /* 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); + if (src->key == SR_CONF_CONN) + conn = g_variant_get_string(src->data, NULL); } - /* 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; + /* Probe for /dev/beaglelogic if not connecting via TCP */ + if (conn == NULL) { + if (!g_file_test(BEAGLELOGIC_DEV_NODE, G_FILE_TEST_EXISTS)) + return NULL; + } else { + params = g_strsplit(conn, "/", 0); + if (!params || !params[1] || !params[2]) { + sr_err("Invalid Parameters."); + g_strfreev(params); + return NULL; + } + if (g_ascii_strncasecmp(params[0], "tcp", 3)) { + sr_err("Only TCP (tcp-raw) protocol is currently supported."); + g_strfreev(params); + 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(); + if (conn == NULL) { + devc->beaglelogic = &beaglelogic_native_ops; + sr_info("BeagleLogic device found at "BEAGLELOGIC_DEV_NODE); + } else { + devc->read_timeout = 1000 * 1000; + devc->beaglelogic = &beaglelogic_tcp_ops; + devc->address = g_strdup(params[1]); + devc->port = g_strdup(params[2]); + g_strfreev(params); + + if (devc->beaglelogic->open(devc) != SR_OK) + goto err_free; + if (beaglelogic_tcp_detect(devc) != SR_OK) + goto err_free; + sr_info("BeagleLogic device found at %s : %s", + devc->address, devc->port); + } /* Fill the channels */ for (i = 0; i < maxch; i++) sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, @@ -128,6 +147,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->priv = devc; return std_scan_complete(di, g_slist_append(NULL, sdi)); +err_free: + g_free(sdi->model); + g_free(sdi->version); + g_free(devc); + g_free(sdi); + + return NULL; } static int dev_open(struct sr_dev_inst *sdi) @@ -135,26 +161,38 @@ static int dev_open(struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; /* Open BeagleLogic */ - if (beaglelogic_open_nonblock(devc)) - return SR_ERR; + if (devc->beaglelogic == &beaglelogic_native_ops) + if (devc->beaglelogic->open(devc)) + return SR_ERR; /* Set fd and local attributes */ - devc->pollfd.fd = devc->fd; + if (devc->beaglelogic == &beaglelogic_tcp_ops) + devc->pollfd.fd = devc->socket; + else + devc->pollfd.fd = devc->fd; devc->pollfd.events = G_IO_IN; devc->pollfd.revents = 0; /* Get the default attributes */ - beaglelogic_get_samplerate(devc); - beaglelogic_get_sampleunit(devc); - beaglelogic_get_triggerflags(devc); - beaglelogic_get_buffersize(devc); - beaglelogic_get_bufunitsize(devc); + devc->beaglelogic->get_samplerate(devc); + devc->beaglelogic->get_sampleunit(devc); + devc->beaglelogic->get_buffersize(devc); + 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; + devc->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"); - beaglelogic_close(devc); - return SR_ERR; + if (devc->beaglelogic == &beaglelogic_native_ops) { + if (devc->beaglelogic->mmap(devc) != SR_OK) { + sr_err("Unable to map capture buffer"); + devc->beaglelogic->close(devc); + return SR_ERR; + } + } else { + devc->tcp_buffer = g_malloc(TCP_BUFFER_SIZE); } return SR_OK; @@ -165,14 +203,18 @@ static int dev_close(struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; /* Close the memory mapping and the file */ - beaglelogic_munmap(devc); - beaglelogic_close(devc); + if (devc->beaglelogic == &beaglelogic_native_ops) + devc->beaglelogic->munmap(devc); + devc->beaglelogic->close(devc); + + if (devc->tcp_buffer) + g_free(devc->tcp_buffer); 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; @@ -198,8 +240,8 @@ 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; @@ -209,7 +251,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_SAMPLERATE: devc->cur_samplerate = g_variant_get_uint64(data); - return beaglelogic_set_samplerate(devc); + return devc->beaglelogic->set_samplerate(devc); case SR_CONF_LIMIT_SAMPLES: tmp_u64 = g_variant_get_uint64(data); devc->limit_samples = tmp_u64; @@ -221,17 +263,15 @@ 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)); } - return beaglelogic_set_triggerflags(devc); + return devc->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; } @@ -239,27 +279,18 @@ 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) { - GVariant *gvar; - GVariantBuilder gvb; - switch (key) { case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, devopts); + 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; @@ -275,22 +306,29 @@ 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; + 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; - beaglelogic_set_sampleunit(devc); + 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; + } + devc->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; @@ -300,9 +338,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) std_session_send_df_header(sdi); /* Trigger and add poll on file */ - beaglelogic_start(devc); - sr_session_source_add_pollfd(sdi->session, &devc->pollfd, - BUFUNIT_TIMEOUT_MS(devc), beaglelogic_receive_data, + devc->beaglelogic->start(devc); + if (devc->beaglelogic == &beaglelogic_native_ops) + sr_session_source_add_pollfd(sdi->session, &devc->pollfd, + BUFUNIT_TIMEOUT_MS(devc), beaglelogic_native_receive_data, + (void *)sdi); + else + sr_session_source_add_pollfd(sdi->session, &devc->pollfd, + BUFUNIT_TIMEOUT_MS(devc), beaglelogic_tcp_receive_data, (void *)sdi); return SR_OK; @@ -313,10 +356,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; /* Execute a stop on BeagleLogic */ - beaglelogic_stop(devc); + devc->beaglelogic->stop(devc); /* lseek to offset 0, flushes the cache */ - lseek(devc->fd, 0, SEEK_SET); + if (devc->beaglelogic == &beaglelogic_native_ops) + lseek(devc->fd, 0, SEEK_SET); /* Remove session source and send EOT packet */ sr_session_source_remove_pollfd(sdi->session, &devc->pollfd);