X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=ff6223c64ff7adf700f5ab43969319457f5659e0;hb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;hp=048ed74f398f6e2efa60d203d8b1e8ecbaf5b418;hpb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 048ed74f..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 + * Copyright (C) 2013 Bert Vermeulen * * 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); @@ -125,9 +125,13 @@ 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);