From 5169661ef5f31341430f9fb39cb0b8e9bdd4dd23 Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Wed, 12 Oct 2022 20:06:33 -0400 Subject: [PATCH] Remove BootHDIns In() input strings for resolution setting since compile-time screen resolution setting has been removed. TODO: Install scripts still have some remaining code that asks for screen resolution and grabs input, such as bare metal install code section. These sections need to also be updated! --- src/Demo/AcctExample/TOS/TOSConfig.ZC | 4 ++-- src/Home/DoDistro.ZC | 2 +- src/Kernel/KernelA.HH | 2 +- src/Misc/DoDistro.ZC | 2 +- src/Misc/OSInstall.ZC | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Demo/AcctExample/TOS/TOSConfig.ZC b/src/Demo/AcctExample/TOS/TOSConfig.ZC index 52c3fa8e..f5060331 100755 --- a/src/Demo/AcctExample/TOS/TOSConfig.ZC +++ b/src/Demo/AcctExample/TOS/TOSConfig.ZC @@ -52,8 +52,8 @@ U0 TOSInit() #define CONFIG_OPTS "MountAHCIAuto\nCT\n" #define CONFIG_DEBUG_OPTS "MountAHCIAuto\nCTHeapInit\n130\nMemInit\n131\nVarInit\n132\n\n" #define CONFIG_DEBUGZ_OPTS "MountAHCIAuto\nCTHeapInit\n0\nMemInit\n0\nVarInit\n0\n\n" -#define TOS_CONFIG "\n" CONFIG_RAM_DRIVES CONFIG_DVD_DRIVES CONFIG_HARD_DRIVES "\n1024\n768\n" CONFIG_DISK_CACHE CONFIG_OPTS -#define TOS_DVD_CONFIG "TB\n0x20000\nT \n\n1024\n768\n\nMountAHCIAuto\nCT\n" +#define TOS_CONFIG "\n" CONFIG_RAM_DRIVES CONFIG_DVD_DRIVES CONFIG_HARD_DRIVES "\n" CONFIG_DISK_CACHE CONFIG_OPTS +#define TOS_DVD_CONFIG "TB\n0x20000\nT\n\n\nMountAHCIAuto\nCT\n" #define TOS_DVD_DEBUG_CONFIG "A" CONFIG_DEBUG_DISTRO\ "B\nScale2Mem(2048,0x40000)\n\n\n"\ diff --git a/src/Home/DoDistro.ZC b/src/Home/DoDistro.ZC index 6e286d93..62fe40a1 100755 --- a/src/Home/DoDistro.ZC +++ b/src/Home/DoDistro.ZC @@ -1,6 +1,6 @@ //Make Your own Distro by #include-ing this file. -#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n" +#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n" U0 MakeMyISO(U8 *_out_iso_filename) {//Does everything with current drive. diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index fb81866b..a7747a3c 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -4511,7 +4511,7 @@ public class CDebugGlobals #define BOOT_SRC_DVD 4 // $LK,"In",A="MN:In"$("") StdIn for call to $LK,"BootHDIns",A="MN:BootHDIns"$(). -#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT \n\n\n\n" +#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n" #help_index "Registry" //Registry sys_message_flags. $LK,"RegOneTimePopUp",A="MN:RegOneTimePopUp"$() diff --git a/src/Misc/DoDistro.ZC b/src/Misc/DoDistro.ZC index 761f5dd3..1baf3459 100755 --- a/src/Misc/DoDistro.ZC +++ b/src/Misc/DoDistro.ZC @@ -1,6 +1,6 @@ //Make Your own Distro by #include-ing this file. -#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n" +#define STD_DISTRO_DVD_CONFIG "TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n" U0 MakeMyISO(U8 *_out_iso_filename) {//Does everything with current drive. diff --git a/src/Misc/OSInstall.ZC b/src/Misc/OSInstall.ZC index 87449d58..6543aabe 100755 --- a/src/Misc/OSInstall.ZC +++ b/src/Misc/OSInstall.ZC @@ -239,7 +239,7 @@ U0 VMInstallDrive(CTask *task, U8 drv_let, I64 ata_port, I64 atapi_port) XTalkWait(task, "C\n%d\n", ata_port); if (atapi_port > -1) XTalkWait(task, "T%d\n", atapi_port); - XTalkWait(task, "\n1024\n768\n\n\n"); //Exit Drives, set Screen Resolution, skip Disk Cache and Options + XTalkWait(task, "\n\n\n\n"); //Exit Drives, skip Disk Cache and Options } U0 VMInstallWiz()