summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/include/intr.h6
-rw-r--r--sys/arch/sgi/localbus/imc.c6
-rw-r--r--sys/arch/sgi/localbus/int.c10
-rw-r--r--sys/arch/sgi/localbus/macebus.c8
-rw-r--r--sys/arch/sgi/localbus/tcc.c6
-rw-r--r--sys/arch/sgi/sgi/intr_template.c4
-rw-r--r--sys/arch/sgi/sgi/ip27_machdep.c10
-rw-r--r--sys/arch/sgi/sgi/ip30_machdep.c18
-rw-r--r--sys/arch/sgi/sgi/machdep.c8
-rw-r--r--sys/arch/sgi/xbow/xheart.c6
10 files changed, 41 insertions, 41 deletions
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 8f88c358f6c..3834bfa0d28 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.46 2015/12/25 09:22:00 visa Exp $ */
+/* $OpenBSD: intr.h,v 1.47 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -183,8 +183,8 @@ void intr_barrier(void *);
extern uint32_t idle_mask;
-struct trap_frame;
-void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trap_frame *));
+struct trapframe;
+void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trapframe *));
uint32_t updateimask(uint32_t);
void dosoftint(void);
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;
diff --git a/sys/arch/sgi/sgi/intr_template.c b/sys/arch/sgi/sgi/intr_template.c
index 3091fdab2b0..ed0fdfc6517 100644
--- a/sys/arch/sgi/sgi/intr_template.c
+++ b/sys/arch/sgi/sgi/intr_template.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr_template.c,v 1.16 2015/12/25 09:22:00 visa Exp $ */
+/* $OpenBSD: intr_template.c,v 1.17 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2009 Miodrag Vallat.
@@ -97,7 +97,7 @@ MASK_FUNCTIONNAME()
* Interrupt dispatcher.
*/
uint32_t
-INTR_FUNCTIONNAME(uint32_t hwpend, struct trap_frame *frame)
+INTR_FUNCTIONNAME(uint32_t hwpend, struct trapframe *frame)
{
struct cpu_info *ci = curcpu();
uint64_t imr, isr, mask;
diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c
index 7d12e12970a..733d6e57159 100644
--- a/sys/arch/sgi/sgi/ip27_machdep.c
+++ b/sys/arch/sgi/sgi/ip27_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip27_machdep.c,v 1.72 2016/02/27 13:08:07 mpi Exp $ */
+/* $OpenBSD: ip27_machdep.c,v 1.73 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -81,8 +81,8 @@ int ip27_hub_intr_establish(int (*)(void *), void *, int, int,
void ip27_hub_intr_disestablish(int);
void ip27_hub_intr_clear(int);
void ip27_hub_intr_set(int);
-uint32_t hubpi_intr0(uint32_t, struct trap_frame *);
-uint32_t hubpi_intr1(uint32_t, struct trap_frame *);
+uint32_t hubpi_intr0(uint32_t, struct trapframe *);
+uint32_t hubpi_intr1(uint32_t, struct trapframe *);
void ip27_hub_intr_makemasks0(void);
void ip27_hub_intr_makemasks1(void);
void ip27_hub_setintrmask(int);
@@ -1018,8 +1018,8 @@ ip27_nmi(void *arg)
{
vaddr_t regs_offs;
register_t *regs, epc;
- struct trap_frame nmi_frame;
- extern int db_ktrap(int, struct trap_frame *);
+ struct trapframe nmi_frame;
+ extern int db_ktrap(int, struct trapframe *);
/*
* Build a ddb frame from the registers saved in the NMI KREGS
diff --git a/sys/arch/sgi/sgi/ip30_machdep.c b/sys/arch/sgi/sgi/ip30_machdep.c
index cb77373213a..17be960e0dc 100644
--- a/sys/arch/sgi/sgi/ip30_machdep.c
+++ b/sys/arch/sgi/sgi/ip30_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip30_machdep.c,v 1.64 2016/02/27 13:08:07 mpi Exp $ */
+/* $OpenBSD: ip30_machdep.c,v 1.65 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -62,7 +62,7 @@ extern void xheart_setintrmask(int);
extern struct user *proc0paddr;
#endif
-uint32_t ip30_lights_frob(uint32_t, struct trap_frame *);
+uint32_t ip30_lights_frob(uint32_t, struct trapframe *);
paddr_t ip30_widget_short(int16_t, u_int);
paddr_t ip30_widget_long(int16_t, u_int);
paddr_t ip30_widget_map(int16_t, u_int, bus_addr_t *, bus_size_t *);
@@ -386,7 +386,7 @@ ip30_find_video()
* Fun with the lightbar
*/
uint32_t
-ip30_lights_frob(uint32_t hwpend, struct trap_frame *cf)
+ip30_lights_frob(uint32_t hwpend, struct trapframe *cf)
{
uint32_t gpioold, gpio;
@@ -436,12 +436,12 @@ ip30_get_ncpusfound(void)
void
ip30_nmi_handler()
{
- extern int db_ktrap(int, struct trap_frame *);
- extern void stacktrace(struct trap_frame *);
- struct trap_frame *fr0;
+ extern int db_ktrap(int, struct trapframe *);
+ extern void stacktrace(struct trapframe *);
+ struct trapframe *fr0;
int s;
#ifdef MULTIPROCESSOR
- struct trap_frame *fr1;
+ struct trapframe *fr1;
struct cpu_info *ci = curcpu();
#endif
@@ -458,10 +458,10 @@ ip30_nmi_handler()
printf("NMI\n");
- fr0 = (struct trap_frame *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x4000,
+ fr0 = (struct trapframe *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x4000,
CCA_CACHED);
#ifdef MULTIPROCESSOR
- fr1 = (struct trap_frame *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x6000,
+ fr1 = (struct trapframe *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x6000,
CCA_CACHED);
#endif
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index bd67676657f..069aaa1b755 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.150 2014/12/10 15:29:53 mikeb Exp $ */
+/* $OpenBSD: machdep.c,v 1.151 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -587,7 +587,7 @@ mips_init(int argc, void *argv, caddr_t boot_esym)
proc0.p_cpu = ci;
proc0.p_addr = proc0paddr = ci->ci_curprocpaddr =
(struct user *)pmap_steal_memory(USPACE, NULL, NULL);
- proc0.p_md.md_regs = (struct trap_frame *)&proc0paddr->u_pcb.pcb_regs;
+ proc0.p_md.md_regs = (struct trapframe *)&proc0paddr->u_pcb.pcb_regs;
tlb_set_pid(MIN_USER_ASID);
/*
@@ -1066,7 +1066,7 @@ printf("perfcnt error %d\n", cmd);
*/
void
rm7k_perfintr(trapframe)
- struct trap_frame *trapframe;
+ struct trapframe *trapframe;
{
struct proc *p = curproc;
@@ -1081,7 +1081,7 @@ rm7k_perfintr(trapframe)
int
rm7k_watchintr(trapframe)
- struct trap_frame *trapframe;
+ struct trapframe *trapframe;
{
return(0);
}
diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c
index 18c4c485736..cff9b445f2f 100644
--- a/sys/arch/sgi/xbow/xheart.c
+++ b/sys/arch/sgi/xbow/xheart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xheart.c,v 1.29 2015/09/26 04:37:18 visa Exp $ */
+/* $OpenBSD: xheart.c,v 1.30 2016/03/06 19:42:27 mpi Exp $ */
/*
* Copyright (c) 2008 Miodrag Vallat.
@@ -70,7 +70,7 @@ int xheart_intr_establish(int (*)(void *), void *, int, int, const char *,
void xheart_intr_disestablish(int);
void xheart_intr_clear(int);
void xheart_intr_set(int);
-uint32_t xheart_intr_handler(uint32_t, struct trap_frame *);
+uint32_t xheart_intr_handler(uint32_t, struct trapframe *);
void xheart_intr_makemasks(void);
void xheart_setintrmask(int);
void xheart_splx(int);
@@ -86,7 +86,7 @@ struct timecounter xheart_timecounter = {
.tc_quality = 100
};
-extern uint32_t ip30_lights_frob(uint32_t, struct trap_frame *);
+extern uint32_t ip30_lights_frob(uint32_t, struct trapframe *);
/*
* HEART interrupt handling declarations: 64 sources; 5 levels.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 03:35:39 +0000