diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2009-12-18 22:12:47 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2009-12-18 22:12:47 +0000 |
| commit | c9d70a32cae764891fa9289deba8c1d56d385e79 (patch) | |
| tree | 1df7987294fa42c825dc74f8874726780c0e4487 /sys/boot | |
| parent | 8bc1b72a4e1fb092e3399470eddffbb60c610016 (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -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 405b92e62866..97ecb7ccb47a 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -645,8 +645,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; @@ -659,8 +659,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; |