summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-10-07 19:07:33 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-10-07 19:07:33 +0000
commit23b7e957708ff7272ed10cbeae24cf9fd7d7ad65 (patch)
treea20642ef307ab97b3cea249b990f6d9d1ca4bd99
parentdc3a6e39fd4441553968564c26b0838d20726ab0 (diff)
downloadrockbox-23b7e957708ff7272ed10cbeae24cf9fd7d7ad65.tar.gz
rockbox-23b7e957708ff7272ed10cbeae24cf9fd7d7ad65.zip
Correct HAS_BUTTON_HOLD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18734 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-creativezv.h2
-rw-r--r--firmware/export/config-creativezvm.h2
-rw-r--r--firmware/export/config-creativezvm60gb.h2
-rw-r--r--firmware/export/config-ondavx747.h2
-rw-r--r--firmware/export/config-ondavx767.h2
-rw-r--r--firmware/target/arm/tms320dm320/creative-zvm/button-target.h2
6 files changed, 7 insertions, 5 deletions
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h
index 78055018d1..b8850a3af6 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config-creativezv.h
@@ -73,7 +73,7 @@
73#define HAVE_LCD_ENABLE 73#define HAVE_LCD_ENABLE
74 74
75#define CONFIG_KEYPAD CREATIVEZV_PAD 75#define CONFIG_KEYPAD CREATIVEZV_PAD
76#define HAS_BUTTON_HOLD 76#define HAVE_BUTTON_HOLD
77#define HAVE_HEADPHONE_DETECTION 77#define HAVE_HEADPHONE_DETECTION
78//#define HAVE_TOUCHPAD 78//#define HAVE_TOUCHPAD
79 79
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index bc6715b4dc..4c1f4624b3 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -73,7 +73,7 @@
73#define HAVE_LCD_ENABLE 73#define HAVE_LCD_ENABLE
74 74
75#define CONFIG_KEYPAD CREATIVEZVM_PAD 75#define CONFIG_KEYPAD CREATIVEZVM_PAD
76#define HAS_BUTTON_HOLD 76#define HAVE_BUTTON_HOLD
77#define HAVE_HEADPHONE_DETECTION 77#define HAVE_HEADPHONE_DETECTION
78//#define HAVE_TOUCHPAD 78//#define HAVE_TOUCHPAD
79 79
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h
index 93fb2e5ec0..3f98059a28 100644
--- a/firmware/export/config-creativezvm60gb.h
+++ b/firmware/export/config-creativezvm60gb.h
@@ -73,7 +73,7 @@
73#define HAVE_LCD_ENABLE 73#define HAVE_LCD_ENABLE
74 74
75#define CONFIG_KEYPAD CREATIVEZVM_PAD 75#define CONFIG_KEYPAD CREATIVEZVM_PAD
76#define HAS_BUTTON_HOLD 76#define HAVE_BUTTON_HOLD
77#define HAVE_HEADPHONE_DETECTION 77#define HAVE_HEADPHONE_DETECTION
78//#define HAVE_TOUCHPAD 78//#define HAVE_TOUCHPAD
79 79
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index 6da9725aab..5144631416 100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config-ondavx747.h
@@ -67,7 +67,7 @@
67#define HAVE_LCD_ENABLE 67#define HAVE_LCD_ENABLE
68 68
69#define CONFIG_KEYPAD ONDAVX747_PAD 69#define CONFIG_KEYPAD ONDAVX747_PAD
70#define HAS_BUTTON_HOLD 70#define HAVE_BUTTON_HOLD
71#define HAVE_TOUCHSCREEN 71#define HAVE_TOUCHSCREEN
72#define HAVE_BUTTON_DATA 72#define HAVE_BUTTON_DATA
73 73
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index 6a44bf4aff..9d3ed9d7ec 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
@@ -67,7 +67,7 @@
67//#define HAVE_LCD_ENABLE 67//#define HAVE_LCD_ENABLE
68 68
69#define CONFIG_KEYPAD ONDAVX767_PAD 69#define CONFIG_KEYPAD ONDAVX767_PAD
70#define HAS_BUTTON_HOLD 70#define HAVE_BUTTON_HOLD
71 71
72/* Define this if you do software codec */ 72/* Define this if you do software codec */
73#define CONFIG_CODEC SWCODEC 73#define CONFIG_CODEC SWCODEC
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
index 897fa9529c..173d98bf30 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
@@ -63,6 +63,8 @@
63#define POWEROFF_BUTTON BUTTON_POWER 63#define POWEROFF_BUTTON BUTTON_POWER
64#define POWEROFF_COUNT 10 64#define POWEROFF_COUNT 10
65 65
66#define HAS_BUTTON_HOLD
67
66void button_init_device(void); 68void button_init_device(void);
67int button_read_device(void); 69int button_read_device(void);
68bool headphones_inserted(void); 70bool headphones_inserted(void);