forked from len0rd/rockbox
* dont compile audio codec drivers for bootloader, as we dont need them -> saves time
* dont include uda1380 in bootloaders * fix to get rid of a nasty humming sound during is not uda1380 specific but iriver specific and so put the fix into the bootloader. An other option was to put audiohw_reset() into target tree... but i want to get rid of audiohw_reset git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15721 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
41a67a7e90
commit
21ac3110f1
3 changed files with 19 additions and 9 deletions
|
@ -41,7 +41,6 @@
|
||||||
#include "power.h"
|
#include "power.h"
|
||||||
#include "powermgmt.h"
|
#include "powermgmt.h"
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "uda1380.h"
|
|
||||||
#include "pcf50606.h"
|
#include "pcf50606.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "rbunicode.h"
|
#include "rbunicode.h"
|
||||||
|
@ -143,7 +142,8 @@ void main(void)
|
||||||
int data;
|
int data;
|
||||||
bool rtc_alarm;
|
bool rtc_alarm;
|
||||||
int button;
|
int button;
|
||||||
|
int mask;
|
||||||
|
|
||||||
/* We want to read the buttons as early as possible, before the user
|
/* We want to read the buttons as early as possible, before the user
|
||||||
releases the ON button */
|
releases the ON button */
|
||||||
|
|
||||||
|
@ -173,9 +173,13 @@ void main(void)
|
||||||
__reset_cookie();
|
__reset_cookie();
|
||||||
power_off();
|
power_off();
|
||||||
}
|
}
|
||||||
|
|
||||||
audiohw_reset();
|
/* get rid of a nasty humming sound during boot */
|
||||||
|
mask = set_irq_level(HIGHEST_IRQ_LEVEL);
|
||||||
|
pcf50606_write(0x3b, 0x00); /* GPOOD2 high Z */
|
||||||
|
pcf50606_write(0x3b, 0x07); /* GPOOD2 low */
|
||||||
|
set_irq_level(mask);
|
||||||
|
|
||||||
/* Start with the main backlight OFF. */
|
/* Start with the main backlight OFF. */
|
||||||
_backlight_init();
|
_backlight_init();
|
||||||
_backlight_off();
|
_backlight_off();
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include "power.h"
|
#include "power.h"
|
||||||
#include "powermgmt.h"
|
#include "powermgmt.h"
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "uda1380.h"
|
|
||||||
#include "eeprom_settings.h"
|
#include "eeprom_settings.h"
|
||||||
#include "rbunicode.h"
|
#include "rbunicode.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
@ -444,8 +443,15 @@ void main(void)
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
backlight_init();
|
backlight_init();
|
||||||
|
|
||||||
#ifdef HAVE_UDA1380
|
#ifdef HAVE_UDA1380
|
||||||
audiohw_reset();
|
/* get rid of a nasty humming sound during boot
|
||||||
|
-> RESET signal */
|
||||||
|
or_l(1<<29, &GPIO_OUT);
|
||||||
|
or_l(1<<29, &GPIO_ENABLE);
|
||||||
|
or_l(1<<29, &GPIO_FUNCTION);
|
||||||
|
sleep(HZ/100);
|
||||||
|
and_l(~(1<<29), &GPIO_OUT);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
lcd_init();
|
lcd_init();
|
||||||
|
|
|
@ -202,7 +202,7 @@ drivers/mas.c
|
||||||
#endif /* SWCODEC */
|
#endif /* SWCODEC */
|
||||||
|
|
||||||
/* Audio codec */
|
/* Audio codec */
|
||||||
#ifndef SIMULATOR
|
#if !defined(SIMULATOR) && !defined(BOOTLOADER)
|
||||||
#if defined(HAVE_UDA1380)
|
#if defined(HAVE_UDA1380)
|
||||||
drivers/audio/uda1380.c
|
drivers/audio/uda1380.c
|
||||||
#elif defined(HAVE_WM8751)
|
#elif defined(HAVE_WM8751)
|
||||||
|
@ -222,7 +222,7 @@ drivers/audio/tlv320.c
|
||||||
#elif defined(HAVE_MAS35XX)
|
#elif defined(HAVE_MAS35XX)
|
||||||
drivers/audio/mas35xx.c
|
drivers/audio/mas35xx.c
|
||||||
#endif /* defined(HAVE_*) */
|
#endif /* defined(HAVE_*) */
|
||||||
#endif /* SIMULATOR */
|
#endif /* !defined(SIMULATOR) && !defined(BOOTLOADER) */
|
||||||
|
|
||||||
/* USB Stack */
|
/* USB Stack */
|
||||||
#if !defined(SIMULATOR)
|
#if !defined(SIMULATOR)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue