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

[Sound-open-firmware] [PATCH 3/4] Send IPC message of DMA trace host update in DMA complete callback.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> It is called every time DMA completes. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/dma-copy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index 5c9ff97..6ba8f57 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -34,6 +34,7 @@ #include <reef/reef.h> #include <reef/debug.h> #include <reef/trace.h> +#include <reef/ipc.h> #include <reef/dma.h> #include <reef/wait.h> #include <platform/dma.h> @@ -76,6 +77,8 @@ static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) if (type == DMA_IRQ_TYPE_LLIST) wait_completed(comp); + ipc_dma_trace_send_position(); + next->size = DMA_RELOAD_END; } -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 2/4] Add API to send DMA trace host offset.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> Fill IPC strucure by current host offset and send it. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/ipc.h | 3 +++ src/ipc/intel-ipc.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 472aca8..fcab45b 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -166,4 +166,7 @@ struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id); */ int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config); +/* send DMA trace host buffer position to host */ +int ipc_dma_trace_send_position(void); + #endif diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 902e5a6..1df88c4 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -619,6 +619,19 @@ error: return -EINVAL; } +/* send DMA trace host buffer position to host */ +int ipc_dma_trace_send_position(void) +{ + struct sof_ipc_dma_trace_posn posn; + + posn.rhdr.hdr.cmd = SOF_IPC_GLB_TRACE_MSG | SOF_IPC_TRACE_DMA_POSITION; + posn.host_offset = _ipc->dmat.host_offset; + posn.rhdr.hdr.size = sizeof(posn); + + return ipc_queue_host_message(_ipc, posn.rhdr.hdr.cmd, &posn, + sizeof(posn), NULL, 0, NULL, NULL); +} + static int ipc_glb_debug_message(uint32_t header) { uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 1/4] Add IPC new message type and structure for sending DMA trace host offset.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> It is used to update DMA trace host offset to kernel for realtime output DMA trace. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/uapi/ipc.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index fc83721..07235e1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -118,6 +118,7 @@ /* trace and debug */ #define SOF_IPC_TRACE_DMA_PARAMS SOF_CMD_TYPE(0x001) +#define SOF_IPC_TRACE_DMA_POSITION SOF_CMD_TYPE(0x002) /* Get message component id */ #define SOF_IPC_MESSAGE_ID(x) (x & 0xffff) @@ -810,4 +811,10 @@ struct sof_ipc_dma_trace_params { struct sof_ipc_host_buffer buffer; } __attribute__((packed)); +/* DMA for Trace params info - SOF_IPC_DEBUG_DMA_PARAMS */ +struct sof_ipc_dma_trace_posn { + struct sof_ipc_reply rhdr; + uint32_t host_offset; /* Offset of DMA host buffer */ +} __attribute__((packed)); + #endif -- 2.7.4

1 0

[Sound-open-firmware] [PATCH v2] Move DMA tracing intialization calling.
by yan.wang＠linux.intel.com 08 Nov '17

08 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> Move it from ipc handler into platform_init(). It should be placed after IPC and DMAC initialization. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/intel-ipc.c | 7 ------- src/platform/baytrail/platform.c | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 63c84df..1df88c4 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -583,13 +583,6 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc_error("DA1"); - /* Initialize DMA for Trace*/ - err = dma_trace_init(&_ipc->dmat); - if (err < 0) { - trace_ipc_error("eIP"); - goto error; - } - /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &params->buffer); if (err < 0) { diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index c175a1b..3517e0b 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -46,6 +46,7 @@ #include <reef/clock.h> #include <reef/ipc.h> #include <reef/trace.h> +#include <reef/dma-trace.h> #include <reef/audio/component.h> #include <config.h> #include <string.h> @@ -357,5 +358,8 @@ int platform_init(struct reef *reef) dai_probe(ssp5); #endif + /* Initialize DMA for Trace*/ + dma_trace_init(&reef->ipc->dmat); + return 0; } -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] volume: fix 16_to_24 right channel wrong issue
by Keyon Jie 07 Nov '17

07 Nov '17

The right channel was set duplicated to the left channel, here correct it. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index f52ab46..e1cbda2 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -179,7 +179,7 @@ static void vol_s16_to_s24(struct comp_dev *dev, struct comp_buffer *sink, dest[i] = q_multsr_sat_32x32( src[i], cd->volume[0], Q_SHIFT_BITS_64(15, 16, 23)); dest[i + 1] = q_multsr_sat_32x32( - src[i], cd->volume[0], Q_SHIFT_BITS_64(15, 16, 23)); + src[i + 1], cd->volume[1], Q_SHIFT_BITS_64(15, 16, 23)); } } -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2] Replace user-defined 32-bit and 16-bit MAX and MIN values
by Ranjani Sridharan 06 Nov '17

