From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 17 Mar 2010 11:53:10 +0000 (+0000)
Subject: AVR: fix redeclaration of ISR_PROTO() macro.
X-Git-Tag: 2.4.0~41
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=ea1d7ca0efe2315a0785aee1acb51ae79480b87e;p=bertos.git

AVR: fix redeclaration of ISR_PROTO() macro.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3223 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index 83b04964..4e61f20a 100644
--- a/bertos/cpu/irq.h
+++ b/bertos/cpu/irq.h
@@ -336,12 +336,6 @@
 			}						\
 			INLINE void __isr_##vect(void)
 
-		/**
-		 * Interrupt service routine prototype: can be used for
-		 * forward declarations.
-		 */
-		#define ISR_PROTO(vect)	ISR(vect)
-
 		/**
 		 * With task priorities enabled each ISR is used a point to
 		 * check if we need to perform a context switch.
@@ -355,14 +349,17 @@
 		#if CONFIG_KERN_PRI
 			#define DECLARE_ISR(func) \
 				DECLARE_ISR_CONTEXT_SWITCH(func)
-
+			/**
+			 * Interrupt service routine prototype: can be used for
+			 * forward declarations.
+			 */
 			#define ISR_PROTO(func) \
 				ISR_PROTO_CONTEXT_SWITCH(func)
 		#endif /* !CONFIG_KERN_PRI */
 	#endif
 
-	#ifndef DECLARE_ISR
-		#define ISR_PROTO(vect) ISR(vect)
+	#ifndef ISR_PROTO
+		#define ISR_PROTO(vect)	ISR(vect)
 	#endif
 	#ifndef DECLARE_ISR
 		#define DECLARE_ISR(vect) ISR(vect)
@@ -370,9 +367,6 @@
 	#ifndef DECLARE_ISR_CONTEXT_SWITCH
 		#define DECLARE_ISR_CONTEXT_SWITCH(vect) ISR(vect)
 	#endif
-	#ifndef ISR_PROTO
-		#define ISR_PROTO(func) ISR(vect)
-	#endif
 	#ifndef ISR_PROTO_CONTEXT_SWITCH
 		#define ISR_PROTO_CONTEXT_SWITCH(func) ISR(vect)
 	#endif