3 files changed, 29 insertions, 6 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 8f1a5e65cc..cd674b63f8 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -151,6 +151,10 @@
 #define USBOTG_ISP1362 1362
 #define USBOTG_M5636 5636
 
+/* Multiple cores */
+#define CPU 0
+#define COP 1
+
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
 #include "config-player.h"
@@ -219,6 +223,19 @@
 /* define for all cpus from PP family */
 #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) || (CONFIG_CPU == PP5024)
 #define CPU_PP
+
+/* PP family has dual cores */
+#if 0
+/* Keep it as single core until dual core support is ready */
+#define NUM_CORES 2
+#define CURRENT_CORE current_core()
+#endif
+
+#define NUM_CORES 1
+#define CURRENT_CORE 0
+#else
+#define NUM_CORES 1
+#define CURRENT_CORE 0
 #endif
 
 /* define for all cpus from ARM family */
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 1b326e1b8b..d13b27c529 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -43,6 +43,8 @@ static inline void udelay(unsigned usecs)
     unsigned start = USEC_TIMER;
     while ((USEC_TIMER - start) < usecs);
 }
+
+unsigned int current_core(void);
 #endif
 
 struct flash_header {
@@ -88,7 +90,7 @@ void cpu_idle_mode(bool on_off);
 #define betoh32(x) swap32(x)
 #define htobe16(x) swap16(x)
 #define htobe32(x) swap32(x)
-#else 
+#else
 #define letoh16(x) swap16(x)
 #define letoh32(x) swap32(x)
 #define htole16(x) swap16(x)
@@ -178,7 +180,7 @@ static inline void coldfire_set_macsr(unsigned long flags)
 static inline unsigned long coldfire_get_macsr(void)
 {
     unsigned long m;
-    
+
     asm volatile ("move.l %%macsr, %0" : "=r" (m));
     return m;
 }
@@ -301,7 +303,7 @@ static inline void invalidate_icache(void)
                  "move.l #0x80000000,%d0\n"
                  "movec.l %d0,%cacr");
 }
-            
+
 #define CPUFREQ_DEFAULT_MULT 1
 #define CPUFREQ_DEFAULT      (CPUFREQ_DEFAULT_MULT * CPU_FREQ)
 #define CPUFREQ_NORMAL_MULT  4
@@ -315,7 +317,7 @@ static inline void invalidate_icache(void)
 
 #define CPUFREQ_DEFAULT_MULT 8
 #define CPUFREQ_DEFAULT 24000000
-#define CPUFREQ_NORMAL_MULT 10 
+#define CPUFREQ_NORMAL_MULT 10
 #define CPUFREQ_NORMAL 30000000
 #define CPUFREQ_MAX_MULT 25
 #define CPUFREQ_MAX 75000000
@@ -336,7 +338,7 @@ static inline unsigned long swap32(unsigned long value)
       result[15.. 8] = value[23..16];
       result[ 7.. 0] = value[31..24];
     */
-{   
+{
     unsigned int tmp;
 
     asm volatile (
@@ -418,7 +420,7 @@ static inline int set_irq_level(int level)
     __asm__ volatile ("clrsr ie");
   else
     __asm__ volatile ("setsr ie");
-    
+
   return result;
 }
 
diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 762e315a4c..a5034aedab 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -31,12 +31,16 @@
 
 int create_thread(void (*function)(void), void* stack, int stack_size,
                   const char *name);
+int create_thread_on_core(unsigned int core, void (*function)(void), void* stack, int stack_size,
+                  const char *name);
 void remove_thread(int threadnum);
+void remove_thread_on_core(unsigned int core, int threadnum);
 void switch_thread(void);
 void sleep_thread(void);
 void wake_up_thread(void);
 void init_threads(void);
 int thread_stack_usage(int threadnum);
+int thread_stack_usage_on_core(unsigned int core, int threadnum);
 #ifdef RB_PROFILE
 void profile_thread(void);
 #endif