summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/boot/i386/gptboot/gptboot.c6
-rw-r--r--sys/boot/i386/zfsboot/zfsboot.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 89df2ec..96efea6 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -642,8 +642,8 @@ bcmp(const void *b1, const void *b2, size_t length)
static struct {
uint16_t len;
uint16_t count;
- uint16_t seg;
uint16_t off;
+ uint16_t seg;
uint64_t lba;
} packet;
@@ -656,8 +656,8 @@ drvread(void *buf, daddr_t lba, unsigned nblk)
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;
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c
index 966a00b..07ade3a 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/sys/boot/i386/zfsboot/zfsboot.c
@@ -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, daddr_t lba, unsigned nblk)
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;
OpenPOWER on IntegriCloud