[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1008-gff68b98

[ljsebald <ljs...@us...>]

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  ff68b986d96786cadf25838d77f651989033b9c4 (commit)
       via  5e09d94fc3caa18c3eba211181ef1d30810d6522 (commit)
       via  26ee38ad5ce64fc48b235a399d3ed743a6e40335 (commit)
       via  47e128fffc7af1b65efcc24fae9a11c58fb4a1f4 (commit)
      from  efc5a3e4cb7c90b03449abc5572e08b1bcf84895 (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 ff68b986d96786cadf25838d77f651989033b9c4
Merge: 5e09d94 47e128f
Author: Lawrence Sebald <ljs...@us...>
Date:   Thu Aug 17 10:43:08 2023 -0400

    Merge pull request #258 from KallistiOS/matching_prereqs
    
    Alter 10.5.0 and 11.4.0 configs so custom dependencies match GCC's download_prerequisites

commit 5e09d94fc3caa18c3eba211181ef1d30810d6522
Merge: efc5a3e 26ee38a
Author: Lawrence Sebald <ljs...@us...>
Date:   Thu Aug 17 10:42:23 2023 -0400

    Merge pull request #269 from KallistiOS/timer-macro-comments
    
    Add comments clarifying quick macro definitions in timer.c

commit 26ee38ad5ce64fc48b235a399d3ed743a6e40335
Author: darc <da...@pr...>
Date:   Tue Aug 15 17:07:12 2023 -0500

    Add comments clarifying quick macro definitions in timer.c

commit 47e128fffc7af1b65efcc24fae9a11c58fb4a1f4
Author: darcagn <da...@pr...>
Date:   Wed Aug 9 13:05:15 2023 -0500

    Alter 10.5.0 and 11.4.0 configs so custom dependencies match GCC's download_prerequisites

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/kernel/timer.c          | 24 ++++++++++++------------
 utils/dc-chain/config/config.mk.10.5.0.sample |  8 ++++----
 utils/dc-chain/config/config.mk.11.4.0.sample |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/kernel/arch/dreamcast/kernel/timer.c b/kernel/arch/dreamcast/kernel/timer.c
index b88905b..b9276d8 100644
--- a/kernel/arch/dreamcast/kernel/timer.c
+++ b/kernel/arch/dreamcast/kernel/timer.c
@@ -15,18 +15,18 @@
 #define TIMER8(o) ( *((volatile uint8*)(0xffd80000 + (o))) )
 #define TIMER16(o) ( *((volatile uint16*)(0xffd80000 + (o))) )
 #define TIMER32(o) ( *((volatile uint32*)(0xffd80000 + (o))) )
-#define TOCR    0x00
-#define TSTR    0x04
-#define TCOR0   0x08
-#define TCNT0   0x0c
-#define TCR0    0x10
-#define TCOR1   0x14
-#define TCNT1   0x18
-#define TCR1    0x1c
-#define TCOR2   0x20
-#define TCNT2   0x24
-#define TCR2    0x28
-#define TCPR2   0x2c
+#define TOCR    0x00       /* Timer Output Control Register */
+#define TSTR    0x04       /* Timer Start Register */
+#define TCOR0   0x08       /* Timer Constant Register 0 */
+#define TCNT0   0x0c       /* Timer Counter Register 0 */
+#define TCR0    0x10       /* Timer Control Register 0 */
+#define TCOR1   0x14       /* Timer Constant Register 1 */
+#define TCNT1   0x18       /* Timer Counter Register 1 */
+#define TCR1    0x1c       /* Timer Control Register 1 */
+#define TCOR2   0x20       /* Timer Constant Register 2 */
+#define TCNT2   0x24       /* Timer Counter Register 2 */
+#define TCR2    0x28       /* Timer Control Register 2 */
+#define TCPR2   0x2c       /* Timer Input Capture */
 
 static int tcors[] = { TCOR0, TCOR1, TCOR2 };
 static int tcnts[] = { TCNT0, TCNT1, TCNT2 };
diff --git a/utils/dc-chain/config/config.mk.10.5.0.sample b/utils/dc-chain/config/config.mk.10.5.0.sample
index 0e90373..da52ff1 100644
--- a/utils/dc-chain/config/config.mk.10.5.0.sample
+++ b/utils/dc-chain/config/config.mk.10.5.0.sample
@@ -37,10 +37,10 @@ arm_gcc_download_type=xz
 #use_custom_dependencies=1
 
 # GCC dependencies for SH
-sh_gmp_ver=6.2.1
-sh_mpfr_ver=4.1.0
-sh_mpc_ver=1.2.1
-sh_isl_ver=0.24
+sh_gmp_ver=6.1.0
+sh_mpfr_ver=3.1.6
+sh_mpc_ver=1.0.3
+sh_isl_ver=0.18
 
 # Tarball extensions to download for GCC dependencies for SH
 sh_gmp_download_type=bz2
diff --git a/utils/dc-chain/config/config.mk.11.4.0.sample b/utils/dc-chain/config/config.mk.11.4.0.sample
index 731fe34..0132602 100644
--- a/utils/dc-chain/config/config.mk.11.4.0.sample
+++ b/utils/dc-chain/config/config.mk.11.4.0.sample
@@ -37,10 +37,10 @@ arm_gcc_download_type=xz
 #use_custom_dependencies=1
 
 # GCC dependencies for SH
-sh_gmp_ver=6.2.1
-sh_mpfr_ver=4.1.0
-sh_mpc_ver=1.2.1
-sh_isl_ver=0.24
+sh_gmp_ver=6.1.0
+sh_mpfr_ver=3.1.6
+sh_mpc_ver=1.0.3
+sh_isl_ver=0.18
 
 # Tarball extensions to download for GCC dependencies for SH
 sh_gmp_download_type=bz2


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.