projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drv_video_init(): simplify logic
[oweals/u-boot.git]
/
drivers
/
input
/
i8042.c
diff --git
a/drivers/input/i8042.c
b/drivers/input/i8042.c
index 22c2a4e3a02da185783e0a1064ceca2f54f0866d..58094c925ceccfae14e969c2567cc496feca51de 100644
(file)
--- a/
drivers/input/i8042.c
+++ b/
drivers/input/i8042.c
@@
-27,8
+27,6
@@
#include <common.h>
#include <common.h>
-#ifdef CONFIG_I8042_KBD
-
#ifdef CONFIG_USE_CPCIDVI
extern u8 gt_cpcidvi_in8(u32 offset);
extern void gt_cpcidvi_out8(u32 offset, u8 data);
#ifdef CONFIG_USE_CPCIDVI
extern u8 gt_cpcidvi_in8(u32 offset);
extern void gt_cpcidvi_out8(u32 offset, u8 data);
@@
-43,7
+41,7
@@
extern void gt_cpcidvi_out8(u32 offset, u8 data);
#ifdef CONFIG_CONSOLE_CURSOR
extern void console_cursor (int state);
#ifdef CONFIG_CONSOLE_CURSOR
extern void console_cursor (int state);
-static int blinkCount = C
FG
_CONSOLE_BLINK_COUNT;
+static int blinkCount = C
ONFIG_SYS
_CONSOLE_BLINK_COUNT;
static int cursor_state = 0;
#endif
static int cursor_state = 0;
#endif
@@
-370,7
+368,7
@@
int i8042_tstc (void)
{
cursor_state ^= 1;
console_cursor (cursor_state);
{
cursor_state ^= 1;
console_cursor (cursor_state);
- blinkCount = C
FG
_CONSOLE_BLINK_COUNT;
+ blinkCount = C
ONFIG_SYS
_CONSOLE_BLINK_COUNT;
udelay (10);
}
#endif
udelay (10);
}
#endif
@@
-411,7
+409,7
@@
int i8042_getc (void)
{
cursor_state ^= 1;
console_cursor (cursor_state);
{
cursor_state ^= 1;
console_cursor (cursor_state);
- blinkCount = C
FG
_CONSOLE_BLINK_COUNT;
+ blinkCount = C
ONFIG_SYS
_CONSOLE_BLINK_COUNT;
}
udelay (10);
#endif
}
udelay (10);
#endif
@@
-670,5
+668,3
@@
static int kbd_reset (void)
return 0;
}
return 0;
}
-
-#endif /* CONFIG_I8042_KBD */