Module Name: src
Committed By: joerg
Date: Sun Mar 2 13:23:17 UTC 2014
Modified Files:
src/sys/arch/arm/xscale: i80321_space.c
Log Message:
Skip a tautologic check if we know it is one.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/i80321_space.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/arm/xscale/i80321_space.c
diff -u src/sys/arch/arm/xscale/i80321_space.c:1.13 src/sys/arch/arm/xscale/i80321_space.c:1.14
--- src/sys/arch/arm/xscale/i80321_space.c:1.13 Fri Jul 1 20:32:51 2011
+++ src/sys/arch/arm/xscale/i80321_space.c Sun Mar 2 13:23:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_space.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: i80321_space.c,v 1.14 2014/03/02 13:23:16 joerg Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.14 2014/03/02 13:23:16 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -291,7 +291,10 @@ i80321_mem_bs_map(void *t, bus_addr_t bp
paddr_t pa, endpa, physbase;
#ifdef I80321_USE_DIRECT_WIN
- if (bpa >= (VERDE_OUT_DIRECT_WIN_BASE) &&
+ if (
+#if VERDE_OUT_DIRECT_WIN_BASE != 0
+ bpa >= (VERDE_OUT_DIRECT_WIN_BASE) &&
+#endif
bpa < (VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SIZE)) {
busbase = VERDE_OUT_DIRECT_WIN_BASE;
physbase = VERDE_OUT_DIRECT_WIN_BASE;
