diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/boot/stage2_a20.asm | 28 | ||||
| -rw-r--r-- | src/drivers/video/vga.c | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/Makefile b/src/Makefile index b57a1b5..15018f6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ CC := gcc DEFINES = -DOS_ABAOS OPT := -O0 INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Idrivers/video -Inet -Idrivers/net -Ikernel -Igui -CFLAGS := -std=c99 -m32 -march=i486 -ffreestanding $(OPT) -g -Werror $(INCLUDES) $(DEFINES) +CFLAGS := -std=c99 -m32 -march=i386 -ffreestanding -nostdlib $(OPT) -g -Werror $(INCLUDES) $(DEFINES) LD := ld LDFLAGS := -m elf_i386 NASMFLAGS := -f elf32 diff --git a/src/boot/stage2_a20.asm b/src/boot/stage2_a20.asm index c0951ad..d9e2b36 100644 --- a/src/boot/stage2_a20.asm +++ b/src/boot/stage2_a20.asm @@ -62,6 +62,20 @@ check_and_enable_A20: cmp ax, 1 je A20_ENABLED +A20_FAST_SPECIAL_PORT: + + mov al, 'F' + call print_char + + in al, 0x92 + or al, 2 + out 0x92, al + + call check_A20_enabled + cmp ax, 1 + je A20_ENABLED + ret + A20_ENABLE_KBD_PORT: mov al, 'K' call print_char @@ -129,20 +143,6 @@ A20_ENABLE_KBD_OUT: cmp ax, 1 je A20_ENABLED -A20_FAST_SPECIAL_PORT: - - mov al, 'F' - call print_char - - in al, 0x92 - or al, 2 - out 0x92, al - - call check_A20_enabled - cmp ax, 1 - je A20_ENABLED - ret - A20_ENABLE_VIA_BIOS: mov al, 'B' call print_char diff --git a/src/drivers/video/vga.c b/src/drivers/video/vga.c index 3ce0e86..c4c226a 100644 --- a/src/drivers/video/vga.c +++ b/src/drivers/video/vga.c @@ -154,11 +154,11 @@ void vga_print_name( void *obj ) void vga_print_info( void *obj ) { - // TODO: print avaiable modes, colors, resolutions + // TODO: print available modes, colors, resolutions } static void write_registers( vga_t *vga, uint8_t *regs ) -{ +{ // misc port8_write( &vga->misc_port, *( regs++ ) ); |