Merge branch 'master' into Alternate_Raw32_Scheduler

remotes/origin_old/ugfx_release_2.6
inmarket 2015-07-08 13:22:58 +10:00
commit 93e5235124
2 changed files with 2 additions and 2 deletions

View File

@ -239,7 +239,7 @@ void gfxSleepMicroseconds(delaytime_t ms) {
#define STACK_DIR_UP FALSE
#define MASK1 0x00000011
#define MASK2 0x00000000
#define STACK_BASE 9
#define STACK_BASE 12
#else
#define AUTO_DETECT_MASK TRUE
#define STACK_DIR_UP stackdirup // TRUE if the stack grow up instead of down

View File

@ -449,7 +449,7 @@ void gfxSleepMicroseconds(delaytime_t ms) {
#define STACK_DIR_UP FALSE
#define MASK1 0x00000011
#define MASK2 0x00000000
#define STACK_BASE 9
#define STACK_BASE 12
#else
#define AUTO_DETECT_MASK TRUE
#define STACK_DIR_UP stackdirup // TRUE if the stack grow up instead of down