scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-29 18:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32l: eliminate GPIO initialization done in keyboard code

Browse Source 
This eliminates the GPIO init code from stm32l's version of
keyboard_scan.c. It moves all initialization to board.c, and
also eliminates the input/output arrays that were used to represent
keyboard GPIOs earlier on. The keyboard code no longer needs
board-specific GPIO knowledge.

There were some minor nomenclature clean-ups along the way, but
but there is still more clean-up to do in future CLs.

Signed-off-by: David Hendricks <dhendrix@chromium.org>

BUG=none
TEST=tested on Daisy

Change-Id: I27e92b10262e686111f20d8e3ed9e416db245355
This commit is contained in:
David Hendricks
2012-04-12 12:33:36 -07:00
parent 432b128c06
commit fe2bae3dd5
7 changed files with 165 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
board/adv/board.c
View File

@@ -10,6 +10,9 @@
#include "registers.h"
#include "util.h"
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH)
#define GPIO_KB_OUTPUT (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OPEN_DRAIN)
/* GPIO interrupt handlers prototypes */
void gaia_power_event(enum gpio_signal signal);
@@ -21,14 +24,14 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"XPSHOLD", GPIO_A, (1<<11), GPIO_INT_RISING, gaia_power_event},
{"CHARGER_INT", GPIO_B, (1<<0), GPIO_INT_RISING, NULL},
{"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, NULL},
{"KB_COL00", GPIO_C, (1<<8), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL01", GPIO_C, (1<<9), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL02", GPIO_C, (1<<10), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL03", GPIO_C, (1<<11), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL04", GPIO_C, (1<<12), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL05", GPIO_C, (1<<14), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL06", GPIO_C, (1<<15), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL07", GPIO_D, (1<<2), GPIO_INT_BOTH, matrix_interrupt},
{"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, matrix_interrupt},
/* Other inputs */
/* Outputs */
{"EN_PP1350", GPIO_A, (1<<9), GPIO_OUT_LOW, NULL},
@@ -38,6 +41,20 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"ENTERING_RW", GPIO_B, (1<<1), GPIO_OUT_LOW, NULL},
{"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL},
{"EC_INT", GPIO_B, (1<<9), GPIO_OUT_LOW, NULL},
{"KB_OUT00", GPIO_B, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT01", GPIO_B, (1<<8), GPIO_KB_OUTPUT, NULL},
{"KB_OUT02", GPIO_B, (1<<12), GPIO_KB_OUTPUT, NULL},
{"KB_OUT03", GPIO_B, (1<<14), GPIO_KB_OUTPUT, NULL},
{"KB_OUT04", GPIO_B, (1<<15), GPIO_KB_OUTPUT, NULL},
{"KB_OUT05", GPIO_C, (1<<0), GPIO_KB_OUTPUT, NULL},
{"KB_OUT06", GPIO_C, (1<<2), GPIO_KB_OUTPUT, NULL},
{"KB_OUT07", GPIO_C, (1<<4), GPIO_KB_OUTPUT, NULL},
{"KB_OUT08", GPIO_C, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT09", GPIO_C, (1<<6), GPIO_KB_OUTPUT, NULL},
{"KB_OUT10", GPIO_B, (1<<13), GPIO_KB_OUTPUT, NULL},
{"KB_OUT11", GPIO_C, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT12", GPIO_C, (1<<7), GPIO_KB_OUTPUT, NULL},
};
void configure_board(void)

30
board/adv/board.h
View File

@@ -25,14 +25,14 @@ enum gpio_signal {
GPIO_CHARGER_INT,
GPIO_LID_OPEN, /* LID switch detection */
/* Keyboard inputs */
KB_COL00,
KB_COL01,
KB_COL02,
KB_COL03,
KB_COL04,
KB_COL05,
KB_COL06,
KB_COL07,
GPIO_KB_IN00,
GPIO_KB_IN01,
GPIO_KB_IN02,
GPIO_KB_IN03,
GPIO_KB_IN04,
GPIO_KB_IN05,
GPIO_KB_IN06,
GPIO_KB_IN07,
/* Other inputs */
/* Outputs */
GPIO_EN_PP1350, /* DDR 1.35v rail enable */
@@ -42,6 +42,20 @@ enum gpio_signal {
GPIO_EC_ENTERING_RW, /* EC is R/W mode for the kbc mux */
GPIO_CHARGER_EN,
GPIO_EC_INT,
/* Keyboard outputs */
GPIO_KB_OUT00,
GPIO_KB_OUT01,
GPIO_KB_OUT02,
GPIO_KB_OUT03,
GPIO_KB_OUT04,
GPIO_KB_OUT05,
GPIO_KB_OUT06,
GPIO_KB_OUT07,
GPIO_KB_OUT08,
GPIO_KB_OUT09,
GPIO_KB_OUT10,
GPIO_KB_OUT11,
GPIO_KB_OUT12,
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT

32
board/daisy/board.c
View File

@@ -26,6 +26,9 @@
* 1-byte checksum).
*/
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH)
#define GPIO_KB_OUTPUT (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OPEN_DRAIN)
/* GPIO interrupt handlers prototypes */
void gaia_power_event(enum gpio_signal signal);
@@ -37,14 +40,14 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"XPSHOLD", GPIO_A, (1<<11), GPIO_INT_RISING, gaia_power_event},
{"CHARGER_INT", GPIO_B, (1<<0), GPIO_INT_RISING, NULL},
{"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, NULL},
{"KB_COL00", GPIO_C, (1<<8), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL01", GPIO_C, (1<<9), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL02", GPIO_C, (1<<10), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL03", GPIO_C, (1<<11), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL04", GPIO_C, (1<<12), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL05", GPIO_C, (1<<14), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL06", GPIO_C, (1<<15), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL07", GPIO_D, (1<<2), GPIO_INT_BOTH, matrix_interrupt},
{"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, matrix_interrupt},
/* Other inputs */
{"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_RISING, NULL},
@@ -56,6 +59,19 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"ENTERING_RW", GPIO_B, (1<<1), GPIO_OUT_LOW, NULL},
{"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL},
{"EC_INT", GPIO_B, (1<<9), GPIO_HI_Z, NULL},
{"KB_OUT00", GPIO_B, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT01", GPIO_B, (1<<8), GPIO_KB_OUTPUT, NULL},
{"KB_OUT02", GPIO_B, (1<<12), GPIO_KB_OUTPUT, NULL},
{"KB_OUT03", GPIO_B, (1<<13), GPIO_KB_OUTPUT, NULL},
{"KB_OUT04", GPIO_B, (1<<14), GPIO_KB_OUTPUT, NULL},
{"KB_OUT05", GPIO_B, (1<<15), GPIO_KB_OUTPUT, NULL},
{"KB_OUT06", GPIO_C, (1<<0), GPIO_KB_OUTPUT, NULL},
{"KB_OUT07", GPIO_C, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT08", GPIO_C, (1<<2), GPIO_KB_OUTPUT, NULL},
{"KB_OUT09", GPIO_C, (1<<4), GPIO_KB_OUTPUT, NULL},
{"KB_OUT10", GPIO_C, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT11", GPIO_C, (1<<6), GPIO_KB_OUTPUT, NULL},
{"KB_OUT12", GPIO_C, (1<<7), GPIO_KB_OUTPUT, NULL},
};
void configure_board(void)

30
board/daisy/board.h
View File

@@ -27,14 +27,14 @@ enum gpio_signal {
GPIO_CHARGER_INT,
GPIO_LID_OPEN, /* LID switch detection */
/* Keyboard inputs */
KB_COL00,
KB_COL01,
KB_COL02,
KB_COL03,
KB_COL04,
KB_COL05,
KB_COL06,
KB_COL07,
GPIO_KB_IN00,
GPIO_KB_IN01,
GPIO_KB_IN02,
GPIO_KB_IN03,
GPIO_KB_IN04,
GPIO_KB_IN05,
GPIO_KB_IN06,
GPIO_KB_IN07,
/* Other inputs */
GPIO_SPI1_NSS,
/* Outputs */
@@ -45,7 +45,19 @@ enum gpio_signal {
GPIO_EC_ENTERING_RW, /* EC is R/W mode for the kbc mux */
GPIO_CHARGER_EN,
GPIO_EC_INT,
GPIO_KB_OUT00,
GPIO_KB_OUT01,
GPIO_KB_OUT02,
GPIO_KB_OUT03,
GPIO_KB_OUT04,
GPIO_KB_OUT05,
GPIO_KB_OUT06,
GPIO_KB_OUT07,
GPIO_KB_OUT08,
GPIO_KB_OUT09,
GPIO_KB_OUT10,
GPIO_KB_OUT11,
GPIO_KB_OUT12,
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT
};

36
board/discovery/board.c
View File

@@ -9,22 +9,38 @@
#include "registers.h"
#include "util.h"
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH)
#define GPIO_KB_OUTPUT (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OPEN_DRAIN)
/* GPIO signal list. Must match order from enum gpio_signal. */
const struct gpio_info gpio_list[GPIO_COUNT] = {
/* Inputs with interrupt handlers are first for efficiency */
{"USER_BUTTON", GPIO_A, (1<<0), GPIO_INT_BOTH, NULL},
{"KB_COL00", GPIO_C, (1<<8), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL01", GPIO_C, (1<<9), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL02", GPIO_C, (1<<10), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL03", GPIO_C, (1<<11), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL04", GPIO_C, (1<<12), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL05", GPIO_C, (1<<14), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL06", GPIO_C, (1<<15), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL07", GPIO_D, (1<<2), GPIO_INT_BOTH, matrix_interrupt},
{"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, matrix_interrupt},
/* Other inputs */
/* Outputs */
{"BLUE_LED", GPIO_B, (1<<6), GPIO_OUT_LOW, NULL},
{"GREEN_LED", GPIO_B, (1<<7), GPIO_OUT_LOW, NULL},
{"BLUE_LED", GPIO_B, (1<<6), GPIO_OUT_LOW, NULL},
{"GREEN_LED", GPIO_B, (1<<7), GPIO_OUT_LOW, NULL},
{"KB_OUT00", GPIO_B, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT01", GPIO_B, (1<<8), GPIO_KB_OUTPUT, NULL},
{"KB_OUT02", GPIO_B, (1<<12), GPIO_KB_OUTPUT, NULL},
{"KB_OUT03", GPIO_B, (1<<13), GPIO_KB_OUTPUT, NULL},
{"KB_OUT04", GPIO_B, (1<<14), GPIO_KB_OUTPUT, NULL},
{"KB_OUT05", GPIO_B, (1<<15), GPIO_KB_OUTPUT, NULL},
{"KB_OUT06", GPIO_C, (1<<0), GPIO_KB_OUTPUT, NULL},
{"KB_OUT07", GPIO_C, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT08", GPIO_C, (1<<2), GPIO_KB_OUTPUT, NULL},
{"KB_OUT09", GPIO_A, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT10", GPIO_A, (1<<2), GPIO_KB_OUTPUT, NULL},
{"KB_OUT11", GPIO_C, (1<<6), GPIO_KB_OUTPUT, NULL},
{"KB_OUT12", GPIO_C, (1<<7), GPIO_KB_OUTPUT, NULL},
};
void configure_board(void)

30
board/discovery/board.h
View File

@@ -24,18 +24,32 @@ enum gpio_signal {
/* Inputs with interrupt handlers are first for efficiency */
GPIO_USER_BUTTON = 0, /* Blue user button */
/* Keyboard inputs */
KB_COL00,
KB_COL01,
KB_COL02,
KB_COL03,
KB_COL04,
KB_COL05,
KB_COL06,
KB_COL07,
GPIO_KB_IN00,
GPIO_KB_IN01,
GPIO_KB_IN02,
GPIO_KB_IN03,
GPIO_KB_IN04,
GPIO_KB_IN05,
GPIO_KB_IN06,
GPIO_KB_IN07,
/* Other inputs */
/* Outputs */
GPIO_BLUE_LED, /* Blue debug LED */
GPIO_GREEN_LED, /* Green debug LED */
/* Keyboard outputs */
GPIO_KB_OUT00,
GPIO_KB_OUT01,
GPIO_KB_OUT02,
GPIO_KB_OUT03,
GPIO_KB_OUT04,
GPIO_KB_OUT05,
GPIO_KB_OUT06,
GPIO_KB_OUT07,
GPIO_KB_OUT08,
GPIO_KB_OUT09,
GPIO_KB_OUT10,
GPIO_KB_OUT11,
GPIO_KB_OUT12,
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT

218
chip/stm32l/keyboard_scan.c
View File

@@ -3,7 +3,11 @@
* found in the LICENSE file.
*/
/* Keyboard scanner module for Chrome EC */
/*
* Keyboard scanner module for Chrome EC
*
* TODO: Finish cleaning up nomenclature (cols/rows/inputs/outputs),
*/
#include "board.h"
#include "gpio.h"
@@ -15,47 +19,6 @@
#include "uart.h"
#include "util.h"
/* Notes:
*
* Daisy schematic calls the outputs rows and the inputs columns. The
* codebase uses the opposite convention.
*
* Outputs: Open-drain, pull-up, output '1' --> impedence state (Hi-Z)
* Inputs: Pull-up
* Daisy:
*
* Columns (outputs):
* KB_ROW00 = PB5
* KB_ROW01 = PB8
* KB_ROW02:5 = PB12:15
* KB_ROW06:8 = PC0:2
* KB_ROW09:12 = PC4:7
* Rows (inputs):
* KB_COL00:04 = PC8:12
* KB_COL05:06 = PC14:15
* KB_COL07 = PD2
* Other:
*
*
* Discovery:
*
* Columns (outputs):
* KB_ROW00 = PB5
* KB_ROW01 = PB8
* KB_ROW02:05 = PB12:15
* KB_ROW06:08 = PC0:2
* KB_ROW09:10 = PA1:2
* KB_ROW11:12 = PC6:7
* Rows (inputs):
* KB_COL00:04 = PC8:12
* KB_COL05:06 = PC14:15
* KB_COL07 = PD2
* Other:
*
* TODO: clean up the nomenclature above; it's weird that KB_ROW00 is a column
* and KB_COL00 is a row...
*/
extern struct gpio_info gpio_list[];
/* used for select_column() */
@@ -99,70 +62,6 @@ struct kbc_gpio {
int pin;
};
const struct kbc_gpio kbc_outputs[] = {
/* Keep this in order of column number */
#if defined(BOARD_daisy)
{ 0, GPIO_B, 5 }, /* KB_ROW00: PB5 */
{ 1, GPIO_B, 8 }, /* KB_ROW01: PB8 */
{ 2, GPIO_B, 12 }, /* KB_ROW02: PB12 */
{ 3, GPIO_B, 13 }, /* KB_ROW03: PB13 */
{ 4, GPIO_B, 14 }, /* KB_ROW04: PB14 */
{ 5, GPIO_B, 15 }, /* KB_ROW05: PB15 */
{ 6, GPIO_C, 0 }, /* KB_ROW06: PC0 */
{ 7, GPIO_C, 1 }, /* KB_ROW07: PC1 */
{ 8, GPIO_C, 2 }, /* KB_ROW08: PC2 */
{ 9, GPIO_C, 4 }, /* KB_ROW09: PC4 */
{ 10, GPIO_C, 5 }, /* KB_ROW10: PC5 */
{ 11, GPIO_C, 6 }, /* KB_ROW11: PC6 */
{ 12, GPIO_C, 7 }, /* KB_ROW12: PC7 */
#elif defined(BOARD_discovery)
{ 0, GPIO_B, 5 }, /* KB_ROW00: PB5 */
{ 1, GPIO_B, 8 }, /* KB_ROW01: PB8 */
{ 2, GPIO_B, 12 }, /* KB_ROW02: PB12 */
{ 3, GPIO_B, 13 }, /* KB_ROW03: PB13 */
{ 4, GPIO_B, 14 }, /* KB_ROW04: PB14 */
{ 5, GPIO_B, 15 }, /* KB_ROW05: PB15 */
{ 6, GPIO_C, 0 }, /* KB_ROW06: PC0 */
{ 7, GPIO_C, 1 }, /* KB_ROW07: PC1 */
{ 8, GPIO_C, 2 }, /* KB_ROW08: PC2 */
{ 9, GPIO_A, 1 }, /* KB_ROW09: PA1 */
{ 10, GPIO_A, 2 }, /* KB_ROW10: PA2 */
{ 11, GPIO_C, 6 }, /* KB_ROW11: PC6 */
{ 12, GPIO_C, 7 }, /* KB_ROW12: PC7 */
#elif defined(BOARD_adv)
{ 0, GPIO_B, 5 }, /* KB_ROW00: PB5 */
{ 1, GPIO_B, 8 }, /* KB_ROW01: PB8 */
{ 2, GPIO_B, 12 }, /* KB_ROW02: PB12 */
{ 3, GPIO_B, 14 }, /* KB_ROW03: PB14 */
{ 4, GPIO_B, 15 }, /* KB_ROW04: PB15 */
{ 5, GPIO_C, 0 }, /* KB_ROW05: PC0 */
{ 6, GPIO_C, 2 }, /* KB_ROW06: PC2 */
{ 7, GPIO_C, 4 }, /* KB_ROW07: PC4 */
{ 8, GPIO_C, 5 }, /* KB_ROW08: PC5 */
{ 9, GPIO_C, 6 }, /* KB_ROW09: PC6 */
{ 10, GPIO_B, 13 }, /* KB_ROW10: PB13 */
{ 11, GPIO_C, 1 }, /* KB_ROW11: PC1 */
{ 12, GPIO_C, 7 }, /* KB_ROW12: PC7 */
#else
#error "Need to define columns (outputs) for this board"
#endif
};
const struct kbc_gpio kbc_inputs[] = {
#if defined(BOARD_daisy) || defined(BOARD_discovery) || defined(BOARD_adv)
{ 0, GPIO_C, 8 }, /* KB_COL00: PC8 */
{ 1, GPIO_C, 9 }, /* KB_COL01: PC9 */
{ 2, GPIO_C, 10 }, /* KB_COL02: PC10 */
{ 3, GPIO_C, 11 }, /* KB_COL03: PC11 */
{ 4, GPIO_C, 12 }, /* KB_COL04: PC12 */
{ 5, GPIO_C, 14 }, /* KB_COL05: PC14 */
{ 6, GPIO_C, 15 }, /* KB_COL06: PC15 */
{ 7, GPIO_D, 2 }, /* KB_COL07: PD2 */
#else
#error "Need to define rows (inputs) for this board"
#endif
};
#if defined(BOARD_daisy) || defined(BOARD_adv)
static const uint32_t ports[] = { GPIO_B, GPIO_C, GPIO_D };
#elif defined(BOARD_discovery)
@@ -182,30 +81,29 @@ void board_keyboard_scan_ready(void)
static void select_column(int col)
{
int i;
int done = 0;
int i, done = 0;
for (i = 0; i < ARRAY_SIZE(ports); i++) {
uint32_t bsrr = 0;
int j;
for (j = 0; j < ARRAY_SIZE(kbc_outputs); j++) {
if (kbc_outputs[j].port != ports[i])
for (j = GPIO_KB_OUT00; j < GPIO_KB_OUT12; j++) {
if (gpio_list[j].port != ports[i])
continue;
if (col == COL_ASSERT_ALL) {
/* drive low (clear output data) */
bsrr |= (1 << (kbc_outputs[j].pin)) << 16;
bsrr |= gpio_list[j].mask << 16;
} else if (col == COL_TRI_STATE_ALL) {
/* put column in hi-Z state (set output data) */
bsrr |= 1 << (kbc_outputs[j].pin);
bsrr |= gpio_list[j].mask;
} else {
/* drive specified column low, others => hi-Z */
if (kbc_outputs[j].num == col) {
if (j - GPIO_KB_OUT00 == col) {
/* to avoid conflict, tri-state all
* columns first, then assert column */
select_column(COL_TRI_STATE_ALL);
bsrr |= (1 << kbc_outputs[j].pin) << 16;
bsrr |= gpio_list[j].mask << 16;
done = 1;
break;
}
@@ -223,81 +121,15 @@ static void select_column(int col)
int keyboard_scan_init(void)
{
int i, j;
uint32_t tmp32;
uint16_t tmp16;
int i;
/* initialize outputs (pull-up, open-drain)
* TODO: this should be done via GPIO declaration in board.c */
for (i = 0; i < ARRAY_SIZE(ports); i++) {
uint32_t mask32 = 0, mode = 0, pupd = 0;
uint16_t mask16 = 0, otype = 0;
for (j = 0; j < ARRAY_SIZE(kbc_outputs); j++) {
if (kbc_outputs[j].port != ports[i])
continue;
mask32 |= 3 << (kbc_outputs[j].pin * 2);
mask16 |= 1 << kbc_outputs[j].pin;
/* output mode */
mode |= 1 << (kbc_outputs[j].pin * 2);
/* pull-up */
pupd |= 1 << (kbc_outputs[j].pin * 2);
/* open-drain */
otype |= 1 << kbc_outputs[j].pin;
}
if (!mask32) /* nothing to do on this port */
continue;
tmp32 = STM32L_GPIO_MODER_OFF(ports[i]);
tmp32 = (tmp32 & ~mask32) | mode;
STM32L_GPIO_MODER_OFF(ports[i]) = tmp32;
tmp32 = STM32L_GPIO_PUPDR_OFF(ports[i]);
tmp32 = (tmp32 & ~mask32) | pupd;
STM32L_GPIO_PUPDR_OFF(ports[i]) = tmp32;
tmp16 = STM32L_GPIO_OTYPER_OFF(ports[i]);
tmp16 = (tmp16 & ~mask16) | otype;
STM32L_GPIO_OTYPER_OFF(ports[i]) = tmp16;
}
uart_printf("[kbscan %s()] initializing keyboard...\n", __func__);
/* Tri-state (put into Hi-Z) the outputs */
select_column(COL_TRI_STATE_ALL);
/* initialize inputs
* TODO: this should be done via GPIO declaration in board.c */
for (i = 0; i < ARRAY_SIZE(ports); i++) {
uint32_t mask32 = 0, pupd = 0;
for (j = 0; j < ARRAY_SIZE(kbc_inputs); j++) {
if (kbc_inputs[j].port != ports[i])
continue;
mask32 |= 3 << (kbc_inputs[j].pin * 2);
/* pull-up */
pupd |= 1 << (kbc_inputs[j].pin * 2);
}
if (!mask32)
continue; /* nothing to do on this port */
STM32L_GPIO_MODER_OFF(ports[i]) &= ~mask32;
tmp32 = STM32L_GPIO_PUPDR_OFF(ports[i]);
tmp32 = (tmp32 & ~mask32) | pupd;
STM32L_GPIO_PUPDR_OFF(ports[i]) = tmp32;
}
/*
* Initialize raw state since host may request it before
* a key has been pressed (e.g. during keyboard driver init)
*/
/* initialize raw state since host may request it before
* a key has been pressed (e.g. during keyboard driver init) */
for (i = 0; i < ARRAY_SIZE(raw_state); i++)
raw_state[i] = 0x00;
@@ -422,15 +254,15 @@ void keyboard_scan_task(void)
{
int key_press_timer = 0;
/* Enable interrupts for keyboard rows */
gpio_enable_interrupt(KB_COL00);
gpio_enable_interrupt(KB_COL01);
gpio_enable_interrupt(KB_COL02);
gpio_enable_interrupt(KB_COL03);
gpio_enable_interrupt(KB_COL04);
gpio_enable_interrupt(KB_COL05);
gpio_enable_interrupt(KB_COL06);
gpio_enable_interrupt(KB_COL07);
/* Enable interrupts for keyboard matrix inputs */
gpio_enable_interrupt(GPIO_KB_IN00);
gpio_enable_interrupt(GPIO_KB_IN01);
gpio_enable_interrupt(GPIO_KB_IN02);
gpio_enable_interrupt(GPIO_KB_IN03);
gpio_enable_interrupt(GPIO_KB_IN04);
gpio_enable_interrupt(GPIO_KB_IN05);
gpio_enable_interrupt(GPIO_KB_IN06);
gpio_enable_interrupt(GPIO_KB_IN07);
while (1) {
wait_for_interrupt();