aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-03-29 18:17:24 +0100
committerJoel Bodenmann <joel@unormal.org>2013-03-29 18:17:24 +0100
commit4440c2c8874c7c94f05b3a04fea52aaa15240721 (patch)
tree442f7c900439aa631051bb298bc8da522f77a226 /drivers
parent2510f3e75b44b84e6ef43275c0818cb90764af2f (diff)
downloaduGFX-4440c2c8874c7c94f05b3a04fea52aaa15240721.tar.gz
uGFX-4440c2c8874c7c94f05b3a04fea52aaa15240721.tar.bz2
uGFX-4440c2c8874c7c94f05b3a04fea52aaa15240721.zip
STMPE811 getpin_pressed() -> getpin_irq()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ginput/touch/STMPE811/ginput_lld_mouse.c2
-rw-r--r--drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h2
-rw-r--r--drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
index 782c5c06..696795cc 100644
--- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
@@ -130,7 +130,7 @@ void ginput_lld_mouse_get_reading(MouseReading *pt)
#else
// Check if the touch controller IRQ pin has gone off
clearfifo = false;
- if(getpin_pressed()) { // please rename this to getpin_irq
+ if(getpin_irq()) { // please rename this to getpin_irq
write_reg(STMPE811_REG_INT_STA, 1, 0xFF); // clear all interrupts
touched = (uint8_t)read_reg(STMPE811_REG_TSC_CTRL, 1) & 0x80; // set the new touched status
clearfifo = true; // only take the last FIFO reading
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
index d7a360cd..a0d5a0de 100644
--- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
+++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
@@ -56,7 +56,7 @@ static void init_board(void)
*
* @notapi
*/
-static inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_irq(void) {
return (!(palReadPad(GPIOC, 13)));
}
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h
index d2a62733..453924b0 100644
--- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h
+++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h
@@ -47,10 +47,10 @@ static void init_board(void)
*
* @notapi
*/
-static inline bool_t getpin_pressed(void)
+static inline bool_t getpin_irq(void)
{
/* Code here */
- #error "ginputSTMPE811: You must supply a definition for getpin_pressed for your board"
+ #error "ginputSTMPE811: You must supply a definition for getpin_irq for your board"
}
/**