From 8f779136fa84fa2ccc402c8f8ceb874d57e41836 Mon Sep 17 00:00:00 2001 From: balika011 Date: Mon, 10 Mar 2025 20:16:20 +0100 Subject: [PATCH] restructure firmware to be more inline with pro --- software/sys_controller/Makefile | 70 ++++++++++--------- .../sys_controller/{ossc => }/av_controller.c | 0 .../{ossc => config}/sysconfig.h | 0 .../{ => ic_drivers}/it6613/EDID.c | 0 .../{ => ic_drivers}/it6613/HDMI_COMMON.h | 0 .../{ => ic_drivers}/it6613/HDMI_TX.c | 0 .../{ => ic_drivers}/it6613/HDMI_TX.h | 0 .../{ => ic_drivers}/it6613/edid.h | 0 .../{ => ic_drivers}/it6613/hdmitx.h | 0 .../{ => ic_drivers}/it6613/hdmitx_nios2.c | 0 .../{ => ic_drivers}/it6613/it6613.c | 0 .../{ => ic_drivers}/it6613/it6613.h | 0 .../{ => ic_drivers}/it6613/it6613_drv.c | 0 .../{ => ic_drivers}/it6613/it6613_drv.h | 0 .../{ => ic_drivers}/it6613/it6613_sys.c | 0 .../{ => ic_drivers}/it6613/it6613_sys.h | 0 .../{ => ic_drivers}/it6613/typedef.h | 0 .../{ => ic_drivers}/pcm1862/pcm1862.c | 0 .../{ => ic_drivers}/pcm1862/pcm1862.h | 0 .../{ => ic_drivers}/pcm1862/pcm1862_regs.h | 0 .../{ => ic_drivers}/spi_charlcd/lcd.c | 0 .../{ => ic_drivers}/spi_charlcd/lcd.h | 0 .../{ => ic_drivers}/ths7353/ths7353.c | 0 .../{ => ic_drivers}/ths7353/ths7353.h | 0 .../{ => ic_drivers}/tvp7002/tvp7002.c | 0 .../{ => ic_drivers}/tvp7002/tvp7002.h | 0 .../{ => ic_drivers}/tvp7002/tvp7002_regs.h | 0 .../{ossc => inc}/av_controller.h | 0 .../sys_controller/{ossc => inc}/avconfig.h | 0 .../sys_controller/{ossc => inc}/controls.h | 0 .../{ossc => inc}/fat16_export.h | 0 .../sys_controller/{ossc => inc}/firmware.h | 0 .../sys_controller/{memory => inc}/flash.h | 0 software/sys_controller/{ossc => inc}/menu.h | 0 .../sys_controller/{memory => inc}/sdcard.h | 0 .../sys_controller/{ossc => inc}/userdata.h | 0 software/sys_controller/{ossc => inc}/utils.h | 0 .../{ossc => inc}/video_modes.h | 0 .../sys_controller/{ossc => src}/avconfig.c | 0 .../sys_controller/{ossc => src}/controls.c | 0 .../{ossc => src}/fat16_export.c | 0 .../sys_controller/{ossc => src}/firmware.c | 0 .../sys_controller/{memory => src}/flash.c | 0 software/sys_controller/{ossc => src}/menu.c | 0 .../sys_controller/{memory => src}/sdcard.c | 0 .../sys_controller/{ossc => src}/userdata.c | 0 software/sys_controller/{ossc => src}/utils.c | 0 .../{ossc => src}/video_modes.c | 0 .../{ossc => src}/video_modes_list.c | 0 49 files changed, 36 insertions(+), 34 deletions(-) rename software/sys_controller/{ossc => }/av_controller.c (100%) rename software/sys_controller/{ossc => config}/sysconfig.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/EDID.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/HDMI_COMMON.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/HDMI_TX.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/HDMI_TX.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/edid.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/hdmitx.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/hdmitx_nios2.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613_drv.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613_drv.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613_sys.c (100%) rename software/sys_controller/{ => ic_drivers}/it6613/it6613_sys.h (100%) rename software/sys_controller/{ => ic_drivers}/it6613/typedef.h (100%) rename software/sys_controller/{ => ic_drivers}/pcm1862/pcm1862.c (100%) rename software/sys_controller/{ => ic_drivers}/pcm1862/pcm1862.h (100%) rename software/sys_controller/{ => ic_drivers}/pcm1862/pcm1862_regs.h (100%) rename software/sys_controller/{ => ic_drivers}/spi_charlcd/lcd.c (100%) rename software/sys_controller/{ => ic_drivers}/spi_charlcd/lcd.h (100%) rename software/sys_controller/{ => ic_drivers}/ths7353/ths7353.c (100%) rename software/sys_controller/{ => ic_drivers}/ths7353/ths7353.h (100%) rename software/sys_controller/{ => ic_drivers}/tvp7002/tvp7002.c (100%) rename software/sys_controller/{ => ic_drivers}/tvp7002/tvp7002.h (100%) rename software/sys_controller/{ => ic_drivers}/tvp7002/tvp7002_regs.h (100%) rename software/sys_controller/{ossc => inc}/av_controller.h (100%) rename software/sys_controller/{ossc => inc}/avconfig.h (100%) rename software/sys_controller/{ossc => inc}/controls.h (100%) rename software/sys_controller/{ossc => inc}/fat16_export.h (100%) rename software/sys_controller/{ossc => inc}/firmware.h (100%) rename software/sys_controller/{memory => inc}/flash.h (100%) rename software/sys_controller/{ossc => inc}/menu.h (100%) rename software/sys_controller/{memory => inc}/sdcard.h (100%) rename software/sys_controller/{ossc => inc}/userdata.h (100%) rename software/sys_controller/{ossc => inc}/utils.h (100%) rename software/sys_controller/{ossc => inc}/video_modes.h (100%) rename software/sys_controller/{ossc => src}/avconfig.c (100%) rename software/sys_controller/{ossc => src}/controls.c (100%) rename software/sys_controller/{ossc => src}/fat16_export.c (100%) rename software/sys_controller/{ossc => src}/firmware.c (100%) rename software/sys_controller/{memory => src}/flash.c (100%) rename software/sys_controller/{ossc => src}/menu.c (100%) rename software/sys_controller/{memory => src}/sdcard.c (100%) rename software/sys_controller/{ossc => src}/userdata.c (100%) rename software/sys_controller/{ossc => src}/utils.c (100%) rename software/sys_controller/{ossc => src}/video_modes.c (100%) rename software/sys_controller/{ossc => src}/video_modes_list.c (100%) diff --git a/software/sys_controller/Makefile b/software/sys_controller/Makefile index 0292e9e..7afd78c 100644 --- a/software/sys_controller/Makefile +++ b/software/sys_controller/Makefile @@ -142,35 +142,35 @@ ACDS_VERSION := 14.1 ELF := sys_controller.elf # Paths to C, C++, and assembly source files. -C_SRCS += it6613/EDID.c -C_SRCS += it6613/HDMI_TX.c -C_SRCS += it6613/hdmitx_nios2.c -C_SRCS += it6613/it6613.c -C_SRCS += it6613/it6613_drv.c -C_SRCS += it6613/it6613_sys.c -C_SRCS += tvp7002/tvp7002.c -C_SRCS += ths7353/ths7353.c -C_SRCS += pcm1862/pcm1862.c -C_SRCS += spi_charlcd/lcd.c -C_SRCS += memory/flash.c -C_SRCS += memory/sdcard.c -C_SRCS += ossc/av_controller.c -C_SRCS += ossc/avconfig.c -C_SRCS += ossc/controls.c -C_SRCS += ossc/firmware.c -C_SRCS += ossc/fat16_export.c +C_SRCS += av_controller.c +C_SRCS += src/avconfig.c +C_SRCS += src/utils.c +C_SRCS += src/controls.c ifeq ($(OSDLANG),JP) -C_SRCS += ossc/menu_sjis.c +C_SRCS += src/menu_sjis.c else -C_SRCS += ossc/menu.c +C_SRCS += src/menu.c endif +C_SRCS += src/video_modes.c +C_SRCS += src/flash.c +C_SRCS += src/firmware.c ifeq ($(OSDLANG),JP) -C_SRCS += ossc/userdata_sjis.c +C_SRCS += src/userdata_sjis.c else -C_SRCS += ossc/userdata.c +C_SRCS += src/userdata.c endif -C_SRCS += ossc/utils.c -C_SRCS += ossc/video_modes.c +C_SRCS += src/sdcard.c +C_SRCS += src/fat16_export.c +C_SRCS += ic_drivers/it6613/EDID.c +C_SRCS += ic_drivers/it6613/HDMI_TX.c +C_SRCS += ic_drivers/it6613/hdmitx_nios2.c +C_SRCS += ic_drivers/it6613/it6613.c +C_SRCS += ic_drivers/it6613/it6613_drv.c +C_SRCS += ic_drivers/it6613/it6613_sys.c +C_SRCS += ic_drivers/tvp7002/tvp7002.c +C_SRCS += ic_drivers/ths7353/ths7353.c +C_SRCS += ic_drivers/pcm1862/pcm1862.c +C_SRCS += ic_drivers/spi_charlcd/lcd.c C_SRCS += ulibSD/sd_io.c C_SRCS += ulibSD/spi_io.c CXX_SRCS := @@ -217,14 +217,16 @@ BSP_ROOT_DIR := ../sys_controller_bsp/ # List of application specific include directories, library directories and library names APP_INCLUDE_DIRS += /usr/lib/picolibc/riscv64-unknown-elf/include -APP_INCLUDE_DIRS += it6613 -APP_INCLUDE_DIRS += tvp7002 -APP_INCLUDE_DIRS += ths7353 -APP_INCLUDE_DIRS += pcm1862 -APP_INCLUDE_DIRS += spi_charlcd +APP_INCLUDE_DIRS += config +APP_INCLUDE_DIRS += inc +APP_INCLUDE_DIRS += ic_drivers/it6613 +APP_INCLUDE_DIRS += ic_drivers/tvp7002 +APP_INCLUDE_DIRS += ic_drivers/ths7353 +APP_INCLUDE_DIRS += ic_drivers/pcm1862 +APP_INCLUDE_DIRS += ic_drivers/spi_charlcd +>>>>>>> 6015591 (restructure firmware to be more inline with pro) APP_INCLUDE_DIRS += memory APP_INCLUDE_DIRS += ulibSD -APP_INCLUDE_DIRS += ossc APP_LIBRARY_DIRS := APP_LIBRARY_NAMES := @@ -976,7 +978,7 @@ clean : clean_elf_derived_files endif clean : - @$(RM) -r $(ELF) $(OBJDUMP_NAME) $(LINKER_MAP_NAME) $(OBJ_ROOT_DIR) $(RUNTIME_ROOT_DIR) $(FORCE_REBUILD_DEP_LIST) ossc/menu_sjis.c ossc/userdata_sjis.c + @$(RM) -r $(ELF) $(OBJDUMP_NAME) $(LINKER_MAP_NAME) $(OBJ_ROOT_DIR) $(RUNTIME_ROOT_DIR) $(FORCE_REBUILD_DEP_LIST) src/menu_sjis.c src/userdata_sjis.c @$(ECHO) [$(APP_NAME) clean complete] # Clean just the BSP. @@ -1133,11 +1135,11 @@ print-elf-name: #------------------------------------------------------------------------------ # CUSTOM TARGETS #------------------------------------------------------------------------------ -ossc/menu_sjis.c: ossc/menu.c - iconv -f UTF-8 -t SHIFT-JIS ossc/menu.c > ossc/menu_sjis.c +src/menu_sjis.c: src/menu.c + iconv -f UTF-8 -t SHIFT-JIS src/menu.c > src/menu_sjis.c -ossc/userdata_sjis.c: ossc/userdata.c - iconv -f UTF-8 -t SHIFT-JIS ossc/userdata.c > ossc/userdata_sjis.c +src/userdata_sjis.c: src/userdata.c + iconv -f UTF-8 -t SHIFT-JIS src/userdata.c > src/userdata_sjis.c mem_init/flash.hex: sys_controller.elf $(RV_OBJCOPY) --change-addresses -0x02080000 -O binary --gap-fill 0 $< mem_init/flash.bin diff --git a/software/sys_controller/ossc/av_controller.c b/software/sys_controller/av_controller.c similarity index 100% rename from software/sys_controller/ossc/av_controller.c rename to software/sys_controller/av_controller.c diff --git a/software/sys_controller/ossc/sysconfig.h b/software/sys_controller/config/sysconfig.h similarity index 100% rename from software/sys_controller/ossc/sysconfig.h rename to software/sys_controller/config/sysconfig.h diff --git a/software/sys_controller/it6613/EDID.c b/software/sys_controller/ic_drivers/it6613/EDID.c similarity index 100% rename from software/sys_controller/it6613/EDID.c rename to software/sys_controller/ic_drivers/it6613/EDID.c diff --git a/software/sys_controller/it6613/HDMI_COMMON.h b/software/sys_controller/ic_drivers/it6613/HDMI_COMMON.h similarity index 100% rename from software/sys_controller/it6613/HDMI_COMMON.h rename to software/sys_controller/ic_drivers/it6613/HDMI_COMMON.h diff --git a/software/sys_controller/it6613/HDMI_TX.c b/software/sys_controller/ic_drivers/it6613/HDMI_TX.c similarity index 100% rename from software/sys_controller/it6613/HDMI_TX.c rename to software/sys_controller/ic_drivers/it6613/HDMI_TX.c diff --git a/software/sys_controller/it6613/HDMI_TX.h b/software/sys_controller/ic_drivers/it6613/HDMI_TX.h similarity index 100% rename from software/sys_controller/it6613/HDMI_TX.h rename to software/sys_controller/ic_drivers/it6613/HDMI_TX.h diff --git a/software/sys_controller/it6613/edid.h b/software/sys_controller/ic_drivers/it6613/edid.h similarity index 100% rename from software/sys_controller/it6613/edid.h rename to software/sys_controller/ic_drivers/it6613/edid.h diff --git a/software/sys_controller/it6613/hdmitx.h b/software/sys_controller/ic_drivers/it6613/hdmitx.h similarity index 100% rename from software/sys_controller/it6613/hdmitx.h rename to software/sys_controller/ic_drivers/it6613/hdmitx.h diff --git a/software/sys_controller/it6613/hdmitx_nios2.c b/software/sys_controller/ic_drivers/it6613/hdmitx_nios2.c similarity index 100% rename from software/sys_controller/it6613/hdmitx_nios2.c rename to software/sys_controller/ic_drivers/it6613/hdmitx_nios2.c diff --git a/software/sys_controller/it6613/it6613.c b/software/sys_controller/ic_drivers/it6613/it6613.c similarity index 100% rename from software/sys_controller/it6613/it6613.c rename to software/sys_controller/ic_drivers/it6613/it6613.c diff --git a/software/sys_controller/it6613/it6613.h b/software/sys_controller/ic_drivers/it6613/it6613.h similarity index 100% rename from software/sys_controller/it6613/it6613.h rename to software/sys_controller/ic_drivers/it6613/it6613.h diff --git a/software/sys_controller/it6613/it6613_drv.c b/software/sys_controller/ic_drivers/it6613/it6613_drv.c similarity index 100% rename from software/sys_controller/it6613/it6613_drv.c rename to software/sys_controller/ic_drivers/it6613/it6613_drv.c diff --git a/software/sys_controller/it6613/it6613_drv.h b/software/sys_controller/ic_drivers/it6613/it6613_drv.h similarity index 100% rename from software/sys_controller/it6613/it6613_drv.h rename to software/sys_controller/ic_drivers/it6613/it6613_drv.h diff --git a/software/sys_controller/it6613/it6613_sys.c b/software/sys_controller/ic_drivers/it6613/it6613_sys.c similarity index 100% rename from software/sys_controller/it6613/it6613_sys.c rename to software/sys_controller/ic_drivers/it6613/it6613_sys.c diff --git a/software/sys_controller/it6613/it6613_sys.h b/software/sys_controller/ic_drivers/it6613/it6613_sys.h similarity index 100% rename from software/sys_controller/it6613/it6613_sys.h rename to software/sys_controller/ic_drivers/it6613/it6613_sys.h diff --git a/software/sys_controller/it6613/typedef.h b/software/sys_controller/ic_drivers/it6613/typedef.h similarity index 100% rename from software/sys_controller/it6613/typedef.h rename to software/sys_controller/ic_drivers/it6613/typedef.h diff --git a/software/sys_controller/pcm1862/pcm1862.c b/software/sys_controller/ic_drivers/pcm1862/pcm1862.c similarity index 100% rename from software/sys_controller/pcm1862/pcm1862.c rename to software/sys_controller/ic_drivers/pcm1862/pcm1862.c diff --git a/software/sys_controller/pcm1862/pcm1862.h b/software/sys_controller/ic_drivers/pcm1862/pcm1862.h similarity index 100% rename from software/sys_controller/pcm1862/pcm1862.h rename to software/sys_controller/ic_drivers/pcm1862/pcm1862.h diff --git a/software/sys_controller/pcm1862/pcm1862_regs.h b/software/sys_controller/ic_drivers/pcm1862/pcm1862_regs.h similarity index 100% rename from software/sys_controller/pcm1862/pcm1862_regs.h rename to software/sys_controller/ic_drivers/pcm1862/pcm1862_regs.h diff --git a/software/sys_controller/spi_charlcd/lcd.c b/software/sys_controller/ic_drivers/spi_charlcd/lcd.c similarity index 100% rename from software/sys_controller/spi_charlcd/lcd.c rename to software/sys_controller/ic_drivers/spi_charlcd/lcd.c diff --git a/software/sys_controller/spi_charlcd/lcd.h b/software/sys_controller/ic_drivers/spi_charlcd/lcd.h similarity index 100% rename from software/sys_controller/spi_charlcd/lcd.h rename to software/sys_controller/ic_drivers/spi_charlcd/lcd.h diff --git a/software/sys_controller/ths7353/ths7353.c b/software/sys_controller/ic_drivers/ths7353/ths7353.c similarity index 100% rename from software/sys_controller/ths7353/ths7353.c rename to software/sys_controller/ic_drivers/ths7353/ths7353.c diff --git a/software/sys_controller/ths7353/ths7353.h b/software/sys_controller/ic_drivers/ths7353/ths7353.h similarity index 100% rename from software/sys_controller/ths7353/ths7353.h rename to software/sys_controller/ic_drivers/ths7353/ths7353.h diff --git a/software/sys_controller/tvp7002/tvp7002.c b/software/sys_controller/ic_drivers/tvp7002/tvp7002.c similarity index 100% rename from software/sys_controller/tvp7002/tvp7002.c rename to software/sys_controller/ic_drivers/tvp7002/tvp7002.c diff --git a/software/sys_controller/tvp7002/tvp7002.h b/software/sys_controller/ic_drivers/tvp7002/tvp7002.h similarity index 100% rename from software/sys_controller/tvp7002/tvp7002.h rename to software/sys_controller/ic_drivers/tvp7002/tvp7002.h diff --git a/software/sys_controller/tvp7002/tvp7002_regs.h b/software/sys_controller/ic_drivers/tvp7002/tvp7002_regs.h similarity index 100% rename from software/sys_controller/tvp7002/tvp7002_regs.h rename to software/sys_controller/ic_drivers/tvp7002/tvp7002_regs.h diff --git a/software/sys_controller/ossc/av_controller.h b/software/sys_controller/inc/av_controller.h similarity index 100% rename from software/sys_controller/ossc/av_controller.h rename to software/sys_controller/inc/av_controller.h diff --git a/software/sys_controller/ossc/avconfig.h b/software/sys_controller/inc/avconfig.h similarity index 100% rename from software/sys_controller/ossc/avconfig.h rename to software/sys_controller/inc/avconfig.h diff --git a/software/sys_controller/ossc/controls.h b/software/sys_controller/inc/controls.h similarity index 100% rename from software/sys_controller/ossc/controls.h rename to software/sys_controller/inc/controls.h diff --git a/software/sys_controller/ossc/fat16_export.h b/software/sys_controller/inc/fat16_export.h similarity index 100% rename from software/sys_controller/ossc/fat16_export.h rename to software/sys_controller/inc/fat16_export.h diff --git a/software/sys_controller/ossc/firmware.h b/software/sys_controller/inc/firmware.h similarity index 100% rename from software/sys_controller/ossc/firmware.h rename to software/sys_controller/inc/firmware.h diff --git a/software/sys_controller/memory/flash.h b/software/sys_controller/inc/flash.h similarity index 100% rename from software/sys_controller/memory/flash.h rename to software/sys_controller/inc/flash.h diff --git a/software/sys_controller/ossc/menu.h b/software/sys_controller/inc/menu.h similarity index 100% rename from software/sys_controller/ossc/menu.h rename to software/sys_controller/inc/menu.h diff --git a/software/sys_controller/memory/sdcard.h b/software/sys_controller/inc/sdcard.h similarity index 100% rename from software/sys_controller/memory/sdcard.h rename to software/sys_controller/inc/sdcard.h diff --git a/software/sys_controller/ossc/userdata.h b/software/sys_controller/inc/userdata.h similarity index 100% rename from software/sys_controller/ossc/userdata.h rename to software/sys_controller/inc/userdata.h diff --git a/software/sys_controller/ossc/utils.h b/software/sys_controller/inc/utils.h similarity index 100% rename from software/sys_controller/ossc/utils.h rename to software/sys_controller/inc/utils.h diff --git a/software/sys_controller/ossc/video_modes.h b/software/sys_controller/inc/video_modes.h similarity index 100% rename from software/sys_controller/ossc/video_modes.h rename to software/sys_controller/inc/video_modes.h diff --git a/software/sys_controller/ossc/avconfig.c b/software/sys_controller/src/avconfig.c similarity index 100% rename from software/sys_controller/ossc/avconfig.c rename to software/sys_controller/src/avconfig.c diff --git a/software/sys_controller/ossc/controls.c b/software/sys_controller/src/controls.c similarity index 100% rename from software/sys_controller/ossc/controls.c rename to software/sys_controller/src/controls.c diff --git a/software/sys_controller/ossc/fat16_export.c b/software/sys_controller/src/fat16_export.c similarity index 100% rename from software/sys_controller/ossc/fat16_export.c rename to software/sys_controller/src/fat16_export.c diff --git a/software/sys_controller/ossc/firmware.c b/software/sys_controller/src/firmware.c similarity index 100% rename from software/sys_controller/ossc/firmware.c rename to software/sys_controller/src/firmware.c diff --git a/software/sys_controller/memory/flash.c b/software/sys_controller/src/flash.c similarity index 100% rename from software/sys_controller/memory/flash.c rename to software/sys_controller/src/flash.c diff --git a/software/sys_controller/ossc/menu.c b/software/sys_controller/src/menu.c similarity index 100% rename from software/sys_controller/ossc/menu.c rename to software/sys_controller/src/menu.c diff --git a/software/sys_controller/memory/sdcard.c b/software/sys_controller/src/sdcard.c similarity index 100% rename from software/sys_controller/memory/sdcard.c rename to software/sys_controller/src/sdcard.c diff --git a/software/sys_controller/ossc/userdata.c b/software/sys_controller/src/userdata.c similarity index 100% rename from software/sys_controller/ossc/userdata.c rename to software/sys_controller/src/userdata.c diff --git a/software/sys_controller/ossc/utils.c b/software/sys_controller/src/utils.c similarity index 100% rename from software/sys_controller/ossc/utils.c rename to software/sys_controller/src/utils.c diff --git a/software/sys_controller/ossc/video_modes.c b/software/sys_controller/src/video_modes.c similarity index 100% rename from software/sys_controller/ossc/video_modes.c rename to software/sys_controller/src/video_modes.c diff --git a/software/sys_controller/ossc/video_modes_list.c b/software/sys_controller/src/video_modes_list.c similarity index 100% rename from software/sys_controller/ossc/video_modes_list.c rename to software/sys_controller/src/video_modes_list.c