X-Git-Url: http://cloudbase.mooo.com/gitweb/avrcpm.git/blobdiff_plain/bca3519feec5ea8f69df660c8f2296d67246b63e..a8cde371bfde7e3b77ecad8b3935cfe972125ea7:/avr/init.asm

diff --git a/avr/init.asm b/avr/init.asm
index c75227d..dcc9459 100644
--- a/avr/init.asm
+++ b/avr/init.asm
@@ -18,7 +18,7 @@
 ;    You should have received a copy of the GNU General Public License
 ;    along with avrcpm.  If not, see <http://www.gnu.org/licenses/>.
 ;
-;    $Id$
+;    $Id: init.asm 241 2015-12-10 09:38:25Z rapid $
 ;
 
 #define REFR_PRE    8           /* timer prescale factor  1/8 */
@@ -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
@@ -57,7 +58,7 @@ cp_l:	lpm	xh,z+
 	outm8	WDTCSR,temp
 	ldi temp,(1<<WDCE)
 	outm8	WDTCSR,temp
-	
+
 ; - Setup Ports
 
 ;	ldi 	temp,(1<<PUD)		;disable pullups
@@ -65,10 +66,15 @@ cp_l:	lpm	xh,z+
 	out 	PORTD,_255		;all pins high (enables pullup on input ports)
 	out 	PORTB,_255
 	out 	PORTC,_255
-	out 	DDRD,_255		; all outputs
-	out	DDRB,_255
-	out	DDRC,_255
-	cbi	P_RXD-1,RXD		; RXD pin is input
+	out 	DDRD,_255		; PD all outputs
+#if I2C_SUPPORT
+	ldi	temp,~((1<<SCL)|(1<<SDA))
+	out	DDRC,temp
+#endif
+#if DRAM_8BIT
+	ldi	temp,~(1<<RXD)
+	out	DDRB,temp
+#endif
 
 	outm8	TIMSK1,_0
 	outm8	TIMSK2,_0
@@ -99,8 +105,8 @@ fill_loop:
 
 ; Init timer 1 as 1 ms system clock tick.
 
-	ldi	temp, low (F_CPU/1000)
-	ldi	temp2,high(F_CPU/1000)
+	ldi	temp, low (TC_1MS)
+	ldi	temp2,high(TC_1MS)
 	outm8	OCR1BH,temp2
 	outm8	OCR1BL,temp
 	ldi	temp,(1<<ICNC1)|(1<<CS10)	;Noise cancel, fall. edge, Normal Mode, clk/1
@@ -112,7 +118,7 @@ fill_loop:
 ; - Init serial port
 
 	rcall	uart_init
-	
+
 ;Init timer2. Refresh-call should happen every (8ms/512) cycles.
 
 	ldi	temp,REFR_CNT*2			; 2 cycles per int
@@ -142,10 +148,10 @@ fill_loop:
 .endif
 
 	rcall	printstr
-	.db	13,13,"CPM on an AVR, v"
-	db_version VMAJOR, VMINOR
-	printstring " r" SVN_REVSTR " " TESTSTR
-		
+	.db	'\r', '\r'
+version_string:
+	makestring "CPM on an AVR, v" VERS_STR " r" SVN_REVSTR TESTSTR
+
 .if MEMTEST
 	printnewline
 	printstring "Testing RAM: fill..."
@@ -175,7 +181,7 @@ ramtestr:
 	rcall	dram_read
 
 ;	ori	temp,0x04		;simulate error
-;	andi	temp,0xF7
+;	andi	temp,0xF7		;another error
 
 	mov	temp2,xh
 	eor	temp2,xl
@@ -218,12 +224,30 @@ ramtestrok:
 	brcc	ramtestr
 ramtestrex:
 	tst	temp3			;any errors?
-	breq	ramtestend	
+	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
@@ -256,31 +280,34 @@ boot_iplwl:
 	dec	temp2
 	brne	boot_iplwl
 	rjmp	boot_again
-	
+
 
 boot_ipl2:
 	lcall	mgr_prnt_parttbl
 	printnewline
 	printstring "Partinit done."
-	
+
 ; 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
+
 	ldi	temp,1<<READ_FUNC
 	lcall	dskDoIt
 
@@ -288,31 +315,4 @@ 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