X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=f3ee2e3b3ec11f820a93d85ea53d8cceb9595971;hb=be64f90b53d09d9720dc6e06ff8ab61d96c03932;hp=d35669e06005324d0fb993a99d1d78ac7ffd62bf;hpb=edb691fcedb767093885c61d19d8d490c9c8c9c2;p=libsigrok.git

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index d35669e0..f3ee2e3b 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -223,8 +223,6 @@ enum sr_input_meta_keys {
 	SR_INPUT_META_FILESIZE = 0x02,
 	/** The first 128 bytes of the file, provided as a GString. */
 	SR_INPUT_META_HEADER = 0x04,
-	/** The file's MIME type. */
-	SR_INPUT_META_MIMETYPE = 0x08,
 
 	/** The module cannot identify a file without this metadata. */
 	SR_INPUT_META_REQUIRED = 0x80,
@@ -280,7 +278,6 @@ struct sr_input_module {
 	 *   SR_INPUT_META_FILENAME
 	 *   SR_INPUT_META_FILESIZE
 	 *   SR_INPUT_META_HEADER
-	 *   SR_INPUT_META_MIMETYPE
 	 *
 	 * If the high bit (SR_INPUT META_REQUIRED) is set, the module cannot
 	 * identify a stream without the given metadata.
@@ -291,7 +288,7 @@ struct sr_input_module {
 	 * Returns a NULL-terminated list of options this module can take.
 	 * Can be NULL, if the module has no options.
 	 */
-	struct sr_option *(*options) (void);
+	const struct sr_option *(*options) (void);
 
 	/**
 	 * Check if this input module can load and parse the specified stream.
@@ -386,7 +383,7 @@ struct sr_output_module {
 	 * A unique ID for this output module, suitable for use in command-line
 	 * clients, [a-z0-9-]. Must not be NULL.
 	 */
-	char *id;
+	const char *id;
 
 	/**
 	 * A unique name for this output module, suitable for use in GUI
@@ -400,7 +397,7 @@ struct sr_output_module {
 	 * This can be displayed by frontends, e.g. when selecting the output
 	 * module for saving a file.
 	 */
-	char *desc;
+	const char *desc;
 
 	/**
 	 * A NULL terminated array of strings containing a list of file name
@@ -494,7 +491,7 @@ struct sr_transform_module {
 	 * A unique ID for this transform module, suitable for use in
 	 * command-line clients, [a-z0-9-]. Must not be NULL.
 	 */
-	char *id;
+	const char *id;
 
 	/**
 	 * A unique name for this transform module, suitable for use in GUI
@@ -508,7 +505,7 @@ struct sr_transform_module {
 	 * This can be displayed by frontends, e.g. when selecting
 	 * which transform module(s) to add.
 	 */
-	char *desc;
+	const char *desc;
 
 	/**
 	 * Returns a NULL-terminated list of options this transform module
@@ -754,6 +751,12 @@ SR_PRIV void sr_packet_free(struct sr_datafeed_packet *packet);
 
 /*--- session_file.c --------------------------------------------------------*/
 
+#if !HAVE_ZIP_DISCARD
+/* Replace zip_discard() if not available. */
+#define zip_discard(zip) sr_zip_discard(zip)
+SR_PRIV void sr_zip_discard(struct zip *archive);
+#endif
+
 SR_PRIV GKeyFile *sr_sessionfile_read_metadata(struct zip *archive,
 			const struct zip_stat *entry);
 
@@ -1033,6 +1036,22 @@ SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog_old *analog, void *in
 SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog_old *analog, void *info);
 SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog_old *analog, void *info);
 
+/*--- hardware/dmm/dtm0660.c ------------------------------------------------*/
+
+#define DTM0660_PACKET_SIZE 15
+
+struct dtm0660_info {
+	gboolean is_ac, is_dc, is_auto, is_rs232, is_micro, is_nano, is_kilo;
+	gboolean is_diode, is_milli, is_percent, is_mega, is_beep, is_farad;
+	gboolean is_ohm, is_rel, is_hold, is_ampere, is_volt, is_hz, is_bat;
+	gboolean is_degf, is_degc, is_c2c1_01, is_c2c1_00, is_apo, is_min;
+	gboolean is_minmax, is_max, is_sign;
+};
+
+SR_PRIV gboolean sr_dtm0660_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval,
+			struct sr_datafeed_analog_old *analog, void *info);
+
 /*--- hardware/dmm/m2110.c --------------------------------------------------*/
 
 #define BBCGM_M2110_PACKET_SIZE 9