X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=28b22015d3fd13f449c0379cf7f84d92b5e8363b;hb=e26a443aadd8ad75dc45d58ffa51e8e86fbb804f;hp=f08671fb1081b28083601d0113c7afad8b4a0ccd;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index f08671fb..28b22015 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -113,8 +113,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
-	serial_flush(serial);
-
 	/* This is how the vendor software scans for hardware. */
 	memset(packet, 0, PACKET_SIZE);
 	packet[0] = 0xaa;
@@ -159,11 +157,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 	for (i = 0; i < MAX_CHANNELS; i++) {
 		snprintf(channel, 10, "CH%d", i + 1);
 		ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel);
-		cg = g_malloc(sizeof(struct sr_channel_group));
-		cg->name = g_strdup(channel);
+		cg = sr_channel_group_new(sdi, channel, NULL);
 		cg->channels = g_slist_append(NULL, ch);
-		cg->priv = NULL;
-		sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 	}
 
 	devc = g_malloc0(sizeof(struct dev_context));
@@ -317,6 +312,8 @@ static int config_list(uint32_t key, GVariant **data,
 		case SR_CONF_DEVICE_OPTIONS:
 			return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 		case SR_CONF_CHANNEL_CONFIG:
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
 			if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {
 				/* The 1-channel models. */
 				*data = g_variant_new_strv(channel_modes, 1);
@@ -338,9 +335,13 @@ static int config_list(uint32_t key, GVariant **data,
 			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
 			break;
 		case SR_CONF_VOLTAGE_TARGET:
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
 			*data = std_gvar_min_max_step_array(devc->model->channels[channel].voltage);
 			break;
 		case SR_CONF_CURRENT_LIMIT:
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
 			*data = std_gvar_min_max_step_array(devc->model->channels[channel].current);
 			break;
 		default: