- Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH] sof: check for missing prototypes
by Pierre-Louis Bossart 25 Sep '17

25 Sep '17

gcc -Wall is not enough, add -Wmissing-prototypes to align with kernel warnings. Add relevant includes and move functions without prototype as static Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- configure.ac | 2 +- src/arch/xtensa/task.c | 1 + src/audio/src_core.c | 6 +++--- src/include/reef/init.h | 2 ++ src/include/reef/interrupt.h | 2 +- src/ipc/pmc-ipc.c | 1 + src/lib/schedule.c | 8 +++++--- src/platform/baytrail/platform.c | 1 + src/platform/baytrail/timer.c | 2 +- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 1c6fd0a..e8c8edf 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([REEF_MINOR], reef_minor, [Reef minor version]) AC_CANONICAL_HOST # General compiler flags -CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -fno-inline-functions -nostdlib" +CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -fno-inline-functions -nostdlib -Wmissing-prototypes" # Cross compiler tool libgcc and headers AC_ARG_WITH([root-dir], diff --git a/src/arch/xtensa/task.c b/src/arch/xtensa/task.c index 7e74c07..349f8ab 100644 --- a/src/arch/xtensa/task.c +++ b/src/arch/xtensa/task.c @@ -33,6 +33,7 @@ #include <reef/interrupt.h> #include <platform/platform.h> #include <reef/debug.h> +#include <arch/task.h> #include <stdint.h> #include <errno.h> diff --git a/src/audio/src_core.c b/src/audio/src_core.c index bce3586..5b804d6 100644 --- a/src/audio/src_core.c +++ b/src/audio/src_core.c @@ -52,21 +52,21 @@ int sof_rates[SOF_RATES_LENGTH] = {8000, 11025, 12000, 16000, 18900, 192000}; /* Calculates the needed FIR delay line length */ -int src_fir_delay_length(struct src_stage *s) +static int src_fir_delay_length(struct src_stage *s) { return s->subfilter_length + (s->num_of_subfilters - 1) * s->idm + s->blk_in; } /* Calculates the FIR output delay line length */ -int src_out_delay_length(struct src_stage *s) +static int src_out_delay_length(struct src_stage *s) { return (s->num_of_subfilters - 1) * s->odm + 1; } /* Returns index of a matching sample rate */ -int src_find_fs(int fs_list[], int list_length, int fs) +static int src_find_fs(int fs_list[], int list_length, int fs) { int i; diff --git a/src/include/reef/init.h b/src/include/reef/init.h index c2eaf87..9d97b48 100644 --- a/src/include/reef/init.h +++ b/src/include/reef/init.h @@ -38,4 +38,6 @@ int main(int argc, char *argv[]); int arch_init(struct reef *reef); +void __memmap_init(void); + #endif diff --git a/src/include/reef/interrupt.h b/src/include/reef/interrupt.h index 3c78e77..ea7d057 100644 --- a/src/include/reef/interrupt.h +++ b/src/include/reef/interrupt.h @@ -79,7 +79,7 @@ static inline void interrupt_global_enable(uint32_t flags) arch_interrupt_global_enable(flags); } -uint32_t platform_interrupt_get_enabled(); +uint32_t platform_interrupt_get_enabled(void); void platform_interrupt_clear(uint32_t irq, uint32_t mask); void platform_interrupt_mask(uint32_t irq, uint32_t mask); void platform_interrupt_unmask(uint32_t irq, uint32_t mask); diff --git a/src/ipc/pmc-ipc.c b/src/ipc/pmc-ipc.c index b8183c0..fdb8d4b 100644 --- a/src/ipc/pmc-ipc.c +++ b/src/ipc/pmc-ipc.c @@ -37,6 +37,7 @@ #include <reef/wait.h> #include <reef/trace.h> #include <platform/interrupt.h> +#include <platform/pmc.h> #include <platform/shim.h> diff --git a/src/lib/schedule.c b/src/lib/schedule.c index 142a2fb..427ca2e 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -159,7 +159,7 @@ static uint32_t sch_work(void *data, uint32_t delay) * Schedule task with the earliest deadline from task list. * Can run in IRQ context. */ -struct task *schedule_edf(void) +static struct task *schedule_edf(void) { struct task *task; struct task *next_plus1_task = NULL; @@ -201,8 +201,9 @@ struct task *schedule_edf(void) return next_plus1_task; } +#if 0 /* FIXME: is this needed ? */ /* delete task from scheduler */ -int schedule_task_del(struct task *task) +static int schedule_task_del(struct task *task) { uint32_t flags; int ret = 0; @@ -225,6 +226,7 @@ out: spin_unlock_irq(&sch->lock, flags); return ret; } +#endif /* * Add a new task to the scheduler to be run and define a scheduling @@ -285,7 +287,7 @@ void schedule_task_complete(struct task *task) spin_unlock_irq(&sch->lock, flags); } -void scheduler_run(void *unused) +static void scheduler_run(void *unused) { struct task *next_task; diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index e3daf48..b701196 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -40,6 +40,7 @@ #include <reef/mailbox.h> #include <reef/dai.h> #include <reef/dma.h> +#include <reef/interrupt.h> #include <reef/reef.h> #include <reef/work.h> #include <reef/clock.h> diff --git a/src/platform/baytrail/timer.c b/src/platform/baytrail/timer.c index 513ede1..9256dd9 100644 --- a/src/platform/baytrail/timer.c +++ b/src/platform/baytrail/timer.c @@ -44,7 +44,7 @@ struct timer_data { static struct timer_data xtimer[1] = {}; -void platform_timer_64_handler(void *arg) +static void platform_timer_64_handler(void *arg) { struct timer *timer = arg; struct timer_data *tdata = timer->timer_data; -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] EQ FIR: Get coefficients and response switch via ABI
by Seppo Ingalsuo 25 Sep '17

