X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.h;h=4258d413d4a3bad72fee264d3f4adb56b2c5cc78;hb=66f5f6978e7f8a3ff3fc97573e79faca44f8775b;hp=3e063664839a89fdab8ad2454b3f3b744640bff4;hpb=f05406117d67de3bd8aa5f904573bdd5d7ba401f;p=libsigrok.git
diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h
index 3e063664..4258d413 100644
--- a/src/hardware/uni-t-dmm/protocol.h
+++ b/src/hardware/uni-t-dmm/protocol.h
@@ -14,8 +14,7 @@
* 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 .
*/
#ifndef LIBSIGROK_HARDWARE_UNI_T_DMM_PROTOCOL_H
@@ -24,15 +23,15 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "uni-t-dmm"
struct dmm_info {
struct sr_dev_driver di;
- char *vendor;
- char *device;
+ const char *vendor;
+ const char *device;
uint32_t baudrate;
int packet_size;
gboolean (*packet_valid)(const uint8_t *);
@@ -46,21 +45,8 @@ struct dmm_info {
#define DMM_BUFSIZE 256
-/** Private, per-device-instance driver context. */
struct dev_context {
- /** The current sampling limit (in number of samples). */
- uint64_t limit_samples;
-
- /** The current sampling limit (in ms). */
- uint64_t limit_msec;
-
- /** Opaque pointer passed in by the frontend. */
- void *cb_data;
-
- /** The current number of already received samples. */
- uint64_t num_samples;
-
- int64_t starttime;
+ struct sr_sw_limits limits;
gboolean first_run;