Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/playstation2 Make this compile again; there is no S...
details: https://anonhg.NetBSD.org/src/rev/969535605ea9
branches: trunk
changeset: 983780:969535605ea9
user: christos <christos%NetBSD.org@localhost>
date: Sat Jun 05 21:38:37 2021 +0000
description:
Make this compile again; there is no SPL_SOFT, so use SPL_SOFTBIO. This
does not matter since we don't do __HAVE_FAST_SOFTINTS...
diffstat:
sys/arch/playstation2/ee/timer.c | 8 ++++----
sys/arch/playstation2/playstation2/interrupt.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diffs (65 lines):
diff -r 31a58ede1ace -r 969535605ea9 sys/arch/playstation2/ee/timer.c
--- a/sys/arch/playstation2/ee/timer.c Sat Jun 05 21:24:16 2021 +0000
+++ b/sys/arch/playstation2/ee/timer.c Sat Jun 05 21:38:37 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.8 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: timer.c,v 1.9 2021/06/05 21:38:37 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.8 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.9 2021/06/05 21:38:37 christos Exp $");
#include "debug_playstation2.h"
@@ -116,7 +116,7 @@
_reg_write_4(T1_MODE_REG, T_MODE_EQUF | T_MODE_OVFF);
#ifdef __HAVE_FAST_SOFTINTS
- softintr_dispatch(0); /* IPL_SOFT */
+ softintr_dispatch(0); /* IPL_SOFTCLOCK */
#endif
return (1);
@@ -129,7 +129,7 @@
_reg_write_4(T2_MODE_REG, T_MODE_EQUF | T_MODE_OVFF);
#ifdef __HAVE_FAST_SOFTINTS
- softintr_dispatch(1); /* IPL_SOFTCLOCK */
+ softintr_dispatch(1); /* IPL_SOFTBIO */
#endif
return (1);
}
diff -r 31a58ede1ace -r 969535605ea9 sys/arch/playstation2/playstation2/interrupt.c
--- a/sys/arch/playstation2/playstation2/interrupt.c Sat Jun 05 21:24:16 2021 +0000
+++ b/sys/arch/playstation2/playstation2/interrupt.c Sat Jun 05 21:38:37 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.16 2018/02/08 09:05:18 dholland Exp $ */
+/* $NetBSD: interrupt.c,v 1.17 2021/06/05 21:38:37 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.16 2018/02/08 09:05:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.17 2021/06/05 21:38:37 christos Exp $");
#include "debug_playstation2.h"
#if defined INTR_DEBUG && !defined GSFB_DEBUG_MONITOR
@@ -105,8 +105,8 @@
evcnt_attach_static(&_playstation2_evcnt.dmac);
/* install software interrupt handler */
- intc_intr_establish(I_CH10_TIMER1, IPL_SOFT, timer1_intr, 0);
- intc_intr_establish(I_CH11_TIMER2, IPL_SOFTCLOCK, timer2_intr, 0);
+ intc_intr_establish(I_CH10_TIMER1, IPL_SOFTCLOCK, timer1_intr, 0);
+ intc_intr_establish(I_CH11_TIMER2, IPL_SOFTBIO, timer2_intr, 0);
/* IPL_SOFTNET and IPL_SOFTSERIAL are shared interrupt. */
intc_intr_establish(I_CH12_TIMER3, IPL_SOFTNET, timer3_intr, 0);
Home |
Main Index |
Thread Index |
Old Index