configure.ac: Emit a warning if the C++ bindings are not being built.

[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 10d95d0978a75d1eb126ca9c2f39020f6f835dd0..c9ba0944a6aaf68004d2bf1e74fe069d485ec90f 100644 (file)
--- a/src/hardware/mic-985xx/protocol.h
+++ b/src/hardware/mic-985xx/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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBSIGROK_HARDWARE_MIC_985XX_PROTOCOL_H
@@ -25,7 +24,7 @@
 #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"
@@ -36,9 +35,9 @@ enum {
 };
 
 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;
@@ -52,21 +51,8 @@ extern SR_PRIV const struct mic_dev_info mic_devs[];
 
 #define SERIAL_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;
 
        uint8_t buf[SERIAL_BUFSIZE];
        int bufoffset;