BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std: Standardize function name. 

std_dev_acquisition_stop_serial() is now std_serial_dev_acquisition_stop().
This commit is contained in:
Bert Vermeulen 2013-12-07 20:39:55 +01:00
parent 37fa80b4be
commit d43b090816
14 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/agilent-dmm/api.c
View File

@ -274,7 +274,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}

4
hardware/brymen-dmm/api.c
View File

@ -256,8 +256,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {

4
hardware/cem-dt-885x/api.c
View File

@ -415,10 +415,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return SR_OK;
}
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {

4
hardware/center-3xx/api.c
View File

@ -252,8 +252,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data,
std_serial_dev_close, sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data,
std_serial_dev_close, sdi->conn, LOG_PREFIX);
}
/* Driver-specific API function wrappers */

2
hardware/colead-slm/api.c
View File

@ -222,7 +222,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}

2
hardware/fluke-dmm/api.c
View File

@ -314,7 +314,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}

2
hardware/gmc-mh-1x-2x/api.c
View File

@ -372,7 +372,7 @@ static int dev_acq_stop(struct sr_dev_inst *sdi, void *cb_data)
if (sdi && (devc = sdi->priv) && devc->limit_msec)
g_timer_stop(devc->elapsed_msec);
return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
sdi->conn, LOG_PREFIX);
}

4
hardware/mic-985xx/api.c
View File

@ -254,8 +254,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
/* Driver-specific API function wrappers */

2
hardware/norma-dmm/api.c
View File

@ -302,7 +302,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
if (sdi && (devc = sdi->priv) && devc->limit_msec)
g_timer_stop(devc->elapsed_msec);
return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
sdi->conn, LOG_PREFIX);
}

4
hardware/serial-dmm/api.c
View File

@ -490,8 +490,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
/* Driver-specific API function wrappers */

4
hardware/teleinfo/api.c
View File

@ -278,8 +278,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
SR_PRIV struct sr_dev_driver teleinfo_driver_info = {

4
hardware/tondaj-sl-814/api.c
View File

@ -218,8 +218,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
return std_dev_acquisition_stop_serial(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = {

2
libsigrok-internal.h
View File

@ -181,7 +181,7 @@ typedef void (*std_dev_clear_t)(void *priv);
SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
const char *prefix);
#ifdef HAVE_LIBSERIALPORT
SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data, dev_close_t dev_close_fn,
struct sr_serial_dev_inst *serial, const char *prefix);
#endif

2
std.c
View File

@ -124,7 +124,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
* @retval SR_ERR_DEV_CLOSED Device is closed.
* @retval SR_ERR Other errors.
*/
SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data, dev_close_t dev_close_fn,
struct sr_serial_dev_inst *serial, const char *prefix)
{