summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-02-10 14:45:13 +0000
committerDave Chapman <dave@dchapman.com>2006-02-10 14:45:13 +0000
commit32ed0d80a9d2382df3472afa4e3b095a4f6ed222 (patch)
tree0ecd4c9f753f9515f5f2b05e9f28381eabfe44ac
parent1f8529708bd65c87f601d5b425f44755da4c237c (diff)
downloadrockbox-32ed0d80a9d2382df3472afa4e3b095a4f6ed222.zip
rockbox-32ed0d80a9d2382df3472afa4e3b095a4f6ed222.tar.gz
rockbox-32ed0d80a9d2382df3472afa4e3b095a4f6ed222.tar.bz2
rockbox-32ed0d80a9d2382df3472afa4e3b095a4f6ed222.tar.xz
Fix iPod 4G grayscale warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8651 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/grayscale.c2
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/export/pcf50605.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c
index 1154c15..ff94e6a 100644
--- a/apps/plugins/grayscale.c
+++ b/apps/plugins/grayscale.c
@@ -22,7 +22,7 @@
#ifndef SIMULATOR /* not for simulator by now */
#include "plugin.h"
-#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4)
+#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && (CONFIG_LCD != LCD_IPOD2BPP)
#include "gray.h"
PLUGIN_HEADER
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b8bf378..53923b3 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -116,7 +116,7 @@ drivers/mas.c
#ifdef IRIVER_H300_SERIES
drivers/pcf50606.c
#endif
-#if defined(APPLE_IPODCOLOR) || defined(APPLE_IPODNANO) || defined(APPLE_IPODVIDEO) || defined(APPLE_IPOD3G) || defined(APPLE_IPOD4G)
+#ifdef IPOD_ARCH
drivers/pcf50605.c
#endif
#if (CONFIG_RTC == RTC_M41ST84W) || (CONFIG_RTC == RTC_PCF50606)
diff --git a/firmware/export/pcf50605.h b/firmware/export/pcf50605.h
index 8da64f3..95fcaff 100644
--- a/firmware/export/pcf50605.h
+++ b/firmware/export/pcf50605.h
@@ -20,7 +20,7 @@
#ifndef PCF50605_H
#define PCF50605_H
-#if defined(APPLE_IPODCOLOR) || defined(APPLE_IPODNANO)
+#ifdef IPOD_ARCH
int pcf50605_read(int address);
void pcf50605_read_multiple(int address, unsigned char* buf, int count);
int pcf50605_write(int address, unsigned char val);