X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=43628acab6c616f1e746b9b55c907a24e898bad1;hb=183859226be37f23232f080b9e7457113a0faeb7;hp=7b57ae70fa65b45a16dd1bb19f83200f5e83e8dc;hpb=c37e6a3f6900ec803c2608fb387054247bab88aa;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 7b57ae70..43628aca 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -205,6 +205,14 @@
 		#define CPU_CM3_LM3S8962    0
 	#endif
 
+	#if defined (__ARM_STM32F101C4__)
+		#define CPU_CM3_STM32       1
+		#define CPU_CM3_STM32F101C4 1
+		#define CPU_NAME            "STM32F101C4"
+	#else
+		#define CPU_CM3_STM32F101C4 0
+	#endif
+
 	#if defined (__ARM_STM32F103RB__)
 		#define CPU_CM3_STM32       1
 		#define CPU_CM3_STM32F103RB 1
@@ -213,6 +221,15 @@
 		#define CPU_CM3_STM32F103RB 0
 	#endif
 
+	#if defined (__ARM_STM32F103RE__)
+		#define CPU_CM3_STM32       1
+		#define CPU_CM3_STM32F103RE 1
+		#define CPU_NAME            "STM32F103RE"
+	#else
+		#define CPU_CM3_STM32F103RE 0
+	#endif
+
+
 	#if defined (__ARM_SAM3N4__)
 		#define CPU_CM3_SAM3    1
 		#define CPU_CM3_SAM3N   1
@@ -223,6 +240,7 @@
 		#define CPU_CM3_SAM3U   0
 		#define CPU_CM3_SAM3N2  0
 		#define CPU_CM3_SAM3N1  0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3N4  0
 	#endif
@@ -235,6 +253,7 @@
 
 		#define CPU_CM3_SAM3N   0
 		#define CPU_CM3_SAM3U   0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3S4  0
 	#endif
@@ -247,10 +266,24 @@
 
 		#define CPU_CM3_SAM3N   0
 		#define CPU_CM3_SAM3S   0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3U4  0
 	#endif
 
+	#if defined (__ARM_SAM3X8__)
+		#define CPU_CM3_SAM3    1
+		#define CPU_CM3_SAM3X   1
+		#define CPU_CM3_SAM3X8  1
+		#define CPU_NAME        "SAM3X8"
+
+		#define CPU_CM3_SAM3N   0
+		#define CPU_CM3_SAM3S   0
+		#define CPU_CM3_SAM3U   0
+	#else
+		#define CPU_CM3_SAM3X8  0
+	#endif
+
 	#if defined (CPU_CM3_LM3S)
 		#if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
 			#error Luminary Cortex-M3 CPU configuration error
@@ -258,16 +291,16 @@
 		#define CPU_CM3_STM32       0
 		#define CPU_CM3_SAM3        0
 	#elif defined (CPU_CM3_STM32)
-		#if CPU_CM3_STM32F103RB + 0 != 1
+		#if CPU_CM3_STM32F101C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE + 0 != 1
 			#error STM32 Cortex-M3 CPU configuration error
 		#endif
 		#define CPU_CM3_LM3S        0
 		#define CPU_CM3_SAM3        0
 	#elif defined (CPU_CM3_SAM3)
-		#if CPU_CM3_SAM3N + 0 != 1
+		#if CPU_CM3_SAM3N + CPU_CM3_SAM3U + CPU_CM3_SAM3S + CPU_CM3_SAM3X + 0 != 1
 			#error SAM3 Cortex-M3 CPU configuration error
 		#endif
-		#if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + 0 != 1
+		#if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + CPU_CM3_SAM3X8 + 0 != 1
 			#error SAM3 Cortex-M3 CPU configuration error
 		#endif
 		#define CPU_CM3_LM3S        0
@@ -292,10 +325,14 @@
 
 	#define CPU_CM3_STM32 0
 	#define CPU_CM3_STM32F103RB 0
+	#define CPU_CM3_STM32F101C4 0
+        #define CPU_CM3_STM32F103RE 0
 
 	#define CPU_CM3_SAM3 0
 	#define CPU_CM3_SAM3N 0
 	#define CPU_CM3_SAM3N4 0
+	#define CPU_CM3_SAM3X 0
+	#define CPU_CM3_SAM3X8 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@ -423,9 +460,16 @@
 		#define CPU_AVR_ATMEGA1280  0
 	#endif
 
+	#if defined(__AVR_ATmega2560__)
+		#define CPU_AVR_ATMEGA2560  1
+		#define CPU_NAME            "ATmega2560"
+	#else
+		#define CPU_AVR_ATMEGA2560  0
+	#endif
+
 	#if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
 	  + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 \
-	  + CPU_AVR_ATMEGA1280 != 1
+	  + CPU_AVR_ATMEGA1280 + CPU_AVR_ATMEGA2560 != 1
 		#error AVR CPU configuration error
 	#endif
 #else
@@ -439,6 +483,7 @@
 	#define CPU_AVR_ATMEGA128       0
 	#define CPU_AVR_ATMEGA1281      0
 	#define CPU_AVR_ATMEGA1280      0
+	#define CPU_AVR_ATMEGA2560      0
 #endif
 
 #if defined (__MSP430__)