Bump copyright year

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index bf0b8b295812bfdcd06ea4245274bd33853c5e96..6f6163b6e2c0a2b99cb2a5c1123d4d0b7967142e 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:
@@ -77,11 +77,11 @@ enum {
 
 /* Handy little macros */
 #define SR_HZ(n)  (n)
-#define SR_KHZ(n) ((n) * 1000)
-#define SR_MHZ(n) ((n) * 1000000)
-#define SR_GHZ(n) ((n) * 1000000000)
+#define SR_KHZ(n) ((n) * (uint64_t)(1000ULL))
+#define SR_MHZ(n) ((n) * (uint64_t)(1000000ULL))
+#define SR_GHZ(n) ((n) * (uint64_t)(1000000000ULL))
 
-#define SR_HZ_TO_NS(n) (1000000000 / (n))
+#define SR_HZ_TO_NS(n) ((uint64_t)(1000000000ULL) / (n))
 
 /** libsigrok loglevels. */
 enum {
@@ -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 {