std_serial_dev_acquisition_stop(): Remove serial parameter
All callers of std_serial_dev_acquisition_stop() currently pass sdi->conn for the serial parameter. And the other std_serial helper functions already require that the conn field of the sr_driver_inst passed to the functions points to the sr_serial_dev_inst associated with the device. Modify std_serial_dev_acquisition_stop() to follow the same pattern and remove the serial parameter. This simplifies the API and ensures consistent behaviour between different drivers. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
parent
bee2b0168c
commit
15f96409dc
|
@ -210,8 +210,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver agdmm_driver_info = {
|
static struct sr_dev_driver agdmm_driver_info = {
|
||||||
|
|
|
@ -218,7 +218,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver appa_55ii_driver_info = {
|
static struct sr_dev_driver appa_55ii_driver_info = {
|
||||||
|
|
|
@ -338,7 +338,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
|
static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
|
||||||
|
|
|
@ -178,8 +178,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver brymen_bm857_driver_info = {
|
static struct sr_dev_driver brymen_bm857_driver_info = {
|
||||||
|
|
|
@ -369,8 +369,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
if (sdi->status != SR_ST_ACTIVE)
|
if (sdi->status != SR_ST_ACTIVE)
|
||||||
return SR_ERR_DEV_CLOSED;
|
return SR_ERR_DEV_CLOSED;
|
||||||
|
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver cem_dt_885x_driver_info = {
|
static struct sr_dev_driver cem_dt_885x_driver_info = {
|
||||||
|
|
|
@ -186,7 +186,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Driver-specific API function wrappers */
|
/* Driver-specific API function wrappers */
|
||||||
|
|
|
@ -139,8 +139,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver colead_slm_driver_info = {
|
static struct sr_dev_driver colead_slm_driver_info = {
|
||||||
|
|
|
@ -246,8 +246,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver flukedmm_driver_info = {
|
static struct sr_dev_driver flukedmm_driver_info = {
|
||||||
|
|
|
@ -470,8 +470,7 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, dev_close,
|
return std_serial_dev_acquisition_stop(sdi, dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
|
static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
|
||||||
|
|
|
@ -176,8 +176,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
|
#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
|
||||||
|
|
|
@ -366,7 +366,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
return SR_ERR_DEV_CLOSED;
|
return SR_ERR_DEV_CLOSED;
|
||||||
|
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver korad_kaxxxxp_driver_info = {
|
static struct sr_dev_driver korad_kaxxxxp_driver_info = {
|
||||||
|
|
|
@ -372,7 +372,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
|
static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
|
||||||
|
|
|
@ -197,8 +197,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Driver-specific API function wrappers */
|
/* Driver-specific API function wrappers */
|
||||||
|
|
|
@ -782,8 +782,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver motech_lps_301_driver_info = {
|
static struct sr_dev_driver motech_lps_301_driver_info = {
|
||||||
|
|
|
@ -221,8 +221,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver norma_dmm_driver_info = {
|
static struct sr_dev_driver norma_dmm_driver_info = {
|
||||||
|
|
|
@ -321,8 +321,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, dev_close,
|
return std_serial_dev_acquisition_stop(sdi, dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver pce_322a_driver_info = {
|
static struct sr_dev_driver pce_322a_driver_info = {
|
||||||
|
|
|
@ -197,8 +197,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \
|
#define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \
|
||||||
|
|
|
@ -182,7 +182,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver teleinfo_driver_info = {
|
static struct sr_dev_driver teleinfo_driver_info = {
|
||||||
|
|
|
@ -151,8 +151,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
|
return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
|
||||||
sdi->conn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sr_dev_driver tondaj_sl_814_driver_info = {
|
static struct sr_dev_driver tondaj_sl_814_driver_info = {
|
||||||
|
|
|
@ -927,5 +927,5 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
|
||||||
SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
|
SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
return std_serial_dev_acquisition_stop(sdi,
|
return std_serial_dev_acquisition_stop(sdi,
|
||||||
std_serial_dev_close, sdi->conn);
|
std_serial_dev_close);
|
||||||
}
|
}
|
||||||
|
|
|
@ -927,8 +927,7 @@ SR_PRIV int std_cleanup(const struct sr_dev_driver *di);
|
||||||
#ifdef HAVE_LIBSERIALPORT
|
#ifdef HAVE_LIBSERIALPORT
|
||||||
SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
|
SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
|
||||||
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
|
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
|
||||||
dev_close_callback dev_close_fn,
|
dev_close_callback dev_close_fn);
|
||||||
struct sr_serial_dev_inst *serial);
|
|
||||||
#endif
|
#endif
|
||||||
SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi);
|
SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi);
|
||||||
SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi);
|
SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi);
|
||||||
|
|
|
@ -206,8 +206,6 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
|
||||||
* @param cb_data Opaque 'cb_data' pointer. Must not be NULL.
|
* @param cb_data Opaque 'cb_data' pointer. Must not be NULL.
|
||||||
* @param dev_close_fn Function pointer to the driver's dev_close().
|
* @param dev_close_fn Function pointer to the driver's dev_close().
|
||||||
* Must not be NULL.
|
* Must not be NULL.
|
||||||
* @param serial The serial device instance (struct serial_dev_inst *).
|
|
||||||
* Must not be NULL.
|
|
||||||
*
|
*
|
||||||
* @retval SR_OK Success.
|
* @retval SR_OK Success.
|
||||||
* @retval SR_ERR_ARG Invalid arguments.
|
* @retval SR_ERR_ARG Invalid arguments.
|
||||||
|
@ -215,9 +213,9 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
|
||||||
* @retval SR_ERR Other errors.
|
* @retval SR_ERR Other errors.
|
||||||
*/
|
*/
|
||||||
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
|
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
|
||||||
dev_close_callback dev_close_fn,
|
dev_close_callback dev_close_fn)
|
||||||
struct sr_serial_dev_inst *serial)
|
|
||||||
{
|
{
|
||||||
|
struct sr_serial_dev_inst *serial = sdi->conn;
|
||||||
const char *prefix = sdi->driver->name;
|
const char *prefix = sdi->driver->name;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue