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/hppa | |
| 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/hppa')
| -rw-r--r-- | sys/arch/hppa/stand/libsa/dev_hppa.h | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/libsa.h | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/pdc.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/hppa/stand/libsa/dev_hppa.h b/sys/arch/hppa/stand/libsa/dev_hppa.h index 2c006dce33c..5e9bcf1613f 100644 --- a/sys/arch/hppa/stand/libsa/dev_hppa.h +++ b/sys/arch/hppa/stand/libsa/dev_hppa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_hppa.h,v 1.8 2003/08/11 06:51:45 mickey Exp $ */ +/* $OpenBSD: dev_hppa.h,v 1.9 2011/03/13 00:13:52 deraadt Exp $ */ #define IOPGSHIFT 11 @@ -9,8 +9,8 @@ struct disklabel; struct hppa_dev { dev_t bootdev; struct pz_device *pz_dev; /* device descriptor */ - daddr_t fsoff; /* offset to the file system */ - daddr_t last_blk; /* byte offset for last read blk */ + daddr32_t fsoff; /* offset to the file system */ + daddr32_t last_blk; /* byte offset for last read blk */ size_t last_read; /* amount read last time */ struct disklabel *label; /* buffer to cache data (aligned properly) */ diff --git a/sys/arch/hppa/stand/libsa/libsa.h b/sys/arch/hppa/stand/libsa/libsa.h index a5c4f02b615..5428c30bb01 100644 --- a/sys/arch/hppa/stand/libsa/libsa.h +++ b/sys/arch/hppa/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.13 2004/04/07 18:24:20 mickey Exp $ */ +/* $OpenBSD: libsa.h,v 1.14 2011/03/13 00:13:52 deraadt Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -39,7 +39,7 @@ void pdc_init(void); struct pz_device; struct pz_device *pdc_findev(int, int); -int iodcstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int iodcstrategy(void *, int, daddr32_t, size_t, void *, size_t *); int ctopen(struct open_file *, ...); int ctclose(struct open_file *); @@ -48,7 +48,7 @@ int dkopen(struct open_file *, ...); int dkclose(struct open_file *); int lfopen(struct open_file *, ...); -int lfstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int lfstrategy(void *, int, daddr32_t, size_t, void *, size_t *); int lfclose(struct open_file *); void ite_probe(struct consdev *); diff --git a/sys/arch/hppa/stand/libsa/pdc.c b/sys/arch/hppa/stand/libsa/pdc.c index 7c4b51123aa..a91f619baef 100644 --- a/sys/arch/hppa/stand/libsa/pdc.c +++ b/sys/arch/hppa/stand/libsa/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.19 2005/04/07 00:21:51 mickey Exp $ */ +/* $OpenBSD: pdc.c,v 1.20 2011/03/13 00:13:52 deraadt Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -128,7 +128,7 @@ int iodcstrategy(devdata, rw, blk, size, buf, rsize) void *devdata; int rw; - daddr_t blk; + daddr32_t blk; size_t size; void *buf; size_t *rsize; |