From: ljsebald <ljs...@us...> - 2024-02-23 01:33:18
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via ba408f3d97331498552a1eeff538e31deb1626a9 (commit) via 0d267e91f546f047fc326acddf90f52cfc94dcf2 (commit) via 0dc229f86c37b6a52f6c823002b36310dde0eae5 (commit) via 30b0112ed38dde16b6cc3a85d2adee8ccea11d26 (commit) from 32799ba83d3a7524110d2ab7f9138d3623803912 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ba408f3d97331498552a1eeff538e31deb1626a9 Merge: 0d267e91 30b0112e Author: Lawrence Sebald <ljs...@us...> Date: Thu Feb 22 20:32:30 2024 -0500 Merge pull request #488 from DC-SWAT/pvr_typos_fix Fixed typos in PVR code. commit 0d267e91f546f047fc326acddf90f52cfc94dcf2 Merge: 32799ba8 0dc229f8 Author: Lawrence Sebald <ljs...@us...> Date: Thu Feb 22 20:30:23 2024 -0500 Merge pull request #489 from dkm/dkm/tune_gcc_config gcc: configure GCC to let it know we use GNU tools commit 0dc229f86c37b6a52f6c823002b36310dde0eae5 Author: Marc Poulhiès <dk...@ka...> Date: Wed Feb 21 08:08:21 2024 +0100 gcc: configure GCC to let it know we use GNU tools In particular, the gcc driver will correctly pass -I from the command line to the assembler. Signed-off-by: Marc Poulhiès <dk...@ka...> commit 30b0112ed38dde16b6cc3a85d2adee8ccea11d26 Author: DC-SWAT <sw...@21...> Date: Wed Feb 21 11:13:18 2024 +0700 Fixed typos in PVR code. ----------------------------------------------------------------------- Summary of changes: kernel/arch/dreamcast/hardware/pvr/pvr_texture.c | 2 +- kernel/arch/dreamcast/include/dc/asic.h | 2 +- kernel/arch/dreamcast/include/dc/pvr.h | 2 +- utils/dc-chain/scripts/gcc-pass1.mk | 2 ++ utils/dc-chain/scripts/gcc-pass2.mk | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_texture.c b/kernel/arch/dreamcast/hardware/pvr/pvr_texture.c index 8fb435fe..0b5506dc 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_texture.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_texture.c @@ -195,7 +195,7 @@ void pvr_txr_load_kimg(kos_img_t *img, pvr_ptr_t dst, uint32 flags) { mutex_unlock((mutex_t *)&pvr_state.dma_lock); } else if(flags & PVR_TXRLOAD_SQ) { - pvr_txr_load(dst, img->data, img->byte_count); + pvr_txr_load(img->data, dst, img->byte_count); } else { memcpy4(dst, img->data, img->byte_count); diff --git a/kernel/arch/dreamcast/include/dc/asic.h b/kernel/arch/dreamcast/include/dc/asic.h index 2efe77d7..b9045373 100644 --- a/kernel/arch/dreamcast/include/dc/asic.h +++ b/kernel/arch/dreamcast/include/dc/asic.h @@ -58,7 +58,7 @@ __BEGIN_DECLS #define ASIC_EVT_PVR_VBLANK_END 0x0004 /**< \brief VBLANK end interrupt */ #define ASIC_EVT_PVR_HBLANK_BEGIN 0x0005 /**< \brief HBLANK begin interrupt */ -#define ASIC_EVT_PVR_YUV_DONE 0x0007 /**< \brief YUV completed */ +#define ASIC_EVT_PVR_YUV_DONE 0x0006 /**< \brief YUV completed */ #define ASIC_EVT_PVR_OPAQUEDONE 0x0007 /**< \brief Opaque list completed */ #define ASIC_EVT_PVR_OPAQUEMODDONE 0x0008 /**< \brief Opaque modifiers completed */ #define ASIC_EVT_PVR_TRANSDONE 0x0009 /**< \brief Transparent list completed */ diff --git a/kernel/arch/dreamcast/include/dc/pvr.h b/kernel/arch/dreamcast/include/dc/pvr.h index 1bb72912..2b9917d7 100644 --- a/kernel/arch/dreamcast/include/dc/pvr.h +++ b/kernel/arch/dreamcast/include/dc/pvr.h @@ -2395,7 +2395,7 @@ int pvr_dma_transfer(void *src, uintptr_t dest, size_t count, int type, #define PVR_DMA_TA 2 /**< \brief Transfer to the tile accelerator */ #define PVR_DMA_YUV 3 /**< \brief Transfer to the YUV converter (TA) */ #define PVR_DMA_VRAM32_SB 4 /**< \brief Transfer to/from VRAM using PVR i/f */ -#define PVR_DMA_VRAM64_SB 4 /**< \brief Transfer to/from VRAM using PVR i/f */ +#define PVR_DMA_VRAM64_SB 5 /**< \brief Transfer to/from VRAM using PVR i/f */ /** @} */ /** \brief Load a texture using TA DMA. diff --git a/utils/dc-chain/scripts/gcc-pass1.mk b/utils/dc-chain/scripts/gcc-pass1.mk index 20c71c5f..0ce06f3f 100644 --- a/utils/dc-chain/scripts/gcc-pass1.mk +++ b/utils/dc-chain/scripts/gcc-pass1.mk @@ -17,6 +17,8 @@ $(build_gcc_pass1): logdir ../$(src_dir)/configure \ --target=$(target) \ --prefix=$(prefix) \ + --with-gnu-as \ + --with-gnu-ld \ --without-headers \ --with-newlib \ --enable-languages=c \ diff --git a/utils/dc-chain/scripts/gcc-pass2.mk b/utils/dc-chain/scripts/gcc-pass2.mk index 96d6760a..4cede52b 100644 --- a/utils/dc-chain/scripts/gcc-pass2.mk +++ b/utils/dc-chain/scripts/gcc-pass2.mk @@ -14,6 +14,8 @@ $(build_gcc_pass2): logdir ../$(src_dir)/configure \ --target=$(target) \ --prefix=$(prefix) \ + --with-gnu-as \ + --with-gnu-ld \ --with-newlib \ --disable-libssp \ --enable-threads=$(thread_model) \ hooks/post-receive -- A pseudo Operating System for the Dreamcast. |