output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / manson-hcs-3xxx / protocol.h

diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index 465cdd9d9315f38fe01332659ab2f895e044228d..da47afb0c56f92eaf0e10874ef534a7005114289 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -15,15 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file
-  *  <em>Manson HCS-3xxx Series</em> power supply driver
-  *  @internal
-  */
-
 #ifndef LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
 
@@ -31,7 +25,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "manson-hcs-3xxx"
@@ -58,25 +52,19 @@ enum {
 /** Information on a single model. */
 struct hcs_model {
        int model_id;      /**< Model info */
-       char *name;        /**< Model name */
-       char *id;          /**< Model ID, like delivered by interface */
+       const char *name;  /**< Model name */
+       const char *id;    /**< Model ID, like delivered by interface */
        double voltage[3]; /**< Min, max, step */
        double current[3]; /**< Min, max, step */
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
        const struct hcs_model *model; /**< Model information. */
 
-       uint64_t limit_samples;
-       uint64_t limit_msec;
-       uint64_t num_samples;
-       int64_t starttime;
+       struct sr_sw_limits limits;
        int64_t req_sent_at;
        gboolean reply_pending;
 
-       void *cb_data;
-
        float current;          /**< Last current value [A] read from device. */
        float current_max;      /**< Output current set. */
        float current_max_device;/**< Device-provided maximum output current. */