Put driver pointers into special section

[libsigrok.git] / src / hardware / arachnid-labs-re-load-pro / api.c

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 4dc594a58b52143b9f3a33ae7644b0babfb8eb09..aeacda1046d5a1cd39a5f2ec8f703e7cee8efd35 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -37,7 +37,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-       SR_CONF_CONTINUOUS | SR_CONF_SET,
+       SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
@@ -52,15 +52,10 @@ static const uint32_t devopts_cg[] = {
        SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET,
        SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET,
        SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
+       SR_CONF_UNDER_VOLTAGE_CONDITION | SR_CONF_GET,
+       SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE | SR_CONF_GET,
 };
 
-SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_dev_inst *sdi;
@@ -132,11 +127,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        }
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       sdi->status = SR_ST_ACTIVE;
+       sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Arachnid Labs");
        sdi->model = g_strdup("Re:load Pro");
        sdi->version = g_strdup(buf + 8);
-       sdi->driver = &arachnid_labs_re_load_pro_driver_info;
+       sdi->driver = di;
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
 
@@ -162,21 +157,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_list(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -290,6 +270,12 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
                *data = g_variant_new_boolean(devc->otp_active);
                break;
+       case SR_CONF_UNDER_VOLTAGE_CONDITION:
+               *data = g_variant_new_boolean(TRUE); /* Always on. */
+               break;
+       case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE:
+               *data = g_variant_new_boolean(devc->uvc_active);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -332,19 +318,16 @@ static int config_set(uint32_t key, GVariant *data,
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        int ret;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-
        serial = sdi->conn;
 
        /* Send the 'monitor <ms>' command (doesn't have a reply). */
@@ -359,7 +342,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        serial_source_add(sdi->session, serial, G_IO_IN, 100,
                          reloadpro_receive_data, (void *)sdi);
 
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        memset(devc->buf, 0, RELOADPRO_BUFSIZE);
        devc->buflen = 0;
@@ -369,21 +352,20 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       return std_serial_dev_acquisition_stop(sdi, cb_data,
+       return std_serial_dev_acquisition_stop(sdi,
                std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
-SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
+static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
        .name = "arachnid-labs-re-load-pro",
        .longname = "Arachnid Labs Re:load Pro",
        .api_version = 1,
-       .init = init,
-       .cleanup = cleanup,
+       .init = std_init,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_list = std_dev_list,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
@@ -393,3 +375,4 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(arachnid_labs_re_load_pro_driver_info);