25 Sep '17

The FIR equalizer configure and control is updated to use the new component ABI. Checks are added to protect equalizer from invalid setup. Also an unused parameter is removed from fir_init_delay() function. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/eq_fir.c | 86 ++++++++++++++++++++++++++++++------------------------ src/audio/eq_fir.h | 34 --------------------- src/audio/fir.c | 3 +- src/audio/fir.h | 3 +- 4 files changed, 50 insertions(+), 76 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index eb2d864..fc6ae03 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -44,6 +44,7 @@ #include <reef/audio/pipeline.h> #include <reef/audio/format.h> #include <uapi/ipc.h> +#include <uapi/eq.h> #include "fir.h" #include "eq_fir.h" @@ -57,7 +58,7 @@ /* src component private data */ struct comp_data { - struct eq_fir_configuration *config; + struct sof_eq_fir_config *config; uint32_t period_bytes; struct fir_state_32x16 fir[PLATFORM_MAX_CHANNELS]; void (*eq_fir_func)(struct comp_dev *dev, @@ -120,7 +121,7 @@ static void eq_fir_s32_default(struct comp_dev *dev, } } -static void eq_fir_free_parameters(struct eq_fir_configuration **config) +static void eq_fir_free_parameters(struct sof_eq_fir_config **config) { if (*config != NULL) rfree(*config); @@ -148,22 +149,26 @@ static void eq_fir_free_delaylines(struct fir_state_32x16 fir[]) } static int eq_fir_setup(struct fir_state_32x16 fir[], - struct eq_fir_configuration *config, int nch) + struct sof_eq_fir_config *config, int nch) { int i, j, idx, length, resp; int32_t *fir_data; + int16_t *coef_data, *assign_response; int response_index[PLATFORM_MAX_CHANNELS]; int length_sum = 0; - if (nch > PLATFORM_MAX_CHANNELS) + if ((nch > PLATFORM_MAX_CHANNELS) + || (config->channels_in_config > PLATFORM_MAX_CHANNELS)) return -EINVAL; /* Collect index of respose start positions in all_coefficients[] */ j = 0; + assign_response = &config->data[0]; + coef_data = &config->data[config->channels_in_config]; for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - if (i < config->number_of_responses_defined) { + if (i < config->number_of_responses) { response_index[i] = j; - j += 3 + config->all_coefficients[j]; + j += 3 + coef_data[j]; } else { response_index[i] = 0; } @@ -174,15 +179,17 @@ static int eq_fir_setup(struct fir_state_32x16 fir[], /* Initialize 1st phase */ for (i = 0; i < nch; i++) { - resp = config->assign_response[i]; + resp = assign_response[i]; + if (resp > config->number_of_responses - 1) + return -EINVAL; + if (resp < 0) { /* Initialize EQ channel to bypass */ fir_reset(&fir[i]); } else { /* Initialize EQ coefficients */ idx = response_index[resp]; - length = fir_init_coef(&fir[i], - &config->all_coefficients[idx]); + length = fir_init_coef(&fir[i], &coef_data[idx]); if (length > 0) length_sum += length; } @@ -199,31 +206,29 @@ static int eq_fir_setup(struct fir_state_32x16 fir[], /* Initialize 2nd phase to set EQ delay lines pointers */ for (i = 0; i < nch; i++) { - resp = config->assign_response[i]; + resp = assign_response[i]; if (resp >= 0) { - idx = response_index[resp]; - fir_init_delay(&fir[i], &config->all_coefficients[idx], - &fir_data); + fir_init_delay(&fir[i], &fir_data); } - } return 0; } static int eq_fir_switch_response(struct fir_state_32x16 fir[], - struct eq_fir_configuration *config, struct eq_fir_update *update, - int nch) + struct sof_eq_fir_config *config, + struct sof_ipc_ctrl_value_comp compv[], uint32_t num_elemens, int nch) { - int i, ret; + int i, j, ret; /* Copy assign response from update and re-initilize EQ */ if (config == NULL) return -EINVAL; - for (i = 0; i < config->stream_max_channels; i++) { - if (i < update->stream_max_channels) - config->assign_response[i] = update->assign_response[i]; + for (i = 0; i < num_elemens; i++) { + j = compv[i].index; + if (j < config->channels_in_config) + config->data[i] = compv[i].svalue; } ret = eq_fir_setup(fir, config, nch); @@ -238,6 +243,9 @@ static int eq_fir_switch_response(struct fir_state_32x16 fir[], static struct comp_dev *eq_fir_new(struct sof_ipc_comp *comp) { struct comp_dev *dev; + struct sof_ipc_comp_eq_fir *eq_fir; + struct sof_ipc_comp_eq_fir *ipc_eq_fir + = (struct sof_ipc_comp_eq_fir *) comp; struct comp_data *cd; int i; @@ -248,7 +256,8 @@ static struct comp_dev *eq_fir_new(struct sof_ipc_comp *comp) if (dev == NULL) return NULL; - memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_eq_fir)); + eq_fir = (struct sof_ipc_comp_eq_fir *) &dev->comp; + memcpy(eq_fir, ipc_eq_fir, sizeof(struct sof_ipc_comp_eq_fir)); cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); if (cd == NULL) { @@ -282,14 +291,18 @@ static void eq_fir_free(struct comp_dev *dev) /* set component audio stream parameters */ static int eq_fir_params(struct comp_dev *dev) { - struct comp_data *cd = comp_get_drvdata(dev); struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + struct comp_data *cd = comp_get_drvdata(dev); struct comp_buffer *sink; int err; trace_eq("par"); - /* calculate period size based on config */ + /* Calculate period size based on config. First make sure that + * frame_bytes is set. + */ + dev->frame_bytes = + dev->params.sample_container_bytes * dev->params.channels; cd->period_bytes = dev->frames * dev->frame_bytes; /* configure downstream buffer */ @@ -312,27 +325,30 @@ static int eq_fir_params(struct comp_dev *dev) static int fir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct eq_fir_update *fir_update; /* TODO: move this to IPC as it's ABI */ + struct sof_ipc_ctrl_value_comp *compv; size_t bs; int i, ret = 0; /* TODO: determine if data is DMAed or appended to cdata */ + /* Check version from ABI header */ + if (cdata->data->comp_abi != SOF_EQ_FIR_ABI_VERSION) + return -EINVAL; + switch (cdata->cmd) { case SOF_CTRL_CMD_EQ_SWITCH: trace_eq("EFx"); - fir_update = (struct eq_fir_update *)cdata->data; + compv = (struct sof_ipc_ctrl_value_comp *) cdata->data->data; ret = eq_fir_switch_response(cd->fir, cd->config, - fir_update, PLATFORM_MAX_CHANNELS); + compv, cdata->num_elems, PLATFORM_MAX_CHANNELS); if (ret < 0) { trace_eq_error("ec1"); return ret; } /* Print trace information */ - tracev_value(fir_update->stream_max_channels); - for (i = 0; i < fir_update->stream_max_channels; i++) - tracev_value(fir_update->assign_response[i]); + for (i = 0; i < cd->config->channels_in_config; i++) + tracev_value(cd->config->data[i]); break; case SOF_CTRL_CMD_EQ_CONFIG: @@ -342,22 +358,16 @@ static int fir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) eq_fir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - bs = cdata->num_elems; - if (bs > EQ_FIR_MAX_BLOB_SIZE) + bs = cdata->data->size; + if ((bs > SOF_EQ_FIR_MAX_SIZE) || (bs < 1)) return -EINVAL; cd->config = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, bs); if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, cdata->data, bs); + memcpy(cd->config, cdata->data->data, bs); ret = eq_fir_setup(cd->fir, cd->config, PLATFORM_MAX_CHANNELS); - - /* Print trace information */ - tracev_value(cd->config->stream_max_channels); - tracev_value(cd->config->number_of_responses_defined); - for (i = 0; i < cd->config->stream_max_channels; i++) - tracev_value(cd->config->assign_response[i]); break; case SOF_CTRL_CMD_MUTE: trace_eq("EFm"); diff --git a/src/audio/eq_fir.h b/src/audio/eq_fir.h index 7579ba4..4d2480c 100644 --- a/src/audio/eq_fir.h +++ b/src/audio/eq_fir.h @@ -33,38 +33,4 @@ #ifndef EQ_FIR_H #define EQ_FIR_H - -/* - * eq_fir_configuration data structure contains this information - * stream max channels - * number_of_responses_defined - * 0=no respones, 1=one response defined, 2=two responses defined, etc. - * assign_response[STREAM_MAX_CHANNELS] - * -1 = not defined, 0 = use first response, 1 = use 2nd response, etc. - * E.g. {0, 0, 0, 0, -1, -1, -1, -1} would apply to channels 0-3 the - * same first defined response and leave channels 4-7 unequalized. - * all_coefficients[] - * Repeated data { filter_length, input_shift, output_shift, h[] } - * where vector h has filter_length number of coefficients. - * Coefficients in h[] are in Q1.15 format. 16384 = 0.5. The shifts - * are number of right shifts. - */ - -#define NHEADER_EQ_FIR_BLOB 2 /* Header is two words plus assigns plus coef */ - -#define EQ_FIR_MAX_BLOB_SIZE 4096 /* Max size allowed for blob in bytes */ - -struct eq_fir_configuration { - uint16_t stream_max_channels; - uint16_t number_of_responses_defined; - uint16_t assign_response[PLATFORM_MAX_CHANNELS]; - int16_t all_coefficients[]; -}; - -struct eq_fir_update { - uint16_t stream_max_channels; - uint16_t assign_response[PLATFORM_MAX_CHANNELS]; - -}; - #endif diff --git a/src/audio/fir.c b/src/audio/fir.c index beb7e72..044b35d 100644 --- a/src/audio/fir.c +++ b/src/audio/fir.c @@ -83,8 +83,7 @@ int fir_init_coef(struct fir_state_32x16 *fir, int16_t config[]) return fir->length; } -void fir_init_delay(struct fir_state_32x16 *fir, int16_t config[], - int32_t **data) +void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data) { fir->delay = *data; fir->delay_size = fir->length; diff --git a/src/audio/fir.h b/src/audio/fir.h index a99bcde..e682ef2 100644 --- a/src/audio/fir.h +++ b/src/audio/fir.h @@ -58,8 +58,7 @@ void fir_reset(struct fir_state_32x16 *fir); int fir_init_coef(struct fir_state_32x16 *fir, int16_t config[]); -void fir_init_delay(struct fir_state_32x16 *fir, int16_t config[], - int32_t **data); +void fir_init_delay(struct fir_state_32x16 *fir, int32_t **data); /* The next trivial functions are inlined */ -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] EQ IIR: Get filter config and response switch via ABI
by Seppo Ingalsuo 25 Sep '17

