diff options
author | Bill Richardson <wfrichar@chromium.org> | 2013-04-24 14:56:05 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-04-24 16:32:58 -0700 |
commit | 1fb81c9c7b95df5f8ca2b81e267898d4269719f6 (patch) | |
tree | d260da72a780ab9352cc053de6c51b9b69e48a40 | |
parent | 0bfb7ddd0713b3476a077f905e96dfa9b1e22d86 (diff) | |
download | chrome-ec-1fb81c9c7b95df5f8ca2b81e267898d4269719f6.tar.gz |
Move LPC constants of out board.c and into chipset where they belong
These should be specific to the lm4's lpc.c, not the board.
BUG=chrome-os-partner:18343
TEST=build all, run link
BRANCH=none
Change-Id: Ie02bbd3cf90f09035d302f5dcaad4d33f4ef9e7c
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/49101
-rw-r--r-- | board/link/board.h | 29 | ||||
-rw-r--r-- | chip/lm4/lpc.c | 27 | ||||
-rw-r--r-- | chip/lm4/mock_lpc.c | 3 |
3 files changed, 30 insertions, 29 deletions
diff --git a/board/link/board.h b/board/link/board.h index f7ee5fba7c..e0c4170c9b 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -44,35 +44,6 @@ #define FAN_CH_KBLIGHT 1 /* Keyboard backlight */ #define FAN_CH_POWER_LED 5 /* Power adapter LED */ -/* TODO: these should really only be used inside lpc.c; once they are, remove - * from board header files. */ -/* LPC channels */ -#define LPC_CH_ACPI 0 /* ACPI commands */ -#define LPC_CH_PORT80 1 /* Port 80 debug output */ -#define LPC_CH_CMD_DATA 2 /* Data for host commands (args/params/response) */ -#define LPC_CH_KEYBOARD 3 /* 8042 keyboard emulation */ -#define LPC_CH_CMD 4 /* Host commands */ -#define LPC_CH_MEMMAP 5 /* Memory-mapped data */ -#define LPC_CH_COMX 7 /* UART emulation */ -/* LPC pool offsets */ -#define LPC_POOL_OFFS_ACPI 0 /* ACPI commands - 0=in, 1=out */ -#define LPC_POOL_OFFS_PORT80 4 /* Port 80 - 4=in, 5=out */ -#define LPC_POOL_OFFS_COMX 8 /* UART emulation range - 8-15 */ -#define LPC_POOL_OFFS_KEYBOARD 16 /* Keyboard - 16=in, 17=out */ -#define LPC_POOL_OFFS_CMD 20 /* Host commands - 20=in, 21=out */ -#define LPC_POOL_OFFS_CMD_DATA 512 /* Data range for host commands - 512-767 */ -#define LPC_POOL_OFFS_MEMMAP 768 /* Memory-mapped data - 768-1023 */ -/* LPC pool data pointers */ -#define LPC_POOL_ACPI (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_ACPI) -#define LPC_POOL_PORT80 (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_PORT80) -#define LPC_POOL_COMX (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_COMX) -#define LPC_POOL_KEYBOARD (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_KEYBOARD) -#define LPC_POOL_CMD (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_CMD) -#define LPC_POOL_CMD_DATA (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_CMD_DATA) -#define LPC_POOL_MEMMAP (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_MEMMAP) -/* LPC COMx I/O address (in x86 I/O address space) */ -#define LPC_COMX_ADDR 0x3f8 /* COM1 */ - enum adc_channel { /* EC internal die temperature in degrees K. */ diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index f3cbe41d12..5c5aad05c1 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -22,6 +22,33 @@ #include "uart.h" #include "util.h" +/* LPC channels */ +#define LPC_CH_ACPI 0 /* ACPI commands */ +#define LPC_CH_PORT80 1 /* Port 80 debug output */ +#define LPC_CH_CMD_DATA 2 /* Data for host commands (args/params/response) */ +#define LPC_CH_KEYBOARD 3 /* 8042 keyboard emulation */ +#define LPC_CH_CMD 4 /* Host commands */ +#define LPC_CH_MEMMAP 5 /* Memory-mapped data */ +#define LPC_CH_COMX 7 /* UART emulation */ +/* LPC pool offsets */ +#define LPC_POOL_OFFS_ACPI 0 /* ACPI commands - 0=in, 1=out */ +#define LPC_POOL_OFFS_PORT80 4 /* Port 80 - 4=in, 5=out */ +#define LPC_POOL_OFFS_COMX 8 /* UART emulation range - 8-15 */ +#define LPC_POOL_OFFS_KEYBOARD 16 /* Keyboard - 16=in, 17=out */ +#define LPC_POOL_OFFS_CMD 20 /* Host commands - 20=in, 21=out */ +#define LPC_POOL_OFFS_CMD_DATA 512 /* Data range for host commands - 512-767 */ +#define LPC_POOL_OFFS_MEMMAP 768 /* Memory-mapped data - 768-1023 */ +/* LPC pool data pointers */ +#define LPC_POOL_ACPI (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_ACPI) +#define LPC_POOL_PORT80 (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_PORT80) +#define LPC_POOL_COMX (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_COMX) +#define LPC_POOL_KEYBOARD (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_KEYBOARD) +#define LPC_POOL_CMD (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_CMD) +#define LPC_POOL_CMD_DATA (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_CMD_DATA) +#define LPC_POOL_MEMMAP (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_MEMMAP) +/* LPC COMx I/O address (in x86 I/O address space) */ +#define LPC_COMX_ADDR 0x3f8 /* COM1 */ + /* Console output macros */ #define CPUTS(outstr) cputs(CC_LPC, outstr) #define CPRINTF(format, args...) cprintf(CC_LPC, format, ## args) diff --git a/chip/lm4/mock_lpc.c b/chip/lm4/mock_lpc.c index b1d12efead..0d47239dd7 100644 --- a/chip/lm4/mock_lpc.c +++ b/chip/lm4/mock_lpc.c @@ -12,6 +12,7 @@ #include "registers.h" #include "uart.h" + void lpc_set_host_event_state(uint32_t mask) { uart_printf("Host event: %x\n", mask); @@ -64,6 +65,8 @@ void lpc_comx_put_char(int c) return; } +#define LPC_POOL_OFFS_CMD_DATA 512 /* Data range for host commands - 512-767 */ +#define LPC_POOL_CMD_DATA (LM4_LPC_LPCPOOL + LPC_POOL_OFFS_CMD_DATA) uint8_t *lpc_get_memmap_range(void) { |