X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=a6ff339b77f3819b6e450eaf591fd36d0aac0ffb;hb=HEAD;hp=0311f68e2db843fb0a305b186b941979012a9226;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 0311f68e..8d23b9e2 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -166,8 +166,10 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
 	probe_name_path(addr, path);
 	status = g_file_get_contents(path->str, &buf, &size, &err);
 	if (!status) {
-		sr_dbg("Name for probe %d can't be read: %s",
-		       prb_num, err->message);
+		/* Don't log "No such file or directory" messages. */
+		if (err->code != G_FILE_ERROR_NOENT)
+			sr_dbg("Name for probe %d can't be read (%d): %s",
+			       prb_num, err->code, err->message);
 		g_string_free(path, TRUE);
 		g_error_free(err);
 		return ret;
@@ -308,11 +310,11 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
 static int revB_addr_to_num(unsigned int addr)
 {
 	switch (addr) {
-	case 0x44:	return 5;
-	case 0x45:	return 6;
-	case 0x42:	return 3;
-	case 0x43:	return 4;
-	default:	return addr - 0x3f;
+	case 0x44: return 5;
+	case 0x45: return 6;
+	case 0x42: return 3;
+	case 0x43: return 4;
+	default:   return addr - 0x3f;
 	}
 }
 
@@ -330,9 +332,8 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
 	if (hwmon < 0)
 		return FALSE;
 
-	cg = g_malloc0(sizeof(struct sr_channel_group));
 	cgp = g_malloc0(sizeof(struct channel_group_priv));
-	cg->priv = cgp;
+	cg = sr_channel_group_new(sdi, NULL, cgp);
 
 	/*
 	 * See if we can read the EEPROM contents. If not, assume it's
@@ -378,8 +379,6 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
 		sr_err("Invalid probe type: %d.", type);
 	}
 
-	sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
-
 	return TRUE;
 }
 
@@ -701,7 +700,7 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
 	uint64_t nrexpiration;
-	struct sr_datafeed_packet packet, framep;
+	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
 	struct sr_analog_encoding encoding;
 	struct sr_analog_meaning meaning;
@@ -757,8 +756,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 	 * accuracy.
 	 */
 	for (i = 0; i < nrexpiration; i++) {
-		framep.type = SR_DF_FRAME_BEGIN;
-		sr_session_send(sdi, &framep);
+		std_session_send_df_frame_begin(sdi);
 
 		/*
 		 * Due to different units used in each channel we're sending
@@ -786,8 +784,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 			sr_session_send(sdi, &packet);
 		}
 
-		framep.type = SR_DF_FRAME_END;
-		sr_session_send(sdi, &framep);
+		std_session_send_df_frame_end(sdi);
 	}
 
 	sr_sw_limits_update_samples_read(&devc->limits, 1);