svn commit: r200694 - in stable/7/sys/boot/i386: gptboot zfsboot
John Baldwin
jhb at FreeBSD.org
Fri Dec 18 22:12:47 UTC 2009
Author: jhb
Date: Fri Dec 18 22:12:47 2009
New Revision: 200694
URL: http://svn.freebsd.org/changeset/base/200694
Log:
MFC 200310:
Fix a confusing typo in the EDD packet structure used in gptboot and
gptzfsboot. I got the segment and offset fields reversed in the structure,
but I also succeeded in crossing the assignments so the actual EDD packet
ended up correct.
Modified:
stable/7/sys/boot/i386/gptboot/gptboot.c
stable/7/sys/boot/i386/zfsboot/zfsboot.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- stable/7/sys/boot/i386/gptboot/gptboot.c Fri Dec 18 21:57:51 2009 (r200693)
+++ stable/7/sys/boot/i386/gptboot/gptboot.c Fri Dec 18 22:12:47 2009 (r200694)
@@ -645,8 +645,8 @@ bcmp(const void *b1, const void *b2, siz
static struct {
uint16_t len;
uint16_t count;
- uint16_t seg;
uint16_t off;
+ uint16_t seg;
uint64_t lba;
} packet;
@@ -659,8 +659,8 @@ drvread(void *buf, daddr_t lba, unsigned
printf("%c\b", c = c << 8 | c >> 24);
packet.len = 0x10;
packet.count = nblk;
- packet.seg = VTOPOFF(buf);
- packet.off = VTOPSEG(buf);
+ packet.off = VTOPOFF(buf);
+ packet.seg = VTOPSEG(buf);
packet.lba = lba;
v86.ctl = V86_FLAGS;
v86.addr = 0x13;
Modified: stable/7/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/7/sys/boot/i386/zfsboot/zfsboot.c Fri Dec 18 21:57:51 2009 (r200693)
+++ stable/7/sys/boot/i386/zfsboot/zfsboot.c Fri Dec 18 22:12:47 2009 (r200694)
@@ -1049,8 +1049,8 @@ putchar(int c)
static struct {
uint16_t len;
uint16_t count;
- uint16_t seg;
uint16_t off;
+ uint16_t seg;
uint64_t lba;
} packet;
#endif
@@ -1065,8 +1065,8 @@ drvread(struct dsk *dsk, void *buf, dadd
printf("%c\b", c = c << 8 | c >> 24);
packet.len = 0x10;
packet.count = nblk;
- packet.seg = VTOPOFF(buf);
- packet.off = VTOPSEG(buf);
+ packet.off = VTOPOFF(buf);
+ packet.seg = VTOPSEG(buf);
packet.lba = lba + dsk->start;
v86.ctl = V86_FLAGS;
v86.addr = 0x13;
More information about the svn-src-stable-7
mailing list