From 6b85f18b64e3df6dd1fe665384374b731f1466f0 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Wed, 25 Aug 2010 19:37:01 +0000 Subject: pacbox_cf.S contains a h300-only function, AND a function for all CF git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27889 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pacbox/SOURCES | 9 ++++++--- apps/plugins/pacbox/pacbox_cf.S | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/plugins/pacbox/SOURCES b/apps/plugins/pacbox/SOURCES index c06288699f..b2fe0a5523 100644 --- a/apps/plugins/pacbox/SOURCES +++ b/apps/plugins/pacbox/SOURCES @@ -6,8 +6,11 @@ wsg3.c #if defined(CPU_PP502x) && (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224) pacbox_arm.S -#elif defined(CPU_COLDFIRE) -pacbox_cf.S -#else +#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) || !defined(IRIVER_H300_SERIES) pacbox_lcd.c #endif + +#if defined(CPU_COLDFIRE) +/* contains cf-specific functions, AND pacbox_lcd.c replacement for h300 only */ +pacbox_cf.S +#endif diff --git a/apps/plugins/pacbox/pacbox_cf.S b/apps/plugins/pacbox/pacbox_cf.S index 8a5ff821f4..7a6111d16b 100644 --- a/apps/plugins/pacbox/pacbox_cf.S +++ b/apps/plugins/pacbox/pacbox_cf.S @@ -25,6 +25,8 @@ .align 2 +#ifdef IRIVER_H300_SERIES + .global blit_display /* @@ -136,6 +138,8 @@ bd_y_loop: lea.l BD_SAVE(%sp), %sp rts +#endif /* IRIVER_H300_SERIES */ + /* See arcade.c for the C implementation of drawChar */ /* Note! This version does not handle flipped screen mode. */ -- cgit v1.2.3