Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1325-gede9ebfd
|
From: falcovorbis <fal...@us...> - 2024-04-12 19:40:31
|
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 ede9ebfd0eb7ac0be7a787fed379a2e7baffcbf4 (commit)
via 1df0c90c98ff7de94df3a06e10e7d90bd3da3934 (commit)
via 523a88e8681c401c5ae486cca743e4edb53eaae1 (commit)
from 0dc26b628cf49c8ec726c33d49325e0337f9bb35 (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 ede9ebfd0eb7ac0be7a787fed379a2e7baffcbf4
Author: Paul Cercueil <pa...@cr...>
Date: Fri Apr 12 21:39:34 2024 +0200
maple: Add support for French AZERTY keyboards (#508)
Signed-off-by: Paul Cercueil <pa...@cr...>
commit 1df0c90c98ff7de94df3a06e10e7d90bd3da3934
Author: Falco Girgis <gyr...@gm...>
Date: Tue Apr 9 19:34:50 2024 -0500
Added debug/assertion option to environ.sh.sample (#473)
- We were never even exposing a mechanism through which the user could
enable or disable assertions. Added one to environ.sh.sample, which
defaults to having them enabled.
commit 523a88e8681c401c5ae486cca743e4edb53eaae1
Author: kapodamy <168...@us...>
Date: Tue Apr 9 18:18:39 2024 -0300
Update g2bus.h (#502)
suppress warnings generated by -Wsign-conversion
-----------------------------------------------------------------------
Summary of changes:
doc/CHANGELOG | 1 +
doc/environ.sh.sample | 8 +++
kernel/arch/dreamcast/hardware/maple/keyboard.c | 60 +++++++++++++++++++++--
kernel/arch/dreamcast/include/dc/g2bus.h | 2 +-
kernel/arch/dreamcast/include/dc/maple/keyboard.h | 2 +-
5 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 62cd90d8..d4801fa1 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -219,6 +219,7 @@ KallistiOS version 2.1.0 -----------------------------------------------
- *** Implemented _POSIX_CPUTIME in clock_gettime() using perf counter timer [FG]
- *** Implemented scandir() and alphasort() POSIX functions from dirent.h [FG]
- DC Added new driver for the SH4's UBC + high-level breakpoint API [FG]
+- DC Add support for French AZERTY keyboards [PC]
KallistiOS version 2.0.0 -----------------------------------------------
- DC Broadband Adapter driver fixes [Megan Potter == MP]
diff --git a/doc/environ.sh.sample b/doc/environ.sh.sample
index 17fc83a5..f53ad3a2 100644
--- a/doc/environ.sh.sample
+++ b/doc/environ.sh.sample
@@ -109,6 +109,14 @@ export KOS_LDFLAGS=""
export KOS_AFLAGS=""
export DC_ARM_LDFLAGS=""
+# Debug Builds
+#
+# Controls whether to disable additional debugging checks and assertions,
+# such as for parameter validation or internal errors. Uncomment this if
+# you do not wish to compile with this additional logic enabled.
+#
+#export KOS_CFLAGS="${KOS_CFLAGS} -DNDEBUG"
+
# Optimization Level
#
# Controls the baseline optimization level to use when building.
diff --git a/kernel/arch/dreamcast/hardware/maple/keyboard.c b/kernel/arch/dreamcast/hardware/maple/keyboard.c
index df184310..cc5dbe4f 100644
--- a/kernel/arch/dreamcast/hardware/maple/keyboard.c
+++ b/kernel/arch/dreamcast/hardware/maple/keyboard.c
@@ -4,6 +4,7 @@
Copyright (C) 2002 Megan Potter
Copyright (C) 2012 Lawrence Sebald
Copyright (C) 2018 Donald Haase
+ Copyright (C) 2024 Paul Cercueil
*/
#include <assert.h>
@@ -233,11 +234,60 @@ static kbd_keymap_t keymaps[KBD_NUM_KEYMAPS] = {
}
},
{
- /* French/AZERTY keyboard, probably. This one needs to be confirmed
- still. */
- { },
- { },
- { }
+ /* French/AZERTY keyboard */
+ /* The hex values in the tables are the ISO-8859-15 representation of the
+ French special chars. */
+ {
+ /* Base values */
+ 0, 0, 0, 0, 'q', 'b', 'c', 'd', /* 0x00 - 0x07 */
+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', /* 0x08 - 0x0F */
+ ',', 'n', 'o', 'p', 'a', 'r', 's', 't', /* 0x10 - 0x17 */
+ 'u', 'v', 'z', 'x', 'y', 'w', '&', 0xe9, /* 0x18 - 0x1F */
+ '\"', '\'', '(', '-', 0xe8, '_', 0xe7, 0xe0, /* 0x20 - 0x27 */
+ 10, 27, 8, 9, ' ', ')', '=', '^', /* 0x28 - 0x2F */
+ '$', 0, '*', 'm', 0xf9, 0xb2, ';', ':', /* 0x30 - 0x37 */
+ '!', 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
+ 0, 0, 0, 0, '/', '*', '-', '+', /* 0x50 - 0x57 */
+ 13, '1', '2', '3', '4', '5', '6', '7', /* 0x58 - 0x5F */
+ '8', '9', '0', '.', 0, 0 /* 0x60 - 0x65 */
+ /* All the rest are unused, and will be 0. */
+ },
+ {
+ /* Shifted values */
+ 0, 0, 0, 0, 'Q', 'B', 'C', 'D', /* 0x00 - 0x07 */
+ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', /* 0x08 - 0x0F */
+ '?', 'N', 'O', 'P', 'A', 'R', 'S', 'T', /* 0x10 - 0x17 */
+ 'U', 'V', 'Z', 'X', 'Y', 'W', '1', '2', /* 0x18 - 0x1F */
+ '3', '4', '5', '6', '7', '8', '9', '0', /* 0x20 - 0x27 */
+ 10, 27, 8, 9, ' ', 0xba, '+', 0, /* 0x28 - 0x2F */
+ 0xa3, 0, 0xb5, 'M', '%', 0xb3, '.', '/', /* 0x30 - 0x37 */
+ 0x7a, 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
+ 0, 0, 0, 0, '/', '*', '-', '+', /* 0x50 - 0x57 */
+ 13, '1', '2', '3', '4', '5', '6', '7', /* 0x58 - 0x5F */
+ '8', '9', '0', '.', 0, 0 /* 0x60 - 0x65 */
+ /* All the rest are unused, and will be 0. */
+ },
+ {
+ /* "Alt" shifted values */
+ 0, 0, 0, 0, 0xe4, 0, 0xa9, 0, /* 0x00 - 0x07 */
+ 0xa4, 0, 0, 0, 0xee, 0xfc, 0xef, 0, /* 0x08 - 0x0F */
+ 0xbf, 0xf1, 0xbd, 0xf4, 0xe6, 0xea, 0xdf, 0, /* 0x10 - 0x17 */
+ 0xfb, 0, 0xe2, 0xbb, 0xfc, 0xab, 0, 0, /* 0x18 - 0x1F */
+ '#', '{', '[', '|', 0, '\\', '^', '@', /* 0x20 - 0x27 */
+ 10, 27, 8, 9, ' ', ']', '}', '~', /* 0x28 - 0x2F */
+ 0, 0, 0, 0xf6, 0, 0xb9, 0xd7, 0xf7, /* 0x30 - 0x37 */
+ 0xa1, 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
+ 0, 0, 0, 0, '/', '*', '-', '+', /* 0x50 - 0x57 */
+ 13, '1', '2', '3', '4', '5', '6', '7', /* 0x58 - 0x5F */
+ '8', '9', '0', '.', 0, 0 /* 0x60 - 0x65 */
+ /* All the rest are unused, and will be 0. */
+ }
},
{
/* Italian/QWERTY keyboard, probably. This one needs to be confirmed
diff --git a/kernel/arch/dreamcast/include/dc/g2bus.h b/kernel/arch/dreamcast/include/dc/g2bus.h
index 1f921cc2..465938d1 100644
--- a/kernel/arch/dreamcast/include/dc/g2bus.h
+++ b/kernel/arch/dreamcast/include/dc/g2bus.h
@@ -140,7 +140,7 @@ void g2_dma_shutdown(void);
is used in with g2_lock() and g2_unlock().
*/
typedef struct {
- uint32_t irq_state; /** \brief IRQ state when entering a G2 critical block */
+ int irq_state; /** \brief IRQ state when entering a G2 critical block */
} g2_ctx_t;
/* Internal constants to access suspend registers for G2 DMA. They are not meant for
diff --git a/kernel/arch/dreamcast/include/dc/maple/keyboard.h b/kernel/arch/dreamcast/include/dc/maple/keyboard.h
index fea99ff9..51be9173 100644
--- a/kernel/arch/dreamcast/include/dc/maple/keyboard.h
+++ b/kernel/arch/dreamcast/include/dc/maple/keyboard.h
@@ -190,7 +190,7 @@ __BEGIN_DECLS
#define KBD_REGION_US 2 /**< \brief US keyboard */
#define KBD_REGION_UK 3 /**< \brief UK keyboard */
#define KBD_REGION_DE 4 /**< \brief German keyboard */
-#define KBD_REGION_FR 5 /**< \brief French keyboard (not supported yet) */
+#define KBD_REGION_FR 5 /**< \brief French keyboard */
#define KBD_REGION_IT 6 /**< \brief Italian keyboard (not supported yet) */
#define KBD_REGION_ES 7 /**< \brief Spanish keyboard */
/** @} */
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
