diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2009-12-18 21:21:14 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2009-12-18 21:21:14 +0000 |
| commit | f70478c04dfcca72278b2478f36fd80818d5e349 (patch) | |
| tree | c0b0a8756503c868de577fa0ae6ffc4378dcac6a /sys | |
| parent | 5e05dbe9bd0c045c0f6272ce1d96943e851e84a7 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 6 | ||||
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 89df2ecb104c..96efea6a1d5e 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 966a00b4f036..07ade3ac61d7 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; |