diff options
Diffstat (limited to 'firmware/target/arm/as3525/debug-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/debug-as3525.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c index 405b7109b1..39f590302d 100644 --- a/firmware/target/arm/as3525/debug-as3525.c +++ b/firmware/target/arm/as3525/debug-as3525.c | |||
@@ -29,8 +29,9 @@ | |||
29 | #include "cpu.h" | 29 | #include "cpu.h" |
30 | #include "pl180.h" | 30 | #include "pl180.h" |
31 | 31 | ||
32 | #define _DEBUG_PRINTF(a,varargs...) \ | 32 | #define _DEBUG_PRINTF(a,varargs...) do { \ |
33 | snprintf(buf, sizeof(buf), (a), ##varargs); lcd_puts(0,line++,buf) | 33 | snprintf(buf, sizeof(buf), (a), ##varargs); lcd_puts(0,line++,buf); \ |
34 | } while(0) | ||
34 | 35 | ||
35 | #define ON "Enabled" | 36 | #define ON "Enabled" |
36 | #define OFF "Disabled" | 37 | #define OFF "Disabled" |
@@ -70,15 +71,12 @@ | |||
70 | unsigned short button_dbop_data(void); | 71 | unsigned short button_dbop_data(void); |
71 | #endif | 72 | #endif |
72 | 73 | ||
73 | static unsigned read_cp15 (void) | 74 | static inline unsigned read_cp15 (void) |
74 | { | 75 | { |
75 | unsigned value; | 76 | unsigned cp15_value; |
76 | |||
77 | asm volatile ( | 77 | asm volatile ( |
78 | "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n":"=r" | 78 | "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n" : "=r"(cp15_value)); |
79 | (value)::"memory" | 79 | return (cp15_value); |
80 | ); | ||
81 | return (value); | ||
82 | } | 80 | } |
83 | 81 | ||
84 | int calc_freq(int clk) | 82 | int calc_freq(int clk) |
@@ -222,7 +220,7 @@ int calc_freq(int clk) | |||
222 | 220 | ||
223 | bool __dbg_hw_info(void) | 221 | bool __dbg_hw_info(void) |
224 | { | 222 | { |
225 | char buf[50]; | 223 | char buf[50]; |
226 | int line; | 224 | int line; |
227 | 225 | ||
228 | lcd_clear_display(); | 226 | lcd_clear_display(); |