probe_groups: API changes required to implement probe groups.

[libsigrok.git] / hardware / ikalogic-scanaplus / api.c

diff --git a/hardware/ikalogic-scanaplus/api.c b/hardware/ikalogic-scanaplus/api.c
index 7f1109a8fda1f9bdc1ecdbae658380b860825134..ba5b1b1103c8cc9571f5266f9483d15171ad7cbb 100644 (file)
--- a/hardware/ikalogic-scanaplus/api.c
+++ b/hardware/ikalogic-scanaplus/api.c
@@ -22,7 +22,7 @@
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_DEVICE_ID                  0x6014
-#define USB_VENDOR_NAME                        "Ikalogic"
+#define USB_VENDOR_NAME                        "IKALOGIC"
 #define USB_MODEL_NAME                 "ScanaPLUS"
 #define USB_IPRODUCT                   "SCANAPLUS"
 
@@ -42,7 +42,7 @@ static const char *probe_names[] = {
        NULL,
 };
 
-/* Note: The Ikalogic ScanaPLUS always samples at 100MHz. */
+/* Note: The IKALOGIC ScanaPLUS always samples at 100MHz. */
 static uint64_t samplerates[1] = { SR_MHZ(100) };
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
@@ -279,9 +279,11 @@ static int cleanup(void)
        return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
@@ -295,10 +297,13 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -329,12 +334,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        GVariant *gvar;
        GVariantBuilder gvb;
 
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -413,7 +420,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info = {
        .name = "ikalogic-scanaplus",
-       .longname = "Ikalogic ScanaPLUS",
+       .longname = "IKALOGIC ScanaPLUS",
        .api_version = 1,
        .init = init,
        .cleanup = cleanup,