From 2f9dfd6dbbed4f47cf581533cf9a8f49f454be64 Mon Sep 17 00:00:00 2001 From: niklas Date: Sat, 4 Jan 1997 12:40:31 +0000 Subject: [PATCH] Use fancy macros --- sys/arch/amiga/amiga/autoconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c index 709a18c4581..612d31a63ab 100644 --- a/sys/arch/amiga/amiga/autoconf.c +++ b/sys/arch/amiga/amiga/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.7 1996/11/23 21:45:03 kstailey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.8 1997/01/04 12:40:31 niklas Exp $ */ /* $NetBSD: autoconf.c,v 1.38.4.1 1996/05/26 16:23:26 is Exp $ */ /* @@ -329,12 +329,12 @@ setroot() if (boothowto & RB_DFLTROOT || (bootdev & B_MAGICMASK) != (u_long)B_DEVMAGIC) return; - majdev = (bootdev >> B_TYPESHIFT) & B_TYPEMASK; + majdev = B_TYPE(bootdev); if (majdev > sizeof(devname) / sizeof(devname[0])) return; - adaptor = (bootdev >> B_ADAPTORSHIFT) & B_ADAPTORMASK; - part = (bootdev >> B_PARTITIONSHIFT) & B_PARTITIONMASK; - unit = (bootdev >> B_UNITSHIFT) & B_UNITMASK; + adaptor = B_ADAPTOR(bootdev); + part = B_PARTITION(bootdev); + unit = B_UNIT(bootdev); orootdev = rootdev; rootdev = MAKEDISKDEV(majdev, unit, part); /* -- 2.20.1