25 Sep '17

The IIR equalizer configure and control is updated to use the new component ABI. In addition there are checks added to protect IIR equalizer from invalid setup. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/eq_iir.c | 76 +++++++++++++++++--------------- src/audio/eq_iir.h | 47 -------------------- src/include/uapi/eq.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 83 deletions(-) create mode 100644 src/include/uapi/eq.h diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 58a06a3..86f879a 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -44,6 +44,7 @@ #include <reef/audio/pipeline.h> #include <reef/audio/format.h> #include <uapi/ipc.h> +#include <uapi/eq.h> #include "eq_iir.h" #include "iir.h" @@ -57,7 +58,7 @@ /* src component private data */ struct comp_data { - struct eq_iir_configuration *config; + struct sof_eq_iir_config *config; uint32_t period_bytes; struct iir_state_df2t iir[PLATFORM_MAX_CHANNELS]; void (*eq_iir_func)(struct comp_dev *dev, @@ -120,7 +121,7 @@ static void eq_iir_s32_default(struct comp_dev *dev, } } -static void eq_iir_free_parameters(struct eq_iir_configuration **config) +static void eq_iir_free_parameters(struct sof_eq_iir_config **config) { if (*config != NULL) rfree(*config); @@ -150,27 +151,31 @@ static void eq_iir_free_delaylines(struct iir_state_df2t *iir) } static int eq_iir_setup(struct iir_state_df2t iir[], - struct eq_iir_configuration *config, int nch) + struct sof_eq_iir_config *config, int nch) { int i, j, idx, resp; size_t s; size_t size_sum = 0; int64_t *iir_delay; /* TODO should not need to know the type */ + int32_t *coef_data, *assign_response; int response_index[PLATFORM_MAX_CHANNELS]; - if (nch > PLATFORM_MAX_CHANNELS) - return -EINVAL; - /* Free existing IIR channels data if it was allocated */ eq_iir_free_delaylines(iir); + if ((nch > PLATFORM_MAX_CHANNELS) + || (config->channels_in_config > PLATFORM_MAX_CHANNELS)) + return -EINVAL; + /* Collect index of respose start positions in all_coefficients[] */ j = 0; + assign_response = &config->data[0]; + coef_data = &config->data[config->channels_in_config]; for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - if (i < config->number_of_responses_defined) { + if (i < config->number_of_responses) { response_index[i] = j; j += NHEADER_DF2T - + NBIQUAD_DF2T * config->all_coefficients[j]; + + NBIQUAD_DF2T * coef_data[j]; } else { response_index[i] = 0; } @@ -178,15 +183,17 @@ static int eq_iir_setup(struct iir_state_df2t iir[], /* Initialize 1st phase */ for (i = 0; i < nch; i++) { - resp = config->assign_response[i]; + resp = assign_response[i]; + if (resp > config->number_of_responses - 1) + return -EINVAL; + if (resp < 0) { /* Initialize EQ channel to bypass */ iir_reset_df2t(&iir[i]); } else { /* Initialize EQ coefficients */ idx = response_index[resp]; - s = iir_init_coef_df2t(&iir[i], - &config->all_coefficients[idx]); + s = iir_init_coef_df2t(&iir[i], &coef_data[idx]); if (s > 0) size_sum += s; else @@ -204,9 +211,8 @@ static int eq_iir_setup(struct iir_state_df2t iir[], /* Initialize 2nd phase to set EQ delay lines pointers */ for (i = 0; i < nch; i++) { - resp = config->assign_response[i]; + resp = assign_response[i]; if (resp >= 0) { - idx = response_index[resp]; iir_init_delay_df2t(&iir[i], &iir_delay); } @@ -216,18 +222,19 @@ static int eq_iir_setup(struct iir_state_df2t iir[], } static int eq_iir_switch_response(struct iir_state_df2t iir[], - struct eq_iir_configuration *config, struct eq_iir_update *update, - int nch) + struct sof_eq_iir_config *config, + struct sof_ipc_ctrl_value_comp compv[], uint32_t num_elemens, int nch) { - int i, ret; + int i, j, ret; /* Copy assign response from update and re-initilize EQ */ if (config == NULL) return -EINVAL; - for (i = 0; i < config->stream_max_channels; i++) { - if (i < update->stream_max_channels) - config->assign_response[i] = update->assign_response[i]; + for (i = 0; i < num_elemens; i++) { + j = compv[i].index; + if (j < config->channels_in_config) + config->data[i] = compv[i].svalue; } ret = eq_iir_setup(iir, config, nch); @@ -293,7 +300,11 @@ static int eq_iir_params(struct comp_dev *dev) trace_eq_iir("par"); - /* calculate period size based on config */ + /* Calculate period size based on config. First make sure that + * frame_bytes is set. + */ + dev->frame_bytes = + dev->params.sample_container_bytes * dev->params.channels; cd->period_bytes = dev->frames * dev->frame_bytes; /* configure downstream buffer */ @@ -316,21 +327,21 @@ static int eq_iir_params(struct comp_dev *dev) static int iir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct eq_iir_update *iir_update; /* TODO: move to IPC header as part of ABI */ + struct sof_ipc_ctrl_value_comp *compv; int i, ret = 0; size_t bs; switch (cdata->cmd) { case SOF_CTRL_CMD_EQ_SWITCH: trace_eq_iir("EFx"); - iir_update = (struct eq_iir_update *) cdata->data; + compv = (struct sof_ipc_ctrl_value_comp *) cdata->data->data; ret = eq_iir_switch_response(cd->iir, cd->config, - iir_update, PLATFORM_MAX_CHANNELS); + compv, cdata->num_elems, PLATFORM_MAX_CHANNELS); /* Print trace information */ - tracev_value(iir_update->stream_max_channels); - for (i = 0; i < iir_update->stream_max_channels; i++) - tracev_value(iir_update->assign_response[i]); + tracev_value(cd->config->channels_in_config); + for (i = 0; i < cd->config->channels_in_config; i++) + tracev_value(cd->config->data[i]); break; case SOF_CTRL_CMD_EQ_CONFIG: @@ -339,8 +350,8 @@ static int iir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) eq_iir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - bs = cdata->num_elems; - if (bs > EQ_IIR_MAX_BLOB_SIZE) + bs = cdata->data->size; + if ((bs > SOF_EQ_IIR_MAX_SIZE) || (bs < 1)) return -EINVAL; /* Allocate and make a copy of the blob and setup IIR */ @@ -348,18 +359,11 @@ static int iir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, cdata->data, bs); + memcpy(cd->config, cdata->data->data, bs); /* Initialize all channels, the actual number of channels may * not be set yet. */ ret = eq_iir_setup(cd->iir, cd->config, PLATFORM_MAX_CHANNELS); - - /* Print trace information */ - tracev_value(cd->config->stream_max_channels); - tracev_value(cd->config->number_of_responses_defined); - for (i = 0; i < cd->config->stream_max_channels; i++) - tracev_value(cd->config->assign_response[i]); - break; case SOF_CTRL_CMD_MUTE: trace_eq_iir("EFm"); diff --git a/src/audio/eq_iir.h b/src/audio/eq_iir.h index 42d95c1..e28a1a3 100644 --- a/src/audio/eq_iir.h +++ b/src/audio/eq_iir.h @@ -33,51 +33,4 @@ #ifndef EQ_IIR_H #define EQ_IIR_H - - -/* eq_iir_configuration - * uint32_t platform max channels - * uint32_t number_of_responses_defined - * 0=no responses, 1=one response defined, 2=two responses defined, etc. - * uint32_t assign_response[PLATFORM_MAX_CHANNELS] - * -1 = not defined, 0 = use first response, 1 = use 2nd response, etc. - * E.g. {0, 0, 0, 0, -1, -1, -1, -1} would apply to channels 0-3 the - * same first defined response and leave channels 4-7 unequalized. - * all_coefficients[] - * <1st EQ> - * uint32_t num_biquads - * uint32_t num_biquads_in_series - * <1st biquad> - * int32_t coef_a2 Q2.30 format - * int32_t coef_a1 Q2.30 format - * int32_t coef_b2 Q2.30 format - * int32_t coef_b1 Q2.30 format - * int32_t coef_b0 Q2.30 format - * int32_t output_shift number of shifts right, shift left is negative - * int32_t output_gain Q2.14 format - * <2nd biquad> - * ... - * <2nd EQ> - * - * Note: A flat response biquad can be made with a section set to - * b0 = 1.0, gain = 1.0, and other parameters set to 0 - * {0, 0, 0, 0, 1073741824, 0, 16484} - */ - -#define EQ_IIR_MAX_BLOB_SIZE 1024 /* In bytes or size_t */ - -#define NHEADER_EQ_IIR_BLOB 2 /* Blob is two words plus asssigns plus coef */ - -struct eq_iir_configuration { - int32_t stream_max_channels; - int32_t number_of_responses_defined; - int32_t assign_response[PLATFORM_MAX_CHANNELS]; - int32_t all_coefficients[]; -}; - -struct eq_iir_update { - int32_t stream_max_channels; - int32_t assign_response[PLATFORM_MAX_CHANNELS]; -}; - #endif diff --git a/src/include/uapi/eq.h b/src/include/uapi/eq.h new file mode 100644 index 0000000..9c42a51 --- /dev/null +++ b/src/include/uapi/eq.h @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2017, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + */ + +#ifndef EQ_H +#define EQ_H + +/* FIR EQ type */ + +/* Component will reject non-matching configuration. The version number need + * to be incremented with any ABI changes in function fir_cmd(). + */ +#define SOF_EQ_FIR_ABI_VERSION 1 + +#define SOF_EQ_FIR_MAX_SIZE 4096 /* Max size allowed for coef data in bytes */ + +/* + * eq_fir_configuration data structure contains this information + * uint16_t channels_in_config + * This describes the number of channels in this EQ config data. It + * can be different from PLATFORM_MAX_CHANNELS. + * uint16_t number_of_responses + * 0=no responses, 1=one response defined, 2=two responses defined, etc. + * int16_t data[] + * assign_response[STREAM_MAX_CHANNELS] + * -1 = not defined, 0 = use first response, 1 = use 2nd response, etc. + * E.g. {0, 0, 0, 0, -1, -1, -1, -1} would apply to channels 0-3 the + * same first defined response and leave channels 4-7 unequalized. + * coef_data[] + * Repeated data { filter_length, input_shift, output_shift, h[] } + * for every EQ response defined where vector h has filter_length + * number of coefficients. Coefficients in h[] are in Q1.15 format. + * E.g. 16384 (Q1.15) = 0.5. The shifts are number of right shifts. + */ + +struct sof_eq_fir_config { + uint16_t channels_in_config; + uint16_t number_of_responses; + int16_t data[]; +}; + +/* IIR EQ type */ + +/* Component will reject non-matching configuration. The version number need + * to be incremented with any ABI changes in function fir_cmd(). + */ +#define SOF_EQ_FIR_ABI_VERSION 1 + +#define SOF_EQ_IIR_MAX_SIZE 1024 /* Max size allowed for coef data in bytes */ + +/* eq_iir_configuration + * uint32_t channels_in_config + * This describes the number of channels in this EQ config data. It + * can be different from PLATFORM_MAX_CHANNELS. + * uint32_t number_of_responses_defined + * 0=no responses, 1=one response defined, 2=two responses defined, etc. + * int32_t data[] + * Data consist of two parts. First is the response assign vector that + * has length of channels_in_config. The latter part is coefficient + * data. + * uint32_t assign_response[channels_in_config] + * -1 = not defined, 0 = use first response, 1 = use 2nd, etc. + * E.g. {0, 0, 0, 0, -1, -1, -1, -1} would apply to channels 0-3 the + * same first defined response and leave channels 4-7 unequalized. + * coefficient_data[] + * <1st EQ> + * uint32_t num_biquads + * uint32_t num_biquads_in_series + * <1st biquad> + * int32_t coef_a2 Q2.30 format + * int32_t coef_a1 Q2.30 format + * int32_t coef_b2 Q2.30 format + * int32_t coef_b1 Q2.30 format + * int32_t coef_b0 Q2.30 format + * int32_t output_shift number of shifts right, shift left is negative + * int32_t output_gain Q2.14 format + * <2nd biquad> + * ... + * <2nd EQ> + * + * Note: A flat response biquad can be made with a section set to + * b0 = 1.0, gain = 1.0, and other parameters set to 0 + * {0, 0, 0, 0, 1073741824, 0, 16484} + */ + +struct sof_eq_iir_config { + uint32_t channels_in_config; + uint32_t number_of_responses; + int32_t data[]; +}; + +#endif /* EQ_H */ + -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] Component ABI: Check for valid ABI header for COMP_CMD_SET_DATA command
by Seppo Ingalsuo 25 Sep '17

