X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=f37d952574038199116e9de25d6051051e1a0367;hb=802cec6861e5f1988f23085b2a6849d86368628c;hp=91ad6be2b441853e6cc9e8bb2c8a058ac3c90107;hpb=b81452356d9c25c75b420ba611979d60b4e3ecfa;p=bertos.git diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h index 91ad6be2..f37d9525 100644 --- a/bertos/cpu/detect.h +++ b/bertos/cpu/detect.h @@ -94,12 +94,17 @@ #endif /* #elif Add other ARM families here */ + #elif defined (__ARM_LM3S1968__) + #define CPU_ARM_LM3S 1 + #define CPU_ARM_LM3S1968 1 + + #else #define CPU_ARM_AT91 0 #endif - #if CPU_ARM_AT91 + 0 /* Add other ARM families here */ != 1 + #if CPU_ARM_AT91 + CPU_ARM_LM3S + 0 /* Add other ARM families here */ != 1 #error ARM CPU configuration error #endif #else @@ -174,6 +179,12 @@ #define CPU_AVR 1 #define CPU_ID avr + #if defined(__AVR_ATmega32__) + #define CPU_AVR_ATMEGA32 1 + #else + #define CPU_AVR_ATMEGA32 0 + #endif + #if defined(__AVR_ATmega64__) #define CPU_AVR_ATMEGA64 1 #else @@ -210,7 +221,7 @@ #define CPU_AVR_ATMEGA1281 0 #endif - #if CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \ + #if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \ + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA1281 != 1 #error AVR CPU configuration error #endif @@ -218,6 +229,7 @@ #define CPU_AVR 0 #define CPU_AVR_ATMEGA8 0 #define CPU_AVR_ATMEGA168 0 + #define CPU_AVR_ATMEGA32 0 #define CPU_AVR_ATMEGA64 0 #define CPU_AVR_ATMEGA103 0 #define CPU_AVR_ATMEGA128 0