From 73ec2de7c239e0f069dd19abdf41b35dc2e13602 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 13 Aug 2007 16:27:42 -0700 Subject: [PATCH] --- yaml --- r: 64036 b: refs/heads/master c: c1a6e2b082a7cefe58315af7a461bbf2f33221a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/boot/edd.c | 30 +----------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/[refs] b/[refs] index 49b1b023e491..b72a7d547baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 362cea339a34e04caae6cad67ea9bde5c100d12b +refs/heads/master: c1a6e2b082a7cefe58315af7a461bbf2f33221a3 diff --git a/trunk/arch/i386/boot/edd.c b/trunk/arch/i386/boot/edd.c index 658834d9f92a..d65dd21c09f2 100644 --- a/trunk/arch/i386/boot/edd.c +++ b/trunk/arch/i386/boot/edd.c @@ -19,40 +19,12 @@ #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) -struct edd_dapa { - u8 pkt_size; - u8 rsvd; - u16 sector_cnt; - u16 buf_off, buf_seg; - u64 lba; - u64 buf_lin_addr; -}; - /* * Read the MBR (first sector) from a specific device. */ static int read_mbr(u8 devno, void *buf) { - struct edd_dapa dapa; - u16 ax, bx, cx, dx, si; - - memset(&dapa, 0, sizeof dapa); - dapa.pkt_size = sizeof(dapa); - dapa.sector_cnt = 1; - dapa.buf_off = (size_t)buf; - dapa.buf_seg = ds(); - /* dapa.lba = 0; */ - - ax = 0x4200; /* Extended Read */ - si = (size_t)&dapa; - dx = devno; - asm("pushfl; stc; int $0x13; setc %%al; popfl" - : "+a" (ax), "+S" (si), "+d" (dx) - : "m" (dapa) - : "ebx", "ecx", "edi", "memory"); - - if (!(u8)ax) - return 0; /* OK */ + u16 ax, bx, cx, dx; ax = 0x0201; /* Legacy Read, one sector */ cx = 0x0001; /* Sector 0-0-1 */