diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-05 00:51:59 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-05 00:51:59 +0000 |
| commit | 796d477c0b5f03d8d84b1697382465b7555e5c98 (patch) | |
| tree | 0522f4b0c219b74af4f5e76a0fc813a809442abc /sys/arch/amd64/stand | |
| parent | 1de8989a1b132480cf21105d5617b5ca6325daa0 (diff) | |
Replace direct references to p_size, p_offset and d_secperunit with
DL_[GET|SET]PSIZE(), DL_[GET|SET]POFFSET(), DL_[GET|SET]DSIZE() in
order to get|set correct value that includes the high bits of the
value.
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/diskprobe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c index 581bcac749c..50062579d5d 100644 --- a/sys/arch/amd64/stand/libsa/diskprobe.c +++ b/sys/arch/amd64/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.12 2012/10/30 14:06:29 jsing Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.13 2013/11/05 00:51:58 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -266,19 +266,19 @@ cdprobe(void) strncpy(dip->disklabel.d_packname, "fictitious", sizeof(dip->disklabel.d_packname)); - dip->disklabel.d_secperunit = 100; + DL_SETDSIZE(&dip->disklabel, 100); dip->disklabel.d_bbsize = 2048; dip->disklabel.d_sbsize = 2048; /* 'a' partition covering the "whole" disk */ - dip->disklabel.d_partitions[0].p_offset = 0; - dip->disklabel.d_partitions[0].p_size = 100; + DL_SETPOFFSET(&dip->disklabel.d_partitions[0], 0); + DL_SETPSIZE(&dip->disklabel.d_partitions[0], 100); dip->disklabel.d_partitions[0].p_fstype = FS_UNUSED; /* The raw partition is special */ - dip->disklabel.d_partitions[RAW_PART].p_offset = 0; - dip->disklabel.d_partitions[RAW_PART].p_size = 100; + DL_SETPOFFSET(&dip->disklabel.d_partitions[RAW_PART], 0); + DL_SETPSIZE(&dip->disklabel.d_partitions[RAW_PART], 100); dip->disklabel.d_partitions[RAW_PART].p_fstype = FS_UNUSED; dip->disklabel.d_npartitions = MAXPARTITIONS; |