X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-sla5032%2Fapi.c;h=a55c9ed199b30985ccdeb7213bf453b6d8497a53;hb=a0ade2f933d62fee3dea55475c7a9c69883b8b25;hp=d3fca3ddc611ed284c320b3b886f83817d1d17b8;hpb=8da8c8265fabe437db254d3b659785ea2352b7dc;p=libsigrok.git

diff --git a/src/hardware/sysclk-sla5032/api.c b/src/hardware/sysclk-sla5032/api.c
index d3fca3dd..a55c9ed1 100644
--- a/src/hardware/sysclk-sla5032/api.c
+++ b/src/hardware/sysclk-sla5032/api.c
@@ -26,7 +26,6 @@
 #include <libsigrok/libsigrok.h>
 #include <libsigrok-internal.h>
 #include "protocol.h"
-#include "sla5032.h"
 
  /* Number of logic channels. */
 #define NUM_CHANNELS	32
@@ -231,9 +230,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	devc->active_fpga_config = FPGA_NOCONF;
 	devc->state = STATE_IDLE;
 
-	ret = sla5032_apply_fpga_config(sdi);
-
-	return ret;
+	return sla5032_apply_fpga_config(sdi);
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -332,8 +329,7 @@ static int config_set(uint32_t key, GVariant *data,
 		devc->limit_samples = value;
 		break;
 	case SR_CONF_CAPTURE_RATIO:
-		value = g_variant_get_uint64(data);
-		devc->capture_ratio = value;
+		devc->capture_ratio = g_variant_get_uint64(data);
 		break;
 	default:
 		/* Must not happen for a key listed in devopts. */
@@ -373,15 +369,15 @@ static int config_channel_set(const struct sr_dev_inst *sdi,
 }
 
 /* Derive trigger masks from the session's trigger configuration. */
-static int prepare_trigger_masks(const struct sr_dev_inst* sdi)
+static int prepare_trigger_masks(const struct sr_dev_inst *sdi)
 {
 	uint32_t trigger_mask, trigger_values, trigger_edge_mask;
 	uint32_t level_bit, type_bit;
-	struct dev_context* devc;
-	struct sr_trigger* trigger;
-	struct sr_trigger_stage* stage;
-	struct sr_trigger_match* match;
-	const GSList* node;
+	struct dev_context *devc;
+	struct sr_trigger *trigger;
+	struct sr_trigger_stage *stage;
+	struct sr_trigger_match *match;
+	const GSList *node;
 	int idx;
 	enum sr_trigger_matches trg;
 
@@ -505,7 +501,7 @@ static int config_list(uint32_t key, GVariant **data,
  */
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-	return la_start_acquisition(sdi);
+	return sla5032_start_acquisition(sdi);
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)