diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 22 | ||||
-rw-r--r-- | apps/plugins/SOURCES | 11 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 4 |
5 files changed, 37 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index aba3964369..c8f7cf14f0 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1648,6 +1648,28 @@ static bool view_battery(void) | |||
1648 | #elif defined(IPOD_NANO2G) | 1648 | #elif defined(IPOD_NANO2G) |
1649 | y = pmu_read_battery_current(); | 1649 | y = pmu_read_battery_current(); |
1650 | lcd_putsf(0, 2, "Battery current: %d mA", y); | 1650 | lcd_putsf(0, 2, "Battery current: %d mA", y); |
1651 | lcd_putsf(0, 3, "PWRCON: %8x", PWRCON); | ||
1652 | lcd_putsf(0, 4, "PWRCONEXT: %8x", PWRCONEXT); | ||
1653 | x = pmu_read(0x1b) & 0xf; | ||
1654 | y = pmu_read(0x1a) * 25 + 625; | ||
1655 | lcd_putsf(0, 5, "AUTO: %x / %d mV", x, y); | ||
1656 | x = pmu_read(0x1f) & 0xf; | ||
1657 | y = pmu_read(0x1e) * 25 + 625; | ||
1658 | lcd_putsf(0, 6, "DOWN1: %x / %d mV", x, y); | ||
1659 | x = pmu_read(0x23) & 0xf; | ||
1660 | y = pmu_read(0x22) * 25 + 625; | ||
1661 | lcd_putsf(0, 7, "DOWN2: %x / %d mV", x, y); | ||
1662 | x = pmu_read(0x27) & 0xf; | ||
1663 | y = pmu_read(0x26) * 100 + 900; | ||
1664 | lcd_putsf(0, 8, "MEMLDO: %x / %d mV", x, y); | ||
1665 | for (i = 0; i < 6; i++) | ||
1666 | { | ||
1667 | x = pmu_read(0x2e + (i << 1)) & 0xf; | ||
1668 | y = pmu_read(0x2d + (i << 1)) * 100 + 900; | ||
1669 | lcd_putsf(0, 9 + i, "LDO%d: %x / %d mV", i + 1, x, y); | ||
1670 | } | ||
1671 | lcd_putsf(0, 15, "CLKCON: %8x", CLKCON); | ||
1672 | lcd_putsf(17, 15, "PLL0: %6x", PLL0PMS); | ||
1651 | #else | 1673 | #else |
1652 | lcd_putsf(0, 3, "Charger: %s", | 1674 | lcd_putsf(0, 3, "Charger: %s", |
1653 | charger_inserted() ? "present" : "absent"); | 1675 | charger_inserted() ? "present" : "absent"); |
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index da906e6967..34940b4ee4 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -179,3 +179,14 @@ md5sum.c | |||
179 | #ifdef USB_ENABLE_HID | 179 | #ifdef USB_ENABLE_HID |
180 | remote_control.c | 180 | remote_control.c |
181 | #endif | 181 | #endif |
182 | |||
183 | test_codec.c | ||
184 | test_core_jpeg.c | ||
185 | test_disk.c | ||
186 | test_fps.c | ||
187 | test_gfx.c | ||
188 | test_mem_jpeg.c | ||
189 | test_resize.c | ||
190 | test_sampr.c | ||
191 | test_scanrate.c | ||
192 | test_viewports.c | ||
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index e4e399ff7b..6eda335bc7 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -30,7 +30,7 @@ PLUGIN_HEADER | |||
30 | #define EV_EXIT 1337 | 30 | #define EV_EXIT 1337 |
31 | 31 | ||
32 | /* seems to work with 1300, but who knows... */ | 32 | /* seems to work with 1300, but who knows... */ |
33 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 | 33 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x1200 |
34 | 34 | ||
35 | #if CONFIG_KEYPAD == RECORDER_PAD | 35 | #if CONFIG_KEYPAD == RECORDER_PAD |
36 | 36 | ||
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index bdc32230eb..af302fa5bb 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make | |||
@@ -10,7 +10,7 @@ | |||
10 | DOOMSRCDIR := $(APPSDIR)/plugins/doom | 10 | DOOMSRCDIR := $(APPSDIR)/plugins/doom |
11 | DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom | 11 | DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom |
12 | 12 | ||
13 | ROCKS += $(DOOMBUILDDIR)/doom.rock | 13 | #ROCKS += $(DOOMBUILDDIR)/doom.rock |
14 | 14 | ||
15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) | 15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) |
16 | DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c | 16 | DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c |
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index fe38b646d9..436f8b4447 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds | |||
@@ -142,8 +142,8 @@ OUTPUT_FORMAT(elf32-littlemips) | |||
142 | 142 | ||
143 | #elif CONFIG_CPU==S5L8700 | 143 | #elif CONFIG_CPU==S5L8700 |
144 | #define DRAMORIG 0x08000000 | 144 | #define DRAMORIG 0x08000000 |
145 | #define IRAMORIG (0x00000000 + (64*1024)) | 145 | #define IRAMORIG (0x00000000 + (128*1024)) |
146 | #define IRAMSIZE (64*1024) | 146 | #define IRAMSIZE (128*1024) |
147 | 147 | ||
148 | #elif CONFIG_CPU==S5L8701 | 148 | #elif CONFIG_CPU==S5L8701 |
149 | #define DRAMORIG 0x08000000 | 149 | #define DRAMORIG 0x08000000 |