Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ecm boot no cr #182

Merged
merged 2 commits into from
Aug 6, 2024
Merged

ecm boot no cr #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2140e
do not display any lone Carriage Returns
ecm-pushbx Aug 1, 2024
00ec582
config: only overwrite skip config prompt if it was displayed
ecm-pushbx Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions kernel/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,14 +1085,15 @@ STATIC BOOL SkipLine(char *pLine)
{
short key;
COUNT i;
signed char originalskipconfigseconds = InitKernelConfig.SkipConfigSeconds;

if (InitKernelConfig.SkipConfigSeconds >= 0)
if (originalskipconfigseconds >= 0)
{

if (InitKernelConfig.SkipConfigSeconds > 0)
if (originalskipconfigseconds > 0)
printf("Press F8 to trace or F5 to skip CONFIG.SYS/AUTOEXEC.BAT");

key = GetBiosKey(InitKernelConfig.SkipConfigSeconds); /* wait 2 seconds */
key = GetBiosKey(originalskipconfigseconds); /* wait 2 seconds */

InitKernelConfig.SkipConfigSeconds = -1;

Expand All @@ -1105,7 +1106,8 @@ STATIC BOOL SkipLine(char *pLine)
singleStep = TRUE;
}

printf("\r%79s\r", ""); /* clear line */
if (originalskipconfigseconds > 0)
printf("\r%79s\r", ""); /* clear line */

if (SkipAllConfig)
printf("Skipping CONFIG.SYS/AUTOEXEC.BAT\n");
Expand Down
2 changes: 1 addition & 1 deletion kernel/initdisk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ void DosDefinePartition(struct DriveParamS *driveParam,
ExtPri = "Ext";
num = extendedPartNo;
}
printf("\r%c: HD%d, %s[%2d]", 'A' + nUnits,
printf("%c: HD%d, %s[%2d]", 'A' + nUnits,
(driveParam->driveno & 0x7f) + 1, ExtPri, num);

printCHS(", CHS= ", &chs);
Expand Down
8 changes: 4 additions & 4 deletions kernel/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,15 @@ STATIC VOID signon()
if (InitKernelConfig.Verbose < 0)
{
#ifdef CUSTOM_BRANDING
printf("\n\r" CUSTOM_BRANDING "\n\n");
printf("\n" CUSTOM_BRANDING "\n\n");
#else
printf("\n\r%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release)));
printf("\n%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release)));
#endif
} else {
#ifdef CUSTOM_BRANDING
printf("\n\r" CUSTOM_BRANDING "\n\n%s", copyright);
printf("\n" CUSTOM_BRANDING "\n\n%s", copyright);
#else
printf("\r%S"
printf("\n%S"
"Kernel compatibility %d.%d - "
#if defined(__BORLANDC__)
"BORLANDC"
Expand Down