Remove int_prio argument from timer_register, and move the only use for it into alpine_cdc plugin, since this plugin is only built on SH7034

Also remove it from TIMER_START()

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21558 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 17 insertions, 16 deletions

diff --git a/apps/plugin.h b/apps/plugin.h
index 2a5b682..160eb2b 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -128,12 +128,12 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 156
+#define PLUGIN_API_VERSION 157
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 156
+#define PLUGIN_MIN_API_VERSION 157
 
 /* plugin return codes */
 enum plugin_status {
@@ -461,8 +461,8 @@ struct plugin_api {
     void (*cpucache_invalidate)(void);
 #endif
     bool (*timer_register)(int reg_prio, void (*unregister_callback)(void),
-                           long cycles, int int_prio,
-                           void (*timer_callback)(void) IF_COP(, int core));
+                           long cycles, void (*timer_callback)(void)
+                           IF_COP(, int core));
     void (*timer_unregister)(void);
     bool (*timer_set_period)(long count);
 
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index 494fa17..73bc49f 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -231,11 +231,13 @@ void timer_set_mode(int mode)
 
     if (mode == TM_RX_TIMEOUT)
     {
-        rb->timer_register(1, NULL, gTimer.timeout, 11, timer4_isr IF_COP(, CPU));
+        rb->timer_register(1, NULL, gTimer.timeout, timer4_isr IF_COP(, CPU));
+        IPRD = (IPRD & 0xFF0F) | 11 << 4;  /* interrupt priority */
     }
     else if (mode == TM_TRANSMIT)
     {
-        rb->timer_register(1, NULL, gTimer.transmit, 14, timer4_isr IF_COP(, CPU));
+        rb->timer_register(1, NULL, gTimer.transmit, timer4_isr IF_COP(, CPU));
+        IPRD = (IPRD & 0xFF0F) | 14 << 4;  /* interrupt priority */
     }
     else
     {
diff --git a/apps/plugins/doom/i_system.c b/apps/plugins/doom/i_system.c
index 09a6180..601ffc3 100644
--- a/apps/plugins/doom/i_system.c
+++ b/apps/plugins/doom/i_system.c
@@ -109,7 +109,7 @@ int  I_GetTime (void)
 void I_Init (void)
 {
 #if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR) && !defined(RB_PROFILE)
-   rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, 1, doomtime IF_COP(, CPU));
+   rb->timer_register(1, NULL, TIMER_FREQ/TICRATE, doomtime IF_COP(, CPU));
 #endif
    I_InitSound();
 }
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c
index ea70ae9..6fa422b 100644
--- a/apps/plugins/lib/grey_core.c
+++ b/apps/plugins/lib/grey_core.c
@@ -648,11 +648,10 @@ void grey_show(bool enable)
 #endif
 #if NUM_CORES > 1
         rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE,
-                                      1, _timer_isr,
+                                      _timer_isr,
                                       (_grey_info.flags & GREY_ON_COP) ? COP : CPU);
 #else
-        rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, 1,
-                                      _timer_isr);
+        rb->timer_register(1, NULL, TIMER_FREQ / LCD_SCANRATE, _timer_isr);
 #endif
 #endif /* !SIMULATOR */
         rb->screen_dump_set_hook(grey_screendump_hook);
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 8906c92..10b9e41 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -910,7 +910,7 @@ enum plugin_status plugin_start(const void* parameter)
 #endif /* CONFIG_CODEC != SWCODEC */
 
     calc_period();
-    rb->timer_register(1, NULL, TIMER_FREQ/1024, 1, timer_callback IF_COP(, CPU));
+    rb->timer_register(1, NULL, TIMER_FREQ/1024, timer_callback IF_COP(, CPU));
 
     draw_display();
 
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c
index 7a0a13b..7746916 100644
--- a/apps/plugins/test_scanrate.c
+++ b/apps/plugins/test_scanrate.c
@@ -162,7 +162,7 @@ int plugin_main(void)
     rb->cpu_boost(true);
 #endif
     /* The actual frequency is twice the displayed value */
-    rb->timer_register(1, NULL, TIMER_FREQ * 5 / scan_rate, 1,
+    rb->timer_register(1, NULL, TIMER_FREQ * 5 / scan_rate,
                        timer_isr IF_COP(, CPU));
 
     while (!done)
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index bcbbb99..bd8a95e 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -562,10 +562,10 @@ int SeekTo(int fd, int nPos)
         gPlay.bVideoUnderrun = false;
         /* start display interrupt */
 #if FREQ == 12000000 /* Ondio speed kludge */
-        rb->timer_register(1, NULL, gPlay.nFrameTimeAdjusted, 1,
+        rb->timer_register(1, NULL, gPlay.nFrameTimeAdjusted,
                            timer4_isr IF_COP(, CPU));
 #else
-        rb->timer_register(1, NULL, gFileHdr.video_frametime, 1,
+        rb->timer_register(1, NULL, gFileHdr.video_frametime,
                            timer4_isr IF_COP(, CPU));
 #endif
     }
@@ -748,10 +748,10 @@ int PlayTick(int fd)
                 {   /* start the video */
 #if FREQ == 12000000 /* Ondio speed kludge */
                     rb->timer_register(1, NULL,
-                        gPlay.nFrameTimeAdjusted, 1, timer4_isr);
+                        gPlay.nFrameTimeAdjusted, timer4_isr);
 #else
                     rb->timer_register(1, NULL,
-                        gFileHdr.video_frametime, 1, timer4_isr);
+                        gFileHdr.video_frametime, timer4_isr);
 #endif
                 }
             }