X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=f2706d11220e17006f4556f2887dffebd1445184;hb=ed229aaa8ff66116967f75112be953940d4a3149;hp=8862db242f8c1d610621986e66fcc087fb07a16b;hpb=f366e86c68071fa7888259aa3963b213caa81b51;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 8862db24..f2706d11 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -38,15 +38,15 @@
 #include <arpa/inet.h>
 #endif
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "ols.h"
 
 #ifdef _WIN32
 #define O_NONBLOCK FIONBIO
 #endif
 
-static int hwcaps[] = {
+static const int hwcaps[] = {
 	SR_HWCAP_LOGIC_ANALYZER,
 	SR_HWCAP_SAMPLERATE,
 	SR_HWCAP_CAPTURE_RATIO,
@@ -93,14 +93,14 @@ static const char *probe_names[NUM_PROBES + 1] = {
 };
 
 /* default supported samplerates, can be overridden by device metadata */
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
 	SR_HZ(10),
 	SR_MHZ(200),
 	SR_HZ(1),
 	NULL,
 };
 
-/* List of struct sr_serial_dev_inst */
+/* List of struct sr_dev_inst. */
 static GSList *dev_insts = NULL;
 
 static int send_shortcommand(int fd, uint8_t command)
@@ -131,10 +131,10 @@ static int send_longcommand(int fd, uint8_t command, uint32_t data)
 	return SR_OK;
 }
 
-static int configure_probes(struct context *ctx, GSList *probes)
+static int configure_probes(struct context *ctx, const GSList *probes)
 {
-	struct sr_probe *probe;
-	GSList *l;
+	const struct sr_probe *probe;
+	const GSList *l;
 	int probe_bit, stage, i;
 	char *tc;
 
@@ -146,7 +146,7 @@ static int configure_probes(struct context *ctx, GSList *probes)
 
 	ctx->num_stages = 0;
 	for (l = probes; l; l = l->next) {
-		probe = (struct sr_probe *)l->data;
+		probe = (const struct sr_probe *)l->data;
 		if (!probe->enabled)
 			continue;
 
@@ -398,7 +398,7 @@ static int hw_init(const char *devinfo)
 		fd = serial_open(l->data, O_RDWR | O_NONBLOCK);
 		if (fd != -1) {
 			serial_params[devcnt] = serial_backup_params(fd);
-			serial_set_params(fd, 115200, 8, 0, 1, 2);
+			serial_set_params(fd, 115200, 8, SERIAL_PARITY_NONE, 1, 2);
 			ret = SR_OK;
 			for (i = 0; i < 5; i++) {
 				if ((ret = send_shortcommand(fd,
@@ -557,11 +557,11 @@ static int hw_cleanup(void)
 	return ret;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
-	void *info;
+	const void *info;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return NULL;
@@ -602,7 +602,7 @@ static int hw_dev_status_get(int dev_index)
 	return sdi->status;
 }
 
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
 {
 	return hwcaps;
 }
@@ -639,12 +639,12 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
 	return SR_OK;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
 	int ret;
-	uint64_t *tmp_u64;
+	const uint64_t *tmp_u64;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR;
@@ -655,10 +655,10 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 
 	switch (hwcap) {
 	case SR_HWCAP_SAMPLERATE:
-		ret = set_samplerate(sdi, *(uint64_t *)value);
+		ret = set_samplerate(sdi, *(const uint64_t *)value);
 		break;
 	case SR_HWCAP_PROBECONFIG:
-		ret = configure_probes(ctx, (GSList *)value);
+		ret = configure_probes(ctx, (const GSList *)value);
 		break;
 	case SR_HWCAP_LIMIT_SAMPLES:
 		tmp_u64 = value;
@@ -671,7 +671,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 		ret = SR_OK;
 		break;
 	case SR_HWCAP_CAPTURE_RATIO:
-		ctx->capture_ratio = *(uint64_t *)value;
+		ctx->capture_ratio = *(const uint64_t *)value;
 		if (ctx->capture_ratio < 0 || ctx->capture_ratio > 100) {
 			ctx->capture_ratio = 0;
 			ret = SR_ERR;