From a0ba6a12a43ce7467c0e9cfc5514af9b00281f30 Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Sun, 6 Jan 2019 14:24:39 -0600 Subject: [PATCH] arch/arm/src/am335x/chip/am3358_memorymap.h: Code cleanup for beaglebone black port arch/arm/src/am335x/am335x_irq.c: Uncomment code for interrupt enable/disable --- arch/arm/src/am335x/am335x_irq.c | 12 ++++++++---- arch/arm/src/am335x/chip/am3358_memorymap.h | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/src/am335x/am335x_irq.c b/arch/arm/src/am335x/am335x_irq.c index 75d0aa012b..a2c0a01af6 100644 --- a/arch/arm/src/am335x/am335x_irq.c +++ b/arch/arm/src/am335x/am335x_irq.c @@ -275,9 +275,11 @@ void up_disable_irq(int irq) { if (irq < AM335X_IRQ_NINT) { - //__asm__ __volatile__ ("\tdsb"); + __asm__ __volatile__ ("\tdsb"); + /* Disable interrupt on INTC */ - //putreg32(INTC_MIR_SET(irq), AM335X_INTC_MIR_SET(irq)); + + putreg32(INTC_MIR_SET(irq), AM335X_INTC_MIR_SET(irq)); } #ifdef CONFIG_AM335X_GPIO_IRQ else @@ -301,9 +303,11 @@ void up_enable_irq(int irq) { if (irq < AM335X_IRQ_NINT) { - //__asm__ __volatile__ ("\tdsb"); + __asm__ __volatile__ ("\tdsb"); + /* Enable interrupt on INTC */ - //putreg32(INTC_MIR_CLEAR(irq), AM335X_INTC_MIR_CLEAR(irq)); + + putreg32(INTC_MIR_CLEAR(irq), AM335X_INTC_MIR_CLEAR(irq)); } #ifdef CONFIG_AM335X_GPIO_IRQ else diff --git a/arch/arm/src/am335x/chip/am3358_memorymap.h b/arch/arm/src/am335x/chip/am3358_memorymap.h index d63a7ceae5..b103f57fbb 100644 --- a/arch/arm/src/am335x/chip/am3358_memorymap.h +++ b/arch/arm/src/am335x/chip/am3358_memorymap.h @@ -498,8 +498,6 @@ # define IDLE_STACK_PBASE (PGTABLE_BASE_PADDR - CONFIG_IDLETHREAD_STACKSIZE) # define IDLE_STACK_VBASE (PGTABLE_BASE_VADDR - CONFIG_IDLETHREAD_STACKSIZE) -//# define IDLE_STACK_PBASE 0x8d000000 -//# define IDLE_STACK_VBASE 0x8d000000 # else /* CONFIG_ARCH_LOWVECTORS */