From fa14ffdea15ecc98513cb557bbe621d09153321f Mon Sep 17 00:00:00 2001 From: LunarLambda Date: Sat, 18 Feb 2023 14:16:02 +0100 Subject: [PATCH] doc: update register list --- dist.sh | 2 +- libseven/doc/registers.md | 22 +++++++++++----------- libseven/include/seven/base.h | 2 +- libseven/include/seven/hw/video/blend.h | 2 +- libseven/meson.build | 2 +- meson.build | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dist.sh b/dist.sh index c2a1571..3d0f40a 100755 --- a/dist.sh +++ b/dist.sh @@ -12,5 +12,5 @@ make_dist() { [ ! -d "$DIST" ] && mkdir "$DIST" || rm "$DIST"/* -(PROJECT=libseven VERSION=0.17.0 make_dist) +(PROJECT=libseven VERSION=0.17.1 make_dist) (PROJECT=minrt VERSION=0.7.3 make_dist) diff --git a/libseven/doc/registers.md b/libseven/doc/registers.md index f47862f..7953cf2 100644 --- a/libseven/doc/registers.md +++ b/libseven/doc/registers.md @@ -38,7 +38,7 @@ Address | Size | Access | GBATEK | libgba | libtonc | libs 0400 004C | 16 | W | MOSAIC | MOSAIC | MOSAIC | MOSAIC 0400 0050 | 16 | R/W | BLDCNT | BLDCNT | BLDCNT | BLDCNT 0400 0052 | 16 | R/W | BLDALPHA | BLDALPHA | BLDALPHA | BLDALPHA - 0400 0054 | 16 | W | BLDY | BLDY | BLDY | **BLDVAL** + 0400 0054 | 16 | W | BLDY | BLDY | BLDY | BLDY ​||||||| 0400 0060 | 16 | R/W | SOUND1CNT_L | SOUND1CNT_L | SOUND1CNT_L | - 0400 0062 | 16 | R/W | SOUND1CNT_H | SOUND1CNT_H | SOUND1CNT_H | - @@ -85,22 +85,22 @@ Address | Size | Access | GBATEK | libgba | libtonc | libs 0400 010E | 16 | R/W | TM3CNT_H | TM3CNT_H | TM3CNT_H | **TM3CNT** ​||||||| 0400 0120 | 32 | R/W | SIODATA32 | SIODATA32 | SIODATA32 | SIODATA32 - 0400 0120 | 16 | R/W | SIOMULTI0 | SIOMULTI0 | SIOMULTI0 | - - 0400 0122 | 16 | R/W | SIOMULTI1 | SIOMULTI1 | SIOMULTI1 | - - 0400 0124 | 16 | R/W | SIOMULTI2 | SIOMULTI2 | SIOMULTI2 | - - 0400 0126 | 16 | R/W | SIOMULTI3 | SIOMULTI3 | SIOMULTI3 | - + 0400 0120 | 16 | R/W | SIOMULTI0 | SIOMULTI0 | SIOMULTI0 | **MULTIRECV0** + 0400 0122 | 16 | R/W | SIOMULTI1 | SIOMULTI1 | SIOMULTI1 | **MULTIRECV1** + 0400 0124 | 16 | R/W | SIOMULTI2 | SIOMULTI2 | SIOMULTI2 | **MULTIRECV2** + 0400 0126 | 16 | R/W | SIOMULTI3 | SIOMULTI3 | SIOMULTI3 | **MULTIRECV3** 0400 0128 | 16 | R/W | SIOCNT | SIOCNT | SIOCNT | SIOCNT - 0400 012A | 16 | R/W | SIOMLT_SEND | SIOMLT_SEND | SIOMLT_SEND | - + 0400 012A | 16 | R/W | SIOMLT_SEND | SIOMLT_SEND | SIOMLT_SEND | **MULTISEND** 0400 012A | 16/8 | R/W | SIODATA8 | SIODATA8 | SIODATA8 | SIODATA8 ​||||||| 0400 0130 | 16 | R | KEYINPUT | KEYINPUT [²] | KEYINPUT [²]| KEYINPUT 0400 0132 | 16 | R/W | KEYCNT | KEYCNT | KEYCNT | KEYCNT ​||||||| - 0400 0134 | 16 | R/W | RCNT | RCNT | RCNT | **SIOMODE2** - 0400 0140 | 16 | R/W | JOYCNT | **HS_CTRL** | JOYCNT | - - 0400 0150 | 32 | R/W | JOY_RECV | **JOYRE** | JOY_RECV | - - 0400 0154 | 32 | R/W | JOY_TRANS | **JOYTR** | JOY_TRANS | - - 0400 0158 | 16 | R | JOYSTAT | **JSTAT** [²] | JOYSTAT [²] | - + 0400 0134 | 16 | R/W | RCNT | RCNT | RCNT | RCNT + 0400 0140 | 16 | R/W | JOYCNT | **HS_CTRL** | JOYCNT | JOYCNT + 0400 0150 | 32 | R/W | JOY_RECV | **JOYRE** | JOY_RECV | **JOYRECV** + 0400 0154 | 32 | R/W | JOY_TRANS | **JOYTR** | JOY_TRANS | **JOYSEND** + 0400 0158 | 16 | R | JOYSTAT | **JSTAT** [²] | JOYSTAT [²] | JOYSTAT ​||||||| [0400 0200] | 16 | R/W | IE | IE | IE | IE 0400 0202 | 16 | R/W | IF | IF | IF | IF diff --git a/libseven/include/seven/base.h b/libseven/include/seven/base.h index ea7e61b..2058353 100644 --- a/libseven/include/seven/base.h +++ b/libseven/include/seven/base.h @@ -26,7 +26,7 @@ #define LIBSEVEN_VERSION_MAJOR 0 #define LIBSEVEN_VERSION_MINOR 17 -#define LIBSEVEN_VERSION_PATCH 0 +#define LIBSEVEN_VERSION_PATCH 1 #define LIBSEVEN_VERSION \ _LIBSEVEN_STR2(LIBSEVEN_VERSION_MAJOR) "." \ diff --git a/libseven/include/seven/hw/video/blend.h b/libseven/include/seven/hw/video/blend.h index 019b797..3028940 100644 --- a/libseven/include/seven/hw/video/blend.h +++ b/libseven/include/seven/hw/video/blend.h @@ -12,7 +12,7 @@ _LIBSEVEN_EXTERN_C #define REG_BLDCNT VOLADDR(0x04000050, uint16_t) #define REG_BLDALPHA VOLADDR(0x04000052, uint16_t) -#define REG_BLDVAL VOLADDR(0x04000054, uint16_t) +#define REG_BLDY VOLADDR(0x04000054, uint16_t) #define BF_BLEND_MODE_OFFSET 6 #define BF_BLEND_MODE_LENGTH 2 diff --git a/libseven/meson.build b/libseven/meson.build index a4d4d9c..5b91959 100644 --- a/libseven/meson.build +++ b/libseven/meson.build @@ -1,4 +1,4 @@ -version = '0.17.0' +version = '0.17.1' sources = [ 'src/hw/bios.s', diff --git a/meson.build b/meson.build index bc0b0c4..638a5df 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('sdk-seven', 'c', - version: '0.19.3', + version: '0.19.4', license: 'Zlib', meson_version: '>=0.59.0', default_options: ['warning_level=2', 'c_std=c99'])