diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-25 01:40:50 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-25 01:40:50 +0100 |
| commit | bad8fa17adf4d9609343fe86feabe05188023bc1 (patch) | |
| tree | d9298a6bc2c6f0a3880ba2dbd3dda662f00e098c /boot2 | |
| parent | 7230b118e3a8f6b25bc2d525999b815c30490c81 (diff) | |
memory and buildsys improvements
Diffstat (limited to 'boot2')
| -rw-r--r-- | boot2/disk_load_16.asm | 2 | ||||
| -rw-r--r-- | boot2/stage2.asm | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/boot2/disk_load_16.asm b/boot2/disk_load_16.asm index f326bec..65b1bff 100644 --- a/boot2/disk_load_16.asm +++ b/boot2/disk_load_16.asm @@ -226,7 +226,7 @@ disk_read_error: mov bx, STR_ERROR call print_string call print_nextline - jmp $ + ;jmp $ disk_load_finish: diff --git a/boot2/stage2.asm b/boot2/stage2.asm index d4abbca..e5ce600 100644 --- a/boot2/stage2.asm +++ b/boot2/stage2.asm @@ -37,10 +37,12 @@ ;;where we will load our kernel into memory and some ;;other memory locations ; -MEMMAP_SIZE_OFFSET equ 0x7c00 -MEMMAP_OFFSET equ 0x7c01 -VESA_MODES equ 0x9300 ; do NOT overwrite yourself! be careful! -VESA_MODE_INFO equ 0x9400 +MEMMAP_SIZE_OFFSET equ 0xa000 +MEMMAP_OFFSET equ 0xa001 + +VESA_MODES equ 0xb000 ; do NOT overwrite yourself! be careful! +VESA_MODE_INFO equ 0xc000 + VESA_MODE_SELECT equ 0x4114 CHUNKS_TO_LOAD equ 0x0a ;number of 0x8000 * 512 byte chunks to load into ram ; |