diff options
Diffstat (limited to 'apps/plugins/xworld/sys.c')
-rw-r--r-- | apps/plugins/xworld/sys.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c index b13d4fb9ed..eac47e66f0 100644 --- a/apps/plugins/xworld/sys.c +++ b/apps/plugins/xworld/sys.c | |||
@@ -117,6 +117,7 @@ void exit_handler(void) | |||
117 | { | 117 | { |
118 | sys_save_settings(save_sys); | 118 | sys_save_settings(save_sys); |
119 | sys_stopAudio(save_sys); | 119 | sys_stopAudio(save_sys); |
120 | rb->timer_unregister(); | ||
120 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 121 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
121 | rb->cpu_boost(false); | 122 | rb->cpu_boost(false); |
122 | #endif | 123 | #endif |
@@ -1114,7 +1115,8 @@ void *sys_get_buffer(struct System* sys, size_t sz) | |||
1114 | { | 1115 | { |
1115 | void* ret = sys->membuf; | 1116 | void* ret = sys->membuf; |
1116 | rb->memset(ret, 0, sz); | 1117 | rb->memset(ret, 0, sz); |
1117 | sys->membuf += sz; | 1118 | sys->membuf = (char*)(sys->membuf) + sz; |
1119 | sys->bytes_left -= sz; | ||
1118 | return ret; | 1120 | return ret; |
1119 | } | 1121 | } |
1120 | else | 1122 | else |
@@ -1128,11 +1130,12 @@ void MutexStack(struct MutexStack_t* s, struct System *stub, void *mutex) | |||
1128 | { | 1130 | { |
1129 | s->sys = stub; | 1131 | s->sys = stub; |
1130 | s->_mutex = mutex; | 1132 | s->_mutex = mutex; |
1131 | sys_lockMutex(s->sys, s->_mutex); | 1133 | /* FW 2017-2-12: disabled; no blocking ops in IRQ context! */ |
1134 | /*sys_lockMutex(s->sys, s->_mutex);*/ | ||
1132 | } | 1135 | } |
1133 | 1136 | ||
1134 | void MutexStack_destroy(struct MutexStack_t* s) | 1137 | void MutexStack_destroy(struct MutexStack_t* s) |
1135 | { | 1138 | { |
1136 | sys_unlockMutex(s->sys, s->_mutex); | 1139 | (void) s; |
1137 | 1140 | /*sys_unlockMutex(s->sys, s->_mutex);*/ | |
1138 | } | 1141 | } |