cvs commit: src/sys/dev/kbdmux kbdmux.c

[Ruslan Ermilov]

On Wed, Sep 20, 2006 at 12:04:49PM -0700, Maksim Yevmenkin wrote:
> ok, i just tested the following patch on sparc64 and it makes
> 'kbdcontrol -k' work as expected. i can now switch between ukbd0 and
> sunkbd0 without any problems.
> 
> --- syscons.c.orig      Fri Mar  3 16:41:28 2006
> +++ syscons.c   Wed Sep 20 09:57:09 2006
> @@ -1194,7 +1194,7 @@
>            keyboard_t *newkbd;
> 
>            s = spltty();
> -           newkbd = kbd_get_keyboard(*(int *)data);
> +           newkbd = kbd_get_keyboard(*(intptr_t *)data);
>            if (newkbd == NULL) {
>                splx(s);
>                return EINVAL;
> 
> can i commit it?
> 
> thanks,
> max
> 
> p.s. yes, i know, there are few other ioctl's with the same problem. i
> just want to address it one ioctl at a time :)
> 
Please don't.  I have this fix already locally,

-           newkbd = kbd_get_keyboard(*(int *)data);
+           newkbd = kbd_get_keyboard((int)*(intptr_t *)data);

but I'm also discussing the gory details with Bruce Evans,
and I don't want to do multiple commits if it turns out
that we need a slightly different technique.  Please keep
the file locally until I send the whole patch.


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer