s/sr_config_make/sr_config_new/.
This matches the naming of other/similar functions better.
This commit is contained in:
parent
333bf022e3
commit
3ebce226a2
|
@ -381,7 +381,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
|
|||
interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
|
||||
packet.type = SR_DF_META;
|
||||
packet.payload = &meta;
|
||||
src = sr_config_make(SR_CONF_SAMPLE_INTERVAL, (const void *)&interval);
|
||||
src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, (const void *)&interval);
|
||||
meta.config = g_slist_append(NULL, src);
|
||||
sr_session_send(devc->cb_data, &packet);
|
||||
g_free(src);
|
||||
|
|
|
@ -355,7 +355,7 @@ 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)
|
||||
{
|
||||
struct sr_config *src;
|
||||
|
||||
|
|
|
@ -121,7 +121,7 @@ static int loadfile(struct sr_input *in, const char *filename)
|
|||
if (ctx->samplerate) {
|
||||
packet.type = SR_DF_META;
|
||||
packet.payload = &meta;
|
||||
src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
|
||||
src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
|
||||
meta.config = g_slist_append(NULL, src);
|
||||
sr_session_send(in->sdi, &packet);
|
||||
}
|
||||
|
|
|
@ -172,7 +172,7 @@ static int loadfile(struct sr_input *in, const char *filename)
|
|||
/* Send metadata about the SR_DF_LOGIC packets to come. */
|
||||
packet.type = SR_DF_META;
|
||||
packet.payload = &meta;
|
||||
src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
|
||||
src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&samplerate);
|
||||
meta.config = g_slist_append(NULL, src);
|
||||
sr_session_send(in->sdi, &packet);
|
||||
|
||||
|
|
|
@ -571,7 +571,7 @@ static int loadfile(struct sr_input *in, const char *filename)
|
|||
packet.type = SR_DF_META;
|
||||
packet.payload = &meta;
|
||||
samplerate = ctx->samplerate / ctx->downsample;
|
||||
src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
|
||||
src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&samplerate);
|
||||
meta.config = g_slist_append(NULL, src);
|
||||
sr_session_send(in->sdi, &packet);
|
||||
|
||||
|
|
|
@ -148,7 +148,7 @@ static int loadfile(struct sr_input *in, const char *filename)
|
|||
|
||||
packet.type = SR_DF_META;
|
||||
packet.payload = &meta;
|
||||
src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
|
||||
src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
|
||||
meta.config = g_slist_append(NULL, src);
|
||||
sr_session_send(in->sdi, &packet);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue