<p>steve-m has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15150">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fw/keypad: Poll Iota powerbutton if required<br><br>This commit adds polling of the TWL3025 PWON<br>signal. If the powerbutton is pressed on targets<br>that use it (Pirelli DP-L10, Huawei GTM900-B),<br>a normal keypad scanning cycle is started in order<br>to preserve the timing, required for the 500ms<br>power off press duration for example.<br><br>Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596<br>---<br>M src/target/firmware/board/compal/keymap.h<br>M src/target/firmware/board/pirelli_dpl10/keymap.h<br>M src/target/firmware/calypso/keypad.c<br>M src/target/firmware/include/keypad.h<br>4 files changed, 27 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/15150/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/board/compal/keymap.h b/src/target/firmware/board/compal/keymap.h</span><br><span>index ce8f9c2..fe0e303 100644</span><br><span>--- a/src/target/firmware/board/compal/keymap.h</span><br><span>+++ b/src/target/firmware/board/compal/keymap.h</span><br><span>@@ -23,5 +23,6 @@</span><br><span> [KEY_OK] = 0,</span><br><span> [KEY_POWER] = 24,</span><br><span> [KEY_MINUS] = 30, /* not existent */</span><br><span style="color: hsl(0, 100%, 40%);">- [KEY_PLUS] = 31, /* not existent */</span><br><span style="color: hsl(120, 100%, 40%);">+ [KEY_PLUS] = 30, /* not existent */</span><br><span style="color: hsl(120, 100%, 40%);">+ [KEY_CAMERA] = 30, /* not existent */</span><br><span> };</span><br><span>diff --git a/src/target/firmware/board/pirelli_dpl10/keymap.h b/src/target/firmware/board/pirelli_dpl10/keymap.h</span><br><span>index b85621b..b06f17d 100644</span><br><span>--- a/src/target/firmware/board/pirelli_dpl10/keymap.h</span><br><span>+++ b/src/target/firmware/board/pirelli_dpl10/keymap.h</span><br><span>@@ -21,8 +21,9 @@</span><br><span> [KEY_LEFT] = 5,</span><br><span> [KEY_RIGHT] = 10,</span><br><span> [KEY_OK] = 11,</span><br><span style="color: hsl(0, 100%, 40%);">-/* power button is not connected, we use the camera button instead */</span><br><span style="color: hsl(0, 100%, 40%);">- [KEY_POWER] = 23,</span><br><span style="color: hsl(120, 100%, 40%);">+/* power button is not connected to keypad scan matrix but to TWL3025 */</span><br><span style="color: hsl(120, 100%, 40%);">+ [KEY_POWER] = 31,</span><br><span> [KEY_MINUS] = 22,</span><br><span> [KEY_PLUS] = 21,</span><br><span style="color: hsl(120, 100%, 40%);">+ [KEY_CAMERA] = 23,</span><br><span> };</span><br><span>diff --git a/src/target/firmware/calypso/keypad.c b/src/target/firmware/calypso/keypad.c</span><br><span>index 937f8bd..c3c1810 100644</span><br><span>--- a/src/target/firmware/calypso/keypad.c</span><br><span>+++ b/src/target/firmware/calypso/keypad.c</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /* Driver for the keypad attached to the TI Calypso */</span><br><span> </span><br><span> /* (C) 2010 by roh <roh@hyte.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2013 by Steve Markgraf <steve@steve-m.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2013-19 by Steve Markgraf <steve@steve-m.de></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -119,6 +119,15 @@</span><br><span> static uint16_t reg;</span><br><span> static uint16_t col;</span><br><span> static uint32_t buttons = 0, debounce1 = 0, debounce2 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t use_iota_pwrbtn = (btn_map[KEY_POWER] == 31);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t pwr_mask = (1 << btn_map[KEY_POWER]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only read Iota powerbutton if it was not yet pressed */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (use_iota_pwrbtn && !(buttons & pwr_mask) && twl3025_get_pwon()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ buttons |= pwr_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!polling)</span><br><span style="color: hsl(120, 100%, 40%);">+ polling = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (with_interrupts && !polling)</span><br><span> return;</span><br><span>@@ -154,7 +163,6 @@</span><br><span> </span><br><span> col++;</span><br><span> if (col > 5) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t pwr_mask = (1 << btn_map[KEY_POWER]);</span><br><span> col = 0;</span><br><span> /* if power button, ignore other states */</span><br><span> if (buttons & pwr_mask)</span><br><span>@@ -162,6 +170,16 @@</span><br><span> else if (lastbuttons & pwr_mask)</span><br><span> buttons = lastbuttons & ~pwr_mask;</span><br><span> dispatch_buttons(buttons);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* check if powerbutton connected to Iota was released */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (use_iota_pwrbtn && (buttons & pwr_mask) && !twl3025_get_pwon()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ buttons &= ~pwr_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* dispatch buttons again so we do not loose</span><br><span style="color: hsl(120, 100%, 40%);">+ * very short powerbutton presses */</span><br><span style="color: hsl(120, 100%, 40%);">+ dispatch_buttons(buttons);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (buttons == 0) {</span><br><span> writew(0x0, KBC_REG);</span><br><span> polling = 3;</span><br><span>@@ -172,5 +190,4 @@</span><br><span> writew(0xff, KBC_REG);</span><br><span> else</span><br><span> writew(0x1f & ~(0x1 << col ), KBC_REG);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span>diff --git a/src/target/firmware/include/keypad.h b/src/target/firmware/include/keypad.h</span><br><span>index 9e9acfe..2ad9889 100644</span><br><span>--- a/src/target/firmware/include/keypad.h</span><br><span>+++ b/src/target/firmware/include/keypad.h</span><br><span>@@ -25,11 +25,11 @@</span><br><span> KEY_POWER, //red on-hook</span><br><span> KEY_MINUS,</span><br><span> KEY_PLUS,</span><br><span style="color: hsl(120, 100%, 40%);">+ KEY_CAMERA,</span><br><span style="color: hsl(120, 100%, 40%);">+ BUTTON_CNT,</span><br><span> KEY_INV = 0xFF</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BUTTON_CNT 23</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum key_states {</span><br><span> PRESSED,</span><br><span> RELEASED,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15150">change 15150</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/15150"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I904baf40d621bd680b602b88d12ff462b3c17596 </div>
<div style="display:none"> Gerrit-Change-Number: 15150 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: steve-m <steve@steve-m.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>