diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-12 16:04:10 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-12 16:04:10 +0000 |
| commit | 6ef96271d26eecca7400306223ea80e8835f35e0 (patch) | |
| tree | 65795f2450df70b22449135cca395f617daf8ff3 /sys | |
| parent | 688f7fb0df18c0a5f0420c14b372fe6f7df37dc6 (diff) | |
Use daddr_t to hold calculated disk sector address. %d -> %lld to
match. Whitespace tweaks. All bringing this chunk into identity
with same chunk in sparc64 fd.c.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/fd.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index ca2784aedd1..2a9f3de3b10 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.85 2013/11/01 17:36:19 krw Exp $ */ +/* $OpenBSD: fd.c,v 1.86 2013/11/12 16:04:09 krw Exp $ */ /* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */ /*- @@ -1380,16 +1380,19 @@ loop: head = sec / type->sectrac; sec -= head * type->sectrac; #ifdef DIAGNOSTIC - {int block; - block = (fd->sc_cylin * type->heads + head) * type->sectrac + - sec; - if (block != fd->sc_blkno) { - printf("fdcintr: block %d != blkno %lld\n", block, - (long long)fd->sc_blkno); + { + daddr_t block; + + block = (fd->sc_cylin * type->heads + head) * + type->sectrac + sec; + if (block != fd->sc_blkno) { + printf("fdcintr: block %lld != blkno %lld\n", + (long long)block, (long long)fd->sc_blkno); #if defined(FD_DEBUG) && defined(DDB) - Debugger(); + Debugger(); #endif - }} + } + } #endif read = bp->b_flags & B_READ; |