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/loongson/stand | |
| 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/loongson/stand')
| -rw-r--r-- | sys/arch/loongson/stand/boot/dev.c | 4 | ||||
| -rw-r--r-- | sys/arch/loongson/stand/boot/libsa.h | 6 | ||||
| -rw-r--r-- | sys/arch/loongson/stand/boot/rd.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/loongson/stand/boot/dev.c b/sys/arch/loongson/stand/boot/dev.c index c60791c8326..94b3616fd27 100644 --- a/sys/arch/loongson/stand/boot/dev.c +++ b/sys/arch/loongson/stand/boot/dev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev.c,v 1.2 2010/02/16 21:28:39 miod Exp $ */ +/* $OpenBSD: dev.c,v 1.3 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -67,7 +67,7 @@ struct pmon_iodata { int pmon_getdisklabel(struct pmon_iodata *pi); int -pmon_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf, +pmon_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf, size_t *rsize) { struct pmon_iodata *pi = (struct pmon_iodata *)f; diff --git a/sys/arch/loongson/stand/boot/libsa.h b/sys/arch/loongson/stand/boot/libsa.h index 8ba7fc90391..7a3bc9eaccf 100644 --- a/sys/arch/loongson/stand/boot/libsa.h +++ b/sys/arch/loongson/stand/boot/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.4 2010/04/03 19:13:27 miod Exp $ */ +/* $OpenBSD: libsa.h,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -41,14 +41,14 @@ void pmon_cnputc(dev_t, int); /* * PMON I/O */ -int pmon_iostrategy(void *, int, daddr_t, size_t, void *, size_t *); +int pmon_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *); int pmon_ioopen(struct open_file *, ...); int pmon_ioclose(struct open_file *); /* * INITRD I/O */ -int rd_iostrategy(void *, int, daddr_t, size_t, void *, size_t *); +int rd_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *); int rd_ioopen(struct open_file *, ...); int rd_ioclose(struct open_file *); int rd_isvalid(void); diff --git a/sys/arch/loongson/stand/boot/rd.c b/sys/arch/loongson/stand/boot/rd.c index 87c045a4464..f179342bcf9 100644 --- a/sys/arch/loongson/stand/boot/rd.c +++ b/sys/arch/loongson/stand/boot/rd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rd.c,v 1.2 2010/04/03 19:13:27 miod Exp $ */ +/* $OpenBSD: rd.c,v 1.3 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -29,7 +29,7 @@ static off_t rdoffs; */ int -rd_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf, +rd_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf, size_t *rsize) { /* never invoked directly */ |