25 Sep '17

This patch adds the code to check the generic ABI header fields and reject data with invalid header. The individual components those use ABI need to check the component specific fields in addition. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/include/reef/audio/component.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 5ae8084..436a758 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -245,6 +245,17 @@ static inline int comp_host_buffer(struct comp_dev *dev, /* send component command - mandatory */ static inline int comp_cmd(struct comp_dev *dev, int cmd, void *data) { + struct sof_ipc_ctrl_data *cdata = data; + + if ((cmd == COMP_CMD_SET_DATA) + && ((cdata->data->magic != SOF_ABI_MAGIC) + || (cdata->data->abi != SOF_ABI_VERSION))) { + trace_comp_error("abi"); + trace_value(cdata->data->magic); + trace_value(cdata->data->abi); + return -EINVAL; + } + return dev->drv->ops.cmd(dev, cmd, data); } -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] Volume: Add 24 to 24 bit samples volume processing
by Seppo Ingalsuo 25 Sep '17

25 Sep '17

This patch adds to component volume S24_4LE to S24_4LE processing. The macro from audio/format.h is used to compute shifts needed for product. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/volume.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/audio/volume.c b/src/audio/volume.c index be6197e..b7e8e39 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -41,6 +41,7 @@ #include <reef/clock.h> #include <reef/audio/component.h> #include <reef/audio/pipeline.h> +#include <reef/audio/format.h> #define trace_volume(__e) trace_event(TRACE_CLASS_VOLUME, __e) #define tracev_volume(__e) tracev_event(TRACE_CLASS_VOLUME, __e) @@ -214,6 +215,26 @@ static void vol_s24_to_s32(struct comp_dev *dev, struct comp_buffer *sink, } } +/* Copy and scale volume from 24 bit source buffer to 24 bit on 32 bit boundary + * dest buffer. + */ +static void vol_s24_to_s24(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t i, *src = (int32_t*) source->r_ptr; + int32_t *dest = (int32_t*) sink->w_ptr; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 and volume is Q1.16 */ + for (i = 0; i < frames * 2; i += 2) { + dest[i] = (int32_t)(Q_MULTS_32X32( + (int64_t)src[i], cd->volume[0], 23, 16, 23)); + dest[i + 1] = (int32_t)(Q_MULTS_32X32( + (int64_t)src[i+1], cd->volume[1], 23, 16, 23)); + } +} + /* map of source and sink buffer formats to volume function */ static const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s16_to_s16}, @@ -224,6 +245,7 @@ static const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 2, vol_s24_to_s16}, {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s32_to_s24}, {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 2, vol_s24_to_s32}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s24_to_s24}, }; /* synchronise host mmap() volume with real value */ -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] comp: host: Add trace output for buffer size errors
by Liam Girdwood 25 Sep '17

