diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-06-11 16:42:02 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-06-11 16:42:02 +0000 |
| commit | 1abdbfde5173507cdbd2578554582107ac062818 (patch) | |
| tree | 076b5f6a59182468ec7241b0085f404a71818328 /sys/dev/flash.c | |
| parent | Create a small MSDOS partition from where u-boot will load the (diff) | |
| download | wireguard-openbsd-1abdbfde5173507cdbd2578554582107ac062818.tar.xz wireguard-openbsd-1abdbfde5173507cdbd2578554582107ac062818.zip | |
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others
Diffstat (limited to 'sys/dev/flash.c')
| -rw-r--r-- | sys/dev/flash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/flash.c b/sys/dev/flash.c index 5cc8c817417..c3e9aaeebb4 100644 --- a/sys/dev/flash.c +++ b/sys/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.25 2013/05/30 16:15:01 deraadt Exp $ */ +/* $OpenBSD: flash.c,v 1.26 2013/06/11 16:42:13 deraadt Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -847,13 +847,13 @@ flashioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p) } int -flashdump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size) +flashdump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) { printf("flashdump\n"); return ENODEV; } -daddr64_t +daddr_t flashsize(dev_t dev) { printf("flashsize\n"); @@ -882,7 +882,7 @@ void _flashstart(struct flash_softc *sc, struct buf *bp) { int part; - daddr64_t offset; + daddr_t offset; long pgno; part = flashpart(bp->b_dev); @@ -969,7 +969,7 @@ flashgetdefaultlabel(dev_t dev, struct flash_softc *sc, lp->d_nsectors = sc->sc_flashdev->capacity / lp->d_ntracks / lp->d_ncylinders; lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors; - DL_SETDSIZE(lp, (daddr64_t)lp->d_ncylinders * lp->d_secpercyl); + DL_SETDSIZE(lp, (daddr_t)lp->d_ncylinders * lp->d_secpercyl); lp->d_version = 1; |