X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=blobdiff_plain;f=2_isa%2Fsrc%2Fbootrom.s;h=2a46cfdabb8a38f695b8c955cbfce4607153b502;hp=18bc1ca4dc54cfb2cbc2cbcd35611d31207e9bd7;hb=ea9bd406578d30791ec039fe868856056ef895e5;hpb=dcb92a8020504f1b27ee01708bbac9f5bcc729eb

diff --git a/2_isa/src/bootrom.s b/2_isa/src/bootrom.s
index 18bc1ca..2a46cfd 100644
--- a/2_isa/src/bootrom.s
+++ b/2_isa/src/bootrom.s
@@ -24,17 +24,17 @@ main:
 	ldih r10, UART_BASE@hi
 	ldi r11, PBASE@lo
 	ldih r11, PBASE@hi
-;poll:
-;	ldw r3, UART_STATUS(r10)
-;	andx r3, UART_RECV_NEW
-;	brzs+ poll; branch if zero
+poll:
+	ldw r3, UART_STATUS(r10)
+	andx r3, UART_RECV_NEW
+	brzs+ poll; branch if zero
 
 	call recv_byte
 	; we received the enter bootrom sign
+	xor r1, r1, r1
 	cmpi r0, 0x48 ; 'H'
-	xor r1, r1, r1 ; TODO: wieder raufziehen
 	breq- bt_H
-	; br poll ; else
+	br poll ; else
 
 ;-----
 send_byte:
@@ -58,11 +58,11 @@ send_word:
 
 ;-----
 recv_byte:
-;	ldw r3, UART_STATUS(r10)
-;	andx r3, UART_RECV_NEW
-;	brzs+ recv_byte; branch if zero
+	ldw r3, UART_STATUS(r10)
+	andx r3, UART_RECV_NEW
+	brzs+ recv_byte; branch if zero
 	xor r0, r0, r0
-;	ldb r0, UART_RECV(r10)
+	ldb r0, UART_RECV(r10)
 	ret
 
 ;-----