#define NUM_PROBES 8
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
// SR_HWCAP_OSCILLOSCOPE,
// SR_HWCAP_PAT_GENERATOR,
supported_samplerates,
};
-static GSList *device_instances = NULL;
+static GSList *dev_insts = NULL;
-static int mso_send_control_message(struct sr_device_instance *sdi,
- uint16_t payload[], int n)
+static int mso_send_control_message(struct sr_dev_inst *sdi,
+ uint16_t payload[], int n)
{
int fd = sdi->serial->fd;
int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot);
return ret;
}
-static int mso_reset_adc(struct sr_device_instance *sdi)
+static int mso_reset_adc(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
uint16_t ops[2];
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_reset_fsm(struct sr_device_instance *sdi)
+static int mso_reset_fsm(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
uint16_t ops[1];
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_toggle_led(struct sr_device_instance *sdi, int state)
+static int mso_toggle_led(struct sr_dev_inst *sdi, int state)
{
struct mso *mso = sdi->priv;
uint16_t ops[1];
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_check_trigger(struct sr_device_instance *sdi,
- uint8_t *info)
+static int mso_check_trigger(struct sr_dev_inst *sdi, uint8_t *info)
{
uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
char buf[1];
return ret;
}
-static int mso_read_buffer(struct sr_device_instance *sdi)
+static int mso_read_buffer(struct sr_dev_inst *sdi)
{
uint16_t ops[] = { mso_trans(REG_BUFFER, 0) };
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_arm(struct sr_device_instance *sdi)
+static int mso_arm(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
uint16_t ops[] = {
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_force_capture(struct sr_device_instance *sdi)
+static int mso_force_capture(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
uint16_t ops[] = {
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_dac_out(struct sr_device_instance *sdi, uint16_t val)
+static int mso_dac_out(struct sr_dev_inst *sdi, uint16_t val)
{
struct mso *mso = sdi->priv;
uint16_t ops[] = {
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_clkrate_out(struct sr_device_instance *sdi, uint16_t val)
+static int mso_clkrate_out(struct sr_dev_inst *sdi, uint16_t val)
{
uint16_t ops[] = {
mso_trans(REG_CLKRATE1, (val >> 8) & 0xff),
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_configure_rate(struct sr_device_instance *sdi,
- uint32_t rate)
+static int mso_configure_rate(struct sr_dev_inst *sdi, uint32_t rate)
{
struct mso *mso = sdi->priv;
unsigned int i;
mso->vbit));
}
-static int mso_configure_trigger(struct sr_device_instance *sdi)
+static int mso_configure_trigger(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
uint16_t ops[16];
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_configure_threshold_level(struct sr_device_instance *sdi)
+static int mso_configure_threshold_level(struct sr_dev_inst *sdi)
{
struct mso *mso = sdi->priv;
}
static int mso_parse_serial(const char *iSerial, const char *iProduct,
- struct mso *mso)
+ struct mso *mso)
{
unsigned int u1, u2, u3, u4, u5, u6;
return SR_OK;
}
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
int devcnt = 0;
struct udev *udev;
struct udev_enumerate *enumerate;
- struct udev_list_entry *devices, *dev_list_entry;
+ struct udev_list_entry *devs, *dev_list_entry;
struct mso *mso;
- deviceinfo = deviceinfo;
+ devinfo = devinfo;
/* It's easier to map usb<->serial using udev */
/*
enumerate = udev_enumerate_new(udev);
udev_enumerate_add_match_subsystem(enumerate, "usb-serial");
udev_enumerate_scan_devices(enumerate);
- devices = udev_enumerate_get_list_entry(enumerate);
- udev_list_entry_foreach(dev_list_entry, devices) {
+ devs = udev_enumerate_get_list_entry(enumerate);
+ udev_list_entry_foreach(dev_list_entry, devs) {
const char *syspath, *sysname, *idVendor, *idProduct,
*iSerial, *iProduct;
char path[32], manufacturer[32], product[32], hwrev[32];
sdi->serial = sr_serial_dev_inst_new(path, -1);
if (!sdi->serial)
- goto err_device_instance_free;
+ goto err_dev_inst_free;
- device_instances = g_slist_append(device_instances, sdi);
+ dev_insts = g_slist_append(dev_insts, sdi);
devcnt++;
continue;
-err_device_instance_free:
+err_dev_inst_free:
sr_dev_inst_free(sdi);
err_free_mso:
g_free(mso);
static int hw_cleanup(void)
{
GSList *l;
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
int ret;
ret = SR_OK;
/* Properly close all devices. */
- for (l = device_instances; l; l = l->next) {
+ for (l = dev_insts; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
sr_err("mso19: %s: sdi was NULL, continuing", __func__);
serial_close(sdi->serial->fd);
sr_dev_inst_free(sdi);
}
- g_slist_free(device_instances);
- device_instances = NULL;
+ g_slist_free(dev_insts);
+ dev_insts = NULL;
return ret;
}
-static int hw_opendev(int device_index)
+static int hw_dev_open(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct mso *mso;
int ret = SR_ERR;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return ret;
mso = sdi->priv;
return SR_OK;
}
-static int hw_closedev(int device_index)
+static int hw_dev_close(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("mso19: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
return SR_OK;
}
-static void *hw_get_device_info(int device_index, int device_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct mso *mso;
void *info = NULL;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL;
mso = sdi->priv;
- switch (device_info_id) {
- case SR_DI_INSTANCE:
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
break;
case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */
return info;
}
-static int hw_get_status(int device_index)
+static int hw_dev_status_get(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ST_NOT_FOUND;
return sdi->status;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
- switch (capability) {
+ switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
return mso_configure_rate(sdi, *(uint64_t *) value);
case SR_HWCAP_PROBECONFIG:
/* FIXME: Pass errors? */
static int receive_data(int fd, int revents, void *user_data)
{
- struct sr_device_instance *sdi = user_data;
+ struct sr_dev_inst *sdi = user_data;
struct mso *mso = sdi->priv;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
return TRUE;
}
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct mso *mso;
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
int ret = SR_ERR;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return ret;
mso = sdi->priv;
if (ret != SR_OK)
return ret;
- mso->session_id = session_device_id;
+ mso->session_id = session_dev_id;
sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
packet.type = SR_DF_HEADER;
header.samplerate = mso->cur_rate;
// header.num_analog_probes = 1;
header.num_logic_probes = 8;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_dev_id, &packet);
return ret;
}
/* FIXME */
-static int hw_stop_acquisition(int device_index, gpointer session_device_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
{
struct sr_datafeed_packet packet;
- device_index = device_index;
+ dev_index = dev_index;
packet.type = SR_DF_END;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_dev_id, &packet);
return SR_OK;
}
-SR_PRIV struct sr_device_plugin link_mso19_plugin_info = {
+SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = {
.name = "link-mso19",
.longname = "Link Instruments MSO-19",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .opendev = hw_opendev,
- .closedev = hw_closedev,
- .get_device_info = hw_get_device_info,
- .get_status = hw_get_status,
- .get_capabilities = hw_get_capabilities,
- .set_configuration = hw_set_configuration,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
+ .dev_info_get = hw_dev_info_get,
+ .dev_status_get = hw_dev_status_get,
+ .hwcap_get_all = hw_hwcap_get_all,
+ .dev_config_set = hw_dev_config_set,
+ .dev_acquisition_start = hw_dev_acquisition_start,
+ .dev_acquisition_stop = hw_dev_acquisition_stop,
};
projects / libsigrok.git / blobdiff