0,
};
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
static GSList *device_instances = NULL;
static libusb_context *usb_context = NULL;
return 0;
}
-static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
struct libusb_device_descriptor *des)
{
unsigned int i;
return 0;
}
-struct sigrok_device_instance *zp_open_device(int device_index)
+struct sr_device_instance *zp_open_device(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
libusb_device **devlist;
struct libusb_device_descriptor des;
int err, i;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
/* TODO: Error handling. */
- err = opendev3(&sdi, devlist[i], &des);
+ err = opendev4(&sdi, devlist[i], &des);
}
} else {
/* Status must be ST_ACTIVE, i.e. already in use... */
return sdi;
}
-static void close_device(struct sigrok_device_instance *sdi)
+static void close_device(struct sr_device_instance *sdi)
{
if (!sdi->usb->devhdl)
return;
trigger_value[stage] |= probe_bit;
stage++;
if (stage > NUM_TRIGGER_STAGES)
- return SIGROK_ERR;
+ return SR_ERR;
}
}
}
- return SIGROK_OK;
+ return SR_OK;
}
/*
static int hw_init(char *deviceinfo)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
struct libusb_device_descriptor des;
libusb_device **devlist;
int err, devcnt, i;
- /* QUICK HACK */
+ /* Avoid compiler warnings. */
deviceinfo = deviceinfo;
if (libusb_init(&usb_context) != 0) {
* TODO: Any way to detect specific model/version in
* the zeroplus range?
*/
- sdi = sigrok_device_instance_new(devcnt,
+ sdi = sr_device_instance_new(devcnt,
ST_INACTIVE, USB_VENDOR_NAME,
USB_MODEL_NAME, USB_MODEL_VERSION);
if (!sdi)
static int hw_opendev(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
int err;
if (!(sdi = zp_open_device(device_index))) {
g_warning("unable to open device");
- return SIGROK_ERR;
+ return SR_ERR;
}
err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
if (err != 0) {
g_warning("Unable to claim interface: %d", err);
- return SIGROK_ERR;
+ return SR_ERR;
}
analyzer_reset(sdi->usb->devhdl);
analyzer_initialize(sdi->usb->devhdl);
- analyzer_configure(sdi->usb->devhdl);
analyzer_set_memory_size(MEMORY_SIZE_512K);
// analyzer_set_freq(g_freq, g_freq_scale);
if (cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */
if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
- &samplerates.low) == SIGROK_ERR)
- return SIGROK_ERR;
+ &samplerates.low) == SR_ERR)
+ return SR_ERR;
}
- return SIGROK_OK;
+ return SR_OK;
}
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)))
close_device(sdi);
}
/* Properly close all devices... */
for (l = device_instances; l; l = l->next)
- close_device((struct sigrok_device_instance *)l->data);
+ close_device((struct sr_device_instance *)l->data);
/* ...and free all their memory. */
for (l = device_instances; l; l = l->next)
static void *hw_get_device_info(int device_index, int device_info_id)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
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;
switch (device_info_id) {
static int hw_get_status(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- sdi = get_sigrok_device_instance(device_instances, device_index);
+ sdi = sr_get_device_instance(device_instances, device_index);
if (sdi)
return sdi->status;
else
/* TODO: This will set the same samplerate for all devices. */
static int set_configuration_samplerate(uint64_t samplerate)
{
- g_message("%s(%llu)", __FUNCTION__, samplerate);
+ g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
if (samplerate > MHZ(1))
analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ);
else if (samplerate > KHZ(1))
cur_samplerate = samplerate;
- return SIGROK_OK;
+ return SR_OK;
}
static int hw_set_configuration(int device_index, int capability, void *value)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
uint64_t *tmp_u64;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
- return SIGROK_ERR;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ return SR_ERR;
switch (capability) {
case HWCAP_SAMPLERATE:
case HWCAP_PROBECONFIG:
return configure_probes((GSList *) value);
case HWCAP_LIMIT_SAMPLES:
- limit_samples = strtoull(value, NULL, 10);
- return SIGROK_OK;
+ tmp_u64 = value;
+ limit_samples = *tmp_u64;
+ return SR_OK;
default:
- return SIGROK_ERR;
+ return SR_ERR;
}
}
static int hw_start_acquisition(int device_index, gpointer session_device_id)
{
- struct sigrok_device_instance *sdi;
- struct datafeed_packet packet;
- struct datafeed_header header;
+ struct sr_device_instance *sdi;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_header header;
int res;
unsigned int packet_num;
unsigned char *buf;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
- return SIGROK_ERR;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ return SR_ERR;
+
+ /* push configured settings to device */
+ analyzer_configure(sdi->usb->devhdl);
analyzer_start(sdi->usb->devhdl);
g_message("Waiting for data");
analyzer_get_trigger_address(sdi->usb->devhdl));
packet.type = DF_HEADER;
- packet.length = sizeof(struct datafeed_header);
+ packet.length = sizeof(struct sr_datafeed_header);
packet.payload = (unsigned char *)&header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
header.samplerate = cur_samplerate;
header.protocol_id = PROTO_RAW;
- header.num_probes = num_channels;
+ header.num_logic_probes = num_channels;
+ header.num_analog_probes = 0;
session_bus(session_device_id, &packet);
buf = g_malloc(PACKET_SIZE);
if (!buf)
- return SIGROK_ERR;
+ return SR_ERR;
analyzer_read_start(sdi->usb->devhdl);
/* Send the incoming transfer to the session bus. */
for (packet_num = 0; packet_num < (memory_size * 4 / PACKET_SIZE);
PACKET_SIZE, res);
#endif
- packet.type = DF_LOGIC32;
+ packet.type = DF_LOGIC;
packet.length = PACKET_SIZE;
+ packet.unitsize = 4;
packet.payload = buf;
session_bus(session_device_id, &packet);
}
packet.type = DF_END;
session_bus(session_device_id, &packet);
- return SIGROK_OK;
+ return SR_OK;
}
/* This stops acquisition on ALL devices, ignoring device_index. */
static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{
- struct datafeed_packet packet;
- struct sigrok_device_instance *sdi;
+ struct sr_datafeed_packet packet;
+ struct sr_device_instance *sdi;
packet.type = DF_END;
session_bus(session_device_id, &packet);
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return; /* TODO: Cry? */
analyzer_reset(sdi->usb->devhdl);
/* TODO: Need to cancel and free any queued up transfers. */
}
-struct device_plugin zeroplus_logic_cube_plugin_info = {
+struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
"zeroplus-logic-cube",
+ "Zeroplus Logic Cube LAP-C series",
1,
hw_init,
hw_cleanup,