From c214e7bb0c3e97d22ecedb1c62f193e19a1d4818 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 7 Aug 2006 01:46:42 +0000 Subject: Grayscale library ported to the grayscale iPods, first version. Added C reference versions of gray_update_rect() for both horizontal and vertical pixel packing. gray_update_rect() and gray_ub_gray_bitmap_part() not yet assembler optimised. Grayscale screendump doesn't work yet. * Fixed button assignments for iPod in grayscale.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10468 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 3 ++- firmware/drivers/lcd-ipod.c | 2 +- firmware/export/config-ipodmini.h | 2 +- firmware/export/config-ipodmini2g.h | 2 +- firmware/export/config.h | 7 ++++--- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index 480c7ce630..0317b4abff 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -87,7 +87,8 @@ drivers/lcd-h100-remote.c drivers/lcd-remote-2bit-vi.c #endif #endif -#if CONFIG_LCD==LCD_IPODNANO || CONFIG_LCD==LCD_IPODCOLOR || CONFIG_LCD == LCD_IPOD2BPP +#if CONFIG_LCD==LCD_IPODNANO || CONFIG_LCD==LCD_IPODCOLOR \ + || CONFIG_LCD == LCD_IPOD2BPP || CONFIG_LCD == LCD_IPODMINI drivers/lcd-ipod.c #endif #if CONFIG_LCD==LCD_IPODVIDEO diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c index 6500335e04..52fde25bf0 100644 --- a/firmware/drivers/lcd-ipod.c +++ b/firmware/drivers/lcd-ipod.c @@ -36,7 +36,7 @@ static inline bool timer_check(int clock_start, int usecs) return ((int)(USEC_TIMER - clock_start)) >= usecs; } -#if (CONFIG_LCD == LCD_IPOD2BPP) +#if (CONFIG_LCD == LCD_IPOD2BPP) || (CONFIG_LCD == LCD_IPODMINI) /*** hardware configuration ***/ diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 4871ea0acc..c842de4001 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -82,7 +82,7 @@ /* Define this to the CPU frequency */ #define CPU_FREQ 11289600 -#define CONFIG_LCD LCD_IPOD2BPP +#define CONFIG_LCD LCD_IPODMINI /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 0 diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index adbb0973ac..ea19f5c985 100755 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -85,7 +85,7 @@ /* Define this to the CPU frequency */ #define CPU_FREQ 11289600 -#define CONFIG_LCD LCD_IPOD2BPP +#define CONFIG_LCD LCD_IPODMINI /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 0 diff --git a/firmware/export/config.h b/firmware/export/config.h index 3bd3ee6fdc..0dd1d25637 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -89,9 +89,10 @@ #define LCD_IPODCOLOR 6 /* as used by iPod Color/Photo */ #define LCD_IPODNANO 7 /* as used by iPod Nano */ #define LCD_IPODVIDEO 8 /* as used by iPod Video */ -#define LCD_IPOD2BPP 9 /* as used by all greyscale iPods */ -#define LCD_IFP7XX 10 /* as used by iRiver iFP 7xx/8xx */ -#define LCD_GIGABEAT 11 +#define LCD_IPOD2BPP 9 /* as used by all fullsize greyscale iPods */ +#define LCD_IPODMINI 10 /* as used by iPod Mini g1/g2 */ +#define LCD_IFP7XX 11 /* as used by iRiver iFP 7xx/8xx */ +#define LCD_GIGABEAT 12 /* LCD_PIXELFORMAT */ #define HORIZONTAL_PACKING 1 -- cgit v1.2.3