From 4563cb18a7a2f13efe19c728e915b677c21efdc8 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 1 Dec 2020 01:03:36 +0000 Subject: [PATCH] Move VMODE to ISO (as it is useless without drivers that are on ISO) git-svn-id: svn://kolibrios.org@8285 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 6 +++--- data/ca/settings/menu.dat | 1 - data/common/settings/syspanel.ini | 2 +- data/et/settings/menu.dat | 1 - data/rus/docs/guide/hardware_support.htm | 2 +- data/rus/settings/syspanel.ini | 2 +- data/sp/settings/menu.dat | 1 - kernel/trunk/data32.inc | 1 - programs/cmm/downloader/compile_ru.bat | 10 ++++++++++ 9 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 programs/cmm/downloader/compile_ru.bat diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e7e2dc87fd..f88268ed94 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -26,7 +26,6 @@ img_files = { {"LANG.INC", build_type .. "/lang.inc"}, {"NOTIFY3.PNG", "common/notify3.png"}, {"UNIMG", PROGS .. "/fs/unimg/unimg"}, - {"VMODE", "common/vmode"}, {"3D/HOUSE.3DS", "common/3d/house.3ds"}, {"DEVELOP/T_EDIT.INI", PROGS .. "/other/t_edit/t_edit.ini"}, {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, @@ -187,8 +186,6 @@ extra_files = { {"kolibrios/develop/tcc/samples/", PROGS .. "/develop/ktcc/trunk/samples/*"}, {"kolibrios/develop/tcc/samples/clayer/", PROGS .. "/develop/ktcc/trunk/samples/clayer/*"}, {"kolibrios/develop/TinyBasic/", "common/develop/TinyBasic/*"}, - {"kolibrios/utils/cnc_editor/cnc_editor", PROGS .. "/other/cnc_editor/cnc_editor"}, - {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"}, {"kolibrios/emul/", "common/emul/*"}, {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"}, {"kolibrios/emul/e80/readme.txt", PROGS .. "/emulator/e80/trunk/readme.txt"}, @@ -276,6 +273,9 @@ extra_files = { {"kolibrios/res/templates/NES/", "common/templates/NES/*"}, {"kolibrios/res/wallpapers/", "common/wallpapers/*"}, {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"}, + {"kolibrios/utils/cnc_editor/cnc_editor", PROGS .. "/other/cnc_editor/cnc_editor"}, + {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"}, + {"kolibrios/utils/vmode", "common/vmode"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index 39f2c84a42..90f39edb8a 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -74,7 +74,6 @@ Dispositius /sys/setup Generador de fons /sys/media/palitra Colors i Aparincia /sys/skincfg Dreseres de teclat /sys/mykey -Mode de vdeo ATI /sys/vmode #9 **** SENSORS **** Procesos /sys/cpu Dispositius PCI /sys/pcidev diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 2bc61e6daf..5c206d5c54 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -6,7 +6,7 @@ cell_h=78 [Configuration] RamDisks=tmpdisk,36 -VideoMode=vmode,108 +VideoMode=/k/utils/vmode,108 LanConfig=network/netcfg,71 SysSetup=setup,5 Date&Time=calendar,52 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 024053751f..d31e39ff1e 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -75,7 +75,6 @@ Seadmed /sys/setup Tausta genereerija /sys/media/palitra Vrvid & Teemad /sys/skincfg MyKey /sys/mykey -ATI video reziim /sys/vmode #9 **** SYSTEM SENSORS **** Protsesside haldur /sys/cpu PCI seadmed /sys/pcidev diff --git a/data/rus/docs/guide/hardware_support.htm b/data/rus/docs/guide/hardware_support.htm index bfe5f85390..eb2a500451 100644 --- a/data/rus/docs/guide/hardware_support.htm +++ b/data/rus/docs/guide/hardware_support.htm @@ -32,7 +32,7 @@ VIA Нет VIDINTEL запускается автоматически, его функция одна - установка "родного" разрешения экрана для ноутбуков. -Драйверы ATIKMS и i915 портированы из Линукса. Они дают поддержку аппаратного курсора мыши, смену видеорежимов через утилиту VMODE и акселерацию двумерной графики. +Драйверы ATIKMS и i915 портированы из Линукса. Они дают поддержку аппаратного курсора мыши, смену видеорежимов через утилиту VMODE и акселерацию двумерной графики. Без использования данных драйверов выбор разрешения экрана возможен лишь на этапе загрузки, но не в процессе работы системы.

Аудио

diff --git a/data/rus/settings/syspanel.ini b/data/rus/settings/syspanel.ini index 47dec2b6d9..bb1f5df073 100644 --- a/data/rus/settings/syspanel.ini +++ b/data/rus/settings/syspanel.ini @@ -6,7 +6,7 @@ cell_h=84 [䨣] 㠫 ᪨=tmpdisk,36 -襭 ࠭=vmode,108 +襭 ࠭=/k/utils/vmode,108 ⥢ ன⢠=network/netcfg,71 ⥬ ன=setup,5 ६=calendar,52 diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index ee68139556..3e9644d0e2 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -76,7 +76,6 @@ Dispositivos /sys/setup Generador de fondo /sys/media/palitra Colores y Apariencia /sys/skincfg Atajos de teclado /sys/mykey -Modo de video ATI /sys/vmode #9 **** SENSORES **** Procesos /sys/cpu Dispositivos PCI /sys/pcidev diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 0458e827c7..c464babca4 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -168,7 +168,6 @@ ud_user_message db 'Error: unsupported processor instruction',0 mtrr_user_message db '"There is a problem with MTRR configuration.\nPerformance can be low" -dW',0 end if -vmode db '/sys/drivers/VMODE.MDR',0 kernel_file_load: ; load kernel.mnt to _CLEAN_ZONE dd 0 ; subfunction diff --git a/programs/cmm/downloader/compile_ru.bat b/programs/cmm/downloader/compile_ru.bat new file mode 100644 index 0000000000..3901d9b9f6 --- /dev/null +++ b/programs/cmm/downloader/compile_ru.bat @@ -0,0 +1,10 @@ +@del lang.h-- +@echo #define LANG_RUS 1 >lang.h-- + +@c-- dl.c +@del dl +@rename dl.com dl +@del warning.txt +@del lang.h-- + +if not exist dl ( @pause ) \ No newline at end of file