diff options
| author | Simon Glass <sjg@chromium.org> | 2014-07-23 06:54:59 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-07-23 14:07:23 +0100 |
| commit | 709ea543b92489e7729d2d7ddd6c9f451e52158c (patch) | |
| tree | c3ae9c03a7d031e510bab2cd3fa093e1f126c5ad /drivers/input/keyboard.c | |
| parent | 91d0be1dd845913ba276e041dc11d1297390de11 (diff) | |
| download | u-boot-imx-709ea543b92489e7729d2d7ddd6c9f451e52158c.zip u-boot-imx-709ea543b92489e7729d2d7ddd6c9f451e52158c.tar.gz u-boot-imx-709ea543b92489e7729d2d7ddd6c9f451e52158c.tar.bz2 | |
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/keyboard.c')
| -rw-r--r-- | drivers/input/keyboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index 5ef1cc0..be0f333 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -70,7 +70,7 @@ static void kbd_put_queue(char data) } /* test if a character is in the queue */ -static int kbd_testc(void) +static int kbd_testc(struct stdio_dev *dev) { #if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555) /* no ISR is used, so received chars must be polled */ @@ -83,7 +83,7 @@ static int kbd_testc(void) } /* gets the character from the queue */ -static int kbd_getc(void) +static int kbd_getc(struct stdio_dev *dev) { char c; while(in_pointer==out_pointer) { |