summaryrefslogtreecommitdiff
path: root/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c')
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index 26136ce59b..ba2cedb76c 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
@@ -42,18 +42,18 @@
42static short last_x, last_y, last_z1, last_z2; /* for the touch screen */ 42static short last_x, last_y, last_z1, last_z2; /* for the touch screen */
43static bool touch_available = false; 43static bool touch_available = false;
44 44
45static enum touchpad_mode current_mode = TOUCHPAD_POINT; 45static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT;
46static int touchpad_buttons[3][3] = { 46static int touchscreen_buttons[3][3] = {
47 {BUTTON_TOPLEFT, BUTTON_TOPMIDDLE, BUTTON_TOPRIGHT}, 47 {BUTTON_TOPLEFT, BUTTON_TOPMIDDLE, BUTTON_TOPRIGHT},
48 {BUTTON_MIDLEFT, BUTTON_CENTER, BUTTON_MIDRIGHT}, 48 {BUTTON_MIDLEFT, BUTTON_CENTER, BUTTON_MIDRIGHT},
49 {BUTTON_BOTTOMLEFT, BUTTON_BOTTOMMIDDLE, BUTTON_BOTTOMRIGHT}, 49 {BUTTON_BOTTOMLEFT, BUTTON_BOTTOMMIDDLE, BUTTON_BOTTOMRIGHT},
50}; 50};
51 51
52void touchpad_set_mode(enum touchpad_mode mode) 52void touchscreen_set_mode(enum touchscreen_mode mode)
53{ 53{
54 current_mode = mode; 54 current_mode = mode;
55} 55}
56enum touchpad_mode touchpad_get_mode(void) 56enum touchscreen_mode touchscreen_get_mode(void)
57{ 57{
58 return current_mode; 58 return current_mode;
59} 59}
@@ -185,13 +185,13 @@ int button_read_device(int *data)
185 *data = touch_to_pixels(x, y); 185 *data = touch_to_pixels(x, y);
186 switch (current_mode) 186 switch (current_mode)
187 { 187 {
188 case TOUCHPAD_POINT: 188 case TOUCHSCREEN_POINT:
189 r_button |= BUTTON_TOUCHPAD; 189 r_button |= BUTTON_TOUCHSCREEN;
190 break; 190 break;
191 case TOUCHPAD_BUTTON: 191 case TOUCHSCREEN_BUTTON:
192 { 192 {
193 int px_x = ((*data&0xffff0000)>>16), px_y = ((*data&0x0000ffff)); 193 int px_x = ((*data&0xffff0000)>>16), px_y = ((*data&0x0000ffff));
194 r_button |= touchpad_buttons[px_y/(LCD_HEIGHT/3)][px_x/(LCD_WIDTH/3)]; 194 r_button |= touchscreen_buttons[px_y/(LCD_HEIGHT/3)][px_x/(LCD_WIDTH/3)];
195 oldbutton = r_button; 195 oldbutton = r_button;
196 break; 196 break;
197 } 197 }
@@ -233,7 +233,7 @@ int button_read_device(int *data)
233 return r_button; 233 return r_button;
234} 234}
235 235
236/* Touchpad data available interupt */ 236/* Touchscreen data available interupt */
237void read_battery_inputs(void); 237void read_battery_inputs(void);
238void GIO14(void) 238void GIO14(void)
239{ 239{