From 0dba8d303d5788539a5582a48444e8ecb5575b4f Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 15 Oct 2018 00:09:41 +0200 Subject: instance.c: Avoid 4 unneeded forward declarations. --- instance.c | 65 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) (limited to 'instance.c') diff --git a/instance.c b/instance.c index 99caabb..99c5012 100644 --- a/instance.c +++ b/instance.c @@ -30,11 +30,6 @@ extern SRD_PRIV GSList *sessions; -static void srd_inst_join_decode_thread(struct srd_decoder_inst *di); -static void srd_inst_reset_state(struct srd_decoder_inst *di); -static void oldpins_array_seed(struct srd_decoder_inst *di); -static void oldpins_array_free(struct srd_decoder_inst *di); - /** @endcond */ /** @@ -51,6 +46,36 @@ static void oldpins_array_free(struct srd_decoder_inst *di); * @{ */ +static void oldpins_array_seed(struct srd_decoder_inst *di) +{ + size_t count; + GArray *arr; + + if (!di) + return; + if (di->old_pins_array) + return; + + count = di->dec_num_channels; + arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count); + g_array_set_size(arr, count); + memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count); + di->old_pins_array = arr; +} + +static void oldpins_array_free(struct srd_decoder_inst *di) +{ + if (!di) + return; + if (!di->old_pins_array) + return; + + srd_dbg("%s: Releasing initial pin state.", di->inst_id); + + g_array_free(di->old_pins_array, TRUE); + di->old_pins_array = NULL; +} + /** * Set one or more options in a decoder instance. * @@ -626,36 +651,6 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di, GArray *i return SRD_OK; } -static void oldpins_array_seed(struct srd_decoder_inst *di) -{ - size_t count; - GArray *arr; - - if (!di) - return; - if (di->old_pins_array) - return; - - count = di->dec_num_channels; - arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count); - g_array_set_size(arr, count); - memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count); - di->old_pins_array = arr; -} - -static void oldpins_array_free(struct srd_decoder_inst *di) -{ - if (!di) - return; - if (!di->old_pins_array) - return; - - srd_dbg("%s: Releasing initial pin state.", di->inst_id); - - g_array_free(di->old_pins_array, TRUE); - di->old_pins_array = NULL; -} - /** @private */ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di) { -- cgit v1.2.3-70-g09d2