From 8ed64b5cba67366ca823ac57d05d4bb86f248996 Mon Sep 17 00:00:00 2001 From: balika011 Date: Mon, 10 Mar 2025 22:11:46 +0100 Subject: [PATCH] remove deprecated ENABLE_AUDIO option --- README.md | 1 - software/sys_controller/Makefile | 3 --- software/sys_controller/av_controller.c | 18 ++---------------- software/sys_controller/inc/firmware.h | 10 ++-------- software/sys_controller/src/avconfig.c | 2 -- software/sys_controller/src/menu.c | 4 ---- 6 files changed, 4 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 5448321..0938283 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ make [OPTIONS] [TARGET] ~~~~ OPTIONS may include following definitions: * OSDLANG=JP (Japanese language menu) -* ENABLE_AUDIO=y (Includes audio setup code for v1.6 PCB / DIY audio add-on board) TARGET is typically one of the following: * all (Default target. Compiles an ELF file) diff --git a/software/sys_controller/Makefile b/software/sys_controller/Makefile index 456014b..7018270 100644 --- a/software/sys_controller/Makefile +++ b/software/sys_controller/Makefile @@ -193,9 +193,6 @@ CREATE_LINKER_MAP := 1 # Common arguments for ALT_CFLAGSs APP_CFLAGS_DEFINED_SYMBOLS := -DPICOLIBC_INTEGER_PRINTF_SCANF -ifeq ($(ENABLE_AUDIO),y) -APP_CFLAGS_DEFINED_SYMBOLS += -DENABLE_AUDIO -endif ifeq ($(OSDLANG),JP) APP_CFLAGS_DEFINED_SYMBOLS += -DOSDLANG_JP endif diff --git a/software/sys_controller/av_controller.c b/software/sys_controller/av_controller.c index 0e34ee7..de6d7c6 100644 --- a/software/sys_controller/av_controller.c +++ b/software/sys_controller/av_controller.c @@ -155,7 +155,6 @@ void ui_disp_status(alt_u8 refresh_osd_timer) { } } -#ifdef ENABLE_AUDIO inline void SetupAudio(tx_mode_t mode) { // shut down audio-tx before setting new config (recommended for changing audio-tx config) @@ -177,7 +176,6 @@ inline void SetupAudio(tx_mode_t mode) #endif } } -#endif inline void TX_enable(tx_mode_t mode) { @@ -202,9 +200,7 @@ inline void TX_enable(tx_mode_t mode) cm.cc.hdmi_vrr = tc.hdmi_vrr; } -#ifdef ENABLE_AUDIO SetupAudio(mode); -#endif // start TX SetAVMute(FALSE); @@ -418,7 +414,6 @@ status_t get_status(tvp_sync_input_t syncinput) if (tc.full_vs_bypass != cm.cc.full_vs_bypass) tvp_set_full_vs_bypass(tc.full_vs_bypass); -#ifdef ENABLE_AUDIO if ((tc.audio_dw_sampl != cm.cc.audio_dw_sampl) || #ifdef MANUAL_CTS update_cur_vm || @@ -434,7 +429,6 @@ status_t get_status(tvp_sync_input_t syncinput) pcm_set_stereo_mode(tc.audio_mono); SetupAudio(cm.cc.tx_mode); } -#endif cm.cc = tc; update_cur_vm = 0; @@ -685,10 +679,8 @@ void program_mode() TX_enable(cm.cc.tx_mode); } else if (cm.cc.tx_mode!=TX_DVI) { HDMITX_SetAVIInfoFrame(vmode_out.vic, (cm.cc.tx_mode == TX_HDMI_RGB) ? F_MODE_RGB444 : F_MODE_YUV444, 0, 0, cm.cc.hdmi_itc, vm_conf.hdmitx_pixr_ifr); -#ifdef ENABLE_AUDIO #ifdef MANUAL_CTS SetupAudio(cm.cc.tx_mode); -#endif #endif } } @@ -807,12 +799,10 @@ int init_hw() InitIT6613(); -#ifdef ENABLE_AUDIO if (pcm1862_init()) { printf("PCM1862 found\n"); pcm1862_active = 1; } -#endif /*if (init_flash() != 0) { printf("Error: could not find flash\n"); @@ -869,7 +859,7 @@ void print_vm_stats() { sniprintf((char*)osd->osd_array.data[++row][0], OSD_CHAR_COLS, "Profile:"); sniprintf((char*)osd->osd_array.data[row][1], OSD_CHAR_COLS, "%u: %s", profile_sel, (target_profile_name[0] == 0) ? "" : target_profile_name); sniprintf((char*)osd->osd_array.data[++row][0], OSD_CHAR_COLS, "FW:"); - sniprintf((char*)osd->osd_array.data[row][1], OSD_CHAR_COLS, "%u.%.2u" FW_SUFFIX1 FW_SUFFIX2 " @ " __DATE__, FW_VER_MAJOR, FW_VER_MINOR); + sniprintf((char*)osd->osd_array.data[row][1], OSD_CHAR_COLS, "%u.%.2u" FW_SUFFIX " @ " __DATE__, FW_VER_MAJOR, FW_VER_MINOR); osd->osd_config.status_refresh = 1; osd->osd_row_color.mask = 0; @@ -965,7 +955,7 @@ int main() if (init_stat >= 0) { printf("### DIY VIDEO DIGITIZER / SCANCONVERTER INIT OK ###\n\n"); - sniprintf(row1, LCD_ROW_LEN+1, "OSSC fw. %u.%.2u" FW_SUFFIX1 FW_SUFFIX2, FW_VER_MAJOR, FW_VER_MINOR); + sniprintf(row1, LCD_ROW_LEN+1, " OSSC fw. %u.%.2u" FW_SUFFIX, FW_VER_MAJOR, FW_VER_MINOR); #ifndef DEBUG strncpy(row2, "2014-2025 marqs", LCD_ROW_LEN+1); #else @@ -1127,11 +1117,9 @@ int main() cm.sync_active = 0; ths_source_sel(target_ths, (cm.cc.video_lpf > 1) ? (VIDEO_LPF_MAX-cm.cc.video_lpf) : THS_LPF_BYPASS); tvp_powerdown(); -#ifdef ENABLE_AUDIO DisableAudioOutput(); if (pcm1862_active) pcm_source_sel(target_pcm); -#endif tvp_source_sel(target_tvp, target_tvp_sync, target_format); cm.clkcnt = 0; //TODO: proper invalidate sys_ctrl &= ~VSYNC_I_TYPE; @@ -1204,9 +1192,7 @@ int main() IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, sys_ctrl); tvp_powerup(); program_mode(); -#ifdef ENABLE_AUDIO SetupAudio(cm.cc.tx_mode); -#endif } else { printf("Sync lost\n"); cm.clkcnt = 0; //TODO: proper invalidate diff --git a/software/sys_controller/inc/firmware.h b/software/sys_controller/inc/firmware.h index e5f4677..15c8d6c 100644 --- a/software/sys_controller/inc/firmware.h +++ b/software/sys_controller/inc/firmware.h @@ -32,16 +32,10 @@ #define INITCFG_VER_MAJOR 1 #define INITCFG_VER_MINOR 0 -#ifdef ENABLE_AUDIO -#define FW_SUFFIX1 "a" -#else -#define FW_SUFFIX1 "" -#endif - #ifdef OSDLANG_JP -#define FW_SUFFIX2 "j" +#define FW_SUFFIX "j" #else -#define FW_SUFFIX2 "" +#define FW_SUFFIX "" #endif #define FW_UPDATE_RETRIES 3 diff --git a/software/sys_controller/src/avconfig.c b/software/sys_controller/src/avconfig.c index e675787..df4fd32 100644 --- a/software/sys_controller/src/avconfig.c +++ b/software/sys_controller/src/avconfig.c @@ -59,10 +59,8 @@ const avconfig_t tc_default = { .c_gain = DEFAULT_COARSE_GAIN, }, .mask_br = 8, -#ifdef ENABLE_AUDIO .audio_dw_sampl = DEFAULT_ON, .audio_gain = AUDIO_GAIN_0DB, -#endif .link_av = AV_LAST, }; diff --git a/software/sys_controller/src/menu.c b/software/sys_controller/src/menu.c index f0d198d..ab1c16e 100644 --- a/software/sys_controller/src/menu.c +++ b/software/sys_controller/src/menu.c @@ -228,7 +228,6 @@ MENU(menu_compatibility, P99_PROTECT({ \ { "Default HDMI VIC", OPT_AVCONFIG_NUMVALUE, { .num = { &tc.default_vic, OPT_NOWRAP, 0, HDMI_1080p50, value_disp } } }, })) -#ifdef ENABLE_AUDIO MENU(menu_audio, P99_PROTECT({ \ { LNG("Down-sampling","ﾀﾞｳﾝｻﾝﾌﾟﾘﾝｸﾞ"), OPT_AVCONFIG_SELECTION, { .sel = { &tc.audio_dw_sampl, OPT_WRAP, SETTING_ITEM(audio_dw_sampl_desc) } } }, { LNG("Swap left/right","ﾋﾀﾞﾘ/ﾐｷﾞｽﾜｯﾌﾟ"), OPT_AVCONFIG_SELECTION, { .sel = { &tc.audio_swap_lr, OPT_WRAP, SETTING_ITEM(off_on_desc) } } }, @@ -236,9 +235,6 @@ MENU(menu_audio, P99_PROTECT({ \ { "Pre-ADC gain", OPT_AVCONFIG_NUMVALUE, { .num = { &tc.audio_gain, OPT_NOWRAP, 0, AUDIO_GAIN_MAX, aud_db_disp } } }, })) #define AUDIO_MENU { LNG("Audio options >","ｵｰﾃﾞｨｵｵﾌﾟｼｮﾝ >"), OPT_SUBMENU, { .sub = { &menu_audio, NULL, NULL } } }, -#else -#define AUDIO_MENU -#endif MENU(menu_settings, P99_PROTECT({ \ { LNG("Link prof->input","Link prof->input"), OPT_AVCONFIG_NUMVALUE, { .num = { &tc.link_av, OPT_WRAP, AV1_RGBs, AV_LAST, link_av_desc } } },