X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgwinstek-gds-800%2Fapi.c;h=82fbf958cef0f5451ab8f23a09a50edf916051a2;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hp=1a444b086a7cedd97b2692504f0a437cbfce9450;hpb=7c198f968b8145321e3b7066c2a549b028a6320b;p=libsigrok.git
diff --git a/src/hardware/gwinstek-gds-800/api.c b/src/hardware/gwinstek-gds-800/api.c
index 1a444b08..82fbf958 100644
--- a/src/hardware/gwinstek-gds-800/api.c
+++ b/src/hardware/gwinstek-gds-800/api.c
@@ -17,168 +17,203 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
-SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
+static const uint32_t scanopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+};
-static GSList *scan(struct sr_dev_driver *di, GSList *options)
-{
- struct drv_context *drvc;
- GSList *devices;
+static const uint32_t devopts[] = {
+ SR_CONF_OSCILLOSCOPE,
+ SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+ SR_CONF_SAMPLERATE | SR_CONF_GET,
+};
- (void)options;
+static struct sr_dev_driver gwinstek_gds_800_driver_info;
- devices = NULL;
- drvc = di->context;
- drvc->instances = NULL;
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
+{
+ struct dev_context *devc;
+ struct sr_dev_inst *sdi;
+ struct sr_scpi_hw_info *hw_info;
+ struct sr_channel_group *cg;
+
+ if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+ sr_info("Couldn't get IDN response.");
+ return NULL;
+ }
- /* TODO: scan for devices, either based on a SR_CONF_CONN option
- * or on a USB scan. */
+ if (strcmp(hw_info->manufacturer, "GW") != 0 ||
+ strncmp(hw_info->model, "GDS-8", 5) != 0) {
+ sr_scpi_hw_info_free(hw_info);
+ return NULL;
+ }
- return devices;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->vendor = g_strdup(hw_info->manufacturer);
+ sdi->model = g_strdup(hw_info->model);
+ sdi->version = g_strdup(hw_info->firmware_version);
+ sdi->conn = scpi;
+ sdi->driver = &gwinstek_gds_800_driver_info;
+ sdi->inst_type = SR_INST_SCPI;
+ sdi->serial_num = g_strdup(hw_info->serial_number);
+ sdi->channels = NULL;
+ sdi->channel_groups = NULL;
+
+ sr_scpi_hw_info_free(hw_info);
+
+ devc = g_malloc0(sizeof(struct dev_context));
+ devc->frame_limit = 1;
+ devc->sample_rate = 0.0;
+ devc->df_started = FALSE;
+ sdi->priv = devc;
+
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
+ sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "CH2");
+
+ cg = g_malloc0(sizeof(struct sr_channel_group));
+ cg->name = g_strdup("");
+ cg->channels = g_slist_append(cg->channels, g_slist_nth_data(sdi->channels, 0));
+ cg->channels = g_slist_append(cg->channels, g_slist_nth_data(sdi->channels, 1));
+ cg->priv = NULL;
+ sdi->channel_groups = g_slist_append(NULL, cg);
+
+ return sdi;
}
-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)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return std_dev_clear(di, NULL);
+ return sr_scpi_scan(di->context, options, probe_device);
}
static int dev_open(struct sr_dev_inst *sdi)
{
- (void)sdi;
-
- /* TODO: get handle from sdi->conn and open it. */
+ int ret;
+ struct sr_scpi_dev_inst *scpi = sdi->conn;
- sdi->status = SR_ST_ACTIVE;
+ if ((ret = sr_scpi_open(scpi)) < 0) {
+ sr_err("Failed to open SCPI device: %s.", sr_strerror(ret));
+ return SR_ERR;
+ }
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
- (void)sdi;
-
- /* TODO: get handle from sdi->conn and close it. */
+ struct sr_scpi_dev_inst *scpi;
- sdi->status = SR_ST_INACTIVE;
-
- return SR_OK;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
+ scpi = sdi->conn;
- /* TODO: free other driver resources, if any. */
+ if (!scpi)
+ return SR_ERR_BUG;
- return SR_OK;
+ return sr_scpi_close(scpi);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int ret;
+ struct dev_context *devc;
- (void)sdi;
- (void)data;
(void)cg;
- ret = SR_OK;
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ devc = sdi->priv;
+
switch (key) {
- /* TODO */
+ case SR_CONF_SAMPLERATE:
+ *data = g_variant_new_uint64(devc->sample_rate);
+ break;
default:
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int ret;
+ struct dev_context *devc;
- (void)data;
(void)cg;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ devc = sdi->priv;
- ret = SR_OK;
switch (key) {
- /* TODO */
+ case SR_CONF_LIMIT_FRAMES:
+ devc->frame_limit = g_variant_get_uint64(data);
+ break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int ret;
-
- (void)sdi;
- (void)data;
- (void)cg;
-
- ret = SR_OK;
- switch (key) {
- /* TODO */
- default:
- return SR_ERR_NA;
- }
-
- return ret;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, devopts);
}
-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)
{
- (void)sdi;
- (void)cb_data;
+ struct sr_scpi_dev_inst *scpi;
+ struct dev_context *devc;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ scpi = sdi->conn;
+ devc = sdi->priv;
- /* TODO: configure hardware, reset acquisition state, set up
- * callbacks and send header packet. */
+ devc->state = START_ACQUISITION;
+ devc->cur_acq_frame = 0;
+
+ sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
+ gwinstek_gds_800_receive_data, (void *)sdi);
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)
{
- (void)cb_data;
+ struct sr_scpi_dev_inst *scpi;
+ struct dev_context *devc;
+ struct sr_datafeed_packet packet;
+
+ scpi = sdi->conn;
+ devc = sdi->priv;
+
+ if (devc->df_started) {
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(sdi, &packet);
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ std_session_send_df_end(sdi);
+
+ devc->df_started = FALSE;
+ }
- /* TODO: stop acquisition. */
+ sr_scpi_source_remove(sdi->session, scpi);
return SR_OK;
}
-SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info = {
+static struct sr_dev_driver gwinstek_gds_800_driver_info = {
.name = "gwinstek-gds-800",
- .longname = "gwinstek gds-800",
+ .longname = "GW Instek GDS-800 series",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .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,
@@ -188,3 +223,4 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(gwinstek_gds_800_driver_info);