len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-22 11:32:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove STATICIRAM hack

Browse source 
It was only needed by the old arm toolchain that we no longer use or support.

Change-Id: Id0e6c67477f8834a637079b03cde5fbf9da68b1c
Reviewed-on: http://gerrit.rockbox.org/233
Reviewed-by: Nils Wallménius <nils@rockbox.org>
This commit is contained in:
Nils Wallménius 2012-05-08 15:58:09 +02:00
parent b371b705c7
commit 2dda258f99
9 changed files with 37 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/drivers/ata.c
View file

@ -205,7 +205,7 @@ static int set_multiple_mode(int sectors);
static int set_features(void);
#ifndef ATA_TARGET_POLLING
STATICIRAM ICODE_ATTR int wait_for_bsy(void)
static ICODE_ATTR int wait_for_bsy(void)
{
long timeout = current_tick + HZ*30;
@ -220,7 +220,7 @@ STATICIRAM ICODE_ATTR int wait_for_bsy(void)
return 0; /* timeout */
}
STATICIRAM ICODE_ATTR int wait_for_rdy(void)
static ICODE_ATTR int wait_for_rdy(void)
{
long timeout;
@ -244,7 +244,7 @@ STATICIRAM ICODE_ATTR int wait_for_rdy(void)
#define wait_for_rdy ata_wait_for_rdy
#endif
STATICIRAM ICODE_ATTR int wait_for_start_of_transfer(void)
static ICODE_ATTR int wait_for_start_of_transfer(void)
{
if (!wait_for_bsy())
return 0;
@ -252,7 +252,7 @@ STATICIRAM ICODE_ATTR int wait_for_start_of_transfer(void)
return (ATA_IN8(ATA_ALT_STATUS) & (STATUS_BSY|STATUS_DRQ)) == STATUS_DRQ;
}
STATICIRAM ICODE_ATTR int wait_for_end_of_transfer(void)
static ICODE_ATTR int wait_for_end_of_transfer(void)
{
if (!wait_for_bsy())
return 0;
@ -275,7 +275,7 @@ static void ata_led(bool on)
#endif
#ifndef ATA_OPTIMIZED_READING
STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
static ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
{
unsigned short tmp = 0;
@ -307,7 +307,7 @@ STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
#endif /* !ATA_OPTIMIZED_READING */
#ifndef ATA_OPTIMIZED_WRITING
STATICIRAM ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
static ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
int wordcount)
{
if ( (unsigned long)buf & 1)

10
firmware/export/config.h
View file

@ -912,21 +912,11 @@ Lyre prototype 1 */
&& CONFIG_CPU != JZ4732 && CONFIG_CPU != AS3525v2 && CONFIG_CPU != IMX233
#define PLUGIN_USE_IRAM
#endif
#if defined(CPU_ARM) && !defined(__ARM_EABI__)
/* GCC quirk workaround: arm-elf-gcc treats static functions as short_call
* when not compiling with -ffunction-sections, even when the function has
* a section attribute.
* This is fixed with eabi since all calls are short ones by default */
#define STATICIRAM
#else
#define STATICIRAM static
#endif
#else
#define ICODE_ATTR
#define ICONST_ATTR
#define IDATA_ATTR
#define IBSS_ATTR
#define STATICIRAM static
#endif
#if (defined(CPU_PP) || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) || \

2
firmware/target/arm/pp/ata-pp5020.c
View file

@ -133,7 +133,7 @@ void ata_dma_set_mode(unsigned char mode) {
/* This waits for an ATA interrupt using polling.
In ATA_CONTROL, CONTROL_nIEN must be cleared.
*/
STATICIRAM ICODE_ATTR int ata_wait_intrq(void)
static ICODE_ATTR int ata_wait_intrq(void)
{
long timeout = current_tick + HZ*10;