X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctions.s;h=6abeffc79fce86efc3e89be7ccb2b9d32e49bcd3;hp=fb1d85bd1ce07f4bf369aa62817653140b4221d1;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/common/OWRomFunctions.s b/common/OWRomFunctions.s
index fb1d85b..6abeffc 100644
--- a/common/OWRomFunctions.s
+++ b/common/OWRomFunctions.s
@@ -169,11 +169,7 @@ hrc_jmp_flasher:
 	lds r_temp,flashmarker
 	cpi r_temp,2
 	brne hrc_jmp_flasher_inc
-	ldi r_temp,0xC0
-	push r_temp
-	ldi r_temp,0x0E
-	push r_temp
-	ret ; Direkter Sprung zum Bootloader
+	JMP_FLASHER
 hrc_jmp_flasher_inc:
 	inc r_temp
 	sts flashmarker,r_temp
@@ -276,7 +272,7 @@ h_searchroms_next: ; Setup next bit
 
 	configZ owid,r_bcount
 	ld r_rwbyte,Z
-	sts srbyte,r_rwbyte
+	sts srbyte,r_rwbyte ;#################### Doppelung ist schon in h_searchrom_next_bit
 	rjmp h_searchrom_next_bit
 		
 h_searchroms_next_bit: ;next Bit lesen
@@ -316,7 +312,7 @@ h_readrom_all:
 h_fwconfiginfo:
 	cpi  r_bytep,24
 	breq h_fwconfiginfo_crc
-#ifdef _CRC8_
+#if defined(_CRC8_)  || defined( _CRC8_16_) 
 	cpi  r_bytep,25
 	breq h_fwconfiginfo_all
 #elif defined _CRC16_
@@ -446,31 +442,9 @@ spause:
 
 .global OWINIT
 OWINIT:
-#ifndef _DIS_FLASH_
-; check for bootloader jumper
-	;vor allen anderen Registerconfigs
 	push r_temp
-	ldi r_temp,(1<<PUD) ;enable pullup 
-	out _SFR_IO_ADDR(MCUCR) ,r_temp
-	sbi _SFR_IO_ADDR(PORTA),PINA5 ;internal pullup on PINA5
-	sbi _SFR_IO_ADDR(PORTA),PINA4 ;internal pullup on PINA4
-	rcall spause
-	sbis _SFR_IO_ADDR(PINA),PINA5
-	rjmp owinit_botest_end  ;PinA5 nicht auf 1
-  	sbis _SFR_IO_ADDR(PINA),PINA4
-	rjmp owinit_botest_end ;PinA4 nicht auf 1
-	cbi _SFR_IO_ADDR(PORTA),PINA4 
-	sbi _SFR_IO_ADDR(DDRA),PINA4  ;PINA4 AUSGANG und 0
-	rcall spause
-	sbic _SFR_IO_ADDR(PINA),PINA5 
-	rjmp owinit_botest_end ;PINA5 nicht 0.... nicht verbunden
-	cbi _SFR_IO_ADDR(DDRA),PINA4
-	ldi r_temp,0xC0
-	push r_temp
-	ldi r_temp,0x0E
-	push r_temp
-	ret ; Direkter Sprung zum Bootloader*/
-owinit_botest_end:
+#ifndef _DIS_FLASH_
+	CHECK_BOOTLOADER_PIN 
 #endif
 	HW_INIT  //Microcontroller specific
 	CHIP_INIT //1-Wire device specific