scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-08 16:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32: fix keyboard FIFO

Browse Source 
When the FIFO is empty, returns the last read entry not the next one.

also rewrite the FIFO index increment to generate slightly better code.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=chrome-os-partner:8869
TEST=On Snow, in U-Boot using "stdin=mkbp-keyb" type on internal
keyboard and see the correct text.

Change-Id: I189d230053de40dd563ce672db82dd6217e545e3
This commit is contained in:
Vincent Palatin
2012-05-25 15:56:55 +00:00
parent 61902efd16
commit 38bab6b9f1
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
board/snow/board.h
View File

@@ -17,6 +17,9 @@
/* use I2C for host communication */
#define CONFIG_I2C
/* By default, enable all console messages except keyboard */
#define CC_DEFAULT (CC_ALL & ~CC_MASK(CC_KEYSCAN))
#define USB_CHARGE_PORT_COUNT 0
/* EC drives 13 outputs to keyboard matrix */

22
chip/stm32/keyboard_scan.c
View File

@@ -76,8 +76,8 @@ void board_keyboard_suppress_noise(void)
__attribute__((weak, alias("__board_keyboard_suppress_noise")));
#define KB_FIFO_DEPTH 16 /* FIXME: this is pretty huge */
static int kb_fifo_start; /* first entry */
static int kb_fifo_end; /* last entry */
static uint32_t kb_fifo_start; /* first entry */
static uint32_t kb_fifo_end; /* last entry */
static uint32_t kb_fifo_entries; /* number of existing entries */
static uint8_t kb_fifo[KB_FIFO_DEPTH][KB_OUTPUTS];
@@ -111,10 +111,7 @@ static int kb_fifo_add(uint8_t *buffp)
memcpy(kb_fifo[kb_fifo_end], buffp, KB_OUTPUTS);
if (kb_fifo_end == KB_FIFO_DEPTH - 1)
kb_fifo_end = 0;
else
kb_fifo_end++;
kb_fifo_end = (kb_fifo_end + 1) % KB_FIFO_DEPTH;
atomic_add(&kb_fifo_entries, 1);
@@ -129,10 +126,11 @@ kb_fifo_push_done:
*/
static int kb_fifo_remove(uint8_t *buffp)
{
memcpy(buffp, kb_fifo[kb_fifo_start], KB_OUTPUTS);
if (!kb_fifo_entries) {
CPRINTF("%s: No entries remaining in FIFO\n", __func__);
/* no entry remaining in FIFO : return last known state */
memcpy(buffp, kb_fifo[(kb_fifo_start - 1) % KB_FIFO_DEPTH],
KB_OUTPUTS);
/*
* Bail out without changing any FIFO indices and let the
* caller know something strange happened. The buffer will
@@ -140,11 +138,9 @@ static int kb_fifo_remove(uint8_t *buffp)
*/
return EC_ERROR_UNKNOWN;
}
memcpy(buffp, kb_fifo[kb_fifo_start], KB_OUTPUTS);
if (kb_fifo_start == KB_FIFO_DEPTH - 1)
kb_fifo_start = 0;
else
kb_fifo_start++;
kb_fifo_start = (kb_fifo_start + 1) % KB_FIFO_DEPTH;
atomic_sub(&kb_fifo_entries, 1);