* avr/Z80int-jmp.asm

[avrcpm.git] / avr / init.asm

diff --git a/avr/init.asm b/avr/init.asm
index 469001a38545c815d391b812918d0ecb07ee425e..2d35ff537faf91f8775c2d9db2b5fb4b583e212d 100644 (file)
--- a/avr/init.asm
+++ b/avr/init.asm
@@ -1,7 +1,7 @@
 ;    Hardware initialisation, disk, mmc, timer, DRAM test
 ;
 ;    Copyright (C) 2010 Sprite_tm
-;    Copyright (C) 2010 Leo C.
+;    Copyright (C) 2010-2013 Leo C.
 ;
 ;    This file is part of avrcpm.
 ;
@@ -119,7 +119,7 @@ clr_l:
 
        sei
 
-#if I2C
+#if I2C_SUPPORT
        rcall   i2c_init                        ; Init I2C master
        rcall   rtc_get
 #endif
@@ -220,8 +220,8 @@ ramtestend:
 
 .if MEMFILL
        ldiw    x,0
+       ldi     temp,MEMFILL_VAL
 ramfillw:
-       ldi temp,MEMFILL_VAL
        rcall   dram_write_pp
        brcc ramfillw
 .endif
@@ -253,7 +253,9 @@ boot_ipl2:
        printnewline
        printstring "Partinit done."
        
-       lcall   dsk_inval_hostbuf       ;init (de)blocking buffer
+; Init (de)blocking buffer
+
+       lcall   dsk_inval_hostbuf
 
 ; Read first sector of first CP/M partition (ipl)
 
@@ -269,7 +271,8 @@ boot_ipl2:
        ldiw    x,IPLADDR
        stsw    dmaadr,x
        
-       lcall   dsk_read
+       ldi     temp,1<<READ_FUNC
+       lcall   dskDoIt
 
 ;      lift off
        ljmp z80_init