06 Nov '17

Replace the user-defined MAX and MIN values for 32-bit and 16-bit with standard INTN_MAX/INTN_MIN macro Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/tone.c | 14 +++++++------- src/include/reef/audio/format.h | 27 ++++++++++++--------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/audio/tone.c b/src/audio/tone.c index 3eb08e9..2957270 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -187,7 +187,7 @@ static void tonegen_control(struct tone_state *sg) return; sg->sample_count = 0; - if (sg->block_count < INT32_MAXVALUE) + if (sg->block_count < INT32_MAX) sg->block_count++; /* Fadein ramp during tone */ @@ -270,13 +270,13 @@ static void tonegen_set_ampl_mult(struct tone_state *sg, int32_t am) /* Tone length in samples, this is the active length of tone */ static void tonegen_set_length(struct tone_state *sg, uint32_t tl) { - sg->tone_length = (tl > 0) ? tl : INT32_MAXVALUE; /* Count rate 125 us */ + sg->tone_length = (tl > 0) ? tl : INT32_MAX; /* Count rate 125 us */ } /* Tone period in samples, this is the length including the pause after beep */ static void tonegen_set_period(struct tone_state *sg, uint32_t tp) { - sg->tone_period = (tp > 0) ? tp : INT32_MAXVALUE; /* Count rate 125 us */ + sg->tone_period = (tp > 0) ? tp : INT32_MAX; /* Count rate 125 us */ } /* Tone ramp parameters: @@ -287,7 +287,7 @@ static void tonegen_set_period(struct tone_state *sg, uint32_t tp) static inline void tonegen_set_linramp(struct tone_state *sg, int32_t step) { - sg->ramp_step = (step > 0) ? step : INT32_MAXVALUE; + sg->ramp_step = (step > 0) ? step : INT32_MAX; } static inline int32_t tonegen_get_f(struct tone_state *sg) @@ -317,7 +317,7 @@ static void tonegen_update_f(struct tone_state *sg, int32_t f) /* Calculate Fs/2, fs is Q32.0, f is Q16.16 */ f_max = Q_SHIFT_LEFT((int64_t) sg->fs, 0, 16 - 1); - f_max = (f_max > INT32_MAXVALUE) ? INT32_MAXVALUE : f_max; + f_max = (f_max > INT32_MAX) ? INT32_MAX : f_max; sg->f = (f > f_max) ? f_max : f; /* Q16 x Q31 -> Q28 */ w_tmp = q_multsr_32x32(sg->f, sg->c, Q_SHIFT_BITS_64(16, 31, 28)); @@ -349,8 +349,8 @@ static void tonegen_reset(struct tone_state *sg) /* Continuous tone */ sg->freq_coef = ONE_Q2_30; /* Set freq multiplier to 1.0 */ sg->ampl_coef = ONE_Q2_30; /* Set ampl multiplier to 1.0 */ - sg->tone_length = INT32_MAXVALUE; - sg->tone_period = INT32_MAXVALUE; + sg->tone_length = INT32_MAX; + sg->tone_period = INT32_MAX; sg->ramp_step = ONE_Q1_31; /* Set lin ramp modification to max */ } diff --git a/src/include/reef/audio/format.h b/src/include/reef/audio/format.h index b9263f1..8964f33 100644 --- a/src/include/reef/audio/format.h +++ b/src/include/reef/audio/format.h @@ -33,13 +33,10 @@ #ifndef AUDIO_FORMAT_H #define AUDIO_FORMAT_H -/* Maximum and minimum values for integer types */ -#define INT16_MAXVALUE 32767 -#define INT16_MINVALUE -32768 +/* Maximum and minimum values for 24 bit */ #define INT24_MAXVALUE 8388607 #define INT24_MINVALUE -8388608 -#define INT32_MAXVALUE 2147483647 -#define INT32_MINVALUE -2147483648 + /* Collection of common fractional numbers */ #define ONE_Q2_30 1073741824 /* Q2.30 1.0 */ @@ -91,8 +88,8 @@ #define Q_MULTSR_32X32(px, py, qx, qy, qp) (((px) * (py) >> (((qx)+(qy)-(qp)-1) +1) >> 1)) /* Saturation */ -#define SATP_INT32(x) (((x) > INT32_MAXVALUE) ? INT32_MAXVALUE : (x)) -#define SATM_INT32(x) (((x) < INT32_MINVALUE) ? INT32_MINVALUE : (x)) +#define SATP_INT32(x) (((x) > INT32_MAX) ? INT32_MAX : (x)) +#define SATM_INT32(x) (((x) < INT32_MIN) ? INT32_MIN : (x)) static inline int64_t q_mults_32x32(int32_t x, int32_t y, const int shift_bits) { @@ -120,10 +117,10 @@ static inline int32_t sat_int32(int64_t x) { #if 1 /* TODO: Is this faster */ - if (x > INT32_MAXVALUE) - return INT32_MAXVALUE; - else if (x < INT32_MINVALUE) - return INT32_MINVALUE; + if (x > INT32_MAX) + return INT32_MAX; + else if (x < INT32_MIN) + return INT32_MIN; else return (int32_t)x; #else @@ -147,10 +144,10 @@ static inline int32_t sat_int24(int32_t x) static inline int16_t sat_int16(int32_t x) { - if (x > INT16_MAXVALUE) - return INT16_MAXVALUE; - else if (x < INT16_MINVALUE) - return INT16_MINVALUE; + if (x > INT16_MAX) + return INT16_MAX; + else if (x < INT16_MIN) + return INT16_MIN; else return (int16_t)x; } -- 2.11.0

