* Initial changes for FAT16 support.

[avrcpm.git] / avrcpm / avr / init.asm

diff --git a/avrcpm/avr/init.asm b/avrcpm/avr/init.asm
index 7b9d9fb6c71f119e5f624d48f84b347abccb8cb2..50e1fa24e6d5f1c6e3f5099e7abe362b9834718f 100644 (file)
--- a/avrcpm/avr/init.asm
+++ b/avrcpm/avr/init.asm
@@ -205,11 +205,13 @@ ramfillw:
 boot_again:
        printnewline
        printstring "Initing mmc...",0
-       rcall   dsk_partinit
+       printnewline
+       call    mgr_init_partitions
 
        cbr     temp,0x80
        brne    boot_ipl2
        printstring "No bootable CP/M disk found! Please change MMC/SD-Card."
+       printnewline
        ldi     temp2,18
 boot_iplwl:
        ldi     temp,255
@@ -220,16 +222,16 @@ boot_iplwl:
        
 
 boot_ipl2:
-       rcall   prnt_parttbl
+       call    mgr_prnt_parttbl
        printnewline
        printstring "Partinit done."
 
 ; Read first sector of first CP/M partition
 
-       lds     xl,hostparttbl
-       lds     xh,hostparttbl+1
-       lds     yl,hostparttbl+2
-       lds     yh,hostparttbl+3
+       lds     xl,hostparttbl+1
+       lds     xh,hostparttbl+2
+       lds     yl,hostparttbl+3
+       lds     yh,hostparttbl+4
        rcall   mmcReadSect
 
        rcall   dsk_cboot               ;init (de)blocking buffer
@@ -247,6 +249,6 @@ iplwriteloop:
        brne iplwriteloop
        cpi zh,high(hostbuf+128)
        brne iplwriteloop
-       rjmp z80_init
+       jmp z80_init