summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/debug_menu.c10
-rw-r--r--firmware/target/arm/pcm-pp.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index c939f02852..d6c5ef4d1c 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -572,7 +572,11 @@ static bool dbg_hw_info(void)
}
#elif CONFIG_CPU == PP5020
char buf[32];
-
+ char pp_version[] = { (PP_VER2 >> 24) & 0xff, (PP_VER2 >> 16) & 0xff,
+ (PP_VER2 >> 8) & 0xff, (PP_VER2) & 0xff,
+ (PP_VER1 >> 24) & 0xff, (PP_VER1 >> 16) & 0xff,
+ (PP_VER1 >> 8) & 0xff, (PP_VER1) & 0xff, '\0' };
+
lcd_setmargins(0, 0);
lcd_setfont(FONT_SYSFIXED);
lcd_clear_display();
@@ -582,10 +586,6 @@ static bool dbg_hw_info(void)
snprintf(buf, sizeof(buf), "HW rev: 0x%08x", ipod_hw_rev);
lcd_puts(0, 1, buf);
- char pp_version[] = { (PP_VER2 >> 24) & 0xff, (PP_VER2 >> 16) & 0xff,
- (PP_VER2 >> 8) & 0xff, (PP_VER2) & 0xff,
- (PP_VER1 >> 24) & 0xff, (PP_VER1 >> 16) & 0xff,
- (PP_VER1 >> 8) & 0xff, (PP_VER1) & 0xff, '\0' };
snprintf(buf, sizeof(buf), "PP version: %s", pp_version);
lcd_puts(0, 2, buf);
lcd_update();
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index d8eecadc9b..8b2186a7ba 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -451,7 +451,7 @@ void pcm_rec_dma_start(void *addr, size_t size)
p = addr;
/* setup FIQ */
- outl(inl(0x6000402c) | I2S_MASK, 0x6000402c);
+ CPU_INT_PRIORITY |= I2S_MASK;
CPU_INT_EN = I2S_MASK;
/* interrupt on full fifo */