[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1049-geb1376e

[darcagn <da...@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  eb1376e3e9c270c3bb893322d7aff95fdd48cfb6 (commit)
       via  ddb904d814e2bafab974847d9df5facf3c4db2aa (commit)
       via  c3a61fe6f59dcbf2c3af7e8ff7bd7d5fdf01dae7 (commit)
      from  c456ff0960fd19306241ecb8dab30148afb1f592 (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 eb1376e3e9c270c3bb893322d7aff95fdd48cfb6
Author: darcagn <da...@pr...>
Date:   Tue Sep 5 08:33:34 2023 -0500

    Fix vmu_set_icon_shape omitted on DC instead of NAOMI (#293)

commit ddb904d814e2bafab974847d9df5facf3c4db2aa
Merge: c456ff0 c3a61fe
Author: Luke Benstead <ka...@gm...>
Date:   Sun Sep 3 09:44:27 2023 +0100

    Merge pull request #291 from KallistiOS/kazade_authors_update
    
    Kazade's Authorship Update (2022 + 2023 Edition)

commit c3a61fe6f59dcbf2c3af7e8ff7bd7d5fdf01dae7
Author: Falco Girgis <gyr...@gm...>
Date:   Sun Sep 3 00:28:26 2023 -0500

    Kazade's authorship should include 2022 and 2023
    
    - Just realized it hasn't been updated in awhile, and checked to see
      that he most definitely does have KOS repo commits for 2022 and 2023.

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

Summary of changes:
 AUTHORS                                    | 2 +-
 kernel/arch/dreamcast/hardware/maple/vmu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d4fc8fc..8e8923d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,7 +41,7 @@ Brian Paul: 1999, 2000, 2001
 Josh Pearson: 2013, 2014, 2015, 2016
 Joe Fenton: 2016
 Stefan Galowicz: 2016, 2017
-Luke Benstead: 2020, 2021
+Luke Benstead: 2020, 2021, 2022, 2023
 Eric Fradella: 2023
 Falco Girgis: 2023
 Ruslan Rostovtsev: 2014, 2016, 2023
diff --git a/kernel/arch/dreamcast/hardware/maple/vmu.c b/kernel/arch/dreamcast/hardware/maple/vmu.c
index 6abdb59..784d050 100644
--- a/kernel/arch/dreamcast/hardware/maple/vmu.c
+++ b/kernel/arch/dreamcast/hardware/maple/vmu.c
@@ -210,7 +210,7 @@ int vmu_set_custom_color(maple_device_t *dev, uint8_t red, uint8_t green, uint8_
    for icon_shape are listed in the biosfont.h and start with
    BFONT_ICON_VMUICON. */
 int vmu_set_icon_shape(maple_device_t *dev, uint8_t icon_shape) {
-#ifdef _arch_sub_naomi
+#ifndef _arch_sub_naomi
     vmu_root_t root;
 
     if(icon_shape < BFONT_ICON_VMUICON || icon_shape > BFONT_ICON_EMBROIDERY)


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