diff options
author | Björn Stenberg <bjorn@haxx.se> | 2003-04-23 09:21:37 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2003-04-23 09:21:37 +0000 |
commit | 28cce684a3f433200e5257eb929ee8d7a63b67ff (patch) | |
tree | 6afe48a8bd53bac805e6ae19dd58f6843af5ccf1 /firmware | |
parent | 86587527f52db8320f8d8ea48dfc76d3d93d79c8 (diff) | |
download | rockbox-28cce684a3f433200e5257eb929ee8d7a63b67ff.tar.gz rockbox-28cce684a3f433200e5257eb929ee8d7a63b67ff.zip |
Changed remote control button events to separate codes. Now the remote control works while keys are locked.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3586 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/serial.c | 16 | ||||
-rw-r--r-- | firmware/export/button.h | 22 |
2 files changed, 15 insertions, 23 deletions
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index 982b99fc2c..5ea807abb4 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c | |||
@@ -91,31 +91,27 @@ int remote_control_rx(void) | |||
91 | switch (btn) | 91 | switch (btn) |
92 | { | 92 | { |
93 | case STOP: | 93 | case STOP: |
94 | #ifdef HAVE_RECORDER_KEYPAD | 94 | last_valid_button = BUTTON_RC_STOP; |
95 | last_valid_button = BUTTON_OFF; | ||
96 | #else | ||
97 | last_valid_button = BUTTON_STOP; | ||
98 | #endif | ||
99 | break; | 95 | break; |
100 | 96 | ||
101 | case PLAY: | 97 | case PLAY: |
102 | last_valid_button = BUTTON_PLAY; | 98 | last_valid_button = BUTTON_RC_PLAY; |
103 | break; | 99 | break; |
104 | 100 | ||
105 | case VOLUP: | 101 | case VOLUP: |
106 | last_valid_button = BUTTON_VOL_UP; | 102 | last_valid_button = BUTTON_RC_VOL_UP; |
107 | break; | 103 | break; |
108 | 104 | ||
109 | case VOLDN: | 105 | case VOLDN: |
110 | last_valid_button = BUTTON_VOL_DOWN; | 106 | last_valid_button = BUTTON_RC_VOL_DOWN; |
111 | break; | 107 | break; |
112 | 108 | ||
113 | case PREV: | 109 | case PREV: |
114 | last_valid_button = BUTTON_LEFT; | 110 | last_valid_button = BUTTON_RC_LEFT; |
115 | break; | 111 | break; |
116 | 112 | ||
117 | case NEXT: | 113 | case NEXT: |
118 | last_valid_button = BUTTON_RIGHT; | 114 | last_valid_button = BUTTON_RC_RIGHT; |
119 | break; | 115 | break; |
120 | 116 | ||
121 | #ifdef SCREENDUMP | 117 | #ifdef SCREENDUMP |
diff --git a/firmware/export/button.h b/firmware/export/button.h index c980e2e36c..e3c37f9382 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -1,3 +1,4 @@ | |||
1 | |||
1 | /*************************************************************************** | 2 | /*************************************************************************** |
2 | * __________ __ ___. | 3 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 4 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
@@ -37,16 +38,18 @@ int button_get_w_tmo(int ticks); | |||
37 | #define BUTTON_LEFT 0x0040 | 38 | #define BUTTON_LEFT 0x0040 |
38 | #define BUTTON_RIGHT 0x0080 | 39 | #define BUTTON_RIGHT 0x0080 |
39 | 40 | ||
40 | /* remote control buttons */ | ||
41 | #define BUTTON_VOL_UP 0x1000 | ||
42 | #define BUTTON_VOL_DOWN 0x1001 | ||
43 | |||
44 | /* Button modifiers */ | 41 | /* Button modifiers */ |
42 | #define BUTTON_REMOTE 0x2000 | ||
45 | #define BUTTON_REPEAT 0x4000 | 43 | #define BUTTON_REPEAT 0x4000 |
46 | #define BUTTON_REL 0x8000 | 44 | #define BUTTON_REL 0x8000 |
47 | 45 | ||
48 | /* Special message */ | 46 | /* remote control buttons */ |
49 | #define BUTTON_LOCKED 0x2000 | 47 | #define BUTTON_RC_VOL_UP (0x0008 | BUTTON_REMOTE) |
48 | #define BUTTON_RC_VOL_DOWN (0x0800 | BUTTON_REMOTE) | ||
49 | #define BUTTON_RC_PLAY (BUTTON_UP | BUTTON_REMOTE) | ||
50 | #define BUTTON_RC_STOP (BUTTON_DOWN | BUTTON_REMOTE) | ||
51 | #define BUTTON_RC_LEFT (BUTTON_LEFT | BUTTON_REMOTE) | ||
52 | #define BUTTON_RC_RIGHT (BUTTON_RIGHT| BUTTON_REMOTE) | ||
50 | 53 | ||
51 | #ifdef HAVE_RECORDER_KEYPAD | 54 | #ifdef HAVE_RECORDER_KEYPAD |
52 | 55 | ||
@@ -57,10 +60,6 @@ int button_get_w_tmo(int ticks); | |||
57 | #define BUTTON_F2 0x0200 | 60 | #define BUTTON_F2 0x0200 |
58 | #define BUTTON_F3 0x0400 | 61 | #define BUTTON_F3 0x0400 |
59 | 62 | ||
60 | #define ALL_BUTTONS (BUTTON_ON | BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | \ | ||
61 | BUTTON_RIGHT | BUTTON_OFF | BUTTON_PLAY | BUTTON_F1 | \ | ||
62 | BUTTON_F2 | BUTTON_F3) | ||
63 | |||
64 | #elif HAVE_PLAYER_KEYPAD | 63 | #elif HAVE_PLAYER_KEYPAD |
65 | 64 | ||
66 | /* Jukebox 6000 and Studio specific button codes */ | 65 | /* Jukebox 6000 and Studio specific button codes */ |
@@ -68,9 +67,6 @@ int button_get_w_tmo(int ticks); | |||
68 | #define BUTTON_PLAY BUTTON_UP | 67 | #define BUTTON_PLAY BUTTON_UP |
69 | #define BUTTON_STOP BUTTON_DOWN | 68 | #define BUTTON_STOP BUTTON_DOWN |
70 | 69 | ||
71 | #define ALL_BUTTONS (BUTTON_ON | BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | \ | ||
72 | BUTTON_RIGHT | BUTTON_MENU) | ||
73 | |||
74 | #endif /* HAVE_PLAYER_KEYPAD */ | 70 | #endif /* HAVE_PLAYER_KEYPAD */ |
75 | 71 | ||
76 | #endif | 72 | #endif |