svn commit: r276186 - projects/arm_intrng/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Wed Dec 24 16:11:15 2014
New Revision: 276186
URL: https://svnweb.freebsd.org/changeset/base/276186

Log:
  More cleanups to allow us to build without intrng

Modified:
  projects/arm_intrng/sys/arm/arm/gic.c
  projects/arm_intrng/sys/arm/arm/mp_machdep.c

Modified: projects/arm_intrng/sys/arm/arm/gic.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/gic.c	Wed Dec 24 16:03:56 2014	(r276185)
+++ projects/arm_intrng/sys/arm/arm/gic.c	Wed Dec 24 16:11:15 2014	(r276186)
@@ -133,6 +133,7 @@ static void arm_gic_eoi(device_t, int);
 static void arm_gic_mask(device_t, int);
 static void arm_gic_unmask(device_t, int);
 static void arm_gic_ipi_send(device_t, cpuset_t, int);
+static int arm_gic_ipi_read(device_t dev, int i);
 static void arm_gic_ipi_clear(device_t, int);
 
 #define	gic_c_read_4(_sc, _reg)		\
@@ -275,6 +276,7 @@ arm_gic_attach(device_t dev)
 	sc->gic_c_bst = rman_get_bustag(sc->gic_res[1]);
 	sc->gic_c_bsh = rman_get_bushandle(sc->gic_res[1]);
 
+#ifdef ARM_INTRNG
 	if (bus_setup_intr(dev, sc->gic_res[2], INTR_TYPE_MISC | INTR_CONTROLLER,
 	    arm_gic_intr, NULL, sc, &sc->gic_intrhand)) {
 		device_printf(dev, "could not setup interrupt handler\n");
@@ -283,8 +285,10 @@ arm_gic_attach(device_t dev)
 	}
 
 	arm_register_pic(dev, PIC_FEATURE_IPI);
+
 	for (int i = 0; i < ARM_IPI_COUNT; i++)
 		arm_ipi_map_irq(dev, i, i);
+#endif
 
 	/* Disable interrupt forwarding to the CPU interface */
 	gic_d_write_4(sc, GICD_CTLR, 0x00);
@@ -515,7 +519,7 @@ int
 pic_ipi_read(int i)
 {
 
-	return (arm_gic_pid_ipi_read(arm_gic_sc->gic_dev, i);
+	return (arm_gic_ipi_read(arm_gic_sc->gic_dev, i));
 }
 
 void

Modified: projects/arm_intrng/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/mp_machdep.c	Wed Dec 24 16:03:56 2014	(r276185)
+++ projects/arm_intrng/sys/arm/arm/mp_machdep.c	Wed Dec 24 16:11:15 2014	(r276186)
@@ -236,7 +236,11 @@ init_secondary(int cpu)
 #endif
 				
 	for (int i = 0; i < ARM_IPI_COUNT; i++)
+#ifdef ARM_INTRNG
 		arm_unmask_ipi(i);
+#else
+		arm_unmask_irq(i);
+#endif
 	enable_interrupts(PSR_I);
 
 	loop_counter = 0;