Module Name: src
Committed By: macallan
Date: Wed May 2 00:55:26 UTC 2012
Modified Files:
src/sys/arch/macppc/macppc: pic_heathrow.c
Log Message:
remove some commented out / unused junk
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/macppc/pic_heathrow.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/macppc/macppc/pic_heathrow.c
diff -u src/sys/arch/macppc/macppc/pic_heathrow.c:1.8 src/sys/arch/macppc/macppc/pic_heathrow.c:1.9
--- src/sys/arch/macppc/macppc/pic_heathrow.c:1.8 Tue Mar 13 18:24:54 2012
+++ src/sys/arch/macppc/macppc/pic_heathrow.c Wed May 2 00:55:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_heathrow.c,v 1.8 2012/03/13 18:24:54 macallan Exp $ */
+/* $NetBSD: pic_heathrow.c,v 1.9 2012/05/02 00:55:26 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_heathrow.c,v 1.8 2012/03/13 18:24:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_heathrow.c,v 1.9 2012/05/02 00:55:26 macallan Exp $");
#include "opt_interrupt.h"
@@ -70,7 +70,6 @@ static inline void heathrow_read_events(
#define INT_ENABLE_REG_L ((uint32_t)pic->pic_cookie + 0x24)
#define INT_CLEAR_REG_L ((uint32_t)pic->pic_cookie + 0x28)
#define INT_LEVEL_REG_L ((uint32_t)pic->pic_cookie + 0x2c)
-#define INT_LEVEL_MASK_HEATHROW 0x1ff00000
static const char *compat[] = {
"heathrow",
@@ -201,10 +200,10 @@ heathrow_read_events(struct heathrow_ops
/* first the low 32 IRQs */
irqs = in32rb(INT_STATE_REG_L);
- events = irqs & ~heathrow->level_mask_l/*INT_LEVEL_MASK_HEATHROW*/;
+ events = irqs & ~heathrow->level_mask_l;
levels = in32rb(INT_LEVEL_REG_L) & heathrow->enable_mask_l;
- events |= levels & heathrow->level_mask_l/*INT_LEVEL_MASK_HEATHROW*/;
+ events |= levels & heathrow->level_mask_l;
out32rb(INT_CLEAR_REG_L, events | irqs);
heathrow->pending_events_l |= events;