2 1

Re: [Sound-open-firmware] Support for Tangier SoC
by Liam Girdwood 06 Nov '17

06 Nov '17

Hi Sven, Btw, best to subscribe as non member posts are blocked and delayed. On Tue, 2017-10-17 at 20:49 +0200, Sven Schwermer wrote: > Hi guys, > > Thanks for your replies. I had tried a running a vanilla kernel on the > Edison. There, the sst_pci driver is probed, but the platform data is > not set and that’s basically where I got stuck because I couldn’t > figure out where that’s supposed to be set. Is that usually ACPI’s > job? > I dont think ACPI is used by the ADSP on Edison, I think it's purely a PCI device. Vanilla kernel wont work either atm, you will need my topic/sof-v4.13 branch from here :- git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc.git Note that this branch only works on the SOF 1.0-dev branches (that are not stable) and not the stable master branch. The stable SOF master firmware branch has a different IPC ABI and only works with the topic/reef kernels (that unfortunately dont support PCI mode on Edison) :( > What exactly should happen once the mrfld_sst SFI IPC is enumerated? I > am lacking the big picture and the order of events here. Is there an > overview document somewhere available online? > There is also more than one driver upstream. The sst driver is for Intel's closed source FW. The open source FW uses different ABIs and APIs to the closed source version, currently you need to blacklist the old SST modules in order to load the SOF FW and driver (this is being fixed in upstream atm) > I guess, the nocodec mode would be fine as a start. > Yes. Liam > Thanks, Sven > > > On 16 Oct 2017, at 17:59, Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> wrote: > > > > On 10/16/17 10:19 AM, Liam Girdwood wrote: > >> On Sun, 2017-10-15 at 19:51 +0200, Sven Schwermer wrote: > >>> Hi. > >>> > >>> I was wondering if the Tangier SoC (Merrifield platform) is or will be > >>> supported by SOF? I have the Intel Edison compute module in mind. > >>> > >> Yes, it _should_ work on Merrifield, but I don't have Edison HW so some > >> things on the driver side might need some work. > >> The 1.0-dev branch and sof-v4.13 kernel will probably be better for > >> Edison than the stable 0.95 branch atm (mainly due to driver updates), > >> but 1.0-dev is still has a few issues prior to doing an rc1 tag. > > > > The main difference with Baytrail is pci/acpi enumeration, and sfi/acpi for the firmware. I've been wanting to enable Tangier for some time but could never figure out how to add a reference to an audio codec, so it'd likely work in 'nocodec' mode, with just the I2S signals on the connector. >

