* This code is experimental and may destroy data on disk images!

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

diff --git a/avrcpm/avr/init.asm b/avrcpm/avr/init.asm
index de576a8608cbb2710b4c23b66b6eb30aa1eccaf2..a1b80ac234090b65537964a2f01e4cde930c7ed1 100644 (file)
--- a/avrcpm/avr/init.asm
+++ b/avrcpm/avr/init.asm
@@ -201,7 +201,7 @@ ramfillw:
 
 boot_again:
        printnewline
-       printstring "Initing mmc...",0
+       printstring "Initing mmc..."
        printnewline
        lcall   mgr_init_partitions
 
@@ -222,31 +222,29 @@ boot_ipl2:
        lcall   mgr_prnt_parttbl
        printnewline
        printstring "Partinit done."
+       
+       ldi     temp,0
+       rcall   dsk_img_type            ;parameter for boot disk image.
 
-       rcall   dsk_cboot               ;init (de)blocking buffer
+       lcall   dsk_inval_hostbuf       ;init (de)blocking buffer
 
 ; Read first sector of first CP/M partition (ipl)
 
-       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
-
-;First sector of disk or first CP/M partition is in hostbuf.
+;      Disk 0
+       sts     seekdsk,_0
+;      Track 0
+       sts     seektrk,_0
+       sts     seektrk+1,_0
+;      Sector 0
+       sts     seeksec,_0
+
+;      Destination
+       ldiw    x,IPLADDR
+       stsw    dmaadr,x
+       
+       lcall   dsk_read
 
-;Save to Z80 RAM (only 128 bytes because that's retro)
-       ldiw z,hostbuf
-       ldiw x,IPLADDR
-iplwriteloop:
-       ld temp,z+
-       rcall   dram_write_pp
-       cpi zl,low(hostbuf+128)
-       brne iplwriteloop
-       cpi zh,high(hostbuf+128)
-       brne iplwriteloop
+;      lift off
        ljmp z80_init