diff options
| author | grog <grog@FreeBSD.org> | 1999-05-15 05:49:21 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 1999-05-15 05:49:21 +0000 |
| commit | f834718a6b5ecafecff3a638959d1268a2d72dec (patch) | |
| tree | 1c40e1c8b924cd43acb172652ccf615f04384ab7 /sys/dev/vinum/vinumutil.c | |
| parent | 891aeb93bc0c41a7c59adbdb8a76e5f24510c0e3 (diff) | |
| download | FreeBSD-src-f834718a6b5ecafecff3a638959d1268a2d72dec.zip FreeBSD-src-f834718a6b5ecafecff3a638959d1268a2d72dec.tar.gz | |
Modify to work with new style dev_t.
With_copious_input_from: peter
phk
Diffstat (limited to 'sys/dev/vinum/vinumutil.c')
| -rw-r--r-- | sys/dev/vinum/vinumutil.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c index 63f695d..92204be 100644 --- a/sys/dev/vinum/vinumutil.c +++ b/sys/dev/vinum/vinumutil.c @@ -238,8 +238,7 @@ sizespec(char *spec) int Volno(dev_t dev) { - int x = (int) dev; - return (x & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT; + return (minor(dev) & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT; } /* @@ -250,8 +249,6 @@ Volno(dev_t dev) int Plexno(dev_t dev) { - int x = (int) dev; - switch (DEVTYPE(dev)) { case VINUM_VOLUME_TYPE: case VINUM_DRIVE_TYPE: @@ -261,11 +258,11 @@ Plexno(dev_t dev) case VINUM_PLEX_TYPE: case VINUM_SD_TYPE: - return VOL[Volno(x)].plex[(x >> VINUM_PLEX_SHIFT) & (MASK(VINUM_PLEX_WIDTH))]; + return VOL[Volno(dev)].plex[(minor(dev) >> VINUM_PLEX_SHIFT) & (MASK(VINUM_PLEX_WIDTH))]; case VINUM_RAWPLEX_TYPE: - return ((x & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT) /* low order 8 bits */ - |((x >> VINUM_RAWPLEX_SHIFT) + return ((minor(dev) & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT) /* low order 8 bits */ + |((minor(dev) >> VINUM_RAWPLEX_SHIFT) & (MASK(VINUM_RAWPLEX_WIDTH) << (VINUM_VOL_SHIFT + VINUM_VOL_WIDTH))); /* upper 12 bits */ } @@ -280,8 +277,6 @@ Plexno(dev_t dev) int Sdno(dev_t dev) { - int x = (int) dev; - switch (DEVTYPE(dev)) { case VINUM_VOLUME_TYPE: case VINUM_DRIVE_TYPE: @@ -291,11 +286,11 @@ Sdno(dev_t dev) return -1; case VINUM_SD_TYPE: - return PLEX[Plexno(x)].sdnos[(x >> VINUM_SD_SHIFT) & (MASK(VINUM_SD_WIDTH))]; + return PLEX[Plexno(dev)].sdnos[(minor(dev) >> VINUM_SD_SHIFT) & (MASK(VINUM_SD_WIDTH))]; case VINUM_RAWSD_TYPE: - return ((x & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT) /* low order 8 bits */ - |((x >> VINUM_RAWPLEX_SHIFT) & (MASK(VINUM_RAWPLEX_WIDTH) + return ((minor(dev) & MASK(VINUM_VOL_WIDTH)) >> VINUM_VOL_SHIFT) /* low order 8 bits */ + |((minor(dev) >> VINUM_RAWPLEX_SHIFT) & (MASK(VINUM_RAWPLEX_WIDTH) << (VINUM_VOL_SHIFT + VINUM_VOL_WIDTH))); /* upper 12 bits */ } return -1; /* compiler paranoia */ |
