X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fsysclk-lwla%2Fapi.c;h=cac7cfc1462b51269d3a019711736c3f297e4e38;hb=f6129c8f0c92e45de5d70b4101bf2bd759a5fdf7;hp=6055b83d4da6b6a46a65218c82918e7e75c6df43;hpb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 6055b83d..cac7cfc1 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -41,12 +41,12 @@ static const int32_t trigger_matches[] = {
 	SR_TRIGGER_FALLING,
 };
 
-static const char *trigger_source_names[] = {
+static const char *trigger_sources[] = {
 	[TRIGGER_CHANNELS] = "CH",
 	[TRIGGER_EXT_TRG] = "TRG",
 };
 
-static const char *signal_edge_names[] = {
+static const char *signal_edges[] = {
 	[EDGE_POSITIVE] = "r",
 	[EDGE_NEGATIVE] = "f",
 };
@@ -67,7 +67,7 @@ static struct sr_dev_inst *dev_inst_new(const struct model_info *model)
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_INACTIVE;
-	sdi->vendor = g_strdup("SysClk");
+	sdi->vendor = g_strdup("Sysclk");
 	sdi->model = g_strdup(model->name);
 	sdi->priv = devc;
 
@@ -79,7 +79,7 @@ static struct sr_dev_inst *dev_inst_new(const struct model_info *model)
 	return sdi;
 }
 
-/* Create a new device instance for a libusb device if it is a SysClk LWLA
+/* Create a new device instance for a libusb device if it is a Sysclk LWLA
  * device and also matches the connection specification.
  */
 static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches,
@@ -121,7 +121,7 @@ static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches,
 	} else {
 		if (conn_matches)
 			sr_warn("USB device %d.%d (%04x:%04x) is not a"
-				" SysClk LWLA.", bus, address, vid, pid);
+				" Sysclk LWLA.", bus, address, vid, pid);
 		return NULL;
 	}
 	sdi = dev_inst_new(model);
@@ -259,6 +259,8 @@ static int dev_open(struct sr_dev_inst *sdi)
 		/* This delay appears to be necessary for reliable operation. */
 		g_usleep(30 * 1000);
 
+		sdi->status = SR_ST_ACTIVE;
+
 		devc->active_fpga_config = FPGA_NOCONF;
 		devc->short_transfer_quirk = FALSE;
 		devc->state = STATE_IDLE;
@@ -271,6 +273,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 			break;
 
 		/* Rinse and repeat. */
+		sdi->status = SR_ST_INACTIVE;
 		sr_usb_close(usb);
 	}
 
@@ -301,11 +304,12 @@ static int dev_close(struct sr_dev_inst *sdi)
 	if (ret != SR_OK)
 		sr_warn("Unable to shut down device.");
 
-	libusb_release_interface(usb->devhdl, USB_INTERFACE);
+	if (usb->devhdl)
+		libusb_release_interface(usb->devhdl, USB_INTERFACE);
 
 	sr_usb_close(usb);
 
-	return SR_OK;
+	return ret;
 }
 
 /* Check whether the device options contain a specific key.
@@ -358,21 +362,21 @@ static int config_get(uint32_t key, GVariant **data,
 		break;
 	case SR_CONF_CLOCK_EDGE:
 		idx = devc->cfg_clock_edge;
-		if (idx >= ARRAY_SIZE(signal_edge_names))
+		if (idx >= ARRAY_SIZE(signal_edges))
 			return SR_ERR_BUG;
-		*data = g_variant_new_string(signal_edge_names[idx]);
+		*data = g_variant_new_string(signal_edges[idx]);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		idx = devc->cfg_trigger_source;
-		if (idx >= ARRAY_SIZE(trigger_source_names))
+		if (idx >= ARRAY_SIZE(trigger_sources))
 			return SR_ERR_BUG;
-		*data = g_variant_new_string(trigger_source_names[idx]);
+		*data = g_variant_new_string(trigger_sources[idx]);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		idx = devc->cfg_trigger_slope;
-		if (idx >= ARRAY_SIZE(signal_edge_names))
+		if (idx >= ARRAY_SIZE(signal_edges))
 			return SR_ERR_BUG;
-		*data = g_variant_new_string(signal_edge_names[idx]);
+		*data = g_variant_new_string(signal_edges[idx]);
 		break;
 	default:
 		/* Must not happen for a key listed in devopts. */
@@ -427,17 +431,17 @@ static int config_set(uint32_t key, GVariant *data,
 			? CLOCK_EXT_CLK : CLOCK_INTERNAL;
 		break;
 	case SR_CONF_CLOCK_EDGE:
-		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edge_names))) < 0)
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
 			return SR_ERR_ARG;
 		devc->cfg_clock_edge = idx;
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
-		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_source_names))) < 0)
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
 			return SR_ERR_ARG;
 		devc->cfg_trigger_source = idx;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edge_names))) < 0)
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
 			return SR_ERR_ARG;
 		devc->cfg_trigger_slope = idx;
 		break;
@@ -584,6 +588,8 @@ static int config_list(uint32_t key, GVariant **data,
 			(devc) ? devc->model->num_devopts : 0);
 	}
 
+	if (!devc)
+		return SR_ERR_ARG;
 	if (!has_devopt(devc->model, key | SR_CONF_LIST))
 		return SR_ERR_NA;
 
@@ -595,11 +601,11 @@ static int config_list(uint32_t key, GVariant **data,
 		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
-		*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_source_names));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 	case SR_CONF_CLOCK_EDGE:
-		*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edge_names));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edges));
 		break;
 	default:
 		/* Must not happen for a key listed in devopts. */
@@ -634,7 +640,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 static struct sr_dev_driver sysclk_lwla_driver_info = {
 	.name = "sysclk-lwla",
-	.longname = "SysClk LWLA series",
+	.longname = "Sysclk LWLA series",
 	.api_version = 1,
 	.init = std_init,
 	.cleanup = std_cleanup,