Constify a lot more items.

[libsigrok.git] / src / hardware / mic-985xx / protocol.h

diff --git a/src/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h
index 279cca5be79f3ed195a49d27b6f18a9226671907..f0e31a61e8cf5bcded1b4054c45c7422644ede2c 100644 (file)
--- a/src/hardware/mic-985xx/protocol.h
+++ b/src/hardware/mic-985xx/protocol.h
@@ -25,23 +25,20 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "mic-985xx"
 
-/* Note: When adding entries here, don't forget to update MIC_DEV_COUNT. */
 enum {
        MIC_98581,
        MIC_98583,
 };
 
-#define MIC_DEV_COUNT 2
-
 struct mic_dev_info {
-       char *vendor;
-       char *device;
-       char *conn;
+       const char *vendor;
+       const char *device;
+       const char *conn;
        uint32_t max_sample_points;
        gboolean has_temperature;
        gboolean has_humidity;
@@ -51,7 +48,7 @@ struct mic_dev_info {
        int (*receive_data)(int, int, void *);
 };
 
-extern SR_PRIV const struct mic_dev_info mic_devs[MIC_DEV_COUNT];
+extern SR_PRIV const struct mic_dev_info mic_devs[];
 
 #define SERIAL_BUFSIZE 256