X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fpipistrello-ols%2Fapi.c;h=d015d7d572d25d1b7e0e7c9a49f72a680e30334c;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=e877234a21357470aefc45900223c7a090d7c57f;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index e877234a..d015d7d5 100644
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t devopts[] = {
@@ -61,11 +62,10 @@ static const char *patterns[] = {
 };
 
 /* Channels are numbered 0-31 (on the PCB silkscreen). */
-SR_PRIV const char *p_ols_channel_names[NUM_CHANNELS + 1] = {
+SR_PRIV const char *p_ols_channel_names[] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
 	"13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23",
 	"24", "25", "26", "27", "28", "29", "30", "31",
-	NULL,
 };
 
 /* Default supported samplerates, can be overridden by device metadata. */
@@ -94,7 +94,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	(void)options;
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	devices = NULL;
 
@@ -111,10 +111,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devc->flag_reg = 0;
 
 	/* Allocate memory for the incoming ftdi data. */
-	if (!(devc->ftdi_buf = g_try_malloc0(FTDI_BUF_SIZE))) {
-		sr_err("ftdi_buf malloc failed.");
-		goto err_free_devc;
-	}
+	devc->ftdi_buf = g_malloc0(FTDI_BUF_SIZE);
 
 	/* Allocate memory for the FTDI context (ftdic) and initialize it. */
 	if (!(devc->ftdic = ftdi_new())) {
@@ -198,7 +195,6 @@ err_free_ftdic:
 	ftdi_free(devc->ftdic); /* NOT free() or g_free()! */
 err_free_ftdi_buf:
 	g_free(devc->ftdi_buf);
-err_free_devc:
 	g_free(devc);
 
 	return NULL;
@@ -206,7 +202,7 @@ err_free_devc:
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static void clear_helper(void *priv)
@@ -303,10 +299,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		if (devc->capture_ratio < 0 || devc->capture_ratio > 100) {
-			devc->capture_ratio = 0;
+		if (devc->capture_ratio < 0 || devc->capture_ratio > 100)
 			ret = SR_ERR;
-		} else
+		else
 			ret = SR_OK;
 		break;
 	case SR_CONF_EXTERNAL_CLOCK:
@@ -443,7 +438,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (p_ols_open(devc) != SR_OK) {
 		return SR_ERR;
 	} else {
-	  sdi->status = SR_ST_ACTIVE;
+		sdi->status = SR_ST_ACTIVE;
 		return SR_OK;
 	}
 }
@@ -581,7 +576,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	 * buffer.
 	 */
 	sr_dbg("max_samples = %d", devc->max_samples);
-	sr_dbg("limit_samples = %d", devc->limit_samples);
+	sr_dbg("limit_samples = %" PRIu64, devc->limit_samples);
 	samplecount = MIN(devc->max_samples, devc->limit_samples);
 	sr_dbg("Samplecount = %d", samplecount);
 
@@ -694,11 +689,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc->cnt_bytes = devc->cnt_samples = devc->cnt_samples_rle = 0;
 	memset(devc->sample, 0, 4);
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Hook up a dummy handler to receive data from the device. */
-	sr_session_source_add(sdi->session, 0, G_IO_IN, 10, p_ols_receive_data,
+	sr_session_source_add(sdi->session, -1, 0, 10, p_ols_receive_data,
 			cb_data);
 
 	return SR_OK;
@@ -707,7 +701,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
 
 	devc = sdi->priv;
 
@@ -718,12 +711,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	write_shortcommand(devc, CMD_RESET);
 	write_shortcommand(devc, CMD_RESET);
 
-	sr_session_source_remove(sdi->session, 0);
+	sr_session_source_remove(sdi->session, -1);
 
-	/* Send end packet to the session bus. */
-	sr_dbg("Sending SR_DF_END.");
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
+	std_session_send_df_end(cb_data, LOG_PREFIX);
 
 	return SR_OK;
 }
@@ -744,5 +734,5 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };