ikalogic-scanalogic2: Publish SR_CONF_MAX_UNCOMPRESSED_SAMPLES.

[libsigrok.git] / hardware / gmc-mh-1x-2x / api.c

diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c
index c95f3523e72c3cb42fba6f89a4e0a89bfdabc145..197522a2cf3baccd7bfc103bb0f6b0affb63e062 100644 (file)
--- a/hardware/gmc-mh-1x-2x/api.c
+++ b/hardware/gmc-mh-1x-2x/api.c
@@ -26,6 +26,7 @@
 #define VENDOR_GMC "Gossen Metrawatt"
 
 SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
+static struct sr_dev_driver *di = &gmc_mh_1x_2x_rs232_driver_info;
 
 static const int32_t hwopts[] = {
        SR_CONF_CONN,
@@ -39,9 +40,9 @@ static const int32_t hwcaps[] = {
        SR_CONF_CONTINUOUS,
 };
 
-static int init_1x_2x_rs232(struct sr_context *sr_ctx)
+static int init(struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, &gmc_mh_1x_2x_rs232_driver_info, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 /**
@@ -81,7 +82,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
        enum model model;
        gint64 timeout_us;
 
-       model = SR_METRAHIT_NONE;
+       model = METRAHIT_NONE;
        timeout_us = g_get_monotonic_time() + 1 * 1000 * 1000;
 
        /*
@@ -93,7 +94,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
                if ((byte == -1) || (timeout_us < g_get_monotonic_time()))
                        break;
                if ((byte & MSGID_MASK) == MSGID_INF) {
-                       if (!(model = sr_gmc_decode_model_sm(byte & MSGC_MASK)))
+                       if (!(model = gmc_decode_model_sm(byte & MSGC_MASK)))
                                break;
                        /* Now expect (at least) 4 data bytes. */
                        for (cnt = 0; cnt < 4; cnt++) {
@@ -101,7 +102,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
                                if ((byte == -1) ||
                                        ((byte & MSGID_MASK) != MSGID_DATA))
                                {
-                                       model = SR_METRAHIT_NONE;
+                                       model = METRAHIT_NONE;
                                        bytecnt = 100;
                                        break;
                                }
@@ -122,7 +123,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
  * on configuration and measurement mode the intervals can be much larger and
  * then the detection might not work.
  */
-static GSList *scan_1x_2x_rs232(GSList *options)
+static GSList *scan(GSList *options)
 {
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
@@ -134,16 +135,15 @@ static GSList *scan_1x_2x_rs232(GSList *options)
        const char *conn, *serialcomm;
        enum model model;
        gboolean serialcomm_given;
-       int cnt;
 
        devices = NULL;
-       drvc = (&gmc_mh_1x_2x_rs232_driver_info)->priv;
+       drvc = di->priv;
        drvc->instances = NULL;
        conn = serialcomm = NULL;
-       model = SR_METRAHIT_NONE;
+       model = METRAHIT_NONE;
        serialcomm_given = FALSE;
 
-       sr_spew("scan_1x_2x_rs232() called!");
+       sr_spew("scan() called!");
 
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -178,7 +178,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
         * If detection failed and no user-supplied parameters,
         * try second baud rate.
         */
-       if ((model == SR_METRAHIT_NONE) && !serialcomm_given) {
+       if ((model == METRAHIT_NONE) && !serialcomm_given) {
                serialcomm = SERIALCOMM_1X_RS232;
                g_free(serial->serialcomm);
                serial->serialcomm = g_strdup(serialcomm);
@@ -188,10 +188,10 @@ static GSList *scan_1x_2x_rs232(GSList *options)
                }
        }
 
-       if (model != SR_METRAHIT_NONE) {
-               sr_spew("%s %s detected!", VENDOR_GMC, sr_gmc_model_str(model));
+       if (model != METRAHIT_NONE) {
+               sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(model));
                if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC,
-                               sr_gmc_model_str(model), "")))
+                               gmc_model_str(model), "")))
                        return NULL;
                if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
                        sr_err("Device context malloc failed.");
@@ -206,7 +206,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 
                sdi->conn = serial;
                sdi->priv = devc;
-               sdi->driver = &gmc_mh_1x_2x_rs232_driver_info;
+               sdi->driver = di;
                if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
                        return NULL;
                sdi->probes = g_slist_append(sdi->probes, probe);
@@ -217,15 +217,14 @@ static GSList *scan_1x_2x_rs232(GSList *options)
        return devices;
 }
 
-static GSList *dev_list_1x_2x_rs232(void)
+static GSList *dev_list(void)
 {
-       return ((struct drv_context *)(gmc_mh_1x_2x_rs232_driver_info.priv))
-                       ->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear_1x_2x_rs232(void)
+static int dev_clear(void)
 {
-       return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL);
+       return std_dev_clear(di, NULL);
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -240,15 +239,15 @@ static int dev_close(struct sr_dev_inst *sdi)
        if ((devc = sdi->priv) && devc->elapsed_msec) {
                g_timer_destroy(devc->elapsed_msec);
                devc->elapsed_msec = NULL;
-               devc->model = SR_METRAHIT_NONE;
+               devc->model = METRAHIT_NONE;
        }
 
        return SR_OK;
 }
 
-static int cleanup_sm_rs232(void)
+static int cleanup(void)
 {
-       return dev_clear_1x_2x_rs232();
+       return dev_clear();
 }
 
 /** TODO */
@@ -312,6 +311,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_probe_group *probe_group)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -329,8 +329,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int dev_acq_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
-                                    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
@@ -360,7 +359,7 @@ static int dev_acq_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int dev_acq_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
 
@@ -374,20 +373,19 @@ static int dev_acq_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .name = "gmc-mh-1x-2x-rs232",
-       .longname =
-               "Gossen Metrawatt Metrahit 1x/2x DMMs, 'RS232' Interface",
+       .longname = "Gossen Metrawatt Metrahit 1x/2x, 'RS232' interface",
        .api_version = 1,
-       .init = init_1x_2x_rs232,
-       .cleanup = cleanup_sm_rs232,
-       .scan = scan_1x_2x_rs232,
-       .dev_list = dev_list_1x_2x_rs232,
-       .dev_clear = dev_clear_1x_2x_rs232,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = std_serial_dev_open,
        .dev_close = dev_close,
-       .dev_acquisition_start = dev_acq_start_1x_2x_rs232,
-       .dev_acquisition_stop = dev_acq_stop,
+       .dev_acquisition_start = dev_acquisition_start,
+       .dev_acquisition_stop = dev_acquisition_stop,
        .priv = NULL,
 };