25 Sep '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/host.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/audio/host.c b/src/audio/host.c index a1d312a..76124fc 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -415,6 +415,7 @@ static int host_params(struct comp_dev *dev) err = buffer_set_size(hd->dma_buffer, buffer_size); if (err < 0) { trace_host_error("eSz"); + trace_value(buffer_size); return err; } -- 2.11.0

1 1

[Sound-open-firmware] [PATCH] topology: fix capture pipeline ID for SSP DAI
by Liam Girdwood 24 Sep '17

24 Sep '17

Capture pipeline for SSP DAI should be 2. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-apl-nocodec.m4 | 2 +- topology/reef-bdw-rt286.m4 | 2 +- topology/reef-bdw-rt5640.m4 | 2 +- topology/reef-bxt-nocodec.m4 | 2 +- topology/reef-byt-nocodec.m4 | 2 +- topology/reef-byt-rt5640.m4 | 2 +- topology/reef-byt-rt5651.m4 | 2 +- topology/reef-cht-nocodec.m4 | 2 +- topology/reef-hsw-rt5640.m4 | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index f87a4e9..5e497f6 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -93,7 +93,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, I2S, + 2, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index eae2065..cb11ad6 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -93,7 +93,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP0 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 0, I2S, + 2, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 60feb82..b3c19c2 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -93,7 +93,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP0 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 0, I2S, + 2, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index 744e9b1..58bc6f6 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -93,7 +93,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, I2S, + 2, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 05373f9..5f6cd1d 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -82,7 +82,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, I2S, + 2, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 911b4d1..c5e8b52 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -82,7 +82,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, Audio, + 2, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index c6f20a4..e335d66 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -82,7 +82,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using "Audio" DAPM stream name and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, Audio, + 2, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 43e0e6e..ddeb71e 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -82,7 +82,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 2, I2S, + 2, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 3d26149..efd815b 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -93,7 +93,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # capture DAI is SSP0 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 1, SSP, 0, I2S, + 2, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] pipeline: fix timestamp for capture streams.
by Liam Girdwood 24 Sep '17

