Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get the M:Robe 500 main build booting again, fix a bug and commit the rest of Cat's work to get sound working. The code is messy right now, but it plays a file (test.raw) in a normal build when you go into the debug ports screen. Take 1.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20118 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2009-02-26 21:24:40 +00:00
parent b0232e0402
commit 9e1d00c9fb
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/debug_menu.c
View file

@ -2655,7 +2655,8 @@ static const struct the_menu_item menuitems[] = {
{ "Dump ROM contents", dbg_save_roms }, { "Dump ROM contents", dbg_save_roms },
#endif #endif
#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \ #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \
|| CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 || CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 \
|| CONFIG_CPU == DM320
{ "View I/O ports", dbg_ports }, { "View I/O ports", dbg_ports },
#endif #endif
#if (CONFIG_RTC == RTC_PCF50605) && !defined(SIMULATOR) #if (CONFIG_RTC == RTC_PCF50605) && !defined(SIMULATOR)

33
bootloader/mrobe500.c
View file

@ -46,7 +46,7 @@
#include "time.h" #include "time.h"
#include "system-arm.h" #include "system-arm.h"
#define MRDEBUG //#define MRDEBUG
#if defined(MRDEBUG) #if defined(MRDEBUG)
@ -194,19 +194,28 @@ void main(void)
int rc; int rc;
int(*kernel_entry)(void); int(*kernel_entry)(void);
power_init(); /* Make sure interrupts are disabled */
lcd_init(); set_irq_level(IRQ_DISABLED);
set_fiq_status(FIQ_DISABLED);
system_init(); system_init();
kernel_init(); kernel_init();
enable_irq(); /* Now enable interrupts */
enable_fiq(); set_irq_level(IRQ_ENABLED);
set_fiq_status(FIQ_ENABLED);
backlight_init();
lcd_init();
font_init();
button_init();
usb_init();
power_init();
// enable_irq();
// enable_fiq();
adc_init(); adc_init();
button_init();
backlight_init();
font_init();
lcd_setfont(FONT_SYSFIXED); lcd_setfont(FONT_SYSFIXED);
@ -217,8 +226,6 @@ void main(void)
printf("Rockbox boot loader"); printf("Rockbox boot loader");
printf("Version %s", APPSVERSION); printf("Version %s", APPSVERSION);
usb_init();
/* Enter USB mode without USB thread */ /* Enter USB mode without USB thread */
if(usb_detect() == USB_INSERTED) if(usb_detect() == USB_INSERTED)
{ {
@ -244,9 +251,13 @@ void main(void)
reset_screen(); reset_screen();
lcd_update(); lcd_update();
} }
#if defined(MRDEBUG) #if defined(MRDEBUG)
mrdebug(); mrdebug();
#endif #endif
sleep(50);
printf("ATA"); printf("ATA");
rc = storage_init(); rc = storage_init();
if(rc) if(rc)

2
firmware/export/dm320.h
View file

@ -30,7 +30,7 @@
#define LCD_BUFFER_SIZE (LCD_WIDTH*LCD_HEIGHT*2) #define LCD_BUFFER_SIZE (LCD_WIDTH*LCD_HEIGHT*2)
#define TTB_SIZE (0x4000) #define TTB_SIZE (0x4000)
/* must be 16Kb (0x4000) aligned */ /* must be 16Kb (0x4000) aligned */
#if 0 #if 1
#define MEM_END 0x00900000 + (MEM*0x00100000) #define MEM_END 0x00900000 + (MEM*0x00100000)
#define TTB_BASE_ADDR (MEM_END - TTB_SIZE) #define TTB_BASE_ADDR (MEM_END - TTB_SIZE)
#else #else

3
tools/configure vendored
View file

@ -1434,8 +1434,7 @@ fi
target="-DMROBE_500" target="-DMROBE_500"
memory=64 # always memory=64 # always
arm926ejscc arm926ejscc
# tool="$rootdir/tools/scramble -add=m500" tool="$rootdir/tools/scramble -add=m500"
tool="cp "
bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
bmp2rb_native="$rootdir/tools/bmp2rb -f 4" bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
output="rockbox.mrobe500" output="rockbox.mrobe500"