BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hameg-hmo: Minor cosmetics, coding-style fixes.

This commit is contained in:
Uwe Hermann 2013-12-03 16:48:21 +01:00
parent d5976d8be5
commit 89280b1a4c
2 changed files with 120 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
hardware/hameg-hmo/api.c
View File

@ -19,7 +19,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include "protocol.h" #include "protocol.h"
#define SERIALCOMM "115200/8n1/flow=1" #define SERIALCOMM "115200/8n1/flow=1"
@ -32,17 +31,11 @@ static const int32_t hwopts[] = {
struct usb_id_info { struct usb_id_info {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t product_id; uint16_t product_id;
} usb_id_info; };
static struct usb_id_info ho_models[] = { static struct usb_id_info ho_models[] = {
{ { 0x0403, 0xed72 }, /* HO720 */
.vendor_id = 0x0403, { 0x0403, 0xed73 }, /* HO730 */
.product_id = 0xed72, /* HO720 */
},
{
.vendor_id = 0x0403,
.product_id = 0xed73, /* HO730 */
},
}; };
static int init(struct sr_context *sr_ctx) static int init(struct sr_context *sr_ctx)
@ -53,27 +46,31 @@ static int init(struct sr_context *sr_ctx)
/** /**
* Find USB serial devices via the USB vendor ID and product ID. * Find USB serial devices via the USB vendor ID and product ID.
* *
* @param vendor_id vendor ID of the USB device. * @param vendor_id Vendor ID of the USB device.
* @param product_id product ID of the USB device. * @param product_id Product ID of the USB device.
* *
* @return A GSList of strings containing the path of the serial device or null * @return A GSList of strings containing the path of the serial device or
* if no serial device is found. The returned list must be freed by the caller. * NULL if no serial device is found. The returned list must be freed
* by the caller.
*/ */
static GSList *auto_find_usb(unsigned long vendor_id, static GSList *auto_find_usb(uint16_t vendor_id, uint16_t product_id)
unsigned long product_id)
{ {
#ifdef __linux__ #ifdef __linux__
const gchar *usb_dev; const gchar *usb_dev;
const char device_tree[] = "/sys/bus/usb/devices/"; const char device_tree[] = "/sys/bus/usb/devices/";
GDir *devices_dir, *device_dir;
GDir *devices_dir;
GSList *l = NULL; GSList *l = NULL;
GSList *tty_devices; GSList *tty_devs;
GSList *matched_paths; GSList *matched_paths;
FILE *fd;
char tmp[5];
gchar *vendor_path, *product_path, *path_copy;
gchar *prefix, *subdir_path, *device_path, *tty_path;
unsigned long read_vendor_id, read_product_id;
const char *file;
l = NULL; l = NULL;
tty_devices = NULL; tty_devs = NULL;
matched_paths = NULL; matched_paths = NULL;
if (!(devices_dir = g_dir_open(device_tree, 0, NULL))) if (!(devices_dir = g_dir_open(device_tree, 0, NULL)))
@ -81,18 +78,9 @@ static GSList *auto_find_usb(unsigned long vendor_id,
/* /*
* Find potential candidates using the vendor ID and product ID * Find potential candidates using the vendor ID and product ID
* and store them in matched_paths * and store them in matched_paths.
*/ */
while ((usb_dev = g_dir_read_name(devices_dir))) { while ((usb_dev = g_dir_read_name(devices_dir))) {
FILE *fd;
char tmp[5];
gchar *vendor_path;
gchar *product_path;
unsigned long read_vendor_id;
unsigned long read_product_id;
vendor_path = g_strconcat(device_tree, vendor_path = g_strconcat(device_tree,
usb_dev, "/idVendor", NULL); usb_dev, "/idVendor", NULL);
product_path = g_strconcat(device_tree, product_path = g_strconcat(device_tree,
@ -126,29 +114,19 @@ static GSList *auto_find_usb(unsigned long vendor_id,
if (vendor_id == read_vendor_id && if (vendor_id == read_vendor_id &&
product_id == read_product_id) { product_id == read_product_id) {
gchar *path_copy;
path_copy = g_strdup(usb_dev); path_copy = g_strdup(usb_dev);
matched_paths = g_slist_prepend(matched_paths, matched_paths = g_slist_prepend(matched_paths,
path_copy); path_copy);
} }
skip_device: skip_device:
g_free(vendor_path); g_free(vendor_path);
g_free(product_path); g_free(product_path);
} }
g_dir_close(devices_dir); g_dir_close(devices_dir);
/* For every matched device try to find a ttyUSBX subfolder */ /* For every matched device try to find a ttyUSBX subfolder. */
for (l = matched_paths; l; l = l->next) { for (l = matched_paths; l; l = l->next) {
const char *file;
GDir *device_dir;
gchar *prefix;
gchar *subdir_path;
gchar *device_path;
subdir_path = NULL; subdir_path = NULL;
device_path = g_strconcat(device_tree, l->data, NULL); device_path = g_strconcat(device_tree, l->data, NULL);
@ -163,8 +141,7 @@ static GSList *auto_find_usb(unsigned long vendor_id,
while ((file = g_dir_read_name(device_dir))) { while ((file = g_dir_read_name(device_dir))) {
if (g_str_has_prefix(file, prefix)) { if (g_str_has_prefix(file, prefix)) {
subdir_path = g_strconcat(device_path, subdir_path = g_strconcat(device_path,
"/", file, "/", file, NULL);
NULL);
break; break;
} }
} }
@ -182,14 +159,12 @@ static GSList *auto_find_usb(unsigned long vendor_id,
while ((file = g_dir_read_name(device_dir))) { while ((file = g_dir_read_name(device_dir))) {
if (g_str_has_prefix(file, "ttyUSB")) { if (g_str_has_prefix(file, "ttyUSB")) {
gchar *tty_path;
tty_path = g_strconcat("/dev/", tty_path = g_strconcat("/dev/",
file, NULL); file, NULL);
sr_dbg("Found USB device %04x:%04x attached to %s", sr_dbg("Found USB device %04x:%04x attached to %s.",
vendor_id, product_id, tty_path); vendor_id, product_id, tty_path);
tty_devices = g_slist_prepend(tty_devices, tty_devs = g_slist_prepend(tty_devs,
tty_path); tty_path);
break; break;
} }
} }
@ -198,7 +173,7 @@ static GSList *auto_find_usb(unsigned long vendor_id,
} }
g_slist_free_full(matched_paths, g_free); g_slist_free_full(matched_paths, g_free);
return tty_devices; return tty_devs;
#else #else
return NULL; return NULL;
#endif #endif
@ -207,16 +182,14 @@ static GSList *auto_find_usb(unsigned long vendor_id,
static GSList *scan(GSList *options) static GSList *scan(GSList *options)
{ {
GSList *devices; GSList *devices;
struct drv_context *drvc; struct drv_context *drvc;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
const char *serial_device, *serial_options;
const char *serial_device; GSList *l, *tty_devs;
const char *serial_options; unsigned int i;
serial_device = NULL; serial_device = NULL;
serial_options = SERIALCOMM; serial_options = SERIALCOMM;
sdi = NULL; sdi = NULL;
devices = NULL; devices = NULL;
drvc = di->priv; drvc = di->priv;
@ -225,29 +198,21 @@ static GSList *scan(GSList *options)
if (sr_serial_extract_options(options, &serial_device, if (sr_serial_extract_options(options, &serial_device,
&serial_options) == SR_OK) { &serial_options) == SR_OK) {
sdi = hameg_probe_serial_device(serial_device, serial_options); sdi = hameg_probe_serial_device(serial_device, serial_options);
if (sdi != NULL) { if (sdi != NULL) {
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
} }
} else { } else {
GSList *l; tty_devs = NULL;
GSList *tty_devices;
unsigned int i;
tty_devices = NULL;
for (i = 0; i < ARRAY_SIZE(ho_models); i++) { for (i = 0; i < ARRAY_SIZE(ho_models); i++) {
if ((l = auto_find_usb(ho_models[i].vendor_id, if ((l = auto_find_usb(ho_models[i].vendor_id,
ho_models[i].product_id)) == NULL) ho_models[i].product_id)) == NULL)
continue; continue;
tty_devs = g_slist_concat(tty_devs, l);
tty_devices = g_slist_concat(tty_devices, l);
} }
for (l = tty_devices; l; l = l->next) { for (l = tty_devs; l; l = l->next) {
sdi = hameg_probe_serial_device(l->data, serial_options); sdi = hameg_probe_serial_device(l->data, serial_options);
if (sdi != NULL) { if (sdi != NULL) {
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
@ -255,7 +220,7 @@ static GSList *scan(GSList *options)
} }
} }
g_slist_free_full(tty_devices, g_free); g_slist_free_full(tty_devs, g_free);
} }
return devices; return devices;
@ -269,7 +234,6 @@ static GSList *dev_list(void)
static void clear_helper(void *priv) static void clear_helper(void *priv)
{ {
unsigned int i; unsigned int i;
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
@ -278,9 +242,8 @@ static void clear_helper(void *priv)
scope_state_free(devc->model_state); scope_state_free(devc->model_state);
for (i = 0; i < model->analog_channels; ++i) { for (i = 0; i < model->analog_channels; ++i)
g_slist_free(devc->analog_groups[i].probes); g_slist_free(devc->analog_groups[i].probes);
}
for (i = 0; i < model->digital_pods; ++i) { for (i = 0; i < model->digital_pods; ++i) {
g_slist_free(devc->digital_groups[i].probes); g_slist_free(devc->digital_groups[i].probes);
@ -351,16 +314,15 @@ static int check_probe_group(struct dev_context *devc,
return PG_DIGITAL; return PG_DIGITAL;
sr_err("Invalid probe group specified."); sr_err("Invalid probe group specified.");
return PG_INVALID; return PG_INVALID;
} }
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group) const struct sr_probe_group *probe_group)
{ {
int ret; int ret, pg_type;
int pg_type;
unsigned int i; unsigned int i;
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
@ -378,12 +340,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
*data = g_variant_new_int32(model->num_xdivs); *data = g_variant_new_int32(model->num_xdivs);
ret = SR_OK; ret = SR_OK;
break; break;
case SR_CONF_NUM_VDIV: case SR_CONF_NUM_VDIV:
if (pg_type == PG_NONE) { if (pg_type == PG_NONE) {
sr_err("No probe group specified."); sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
} else if (pg_type == PG_ANALOG) { } else if (pg_type == PG_ANALOG) {
for (i = 0; i < model->analog_channels; ++i) { for (i = 0; i < model->analog_channels; ++i) {
if (probe_group == &devc->analog_groups[i]) { if (probe_group == &devc->analog_groups[i]) {
@ -397,7 +357,6 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
ret = SR_ERR_NA; ret = SR_ERR_NA;
} }
break; break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
} }
@ -408,7 +367,6 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n) static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
{ {
unsigned int i; unsigned int i;
GVariant *rational[2]; GVariant *rational[2];
GVariantBuilder gvb; GVariantBuilder gvb;
@ -418,7 +376,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
rational[0] = g_variant_new_uint64((*array)[i][0]); rational[0] = g_variant_new_uint64((*array)[i][0]);
rational[1] = g_variant_new_uint64((*array)[i][1]); rational[1] = g_variant_new_uint64((*array)[i][1]);
/* FIXME valgrind reports a memory leak here */ /* FIXME: Valgrind reports a memory leak here. */
g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2)); g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
} }
@ -428,14 +386,15 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group) const struct sr_probe_group *probe_group)
{ {
int ret; int ret, pg_type;
int pg_type; unsigned int i, j;
unsigned int i;
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
struct scope_state *state; struct scope_state *state;
const char *tmp;
uint64_t p, q, tmp_u64;
double tmp_d;
if (!sdi || !(devc = sdi->priv)) if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG; return SR_ERR_ARG;
@ -453,17 +412,11 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
devc->frame_limit = g_variant_get_uint64(data); devc->frame_limit = g_variant_get_uint64(data);
ret = SR_OK; ret = SR_OK;
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
{
const char *tmp;
tmp = g_variant_get_string(data, NULL); tmp = g_variant_get_string(data, NULL);
for (i = 0; (*model->trigger_sources)[i]; i++) { for (i = 0; (*model->trigger_sources)[i]; i++) {
if (!g_strcmp0(tmp, (*model->trigger_sources)[i])) { if (!g_strcmp0(tmp, (*model->trigger_sources)[i])) {
state->trigger_source = i; state->trigger_source = i;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE], (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE],
(*model->trigger_sources)[i]); (*model->trigger_sources)[i]);
@ -472,14 +425,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
break; break;
} }
} }
} break;
break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
{
unsigned int j;
uint64_t p, q;
if (pg_type == PG_NONE) { if (pg_type == PG_NONE) {
sr_err("No probe group specified."); sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
@ -489,10 +436,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
for (i = 0; i < model->num_vdivs; i++) { for (i = 0; i < model->num_vdivs; i++) {
if (p == (*model->vdivs)[i][0] && if (p == (*model->vdivs)[i][0] &&
q == (*model->vdivs)[i][1]){ q == (*model->vdivs)[i][1]) {
for (j = 1; j <= model->analog_channels; ++j) { for (j = 1; j <= model->analog_channels; ++j) {
if (probe_group == &devc->analog_groups[j - 1]) { if (probe_group == &devc->analog_groups[j - 1]) {
state->analog_channels[j-1].vdiv = (float) p / q; state->analog_channels[j - 1].vdiv = (float) p / q;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV], (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
j, state->analog_channels[j-1].vdiv); j, state->analog_channels[j-1].vdiv);
@ -509,18 +456,13 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
break; break;
} }
} }
} break;
break;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
{
uint64_t p, q;
g_variant_get(data, "(tt)", &p, &q); g_variant_get(data, "(tt)", &p, &q);
for (i = 0; i < model->num_timebases; i++) { for (i = 0; i < model->num_timebases; i++) {
if (p == (*model->timebases)[i][0] && if (p == (*model->timebases)[i][0] &&
q == (*model->timebases)[i][1]){ q == (*model->timebases)[i][1]) {
state->timebase = (float) p / q; state->timebase = (float) p / q;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE], (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE],
@ -530,51 +472,35 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
break; break;
} }
} }
} break;
break;
case SR_CONF_HORIZ_TRIGGERPOS: case SR_CONF_HORIZ_TRIGGERPOS:
{ tmp_d = g_variant_get_double(data);
double tmp;
tmp = g_variant_get_double(data); if (tmp_d < 0.0 || tmp_d > 1.0)
if (tmp < 0.0 || tmp > 1.0)
return SR_ERR; return SR_ERR;
state->horiz_triggerpos = -(tmp - 0.5) * state->timebase * model->num_xdivs; state->horiz_triggerpos = -(tmp_d - 0.5) * state->timebase * model->num_xdivs;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS], (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS],
state->horiz_triggerpos); state->horiz_triggerpos);
ret = sr_scpi_send(sdi->conn, command); ret = sr_scpi_send(sdi->conn, command);
} break;
break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
{ tmp_u64 = g_variant_get_uint64(data);
uint64_t tmp;
tmp = g_variant_get_uint64(data); if (tmp_u64 != 0 && tmp_u64 != 1)
if (tmp != 0 && tmp != 1)
return SR_ERR; return SR_ERR;
state->trigger_slope = tmp; state->trigger_slope = tmp_u64;
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE], (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
tmp ? "POS" : "NEG"); tmp_u64 ? "POS" : "NEG");
ret = sr_scpi_send(sdi->conn, command); ret = sr_scpi_send(sdi->conn, command);
} break;
break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
{
unsigned int j;
const char *tmp;
if (pg_type == PG_NONE) { if (pg_type == PG_NONE) {
sr_err("No probe group specified."); sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
@ -603,9 +529,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
break; break;
} }
} }
} break;
break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
break; break;
@ -618,10 +542,9 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
} }
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group) const struct sr_probe_group *probe_group)
{ {
int pg_type; int pg_type;
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
@ -637,44 +560,35 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (pg_type == PG_NONE) { if (pg_type == PG_NONE) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
model->hw_caps, model->hw_caps, model->num_hwcaps,
model->num_hwcaps, sizeof(int32_t));
sizeof(int32_t));
} else if (pg_type == PG_ANALOG) { } else if (pg_type == PG_ANALOG) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
model->analog_hwcaps, model->analog_hwcaps, model->num_analog_hwcaps,
model->num_analog_hwcaps, sizeof(int32_t));
sizeof(int32_t));
} else { } else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
NULL, 0, sizeof(int32_t)); NULL, 0, sizeof(int32_t));
} }
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
if (pg_type == PG_NONE) if (pg_type == PG_NONE)
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
*data = g_variant_new_strv(*model->coupling_options, *data = g_variant_new_strv(*model->coupling_options,
g_strv_length((char **) *model->coupling_options)); g_strv_length((char **)*model->coupling_options));
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
*data = g_variant_new_strv(*model->trigger_sources, *data = g_variant_new_strv(*model->trigger_sources,
g_strv_length((char **) *model->trigger_sources)); g_strv_length((char **)*model->trigger_sources));
break; break;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
*data = build_tuples(model->timebases, model->num_timebases); *data = build_tuples(model->timebases, model->num_timebases);
break; break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
if (pg_type == PG_NONE) if (pg_type == PG_NONE)
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
*data = build_tuples(model->vdivs, model->num_vdivs); *data = build_tuples(model->vdivs, model->num_vdivs);
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -685,7 +599,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi) SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
{ {
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
struct sr_probe *probe; struct sr_probe *probe;
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
@ -707,7 +620,7 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
probe->index < 8 ? 1 : 2); probe->index < 8 ? 1 : 2);
break; break;
default: default:
sr_err("Invalid probe type"); sr_err("Invalid probe type.");
break; break;
} }
@ -717,21 +630,13 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
static int hmo_check_probes(GSList *probes) static int hmo_check_probes(GSList *probes)
{ {
GSList *l; GSList *l;
gboolean enabled_pod1;
gboolean enabled_pod2;
gboolean enabled_chan3;
gboolean enabled_chan4;
struct sr_probe *probe; struct sr_probe *probe;
gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4;
enabled_pod1 = FALSE; enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE;
enabled_pod2 = FALSE;
enabled_chan3 = FALSE;
enabled_chan4 = FALSE;
for (l = probes; l; l = l->next) { for (l = probes; l; l = l->next) {
probe = l->data; probe = l->data;
switch (probe->type) { switch (probe->type) {
case SR_PROBE_ANALOG: case SR_PROBE_ANALOG:
if (probe->index == 2) if (probe->index == 2)
@ -739,14 +644,12 @@ static int hmo_check_probes(GSList *probes)
else if (probe->index == 3) else if (probe->index == 3)
enabled_chan4 = TRUE; enabled_chan4 = TRUE;
break; break;
case SR_PROBE_LOGIC: case SR_PROBE_LOGIC:
if (probe->index < 8) if (probe->index < 8)
enabled_pod1 = TRUE; enabled_pod1 = TRUE;
else else
enabled_pod2 = TRUE; enabled_pod2 = TRUE;
break; break;
default: default:
return SR_ERR; return SR_ERR;
} }
@ -765,10 +668,8 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
unsigned int i; unsigned int i;
gboolean *pod_enabled; gboolean *pod_enabled;
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE];
struct scope_state *state; struct scope_state *state;
struct scope_config *model; struct scope_config *model;
struct sr_probe *probe; struct sr_probe *probe;
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
@ -782,10 +683,8 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
for (l = sdi->probes; l; l = l->next) { for (l = sdi->probes; l; l = l->next) {
probe = l->data; probe = l->data;
switch (probe->type) { switch (probe->type) {
case SR_PROBE_ANALOG: case SR_PROBE_ANALOG:
{
if (probe->enabled != state->analog_channels[probe->index].state) { if (probe->enabled != state->analog_channels[probe->index].state) {
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE], (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
@ -795,11 +694,8 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
state->analog_channels[probe->index].state = probe->enabled; state->analog_channels[probe->index].state = probe->enabled;
} }
} break;
break;
case SR_PROBE_LOGIC: case SR_PROBE_LOGIC:
{
/* /*
* A digital POD needs to be enabled for every group of * A digital POD needs to be enabled for every group of
* 8 probes. * 8 probes.
@ -817,24 +713,22 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
state->digital_channels[probe->index] = probe->enabled; state->digital_channels[probe->index] = probe->enabled;
} }
} break;
break;
default: default:
return SR_ERR; return SR_ERR;
} }
} }
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]) { if (state->digital_pods[i - 1] != pod_enabled[i - 1]) {
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE], (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE],
i, pod_enabled[i-1]); i, pod_enabled[i - 1]);
if (sr_scpi_send(serial, command) != SR_OK) if (sr_scpi_send(serial, command) != SR_OK)
return SR_ERR; return SR_ERR;
state->digital_pods[i-1] = pod_enabled[i-1]; state->digital_pods[i - 1] = pod_enabled[i - 1];
} }
} }
@ -847,7 +741,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{ {
GSList *l; GSList *l;
gboolean digital_added; gboolean digital_added;
struct sr_probe *probe; struct sr_probe *probe;
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
@ -861,12 +754,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
for (l = sdi->probes; l; l = l->next) { for (l = sdi->probes; l; l = l->next) {
probe = l->data; probe = l->data;
if (probe->enabled) { if (probe->enabled) {
/* Only add a single digital probe */ /* Only add a single digital probe. */
if (probe->type != SR_PROBE_LOGIC || !digital_added) { if (probe->type != SR_PROBE_LOGIC || !digital_added) {
devc->enabled_probes = g_slist_append(devc->enabled_probes, devc->enabled_probes = g_slist_append(
probe); devc->enabled_probes, probe);
if (probe->type == SR_PROBE_LOGIC) if (probe->type == SR_PROBE_LOGIC)
digital_added = TRUE; digital_added = TRUE;
} }
@ -918,7 +810,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = { SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
.name = "hameg-hmo", .name = "hameg-hmo",
.longname = "Hameg HMO scope driver", .longname = "Hameg HMO",
.api_version = 1, .api_version = 1,
.init = init, .init = init,
.cleanup = cleanup, .cleanup = cleanup,

90
hardware/hameg-hmo/protocol.c
View File

@ -261,7 +261,7 @@ static int check_manufacturer(const char *manufacturer)
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(manufacturers); ++i) for (i = 0; i < ARRAY_SIZE(manufacturers); ++i)
if (strcmp(manufacturer, manufacturers[i]) == 0) if (!strcmp(manufacturer, manufacturers[i]))
return SR_OK; return SR_OK;
return SR_ERR; return SR_ERR;
@ -273,7 +273,7 @@ static void scope_state_dump(struct scope_config *config,
unsigned int i; unsigned int i;
for (i = 0; i < config->analog_channels; ++i) { for (i = 0; i < config->analog_channels; ++i) {
sr_info("State of analog channel %d -> %s : %s %.3eV %.3e offset", i+1, sr_info("State of analog channel %d -> %s : %s %.3eV %.3e offset", i + 1,
state->analog_channels[i].state ? "On" : "Off", state->analog_channels[i].state ? "On" : "Off",
(*config->coupling_options)[state->analog_channels[i].coupling], (*config->coupling_options)[state->analog_channels[i].coupling],
state->analog_channels[i].vdiv, state->analog_channels[i].vertical_offset); state->analog_channels[i].vdiv, state->analog_channels[i].vertical_offset);
@ -297,15 +297,13 @@ static void scope_state_dump(struct scope_config *config,
} }
static int scope_state_get_array_option(struct sr_serial_dev_inst *serial, static int scope_state_get_array_option(struct sr_serial_dev_inst *serial,
const char *command, const char *(*array)[], const char *command, const char *(*array)[], int *result)
int *result)
{ {
char *tmp; char *tmp;
unsigned int i; unsigned int i;
if (sr_scpi_get_string(serial, command, &tmp) != SR_OK) { if (sr_scpi_get_string(serial, command, &tmp) != SR_OK) {
if (tmp) g_free(tmp);
g_free(tmp);
return SR_ERR; return SR_ERR;
} }
@ -416,21 +414,25 @@ SR_PRIV int scope_state_get(struct sr_dev_inst *sdi)
if (digital_channel_state_get(sdi->conn, config, state) != SR_OK) if (digital_channel_state_get(sdi->conn, config, state) != SR_OK)
return SR_ERR; return SR_ERR;
/* TODO check if value is sensible */ /* TODO: Check if value is sensible. */
if (sr_scpi_get_float(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE], if (sr_scpi_get_float(sdi->conn,
&state->timebase) != SR_OK) (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
&state->timebase) != SR_OK)
return SR_ERR; return SR_ERR;
if (sr_scpi_get_float(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS], if (sr_scpi_get_float(sdi->conn,
&state->horiz_triggerpos) != SR_OK) (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
&state->horiz_triggerpos) != SR_OK)
return SR_ERR; return SR_ERR;
if (scope_state_get_array_option(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SOURCE], if (scope_state_get_array_option(sdi->conn,
config->trigger_sources, &state->trigger_source) != SR_OK) (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SOURCE],
config->trigger_sources, &state->trigger_source) != SR_OK)
return SR_ERR; return SR_ERR;
if (scope_state_get_array_option(sdi->conn, (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SLOPE], if (scope_state_get_array_option(sdi->conn,
config->trigger_slopes, &state->trigger_slope) != SR_OK) (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SLOPE],
config->trigger_slopes, &state->trigger_slope) != SR_OK)
return SR_ERR; return SR_ERR;
scope_state_dump(config, state); scope_state_dump(config, state);
@ -446,15 +448,15 @@ SR_PRIV struct scope_state *scope_state_new(struct scope_config *config)
return NULL; return NULL;
if (!(state->analog_channels = g_try_malloc0_n(config->analog_channels, if (!(state->analog_channels = g_try_malloc0_n(config->analog_channels,
sizeof(struct analog_channel_state)))) sizeof(struct analog_channel_state))))
goto fail; goto fail;
if (!(state->digital_channels = g_try_malloc0_n(config->digital_channels, if (!(state->digital_channels = g_try_malloc0_n(
sizeof(gboolean)))) config->digital_channels, sizeof(gboolean))))
goto fail; goto fail;
if (!(state->digital_pods = g_try_malloc0_n(config->digital_pods, if (!(state->digital_pods = g_try_malloc0_n(config->digital_pods,
sizeof(gboolean)))) sizeof(gboolean))))
goto fail; goto fail;
return state; return state;
@ -483,16 +485,14 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
{ {
char tmp[25]; char tmp[25];
int model_index; int model_index;
unsigned int i; unsigned int i, j;
unsigned int j;
struct sr_probe *probe; struct sr_probe *probe;
struct dev_context *devc; struct dev_context *devc;
devc = sdi->priv; devc = sdi->priv;
model_index = -1; model_index = -1;
/* Find the exact model */ /* Find the exact model. */
for (i = 0; i < ARRAY_SIZE(scope_models); i++) { for (i = 0; i < ARRAY_SIZE(scope_models); i++) {
for (j = 0; scope_models[i].name[j]; j++) { for (j = 0; scope_models[i].name[j]; j++) {
if (!strcmp(sdi->model, scope_models[i].name[j])) { if (!strcmp(sdi->model, scope_models[i].name[j])) {
@ -505,7 +505,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
} }
if (model_index == -1) { if (model_index == -1) {
sr_dbg("Unsupported HMO device"); sr_dbg("Unsupported HMO device.");
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -517,37 +517,38 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
scope_models[model_index].digital_pods))) scope_models[model_index].digital_pods)))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
/* Add analog channels */ /* Add analog channels. */
for (i = 0; i < scope_models[model_index].analog_channels; i++) { for (i = 0; i < scope_models[model_index].analog_channels; i++) {
if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
(*scope_models[model_index].analog_names)[i]))) (*scope_models[model_index].analog_names)[i])))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
sdi->probes = g_slist_append(sdi->probes, probe); sdi->probes = g_slist_append(sdi->probes, probe);
devc->analog_groups[i].name = (char *) (*scope_models[model_index].analog_names)[i]; devc->analog_groups[i].name =
(char *)(*scope_models[model_index].analog_names)[i];
devc->analog_groups[i].probes = g_slist_append(NULL, probe); devc->analog_groups[i].probes = g_slist_append(NULL, probe);
sdi->probe_groups = g_slist_append(sdi->probe_groups, sdi->probe_groups = g_slist_append(sdi->probe_groups,
&devc->analog_groups[i]); &devc->analog_groups[i]);
} }
/* Add digital probe groups */ /* Add digital probe groups. */
for (i = 0; i < scope_models[model_index].digital_pods; ++i) { for (i = 0; i < scope_models[model_index].digital_pods; ++i) {
g_snprintf(tmp, 25, "POD%d", i); g_snprintf(tmp, 25, "POD%d", i);
devc->digital_groups[i].name = g_strdup(tmp); devc->digital_groups[i].name = g_strdup(tmp);
sdi->probe_groups = g_slist_append(sdi->probe_groups, sdi->probe_groups = g_slist_append(sdi->probe_groups,
&devc->digital_groups[i < 8 ? 0 : 1]); &devc->digital_groups[i < 8 ? 0 : 1]);
} }
/* Add digital channels */ /* Add digital channels. */
for (i = 0; i < scope_models[model_index].digital_channels; i++) { for (i = 0; i < scope_models[model_index].digital_channels; i++) {
if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
(*scope_models[model_index].digital_names)[i]))) (*scope_models[model_index].digital_names)[i])))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
sdi->probes = g_slist_append(sdi->probes, probe); sdi->probes = g_slist_append(sdi->probes, probe);
devc->digital_groups[i < 8 ? 0 : 1].probes = g_slist_append(devc->digital_groups[i < 8 ? 0 : 1].probes, devc->digital_groups[i < 8 ? 0 : 1].probes = g_slist_append(
probe); devc->digital_groups[i < 8 ? 0 : 1].probes, probe);
} }
devc->model_config = &scope_models[model_index]; devc->model_config = &scope_models[model_index];
@ -580,7 +581,7 @@ SR_PRIV struct sr_dev_inst *hameg_probe_serial_device(const char *serial_device,
goto fail; goto fail;
if (sr_scpi_get_hw_id(serial, &hw_info) != SR_OK) { if (sr_scpi_get_hw_id(serial, &hw_info) != SR_OK) {
sr_info("Couldn't get IDN response"); sr_info("Couldn't get IDN response.");
goto fail; goto fail;
} }
@ -627,6 +628,9 @@ SR_PRIV int hameg_hmo_receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
GArray *data;
struct sr_datafeed_analog analog;
struct sr_datafeed_logic logic;
(void)fd; (void)fd;
@ -641,10 +645,6 @@ SR_PRIV int hameg_hmo_receive_data(int fd, int revents, void *cb_data)
switch (probe->type) { switch (probe->type) {
case SR_PROBE_ANALOG: case SR_PROBE_ANALOG:
{
GArray *data;
struct sr_datafeed_analog analog;
if (sr_scpi_get_floatv(sdi->conn, NULL, &data) != SR_OK) { if (sr_scpi_get_floatv(sdi->conn, NULL, &data) != SR_OK) {
if (data) if (data)
g_array_free(data, TRUE); g_array_free(data, TRUE);
@ -666,14 +666,8 @@ SR_PRIV int hameg_hmo_receive_data(int fd, int revents, void *cb_data)
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);
g_slist_free(analog.probes); g_slist_free(analog.probes);
g_array_free(data, TRUE); g_array_free(data, TRUE);
} break;
break;
case SR_PROBE_LOGIC: case SR_PROBE_LOGIC:
{
GArray *data;
struct sr_datafeed_logic logic;
if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) { if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) {
if (data) if (data)
g_free(data); g_free(data);
@ -690,11 +684,9 @@ SR_PRIV int hameg_hmo_receive_data(int fd, int revents, void *cb_data)
packet.payload = &logic; packet.payload = &logic;
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);
g_array_free(data, TRUE); g_array_free(data, TRUE);
} break;
break;
default: default:
sr_err("Invalid probe type"); sr_err("Invalid probe type.");
break; break;
} }