X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=8651e779b959ff537498fbc9039541ced70c3e28;hb=4cea9eb20dc8d816a67c57d111a3a4529d452e4d;hp=b6916db196cb88e3edcd81ef23908b54288497af;hpb=d32d961d17e3c7f409912062e5c336c19b6ef270;p=libsigrok.git
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index b6916db1..8651e779 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
@@ -24,7 +25,7 @@
#include
#include
#include
-#include "config.h"
+#include
#include "analyzer.h"
#define USB_VENDOR 0x0c12
@@ -51,7 +52,7 @@ typedef struct {
* 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},
@@ -62,13 +63,13 @@ model_t zeroplus_models[] = {
};
static int capabilities[] = {
- HWCAP_LOGIC_ANALYZER,
- HWCAP_SAMPLERATE,
- HWCAP_PROBECONFIG,
- HWCAP_CAPTURE_RATIO,
+ SR_HWCAP_LOGIC_ANALYZER,
+ SR_HWCAP_SAMPLERATE,
+ SR_HWCAP_PROBECONFIG,
+ SR_HWCAP_CAPTURE_RATIO,
/* These are really implemented in the driver, not the hardware. */
- HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_LIMIT_SAMPLES,
0,
};
@@ -108,7 +109,7 @@ static uint64_t supported_samplerates[] = {
0,
};
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
0, 0, 0,
supported_samplerates,
};
@@ -116,8 +117,8 @@ static struct samplerates 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 };
@@ -176,7 +177,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
/* Found it. */
if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
- (*sdi)->status = ST_ACTIVE;
+ (*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);
@@ -189,7 +190,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
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;
@@ -200,7 +201,7 @@ struct sr_device_instance *zp_open_device(int device_index)
return NULL;
libusb_get_device_list(usb_context, &devlist);
- if (sdi->status == ST_INACTIVE) {
+ if (sdi->status == SR_ST_INACTIVE) {
/* Find the device by vendor, product, bus and address. */
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
@@ -208,12 +209,12 @@ struct sr_device_instance *zp_open_device(int device_index)
err = opendev4(&sdi, devlist[i], &des);
}
} else {
- /* Status must be ST_ACTIVE, i.e. already in use... */
+ /* Status must be SR_ST_ACTIVE, i.e. already in use... */
sdi = NULL;
}
libusb_free_device_list(devlist, 1);
- if (sdi && sdi->status != ST_ACTIVE)
+ if (sdi && sdi->status != SR_ST_ACTIVE)
sdi = NULL;
return sdi;
@@ -229,12 +230,12 @@ static void close_device(struct sr_device_instance *sdi)
libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE);
libusb_close(sdi->usb->devhdl);
sdi->usb->devhdl = NULL;
- sdi->status = ST_INACTIVE;
+ sdi->status = SR_ST_INACTIVE;
}
static int configure_probes(GSList *probes)
{
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
int probe_bit, stage, i;
char *tc;
@@ -247,7 +248,7 @@ static int configure_probes(GSList *probes)
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);
@@ -273,7 +274,7 @@ static int configure_probes(GSList *probes)
* 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;
@@ -306,13 +307,13 @@ static int hw_init(char *deviceinfo)
* the zeroplus range?
*/
sdi = sr_device_instance_new(devcnt,
- ST_INACTIVE, USB_VENDOR_NAME,
+ SR_ST_INACTIVE, USB_VENDOR_NAME,
USB_MODEL_NAME, USB_MODEL_VERSION);
if (!sdi)
return 0;
device_instances =
g_slist_append(device_instances, sdi);
- sdi->usb = usb_device_instance_new(
+ sdi->usb = sr_usb_device_instance_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devcnt++;
@@ -360,7 +361,7 @@ static int hw_opendev(int device_index)
if (cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */
- if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
+ if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE,
&samplerates.low) == SR_ERR)
return SR_ERR;
}
@@ -404,19 +405,19 @@ static void *hw_get_device_info(int device_index, int device_info_id)
return NULL;
switch (device_info_id) {
- case DI_INSTANCE:
+ case SR_DI_INSTANCE:
info = sdi;
break;
- case DI_NUM_PROBES:
+ case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(num_channels);
break;
- case DI_SAMPLERATES:
+ case SR_DI_SAMPLERATES:
info = &samplerates;
break;
- case DI_TRIGGER_TYPES:
+ case SR_DI_TRIGGER_TYPES:
info = TRIGGER_TYPES;
break;
- case DI_CUR_SAMPLERATE:
+ case SR_DI_CUR_SAMPLERATE:
info = &cur_samplerate;
break;
}
@@ -432,7 +433,7 @@ static int hw_get_status(int device_index)
if (sdi)
return sdi->status;
else
- return ST_NOT_FOUND;
+ return SR_ST_NOT_FOUND;
}
static int *hw_get_capabilities(void)
@@ -465,12 +466,12 @@ static int hw_set_configuration(int device_index, int capability, void *value)
return SR_ERR;
switch (capability) {
- case HWCAP_SAMPLERATE:
+ case SR_HWCAP_SAMPLERATE:
tmp_u64 = value;
return set_configuration_samplerate(*tmp_u64);
- case HWCAP_PROBECONFIG:
+ case SR_HWCAP_PROBECONFIG:
return configure_probes((GSList *) value);
- case HWCAP_LIMIT_SAMPLES:
+ case SR_HWCAP_LIMIT_SAMPLES:
tmp_u64 = value;
limit_samples = *tmp_u64;
return SR_OK;
@@ -482,8 +483,8 @@ static int hw_set_configuration(int device_index, int capability, void *value)
static int hw_start_acquisition(int device_index, gpointer session_device_id)
{
struct sr_device_instance *sdi;
- struct datafeed_packet packet;
- struct datafeed_header header;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_header header;
int res;
unsigned int packet_num;
unsigned char *buf;
@@ -505,16 +506,16 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
g_message("Trigger address = 0x%x",
analyzer_get_trigger_address(sdi->usb->devhdl));
- packet.type = DF_HEADER;
- packet.length = sizeof(struct datafeed_header);
+ packet.type = SR_DF_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.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)
@@ -529,17 +530,17 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
PACKET_SIZE, res);
#endif
- packet.type = DF_LOGIC;
+ 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 = DF_END;
- session_bus(session_device_id, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(session_device_id, &packet);
return SR_OK;
}
@@ -547,11 +548,11 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
/* 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 sr_datafeed_packet packet;
struct sr_device_instance *sdi;
- packet.type = DF_END;
- session_bus(session_device_id, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(session_device_id, &packet);
if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return; /* TODO: Cry? */
@@ -560,8 +561,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
/* 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,