diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 3 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipod.c | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodmini.h | 2 | ||||
-rwxr-xr-x | firmware/export/config-ipodmini2g.h | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 7 |
5 files changed, 9 insertions, 7 deletions
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 | |||
87 | drivers/lcd-remote-2bit-vi.c | 87 | drivers/lcd-remote-2bit-vi.c |
88 | #endif | 88 | #endif |
89 | #endif | 89 | #endif |
90 | #if CONFIG_LCD==LCD_IPODNANO || CONFIG_LCD==LCD_IPODCOLOR || CONFIG_LCD == LCD_IPOD2BPP | 90 | #if CONFIG_LCD==LCD_IPODNANO || CONFIG_LCD==LCD_IPODCOLOR \ |
91 | || CONFIG_LCD == LCD_IPOD2BPP || CONFIG_LCD == LCD_IPODMINI | ||
91 | drivers/lcd-ipod.c | 92 | drivers/lcd-ipod.c |
92 | #endif | 93 | #endif |
93 | #if CONFIG_LCD==LCD_IPODVIDEO | 94 | #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) | |||
36 | return ((int)(USEC_TIMER - clock_start)) >= usecs; | 36 | return ((int)(USEC_TIMER - clock_start)) >= usecs; |
37 | } | 37 | } |
38 | 38 | ||
39 | #if (CONFIG_LCD == LCD_IPOD2BPP) | 39 | #if (CONFIG_LCD == LCD_IPOD2BPP) || (CONFIG_LCD == LCD_IPODMINI) |
40 | 40 | ||
41 | /*** hardware configuration ***/ | 41 | /*** hardware configuration ***/ |
42 | 42 | ||
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 @@ | |||
82 | /* Define this to the CPU frequency */ | 82 | /* Define this to the CPU frequency */ |
83 | #define CPU_FREQ 11289600 | 83 | #define CPU_FREQ 11289600 |
84 | 84 | ||
85 | #define CONFIG_LCD LCD_IPOD2BPP | 85 | #define CONFIG_LCD LCD_IPODMINI |
86 | 86 | ||
87 | /* Offset ( in the firmware file's header ) to the file length */ | 87 | /* Offset ( in the firmware file's header ) to the file length */ |
88 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 88 | #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 @@ | |||
85 | /* Define this to the CPU frequency */ | 85 | /* Define this to the CPU frequency */ |
86 | #define CPU_FREQ 11289600 | 86 | #define CPU_FREQ 11289600 |
87 | 87 | ||
88 | #define CONFIG_LCD LCD_IPOD2BPP | 88 | #define CONFIG_LCD LCD_IPODMINI |
89 | 89 | ||
90 | /* Offset ( in the firmware file's header ) to the file length */ | 90 | /* Offset ( in the firmware file's header ) to the file length */ |
91 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 91 | #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 @@ | |||
89 | #define LCD_IPODCOLOR 6 /* as used by iPod Color/Photo */ | 89 | #define LCD_IPODCOLOR 6 /* as used by iPod Color/Photo */ |
90 | #define LCD_IPODNANO 7 /* as used by iPod Nano */ | 90 | #define LCD_IPODNANO 7 /* as used by iPod Nano */ |
91 | #define LCD_IPODVIDEO 8 /* as used by iPod Video */ | 91 | #define LCD_IPODVIDEO 8 /* as used by iPod Video */ |
92 | #define LCD_IPOD2BPP 9 /* as used by all greyscale iPods */ | 92 | #define LCD_IPOD2BPP 9 /* as used by all fullsize greyscale iPods */ |
93 | #define LCD_IFP7XX 10 /* as used by iRiver iFP 7xx/8xx */ | 93 | #define LCD_IPODMINI 10 /* as used by iPod Mini g1/g2 */ |
94 | #define LCD_GIGABEAT 11 | 94 | #define LCD_IFP7XX 11 /* as used by iRiver iFP 7xx/8xx */ |
95 | #define LCD_GIGABEAT 12 | ||
95 | 96 | ||
96 | /* LCD_PIXELFORMAT */ | 97 | /* LCD_PIXELFORMAT */ |
97 | #define HORIZONTAL_PACKING 1 | 98 | #define HORIZONTAL_PACKING 1 |