4 10

[Sound-open-firmware] [PATCH] cht: fix SSP IRQ sharing
by Liam Girdwood 03 Nov '17

03 Nov '17

SSP 0,1,2 on CHT share the same physical IRQ as SSP 3,4,5 respectively. Fix this so that all SSPs IRQs are supported. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/drivers/ssp.c | 9 +++++++++ src/platform/baytrail/include/platform/interrupt.h | 7 +++++++ src/platform/baytrail/include/platform/shim.h | 1 + src/platform/baytrail/platform.c | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 8eacd0c..9eb4934 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -400,8 +400,17 @@ static int ssp_probe(struct dai *dai) ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_READY; ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_READY; +#if defined CONFIG_CHERRYTRAIL + /* register our IRQ handler - CHT shares SSP 0,1,2 IRQs with SSP 3,4,5 */ + if (ssp_irq(dai) >= IRQ_CHT_SSP_OFFSET) + interrupt_register(ssp_irq(dai) - IRQ_CHT_SSP_OFFSET, + ssp_irq_handler, dai); + else + interrupt_register(ssp_irq(dai), ssp_irq_handler, dai); +#else /* register our IRQ handler */ interrupt_register(ssp_irq(dai), ssp_irq_handler, dai); +#endif platform_interrupt_unmask(ssp_irq(dai), 1); interrupt_enable(ssp_irq(dai)); diff --git a/src/platform/baytrail/include/platform/interrupt.h b/src/platform/baytrail/include/platform/interrupt.h index 8c97122..d197d67 100644 --- a/src/platform/baytrail/include/platform/interrupt.h +++ b/src/platform/baytrail/include/platform/interrupt.h @@ -56,6 +56,13 @@ #define IRQ_NUM_EXT_DMAC2 19 /* Level 5 */ #define IRQ_NUM_NMI 20 /* Level 7 */ +/* SSP 3,4,5 share PHY IRQs with SSP 0,1,2 respectively but we give them a + virtual number in order to differentiate from SSP0, 1 and 2 IRQs */ +#define IRQ_CHT_SSP_OFFSET 16 +#define IRQ_NUM_EXT_SSP3 (IRQ_CHT_SSP_OFFSET + IRQ_NUM_EXT_SSP0) /* Level 5 */ +#define IRQ_NUM_EXT_SSP4 (IRQ_CHT_SSP_OFFSET + IRQ_NUM_EXT_SSP1) /* Level 5 */ +#define IRQ_NUM_EXT_SSP5 (IRQ_CHT_SSP_OFFSET + IRQ_NUM_EXT_SSP2) /* Level 5 */ + /* IRQ Masks */ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) diff --git a/src/platform/baytrail/include/platform/shim.h b/src/platform/baytrail/include/platform/shim.h index b2e9132..61bc6a8 100644 --- a/src/platform/baytrail/include/platform/shim.h +++ b/src/platform/baytrail/include/platform/shim.h @@ -38,6 +38,7 @@ #define SHIM_PISR 0x08 #define SHIM_PISRH 0x0c #define SHIM_PIMR 0x10 +#define SHIM_PIMRH 0x14 #define SHIM_ISRX 0x18 #define SHIM_ISRD 0x20 #define SHIM_IMRX 0x28 diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 61596bb..441621c 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -179,7 +179,7 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask) break; #if defined CONFIG_CHERRYTRAIL case IRQ_NUM_EXT_DMAC2: - shim_write(SHIM_PISMH, mask << 8); + shim_write(SHIM_PIMRH, mask << 8); break; case IRQ_NUM_EXT_SSP3: shim_write(SHIM_PIMRH, mask << 0); -- 2.11.0

