Rename intrq to intrsource and move to a common arm header.

Author: haesbaert

sys/arch/arm/cortex/ampintc.c

@@ -139,7 +139,7 @@
 
 struct ampintc_softc {
 	struct device		 sc_dev;
-	struct intrq 		*sc_ampintc_handler;
+	struct intrsource 	*sc_ampintc_handler;
 	int			 sc_nintr;
 	bus_space_tag_t		 sc_iot;
 	bus_space_handle_t	 sc_d_ioh, sc_p_ioh;
@@ -158,13 +158,6 @@ struct intrhand {
 	char *ih_name;
 };
 
-struct intrq {
-	TAILQ_HEAD(, intrhand) iq_list;	/* handler list */
-	int iq_irq;			/* IRQ to mask while handling */
-	int iq_levels;			/* IPL_*'s this IRQ has */
-	int iq_ist;			/* share type */
-};
-
 
 int		 ampintc_match(struct device *, void *, void *);
 void		 ampintc_attach(struct device *, struct device *, void *);

sys/arch/armv7/include/intr.h

@@ -104,6 +104,13 @@ struct arm_intr_func {
 
 extern struct arm_intr_func arm_intr_func;
 
+struct intrsource {
+	TAILQ_HEAD(, intrhand) iq_list;	/* handler list */
+	int iq_irq;			/* IRQ to mask while handling */
+	int iq_levels;			/* IPL_*'s this IRQ has */
+	int iq_ist;			/* share type */
+};
+
 #define splraise(cpl)		(arm_intr_func.raise(cpl))
 #define _splraise(cpl)		(arm_intr_func.raise(cpl))
 #define spllower(cpl)		(arm_intr_func.lower(cpl))

sys/arch/armv7/omap/intc.c

@@ -77,16 +77,9 @@ struct intrhand {
 	char *ih_name;
 };
 
-struct intrq {
-	TAILQ_HEAD(, intrhand) iq_list;	/* handler list */
-	int iq_irq;			/* IRQ to mask while handling */
-	int iq_levels;			/* IPL_*'s this IRQ has */
-	int iq_ist;			/* share type */
-};
-
 volatile int softint_pending;
 
-struct intrq intc_handler[INTC_MAX_IRQ];
+struct intrsource intc_handler[INTC_MAX_IRQ];
 u_int32_t intc_smask[NIPL];
 u_int32_t intc_imask[INTC_MAX_BANKS][NIPL];
 

sys/arch/armv7/sunxi/a1xintc.c

@@ -122,16 +122,9 @@ struct intrhand {
 	char *ih_name;
 };
 
-struct intrq {
-	TAILQ_HEAD(, intrhand) iq_list;	/* handler list */
-	int iq_irq;			/* IRQ to mask while handling */
-	int iq_levels;			/* IPL_*'s this IRQ has */
-	int iq_ist;			/* share type */
-};
-
 volatile int a1xsoftint_pending;
 
-struct intrq a1xintc_handler[NIRQ];
+struct intrsource a1xintc_handler[NIRQ];
 u_int32_t a1xintc_smask[NIPL];
 u_int32_t a1xintc_imask[NBANKS][NIPL];