From 4f08d0ad8b4a2dd9ad6a851a7c47d88a1d5d7f0b Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 5 Jun 2024 09:45:07 +0100 Subject: [PATCH] [Boot] Update for locales - Fixes for new locale codes. - Some whitespace clean-up. --- kernel/trunk/boot/bootcode.inc | 4 +-- .../trunk/boot/{et.inc => bootfont-et_EE.inc} | 0 .../trunk/boot/{ru.inc => bootfont-ru_RU.inc} | 0 .../boot/{bootge.inc => bootstr-de_DE.inc} | 0 .../boot/{booten.inc => bootstr-en_US.inc} | 0 .../boot/{bootsp.inc => bootstr-es_ES.inc} | 0 .../boot/{bootet.inc => bootstr-et_EE.inc} | 0 .../boot/{bootru.inc => bootstr-ru_RU.inc} | 0 kernel/trunk/bootbios.inc | 17 +++++++------ kernel/trunk/data32.inc | 25 ++++++++++--------- kernel/trunk/kernel.asm | 2 +- kernel/trunk/kernelsp.inc | 2 +- 12 files changed, 26 insertions(+), 24 deletions(-) rename kernel/trunk/boot/{et.inc => bootfont-et_EE.inc} (100%) rename kernel/trunk/boot/{ru.inc => bootfont-ru_RU.inc} (100%) rename kernel/trunk/boot/{bootge.inc => bootstr-de_DE.inc} (100%) rename kernel/trunk/boot/{booten.inc => bootstr-en_US.inc} (100%) rename kernel/trunk/boot/{bootsp.inc => bootstr-es_ES.inc} (100%) rename kernel/trunk/boot/{bootet.inc => bootstr-et_EE.inc} (100%) rename kernel/trunk/boot/{bootru.inc => bootstr-ru_RU.inc} (100%) diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index 4e8e362e51..014df6331b 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -315,7 +315,7 @@ end if int 0x10 if lang eq ru_RU - ; Load & set russian VGA font (RU.INC) + ; Load & set Russian VGA font 'bootfont-ru_RU' mov bp, RU_FNT1 ; RU_FNT1 - First part mov bx, 1000h ; 768 bytes mov cx, 30h ; 48 symbols @@ -329,8 +329,8 @@ if lang eq ru_RU mov dx, 0E0h ; 224 - position of first symbol mov ax, 1100h int 10h - ; End set VGA russian font else if lang eq et_EE + ; Load & set Estonian VGA font 'bootfont-et_EE' mov bp, ET_FNT ; ET_FNT1 mov bx, 1000h ; mov cx, 255 ; 256 symbols diff --git a/kernel/trunk/boot/et.inc b/kernel/trunk/boot/bootfont-et_EE.inc similarity index 100% rename from kernel/trunk/boot/et.inc rename to kernel/trunk/boot/bootfont-et_EE.inc diff --git a/kernel/trunk/boot/ru.inc b/kernel/trunk/boot/bootfont-ru_RU.inc similarity index 100% rename from kernel/trunk/boot/ru.inc rename to kernel/trunk/boot/bootfont-ru_RU.inc diff --git a/kernel/trunk/boot/bootge.inc b/kernel/trunk/boot/bootstr-de_DE.inc similarity index 100% rename from kernel/trunk/boot/bootge.inc rename to kernel/trunk/boot/bootstr-de_DE.inc diff --git a/kernel/trunk/boot/booten.inc b/kernel/trunk/boot/bootstr-en_US.inc similarity index 100% rename from kernel/trunk/boot/booten.inc rename to kernel/trunk/boot/bootstr-en_US.inc diff --git a/kernel/trunk/boot/bootsp.inc b/kernel/trunk/boot/bootstr-es_ES.inc similarity index 100% rename from kernel/trunk/boot/bootsp.inc rename to kernel/trunk/boot/bootstr-es_ES.inc diff --git a/kernel/trunk/boot/bootet.inc b/kernel/trunk/boot/bootstr-et_EE.inc similarity index 100% rename from kernel/trunk/boot/bootet.inc rename to kernel/trunk/boot/bootstr-et_EE.inc diff --git a/kernel/trunk/boot/bootru.inc b/kernel/trunk/boot/bootstr-ru_RU.inc similarity index 100% rename from kernel/trunk/boot/bootru.inc rename to kernel/trunk/boot/bootstr-ru_RU.inc diff --git a/kernel/trunk/bootbios.inc b/kernel/trunk/bootbios.inc index 9e06a1c00e..a766950586 100644 --- a/kernel/trunk/bootbios.inc +++ b/kernel/trunk/bootbios.inc @@ -24,24 +24,25 @@ org 0 ; struct kernel_header jmp start_of_code ; jump db 'KolibriOS ' ; signature - db 'v0.7.7.0 ',13,10,13,10,0 ; version + db 'v0.7.7.0 ',13,10,13,10,0 ; FIXME: get distribution version from git tag dd B32-KERNEL_BASE ; offset of the kernel's 32-bit entry point include "boot/bootstr.inc" ; language-independent boot messages include "boot/preboot.inc" +; Language support for locales: de_DE, es_ES, ru_RU (CP866), et_EE, en_US. if lang eq de_DE -include "boot/bootge.inc" ; german system boot messages + include "boot/bootstr-de_DE.inc" ; German system boot messages else if lang eq es_ES -include "boot/bootsp.inc" ; spanish system boot messages + include "boot/bootstr-es_ES.inc" ; Spanish system boot messages else if lang eq ru_RU -include "boot/bootru.inc" ; russian system boot messages -include "boot/ru.inc" ; Russian font + include "boot/bootstr-ru_RU.inc" ; Russian system boot messages + include "boot/bootfont-ru_RU.inc" ; Russian font else if lang eq et_EE -include "boot/bootet.inc" ; estonian system boot messages -include "boot/et.inc" ; Estonian font + include "boot/bootstr-et_EE.inc" ; Estonian system boot messages + include "boot/bootfont-et_EE.inc" ; Estonian font else -include "boot/booten.inc" ; english system boot messages + include "boot/bootstr-en_US.inc" ; English system boot messages (default) end if include "boot/bootcode.inc" ; 16 bit system boot code diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index d7bc008dec..31d9511477 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -45,6 +45,7 @@ keymap_alt: db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +; Language support for locales: ru_RU (UTF-8), es_ES (data32sp.inc), et_EE (data32et.inc), en_US. if lang eq ru_RU boot_initirq cp866 'Инициализация IRQ',0 @@ -92,7 +93,7 @@ else if lang eq es_ES include 'data32sp.inc' else if lang eq et_EE include 'data32et.inc' -else +else ; Default to en_US boot_initirq db 'Initialize IRQ',0 boot_picinit db 'Initialize PIC',0 boot_v86machine db 'Initialize system V86 machine',0 @@ -198,27 +199,27 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000 dll_cur_addr dd MIN_DEFAULT_DLL_ADDR -if lang eq en_US +if lang eq en_US ; English (American) SYSLANG = 1 -else if lang eq fi_FI +else if lang eq fi_FI ; Finnish SYSLANG = 2 -else if lang eq de_DE +else if lang eq de_DE ; German SYSLANG = 3 -else if lang eq ru_RU +else if lang eq ru_RU ; Russian SYSLANG = 4 -else if lang eq fr_FR +else if lang eq fr_FR ; French SYSLANG = 5 -else if lang eq et_EE +else if lang eq et_EE ; Estonian SYSLANG = 6 -else if lang eq uk_UA +else if lang eq uk_UA ; Ukrainian SYSLANG = 7 -else if lang eq it_IT +else if lang eq it_IT ; Italian SYSLANG = 8 -else if lang eq nl_BE +else if lang eq nl_BE ; Flemish SYSLANG = 9 -else if lang eq es_ES +else if lang eq es_ES ; Spanish SYSLANG = 10 -else if lang eq ca_ES +else if lang eq ca_ES ; Catalan SYSLANG = 11 else display 'unsupported language specified',13,10 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index d0c22c0434..3be8af1b09 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -2288,7 +2288,7 @@ endg iglobal version_inf: - db 0,7,7,0 ; version 0.7.7.0 + db 0,7,7,0 ; FIXME: Get distribution version from git tag db 0 .rev dd __REV__ .size = $ - version_inf diff --git a/kernel/trunk/kernelsp.inc b/kernel/trunk/kernelsp.inc index 2734b12fff..8350f72b8d 100644 --- a/kernel/trunk/kernelsp.inc +++ b/kernel/trunk/kernelsp.inc @@ -8,5 +8,5 @@ ; Éste archivo debe ser editado con codificación CP866 -version cp850 'KolibriOS versión 0.7.7.0+ ',13,10,13,10,0 +version cp850 'KolibriOS versión 0.7.7.0 ',13,10,13,10,0 ; FIXME: Get distribution version from git tag diff16 "fin del código del kernel",0,$