X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fboot%2Fboot.s;h=b9e1a76b1da7c01a26489aaf0b43f501133ea3b9;hp=4ab605c7f43be867016e38bf749537ab4695f41e;hb=e552b31989dbb36f780428332be1b4958d26a37b;hpb=201a6c7cbc9a6fc7f7d4126cd4e41eff658818a3

diff --git a/src/boot/boot.s b/src/boot/boot.s
index 4ab605c..b9e1a76 100644
--- a/src/boot/boot.s
+++ b/src/boot/boot.s
@@ -63,10 +63,7 @@ read_sectors:
 	ret
 
 	.set VAR_ATTEMPTS, -2
-str_rdsec_msg: .asciz "rdsec: "
-str_cyl_msg: .asciz " C "
-str_head_msg: .asciz " H "
-str_sec_msg: .asciz " S "
+#str_rdsec_msg: .asciz "rdsec: "
 
 # read_sector(sidx)
 read_sector:
@@ -81,8 +78,8 @@ read_sector:
 .Lread_try:
 	# calculate the track (sidx / sectors_per_track)
 	mov 4(%bp), %ax
-	mov $str_rdsec_msg, %si
-	call print_str_num16
+#	mov $str_rdsec_msg, %si
+#	call print_str_num16
 
 	xor %dx, %dx
 	mov $SECT_PER_TRACK, %cx
@@ -101,23 +98,6 @@ read_sector:
 	inc %al
 	or %al, %cl
 
-	mov $str_cyl_msg, %si
-	mov %cx, %ax
-	rol $2, %al
-	and $3, %al
-	ror $8, %ax
-	call print_str_num16
-
-	mov $str_head_msg, %si
-	xor %ax, %ax
-	mov %dh, %al
-	call print_str_num16
-
-	mov $str_sec_msg, %si
-	mov %cl, %al
-	and $0x3f, %ax
-	call print_str_num16
-
 	# ah = 2 (read), al = 1 sectors
 	mov $0x0201, %ax
 	movb drive_number, %dl
@@ -139,13 +119,13 @@ read_sector:
 
 .Lread_ok:
 	# DBG print first dword
-	mov $str_read_error + 4, %si
-	mov %es:(%bx), %eax
-	call print_str_num
+#	mov $str_read_error + 4, %si
+#	mov %es:(%bx), %eax
+#	call print_str_num
 
 	# increment es:bx accordingly (advance es if bx overflows)
 	add $512, %bx
-	jno 0f
+	jnc 0f
 	mov %es, %ax
 	add $4096, %ax
 	mov %ax, %es
@@ -213,6 +193,7 @@ print_str:
 	ret
 
 	# expects number in eax
+	.global print_num
 print_num:
 	# save registers
 	push %es
@@ -303,6 +284,7 @@ setup_serial:
 	ret
 
 	# expects a character in al
+	.global ser_putchar
 ser_putchar:
 	push %dx