Module Name: src
Committed By: rkujawa
Date: Sun Nov 25 19:15:44 UTC 2012
Modified Files:
src/sys/arch/amiga/dev: zbus.c
Log Message:
Use constants, not magic values.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amiga/dev/zbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/zbus.c
diff -u src/sys/arch/amiga/dev/zbus.c:1.69 src/sys/arch/amiga/dev/zbus.c:1.70
--- src/sys/arch/amiga/dev/zbus.c:1.69 Sat Oct 27 17:17:32 2012
+++ src/sys/arch/amiga/dev/zbus.c Sun Nov 25 19:15:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zbus.c,v 1.69 2012/10/27 17:17:32 chs Exp $ */
+/* $NetBSD: zbus.c,v 1.70 2012/11/25 19:15:43 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.69 2012/10/27 17:17:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.70 2012/11/25 19:15:43 rkujawa Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -330,8 +330,9 @@ zbusattach(device_t parent, device_t sel
* check if it's a Zorro II or III board and not linked into
* MemList (i.e. not a memory board)
*/
- if ((cdp->rom.type & 0xe0) != 0xc0 &&
- (cdp->rom.type & 0xe0) != 0x80)
+ if ((cdp->rom.type & (ERT_TYPEMASK | ERTF_MEMLIST)) !=
+ ERT_ZORROII && (cdp->rom.type & (ERT_TYPEMASK |
+ ERTF_MEMLIST)) != ERT_ZORROIII)
continue; /* er_Type != Zorro I/O */
za.pa = cdp->addr;
