svn commit: r200695 - stable/6/sys/boot/i386/gptboot

[John Baldwin]

Author: jhb
Date: Fri Dec 18 22:13:34 2009
New Revision: 200695
URL: http://svn.freebsd.org/changeset/base/200695

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/6/sys/boot/i386/gptboot/gptboot.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- stable/6/sys/boot/i386/gptboot/gptboot.c	Fri Dec 18 22:12:47 2009	(r200694)
+++ stable/6/sys/boot/i386/gptboot/gptboot.c	Fri Dec 18 22:13:34 2009	(r200695)
@@ -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;