/* TODO: All of these should go in a device-specific struct. */
static uint64_t cur_samplerate = 0;
+static uint64_t period_ps = 0;
static uint64_t limit_samples = 0;
static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
static uint64_t memory_size = 0;
int err;
if ((err = libusb_get_device_descriptor(dev, des))) {
- g_warning("failed to get device descriptor: %d", err);
+ sr_warn("failed to get device descriptor: %d", err);
return -1;
}
if (!(des->idProduct == zeroplus_models[i].pid))
continue;
- g_message("Found PID=%04X (%s)", des->idProduct,
- zeroplus_models[i].model_name);
+ sr_info("Found PID=%04X (%s)", des->idProduct,
+ zeroplus_models[i].model_name);
num_channels = zeroplus_models[i].channels;
memory_size = zeroplus_models[i].sample_depth * 1024;
break;
}
if (num_channels == 0) {
- g_warning("Unknown ZeroPlus device %04X",
- des->idProduct);
+ sr_warn("Unknown ZeroPlus device %04X", des->idProduct);
return -2;
}
/* Found it. */
if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
(*sdi)->status = SR_ST_ACTIVE;
- g_message("opened device %d on %d.%d interface %d",
- (*sdi)->index, (*sdi)->usb->bus,
- (*sdi)->usb->address, USB_INTERFACE);
+ sr_info("opened device %d on %d.%d interface %d",
+ (*sdi)->index, (*sdi)->usb->bus,
+ (*sdi)->usb->address, USB_INTERFACE);
} else {
- g_warning("failed to open device: %d", err);
+ sr_warn("failed to open device: %d", err);
*sdi = NULL;
}
}
if (!sdi->usb->devhdl)
return;
- g_message("closing device %d on %d.%d interface %d", sdi->index,
- sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
+ sr_info("closing device %d on %d.%d interface %d", sdi->index,
+ sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE);
libusb_close(sdi->usb->devhdl);
sdi->usb->devhdl = NULL;
deviceinfo = deviceinfo;
if (libusb_init(&usb_context) != 0) {
- g_warning("Failed to initialize USB.");
+ sr_warn("Failed to initialize USB.");
return 0;
}
for (i = 0; devlist[i]; i++) {
err = libusb_get_device_descriptor(devlist[i], &des);
if (err != 0) {
- g_warning("failed to get device descriptor: %d", err);
+ sr_warn("failed to get device descriptor: %d", err);
continue;
}
int err;
if (!(sdi = zp_open_device(device_index))) {
- g_warning("unable to open device");
+ sr_warn("unable to open device");
return SR_ERR;
}
err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
if (err != 0) {
- g_warning("Unable to claim interface: %d", err);
+ sr_warn("Unable to claim interface: %d", err);
return SR_ERR;
}
analyzer_reset(sdi->usb->devhdl);
return SR_OK;
}
-static void hw_closedev(int device_index)
+static int hw_closedev(int device_index)
{
struct sr_device_instance *sdi;
- if ((sdi = sr_get_device_instance(device_instances, device_index)))
- close_device(sdi);
+ if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+ sr_err("lap-c: %s: sdi was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
+ }
+
+ /* TODO */
+ close_device(sdi);
+
+ return SR_OK;
}
static void hw_cleanup(void)
/* TODO: This will set the same samplerate for all devices. */
static int set_configuration_samplerate(uint64_t samplerate)
{
- g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
+ sr_info("%s(%" PRIu64 ")", __func__, samplerate);
if (samplerate > SR_MHZ(1))
analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
else if (samplerate > SR_KHZ(1))
analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
cur_samplerate = samplerate;
+ period_ps = 1000000000000 / samplerate;
return SR_OK;
}
}
}
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int device_index, gpointer session_data)
{
struct sr_device_instance *sdi;
struct sr_datafeed_packet packet;
+ struct sr_datafeed_logic logic;
struct sr_datafeed_header header;
+ uint64_t samples_read;
int res;
unsigned int packet_num;
unsigned char *buf;
analyzer_configure(sdi->usb->devhdl);
analyzer_start(sdi->usb->devhdl);
- g_message("Waiting for data");
+ sr_info("Waiting for data");
analyzer_wait_data(sdi->usb->devhdl);
- g_message("Stop address = 0x%x",
- analyzer_get_stop_address(sdi->usb->devhdl));
- g_message("Now address = 0x%x",
- analyzer_get_now_address(sdi->usb->devhdl));
- g_message("Trigger address = 0x%x",
- analyzer_get_trigger_address(sdi->usb->devhdl));
+ sr_info("Stop address = 0x%x", analyzer_get_stop_address(sdi->usb->devhdl));
+ sr_info("Now address = 0x%x", analyzer_get_now_address(sdi->usb->devhdl));
+ sr_info("Trigger address = 0x%x", analyzer_get_trigger_address(sdi->usb->devhdl));
packet.type = SR_DF_HEADER;
- packet.length = sizeof(struct sr_datafeed_header);
- packet.payload = (unsigned char *)&header;
+ packet.payload = &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
header.samplerate = cur_samplerate;
- header.protocol_id = SR_PROTO_RAW;
header.num_logic_probes = num_channels;
header.num_analog_probes = 0;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_data, &packet);
- buf = g_malloc(PACKET_SIZE);
- if (!buf)
- return SR_ERR;
+ if (!(buf = g_try_malloc(PACKET_SIZE))) {
+ sr_err("lap-c: %s: buf malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
+
+ samples_read = 0;
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_num++) {
res = analyzer_read_data(sdi->usb->devhdl, buf, PACKET_SIZE);
-#if 0
- g_message("Tried to read %llx bytes, actually read %x bytes",
- PACKET_SIZE, res);
-#endif
+ sr_info("Tried to read %llx bytes, actually read %x bytes",
+ PACKET_SIZE, res);
packet.type = SR_DF_LOGIC;
- packet.length = PACKET_SIZE;
- packet.unitsize = 4;
- packet.payload = buf;
- sr_session_bus(session_device_id, &packet);
+ packet.timeoffset = samples_read * period_ps;
+ packet.duration = res / 4 * period_ps;
+ packet.payload = &logic;
+ logic.length = PACKET_SIZE;
+ logic.unitsize = 4;
+ logic.data = buf;
+ sr_session_bus(session_data, &packet);
+ samples_read += res / 4;
}
analyzer_read_stop(sdi->usb->devhdl);
g_free(buf);
packet.type = SR_DF_END;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_data, &packet);
return SR_OK;
}
}
struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
- "zeroplus-logic-cube",
- "Zeroplus Logic Cube LAP-C series",
- 1,
- hw_init,
- hw_cleanup,
- hw_opendev,
- hw_closedev,
- hw_get_device_info,
- hw_get_status,
- hw_get_capabilities,
- hw_set_configuration,
- hw_start_acquisition,
- hw_stop_acquisition,
+ .name = "zeroplus-logic-cube",
+ .longname = "Zeroplus Logic Cube LAP-C series",
+ .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,
};
projects / libsigrok.git / blobdiff