X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=875291ee9a63de5574fee21165e3a56cb11c0409;hb=6d754b6d3a8f843cd5254617674f484cac9b12db;hp=54d888b07f5a7d9a3b540336bf4b935d88c6abb9;hpb=e519ba8645b56f6c9eaaf69d6357a1efa8df501e;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 54d888b0..875291ee 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)
@@ -519,7 +526,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	sr_session_bus(session_device_id, &packet);
 
 	if (!(buf = g_try_malloc(PACKET_SIZE))) {
-		sr_err("zeroplus: %s: buf malloc failed", __func__);
+		sr_err("lap-c: %s: buf malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -570,8 +577,8 @@ struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
-	.open = hw_opendev,
-	.close = hw_closedev,
+	.opendev = hw_opendev,
+	.closedev = hw_closedev,
 	.get_device_info = hw_get_device_info,
 	.get_status = hw_get_status,
 	.get_capabilities = hw_get_capabilities,