Tag for Version 3.2

[avrcpm.git] / avr / init.asm

diff --git a/avr/init.asm b/avr/init.asm
index c75227dc014286010685e5c67654956361023848..41626dd285bf7d1c19c14de1bd85c2ef77860e15 100644 (file)
--- a/avr/init.asm
+++ b/avr/init.asm
@@ -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
@@ -224,6 +225,24 @@ ramtestrex:
 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
@@ -269,17 +288,20 @@ boot_ipl2:
 
 ; 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
        
        ldi     temp,1<<READ_FUNC
        lcall   dskDoIt
@@ -288,31 +310,5 @@ boot_ipl2:
        ljmp z80_init
 
 
-printspace:
-       push    temp
-       ldi     temp,' '
-       rcall   uartputc
-       pop     temp
-       ret
-
-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
-
-
-
+; vim:set ts=8 noet nowrap