diff options
Diffstat (limited to 'sys/arch/sgi/localbus')
| -rw-r--r-- | sys/arch/sgi/localbus/imc.c | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/int.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/tcc.c | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c index 99e9ad0db79..f4ed8688f4f 100644 --- a/sys/arch/sgi/localbus/imc.c +++ b/sys/arch/sgi/localbus/imc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imc.c,v 1.20 2015/09/24 18:37:50 miod Exp $ */ +/* $OpenBSD: imc.c,v 1.21 2016/03/06 19:42:27 mpi Exp $ */ /* $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */ /* @@ -86,7 +86,7 @@ struct cfdriver imc_cd = { NULL, "imc", DV_DULL }; -uint32_t imc_bus_error(uint32_t, struct trap_frame *); +uint32_t imc_bus_error(uint32_t, struct trapframe *); int imc_watchdog_cb(void *, int); void imc_space_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t, @@ -735,7 +735,7 @@ imc_bus_reset() } uint32_t -imc_bus_error(uint32_t hwpend, struct trap_frame *tf) +imc_bus_error(uint32_t hwpend, struct trapframe *tf) { uint32_t cpustat, giostat; paddr_t cpuaddr, gioaddr; diff --git a/sys/arch/sgi/localbus/int.c b/sys/arch/sgi/localbus/int.c index 4eba6335916..bad3c1291c4 100644 --- a/sys/arch/sgi/localbus/int.c +++ b/sys/arch/sgi/localbus/int.c @@ -1,4 +1,4 @@ -/* $OpenBSD: int.c,v 1.11 2014/09/30 06:51:58 jmatthew Exp $ */ +/* $OpenBSD: int.c,v 1.12 2016/03/06 19:42:27 mpi Exp $ */ /* $NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $ */ /* @@ -75,7 +75,7 @@ paddr_t int2_get_base(void); void int_8254_cal(void); void int_8254_startclock(struct cpu_info *); -uint32_t int_8254_intr0(uint32_t, struct trap_frame *); +uint32_t int_8254_intr0(uint32_t, struct trapframe *); /* * INT2 Interrupt handling declarations: 16 local sources on 2 levels. @@ -102,9 +102,9 @@ uint32_t int2_intem; uint8_t int2_l0imask[NIPLS], int2_l1imask[NIPLS]; void int2_splx(int); -uint32_t int2_l0intr(uint32_t, struct trap_frame *); +uint32_t int2_l0intr(uint32_t, struct trapframe *); void int2_l0makemasks(void); -uint32_t int2_l1intr(uint32_t, struct trap_frame *); +uint32_t int2_l1intr(uint32_t, struct trapframe *); void int2_l1makemasks(void); /* @@ -513,7 +513,7 @@ int_8254_cal(void) } uint32_t -int_8254_intr0(uint32_t hwpend, struct trap_frame *tf) +int_8254_intr0(uint32_t hwpend, struct trapframe *tf) { struct cpu_info *ci = curcpu(); diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 4081ca6956f..e6aa16c0754 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.63 2014/09/30 06:51:58 jmatthew Exp $ */ +/* $OpenBSD: macebus.c,v 1.64 2016/03/06 19:42:27 mpi Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -57,8 +57,8 @@ int macebussubmatch(struct device *, void *, void *); void macebus_intr_makemasks(void); void macebus_splx(int); -uint32_t macebus_iointr(uint32_t, struct trap_frame *); -uint32_t macebus_aux(uint32_t, struct trap_frame *); +uint32_t macebus_iointr(uint32_t, struct trapframe *); +uint32_t macebus_aux(uint32_t, struct trapframe *); int macebus_iointr_skip(struct intrhand *, uint64_t, uint64_t); void crime_setintrmask(int); @@ -633,7 +633,7 @@ macebus_iointr_skip(struct intrhand *ih, uint64_t mace_isr, uint64_t mace_imr) * Macebus auxilary functions run each clock interrupt. */ uint32_t -macebus_aux(uint32_t hwpend, struct trap_frame *cf) +macebus_aux(uint32_t hwpend, struct trapframe *cf) { u_int64_t mask; diff --git a/sys/arch/sgi/localbus/tcc.c b/sys/arch/sgi/localbus/tcc.c index 133f30c687d..490a90fc977 100644 --- a/sys/arch/sgi/localbus/tcc.c +++ b/sys/arch/sgi/localbus/tcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcc.c,v 1.9 2016/01/05 05:27:54 visa Exp $ */ +/* $OpenBSD: tcc.c,v 1.10 2016/03/06 19:42:27 mpi Exp $ */ /* * Copyright (c) 2012 Miodrag Vallat. @@ -50,7 +50,7 @@ struct cfdriver tcc_cd = { NULL, "tcc", DV_DULL }; -uint32_t tcc_bus_error(uint32_t, struct trap_frame *); +uint32_t tcc_bus_error(uint32_t, struct trapframe *); CACHE_PROTOS(tcc) @@ -99,7 +99,7 @@ tcc_bus_reset() } uint32_t -tcc_bus_error(uint32_t hwpend, struct trap_frame *tf) +tcc_bus_error(uint32_t hwpend, struct trapframe *tf) { uint64_t intr, error, addr, errack; unsigned int errtype; |