Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ghaerr committed Nov 13, 2024
1 parent f5c159c commit 3def02f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions elks/arch/i86/boot/setup.S
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ putc: push %ax
//
// load /bootopts file for FAT filesystem boot
// If size > 512 bytes, both sectors must be contiguous.
// This is currently guaranteed by using a 1K /bootopts in
// distribution images, as later edits will remain contiguous.
// This is currently guaranteed by providing a 1K /bootopts in
// distribution images, so later edits will remain contiguous.
//
// Uses previous boot sector's BPB contents for disk geometry
// and previous boot sector's buffer which still holds root directory sector.
Expand Down
4 changes: 2 additions & 2 deletions elks/include/linuxmt/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

/*
* SETUP_ defines are initialzied by setup.S and queried only during kernel init.
* The REL_INITSEG segment is released at end of kernel init. For later use the
* value must be copied, as afterwards setupb/setupw will return incorrect data.
* The REL_INITSEG segment is released at end of kernel init. If used later any
* values must be copied, as afterwards setupb/setupw will return incorrect data.
* These defines are overridden for ROM based systems w/o setup code.
* See setup.S for setupb/setupw offsets.
*/
Expand Down
10 changes: 5 additions & 5 deletions elks/init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void start_kernel(void)
setsp(&task->t_regs.ax); /* change to idle task stack */
kernel_init(); /* continue init running on idle task stack */

/* fork and setup procedure init_task() to run as task #1 */
/* fork and setup procedure init_task() to run as task #1 on reschedule */
kfork_proc(init_task);
wake_up_process(&task[1]);

Expand All @@ -126,7 +126,7 @@ void start_kernel(void)
#ifdef CONFIG_TIMER_INT0F
int0F(); /* simulate timer interrupt hooked on IRQ 7 */
#else
idle_halt(); /* halt until interrupt to save poer */
idle_halt(); /* halt until interrupt to save power */
#endif
}
}
Expand Down Expand Up @@ -619,16 +619,16 @@ static void INITPROC finalize_options(void)

/* convert argv array to stack array for sys_execv*/
args--;
argv_init[0] = (char *)args; /* 0 = argc*/
argv_init[0] = (char *)args; /* 0 = argc*/
char *q = (char *)&argv_init[args+2+envs+1];
for (i=1; i<=args; i++) { /* 1..argc = av*/
for (i=1; i<=args; i++) { /* 1..argc = av*/
char *p = argv_init[i];
char *savq = q;
while ((*q++ = *p++) != 0)
;
argv_init[i] = (char *)(savq - (char *)argv_init);
}
/*argv_init[args+1] = NULL;*/ /* argc+1 = 0*/
/*argv_init[args+1] = NULL;*/ /* argc+1 = 0*/
#if ENV
if (envs) {
for (i=0; i<envs; i++) {
Expand Down

0 comments on commit 3def02f

Please sign in to comment.