devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Apply 2 small size optimisations. * Put ICODE_ATTR into the function definitions where applicable, saving the separate declaration.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17408 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-05-08 05:39:29 +00:00
parent 93651ed84d
commit f18e4db81b
1 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
firmware/drivers/ata.c
View file

@ -179,23 +179,22 @@ static int perform_soft_reset(void);
static int set_multiple_mode(int sectors); static int set_multiple_mode(int sectors);
static int set_features(void); static int set_features(void);
STATICIRAM int wait_for_bsy(void) ICODE_ATTR; STATICIRAM ICODE_ATTR int wait_for_bsy(void)
STATICIRAM int wait_for_bsy(void)
{ {
long timeout = current_tick + HZ*30; long timeout = current_tick + HZ*30;
while (TIME_BEFORE(current_tick, timeout) && (ATA_STATUS & STATUS_BSY)) {
do
{
if (!(ATA_STATUS & STATUS_BSY))
return 1;
last_disk_activity = current_tick; last_disk_activity = current_tick;
yield(); yield();
} } while (TIME_BEFORE(current_tick, timeout));
if (TIME_BEFORE(current_tick, timeout)) return 0; /* timeout */
return 1;
else
return 0; /* timeout */
} }
STATICIRAM int wait_for_rdy(void) ICODE_ATTR; STATICIRAM ICODE_ATTR int wait_for_rdy(void)
STATICIRAM int wait_for_rdy(void)
{ {
long timeout; long timeout;
@ -203,21 +202,19 @@ STATICIRAM int wait_for_rdy(void)
return 0; return 0;
timeout = current_tick + HZ*10; timeout = current_tick + HZ*10;
while (TIME_BEFORE(current_tick, timeout) && do
!(ATA_ALT_STATUS & STATUS_RDY)) { {
if (ATA_ALT_STATUS & STATUS_RDY)
return 1;
last_disk_activity = current_tick; last_disk_activity = current_tick;
yield(); yield();
} } while (TIME_BEFORE(current_tick, timeout));
if (TIME_BEFORE(current_tick, timeout)) return 0; /* timeout */
return STATUS_RDY;
else
return 0; /* timeout */
} }
STATICIRAM int wait_for_start_of_transfer(void) ICODE_ATTR; STATICIRAM ICODE_ATTR int wait_for_start_of_transfer(void)
STATICIRAM int wait_for_start_of_transfer(void)
{ {
if (!wait_for_bsy()) if (!wait_for_bsy())
return 0; return 0;
@ -225,8 +222,7 @@ STATICIRAM int wait_for_start_of_transfer(void)
return (ATA_ALT_STATUS & (STATUS_BSY|STATUS_DRQ)) == STATUS_DRQ; return (ATA_ALT_STATUS & (STATUS_BSY|STATUS_DRQ)) == STATUS_DRQ;
} }
STATICIRAM int wait_for_end_of_transfer(void) ICODE_ATTR; STATICIRAM ICODE_ATTR int wait_for_end_of_transfer(void)
STATICIRAM int wait_for_end_of_transfer(void)
{ {
if (!wait_for_bsy()) if (!wait_for_bsy())
return 0; return 0;
@ -247,8 +243,7 @@ static void ata_led(bool on)
#endif #endif
#ifndef ATA_OPTIMIZED_READING #ifndef ATA_OPTIMIZED_READING
STATICIRAM void copy_read_sectors(unsigned char* buf, int wordcount) ICODE_ATTR; STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount)
STATICIRAM void copy_read_sectors(unsigned char* buf, int wordcount)
{ {
unsigned short tmp = 0; unsigned short tmp = 0;
@ -456,9 +451,8 @@ int ata_read_sectors(IF_MV2(int drive,)
} }
#ifndef ATA_OPTIMIZED_WRITING #ifndef ATA_OPTIMIZED_WRITING
STATICIRAM void copy_write_sectors(const unsigned char* buf, int wordcount) STATICIRAM ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
ICODE_ATTR; int wordcount)
STATICIRAM void copy_write_sectors(const unsigned char* buf, int wordcount)
{ {
if ( (unsigned long)buf & 1) if ( (unsigned long)buf & 1)
{ /* not 16-bit aligned, copy byte by byte */ { /* not 16-bit aligned, copy byte by byte */