X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=ff6223c64ff7adf700f5ab43969319457f5659e0;hb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;hp=59709e63d195fb6ed8879371c37e299d19e0a787;hpb=4c0e310ca305ba776aa70d8062f467ac246c910b;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 59709e63..ff6223c6 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -113,7 +113,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 /*--- hwdriver.c ------------------------------------------------------------*/
 
 SR_PRIV void sr_hw_cleanup_all(void);
-SR_PRIV struct sr_config *sr_config_make(int key, const void *value);
+SR_PRIV struct sr_config *sr_config_new(int key, const void *value);
 SR_PRIV int sr_source_remove(int fd);
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
 			  sr_receive_data_callback_t cb, void *cb_data);
@@ -123,6 +123,18 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 			    const struct sr_datafeed_packet *packet);
 
+/*--- std.c -----------------------------------------------------------------*/
+
+typedef int (*dev_close_t)(struct sr_dev_inst *sdi);
+
+SR_PRIV int std_hw_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
+			const char *prefix);
+SR_PRIV int std_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+			void *cb_data, dev_close_t hw_dev_close_fn,
+			struct sr_serial_dev_inst *serial, const char *prefix);
+SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
+				       const char *prefix);
+
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
 enum {
@@ -227,7 +239,7 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 #define RS9LCD_PACKET_SIZE 9
 
 /* Dummy info struct. The parser does not use it. */
-struct rs9lcd_info {};
+struct rs9lcd_info { int dummy; };
 
 SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,