len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert accidental changes from r24723

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24724 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2010-02-17 16:12:21 +00:00
parent e5c815272d
commit 04ea85fb88
8 changed files with 56 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/SOURCES
View file

@ -179,14 +179,3 @@ md5sum.c
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
remote_control.c remote_control.c
#endif #endif
test_codec.c
test_core_jpeg.c
test_disk.c
test_fps.c
test_gfx.c
test_mem_jpeg.c
test_resize.c
test_sampr.c
test_scanrate.c
test_viewports.c

2
apps/plugins/battery_bench.c
View file

@ -30,7 +30,7 @@ PLUGIN_HEADER
#define EV_EXIT 1337 #define EV_EXIT 1337
/* seems to work with 1300, but who knows... */ /* seems to work with 1300, but who knows... */
#define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x1200 #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD

2
apps/plugins/doom/doom.make
View file

@ -10,7 +10,7 @@
DOOMSRCDIR := $(APPSDIR)/plugins/doom DOOMSRCDIR := $(APPSDIR)/plugins/doom
DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom
#ROCKS += $(DOOMBUILDDIR)/doom.rock ROCKS += $(DOOMBUILDDIR)/doom.rock
DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES)
DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c

4
apps/plugins/plugin.lds
View file

@ -142,8 +142,8 @@ OUTPUT_FORMAT(elf32-littlemips)
#elif CONFIG_CPU==S5L8700 #elif CONFIG_CPU==S5L8700
#define DRAMORIG 0x08000000 #define DRAMORIG 0x08000000
#define IRAMORIG (0x00000000 + (128*1024)) #define IRAMORIG (0x00000000 + (64*1024))
#define IRAMSIZE (128*1024) #define IRAMSIZE (64*1024)
#elif CONFIG_CPU==S5L8701 #elif CONFIG_CPU==S5L8701
#define DRAMORIG 0x08000000 #define DRAMORIG 0x08000000

2
firmware/panic.c
View file

@ -32,7 +32,7 @@
#include "system.h" #include "system.h"
static char panic_buf[128]; static char panic_buf[128];
#define LINECHARS (LCD_WIDTH/SYSFONT_WIDTH) - 2 #define LINECHARS (LCD_WIDTH/SYSFONT_WIDTH)
/* /*
* "Dude. This is pretty fucked-up, right here." * "Dude. This is pretty fucked-up, right here."

4
firmware/target/arm/s5l8700/app.lds
View file

@ -28,7 +28,7 @@ STARTUP(target/arm/s5l8700/crt0.o)
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE) #define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE)
#define CODECORIG (ENDAUDIOADDR) #define CODECORIG (ENDAUDIOADDR)
#if CONFIG_CPU==S5L8700 #if CONFIG_CPU==S5L8700
#define IRAMSIZE (128*1024) /* 256KB total - 128KB for core, 128KB for plugins */ #define IRAMSIZE (64*1024) /* 128KB total - 64KB for core, 64KB for plugins */
#else /* S5L8701 */ #else /* S5L8701 */
#define IRAMSIZE (96*1024) /* 176KB total - 96KB for core, 80KB for plugins */ #define IRAMSIZE (96*1024) /* 176KB total - 96KB for core, 80KB for plugins */
#endif #endif
@ -108,7 +108,7 @@ SECTIONS
stackbegin = .; stackbegin = .;
_stackbegin = .; _stackbegin = .;
#ifdef IPOD_NANO2G #ifdef IPOD_NANO2G
. += 0x2000; . += 0x4000;
#endif #endif
. += 0x2000; . += 0x2000;
stackend = .; stackend = .;

2
firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
View file

@ -48,7 +48,7 @@ void power_off(void)
void power_init(void) void power_init(void)
{ {
pmu_write(0x1e, 15); /* Vcore = 1.000V */ /* TODO */
} }
#if CONFIG_CHARGING #if CONFIG_CHARGING