/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 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
#define SR_HZ_TO_NS(n) (1000000000 / (n))
/* libsigrok loglevels. */
-#define SR_LOG_NONE 0 /**< Output no messages at all. */
+#define SR_LOG_NONE 0 /**< Output no messages at all. */
#define SR_LOG_ERR 1 /**< Output error messages. */
-#define SR_LOG_WARN 2 /**< Output warnings. */
-#define SR_LOG_INFO 3 /**< Output informational messages. */
+#define SR_LOG_WARN 2 /**< Output warnings. */
+#define SR_LOG_INFO 3 /**< Output informational messages. */
#define SR_LOG_DBG 4 /**< Output debug messages. */
-#define SR_LOG_SPEW 5 /**< Output very noisy debug messages. */
+#define SR_LOG_SPEW 5 /**< Output very noisy debug messages. */
/*
* Use SR_API to mark public API symbols, and SR_PRIV for private symbols.
char *shortname;
};
-struct sr_device_instance {
+struct sr_dev_inst {
int index;
int status;
int instance_type;
void *priv;
};
-/* sr_device_instance types */
+/* sr_dev_inst types */
enum {
SR_USB_INSTANCE,
SR_SERIAL_INSTANCE,
/* Device info IDs */
enum {
- /* struct sr_device_instance for this specific device */
+ /* struct sr_dev_inst for this specific device */
SR_DI_INSTANCE,
/* The number of probes connected to this device */
SR_DI_NUM_PROBES,
char *longname;
int api_version;
int (*init) (const char *deviceinfo);
- void (*cleanup) (void);
+ int (*cleanup) (void);
/* Device-specific */
int (*opendev) (int device_index);
int *(*get_capabilities) (void);
int (*set_configuration) (int device_index, int capability, void *value);
int (*start_acquisition) (int device_index, gpointer session_device_id);
- void (*stop_acquisition) (int device_index, gpointer session_device_id);
+ int (*stop_acquisition) (int device_index, gpointer session_device_id);
};
struct sr_session {