2 2

[Sound-open-firmware] [PATCH] Revert "Move DMA tracing intialization calling."
by Pierre-Louis Bossart 02 Nov '17

02 Nov '17

This reverts commit 97addafa1025cdb3413f2c663bc0513a1ecf4cd5. git bisect tells me this is the source of IPC timeouts, 100% reproducible [ 162.496099] sof-audio sof-audio: error: ipc timed out for 0x90010000 size 0x18 [ 162.496590] sof-audio sof-audio: error: cant set params for DMA for Trace-110 [ 162.496636] sof-audio sof-audio: error: failed to initialize trace -110 [ 162.808132] sof-audio sof-audio: error: ipc timed out for 0x30010000 size 0x3c The same errors were also reported by Sven Schwermer on the mailing list on a Tangier device, revert until we figure out what's wrong. Cc: Sven Schwermer <sven(a)svenschwermer.de> Cc: Yan Wang <yan.wang(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/ipc/intel-ipc.c | 7 +++++++ src/platform/baytrail/platform.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 902e5a6..f6d88ef 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -583,6 +583,13 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc_error("DA1"); + /* Initialize DMA for Trace*/ + err = dma_trace_init(&_ipc->dmat); + if (err < 0) { + trace_ipc_error("eIP"); + goto error; + } + /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &params->buffer); if (err < 0) { diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 61596bb..b701196 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -46,7 +46,6 @@ #include <reef/clock.h> #include <reef/ipc.h> #include <reef/trace.h> -#include <reef/dma-trace.h> #include <reef/audio/component.h> #include <config.h> #include <string.h> @@ -297,9 +296,6 @@ int platform_init(struct reef *reef) trace_point(TRACE_BOOT_PLATFORM_IPC); ipc_init(reef); - /* Initialize DMA for Trace*/ - dma_trace_init(&reef->ipc->dmat); - /* init DMACs */ trace_point(TRACE_BOOT_PLATFORM_DMA); dmac0 = dma_get(DMA_ID_DMAC0); -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] Replace user-defined 32-bit and 16-bit MAX and MIN values
by Ranjani Sridharan 01 Nov '17

01 Nov '17

