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

diff --git a/avr/init.asm b/avr/init.asm
index cbd01b3..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 */
@@ -66,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
@@ -100,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
@@ -143,9 +148,9 @@ 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
@@ -176,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