X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fprotocol.c;h=41c6dc878cba90fa460d8895548fa553bf527cbb;hb=4b25cbffa17c9b8c9c30f98ffe6918a15b664b2a;hp=4d1b1cceb694a304b77cbc45d8cc7ef9a717e512;hpb=1f4f98e05cd6cd2f245cdc5e0776fe8af1e092c9;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c
index 4d1b1cce..41c6dc87 100644
--- a/src/hardware/asix-sigma/protocol.c
+++ b/src/hardware/asix-sigma/protocol.c
@@ -47,7 +47,7 @@ SR_PRIV const uint64_t samplerates[] = {
 
 SR_PRIV const size_t samplerates_count = ARRAY_SIZE(samplerates);
 
-static const char sigma_firmware_files[][24] = {
+static const char firmware_files[][24] = {
 	/* 50 MHz, supports 8 bit fractions */
 	"asix-sigma-50.fw",
 	/* 100 MHz */
@@ -272,15 +272,6 @@ SR_PRIV int sigma_write_trigger_lut(struct triggerlut *lut, struct dev_context *
 	return SR_OK;
 }
 
-SR_PRIV void sigma_clear_helper(void *priv)
-{
-	struct dev_context *devc;
-
-	devc = priv;
-
-	ftdi_deinit(&devc->ftdic);
-}
-
 /*
  * Configure the FPGA for bitbang mode.
  * This sequence is documented in section 2. of the ASIX Sigma programming
@@ -448,7 +439,7 @@ static int upload_firmware(struct sr_context *ctx,
 	const char *firmware;
 
 	/* Avoid downloading the same firmware multiple times. */
-	firmware = sigma_firmware_files[firmware_idx];
+	firmware = firmware_files[firmware_idx];
 	if (devc->cur_firmware == firmware_idx) {
 		sr_info("Not uploading firmware file '%s' again.", firmware);
 		return SR_OK;
@@ -686,7 +677,6 @@ SR_PRIV int sigma_convert_trigger(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-
 /* Software trigger to determine exact trigger position. */
 static int get_trigger_offset(uint8_t *samples, uint16_t last_sample,
 			      struct sigma_trigger *t)
@@ -1114,7 +1104,7 @@ static int download_capture(struct sr_dev_inst *sdi)
 
 	std_session_send_df_end(sdi);
 
-	sdi->driver->dev_acquisition_stop(sdi);
+	sr_dev_acquisition_stop(sdi);
 
 	g_free(dram_line);