X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=drivers%2Finput%2Fkeyboard.c;h=be0f3330dbc637f76bf239e0f51ac3e4835f0316;hb=cb7bd2e07e70aed7802e28619ce93d15d7ce10dc;hp=a5fbd5f5095db5a174dd461a3beb27f9c8a368a2;hpb=a694610d3361465d4c8d27dde72ab8b63d31115e;p=u-boot diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index a5fbd5f509..be0f3330db 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -3,7 +3,6 @@ * (C) Copyright 2004 * DENX Software Engineering * Wolfgang Denk, wd@denx.de - * All rights reserved. * * Keyboard driver * @@ -71,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 */ @@ -84,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) { @@ -276,8 +275,6 @@ int kbd_init (void) memset (&kbddev, 0, sizeof(kbddev)); strcpy(kbddev.name, DEVNAME); kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; - kbddev.putc = NULL ; - kbddev.puts = NULL ; kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ;