summaryrefslogtreecommitdiffstats
path: root/drivers/input/i8042.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-07-23 06:54:59 -0600
committerSimon Glass <sjg@chromium.org>2014-07-23 14:07:23 +0100
commit709ea543b92489e7729d2d7ddd6c9f451e52158c (patch)
treec3ae9c03a7d031e510bab2cd3fa093e1f126c5ad /drivers/input/i8042.c
parent91d0be1dd845913ba276e041dc11d1297390de11 (diff)
downloadtalos-obmc-uboot-709ea543b92489e7729d2d7ddd6c9f451e52158c.tar.gz
talos-obmc-uboot-709ea543b92489e7729d2d7ddd6c9f451e52158c.zip
stdio: Pass device pointer to stdio methods
At present stdio device functions do not get any clue as to which stdio device is being acted on. Some implementations go to great lengths to work around this, such as defining a whole separate set of functions for each possible device. For driver model we need to associate a stdio_dev with a device. It doesn't seem possible to continue with this work-around approach. Instead, add a stdio_dev pointer to each of the stdio member functions. Note: The serial drivers have the same problem, but it is not strictly necessary to fix that to get driver model running. Also, if we convert serial over to driver model the problem will go away. Code size increases by 244 bytes for Thumb2 and 428 for PowerPC. 22: stdio: Pass device pointer to stdio methods arm: (for 2/2 boards) all +244.0 bss -4.0 text +248.0 powerpc: (for 1/1 boards) all +428.0 text +428.0 Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Marek Vasut <marex@denx.de> Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/input/i8042.c')
-rw-r--r--drivers/input/i8042.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 35fa0bb504..ca1604c540 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -398,7 +398,7 @@ int i8042_kbd_init(void)
* i8042_tstc - test if keyboard input is available
* option: cursor blinking if called in a loop
*/
-int i8042_tstc(void)
+int i8042_tstc(struct stdio_dev *dev)
{
unsigned char scan_code = 0;
@@ -432,7 +432,7 @@ int i8042_tstc(void)
* i8042_getc - wait till keyboard input is available
* option: turn on/off cursor while waiting
*/
-int i8042_getc(void)
+int i8042_getc(struct stdio_dev *dev)
{
int ret_chr;
unsigned char scan_code;
OpenPOWER on IntegriCloud