sync with trunk

git-svn-id: svn://kolibrios.org@1198 a494cfbc-eb01-0410-851d-a64ba20cac60
2009-10-07 09:59:35 +00:00
parent 9c06d10fb3
commit 6507cc5019
36 changed files with 5707 additions and 5930 deletions
--- a/kernel/branches/net/boot/bootcode.inc
+++ b/kernel/branches/net/boot/bootcode.inc
@@ -815,9 +815,12 @@ end if
        dec     al
        mov     [boot_dev], al

+; GET MEMORY MAP
+include 'detect/biosmem.inc'
+
 ; READ DISKETTE TO MEMORY

-;        cmp     [boot_dev],0
+        cmp     [boot_dev],0
        jne     no_sys_on_floppy
        mov     si,diskload
        call    print