X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=f5b2d9e4443268956df325ccec771397dd993957;hb=697785d1aedc0bf385ea21074d83d61b11d8ce29;hp=a2d616f21f7f7713ce8a47e8cc250bcf8ee8b4f3;hpb=b53738baf76219237e0a6629905981d7a1f2508e;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index a2d616f2..f5b2d9e4 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -370,12 +370,19 @@ static int hw_opendev(int device_index)
 	return SR_OK;
 }
 
-static void hw_closedev(int device_index)
+static int hw_closedev(int device_index)
 {
 	struct sr_device_instance *sdi;
 
-	if ((sdi = sr_get_device_instance(device_instances, device_index)))
-		close_device(sdi);
+	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+		sr_err("lap-c: %s: sdi was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
+	}
+
+	/* TODO */
+	close_device(sdi);
+
+	return SR_OK;
 }
 
 static void hw_cleanup(void)
@@ -565,17 +572,17 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 }
 
 struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
-	"zeroplus-logic-cube",
-	"Zeroplus Logic Cube LAP-C series",
-	1,
-	hw_init,
-	hw_cleanup,
-	hw_opendev,
-	hw_closedev,
-	hw_get_device_info,
-	hw_get_status,
-	hw_get_capabilities,
-	hw_set_configuration,
-	hw_start_acquisition,
-	hw_stop_acquisition,
+	.name = "zeroplus-logic-cube",
+	.longname = "Zeroplus Logic Cube LAP-C series",
+	.api_version = 1,
+	.init = hw_init,
+	.cleanup = hw_cleanup,
+	.opendev = hw_opendev,
+	.closedev = hw_closedev,
+	.get_device_info = hw_get_device_info,
+	.get_status = hw_get_status,
+	.get_capabilities = hw_get_capabilities,
+	.set_configuration = hw_set_configuration,
+	.start_acquisition = hw_start_acquisition,
+	.stop_acquisition = hw_stop_acquisition,
 };