* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdlib.h>
+#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 uint32_t drvopts[] = {
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;
goto fail;
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_ACTIVE;
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 = di;
+ sdi->driver = &hameg_hmo_driver_info;
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:
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)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return sr_scpi_scan(di->priv, options, hmo_probe_serial_device);
-}
-
-static GSList *dev_list(void)
-{
- return ((struct drv_context *)(di->priv))->instances;
+ return sr_scpi_scan(di->context, options, hmo_probe_serial_device);
}
static void clear_helper(void *priv)
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);
}
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)
+ 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)
+ for (i = 0; i < model->digital_pods; i++)
if (cg == devc->digital_groups[i])
return CG_DIGITAL;
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))
+ if (!sdi)
return SR_ERR_ARG;
+ devc = sdi->priv;
+
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
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;
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) {
+ for (i = 0; i < model->analog_channels; i++) {
if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new_int32(model->num_ydivs);
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) {
+ for (i = 0; i < model->analog_channels; i++) {
if (cg != devc->analog_groups[i])
continue;
*data = g_variant_new("(tt)",
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) {
+ 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]);
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;
double tmp_d;
gboolean update_sample_rate;
- if (!sdi || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_ARG;
+ devc = sdi->priv;
+
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
if (p != (*model->vdivs)[i][0] ||
q != (*model->vdivs)[i][1])
continue;
- for (j = 1; j <= model->analog_channels; ++j) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_channels[j - 1].vdiv = i;
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) {
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) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_channels[j-1].coupling = i;
{
int cg_type = CG_NONE;
struct dev_context *devc = NULL;
- struct scope_config *model = NULL;
+ const struct scope_config *model = NULL;
- if (sdi && (devc = sdi->priv)) {
+ if (sdi) {
+ devc = sdi->priv;
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
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;
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;
}
}
- 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),
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;
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;
.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,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
projects / libsigrok.git / blobdiff