From 745e7b5ac2df80b6c5dd4c07d8dd405b489189d2 Mon Sep 17 00:00:00 2001
From: maralvira <maralvira>
Date: Sun, 7 Nov 2010 14:21:59 +0000
Subject: [PATCH] Add cal_isr() support

---
 cpu/mc1322x/lib/include/isr.h | 4 +++-
 cpu/mc1322x/src/isr.c         | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cpu/mc1322x/lib/include/isr.h b/cpu/mc1322x/lib/include/isr.h
index 8e6039373..df08e1039 100644
--- a/cpu/mc1322x/lib/include/isr.h
+++ b/cpu/mc1322x/lib/include/isr.h
@@ -30,7 +30,7 @@
  * This file is part of libmc1322x: see http://mc1322x.devl.org
  * for details. 
  *
- * $Id: isr.h,v 1.1 2010/06/10 14:55:39 maralvira Exp $
+ * $Id: isr.h,v 1.2 2010/11/07 14:21:59 maralvira Exp $
  */
 
 #ifndef ISR_H
@@ -87,6 +87,8 @@ extern void kbi5_isr(void) __attribute__((weak));
 extern void kbi6_isr(void) __attribute__((weak));
 extern void kbi7_isr(void) __attribute__((weak));
 
+extern void cal_isr(void) __attribute__((weak));
+
 extern void uart1_isr(void) __attribute__((weak));
 
 extern void maca_isr(void) __attribute__((weak));
diff --git a/cpu/mc1322x/src/isr.c b/cpu/mc1322x/src/isr.c
index 6f2f1eba4..70b5509c6 100644
--- a/cpu/mc1322x/src/isr.c
+++ b/cpu/mc1322x/src/isr.c
@@ -30,7 +30,7 @@
  * This file is part of libmc1322x: see http://mc1322x.devl.org
  * for details. 
  *
- * $Id: isr.c,v 1.1 2010/06/10 14:49:31 maralvira Exp $
+ * $Id: isr.c,v 1.2 2010/11/07 14:21:59 maralvira Exp $
  */
 
 #include <mc1322x.h>
@@ -66,6 +66,12 @@ void irq(void)
 			if(kbi_evnt(5) && (kbi5_isr != 0)) { kbi5_isr(); }
 			if(kbi_evnt(6) && (kbi6_isr != 0)) { kbi6_isr(); }
 			if(kbi_evnt(7) && (kbi7_isr != 0)) { kbi7_isr(); }
+
+			if (CRM.STATUSbits.CAL_DONE && CRM.CAL_CNTLbits.CAL_IEN && cal_isr)
+			{
+				CRM.STATUSbits.CAL_DONE = 0;
+				cal_isr();
+			}
 		}
 
 		*INTFRC = 0; /* stop forcing interrupts */