NULL,
};
-/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
-static GSList *device_instances = NULL;
+/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+static GSList *dev_insts = NULL;
static libusb_context *usb_context = NULL;
uint8_t trigger_value[NUM_TRIGGER_STAGES];
// uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
- struct sr_usb_device_instance *usb;
+ struct sr_usb_dev_inst *usb;
};
static int hw_set_configuration(int device_index, int capability, void *value);
return 0;
}
-static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
+static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
struct libusb_device_descriptor *des)
{
struct zp *zp;
return 0;
}
-static struct sr_device_instance *zp_open_device(int device_index)
+static struct sr_dev_inst *zp_open_device(int device_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
libusb_device **devlist;
struct libusb_device_descriptor des;
int err, i;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
return sdi;
}
-static void close_device(struct sr_device_instance *sdi)
+static void close_device(struct sr_dev_inst *sdi)
{
struct zp *zp;
sdi->status = SR_ST_INACTIVE;
}
-static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
+static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
{
struct zp *zp;
struct sr_probe *probe;
static int hw_init(const char *deviceinfo)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
libusb_device **devlist;
int err, devcnt, i;
* the zeroplus range?
*/
/* Register the device with libsigrok. */
- sdi = sr_dev_inst_new(devcnt,
+ if (!(sdi = sr_dev_inst_new(devcnt,
SR_ST_INACTIVE, USB_VENDOR_NAME,
- USB_MODEL_NAME, USB_MODEL_VERSION);
- if (!sdi) {
- sr_err("zp: %s: sr_device_instance_new failed",
+ USB_MODEL_NAME, USB_MODEL_VERSION))) {
+ sr_err("zp: %s: sr_dev_inst_new failed",
__func__);
return 0;
}
sdi->priv = zp;
- device_instances =
- g_slist_append(device_instances, sdi);
+ dev_insts =
+ g_slist_append(dev_insts, sdi);
zp->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
static int hw_opendev(int device_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct zp *zp;
int err;
static int hw_closedev(int device_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
static int hw_cleanup(void)
{
GSList *l;
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- for (l = device_instances; l; l = l->next) {
+ for (l = dev_insts; l; l = l->next) {
sdi = l->data;
/* Properly close all devices... */
close_device(sdi);
/* ...and free all their memory. */
sr_dev_inst_free(sdi);
}
- g_slist_free(device_instances);
- device_instances = NULL;
+ g_slist_free(dev_insts);
+ dev_insts = NULL;
if (usb_context)
libusb_exit(usb_context);
static void *hw_get_device_info(int device_index, int device_info_id)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct zp *zp;
void *info;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return NULL;
}
static int hw_get_status(int device_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- sdi = sr_dev_inst_get(device_instances, device_index);
+ sdi = sr_dev_inst_get(dev_insts, device_index);
if (sdi)
return sdi->status;
else
return capabilities;
}
-static int set_configuration_samplerate(struct sr_device_instance *sdi,
+static int set_configuration_samplerate(struct sr_dev_inst *sdi,
uint64_t samplerate)
{
struct zp *zp;
static int hw_set_configuration(int device_index, int capability, void *value)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
uint64_t *tmp_u64;
struct zp *zp;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
static int hw_start_acquisition(int device_index, gpointer session_data)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct sr_datafeed_header header;
unsigned char *buf;
struct zp *zp;
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
static int hw_stop_acquisition(int device_index, gpointer session_device_id)
{
struct sr_datafeed_packet packet;
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct zp *zp;
packet.type = SR_DF_END;
sr_session_bus(session_device_id, &packet);
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR_BUG;
}