24 Sep '17

Make sure we timestamp upstream in capture streams Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 62c21b7..4e830c6 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -851,7 +851,7 @@ upstream: continue; /* continue downstream */ - res = timestamp_upstream(start, buffer->sink, posn); + res = timestamp_upstream(start, buffer->source, posn); if (res == 1) break; } -- 2.11.0

1 3

[Sound-open-firmware] [PATCH] ssp: add missing break in dai format switch
by Pierre-Louis Bossart 23 Sep '17

23 Sep '17

Support for DSP_A is obviously broken. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/ssp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index c97b60e..a472974 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -224,6 +224,7 @@ static inline int ssp_set_config(struct dai *dai, sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); sscr1 |= SSCR1_TRAIL; sspsp |= SSPSP_SFRMWDTH(1) | SSPSP_SFRMDLY(2); + break; case SOF_DAI_FMT_DSP_B: sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); sscr1 |= SSCR1_TRAIL; -- 2.11.0

2 1

[Sound-open-firmware] [PATCH 1/4] SRC: Add checks for number of channels when initializing from params
by Seppo Ingalsuo 22 Sep '17

22 Sep '17

This patch prevents SRCs init to loop past PLATFORM_MAX_CHANNELS. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src.c | 5 +++-- src/audio/src_core.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/audio/src.c b/src/audio/src.c index 1f84a5a..203e802 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -322,7 +322,7 @@ static int src_params(struct comp_dev *dev) size_t delay_lines_size; uint32_t source_rate, sink_rate; int32_t *buffer_start; - int n = 0, i, err, frames_is_for_source, q; + int n = 0, i, err, frames_is_for_source, nch, q; trace_src("par"); @@ -392,7 +392,8 @@ static int src_params(struct comp_dev *dev) buffer_start = cd->delay_lines + need.scratch; /* Initize SRC for actual sample rate */ - for (i = 0; i < params->channels; i++) { + nch = MIN(params->channels, PLATFORM_MAX_CHANNELS); + for (i = 0; i < nch; i++) { n = src_polyphase_init(&cd->src[i], source_rate, sink_rate, &need, buffer_start); buffer_start += need.single_src; diff --git a/src/audio/src_core.h b/src/audio/src_core.h index 5977421..886cc23 100644 --- a/src/audio/src_core.h +++ b/src/audio/src_core.h @@ -33,6 +33,7 @@ #define SRC_CORE_H #define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) struct src_alloc { int fir_s1; -- 2.11.0

2 4