svn commit: r276021 - head/sys/arm/ti

[Andrew Turner]

Author: andrew
Date: Sun Dec 21 16:48:57 2014
New Revision: 276021
URL: https://svnweb.freebsd.org/changeset/base/276021

Log:
  Reduce the diff in the Ti aintc between head and arm_intrng

Modified:
  head/sys/arm/ti/aintc.c

Modified: head/sys/arm/ti/aintc.c
==============================================================================
--- head/sys/arm/ti/aintc.c	Sun Dec 21 16:43:56 2014	(r276020)
+++ head/sys/arm/ti/aintc.c	Sun Dec 21 16:48:57 2014	(r276021)
@@ -72,10 +72,10 @@ static struct resource_spec ti_aintc_spe
 
 static struct ti_aintc_softc *ti_aintc_sc = NULL;
 
-#define	aintc_read_4(reg)		\
-    bus_space_read_4(ti_aintc_sc->aintc_bst, ti_aintc_sc->aintc_bsh, reg)
-#define	aintc_write_4(reg, val)		\
-    bus_space_write_4(ti_aintc_sc->aintc_bst, ti_aintc_sc->aintc_bsh, reg, val)
+#define	aintc_read_4(_sc, reg)		\
+    bus_space_read_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg))
+#define	aintc_write_4(_sc, reg, val)		\
+    bus_space_write_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg), (val))
 
 
 static int
@@ -112,17 +112,17 @@ ti_aintc_attach(device_t dev)
 
 	ti_aintc_sc = sc;
 
-	x = aintc_read_4(INTC_REVISION);
+	x = aintc_read_4(sc, INTC_REVISION);
 	device_printf(dev, "Revision %u.%u\n",(x >> 4) & 0xF, x & 0xF);
 
 	/* SoftReset */
-	aintc_write_4(INTC_SYSCONFIG, 2);
+	aintc_write_4(sc, INTC_SYSCONFIG, 2);
 
 	/* Wait for reset to complete */
-	while(!(aintc_read_4(INTC_SYSSTATUS) & 1));
+	while(!(aintc_read_4(sc, INTC_SYSSTATUS) & 1));
 
 	/*Set Priority Threshold */
-	aintc_write_4(INTC_THRESHOLD, 0xFF);
+	aintc_write_4(sc, INTC_THRESHOLD, 0xFF);
 
 	return (0);
 }
@@ -146,22 +146,23 @@ DRIVER_MODULE(aintc, simplebus, ti_aintc
 int
 arm_get_next_irq(int last_irq)
 {
+	struct ti_aintc_softc *sc = ti_aintc_sc;
 	uint32_t active_irq;
 
 	if (last_irq != -1) {
-		aintc_write_4(INTC_ISR_CLEAR(last_irq >> 5),
+		aintc_write_4(sc, INTC_ISR_CLEAR(last_irq >> 5),
 			1UL << (last_irq & 0x1F));
-		aintc_write_4(INTC_CONTROL,1);
+		aintc_write_4(sc, INTC_CONTROL, 1);
 	}
 
 	/* Get the next active interrupt */
-	active_irq = aintc_read_4(INTC_SIR_IRQ);
+	active_irq = aintc_read_4(sc, INTC_SIR_IRQ);
 
 	/* Check for spurious interrupt */
 	if ((active_irq & 0xffffff80)) {
-		device_printf(ti_aintc_sc->sc_dev,
-			"Spurious interrupt detected (0x%08x)\n", active_irq);
-		aintc_write_4(INTC_SIR_IRQ, 0);
+		device_printf(sc->sc_dev,
+		    "Spurious interrupt detected (0x%08x)\n", active_irq);
+		aintc_write_4(sc, INTC_SIR_IRQ, 0);
 		return -1;
 	}
 
@@ -174,13 +175,16 @@ arm_get_next_irq(int last_irq)
 void
 arm_mask_irq(uintptr_t nb)
 {
-	aintc_write_4(INTC_MIR_SET(nb >> 5), (1UL << (nb & 0x1F)));
+	struct ti_aintc_softc *sc = ti_aintc_sc;
+
+	aintc_write_4(sc, INTC_MIR_SET(nb >> 5), (1UL << (nb & 0x1F)));
 }
 
 void
 arm_unmask_irq(uintptr_t nb)
 {
+	struct ti_aintc_softc *sc = ti_aintc_sc;
 
 	arm_irq_memory_barrier(nb);
-	aintc_write_4(INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F)));
+	aintc_write_4(sc, INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F)));
 }