diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-07-08 13:22:58 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-07-08 13:22:58 +1000 |
| commit | 93e523512479e6dc5f60fb0fb9bcf63696acd49a (patch) | |
| tree | d25cda16a454f9522025734c4bb8d55869eefeff /src/gos | |
| parent | f2ee56661c6dbdb3b797d8f3df43137bdd20ec39 (diff) | |
| parent | 0d54fae73192c23af3657fea756c91ea84008804 (diff) | |
| download | uGFX-93e523512479e6dc5f60fb0fb9bcf63696acd49a.tar.gz uGFX-93e523512479e6dc5f60fb0fb9bcf63696acd49a.tar.bz2 uGFX-93e523512479e6dc5f60fb0fb9bcf63696acd49a.zip | |
Merge branch 'master' into Alternate_Raw32_Scheduler
Diffstat (limited to 'src/gos')
| -rw-r--r-- | src/gos/gos_arduino.c | 2 | ||||
| -rw-r--r-- | src/gos/gos_raw32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gos/gos_arduino.c b/src/gos/gos_arduino.c index 4c01695a..0c01a30c 100644 --- a/src/gos/gos_arduino.c +++ b/src/gos/gos_arduino.c @@ -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 diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c index 1a2ba22b..529dcf79 100644 --- a/src/gos/gos_raw32.c +++ b/src/gos/gos_raw32.c @@ -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 |