summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2006-04-10 03:51:17 +0000
committerZakk Roberts <midk@rockbox.org>2006-04-10 03:51:17 +0000
commit2f943b054c4eb630c9b5b7170da38e494c1be235 (patch)
treea72d3e22c88f7ddb67e9a8d01a94e9927001c702 /firmware
parentbf6f9c66a158a478d639672857bbf9bac791dd30 (diff)
downloadrockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.tar.gz
rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.tar.bz2
rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.zip
Enabled the quickscreen for iAudio X5. Globally, REC enters the menu and holding REC enters the quickscreen. Also moved the quickscreen #define to model config files, which simplifies the checking for it and makes checking more consistent. Cleaned up keymappings in quickscreen.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9590 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-fmrecorder.h3
-rw-r--r--firmware/export/config-h100.h3
-rw-r--r--firmware/export/config-h120.h3
-rw-r--r--firmware/export/config-h300.h3
-rw-r--r--firmware/export/config-iaudiox5.h3
-rw-r--r--firmware/export/config-ipod3g.h3
-rw-r--r--firmware/export/config-ipod4g.h3
-rw-r--r--firmware/export/config-ipodcolor.h3
-rw-r--r--firmware/export/config-ipodmini.h3
-rwxr-xr-xfirmware/export/config-ipodmini2g.h3
-rw-r--r--firmware/export/config-ipodnano.h7
-rw-r--r--firmware/export/config-ipodvideo.h5
-rw-r--r--firmware/export/config-recorder.h3
-rw-r--r--firmware/export/config-recorderv2.h3
14 files changed, 45 insertions, 3 deletions
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 335d3eadac..27e2f10f88 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 112
#define LCD_HEIGHT 64
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 5042c5407e..20fcb75fdf 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -16,6 +16,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index 0c8eec031e..34c10b7682 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -12,6 +12,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index d9260e6cca..41e3c827d5 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -15,6 +15,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 220
#define LCD_HEIGHT 176
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index c4e7e5000c..746ca26e31 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -14,6 +14,9 @@
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index ad555d875a..2b7005df30 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 832f3f4d22..9abc6b305e 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index afe1a06421..1d88f0da75 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -15,6 +15,9 @@
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 220
#define LCD_HEIGHT 176
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 146a212714..7018c4e876 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 138
#define LCD_HEIGHT 110
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index c3b7a676c3..881e4d2f44 100755
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 138
#define LCD_HEIGHT 110
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index c3b0745716..98e307fa86 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -15,6 +15,9 @@
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 176
#define LCD_HEIGHT 132
@@ -53,7 +56,7 @@
#ifndef SIMULATOR
-/* The Nano actually has a PP5021 - but it's register compatible with
+/* The Nano actually has a PP5021 - but it's register compatible with
the 5020 so Rockbox doesn't care. */
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -64,7 +67,7 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-#define BATTERY_SCALE_FACTOR 5865
+#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
//#define HAVE_CHARGING 1
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index d13727f37c..1f57432c56 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -15,6 +15,9 @@
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR 1
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 320
#define LCD_HEIGHT 240
@@ -53,7 +56,7 @@
#ifndef SIMULATOR
-/* The Nano actually has a PP5021 - but it's register compatible with
+/* The Nano actually has a PP5021 - but it's register compatible with
the 5020 so Rockbox doesn't care. */
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index d727519421..130e199783 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 112
#define LCD_HEIGHT 64
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 5548c0789d..b3136f13cc 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
/* LCD dimensions */
#define LCD_WIDTH 112
#define LCD_HEIGHT 64