Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR kern/7033 (Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>): use

Browse Source 
device minor to unit/partition macros from sys/disklabel.h
This commit is contained in:
drochner 1999-02-22 16:00:01 +00:00
parent ae6215337e
commit 220b8d9add
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/subr_disk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_disk.c,v 1.24 1998/08/04 04:03:14 perry Exp $ */ /* $NetBSD: subr_disk.c,v 1.25 1999/02/22 16:00:01 drochner Exp $ */
/*- /*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -188,11 +188,6 @@ insert: bp->b_actf = bq->b_actf;
bq->b_actf = bp; bq->b_actf = bp;
} }
/* encoding of disk minor numbers, should be elsewhere... */
#define dkunit(dev) (minor(dev) >> 3)
#define dkpart(dev) (minor(dev) & 07)
#define dkminor(unit, part) (((unit) << 3) | (part))
/* /*
* Compute checksum for disk label. * Compute checksum for disk label.
*/ */
@ -231,7 +226,7 @@ diskerr(bp, dname, what, pri, blkdone, lp)
int pri, blkdone; int pri, blkdone;
register struct disklabel *lp; register struct disklabel *lp;
{ {
int unit = dkunit(bp->b_dev), part = dkpart(bp->b_dev); int unit = DISKUNIT(bp->b_dev), part = DISKPART(bp->b_dev);
register void (*pr) __P((const char *, ...)); register void (*pr) __P((const char *, ...));
char partname = 'a' + part; char partname = 'a' + part;
int sn; int sn;