Module Name: src
Committed By: macallan
Date: Wed Jun 15 14:32:03 UTC 2016
Modified Files:
src/sys/arch/macppc/macppc: pic_ohare.c
Log Message:
g/c some leftovers from when we had static assignments of edge or level
triggers
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/macppc/pic_ohare.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_ohare.c
diff -u src/sys/arch/macppc/macppc/pic_ohare.c:1.12 src/sys/arch/macppc/macppc/pic_ohare.c:1.13
--- src/sys/arch/macppc/macppc/pic_ohare.c:1.12 Sun Apr 21 15:42:11 2013
+++ src/sys/arch/macppc/macppc/pic_ohare.c Wed Jun 15 14:32:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $ */
+/* $NetBSD: pic_ohare.c,v 1.13 2016/06/15 14:32:03 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.13 2016/06/15 14:32:03 macallan Exp $");
#include "opt_interrupt.h"
@@ -68,8 +68,6 @@ static inline void ohare_read_events(str
#define INT_ENABLE_REG ((uint32_t)pic->pic_cookie + 0x24)
#define INT_CLEAR_REG ((uint32_t)pic->pic_cookie + 0x28)
#define INT_LEVEL_REG ((uint32_t)pic->pic_cookie + 0x2c)
-#define INT_LEVEL_MASK_OHARE 0x1ff00000
-#define INT_LEVEL_MASK_GC 0x3ff00000
int init_ohare(void)
{
@@ -135,12 +133,12 @@ setup_ohare(uint32_t addr, int is_gc)
if (is_gc) {
strcpy(pic->pic_name, "gc");
- ohare->level_mask = 0;
} else {
strcpy(pic->pic_name, "ohare");
- ohare->level_mask = 0;
}
+ ohare->level_mask = 0;
+
for (i = 0; i < OHARE_NIRQ; i++)
ohare->priority_masks[i] = 0;
for (i = 0; i < NIPL; i++)
