{0x7016, "LAP-C(162000)", 16, 2048, 200},
};
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_PROBECONFIG,
NULL,
};
-/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
-static GSList *device_instances = NULL;
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
+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);
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
static unsigned int get_memory_size(int type)
{
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_dev(int dev_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, dev_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
return sdi;
}
-static void close_device(struct sr_device_instance *sdi)
+static void close_dev(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;
* API callbacks
*/
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
libusb_device **devlist;
int err, devcnt, i;
struct zp *zp;
/* Avoid compiler warnings. */
- (void)deviceinfo;
+ (void)devinfo;
/* Allocate memory for our private driver context. */
if (!(zp = g_try_malloc(sizeof(struct zp)))) {
* 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);
return devcnt;
}
-static int hw_opendev(int device_index)
+static int hw_dev_open(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct zp *zp;
int err;
- if (!(sdi = zp_open_device(device_index))) {
+ if (!(sdi = zp_open_dev(dev_index))) {
sr_err("zp: unable to open device");
return SR_ERR;
}
- /* TODO: Note: sdi is retrieved in zp_open_device(). */
+ /* TODO: Note: sdi is retrieved in zp_open_dev(). */
if (!(zp = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
if (zp->cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */
- if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
&samplerates.list[0]) == SR_ERR)
return SR_ERR;
}
return SR_OK;
}
-static int hw_closedev(int device_index)
+static int hw_dev_close(int dev_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, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
/* TODO */
- close_device(sdi);
+ close_dev(sdi);
return SR_OK;
}
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);
+ close_dev(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);
return SR_OK;
}
-static void *hw_get_device_info(int device_index, int device_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_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, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return NULL;
}
return NULL;
}
- switch (device_info_id) {
- case SR_DI_INSTANCE:
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
break;
case SR_DI_NUM_PROBES:
return info;
}
-static int hw_get_status(int device_index)
+static int hw_dev_status_get(int dev_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, dev_index);
if (sdi)
return sdi->status;
else
return SR_ST_NOT_FOUND;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int set_configuration_samplerate(struct sr_device_instance *sdi,
- uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
struct zp *zp;
return SR_OK;
}
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, 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, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
return SR_ERR_ARG;
}
- switch (capability) {
+ switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
tmp_u64 = value;
- return set_configuration_samplerate(sdi, *tmp_u64);
+ return set_samplerate(sdi, *tmp_u64);
case SR_HWCAP_PROBECONFIG:
return configure_probes(sdi, (GSList *)value);
case SR_HWCAP_LIMIT_SAMPLES:
}
}
-static int hw_start_acquisition(int device_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_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, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
return SR_OK;
}
-/* This stops acquisition on ALL devices, ignoring device_index. */
-static int hw_stop_acquisition(int device_index, gpointer session_device_id)
+/* This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_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);
+ sr_session_bus(session_dev_id, &packet);
- if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR_BUG;
}
return SR_OK;
}
-SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
+SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
.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,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
+ .dev_info_get = hw_dev_info_get,
+ .dev_status_get = hw_dev_status_get,
+ .hwcap_get_all = hw_hwcap_get_all,
+ .dev_config_set = hw_dev_config_set,
+ .dev_acquisition_start = hw_dev_acquisition_start,
+ .dev_acquisition_stop = hw_dev_acquisition_stop,
};
projects / libsigrok.git / blobdiff