Replace the user-defined MAX and MIN values for 32-bit and 16-bit with standard INTN_MAX/INTN_MIN macro Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/tone.c | 14 +++++++------- src/include/reef/audio/format.h | 27 ++++++++++++--------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/audio/tone.c b/src/audio/tone.c index 1fde455..b9f2428 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -175,7 +175,7 @@ static void tonegen_control(struct tone_state *sg) return; sg->sample_count = 0; - if (sg->block_count < INT32_MAXVALUE) + if (sg->block_count < INT32_MAX) sg->block_count++; /* Fadein ramp during tone */ @@ -255,8 +255,8 @@ static void tonegen_set_sweep(struct tone_state *sg, int32_t fc, int32_t ac, */ sg->freq_coef = (fc > 0) ? fc : ONE_Q2_30; /* Set freq mult to 1.0 */ sg->ampl_coef = (ac > 0) ? ac : ONE_Q2_30; /* Set ampl mult to 1.0 */ - sg->tone_length = (l > 0) ? l : INT32_MAXVALUE; /* Count rate 125 us */ - sg->tone_period = (p > 0) ? p : INT32_MAXVALUE; /* Count rate 125 us */ + sg->tone_length = (l > 0) ? l : INT32_MAX; /* Count rate 125 us */ + sg->tone_period = (p > 0) ? p : INT32_MAX; /* Count rate 125 us */ } #endif @@ -268,7 +268,7 @@ static void tonegen_set_sweep(struct tone_state *sg, int32_t fc, int32_t ac, static inline void tonegen_set_linramp(struct tone_state *sg, int32_t step) { - sg->ramp_step = (step > 0) ? step : INT32_MAXVALUE; + sg->ramp_step = (step > 0) ? step : INT32_MAX; } static inline int32_t tonegen_get_f(struct tone_state *sg) @@ -298,7 +298,7 @@ static void tonegen_update_f(struct tone_state *sg, int32_t f) /* Calculate Fs/2, fs is Q32.0, f is Q16.16 */ f_max = Q_SHIFT_LEFT((int64_t) sg->fs, 0, 16 - 1); - f_max = (f_max > INT32_MAXVALUE) ? INT32_MAXVALUE : f_max; + f_max = (f_max > INT32_MAX) ? INT32_MAX : f_max; sg->f = (f > f_max) ? f_max : f; /* Q16 x Q31 -> Q28 */ w_tmp = q_multsr_32x32(sg->f, sg->c, Q_SHIFT_BITS_64(16, 31, 28)); @@ -330,8 +330,8 @@ static void tonegen_reset(struct tone_state *sg) /* Continuous tone */ sg->freq_coef = ONE_Q2_30; /* Set freq multiplier to 1.0 */ sg->ampl_coef = ONE_Q2_30; /* Set ampl multiplier to 1.0 */ - sg->tone_length = INT32_MAXVALUE; - sg->tone_period = INT32_MAXVALUE; + sg->tone_length = INT32_MAX; + sg->tone_period = INT32_MAX; sg->ramp_step = ONE_Q1_31; /* Set lin ramp modification to max */ } diff --git a/src/include/reef/audio/format.h b/src/include/reef/audio/format.h index b9263f1..8964f33 100644 --- a/src/include/reef/audio/format.h +++ b/src/include/reef/audio/format.h @@ -33,13 +33,10 @@ #ifndef AUDIO_FORMAT_H #define AUDIO_FORMAT_H -/* Maximum and minimum values for integer types */ -#define INT16_MAXVALUE 32767 -#define INT16_MINVALUE -32768 +/* Maximum and minimum values for 24 bit */ #define INT24_MAXVALUE 8388607 #define INT24_MINVALUE -8388608 -#define INT32_MAXVALUE 2147483647 -#define INT32_MINVALUE -2147483648 + /* Collection of common fractional numbers */ #define ONE_Q2_30 1073741824 /* Q2.30 1.0 */ @@ -91,8 +88,8 @@ #define Q_MULTSR_32X32(px, py, qx, qy, qp) (((px) * (py) >> (((qx)+(qy)-(qp)-1) +1) >> 1)) /* Saturation */ -#define SATP_INT32(x) (((x) > INT32_MAXVALUE) ? INT32_MAXVALUE : (x)) -#define SATM_INT32(x) (((x) < INT32_MINVALUE) ? INT32_MINVALUE : (x)) +#define SATP_INT32(x) (((x) > INT32_MAX) ? INT32_MAX : (x)) +#define SATM_INT32(x) (((x) < INT32_MIN) ? INT32_MIN : (x)) static inline int64_t q_mults_32x32(int32_t x, int32_t y, const int shift_bits) { @@ -120,10 +117,10 @@ static inline int32_t sat_int32(int64_t x) { #if 1 /* TODO: Is this faster */ - if (x > INT32_MAXVALUE) - return INT32_MAXVALUE; - else if (x < INT32_MINVALUE) - return INT32_MINVALUE; + if (x > INT32_MAX) + return INT32_MAX; + else if (x < INT32_MIN) + return INT32_MIN; else return (int32_t)x; #else @@ -147,10 +144,10 @@ static inline int32_t sat_int24(int32_t x) static inline int16_t sat_int16(int32_t x) { - if (x > INT16_MAXVALUE) - return INT16_MAXVALUE; - else if (x < INT16_MINVALUE) - return INT16_MINVALUE; + if (x > INT16_MAX) + return INT16_MAX; + else if (x < INT16_MIN) + return INT16_MIN; else return (int16_t)x; } -- 2.11.0

2 1