diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-03-13 00:13:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-03-13 00:13:54 +0000 |
| commit | 498cf2cbf80b299bf6c21307d98f424374b5b18c (patch) | |
| tree | 8553045f12ef69e9aaafd5e8e87dfa1fbe23c284 /sys/arch/sgi | |
| parent | 87ac327e012b105ceaf428b26525cfa462ccd835 (diff) | |
Change daddr_t to daddr32_t. The bootblocks on our architectures only
do 32-bit block spanning. If later on we get some that can/should do
64-bit, that can be done now using daddr64_t (but of course, we are taking
this step to finalize the daddr_t 64-bit conversion).
ok miod krw
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/boot/diskio.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/sgi/stand/boot/conf.c b/sys/arch/sgi/stand/boot/conf.c index 2964476870f..caa763f7b8f 100644 --- a/sys/arch/sgi/stand/boot/conf.c +++ b/sys/arch/sgi/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.3 2009/05/14 18:57:43 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -31,7 +31,7 @@ extern void nullsys(); extern int nodev(); extern int noioctl(); -int diostrategy(void *, int, daddr_t, size_t, void *, size_t *); +int diostrategy(void *, int, daddr32_t, size_t, void *, size_t *); int dioopen(struct open_file *, ...); int dioclose(struct open_file *); diff --git a/sys/arch/sgi/stand/boot/diskio.c b/sys/arch/sgi/stand/boot/diskio.c index 749794be0e5..e1bc49c51df 100644 --- a/sys/arch/sgi/stand/boot/diskio.c +++ b/sys/arch/sgi/stand/boot/diskio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskio.c,v 1.5 2009/07/15 20:34:57 martynas Exp $ */ +/* $OpenBSD: diskio.c,v 1.6 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 2000 Opsycon AB (www.opsycon.se) @@ -45,7 +45,7 @@ struct dio_softc { }; int -diostrategy(void *devdata, int rw, daddr_t bn, u_int reqcnt, void *addr, +diostrategy(void *devdata, int rw, daddr32_t bn, u_int reqcnt, void *addr, size_t *cnt) { struct dio_softc *sc = (struct dio_softc *)devdata; @@ -73,7 +73,7 @@ dioopen(struct open_file *f, ...) struct dio_softc *sc; struct disklabel *lp; long fd; - daddr_t labelsector; + daddr32_t labelsector; va_list ap; va_start(ap, f); @@ -105,7 +105,7 @@ dioopen(struct open_file *f, ...) #if 0 /* Try to read disk label and partition table information. */ - i = diostrategy(sc, F_READ, (daddr_t)labelsector, DEV_BSIZE, buf, &cnt); + i = diostrategy(sc, F_READ, (daddr32_t)labelsector, DEV_BSIZE, buf, &cnt); if (i == 0 && cnt == DEV_BSIZE) msg = getdisklabel(buf, lp); |