diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-11-22 21:20:54 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-11-22 21:20:54 +0000 |
commit | d4e53976d91eab4746d286b89a36bc05c767ede2 (patch) | |
tree | 845663e7670e9b9ec677e8aeede82c309d771a9b | |
parent | 011835dec37c49dab5f4e374f6d11ec326fbc67f (diff) | |
download | rockbox-d4e53976d91eab4746d286b89a36bc05c767ede2.tar.gz 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
-rw-r--r-- | apps/wps-display.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-player.c | 2 | ||||
-rw-r--r-- | firmware/drivers/power.c | 6 | ||||
-rw-r--r-- | firmware/export/hwcompat.h | 3 | ||||
-rw-r--r-- | firmware/hwcompat.c | 4 | ||||
-rw-r--r-- | uisimulator/common/font-player.c | 2 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 2 |
7 files changed, 10 insertions, 11 deletions
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, | |||
461 | #endif | 461 | #endif |
462 | case 'f': /* full-line progress bar */ | 462 | case 'f': /* full-line progress bar */ |
463 | #ifdef HAVE_LCD_CHARCELLS | 463 | #ifdef HAVE_LCD_CHARCELLS |
464 | if(has_new_lcd()) { | 464 | if(is_new_player()) { |
465 | *flags |= WPS_REFRESH_PLAYER_PROGRESS; | 465 | *flags |= WPS_REFRESH_PLAYER_PROGRESS; |
466 | *flags |= WPS_REFRESH_DYNAMIC; | 466 | *flags |= WPS_REFRESH_DYNAMIC; |
467 | full_line_progressbar=1; | 467 | 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) | |||
496 | 496 | ||
497 | (void)data_vector; | 497 | (void)data_vector; |
498 | 498 | ||
499 | new_lcd = has_new_lcd(); | 499 | new_lcd = is_new_player(); |
500 | memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped)); | 500 | memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped)); |
501 | memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content)); | 501 | memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content)); |
502 | memset(extended_pattern_usage, 0, sizeof(extended_pattern_usage)); | 502 | 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) | |||
119 | if(on) | 119 | if(on) |
120 | { | 120 | { |
121 | #ifdef ATA_POWER_PLAYERSTYLE | 121 | #ifdef ATA_POWER_PLAYERSTYLE |
122 | if (has_ata_power_control()) | 122 | if (is_new_player()) |
123 | { | 123 | { |
124 | or_b(0x10, &PBDRL); | 124 | or_b(0x10, &PBDRL); |
125 | touched = true; | 125 | touched = true; |
@@ -134,7 +134,7 @@ void ide_power_enable(bool on) | |||
134 | if(!on) | 134 | if(!on) |
135 | { | 135 | { |
136 | #ifdef ATA_POWER_PLAYERSTYLE | 136 | #ifdef ATA_POWER_PLAYERSTYLE |
137 | if (has_ata_power_control()) | 137 | if (is_new_player()) |
138 | { | 138 | { |
139 | and_b(~0x10, &PBDRL); | 139 | and_b(~0x10, &PBDRL); |
140 | touched = true; | 140 | touched = true; |
@@ -166,7 +166,7 @@ bool ide_powered(void) | |||
166 | { | 166 | { |
167 | #if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF) | 167 | #if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF) |
168 | #ifdef ATA_POWER_PLAYERSTYLE | 168 | #ifdef ATA_POWER_PLAYERSTYLE |
169 | if (has_ata_power_control()) | 169 | if (is_new_player()) |
170 | { | 170 | { |
171 | if ((PBCR2 & 0x0300) || !(PBIOR & 0x0010)) /* not configured for output */ | 171 | if ((PBCR2 & 0x0300) || !(PBIOR & 0x0010)) /* not configured for output */ |
172 | return false; /* would be floating low, disk off */ | 172 | 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); | |||
34 | int read_hw_mask(void); | 34 | int read_hw_mask(void); |
35 | 35 | ||
36 | #ifdef ARCHOS_PLAYER | 36 | #ifdef ARCHOS_PLAYER |
37 | bool has_new_lcd(void); | 37 | bool is_new_player(void); |
38 | bool has_ata_power_control(void) __attribute__ ((alias ("has_new_lcd"))); | ||
39 | #endif | 38 | #endif |
40 | 39 | ||
41 | #endif | 40 | #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) | |||
39 | } | 39 | } |
40 | 40 | ||
41 | #ifdef ARCHOS_PLAYER | 41 | #ifdef ARCHOS_PLAYER |
42 | bool has_new_lcd(void) | 42 | bool is_new_player(void) |
43 | { | 43 | { |
44 | return read_rom_version() > 451; | 44 | return read_rom_version() > 451; |
45 | } | 45 | } |
46 | #endif | 46 | #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; | |||
541 | 541 | ||
542 | void font_init() | 542 | void font_init() |
543 | { | 543 | { |
544 | if (has_new_lcd()) | 544 | if (is_new_player()) |
545 | font_player = &font_new_player; | 545 | font_player = &font_new_player; |
546 | else | 546 | else |
547 | font_player = &font_old_player; | 547 | 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) | |||
165 | return 0; | 165 | return 0; |
166 | } | 166 | } |
167 | 167 | ||
168 | bool has_new_lcd(void) | 168 | bool is_new_player(void) |
169 | { | 169 | { |
170 | return having_new_lcd; | 170 | return having_new_lcd; |
171 | } | 171 | } |