#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,
};
return ret;
}
-
static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
{
return (uint16_t) (0x200 -
return SR_OK;
}
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
struct sr_device_instance *sdi;
int devcnt = 0;
/* hardware initial state */
mso->ctlbase = 0;
- sdi = sr_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",
if (ret != SR_OK)
return ret;
- sdi->status = ST_ACTIVE;
+ sdi->status = SR_ST_ACTIVE;
/* FIXME: discard serial buffer */
if (sdi->serial->fd != -1) {
serial_close(sdi->serial->fd);
sdi->serial->fd = -1;
- sdi->status = ST_INACTIVE;
+ sdi->status = SR_ST_INACTIVE;
}
}
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;
}
struct sr_device_instance *sdi;
if (!(sdi = sr_get_device_instance(device_instances, device_index)))
- return ST_NOT_FOUND;
+ return SR_ST_NOT_FOUND;
return sdi->status;
}
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 '!'
((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;
}
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.type = SR_DF_HEADER;
packet.length = sizeof(struct sr_datafeed_header);
packet.payload = (unsigned char *) &header;
header.feed_version = 1;
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;
}
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 sr_device_plugin link_mso19_plugin_info = {