Add Rigol DS1052E/1102E VID:PID

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 41031fcab949d02d3ddbfc7b8e2d66f00c3cbabd..a606dfb08ee9933bb4048079061e51b02c5ecf53 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -522,7 +522,7 @@ struct sr_probe {
 
 struct sr_config {
        int key;
-       const void *value;
+       GVariant *data;
 };
 
 struct sr_config_info {
@@ -722,18 +722,6 @@ enum {
        SR_ST_STOPPING,
 };
 
-/*
- * A device supports either a range of samplerates with steps of a given
- * granularity, or is limited to a set of defined samplerates. Use either
- * step or list, but not both.
- */
-struct sr_samplerates {
-       uint64_t low;
-       uint64_t high;
-       uint64_t step;
-       const uint64_t *list;
-};
-
 struct sr_dev_driver {
        /* Driver-specific */
        char *name;
@@ -744,11 +732,11 @@ struct sr_dev_driver {
        GSList *(*scan) (GSList *options);
        GSList *(*dev_list) (void);
        int (*dev_clear) (void);
-       int (*config_get) (int id, const void **value,
+       int (*config_get) (int id, GVariant **data,
                        const struct sr_dev_inst *sdi);
-       int (*config_set) (int id, const void *value,
+       int (*config_set) (int id, GVariant *data,
                        const struct sr_dev_inst *sdi);
-       int (*config_list) (int info_id, const void **data,
+       int (*config_list) (int info_id, GVariant **data,
                        const struct sr_dev_inst *sdi);
 
        /* Device-specific */