- Fix issues with timer 2+.

emukidid · Jan 3, 2020 · f32ecd5 · f32ecd5
1 parent e1232b9
commit f32ecd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cube/patches/alt/emulator.c b/cube/patches/alt/emulator.c
@@ -228,6 +228,7 @@ void service_exception(OSException exception, OSContext *context, uint32_t dsisr
 				timer2_stop();
 				change_disc();
 			}
+			restore_timer_interrupts();
 			break;
 		}
 	}

diff --git a/cube/patches/alt/timer.h b/cube/patches/alt/timer.h
@@ -53,7 +53,7 @@ static inline void timer1_start(uint32_t ticks)
 	mmcr0.dms = false;
 	mmcr0.dmr = false;
 	mmcr0.enint = true;
-	mmcr0.discount = true;
+	mmcr0.discount = false;
 	mmcr0.rtcselect = 0;
 	mmcr0.intonbittrans = false;
 	mmcr0.threshold = 0;
@@ -98,7 +98,7 @@ static inline void timer2_start(uint32_t ticks)
 	mmcr0.dms = false;
 	mmcr0.dmr = false;
 	mmcr0.enint = true;
-	mmcr0.discount = true;
+	mmcr0.discount = false;
 	mmcr0.rtcselect = 0;
 	mmcr0.intonbittrans = false;
 	mmcr0.threshold = 0;
@@ -128,4 +128,12 @@ static inline void timer2_stop(void)
 	asm volatile("mtpmc2 %0" :: "r" (0));
 }
 
+static inline void restore_timer_interrupts(void)
+{
+	union mmcr0 mmcr0;
+	asm volatile("mfmmcr0 %0" : "=r" (mmcr0.val));
+	mmcr0.enint = mmcr0.pmc1select || mmcr0.pmc2select;
+	asm volatile("mtmmcr0 %0" :: "r" (mmcr0.val));
+}
+
 #endif /* TIMER_H */
-Original file line number
+Diff line change
@@ Expand Up @@
     				timer2_stop();
     				change_disc();
     			}
+    			restore_timer_interrupts();
     			break;
     		}
     	}
@@ Expand Down @@