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

Remove a useless bit of indirection. On all Atmel ARM products, irq 1

Browse Source 
is the system IRQ, so use the define for it and get on with life.
This commit is contained in:
Warner Losh 2012-07-10 15:02:29 +00:00
parent 72ee489703
commit d67febb24f
6 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/at91/at91.c
View File

@ -365,7 +365,7 @@ at91_setup_intr(device_t dev, device_t child,
struct at91_softc *sc = device_get_softc(dev); struct at91_softc *sc = device_get_softc(dev);
int error; int error;
if (rman_get_start(ires) == sc->sc_irq_system && filt == NULL) if (rman_get_start(ires) == AT91_IRQ_SYSTEM && filt == NULL)
panic("All system interrupt ISRs must be FILTER"); panic("All system interrupt ISRs must be FILTER");
error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
filt, intr, arg, cookiep); filt, intr, arg, cookiep);

1
sys/arm/at91/at91rm9200.c
View File

@ -204,7 +204,6 @@ at91_attach(device_t dev)
/* XXX Hack to tell atmelarm about the AIC */ /* XXX Hack to tell atmelarm about the AIC */
at91sc->sc_aic_sh = sc->sc_aic_sh; at91sc->sc_aic_sh = sc->sc_aic_sh;
at91sc->sc_irq_system = AT91_IRQ_SYSTEM;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +

1
sys/arm/at91/at91sam9260.c
View File

@ -204,7 +204,6 @@ at91_attach(device_t dev)
/* XXX Hack to tell atmelarm about the AIC */ /* XXX Hack to tell atmelarm about the AIC */
at91sc->sc_aic_sh = sc->sc_aic_sh; at91sc->sc_aic_sh = sc->sc_aic_sh;
at91sc->sc_irq_system = AT91_IRQ_SYSTEM;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +

1
sys/arm/at91/at91sam9g20.c
View File

@ -215,7 +215,6 @@ at91_attach(device_t dev)
/* XXX Hack to tell atmelarm about the AIC */ /* XXX Hack to tell atmelarm about the AIC */
at91sc->sc_aic_sh = sc->sc_aic_sh; at91sc->sc_aic_sh = sc->sc_aic_sh;
at91sc->sc_irq_system = AT91_IRQ_SYSTEM;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +

1
sys/arm/at91/at91sam9x25.c
View File

@ -218,7 +218,6 @@ at91_attach(device_t dev)
/* XXX Hack to tell atmelarm about the AIC */ /* XXX Hack to tell atmelarm about the AIC */
at91sc->sc_aic_sh = sc->sc_aic_sh; at91sc->sc_aic_sh = sc->sc_aic_sh;
at91sc->sc_irq_system = AT91_IRQ_SYSTEM;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +

1
sys/arm/at91/at91var.h
View File

@ -40,7 +40,6 @@ struct at91_softc {
bus_space_handle_t sc_aic_sh; bus_space_handle_t sc_aic_sh;
struct rman sc_irq_rman; struct rman sc_irq_rman;
struct rman sc_mem_rman; struct rman sc_mem_rman;
uint32_t sc_irq_system;
}; };
struct at91_ivar { struct at91_ivar {