From d583d2fbd6ca3c754de078f04bf5f87566dbda52 Mon Sep 17 00:00:00 2001
From: Gene Cumm <gene.cumm@gmail.com>
Date: Sun, 27 Mar 2011 08:32:05 -0400
Subject: diag/mbr/handoff: Code comments; reflow output

The printing of CR/LF was misplaced such that it'd print a blank line if
no PnP data was found.
---
 diag/mbr/handoff.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/diag/mbr/handoff.S b/diag/mbr/handoff.S
index b3fe5139..2ac0cccb 100644
--- a/diag/mbr/handoff.S
+++ b/diag/mbr/handoff.S
@@ -221,17 +221,17 @@ scn_pnp:
 	/* 0x506E5024 */
 	movw	$0x5024, %dx
 	movw	$0x506E, %bx
-ch_pnp:	es lodsw
+ch_pnp:	es lodsw	/* Check for $PnP */
 	cmpw	%dx, %ax
 	jne	ch_pnp_l
 	es lodsw
 	cmpw	%bx, %ax
 	je	pr_pnp
-ch_pnp_l:
+ch_pnp_l:		/* Check $PnP failed; loop to next address */
 	addw	$14, %si
 	andw	$0xFFF0, %si
 	loopw	ch_pnp
-	jmp	end
+	jmp	pnp_end
 pr_pnp:
 	pushw	%si
 	call	wrstr
@@ -244,8 +244,8 @@ pr_pnp:
 	andw	$0xFFF0, %dx
 	call	wrhexw
 #endif	/* DEBUG_PNP */
-
 	call	crlf
+pnp_end:
 
 end:
 	jmp	bootfail
-- 
cgit v1.2.1


From 664d8f66849ede9af30ccba90c9070220c474eb4 Mon Sep 17 00:00:00 2001
From: Gene Cumm <gene.cumm@gmail.com>
Date: Sun, 27 Mar 2011 08:36:19 -0400
Subject: diag/mbr/handoff: Add optional printing of floppy descriptor

---
 diag/mbr/handoff.S | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/diag/mbr/handoff.S b/diag/mbr/handoff.S
index 2ac0cccb..7af3fdeb 100644
--- a/diag/mbr/handoff.S
+++ b/diag/mbr/handoff.S
@@ -56,6 +56,7 @@
 #define DEBUG_PNP	/* Scan for $PnP and show address */
 #define DEBUG_PAK	/* Press Any Key before boot fail */
 // #define DEBUG_ENTRY_REG	/* Store (manually as pusha is 80186) registers */
+// #define DEBUG_FDT	/* Print the floppy descriptor table; INT 1Eh*/
 
 #ifdef DEBUG_MARKER1
 	.macro ASCII_MARKER1 s:vararg
@@ -108,6 +109,10 @@ es_bot		= (es_ds)
 
 BIOS_page	= 0x462
 
+int_1e		= (4*0x1e)
+int_1e_seg	= (int_1e)
+int_1e_off	= (int_1e+2)
+
 	.globl	_start
 _start:
 	cli
@@ -247,6 +252,27 @@ pr_pnp:
 	call	crlf
 pnp_end:
 
+#ifdef DEBUG_FDT
+	/* INT 1Eh: Floppy Parameter Table Pointer */
+pr_1e:	call	wrstr
+	.ascii	"INT 1Eh: \0"
+	mov	$int_1e,%bx
+	les	(%bx),%di
+	pushw	%es
+	popw	%dx
+	call	wrhexw
+	movb	$':, %al
+	call	wrchr
+	pushw	%di
+	popw	%dx
+	call	wrhexw
+	call	crlf
+	/* [INT 1Eh] */
+	movw	$14, %cx
+	call	wrhexbses
+	call	crlf
+#endif	/* DEBUG_FDT */
+
 end:
 	jmp	bootfail
 
-- 
cgit v1.2.1