diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 48ddaa0fcc..61482ce5ab 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -669,6 +669,7 @@ tup.append_table(img_files, { }) tup.append_table(extra_files, { {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"}, + {"kolibrios/drivers/acpi/install.kex", PROGS .. "/cmm/misc/acpi_install.com"}, {"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pigex.com"}, {"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"}, {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/misc/install.com"}, diff --git a/data/common/drivers/acpi/install.kex b/data/common/drivers/acpi/install.kex deleted file mode 100644 index bc729f6603..0000000000 Binary files a/data/common/drivers/acpi/install.kex and /dev/null differ diff --git a/programs/cmm/misc/Tupfile.lua b/programs/cmm/misc/Tupfile.lua index 74eacc3018..fd6fdf865d 100644 --- a/programs/cmm/misc/Tupfile.lua +++ b/programs/cmm/misc/Tupfile.lua @@ -3,6 +3,7 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end +tup.rule("acpi_install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "acpi_install.com") tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com") tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com") tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com") diff --git a/programs/cmm/misc/acpi_install.c b/programs/cmm/misc/acpi_install.c new file mode 100644 index 0000000000..01f3be0033 --- /dev/null +++ b/programs/cmm/misc/acpi_install.c @@ -0,0 +1,23 @@ +#define MEMSIZE 4096*20 +#define ENTRY_POINT #main + +#include "../lib/fs.h" + +void main() +{ + RunProgram("/kolibrios/drivers/acpi/acpi", NULL); + + pause(300); + if (file_exists("/rd/1/drivers/devices.dat")) { + if (GetSystemLanguage()==4) { + notify("'ACPI/APIC\n/rd/1/drivers/devices.dat был успешно сгенерирован.\nУстановка ещё не закончена. Следуйте указаниям в Readme!' -tdO"); + } else { + notify("'ACPI/APIC\n/rd/1/drivers/devices.dat was succesfully generated.\nInstallation is not completed.\nFor the next steps please check Readme!' -tdO"); + } + RunProgram("/sys/@open", "/kolibrios/drivers/acpi/readme.txt"); + } else { + notify("'Error generating /rd/1/drivers/devices.dat' -E"); + } + + ExitProcess(); +}