X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fapi.c;h=df2cddbba8000654e34890f7be218df35d003324;hb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;hp=dc575e4f363e9f1c0ee2a83238738d3ed6bfa25f;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index dc575e4f..df2cddbb 100644
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -102,14 +102,12 @@ static const uint8_t coupling_map[] = {
 	0x00, 0x08, 0x04
 };
 
-static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
-			 struct parport *port)
+static GSList *scan_port(GSList *devices, struct parport *port)
 {
 	struct sr_dev_inst *sdi;
 	struct sr_channel *ch;
 	struct sr_channel_group *cg;
 	struct dev_context *devc;
-	struct drv_context *drvc;
 	int i;
 
 	if (ieee1284_open(port, 0, &i) != E1284_OK) {
@@ -135,8 +133,6 @@ static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Hung-Chang");
 	sdi->model = g_strdup("DSO-2100");
-	sdi->driver = di;
-	drvc = di->context;
 	sdi->inst_type = 0; /* FIXME */
 	sdi->conn = port;
 	ieee1284_ref(port);
@@ -169,7 +165,6 @@ static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
 	devc->last_step = 0; /* buffersize = 1000 */
 	sdi->priv = devc;
 
-	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
 fail3:
@@ -209,7 +204,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	for (i = 0; i < ports.portc; i++)
 		if (!strcmp(ports.portv[i]->name, conn)) {
 			port_found = TRUE;
-			devices = scan_port(devices, di, ports.portv[i]);
+			devices = scan_port(devices, ports.portv[i]);
 		}
 
 	if (!port_found) {
@@ -220,7 +215,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	ieee1284_free_ports(&ports);
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static void clear_private(void *priv)
@@ -287,13 +282,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_OK;
-
 	g_free(devc->samples);
 	hung_chang_dso_2100_reset_port(sdi->conn);
 	ieee1284_release(sdi->conn);
 	ieee1284_close(sdi->conn);
+
 	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
@@ -439,9 +432,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (cg) /* sr_config_set will validate cg using config_list */
 		ch = ((struct sr_channel *)cg->channels->data)->index;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
@@ -554,9 +544,6 @@ static int config_commit(const struct sr_dev_inst *sdi)
 	uint8_t state = hung_chang_dso_2100_read_mbox(sdi->conn, 0.02);
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	switch (state) {
 	case 0x03:
 	case 0x14:
@@ -565,10 +552,12 @@ static int config_commit(const struct sr_dev_inst *sdi)
 		break;
 	case 0x00:
 		state = 0x01;
+		/* Fallthrough */
 	default:
 		ret = hung_chang_dso_2100_move_to(sdi, 1);
 		if (ret != SR_OK)
 			return ret;
+		/* Fallthrough */
 	case 0x01:
 		hung_chang_dso_2100_write_mbox(sdi->conn, 4);
 	}
@@ -667,9 +656,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc = sdi->priv;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	if (devc->channel) {
 		static const float res_array[] = {0.5, 1, 2, 5};
 		static const uint8_t relays[] = {100, 10, 10, 1};
@@ -687,7 +673,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	if (ret != SR_OK)
 		return ret;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	sr_session_source_add(sdi->session, -1, 0, 8,
 			      hung_chang_dso_2100_poll, (void *)sdi);
@@ -695,24 +681,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 	sr_session_source_remove(sdi->session, -1);
 	hung_chang_dso_2100_move_to(sdi, 1);
 
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return hung_chang_dso_2100_dev_acquisition_stop(sdi);
-}
-
-SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
+static struct sr_dev_driver hung_chang_dso_2100_driver_info = {
 	.name = "hung-chang-dso-2100",
 	.longname = "Hung-Chang DSO-2100",
 	.api_version = 1,
@@ -732,3 +710,4 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(hung_chang_dso_2100_driver_info);