X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=48d3cb8fd5b0151d7d6a1414419e45a7f7786435;hb=54d471f4980f1b975188b5e8bdf5aa90acd3cece;hp=0c00c2fa2411ee03cfd0c669358bd3b1fb2f9232;hpb=cd04f641a59806fa5c88abd73766d254dcda4012;p=libsigrok.git

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 0c00c2fa..48d3cb8f 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -151,37 +150,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	GVariantBuilder gvb;
-	int ret;
-
-	/* Always available. */
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (!sdi)
-		return SR_ERR_ARG;
-
-	ret = SR_OK;
-
 	if (!cg) {
-		/* No channel group: global options. */
-		switch (key) {
-		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
-		default:
-			return SR_ERR_NA;
-		}
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	} else {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
@@ -189,26 +159,20 @@ static int config_list(uint32_t key, GVariant **data,
 				devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
 			break;
 		case SR_CONF_CURRENT_LIMIT:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, step. */
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(6.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.001)); /* 1mA steps */
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_min_max_step(0.0, 6.0, 0.001);
 			break;
 		default:
 			return SR_ERR_NA;
 		}
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_get(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 	float fvalue;
 
 	(void)cg;
@@ -224,7 +188,6 @@ static int config_get(uint32_t key, GVariant **data,
 	 *  - SR_CONF_ENABLED (state cannot be queried, only set)
 	 */
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 	case SR_CONF_LIMIT_MSEC:
@@ -268,7 +231,7 @@ static int config_get(uint32_t key, GVariant **data,
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
@@ -279,9 +242,6 @@ static int config_set(uint32_t key, GVariant *data,
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	ret = SR_OK;
@@ -309,9 +269,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	serial = sdi->conn;
 
@@ -323,7 +280,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	/* Poll every 100ms, or whenever some data comes in. */
 	serial_source_add(sdi->session, serial, G_IO_IN, 100,
 			  reloadpro_receive_data, (void *)sdi);
 
@@ -344,6 +300,7 @@ static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,