X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=b89de8d8a096a393b07cf15f8c4bbd8f3b23435c;hb=17d5a11c69ebd7dd0a62a6e2466d3d8ce05b9d03;hp=7f3d5f549321e0cc6025ee16f7a20624b3da1e44;hpb=db81fbb58261825e03aadaf20cff794e4c65401a;p=libsigrok.git
diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 7f3d5f54..b89de8d8 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -17,19 +17,25 @@
* along with this program. If not, see .
*/
+#include
#include
+#include "scpi.h"
#include "protocol.h"
#define SERIALCOMM "115200/8n1/flow=1"
SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
-static struct sr_dev_driver *di = &hameg_hmo_driver_info;
static const char *manufacturers[] = {
"HAMEG",
+ "Rohde&Schwarz",
};
-static const int32_t scanopts[] = {
+static const uint32_t drvopts[] = {
+ SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@@ -41,16 +47,11 @@ enum {
CG_DIGITAL,
};
-static int init(struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static int check_manufacturer(const char *manufacturer)
{
unsigned int i;
- for (i = 0; i < ARRAY_SIZE(manufacturers); ++i)
+ for (i = 0; i < ARRAY_SIZE(manufacturers); i++)
if (!strcmp(manufacturer, manufacturers[i]))
return SR_OK;
@@ -75,29 +76,25 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
if (check_manufacturer(hw_info->manufacturer) != SR_OK)
goto fail;
- if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
- hw_info->manufacturer, hw_info->model,
- hw_info->firmware_version))) {
- goto fail;
- }
+ 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->serial_num = g_strdup(hw_info->serial_number);
+ sdi->driver = &hameg_hmo_driver_info;
+ sdi->inst_type = SR_INST_SCPI;
+ sdi->conn = scpi;
+
sr_scpi_hw_info_free(hw_info);
hw_info = NULL;
- if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
- goto fail;
+ devc = g_malloc0(sizeof(struct dev_context));
- sdi->driver = di;
sdi->priv = devc;
- sdi->inst_type = SR_INST_SCPI;
- sdi->conn = scpi;
if (hmo_init_device(sdi) != SR_OK)
goto fail;
- sr_scpi_close(sdi->conn);
-
- sdi->status = SR_ST_INACTIVE;
-
return sdi;
fail:
@@ -105,48 +102,31 @@ fail:
sr_scpi_hw_info_free(hw_info);
if (sdi)
sr_dev_inst_free(sdi);
- if (devc)
- g_free(devc);
+ g_free(devc);
return NULL;
}
-static GSList *scan(GSList *options)
-{
- return sr_scpi_scan(di->priv, options, hmo_probe_serial_device);
-}
-
-static GSList *dev_list(void)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return sr_scpi_scan(di->context, options, hmo_probe_serial_device);
}
static void clear_helper(void *priv)
{
- unsigned int i;
struct dev_context *devc;
- struct scope_config *model;
devc = priv;
- model = devc->model_config;
hmo_scope_state_free(devc->model_state);
- for (i = 0; i < model->analog_channels; ++i)
- g_slist_free(devc->analog_groups[i].channels);
-
- for (i = 0; i < model->digital_pods; ++i) {
- g_slist_free(devc->digital_groups[i].channels);
- g_free(devc->digital_groups[i].name);
- }
-
g_free(devc->analog_groups);
g_free(devc->digital_groups);
g_free(devc);
}
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear(di, clear_helper);
}
@@ -176,30 +156,23 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
-{
- dev_clear();
-
- return SR_OK;
-}
-
static int check_channel_group(struct dev_context *devc,
const struct sr_channel_group *cg)
{
unsigned int i;
- struct scope_config *model;
+ const struct scope_config *model;
model = devc->model_config;
if (!cg)
return CG_NONE;
- for (i = 0; i < model->analog_channels; ++i)
- if (cg == &devc->analog_groups[i])
+ for (i = 0; i < model->analog_channels; i++)
+ if (cg == devc->analog_groups[i])
return CG_ANALOG;
- for (i = 0; i < model->digital_pods; ++i)
- if (cg == &devc->digital_groups[i])
+ for (i = 0; i < model->digital_pods; i++)
+ if (cg == devc->digital_groups[i])
return CG_DIGITAL;
sr_err("Invalid channel group specified.");
@@ -207,13 +180,13 @@ static int check_channel_group(struct dev_context *devc,
return CG_INVALID;
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
int ret, cg_type;
unsigned int i;
struct dev_context *devc;
- struct scope_config *model;
+ const struct scope_config *model;
struct scope_state *state;
if (!sdi || !(devc = sdi->priv))
@@ -227,7 +200,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
state = devc->model_state;
switch (key) {
- case SR_CONF_NUM_TIMEBASE:
+ case SR_CONF_NUM_HDIV:
*data = g_variant_new_int32(model->num_xdivs);
ret = SR_OK;
break;
@@ -241,8 +214,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
sr_err("No channel group specified.");
return SR_ERR_CHANNEL_GROUP;
} else if (cg_type == CG_ANALOG) {
- for (i = 0; i < model->analog_channels; ++i) {
- if (cg != &devc->analog_groups[i])
+ for (i = 0; i < model->analog_channels; i++) {
+ if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new_int32(model->num_ydivs);
ret = SR_OK;
@@ -258,8 +231,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
sr_err("No channel group specified.");
return SR_ERR_CHANNEL_GROUP;
} else if (cg_type == CG_ANALOG) {
- for (i = 0; i < model->analog_channels; ++i) {
- if (cg != &devc->analog_groups[i])
+ for (i = 0; i < model->analog_channels; i++) {
+ if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new("(tt)",
(*model->vdivs)[state->analog_channels[i].vdiv][0],
@@ -289,8 +262,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
sr_err("No channel group specified.");
return SR_ERR_CHANNEL_GROUP;
} else if (cg_type == CG_ANALOG) {
- for (i = 0; i < model->analog_channels; ++i) {
- if (cg != &devc->analog_groups[i])
+ for (i = 0; i < model->analog_channels; i++) {
+ if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
ret = SR_OK;
@@ -331,14 +304,14 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
return g_variant_builder_end(&gvb);
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
int ret, cg_type;
unsigned int i, j;
char command[MAX_COMMAND_SIZE], float_str[30];
struct dev_context *devc;
- struct scope_config *model;
+ const struct scope_config *model;
struct scope_state *state;
const char *tmp;
uint64_t p, q;
@@ -388,8 +361,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
if (p != (*model->vdivs)[i][0] ||
q != (*model->vdivs)[i][1])
continue;
- for (j = 1; j <= model->analog_channels; ++j) {
- if (cg != &devc->analog_groups[j - 1])
+ for (j = 1; j <= model->analog_channels; j++) {
+ if (cg != devc->analog_groups[j - 1])
continue;
state->analog_channels[j - 1].vdiv = i;
g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -447,17 +420,17 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
break;
case SR_CONF_TRIGGER_SLOPE:
tmp = g_variant_get_string(data, NULL);
+ for (i = 0; (*model->trigger_slopes)[i]; i++) {
+ if (g_strcmp0(tmp, (*model->trigger_slopes)[i]) != 0)
+ continue;
+ state->trigger_slope = i;
+ g_snprintf(command, sizeof(command),
+ (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
+ (*model->trigger_slopes)[i]);
- if (!tmp || !(tmp[0] == 'f' || tmp[0] == 'r'))
- return SR_ERR_ARG;
-
- state->trigger_slope = (tmp[0] == 'r') ? 0 : 1;
-
- g_snprintf(command, sizeof(command),
- (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
- (state->trigger_slope == 0) ? "POS" : "NEG");
-
- ret = sr_scpi_send(sdi->conn, command);
+ ret = sr_scpi_send(sdi->conn, command);
+ break;
+ }
break;
case SR_CONF_COUPLING:
if (cg_type == CG_NONE) {
@@ -470,8 +443,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
for (i = 0; (*model->coupling_options)[i]; i++) {
if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
continue;
- for (j = 1; j <= model->analog_channels; ++j) {
- if (cg != &devc->analog_groups[j - 1])
+ for (j = 1; j <= model->analog_channels; j++) {
+ if (cg != devc->analog_groups[j - 1])
continue;
state->analog_channels[j-1].coupling = i;
@@ -503,38 +476,40 @@ static int config_set(int key, 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(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int cg_type;
- struct dev_context *devc;
- struct scope_config *model;
-
- if (!sdi || !(devc = sdi->priv))
- return SR_ERR_ARG;
+ int cg_type = CG_NONE;
+ struct dev_context *devc = NULL;
+ const struct scope_config *model = NULL;
- if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
- return SR_ERR;
+ if (sdi && (devc = sdi->priv)) {
+ if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
+ return SR_ERR;
- model = devc->model_config;
+ model = devc->model_config;
+ }
switch (key) {
case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
if (cg_type == CG_NONE) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- model->hw_caps, model->num_hwcaps,
- sizeof(int32_t));
+ if (model)
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ model->devopts, model->num_devopts, sizeof(uint32_t));
+ else
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
} else if (cg_type == CG_ANALOG) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- model->analog_hwcaps, model->num_analog_hwcaps,
- sizeof(int32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ model->analog_devopts, model->num_analog_devopts,
+ sizeof(uint32_t));
} else {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- NULL, 0, sizeof(int32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ NULL, 0, sizeof(uint32_t));
}
break;
case SR_CONF_COUPLING:
@@ -544,14 +519,20 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
g_strv_length((char **)*model->coupling_options));
break;
case SR_CONF_TRIGGER_SOURCE:
+ if (!model)
+ return SR_ERR_ARG;
*data = g_variant_new_strv(*model->trigger_sources,
g_strv_length((char **)*model->trigger_sources));
break;
case SR_CONF_TRIGGER_SLOPE:
+ if (!model)
+ return SR_ERR_ARG;
*data = g_variant_new_strv(*model->trigger_slopes,
g_strv_length((char **)*model->trigger_slopes));
break;
case SR_CONF_TIMEBASE:
+ if (!model)
+ return SR_ERR_ARG;
*data = build_tuples(model->timebases, model->num_timebases);
break;
case SR_CONF_VDIV:
@@ -571,7 +552,7 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
char command[MAX_COMMAND_SIZE];
struct sr_channel *ch;
struct dev_context *devc;
- struct scope_config *model;
+ const struct scope_config *model;
devc = sdi->priv;
model = devc->model_config;
@@ -639,7 +620,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
gboolean *pod_enabled, setup_changed;
char command[MAX_COMMAND_SIZE];
struct scope_state *state;
- struct scope_config *model;
+ const struct scope_config *model;
struct sr_channel *ch;
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
@@ -692,7 +673,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
}
}
- for (i = 1; i <= model->digital_pods; ++i) {
+ for (i = 1; i <= model->digital_pods; i++) {
if (state->digital_pods[i - 1] == pod_enabled[i - 1])
continue;
g_snprintf(command, sizeof(command),
@@ -712,7 +693,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
return SR_OK;
}
-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)
{
GSList *l;
gboolean digital_added;
@@ -759,25 +740,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
hmo_receive_data, (void *)sdi);
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
devc->current_channel = devc->enabled_channels;
return hmo_request_data(sdi);
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
- struct sr_datafeed_packet packet;
-
- (void)cb_data;
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -797,10 +772,10 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
.name = "hameg-hmo",
.longname = "Hameg HMO",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
@@ -809,5 +784,5 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};