* avr/Z80int-jmp.asm

[avrcpm.git] / avr / init.asm

diff --git a/avr/init.asm b/avr/init.asm
index a6a1d416e01b749faa861063bab121c5e2e48feb..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.
 ;
@@ -60,9 +60,9 @@ cp_l: lpm     xh,z+
        
 ; - Setup Ports
 
-       ldi     temp,(1<<PUD)           ;disable pullups
-       outm8   P_PUD,temp
-       out     PORTD,_255              ;all pins high
+;      ldi     temp,(1<<PUD)           ;disable pullups
+;      outm8   P_PUD,temp
+       out     PORTD,_255              ;all pins high (enables pullup on input ports)
        out     PORTB,_255
        out     PORTC,_255
        out     DDRD,_255               ; all outputs
@@ -103,7 +103,7 @@ clr_l:
 
        rcall   uart_init
        
-;Init timer2. Refresh-call should happen every (8ms/512)=312 cycles.
+;Init timer2. Refresh-call should happen every (8ms/512) cycles.
 
        ldi     temp,REFR_CNT*2                 ; 2 cycles per int
        outm8   OCR2A,temp
@@ -119,7 +119,7 @@ clr_l:
 
        sei
 
-#if I2C
+#if I2C_SUPPORT
        rcall   i2c_init                        ; Init I2C master
        rcall   rtc_get
 #endif
@@ -177,7 +177,7 @@ ramtestr:
        printstring "Addr xx yy "
 ramtestr1:
        printnewline
-       mov     temp4,temp
+       mov     zl,temp
        movw    temp,x
        rcall   printhexw
        rcall   printspace
@@ -186,16 +186,16 @@ ramtestr1:
        mov     temp2,temp
        rcall   printhex
        rcall   printspace
-       mov     temp,temp4
+       mov     temp,zl
        rcall   printhex
        rcall   printspace
        mov     temp,temp2
-       eor     temp,temp4
+       eor     temp,zl
        and     temp,temp2
        rcall   printxbits
        rcall   printspace
        mov     temp,temp2
-       eor     temp,temp4
+       eor     temp,zl
        com     temp2
        and     temp,temp2
        rcall   printxbits
@@ -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