diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2010-02-04 20:20:10 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2010-02-04 20:20:10 +0000 |
| commit | 69fe1ad830cd339d76507b96aca365c0ea0dfe11 (patch) | |
| tree | d8cc590bc4aaa388b3acbfd6f0761e0772b1bb2a | |
| parent | 35472fe7f1c7133fa4291dad36ae457a460f021c (diff) | |
| download | rockbox-69fe1ad830cd339d76507b96aca365c0ea0dfe11.tar.gz rockbox-69fe1ad830cd339d76507b96aca365c0ea0dfe11.zip | |
Put back the insane buffer where it belongs on non-ARM, and simplify the selection.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24512 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/codecs/demac/libdemac/demac_config.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/codecs/demac/libdemac/demac_config.h b/apps/codecs/demac/libdemac/demac_config.h index 7388aa1059..c908c3ea10 100644 --- a/apps/codecs/demac/libdemac/demac_config.h +++ b/apps/codecs/demac/libdemac/demac_config.h | |||
| @@ -48,24 +48,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA | |||
| 48 | #define FILTER256_IRAM | 48 | #define FILTER256_IRAM |
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
| 51 | #if CONFIG_CPU == PP5002 | 51 | #if CONFIG_CPU == PP5002 || defined(CPU_S5L870X) |
| 52 | /* Code in IRAM for speed, not enough IRAM for the insane filter buffer. */ | 52 | /* Code in IRAM for speed, not enough IRAM for the insane filter buffer. */ |
| 53 | #define ICODE_SECTION_DEMAC_ARM .icode | 53 | #define ICODE_SECTION_DEMAC_ARM .icode |
| 54 | #define ICODE_ATTR_DEMAC ICODE_ATTR | 54 | #define ICODE_ATTR_DEMAC ICODE_ATTR |
| 55 | #define IBSS_ATTR_DEMAC_INSANEBUF | 55 | #define IBSS_ATTR_DEMAC_INSANEBUF |
| 56 | #elif CONFIG_CPU == PP5020 | 56 | #elif defined(CPU_PP502x) |
| 57 | /* Not enough IRAM for the insane filter buffer. */ | 57 | /* Insane filter buffer not in IRAM due to division table. */ |
| 58 | #define ICODE_SECTION_DEMAC_ARM .text | 58 | #define ICODE_SECTION_DEMAC_ARM .text |
| 59 | #define ICODE_ATTR_DEMAC | 59 | #define ICODE_ATTR_DEMAC |
| 60 | #define IBSS_ATTR_DEMAC_INSANEBUF | 60 | #define IBSS_ATTR_DEMAC_INSANEBUF |
| 61 | #elif defined(CPU_S5L870X) | ||
| 62 | #define ICODE_SECTION_DEMAC_ARM .icode | ||
| 63 | #define ICODE_ATTR_DEMAC ICODE_ATTR | ||
| 64 | #define IBSS_ATTR_DEMAC_INSANEBUF | ||
| 65 | #else | 61 | #else |
| 66 | #define ICODE_SECTION_DEMAC_ARM .text | 62 | #define ICODE_SECTION_DEMAC_ARM .text |
| 67 | #define ICODE_ATTR_DEMAC | 63 | #define ICODE_ATTR_DEMAC |
| 68 | #define IBSS_ATTR_DEMAC_INSANEBUF | 64 | #define IBSS_ATTR_DEMAC_INSANEBUF IBSS_ATTR |
| 69 | #endif | 65 | #endif |
| 70 | 66 | ||
| 71 | #else /* !ROCKBOX */ | 67 | #else /* !ROCKBOX */ |