Module Name: src
Committed By: skrll
Date: Wed May 27 09:30:14 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: mainbus.c
src/sys/arch/hp700/include: iomod.h
Log Message:
s/FLEX_MASK/HPPA_&/ for consistency.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hp700/hp700/mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/include/iomod.h
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/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.51 src/sys/arch/hp700/hp700/mainbus.c:1.52
--- src/sys/arch/hp700/hp700/mainbus.c:1.51 Sun May 24 15:27:08 2009
+++ src/sys/arch/hp700/hp700/mainbus.c Wed May 27 09:30:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.51 2009/05/24 15:27:08 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.52 2009/05/27 09:30:14 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.51 2009/05/24 15:27:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.52 2009/05/27 09:30:14 skrll Exp $");
#include "locators.h"
#include "power.h"
@@ -1521,11 +1521,11 @@
/*
* Local-Broadcast the HPA to all modules on the bus
*/
- ((struct iomod *)(pdc_hpa.hpa & FLEX_MASK))[FPA_IOMOD].io_flex =
- (void *)((pdc_hpa.hpa & FLEX_MASK) | DMA_ENABLE);
+ ((struct iomod *)(pdc_hpa.hpa & HPPA_FLEX_MASK))[FPA_IOMOD].io_flex =
+ (void *)((pdc_hpa.hpa & HPPA_FLEX_MASK) | DMA_ENABLE);
sc->sc_hpa = pdc_hpa.hpa;
- aprint_normal(" [flex %lx]\n", pdc_hpa.hpa & FLEX_MASK);
+ aprint_normal(" [flex %lx]\n", pdc_hpa.hpa & HPPA_FLEX_MASK);
/* PDC first */
memset(&nca, 0, sizeof(nca));
Index: src/sys/arch/hp700/include/iomod.h
diff -u src/sys/arch/hp700/include/iomod.h:1.5 src/sys/arch/hp700/include/iomod.h:1.6
--- src/sys/arch/hp700/include/iomod.h:1.5 Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hp700/include/iomod.h Wed May 27 09:30:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iomod.h,v 1.5 2009/04/30 07:01:27 skrll Exp $ */
+/* $NetBSD: iomod.h,v 1.6 2009/05/27 09:30:14 skrll Exp $ */
/* $OpenBSD: iomod.h,v 1.18 2007/10/20 16:41:45 miod Exp $ */
@@ -123,8 +123,8 @@
#define FPA_IOMOD ((FPA_HIGH-FPA_LOW)/sizeof(struct iomod))
#define MAXMODBUS ((int)(FPA_IOMOD)) /* maximum modules/bus */
-#define FLEX_MASK 0xFFFC0000 /* (see below) */
-#define HPPA_FLEX(a) (((a) & FLEX_MASK) >> 18)
+#define HPPA_FLEX_MASK 0xFFFC0000 /* (see below) */
+#define HPPA_FLEX(a) (((a) & HPPA_FLEX_MASK) >> 18)
/* size of HPA space for any device */
#define IOMOD_HPASIZE 0x1000
