scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-11 18:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test compilation error for link

Browse Source 
Now pingpong and mutex tests compile. Still need some more work to
handle the i8042-specific KEYPROTO task for keyboard tests.

BUG=chrome-os-partner:18598
TEST=Build tests for link
BRANCH=None

Change-Id: I9ee35d4edb811f17b9a81beb799484a07c0bef14
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47981
This commit is contained in:
Vic Yang
2013-04-12 15:19:50 +08:00
committed by ChromeBot
parent 2b3c02bf9f
commit 27459f8600
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/link/board.h
View File

@@ -23,7 +23,9 @@
#define CONFIG_CHIPSET_X86
#endif
#define CONFIG_EXTPOWER_GPIO
#ifdef CONFIG_TASK_KEYPROTO
#define CONFIG_KEYBOARD_PROTOCOL_8042
#endif
#define CONFIG_LID_SWITCH
#define CONFIG_LPC
#define CONFIG_ONEWIRE

4
chip/lm4/keyboard_raw.c
View File

@@ -51,7 +51,7 @@ void keyboard_raw_task_start(void)
task_enable_irq(KB_SCAN_ROW_IRQ);
}
void keyboard_raw_drive_column(int col)
test_mockable void keyboard_raw_drive_column(int col)
{
if (col == KEYBOARD_COLUMN_NONE) {
/* Tri-state all outputs */
@@ -72,7 +72,7 @@ void keyboard_raw_drive_column(int col)
}
}
int keyboard_raw_read_rows(void)
test_mockable int keyboard_raw_read_rows(void)
{
/* Bits are active-low, so invert returned levels */
return LM4_GPIO_DATA(KB_SCAN_ROW_GPIO, 0xff) ^ 0xff;

4
chip/lm4/switch.c
View File

@@ -191,7 +191,9 @@ static void power_button_pressed(uint64_t tnow)
pwrbtn_state = PWRBTN_STATE_PRESSED;
tnext_state = tnow;
*memmap_switches |= EC_SWITCH_POWER_BUTTON_PRESSED;
#ifdef CONFIG_TASK_KEYPROTO
keyboard_set_power_button(1);
#endif
host_set_single_event(EC_HOST_EVENT_POWER_BUTTON);
}
@@ -210,7 +212,9 @@ static void power_button_released(uint64_t tnow)
pwrbtn_state = PWRBTN_STATE_RELEASED;
tnext_state = tnow;
*memmap_switches &= ~EC_SWITCH_POWER_BUTTON_PRESSED;
#ifdef CONFIG_TASK_KEYPROTO
keyboard_set_power_button(0);
#endif
}
/**

9
include/chipset.h
View File

@@ -51,7 +51,7 @@ static inline int chipset_in_state(int state_mask)
}
#endif
#ifdef CONFIG_TASK_CHIPSET
/**
* Ask the chipset to exit the hard off state.
*
@@ -59,6 +59,9 @@ static inline int chipset_in_state(int state_mask)
* state to begin with.
*/
void chipset_exit_hard_off(void);
#else
static inline void chipset_exit_hard_off(void) { }
#endif
/**
* Enable/disable CPU throttling.
@@ -67,6 +70,7 @@ void chipset_exit_hard_off(void);
*/
void chipset_throttle_cpu(int throttle);
#ifdef CONFIG_TASK_CHIPSET
/**
* Immedaitely shut off power to main processor and chipset.
*
@@ -74,6 +78,9 @@ void chipset_throttle_cpu(int throttle);
* critical.
*/
void chipset_force_shutdown(void);
#else
static inline void chipset_force_shutdown(void) { }
#endif
/**
* Reset the CPU and/or chipset.

11
include/keyboard_scan.h
View File

@@ -51,12 +51,19 @@ enum boot_key {
BOOT_KEY_OTHER = -1, /* None of the above */
};
#ifdef CONFIG_TASK_KEYSCAN
/**
* Return the key held down at boot time in addition to the keyboard-controlled
* reset keys. Returns BOOT_KEY_OTHER if none of the keys specifically checked
* was pressed, or reset was not caused by a keyboard-controlled reset.
*/
enum boot_key keyboard_scan_get_boot_key(void);
#else
static inline enum boot_key keyboard_scan_get_boot_key(void)
{
return BOOT_KEY_NONE;
}
#endif
/**
* Return a pointer to the current debounced keyboard matrix state, which is
@@ -64,10 +71,14 @@ enum boot_key keyboard_scan_get_boot_key(void);
*/
const uint8_t *keyboard_scan_get_state(void);
#ifdef CONFIG_TASK_KEYSCAN
/**
* Enables/disables keyboard matrix scan.
*/
void keyboard_scan_enable(int enable);
#else
static inline void keyboard_scan_enable(int enable) { }
#endif
#ifdef CONFIG_KEYBOARD_SUPPRESS_NOISE
/**