diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-04-01 15:51:49 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-04-01 15:51:49 -0700 |
| commit | 2ce2f3b9d05a30fe11b9e69562b73b0f068c6bc6 (patch) | |
| tree | abd7d5b6c4ab21f1911e64bb97713b94adf97658 | |
| parent | a7270ae36cc247d2b6d3ae897ba9417cea38452d (diff) | |
| parent | 664d8f66849ede9af30ccba90c9070220c474eb4 (diff) | |
| download | syslinux-2ce2f3b9d05a30fe11b9e69562b73b0f068c6bc6.tar.gz | |
Merge remote-tracking branch 'genec/diag-mbr-handoff-for-hpa'syslinux-4.04-pre16
| -rw-r--r-- | diag/mbr/handoff.S | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/diag/mbr/handoff.S b/diag/mbr/handoff.S index b3fe5139..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 @@ -221,17 +226,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 +249,29 @@ pr_pnp: andw $0xFFF0, %dx call wrhexw #endif /* DEBUG_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 |