X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fmic-985xx%2Fprotocol.h;h=c9ba0944a6aaf68004d2bf1e74fe069d485ec90f;hb=58ffcf97121453fb53e885338e23e54c7ed78659;hp=10d95d0978a75d1eb126ca9c2f39020f6f835dd0;hpb=20a7cd07c9d1460e335fc9c3e39378ab708ef4bc;p=libsigrok.git
diff --git a/src/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h
index 10d95d09..c9ba0944 100644
--- 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 .
*/
#ifndef LIBSIGROK_HARDWARE_MIC_985XX_PROTOCOL_H
@@ -25,7 +24,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#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;