Module Name: src
Committed By: christos
Date: Sat Jun 5 21:38:37 UTC 2021
Modified Files:
src/sys/arch/playstation2/ee: timer.c
src/sys/arch/playstation2/playstation2: interrupt.c
Log Message:
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...
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/playstation2/ee/timer.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/playstation2/playstation2/interrupt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/playstation2/ee/timer.c
diff -u src/sys/arch/playstation2/ee/timer.c:1.8 src/sys/arch/playstation2/ee/timer.c:1.9
--- src/sys/arch/playstation2/ee/timer.c:1.8 Mon Mar 31 07:25:49 2014
+++ src/sys/arch/playstation2/ee/timer.c Sat Jun 5 17:38:37 2021
@@ -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 @@ timer1_intr(void *arg)
_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 @@ timer2_intr(void *arg)
_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);
}
Index: src/sys/arch/playstation2/playstation2/interrupt.c
diff -u src/sys/arch/playstation2/playstation2/interrupt.c:1.16 src/sys/arch/playstation2/playstation2/interrupt.c:1.17
--- src/sys/arch/playstation2/playstation2/interrupt.c:1.16 Thu Feb 8 04:05:18 2018
+++ src/sys/arch/playstation2/playstation2/interrupt.c Sat Jun 5 17:38:37 2021
@@ -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 @@ interrupt_init(void)
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);
