d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redefinitions in ARMADA code

Browse Source 
* Rename IRQ_MASK to MPIC_IRQ_MASK not to overlap with
  register name from mvreg.h
* Remove ARM_INTRNG from ARMADA38X, apparently was already
  included.
This commit is contained in:
wma 2016-03-15 06:06:09 +00:00
parent c39a40d212
commit ebabdead98
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/conf/ARMADA38X
View File

@ -23,7 +23,6 @@ options SCHED_ULE # ULE scheduler
#options SCHED_4BSD # 4BSD scheduler
options SMP
options ARM_INTRNG
# Debugging
#options DEBUG

6
sys/arm/mv/mpic.c
View File

@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#define MPIC_INT_ERR 4
#define MPIC_INT_MSI 96
#define IRQ_MASK 0x3ff
#define MPIC_IRQ_MASK 0x3ff
#define MPIC_CTRL 0x0
#define MPIC_SOFT_INT 0x4
@ -409,10 +409,10 @@ arm_get_next_irq(int last)
{
u_int irq, next = -1;
irq = mv_mpic_get_cause() & IRQ_MASK;
irq = mv_mpic_get_cause() & MPIC_IRQ_MASK;
CTR2(KTR_INTR, "%s: irq:%#x", __func__, irq);
if (irq != IRQ_MASK) {
if (irq != MPIC_IRQ_MASK) {
if (irq == MPIC_INT_ERR)
irq = mv_mpic_get_cause_err();
if (irq == MPIC_INT_MSI)