Tag for Version 3.2

[avrcpm.git] / avr / init.asm

diff --git a/avr/init.asm b/avr/init.asm
index e0b860a8154d52efa9e9c3ca4dee91318e8672c0..41626dd285bf7d1c19c14de1bd85c2ef77860e15 100644 (file)
--- a/avr/init.asm
+++ b/avr/init.asm
@@ -1,7 +1,7 @@
-;    Various functions: init, (RAM) disk, mmc, timer
+;    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.
 ;
@@ -34,7 +34,8 @@ regval_tab:
 regval_tab_e:
 
 start:
-       ldi temp,low(RAMEND)    ; top of memory
+       ldi temp,low(RAMEND)    ; top of memory; vim:set ts=8 noet nowrap
+
        out SPL,temp            ; init stack pointer
        ldi temp,high(RAMEND)   ; top of memory
        out SPH,temp            ; init stack pointer
@@ -60,9 +61,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
@@ -79,12 +80,21 @@ cp_l:       lpm     xh,z+
 
        ldiw    z,SRAM_START
        ldi     temp2,high(ramtop)
-clr_l:
+clr_loop:
        st      z+,_0
        cpi     zl,low(ramtop)
        cpc     zh,temp2
-       brne    clr_l
+       brne    clr_loop
+
+; - Fill unused RAM (stack)
 
+       ldi     temp2,high(RAMEND+1)
+       ldi     temp,SRAMFILL_VAL
+fill_loop:
+       st      z+,temp
+       cpi     zl,low(RAMEND+1)
+       cpc     zh,temp2
+       brne    fill_loop
 
 ; Init clock/timer system
 
@@ -104,7 +114,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
@@ -120,6 +130,11 @@ clr_l:
 
        sei
 
+#if I2C_SUPPORT
+       rcall   i2c_init                        ; Init I2C master
+       rcall   rtc_get
+#endif
+
 
 .if BOOTWAIT
        ldi temp,10
@@ -130,6 +145,7 @@ clr_l:
        rcall   printstr
        .db     13,13,"CPM on an AVR, v"
        db_version VMAJOR, VMINOR
+       printstring " r" SVN_REVSTR " " TESTSTR
                
 .if MEMTEST
        printnewline
@@ -155,43 +171,86 @@ ramtestwl:
 
 ;re-read RAM
        ldiw    x,0
-       clr     temp3
+       clr     temp3                   ;Error counter
 ramtestr:
-       mem_read
+       rcall   dram_read
+
+;      ori     temp,0x04               ;simulate error
+;      andi    temp,0xF7
+
        mov     temp2,xh
        eor     temp2,xl
        cp      temp,temp2
        breq    ramtestrok
-       push    temp
-       cpi     temp3,0         ;if first error
-       brne    ramtest2
-       inc     temp3
-       ldi     temp,10         ;newline
-       rcall   uartPutc
-ramtest2:
-       ldi     temp,13         ;return
-       rcall   uartPutc
-       pop     temp
-       rcall   printhex
-       ldi     temp,'<'
-       rcall   uartPutc
+       tst     temp3
+       brne    ramtestr1
+       printnewline
+       printstring "Addr xx yy "
+ramtestr1:
+       printnewline
+       mov     zl,temp
+       movw    temp,x
+       rcall   printhexw
+       rcall   printspace
        mov     temp,xh
        eor     temp,xl
+       mov     temp2,temp
        rcall   printhex
-       ldi     temp,'@'
-       rcall   uartPutc
-       movw    temp,x
-       rcall   printhexw
+       rcall   printspace
+       mov     temp,zl
+       rcall   printhex
+       rcall   printspace
+       mov     temp,temp2
+       eor     temp,zl
+       and     temp,temp2
+       rcall   printxbits
+       rcall   printspace
+       mov     temp,temp2
+       eor     temp,zl
+       com     temp2
+       and     temp,temp2
+       rcall   printxbits
+
+       inc     temp3
+       cpi     temp3,16                ;
+       brsh    ramtestrex
 ramtestrok:
        adiw    xl,1
        brcc    ramtestr
+ramtestrex:
+       tst     temp3                   ;any errors?
+       breq    ramtestend      
+
+       printstring " System halted!"
+halted_loop:
+       rjmp    halted_loop             ;keep AVR in an endless loop
+
+printxbits:
+       push    temp2
+       push    temp3
+       mov     temp2,temp
+       ldi     temp3,8
+prntxb0:
+       ldi     temp,'-'
+       lsl     temp2
+       brcc    prntxb1
+       ldi     temp,'X'
+prntxb1:
+       rcall   uartPutc
+       dec     temp3
+       brne    prntxb0
+       pop     temp3
+       pop     temp2
+       ret
+
+ramtestend:
 
 .endif
 
 .if MEMFILL
        ldiw    x,0
+       ldi     temp,MEMFILL_VAL
 ramfillw:
-       ldi temp,MEMFILL_VAL
        rcall   dram_write_pp
        brcc ramfillw
 .endif
@@ -223,25 +282,33 @@ 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)
 
+       ldiw    y,fsys_vars
+
 ;      Disk 0
-       sts     seekdsk,_0
+       std     y+o_seekdsk,_0
 ;      Track 0
-       sts     seektrk,_0
-       sts     seektrk+1,_0
+       std     y+o_seektrk,  _0
+       std     y+o_seektrk+1,_0
 ;      Sector 0
-       sts     seeksec,_0
+       std     y+o_seeksec,_0
 
 ;      Destination
        ldiw    x,IPLADDR
-       stsw    dmaadr,x
+       std     y+o_dmaadr+0,xl
+       std     y+o_dmaadr+1,xh
        
-       lcall   dsk_read
+       ldi     temp,1<<READ_FUNC
+       lcall   dskDoIt
 
 ;      lift off
        ljmp z80_init
 
 
+; vim:set ts=8 noet nowrap
+