X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=640f6975ddf69d4b4c90937d08c89e42d2570dae;hb=3ebce226a2672ea4f0788f5f2a222586148aabc1;hp=41144cbd22dd14616e2b999aa44e7302720f8596;hpb=063e7aef6d41d4c44591ff93672079998bf9622f;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 41144cbd..640f6975 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -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); @@ -125,8 +125,15 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, /*--- 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 ----------------------------------------------*/ @@ -232,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,