#include <glib.h>
#include <libusb.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
#include "analyzer.h"
#define USB_VENDOR 0x0c12
* Note -- 16032, 16064 and 16128 *usually* -- but not always -- have the
* same 128K sample depth.
*/
-model_t zeroplus_models[] = {
+static model_t zeroplus_models[] = {
{0x7009, "LAP-C(16064)", 16, 64, 100},
{0x700A, "LAP-C(16128)", 16, 128, 200},
{0x700B, "LAP-C(32128)", 32, 128, 200},
* that high.
*/
static uint64_t supported_samplerates[] = {
- 100,
- 500,
- KHZ(1),
- KHZ(5),
- KHZ(25),
- KHZ(50),
- KHZ(100),
- KHZ(200),
- KHZ(400),
- KHZ(800),
- MHZ(1),
- MHZ(10),
- MHZ(25),
- MHZ(50),
- MHZ(80),
- MHZ(100),
- MHZ(150),
- MHZ(200),
+ SR_HZ(100),
+ SR_HZ(500),
+ SR_KHZ(1),
+ SR_KHZ(5),
+ SR_KHZ(25),
+ SR_KHZ(50),
+ SR_KHZ(100),
+ SR_KHZ(200),
+ SR_KHZ(400),
+ SR_KHZ(800),
+ SR_MHZ(1),
+ SR_MHZ(10),
+ SR_MHZ(25),
+ SR_MHZ(50),
+ SR_MHZ(80),
+ SR_MHZ(100),
+ SR_MHZ(150),
+ SR_MHZ(200),
0,
};
-static struct samplerates samplerates = {
- 0, 0, 0,
+static struct sr_samplerates samplerates = {
+ SR_HZ(0),
+ SR_HZ(0),
+ SR_HZ(0),
supported_samplerates,
};
/* TODO: All of these should go in a device-specific struct. */
static uint64_t cur_samplerate = 0;
static uint64_t limit_samples = 0;
-int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
-uint64_t memory_size = 0;
+static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
+static uint64_t memory_size = 0;
static uint8_t probe_mask = 0;
static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 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;
}
}
return 0;
}
-struct sr_device_instance *zp_open_device(int device_index)
+static struct sr_device_instance *zp_open_device(int device_index)
{
struct sr_device_instance *sdi;
libusb_device **devlist;
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;
static int configure_probes(GSList *probes)
{
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
int probe_bit, stage, i;
char *tc;
stage = -1;
for (l = probes; l; l = l->next) {
- probe = (struct probe *)l->data;
+ probe = (struct sr_probe *)l->data;
if (probe->enabled == FALSE)
continue;
probe_bit = 1 << (probe->index - 1);
* API callbacks
*/
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
struct sr_device_instance *sdi;
struct libusb_device_descriptor des;
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);
/* TODO: This will set the same samplerate for all devices. */
static int set_configuration_samplerate(uint64_t 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))
- analyzer_set_freq(samplerate / KHZ(1), FREQ_SCALE_KHZ);
+ sr_info("%s(%" PRIu64 ")", __FUNCTION__, 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 / SR_KHZ(1), FREQ_SCALE_KHZ);
else
analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
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);
header.protocol_id = SR_PROTO_RAW;
header.num_logic_probes = num_channels;
header.num_analog_probes = 0;
- session_bus(session_device_id, &packet);
+ sr_session_bus(session_device_id, &packet);
buf = g_malloc(PACKET_SIZE);
if (!buf)
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);
+ sr_info("Tried to read %llx bytes, actually read %x bytes",
+ PACKET_SIZE, res);
#endif
packet.type = SR_DF_LOGIC;
packet.length = PACKET_SIZE;
packet.unitsize = 4;
packet.payload = buf;
- session_bus(session_device_id, &packet);
+ sr_session_bus(session_device_id, &packet);
}
analyzer_read_stop(sdi->usb->devhdl);
g_free(buf);
packet.type = SR_DF_END;
- session_bus(session_device_id, &packet);
+ sr_session_bus(session_device_id, &packet);
return SR_OK;
}
struct sr_device_instance *sdi;
packet.type = SR_DF_END;
- session_bus(session_device_id, &packet);
+ sr_session_bus(session_device_id, &packet);
if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return; /* TODO: Cry? */
projects / libsigrok.git / blobdiff