diff --git a/apps/wps-display.c b/apps/wps-display.c index 5ad8b188e2..90fec56001 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c @@ -461,7 +461,7 @@ static char* get_tag(struct mp3entry* cid3, #endif case 'f': /* full-line progress bar */ #ifdef HAVE_LCD_CHARCELLS - if(has_new_lcd()) { + if(is_new_player()) { *flags |= WPS_REFRESH_PLAYER_PROGRESS; *flags |= WPS_REFRESH_DYNAMIC; full_line_progressbar=1; 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 diff --git a/uisimulator/common/font-player.c b/uisimulator/common/font-player.c index 988b903c7b..e85304dcdc 100644 --- a/uisimulator/common/font-player.c +++ b/uisimulator/common/font-player.c @@ -541,7 +541,7 @@ unsigned char (*font_player)[256][5]=&font_new_player; void font_init() { - if (has_new_lcd()) + if (is_new_player()) font_player = &font_new_player; else font_player = &font_old_player; diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index 67315de08e..bf39b70ef9 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c @@ -165,7 +165,7 @@ int rtc_write(int address, int value) return 0; } -bool has_new_lcd(void) +bool is_new_player(void) { return having_new_lcd; }