summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-11-22 21:20:54 +0000
committerJens Arnold <amiconn@rockbox.org>2004-11-22 21:20:54 +0000
commitd4e53976d91eab4746d286b89a36bc05c767ede2 (patch)
tree845663e7670e9b9ec677e8aeede82c309d771a9b /firmware
parent011835dec37c49dab5f4e374f6d11ec326fbc67f (diff)
downloadrockbox-d4e53976d91eab4746d286b89a36bc05c767ede2.tar.gz
rockbox-d4e53976d91eab4746d286b89a36bc05c767ede2.tar.bz2
rockbox-d4e53976d91eab4746d286b89a36bc05c767ede2.zip
Renamed has_new_lcd() to is_new_player(), and got rid of the alias
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5459 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/lcd-player.c2
-rw-r--r--firmware/drivers/power.c6
-rw-r--r--firmware/export/hwcompat.h3
-rw-r--r--firmware/hwcompat.c4
4 files changed, 7 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index ced421b88f..1b841b5848 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -496,7 +496,7 @@ void lcd_init (void)
(void)data_vector;
- new_lcd = has_new_lcd();
+ new_lcd = is_new_player();
memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped));
memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content));
memset(extended_pattern_usage, 0, sizeof(extended_pattern_usage));
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index c67dd8be05..d4e8b3315b 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -119,7 +119,7 @@ void ide_power_enable(bool on)
if(on)
{
#ifdef ATA_POWER_PLAYERSTYLE
- if (has_ata_power_control())
+ if (is_new_player())
{
or_b(0x10, &PBDRL);
touched = true;
@@ -134,7 +134,7 @@ void ide_power_enable(bool on)
if(!on)
{
#ifdef ATA_POWER_PLAYERSTYLE
- if (has_ata_power_control())
+ if (is_new_player())
{
and_b(~0x10, &PBDRL);
touched = true;
@@ -166,7 +166,7 @@ bool ide_powered(void)
{
#if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF)
#ifdef ATA_POWER_PLAYERSTYLE
- if (has_ata_power_control())
+ if (is_new_player())
{
if ((PBCR2 & 0x0300) || !(PBIOR & 0x0010)) /* not configured for output */
return false; /* would be floating low, disk off */
diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index f33bb9cc6e..03fb161ce4 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -34,8 +34,7 @@ int read_rom_version(void);
int read_hw_mask(void);
#ifdef ARCHOS_PLAYER
-bool has_new_lcd(void);
-bool has_ata_power_control(void) __attribute__ ((alias ("has_new_lcd")));
+bool is_new_player(void);
#endif
#endif
diff --git a/firmware/hwcompat.c b/firmware/hwcompat.c
index 43a516815f..ceac5b1c58 100644
--- a/firmware/hwcompat.c
+++ b/firmware/hwcompat.c
@@ -39,8 +39,8 @@ int read_hw_mask(void)
}
#ifdef ARCHOS_PLAYER
-bool has_new_lcd(void)
+bool is_new_player(void)
{
return read_rom_version() > 451;
-}
+}
#endif