Add Rigol DS1052E/1102E VID:PID

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index d4dd7bb65fa598f0d5a0f7fc260511fcf3de978c..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
@@ -36,7 +36,7 @@ extern "C" {
  * The public libsigrok header file to be used by frontends.
  *
  * This is the only file that libsigrok users (frontends) are supposed to
- * use and #include. There are other header files which get installed with
+ * use and \#include. There are other header files which get installed with
  * libsigrok, but those are not meant to be used directly by frontends.
  *
  * The correct way to get/use the libsigrok API functions is:
@@ -522,7 +522,7 @@ struct sr_probe {
 
 struct sr_config {
        int key;
-       const void *value;
+       GVariant *data;
 };
 
 struct sr_config_info {
@@ -594,7 +594,7 @@ enum {
 
        /*--- Device configuration ------------------------------------------*/
 
-       /** The device supports setting/changing its samplerate. */
+       /** The device supports setting its samplerate, in Hz. */
        SR_CONF_SAMPLERATE = 30000,
 
        /** The device supports setting a pre/post-trigger capture ratio. */
@@ -633,6 +633,9 @@ enum {
        /** Trigger types.  */
        SR_CONF_TRIGGER_TYPE,
 
+       /** The device supports setting its sample interval, in ms. */
+       SR_CONF_SAMPLE_INTERVAL,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /** Scan options supported by the driver. */
@@ -679,6 +682,10 @@ enum {
         * samples continuously, until explicitly stopped by a certain command.
         */
        SR_CONF_CONTINUOUS,
+
+       /** The device has internal storage, into which data is logged. This
+        * starts or stops the internal logging. */
+       SR_CONF_DATALOG,
 };
 
 struct sr_dev_inst {
@@ -715,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;
@@ -737,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 */