summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/debug-as3525.c2
-rw-r--r--firmware/target/arm/as3525/debug-target.h2
-rw-r--r--firmware/target/arm/at91sam/lyre_proto1/debug-lyre_proto1.c4
-rw-r--r--firmware/target/arm/at91sam/lyre_proto1/debug-target.h4
-rw-r--r--firmware/target/arm/debug-pp.c78
-rw-r--r--firmware/target/arm/debug-target.h1
-rw-r--r--firmware/target/arm/imx31/debug-imx31.c2
-rw-r--r--firmware/target/arm/imx31/debug-target.h2
-rw-r--r--firmware/target/arm/s3c2440/debug-s3c2440.c2
-rw-r--r--firmware/target/arm/s3c2440/debug-target.h2
-rw-r--r--firmware/target/arm/s5l8700/debug-s5l8700.c4
-rw-r--r--firmware/target/arm/s5l8700/debug-target.h2
-rw-r--r--firmware/target/arm/tcc77x/debug-target.h2
-rw-r--r--firmware/target/arm/tcc77x/debug-tcc77x.c2
-rw-r--r--firmware/target/arm/tcc780x/debug-target.h2
-rw-r--r--firmware/target/arm/tcc780x/debug-tcc780x.c2
-rw-r--r--firmware/target/arm/tms320dm320/debug-dm320.c2
-rw-r--r--firmware/target/arm/tms320dm320/debug-target.h2
18 files changed, 98 insertions, 19 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index 513295edcb..d18f2d70b2 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -248,7 +248,7 @@ static int calc_freq(int clk)
248 } 248 }
249} 249}
250 250
251bool __dbg_hw_info(void) 251bool dbg_hw_info(void)
252{ 252{
253 int line; 253 int line;
254#if CONFIG_CPU == AS3525 254#if CONFIG_CPU == AS3525
diff --git a/firmware/target/arm/as3525/debug-target.h b/firmware/target/arm/as3525/debug-target.h
index a9e43550a8..1359e6a00e 100644
--- a/firmware/target/arm/as3525/debug-target.h
+++ b/firmware/target/arm/as3525/debug-target.h
@@ -24,6 +24,6 @@
24#include <stdbool.h> 24#include <stdbool.h>
25 25
26#define DEBUG_CANCEL BUTTON_LEFT 26#define DEBUG_CANCEL BUTTON_LEFT
27bool __dbg_hw_info(void); 27bool dbg_hw_info(void);
28bool dbg_ports(void); 28bool dbg_ports(void);
29#endif 29#endif
diff --git a/firmware/target/arm/at91sam/lyre_proto1/debug-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/debug-lyre_proto1.c
index 54a262a9ff..5277afc348 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/debug-lyre_proto1.c
+++ b/firmware/target/arm/at91sam/lyre_proto1/debug-lyre_proto1.c
@@ -23,12 +23,12 @@
23#include <stdbool.h> 23#include <stdbool.h>
24#include "debug-target.h" 24#include "debug-target.h"
25 25
26bool __dbg_ports(void) 26bool dbg_ports(void)
27{ 27{
28 return false; 28 return false;
29} 29}
30 30
31bool __dbg_hw_info(void) 31bool dbg_hw_info(void)
32{ 32{
33 return false; 33 return false;
34} 34}
diff --git a/firmware/target/arm/at91sam/lyre_proto1/debug-target.h b/firmware/target/arm/at91sam/lyre_proto1/debug-target.h
index 140feafe67..59dd58cb32 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/debug-target.h
+++ b/firmware/target/arm/at91sam/lyre_proto1/debug-target.h
@@ -21,6 +21,6 @@
21 21
22#include <stdbool.h> 22#include <stdbool.h>
23 23
24bool __dbg_ports(void); 24bool dbg_ports(void);
25bool __dbg_hw_info(void); 25bool dbg_hw_info(void);
26 26
diff --git a/firmware/target/arm/debug-pp.c b/firmware/target/arm/debug-pp.c
index 3b9250c0fb..080e0ed631 100644
--- a/firmware/target/arm/debug-pp.c
+++ b/firmware/target/arm/debug-pp.c
@@ -28,8 +28,43 @@
28#include "powermgmt.h" 28#include "powermgmt.h"
29#include "adc.h" 29#include "adc.h"
30#include "iap.h" 30#include "iap.h"
31#include "hwcompat.h"
31#include "debug-target.h" 32#include "debug-target.h"
32 33
34static int perfcheck(void)
35{
36 int result;
37
38 asm (
39 "mrs r2, CPSR \n"
40 "orr r0, r2, #0xc0 \n" /* disable IRQ and FIQ */
41 "msr CPSR_c, r0 \n"
42 "mov %[res], #0 \n"
43 "ldr r0, [%[timr]] \n"
44 "add r0, r0, %[tmo] \n"
45 "1: \n"
46 "add %[res], %[res], #1 \n"
47 "ldr r1, [%[timr]] \n"
48 "cmp r1, r0 \n"
49 "bmi 1b \n"
50 "msr CPSR_c, r2 \n" /* reset IRQ and FIQ state */
51 :
52 [res]"=&r"(result)
53 :
54 [timr]"r"(&USEC_TIMER),
55 [tmo]"r"(
56#if CONFIG_CPU == PP5002
57 16000
58#else /* PP5020/5022/5024 */
59 10226
60#endif
61 )
62 :
63 "r0", "r1", "r2"
64 );
65 return result;
66}
67
33bool dbg_ports(void) 68bool dbg_ports(void)
34{ 69{
35 int line; 70 int line;
@@ -152,3 +187,46 @@ bool dbg_ports(void)
152 } 187 }
153 return false; 188 return false;
154} 189}
190
191bool dbg_hw_info(void)
192{
193 int line = 0;
194#if defined(CPU_PP502x)
195 char pp_version[] = { (PP_VER2 >> 24) & 0xff, (PP_VER2 >> 16) & 0xff,
196 (PP_VER2 >> 8) & 0xff, (PP_VER2) & 0xff,
197 (PP_VER1 >> 24) & 0xff, (PP_VER1 >> 16) & 0xff,
198 (PP_VER1 >> 8) & 0xff, (PP_VER1) & 0xff, '\0' };
199#elif CONFIG_CPU == PP5002
200 char pp_version[] = { (PP_VER4 >> 8) & 0xff, PP_VER4 & 0xff,
201 (PP_VER3 >> 8) & 0xff, PP_VER3 & 0xff,
202 (PP_VER2 >> 8) & 0xff, PP_VER2 & 0xff,
203 (PP_VER1 >> 8) & 0xff, PP_VER1 & 0xff, '\0' };
204#endif
205
206 lcd_setfont(FONT_SYSFIXED);
207 lcd_clear_display();
208
209 lcd_puts(0, line++, "[Hardware info]");
210
211#ifdef IPOD_ARCH
212 lcd_putsf(0, line++, "HW rev: 0x%08lx", IPOD_HW_REVISION);
213#endif
214
215#ifdef IPOD_COLOR
216 extern int lcd_type; /* Defined in lcd-colornano.c */
217
218 lcd_putsf(0, line++, "LCD type: %d", lcd_type);
219#endif
220
221 lcd_putsf(0, line++, "PP version: %s", pp_version);
222
223 lcd_putsf(0, line++, "Est. clock (kHz): %d", perfcheck());
224
225 lcd_update();
226
227 /* wait for exit */
228 while (button_get_w_tmo(HZ/10) != (DEBUG_CANCEL|BUTTON_REL));
229
230 lcd_setfont(FONT_UI);
231 return false;
232}
diff --git a/firmware/target/arm/debug-target.h b/firmware/target/arm/debug-target.h
index 4408acf5da..28f95327ad 100644
--- a/firmware/target/arm/debug-target.h
+++ b/firmware/target/arm/debug-target.h
@@ -47,3 +47,4 @@
47# define DEBUG_CANCEL BUTTON_CANCEL 47# define DEBUG_CANCEL BUTTON_CANCEL
48#endif 48#endif
49bool dbg_ports(void); 49bool dbg_ports(void);
50bool dbg_hw_info(void);
diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c
index f8dacbedd5..92884fe8aa 100644
--- a/firmware/target/arm/imx31/debug-imx31.c
+++ b/firmware/target/arm/imx31/debug-imx31.c
@@ -31,7 +31,7 @@
31#include "dvfs_dptc-imx31.h" 31#include "dvfs_dptc-imx31.h"
32#include <stdio.h> 32#include <stdio.h>
33 33
34bool __dbg_hw_info(void) 34bool dbg_hw_info(void)
35{ 35{
36 int line; 36 int line;
37 unsigned int pllref; 37 unsigned int pllref;
diff --git a/firmware/target/arm/imx31/debug-target.h b/firmware/target/arm/imx31/debug-target.h
index ca02ab84de..25fd5d872b 100644
--- a/firmware/target/arm/imx31/debug-target.h
+++ b/firmware/target/arm/imx31/debug-target.h
@@ -22,7 +22,7 @@
22#define DEBUG_TARGET_H 22#define DEBUG_TARGET_H
23 23
24#define DEBUG_CANCEL BUTTON_BACK 24#define DEBUG_CANCEL BUTTON_BACK
25bool __dbg_hw_info(void); 25bool dbg_hw_info(void);
26bool dbg_ports(void); 26bool dbg_ports(void);
27bool __dbg_dvfs_dptc(void); 27bool __dbg_dvfs_dptc(void);
28 28
diff --git a/firmware/target/arm/s3c2440/debug-s3c2440.c b/firmware/target/arm/s3c2440/debug-s3c2440.c
index e552f12c2b..99ab8e4306 100644
--- a/firmware/target/arm/s3c2440/debug-s3c2440.c
+++ b/firmware/target/arm/s3c2440/debug-s3c2440.c
@@ -29,7 +29,7 @@
29#include "font.h" 29#include "font.h"
30#include "debug-target.h" 30#include "debug-target.h"
31 31
32bool __dbg_hw_info(void) 32bool dbg_hw_info(void)
33{ 33{
34 return false; 34 return false;
35} 35}
diff --git a/firmware/target/arm/s3c2440/debug-target.h b/firmware/target/arm/s3c2440/debug-target.h
index dc274b9f06..9e83da6f48 100644
--- a/firmware/target/arm/s3c2440/debug-target.h
+++ b/firmware/target/arm/s3c2440/debug-target.h
@@ -25,6 +25,6 @@
25#define DEBUG_CANCEL BUTTON_MENU 25#define DEBUG_CANCEL BUTTON_MENU
26#endif 26#endif
27 27
28bool __dbg_hw_info(void); 28bool dbg_hw_info(void);
29bool dbg_ports(void); 29bool dbg_ports(void);
30 30
diff --git a/firmware/target/arm/s5l8700/debug-s5l8700.c b/firmware/target/arm/s5l8700/debug-s5l8700.c
index 28bb9b2050..3631a474ed 100644
--- a/firmware/target/arm/s5l8700/debug-s5l8700.c
+++ b/firmware/target/arm/s5l8700/debug-s5l8700.c
@@ -41,7 +41,7 @@
41extern int lcd_type; 41extern int lcd_type;
42extern uint32_t nand_type[4]; 42extern uint32_t nand_type[4];
43 43
44bool __dbg_hw_info(void) 44bool dbg_hw_info(void)
45{ 45{
46 int line; 46 int line;
47 int i; 47 int i;
@@ -127,7 +127,7 @@ bool __dbg_hw_info(void)
127 } 127 }
128 128
129#else 129#else
130 _DEBUG_PRINTF("__dbg_hw_info"); 130 _DEBUG_PRINTF("dbg_hw_info");
131#endif 131#endif
132 132
133 lcd_update(); 133 lcd_update();
diff --git a/firmware/target/arm/s5l8700/debug-target.h b/firmware/target/arm/s5l8700/debug-target.h
index 351468fb50..95f2f94795 100644
--- a/firmware/target/arm/s5l8700/debug-target.h
+++ b/firmware/target/arm/s5l8700/debug-target.h
@@ -26,7 +26,7 @@
26 26
27#define DEBUG_CANCEL BUTTON_MENU 27#define DEBUG_CANCEL BUTTON_MENU
28 28
29bool __dbg_hw_info(void); 29bool dbg_hw_info(void);
30bool dbg_ports(void); 30bool dbg_ports(void);
31 31
32#endif /* _DEBUG_TARGET_H_ */ 32#endif /* _DEBUG_TARGET_H_ */
diff --git a/firmware/target/arm/tcc77x/debug-target.h b/firmware/target/arm/tcc77x/debug-target.h
index 6cf93cc5a4..c985751a23 100644
--- a/firmware/target/arm/tcc77x/debug-target.h
+++ b/firmware/target/arm/tcc77x/debug-target.h
@@ -19,6 +19,6 @@
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22bool __dbg_hw_info(void); 22bool dbg_hw_info(void);
23bool dbg_ports(void); 23bool dbg_ports(void);
24 24
diff --git a/firmware/target/arm/tcc77x/debug-tcc77x.c b/firmware/target/arm/tcc77x/debug-tcc77x.c
index 88b0722a4e..250afb46c7 100644
--- a/firmware/target/arm/tcc77x/debug-tcc77x.c
+++ b/firmware/target/arm/tcc77x/debug-tcc77x.c
@@ -36,7 +36,7 @@ bool dbg_ports(void)
36 return false; 36 return false;
37} 37}
38 38
39bool __dbg_hw_info(void) 39bool dbg_hw_info(void)
40{ 40{
41 int line = 0, i, button, oldline; 41 int line = 0, i, button, oldline;
42 bool done=false; 42 bool done=false;
diff --git a/firmware/target/arm/tcc780x/debug-target.h b/firmware/target/arm/tcc780x/debug-target.h
index 6cf93cc5a4..c985751a23 100644
--- a/firmware/target/arm/tcc780x/debug-target.h
+++ b/firmware/target/arm/tcc780x/debug-target.h
@@ -19,6 +19,6 @@
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22bool __dbg_hw_info(void); 22bool dbg_hw_info(void);
23bool dbg_ports(void); 23bool dbg_ports(void);
24 24
diff --git a/firmware/target/arm/tcc780x/debug-tcc780x.c b/firmware/target/arm/tcc780x/debug-tcc780x.c
index d527e2b045..22de868639 100644
--- a/firmware/target/arm/tcc780x/debug-tcc780x.c
+++ b/firmware/target/arm/tcc780x/debug-tcc780x.c
@@ -40,7 +40,7 @@ bool dbg_ports(void)
40 return false; 40 return false;
41} 41}
42 42
43bool __dbg_hw_info(void) 43bool dbg_hw_info(void)
44{ 44{
45 int line = 0, i, oldline; 45 int line = 0, i, oldline;
46 46
diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c
index 26f34a4f5f..de17d54843 100644
--- a/firmware/target/arm/tms320dm320/debug-dm320.c
+++ b/firmware/target/arm/tms320dm320/debug-dm320.c
@@ -121,7 +121,7 @@ bool dbg_ports(void)
121 return false; 121 return false;
122} 122}
123 123
124bool __dbg_hw_info(void) 124bool dbg_hw_info(void)
125{ 125{
126 int line = 0, oldline; 126 int line = 0, oldline;
127 int button; 127 int button;
diff --git a/firmware/target/arm/tms320dm320/debug-target.h b/firmware/target/arm/tms320dm320/debug-target.h
index bcf9d688cd..5fc0c98ce0 100644
--- a/firmware/target/arm/tms320dm320/debug-target.h
+++ b/firmware/target/arm/tms320dm320/debug-target.h
@@ -19,5 +19,5 @@
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22bool __dbg_hw_info(void); 22bool dbg_hw_info(void);
23bool dbg_ports(void); 23bool dbg_ports(void);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-12 14:56:32 +0000