From 836cadcb13d3fec1a81b02ce3a5c1d6fa1b1bf8a Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 21 Jun 2013 16:55:41 +0000
Subject: [PATCH] [9x 2561] AUDIO fixes

---
 src/targets/stock/board_stock.cpp | 4 +++-
 src/targets/stock/board_stock.h   | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/targets/stock/board_stock.cpp b/src/targets/stock/board_stock.cpp
index 9d2100d99..b3a82dc86 100644
--- a/src/targets/stock/board_stock.cpp
+++ b/src/targets/stock/board_stock.cpp
@@ -122,7 +122,9 @@ inline void boardInit()
 
 #if defined(AUDIO) || defined(VOICE)
   SET_TIMER_AUDIO_CTRL();
-  #if !defined(CPUM2561)
+  #if defined(CPUM2561)
+    RESUME_AUDIO_INTERRUPT();
+  #else
     TIMSK |= (1<<OCIE0) | (1<<TOIE0) | (1<<TOIE2); // Enable Output-Compare and Overflow interrrupts
   #endif
 #elif defined(PWM_BACKLIGHT)
diff --git a/src/targets/stock/board_stock.h b/src/targets/stock/board_stock.h
index e13b52604..5e19f127e 100644
--- a/src/targets/stock/board_stock.h
+++ b/src/targets/stock/board_stock.h
@@ -76,10 +76,10 @@
   #define RESUME_10MS_INTERRUPT()  TIMSK2 |= (1<<OCIE2A)
   #define PAUSE_PPMIN_INTERRUPT()  TIMSK3 &= ~(1<<ICIE3)
   #define RESUME_PPMIN_INTERRUPT() TIMSK3 |= (1<<ICIE3)
-  #define TIMER_AUDIO_VECT         TIMER4_OVF_vect
-  #define SET_TIMER_AUDIO_CTRL()   TCCR4B = (0b111 << CS20)
-  #define PAUSE_AUDIO_INTERRUPT()  TIMSK4 &= ~(1<<TOIE4)
-  #define RESUME_AUDIO_INTERRUPT() TIMSK4 |= (1<<TOIE4)
+  #define TIMER_AUDIO_VECT         TIMER4_COMPA_vect
+  #define SET_TIMER_AUDIO_CTRL()   TCCR4B = (1 << WGM42) | (0b010 << CS40)
+  #define PAUSE_AUDIO_INTERRUPT()  TIMSK4 &= ~(1<<OCIE4A)
+  #define RESUME_AUDIO_INTERRUPT() TIMSK4 |= (1<<OCIE4A)
 #else
   #define TIMER_16KHZ_VECT         TIMER0_OVF_vect
   #define COUNTER_16KHZ            TCNT0