diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-11 23:51:00 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-11 23:51:00 +0000 |
commit | 8636e6949e802556da1588b814e454155358df90 (patch) | |
tree | fb668ba4b210d21185ee6f46a8e80e61171af8bf /apps | |
parent | b16137e10b0b309ccd9bf81fb2d70f24b090aa7d (diff) | |
download | rockbox-8636e6949e802556da1588b814e454155358df90.tar.gz rockbox-8636e6949e802556da1588b814e454155358df90.zip |
Moved SH1 system code to target tree. * First shot at hwcompat cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13114 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 7 | ||||
-rw-r--r-- | apps/menu.c | 1 | ||||
-rw-r--r-- | apps/settings.c | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 682bcaf456..12d5f435b7 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -86,6 +86,7 @@ | |||
86 | #ifdef IAUDIO_X5 | 86 | #ifdef IAUDIO_X5 |
87 | #include "ds2411.h" | 87 | #include "ds2411.h" |
88 | #endif | 88 | #endif |
89 | #include "hwcompat.h" | ||
89 | 90 | ||
90 | #ifndef SIMULATOR | 91 | #ifndef SIMULATOR |
91 | static bool dbg_list(char *title, int count, int selection_size, | 92 | static bool dbg_list(char *title, int count, int selection_size, |
@@ -405,8 +406,8 @@ static bool dbg_hw_info(void) | |||
405 | { | 406 | { |
406 | #if CONFIG_CPU == SH7034 | 407 | #if CONFIG_CPU == SH7034 |
407 | char buf[32]; | 408 | char buf[32]; |
408 | int bitmask = *(unsigned short*)0x20000fc; | 409 | int bitmask = HW_MASK; |
409 | int rom_version = *(unsigned short*)0x20000fe; | 410 | int rom_version = ROM_VERSION; |
410 | unsigned manu, id; /* flash IDs */ | 411 | unsigned manu, id; /* flash IDs */ |
411 | bool got_id; /* flag if we managed to get the flash IDs */ | 412 | bool got_id; /* flag if we managed to get the flash IDs */ |
412 | unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */ | 413 | unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */ |
@@ -564,7 +565,7 @@ static bool dbg_hw_info(void) | |||
564 | char buf[32]; | 565 | char buf[32]; |
565 | int button; | 566 | int button; |
566 | int currval = 0; | 567 | int currval = 0; |
567 | int rom_version = *(unsigned short*)0x20000fe; | 568 | int rom_version = ROM_VERSION; |
568 | unsigned manu, id; /* flash IDs */ | 569 | unsigned manu, id; /* flash IDs */ |
569 | bool got_id; /* flag if we managed to get the flash IDs */ | 570 | bool got_id; /* flag if we managed to get the flash IDs */ |
570 | unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */ | 571 | unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */ |
diff --git a/apps/menu.c b/apps/menu.c index 26edbb040c..6340185e07 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include "config.h" | 26 | #include "config.h" |
27 | 27 | ||
28 | #include "hwcompat.h" | ||
29 | #include "lcd.h" | 28 | #include "lcd.h" |
30 | #include "font.h" | 29 | #include "font.h" |
31 | #include "backlight.h" | 30 | #include "backlight.h" |
diff --git a/apps/settings.c b/apps/settings.c index b0e84619a6..b6eb9a4f64 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include "icons.h" | 46 | #include "icons.h" |
47 | #include "font.h" | 47 | #include "font.h" |
48 | #include "peakmeter.h" | 48 | #include "peakmeter.h" |
49 | #include "hwcompat.h" | ||
50 | #endif | 49 | #endif |
51 | #include "lang.h" | 50 | #include "lang.h" |
52 | #include "language.h" | 51 | #include "language.h" |