diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugin.h | 8 | ||||
-rw-r--r-- | apps/plugins/alpine_cdc.c | 6 | ||||
-rw-r--r-- | apps/plugins/doom/i_system.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/grey_core.c | 5 | ||||
-rw-r--r-- | apps/plugins/metronome.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_scanrate.c | 2 | ||||
-rw-r--r-- | apps/plugins/video.c | 8 |
7 files changed, 17 insertions, 16 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index 2a5b6829c0..160eb2b1e7 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -128,12 +128,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
128 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 128 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
129 | 129 | ||
130 | /* increase this every time the api struct changes */ | 130 | /* increase this every time the api struct changes */ |
131 | #define PLUGIN_API_VERSION 156 | 131 | #define PLUGIN_API_VERSION 157 |
132 | 132 | ||
133 | /* update this to latest version if a change to the api struct breaks | 133 | /* update this to latest version if a change to the api struct breaks |
134 | backwards compatibility (and please take the opportunity to sort in any | 134 | backwards compatibility (and please take the opportunity to sort in any |
135 | new function which are "waiting" at the end of the function table) */ | 135 | new function which are "waiting" at the end of the function table) */ |
136 | #define PLUGIN_MIN_API_VERSION 156 | 136 | #define PLUGIN_MIN_API_VERSION 157 |
137 | 137 | ||
138 | /* plugin return codes */ | 138 | /* plugin return codes */ |
139 | enum plugin_status { | 139 | enum plugin_status { |
@@ -461,8 +461,8 @@ struct plugin_api { | |||
461 | void (*cpucache_invalidate)(void); | 461 | void (*cpucache_invalidate)(void); |
462 | #endif | 462 | #endif |
463 | bool (*timer_register)(int reg_prio, void (*unregister_callback)(void), | 463 | bool (*timer_register)(int reg_prio, void (*unregister_callback)(void), |
464 | long cycles, int int_prio, | 464 | long cycles, void (*timer_callback)(void) |
465 | void (*timer_callback)(void) IF_COP(, int core)); | 465 | IF_COP(, int core)); |
466 | void (*timer_unregister)(void); | 466 | void (*timer_unregister)(void); |
467 | bool (*timer_set_period)(long count); | 467 | bool (*timer_set_period)(long count); |
468 | 468 | ||
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index 494fa17842..73bc49ff00 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -231,11 +231,13 @@ void timer_set_mode(int mode) | |||
231 | 231 | ||
232 | if (mode == TM_RX_TIMEOUT) | 232 | if (mode == TM_RX_TIMEOUT) |
233 | { | 233 | { |
234 | rb->timer_register(1, NULL, gTimer.timeout, 11, timer4_isr IF_COP(, CPU)); | 234 | rb->timer_register(1, NULL, gTimer.timeout, timer4_isr IF_COP(, CPU)); |
235 | IPRD = (IPRD & 0xFF0F) | 11 << 4; /* interrupt priority */ | ||
235 | } | 236 | } |
236 | else if (mode == TM_TRANSMIT) | 237 | else if (mode == TM_TRANSMIT) |
237 | { | 238 | { |
238 | rb->timer_register(1, NULL, gTimer.transmit, 14, timer4_isr IF_COP(, CPU)); | 239 | rb->timer_register(1, NULL, gTimer.transmit, timer4_isr IF_COP(, CPU)); |
240 | IPRD = (IPRD & 0xFF0F) | 14 << 4; /* interrupt priority */ | ||
239 | } | 241 | } |
240 | else | 242 | else |
241 | { | 243 | { |
diff --git a/apps/plugins/doom/i_system.c b/apps/plugins/doom/i_system.c index 09a61808fd..601ffc3b27 100644 --- a/apps/plugins/doom/i_system.c +++ b/apps/plugins/doom/i_system.c | |||
@@ -109,7 +109,7 @@ int I_GetTime (void) | |||
109 | void I_Init (void) | 109 | void I_Init (void) |
110 | { | 110 | { |
111 | #if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR) && !defined(RB_PROFILE) | 111 | #if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR) && !defined(RB_PROFILE) |
112 | rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime IF_COP(, CPU)); | 112 | rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, doomtime IF_COP(, CPU)); |
113 | #endif | 113 | #endif |
114 | I_InitSound(); | 114 | I_InitSound(); |
115 | } | 115 | } |
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index ea70ae942b..6fa422be05 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -648,11 +648,10 @@ void grey_show(bool enable) | |||
648 | #endif | 648 | #endif |
649 | #if NUM_CORES > 1 | 649 | #if NUM_CORES > 1 |
650 | rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, | 650 | rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, |
651 | 1, _timer_isr, | 651 | _timer_isr, |
652 | (_grey_info.flags & GREY_ON_COP) ? COP : CPU); | 652 | (_grey_info.flags & GREY_ON_COP) ? COP : CPU); |
653 | #else | 653 | #else |
654 | rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, 1, | 654 | rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, _timer_isr); |
655 | _timer_isr); | ||
656 | #endif | 655 | #endif |
657 | #endif /* !SIMULATOR */ | 656 | #endif /* !SIMULATOR */ |
658 | rb->screen_dump_set_hook(grey_screendump_hook); | 657 | rb->screen_dump_set_hook(grey_screendump_hook); |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index 8906c923a0..10b9e41738 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -910,7 +910,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
910 | #endif /* CONFIG_CODEC != SWCODEC */ | 910 | #endif /* CONFIG_CODEC != SWCODEC */ |
911 | 911 | ||
912 | calc_period(); | 912 | calc_period(); |
913 | rb->timer_register(1, NULL, TIMER_FREQ/1024, 1, timer_callback IF_COP(, CPU)); | 913 | rb->timer_register(1, NULL, TIMER_FREQ/1024, timer_callback IF_COP(, CPU)); |
914 | 914 | ||
915 | draw_display(); | 915 | draw_display(); |
916 | 916 | ||
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 7a0a13bc94..7746916386 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -162,7 +162,7 @@ int plugin_main(void) | |||
162 | rb->cpu_boost(true); | 162 | rb->cpu_boost(true); |
163 | #endif | 163 | #endif |
164 | /* The actual frequency is twice the displayed value */ | 164 | /* The actual frequency is twice the displayed value */ |
165 | rb->timer_register(1, NULL, TIMER_FREQ * 5 / scan_rate, 1, | 165 | rb->timer_register(1, NULL, TIMER_FREQ * 5 / scan_rate, |
166 | timer_isr IF_COP(, CPU)); | 166 | timer_isr IF_COP(, CPU)); |
167 | 167 | ||
168 | while (!done) | 168 | while (!done) |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index bcbbb99d80..bd8a95eb71 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -562,10 +562,10 @@ int SeekTo(int fd, int nPos) | |||
562 | gPlay.bVideoUnderrun = false; | 562 | gPlay.bVideoUnderrun = false; |
563 | /* start display interrupt */ | 563 | /* start display interrupt */ |
564 | #if FREQ == 12000000 /* Ondio speed kludge */ | 564 | #if FREQ == 12000000 /* Ondio speed kludge */ |
565 | rb->timer_register(1, NULL, gPlay.nFrameTimeAdjusted, 1, | 565 | rb->timer_register(1, NULL, gPlay.nFrameTimeAdjusted, |
566 | timer4_isr IF_COP(, CPU)); | 566 | timer4_isr IF_COP(, CPU)); |
567 | #else | 567 | #else |
568 | rb->timer_register(1, NULL, gFileHdr.video_frametime, 1, | 568 | rb->timer_register(1, NULL, gFileHdr.video_frametime, |
569 | timer4_isr IF_COP(, CPU)); | 569 | timer4_isr IF_COP(, CPU)); |
570 | #endif | 570 | #endif |
571 | } | 571 | } |
@@ -748,10 +748,10 @@ int PlayTick(int fd) | |||
748 | { /* start the video */ | 748 | { /* start the video */ |
749 | #if FREQ == 12000000 /* Ondio speed kludge */ | 749 | #if FREQ == 12000000 /* Ondio speed kludge */ |
750 | rb->timer_register(1, NULL, | 750 | rb->timer_register(1, NULL, |
751 | gPlay.nFrameTimeAdjusted, 1, timer4_isr); | 751 | gPlay.nFrameTimeAdjusted, timer4_isr); |
752 | #else | 752 | #else |
753 | rb->timer_register(1, NULL, | 753 | rb->timer_register(1, NULL, |
754 | gFileHdr.video_frametime, 1, timer4_isr); | 754 | gFileHdr.video_frametime, timer4_isr); |
755 | #endif | 755 | #endif |
756 | } | 756 | } |
757 | } | 757 | } |