tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main, config: fix OW build (char not UBYTE, static file pointers)

This commit is contained in:
C. Masloch 2022-05-21 22:30:11 +02:00 committed by Kenneth J Davis
parent 42b8e12bc7
commit ee255d2355
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/config.c
View File

@ -62,7 +62,7 @@ STATIC struct MenuSelector MenuStruct[MENULINESMAX] BSS_INIT({0});
int nMenuLine BSS_INIT(0); int nMenuLine BSS_INIT(0);
int MenuColor = -1; int MenuColor = -1;
extern UBYTE kernel_command_line[256]; extern char kernel_command_line[256];
extern int kernel_command_line_length; extern int kernel_command_line_length;
STATIC void WriteMenuLine(struct MenuSelector *menu) STATIC void WriteMenuLine(struct MenuSelector *menu)
@ -866,9 +866,9 @@ VOID DoConfig(int nPass)
unsigned ii; unsigned ii;
static char commandbuffer[256]; static char commandbuffer[256];
char * end = &kernel_command_line[kernel_command_line_length]; char * end = &kernel_command_line[kernel_command_line_length];
char * configfile = ""; static char * configfile = "";
char * altconfigfile = "fdconfig.sys"; static char * altconfigfile = "fdconfig.sys";
char * oldconfigfile = "config.sys"; static char * oldconfigfile = "config.sys";
struct { char ** pointer; char const * command; } struct { char ** pointer; char const * command; }
configcommands[] = { configcommands[] = {
{ &configfile, "CONFIG" }, { &configfile, "CONFIG" },

6
kernel/main.c
View File

@ -68,8 +68,8 @@ __segment DosTextSeg = 0;
struct lol FAR *LoL = &DATASTART; struct lol FAR *LoL = &DATASTART;
struct _KernelConfig InitKernelConfig = { 0xFF }; struct _KernelConfig InitKernelConfig = { -1 };
UBYTE kernel_command_line[256] = { 0x00, 0xFF }; /* special none value */ char kernel_command_line[256] = { 0, -1 }; /* special none value */
int kernel_command_line_length BSS_INIT(0); int kernel_command_line_length BSS_INIT(0);
UBYTE debugger_present = 0xFF; /* initialised in kernel.asm UBYTE debugger_present = 0xFF; /* initialised in kernel.asm
do NOT set 0 here or compiler may do NOT set 0 here or compiler may
@ -111,7 +111,7 @@ VOID ASMCFUNC FreeDOSmain(void)
#ifdef DEBUG #ifdef DEBUG
/* printf must go after setup_int_vectors call */ /* printf must go after setup_int_vectors call */
if (kernel_command_line[0] == 0x00 && kernel_command_line[1] == 0xFF) { if (kernel_command_line[0] == 0 && kernel_command_line[1] == (char)-1) {
printf("\nKERNEL: Command line is not specified.\n"); printf("\nKERNEL: Command line is not specified.\n");
} else { } else {
printf("\nKERNEL: Command line is \"%s\"\n", kernel_command_line); printf("\nKERNEL: Command line is \"%s\"\n", kernel_command_line);