#define USB_PRODUCT "f190"
static int capabilities[] = {
- HWCAP_LOGIC_ANALYZER,
-// HWCAP_OSCILLOSCOPE,
-// HWCAP_PAT_GENERATOR,
+ SR_HWCAP_LOGIC_ANALYZER,
+// SR_HWCAP_OSCILLOSCOPE,
+// SR_HWCAP_PAT_GENERATOR,
- HWCAP_SAMPLERATE,
-// HWCAP_CAPTURE_RATIO,
- HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_SAMPLERATE,
+// SR_HWCAP_CAPTURE_RATIO,
+ SR_HWCAP_LIMIT_SAMPLES,
0,
};
MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0
};
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
100, MHZ(200), 0, supported_samplerates,
};
static GSList *device_instances = NULL;
-static int mso_send_control_message(struct sigrok_device_instance *sdi,
+static int mso_send_control_message(struct sr_device_instance *sdi,
uint16_t payload[], int n)
{
int fd = sdi->serial->fd;
return ret;
}
-static int mso_reset_adc(struct sigrok_device_instance *sdi)
+static int mso_reset_adc(struct sr_device_instance *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 sigrok_device_instance *sdi)
+static int mso_reset_fsm(struct sr_device_instance *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 sigrok_device_instance *sdi, int state)
+static int mso_toggle_led(struct sr_device_instance *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 sigrok_device_instance *sdi,
+static int mso_check_trigger(struct sr_device_instance *sdi,
uint8_t *info)
{
uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
return ret;
}
-static int mso_read_buffer(struct sigrok_device_instance *sdi)
+static int mso_read_buffer(struct sr_device_instance *sdi)
{
uint16_t ops[] = { mso_trans(REG_BUFFER, 0) };
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
}
-static int mso_arm(struct sigrok_device_instance *sdi)
+static int mso_arm(struct sr_device_instance *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 sigrok_device_instance *sdi)
+static int mso_force_capture(struct sr_device_instance *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 sigrok_device_instance *sdi, uint16_t val)
+static int mso_dac_out(struct sr_device_instance *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 sigrok_device_instance *sdi, uint16_t val)
+static int mso_clkrate_out(struct sr_device_instance *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 sigrok_device_instance *sdi,
+static int mso_configure_rate(struct sr_device_instance *sdi,
uint32_t rate)
{
struct mso *mso = sdi->priv;
return ret;
}
-
static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
{
return (uint16_t) (0x200 -
mso->vbit));
}
-static int mso_configure_trigger(struct sigrok_device_instance *sdi)
+static int mso_configure_trigger(struct sr_device_instance *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 sigrok_device_instance *sdi)
+static int mso_configure_threshold_level(struct sr_device_instance *sdi)
{
struct mso *mso = sdi->priv;
return SR_OK;
}
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
int devcnt = 0;
struct udev *udev;
struct udev_enumerate *enumerate;
/* hardware initial state */
mso->ctlbase = 0;
- sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING,
+ sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
manufacturer, product, hwrev);
if (!sdi) {
g_warning("Unable to create device instance for %s",
/* save a pointer to our private instance data */
sdi->priv = mso;
- sdi->serial = serial_device_instance_new(path, -1);
+ sdi->serial = sr_serial_device_instance_new(path, -1);
if (!sdi->serial)
goto err_device_instance_free;
continue;
err_device_instance_free:
- sigrok_device_instance_free(sdi);
+ sr_device_instance_free(sdi);
err_free_mso:
free(mso);
}
static void hw_cleanup(void)
{
GSList *l;
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
/* Properly close all devices. */
for (l = device_instances; l; l = l->next) {
serial_close(sdi->serial->fd);
if (sdi->priv != NULL)
free(sdi->priv);
- sigrok_device_instance_free(sdi);
+ sr_device_instance_free(sdi);
}
g_slist_free(device_instances);
device_instances = NULL;
static int hw_opendev(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
struct mso *mso;
int ret = SR_ERR;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return ret;
mso = sdi->priv;
if (ret != SR_OK)
return ret;
- sdi->status = ST_ACTIVE;
+ sdi->status = SR_ST_ACTIVE;
/* FIXME: discard serial buffer */
static void hw_closedev(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return;
if (sdi->serial->fd != -1) {
serial_close(sdi->serial->fd);
sdi->serial->fd = -1;
- sdi->status = ST_INACTIVE;
+ sdi->status = SR_ST_INACTIVE;
}
}
static void *hw_get_device_info(int device_index, int device_info_id)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
struct mso *mso;
void *info = NULL;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return NULL;
mso = sdi->priv;
switch (device_info_id) {
- case DI_INSTANCE:
+ case SR_DI_INSTANCE:
info = sdi;
break;
- case DI_NUM_PROBES: /* FIXME: How to report analog probe? */
+ case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */
info = GINT_TO_POINTER(8);
break;
- case DI_SAMPLERATES:
+ case SR_DI_SAMPLERATES:
info = &samplerates;
break;
- case DI_TRIGGER_TYPES:
+ case SR_DI_TRIGGER_TYPES:
info = "01"; /* FIXME */
break;
- case DI_CUR_SAMPLERATE:
+ case SR_DI_CUR_SAMPLERATE:
info = &mso->cur_rate;
break;
}
static int hw_get_status(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
- return ST_NOT_FOUND;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ return SR_ST_NOT_FOUND;
return sdi->status;
}
static int hw_set_configuration(int device_index, int capability, void *value)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return SR_ERR;
switch (capability) {
- case HWCAP_SAMPLERATE:
+ case SR_HWCAP_SAMPLERATE:
return mso_configure_rate(sdi, *(uint64_t *) value);
- case HWCAP_PROBECONFIG:
- case HWCAP_LIMIT_SAMPLES:
+ case SR_HWCAP_PROBECONFIG:
+ case SR_HWCAP_LIMIT_SAMPLES:
default:
return SR_OK; /* FIXME */
}
-
}
#define MSO_TRIGGER_UNKNOWN '!'
/* FIXME: Pass errors? */
static int receive_data(int fd, int revents, void *user_data)
{
- struct sigrok_device_instance *sdi = user_data;
+ struct sr_device_instance *sdi = user_data;
struct mso *mso = sdi->priv;
- struct datafeed_packet packet;
+ struct sr_datafeed_packet packet;
uint8_t in[1024], logic_out[1024];
double analog_out[1024];
size_t i, s;
((mso->buffer[i * 3 + 2] & 0x3f) << 2);
}
- packet.type = DF_LOGIC;
+ packet.type = SR_DF_LOGIC;
packet.length = 1024;
packet.unitsize = 1;
packet.payload = logic_out;
- session_bus(mso->session_id, &packet);
+ sr_session_bus(mso->session_id, &packet);
- packet.type = DF_ANALOG;
+ packet.type = SR_DF_ANALOG;
packet.length = 1024;
packet.unitsize = sizeof(double);
packet.payload = analog_out;
- session_bus(mso->session_id, &packet);
+ sr_session_bus(mso->session_id, &packet);
- packet.type = DF_END;
- session_bus(mso->session_id, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(mso->session_id, &packet);
return TRUE;
}
static int hw_start_acquisition(int device_index, gpointer session_device_id)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
struct mso *mso;
- struct datafeed_packet packet;
- struct datafeed_header header;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_header header;
int ret = SR_ERR;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return ret;
mso = sdi->priv;
return ret;
mso->session_id = session_device_id;
- source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
+ sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
- packet.type = DF_HEADER;
- packet.length = sizeof(struct datafeed_header);
+ packet.type = SR_DF_HEADER;
+ packet.length = sizeof(struct sr_datafeed_header);
packet.payload = (unsigned char *) &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
header.samplerate = mso->cur_rate;
header.num_analog_probes = 1;
header.num_logic_probes = 8;
- header.protocol_id = PROTO_RAW;
- session_bus(session_device_id, &packet);
+ header.protocol_id = SR_PROTO_RAW;
+ sr_session_bus(session_device_id, &packet);
return ret;
}
/* FIXME */
static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{
- struct datafeed_packet packet;
+ struct sr_datafeed_packet packet;
device_index = device_index;
- packet.type = DF_END;
- session_bus(session_device_id, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(session_device_id, &packet);
}
-struct device_plugin link_mso19_plugin_info = {
+struct sr_device_plugin link_mso19_plugin_info = {
.name = "link-mso19",
+ .longname = "Link Instruments MSO-19",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
-
.open = hw_opendev,
.close = hw_closedev,
.get_device_info = hw_get_device_info,