From 683abd77d276e806911a28241d956619d270930d Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 14 Apr 2020 02:13:16 -0400 Subject: Fix checkwps build for dx50 & dx90 targets Their codec headers weren't in the right place. Change-Id: Iae16c10defc937cc227afd8992ff45cd6d664898 --- firmware/export/audiohw.h | 4 +- firmware/export/codec-dx50.h | 55 +++++++++++++++++++++++++ firmware/export/codec-dx90.h | 35 ++++++++++++++++ firmware/target/hosted/ibasso/dx50/codec-dx50.h | 55 ------------------------- firmware/target/hosted/ibasso/dx90/codec-dx90.h | 35 ---------------- 5 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 firmware/export/codec-dx50.h create mode 100644 firmware/export/codec-dx90.h delete mode 100644 firmware/target/hosted/ibasso/dx50/codec-dx50.h delete mode 100644 firmware/target/hosted/ibasso/dx90/codec-dx90.h (limited to 'firmware') diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 00bb15812d..f22e72554d 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -215,7 +215,7 @@ struct sound_settings_info #include "cs4398.h" #elif defined(HAVE_ES9018) #include "es9018.h" -#elif (CONFIG_PLATFORM & (PLATFORM_ANDROID | PLATFORM_MAEMO\ +#elif (CONFIG_PLATFORM & (PLATFORM_ANDROID | PLATFORM_MAEMO \ | PLATFORM_PANDORA | PLATFORM_SDL)) #include "hosted_codec.h" #elif defined(DX50) @@ -644,7 +644,7 @@ void audiohw_set_pitch(int32_t val); /** * Return the set pitch ratio - */ + */ int32_t audiohw_get_pitch(void); #endif /* HAVE_PITCHCONTROL */ diff --git a/firmware/export/codec-dx50.h b/firmware/export/codec-dx50.h new file mode 100644 index 0000000000..baa5b7c3b6 --- /dev/null +++ b/firmware/export/codec-dx50.h @@ -0,0 +1,55 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#ifndef _CODEC_DX50_H_ +#define _CODEC_DX50_H_ + + +#define AUDIOHW_CAPS (MONO_VOL_CAP | FILTER_ROLL_OFF_CAP) + + +/* + http://www.wolfsonmicro.com/media/76425/WM8740.pdf + + 0.5 * ( x - 255 ) = ydB 1 <= x <= 255 + mute x = 0 + + x = 255 -> 0dB + . + . + . + x = 2 -> -126.5dB + x = 1 -> -127dB + x = 0 -> -128dB + + See audiohw.h, sound.c. +*/ +AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -128, 0, -30) + + +/* 1: slow roll off, 0: sharp roll off, sharp roll off default */ +AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 1, 0) + + +#endif diff --git a/firmware/export/codec-dx90.h b/firmware/export/codec-dx90.h new file mode 100644 index 0000000000..b96377dfec --- /dev/null +++ b/firmware/export/codec-dx90.h @@ -0,0 +1,35 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#ifndef _CODEC_DX90_H_ +#define _CODEC_DX90_H_ + + +#define AUDIOHW_CAPS MONO_VOL_CAP + + +AUDIOHW_SETTING(VOLUME, "", 0, 1, -255, 0, -128) + + +#endif diff --git a/firmware/target/hosted/ibasso/dx50/codec-dx50.h b/firmware/target/hosted/ibasso/dx50/codec-dx50.h deleted file mode 100644 index baa5b7c3b6..0000000000 --- a/firmware/target/hosted/ibasso/dx50/codec-dx50.h +++ /dev/null @@ -1,55 +0,0 @@ -/*************************************************************************** - * __________ __ ___ - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 - * Copyright (C) 2014 by Mario Basister: iBasso DX90 port - * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features - * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - - -#ifndef _CODEC_DX50_H_ -#define _CODEC_DX50_H_ - - -#define AUDIOHW_CAPS (MONO_VOL_CAP | FILTER_ROLL_OFF_CAP) - - -/* - http://www.wolfsonmicro.com/media/76425/WM8740.pdf - - 0.5 * ( x - 255 ) = ydB 1 <= x <= 255 - mute x = 0 - - x = 255 -> 0dB - . - . - . - x = 2 -> -126.5dB - x = 1 -> -127dB - x = 0 -> -128dB - - See audiohw.h, sound.c. -*/ -AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -128, 0, -30) - - -/* 1: slow roll off, 0: sharp roll off, sharp roll off default */ -AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 1, 0) - - -#endif diff --git a/firmware/target/hosted/ibasso/dx90/codec-dx90.h b/firmware/target/hosted/ibasso/dx90/codec-dx90.h deleted file mode 100644 index b96377dfec..0000000000 --- a/firmware/target/hosted/ibasso/dx90/codec-dx90.h +++ /dev/null @@ -1,35 +0,0 @@ -/*************************************************************************** - * __________ __ ___ - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 - * Copyright (C) 2014 by Mario Basister: iBasso DX90 port - * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features - * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - - -#ifndef _CODEC_DX90_H_ -#define _CODEC_DX90_H_ - - -#define AUDIOHW_CAPS MONO_VOL_CAP - - -AUDIOHW_SETTING(VOLUME, "", 0, 1, -255, 0, -128) - - -#endif -- cgit v1.2.3