hw/char/escc.c | 74
This is my second attempt to contribute a patch which makes the -k switch
useful for sparc emulation as its value is used to emulate the dip switch
in a SUN keyboard for language layout setting.
Unfortunately my glib version is too old to compile later versions of qemu
so even though this patch is made from latest git I have only been able to
test it myself with qemu version 4.1.1. I think and hope that this patch will
compile and work also with the latest version of git as it only affects one
file and there hasn't been much changes to that file since tested version
4.1.1.
Best regards Henrik
From e302b02dec32c28297ed20d852c5fba2c1682f5a Mon Sep 17 00:00:00 2001
From: Henrik Carlqvist <hc1245@poolhem.se>
Date: Mon, 3 Aug 2020 22:11:55 +0200
Subject: [PATCH] Emulating sun keyboard language layout dip switches, taking
the value for the dip switches from the "-k" option to qemu.
SUN Type 4, 5 and 5c keyboards have dip switches to choose the language
layout of the keyboard. Solaris makes an ioctl to query the value of the
dipswitches and uses that value to select keyboard layout. Also the SUN
bios like the one in the file ss5.bin uses this value to support at least
some keyboard layouts. However, the OpenBIOS provided with qemu is
hardcoded to always use an US keyboard layout.
Before this patch, qemu allways gave dip switch value 0x21 (US keyboard),
this patch uses the command line switch "-k" (keyboard layout) to select
dip switch value. A table is used to lookup values from arguments like:
-k fr
-k es
But the patch also accepts numeric dip switch values directly to the -k
switch:
-k 0x2b
-k 43
Both values above are the same and select swedish keyboard as explained in
table 3-15 at
https://docs.oracle.com/cd/E19683-01/806-6642/new-43/index.html
Unless you want to do a full Solaris installation but happen to have
access to a bios file, the easiest way to test that the patch works is to:
qemu-system-sparc -k sv -bios /path/to/ss5.bin
If you already happen to have a Solaris installation in a qemu disk image
file you can easily try different keyboard layouts after this patch is
applied.
Signed-off-by: Henrik Carlqvist <hc1245@poolhem.se>
---
hw/char/escc.c | 74
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73
insertions(+), 1 deletion(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 7d16ee8688..7287056b5f 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -30,6 +30,8 @@
#include "qemu/module.h"
#include "hw/char/escc.h"
#include "ui/console.h"
+#include "sysemu/sysemu.h"
+#include "qemu/cutils.h"
#include "trace.h"
/*
@@ -175,6 +177,7 @@
#define R_MISC1I 14
#define R_EXTINT 15
+static unsigned char sun_keyboard_layout_dip_switch(void);
static void handle_kbd_command(ESCCChannelState *s, int val);
static int serial_can_receive(void *opaque);
static void serial_receive_byte(ESCCChannelState *s, int ch);
@@ -730,6 +733,75 @@ static QemuInputHandler sunkbd_handler = {
.event = sunkbd_handle_event,
};
+static unsigned char sun_keyboard_layout_dip_switch(void)
+{
+ /* Return the value of the dip-switches in a SUN Type 5 keyboard */
+ static unsigned char ret = 0xff;
+
+ if ((ret == 0xff) && keyboard_layout) {
+ int i;
+ struct layout_values {
+ const char *lang;
+ unsigned char dip;
+ } languages[] =
+ /* Dip values from table 3-16 Layouts for Type 4, 5, and 5c Keyboards */
+ {
+ {"en-us", 0x21}, /* U.S.A. (US5.kt) */
+ /* 0x22 is some other US (US_UNIX5.kt)*/
+ {"fr", 0x23}, /* France (France5.kt) */
+ {"da", 0x24}, /* Denmark (Denmark5.kt) */
+ {"de", 0x25}, /* Germany (Germany5.kt) */
+ {"it", 0x26}, /* Italy (Italy5.kt) */
+ {"nl", 0x27}, /* The Netherlands (Netherland5.kt) */
+ {"no", 0x28}, /* Norway (Norway.kt) */
+ {"pt", 0x29}, /* Portugal (Portugal5.kt) */
+ {"es", 0x2a}, /* Spain (Spain5.kt) */
+ {"sv", 0x2b}, /* Sweden (Sweden5.kt) */
+ {"fr-ch", 0x2c}, /* Switzerland/French (Switzer_Fr5.kt) */
+ {"de-ch", 0x2d}, /* Switzerland/German (Switzer_Ge5.kt) */
+ {"en-gb", 0x2e}, /* Great Britain (UK5.kt) */
+ {"ko", 0x2f}, /* Korea (Korea5.kt) */
+ {"tw", 0x30}, /* Taiwan (Taiwan5.kt) */
+ {"ja", 0x31}, /* Japan (Japan5.kt) */
+ {"fr-ca", 0x32}, /* Canada/French (Canada_Fr5.kt) */
+ {"hu", 0x33}, /* Hungary (Hungary5.kt) */
+ {"pl", 0x34}, /* Poland (Poland5.kt) */
+ {"cz", 0x35}, /* Czech (Czech5.kt) */
+ {"ru", 0x36}, /* Russia (Russia5.kt) */
+ {"lv", 0x37}, /* Latvia (Latvia5.kt) */
+ {"tr", 0x38}, /* Turkey-Q5 (TurkeyQ5.kt) */
+ {"gr", 0x39}, /* Greece (Greece5.kt) */
+ {"ar", 0x3a}, /* Arabic (Arabic5.kt) */
+ {"lt", 0x3b}, /* Lithuania (Lithuania5.kt) */
+ {"nl-be", 0x3c}, /* Belgium (Belgian5.kt) */
+ {"be", 0x3c}, /* Belgium (Belgian5.kt) */
+ };
+
+ for (i = 0;
+ i < sizeof(languages) / sizeof(struct layout_values);
+ i++) {
+ if (!strcmp(keyboard_layout, languages[i].lang)) {
+ ret = languages[i].dip;
+ return ret;
+ }
+ }
+ /* Found no known language code */
+
+ if ((keyboard_layout[0] >= '0') && (keyboard_layout[0] <= '9')) {
+ unsigned int tmp;
+ /* As a fallback we also accept numeric dip switch value */
+ if (!qemu_strtoui(keyboard_layout, NULL, 0, &tmp)) {
+ ret = (unsigned char)tmp;
+ }
+ }
+ }
+ if (ret == 0xff) {
+ /* Final fallback if keyboard_layout was not set or recognized */
+ ret = 0x21; /* en-us layout */
+ }
+ return ret;
+}
+
static void handle_kbd_command(ESCCChannelState *s, int val)
{
trace_escc_kbd_command(val);
@@ -751,7 +823,7 @@ static void handle_kbd_command(ESCCChannelState *s, int
val) case 0xf:
clear_queue(s);
put_queue(s, 0xfe);
- put_queue(s, 0x21); /* en-us layout */
+ put_queue(s, sun_keyboard_layout_dip_switch());
break;
default:
break;
--
2.14.5
Just wanted to check that my patch hasn't been forgotten... I was hoping that
it would make it into some branch in git.
Do you want me to do any more changes to the patch or the description?
Best regards Henrik
On Mon, 3 Aug 2020 22:20:49 +0200
Henrik Carlqvist <hc981@poolhem.se> wrote:
> This is my second attempt to contribute a patch which makes the -k switch
> useful for sparc emulation as its value is used to emulate the dip switch
> in a SUN keyboard for language layout setting.
>
> Unfortunately my glib version is too old to compile later versions of qemu
> so even though this patch is made from latest git I have only been able to
> test it myself with qemu version 4.1.1. I think and hope that this patch
> will compile and work also with the latest version of git as it only affects
> one file and there hasn't been much changes to that file since tested
> version 4.1.1.
>
> Best regards Henrik
>
> From e302b02dec32c28297ed20d852c5fba2c1682f5a Mon Sep 17 00:00:00 2001
> From: Henrik Carlqvist <hc1245@poolhem.se>
> Date: Mon, 3 Aug 2020 22:11:55 +0200
> Subject: [PATCH] Emulating sun keyboard language layout dip switches, taking
> the value for the dip switches from the "-k" option to qemu.
>
> SUN Type 4, 5 and 5c keyboards have dip switches to choose the language
> layout of the keyboard. Solaris makes an ioctl to query the value of the
> dipswitches and uses that value to select keyboard layout. Also the SUN
> bios like the one in the file ss5.bin uses this value to support at least
> some keyboard layouts. However, the OpenBIOS provided with qemu is
> hardcoded to always use an US keyboard layout.
>
> Before this patch, qemu allways gave dip switch value 0x21 (US keyboard),
> this patch uses the command line switch "-k" (keyboard layout) to select
> dip switch value. A table is used to lookup values from arguments like:
>
> -k fr
> -k es
>
> But the patch also accepts numeric dip switch values directly to the -k
> switch:
>
> -k 0x2b
> -k 43
>
> Both values above are the same and select swedish keyboard as explained in
> table 3-15 at
> https://docs.oracle.com/cd/E19683-01/806-6642/new-43/index.html
>
> Unless you want to do a full Solaris installation but happen to have
> access to a bios file, the easiest way to test that the patch works is to:
>
> qemu-system-sparc -k sv -bios /path/to/ss5.bin
>
> If you already happen to have a Solaris installation in a qemu disk image
> file you can easily try different keyboard layouts after this patch is
> applied.
>
> Signed-off-by: Henrik Carlqvist <hc1245@poolhem.se>
> ---
> hw/char/escc.c | 74
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed,
> 73 insertions(+), 1 deletion(-)
>
> diff --git a/hw/char/escc.c b/hw/char/escc.c
> index 7d16ee8688..7287056b5f 100644
> --- a/hw/char/escc.c
> +++ b/hw/char/escc.c
> @@ -30,6 +30,8 @@
> #include "qemu/module.h"
> #include "hw/char/escc.h"
> #include "ui/console.h"
> +#include "sysemu/sysemu.h"
> +#include "qemu/cutils.h"
> #include "trace.h"
>
> /*
> @@ -175,6 +177,7 @@
> #define R_MISC1I 14
> #define R_EXTINT 15
>
> +static unsigned char sun_keyboard_layout_dip_switch(void);
> static void handle_kbd_command(ESCCChannelState *s, int val);
> static int serial_can_receive(void *opaque);
> static void serial_receive_byte(ESCCChannelState *s, int ch);
> @@ -730,6 +733,75 @@ static QemuInputHandler sunkbd_handler = {
> .event = sunkbd_handle_event,
> };
>
> +static unsigned char sun_keyboard_layout_dip_switch(void)
> +{
> + /* Return the value of the dip-switches in a SUN Type 5 keyboard */
> + static unsigned char ret = 0xff;
> +
> + if ((ret == 0xff) && keyboard_layout) {
> + int i;
> + struct layout_values {
> + const char *lang;
> + unsigned char dip;
> + } languages[] =
> + /* Dip values from table 3-16 Layouts for Type 4, 5, and 5c Keyboards
> */+ {
> + {"en-us", 0x21}, /* U.S.A. (US5.kt) */
> + /* 0x22 is some other US (US_UNIX5.kt)*/
> + {"fr", 0x23}, /* France (France5.kt) */
> + {"da", 0x24}, /* Denmark (Denmark5.kt) */
> + {"de", 0x25}, /* Germany (Germany5.kt) */
> + {"it", 0x26}, /* Italy (Italy5.kt) */
> + {"nl", 0x27}, /* The Netherlands (Netherland5.kt) */
> + {"no", 0x28}, /* Norway (Norway.kt) */
> + {"pt", 0x29}, /* Portugal (Portugal5.kt) */
> + {"es", 0x2a}, /* Spain (Spain5.kt) */
> + {"sv", 0x2b}, /* Sweden (Sweden5.kt) */
> + {"fr-ch", 0x2c}, /* Switzerland/French (Switzer_Fr5.kt) */
> + {"de-ch", 0x2d}, /* Switzerland/German (Switzer_Ge5.kt) */
> + {"en-gb", 0x2e}, /* Great Britain (UK5.kt) */
> + {"ko", 0x2f}, /* Korea (Korea5.kt) */
> + {"tw", 0x30}, /* Taiwan (Taiwan5.kt) */
> + {"ja", 0x31}, /* Japan (Japan5.kt) */
> + {"fr-ca", 0x32}, /* Canada/French (Canada_Fr5.kt) */
> + {"hu", 0x33}, /* Hungary (Hungary5.kt) */
> + {"pl", 0x34}, /* Poland (Poland5.kt) */
> + {"cz", 0x35}, /* Czech (Czech5.kt) */
> + {"ru", 0x36}, /* Russia (Russia5.kt) */
> + {"lv", 0x37}, /* Latvia (Latvia5.kt) */
> + {"tr", 0x38}, /* Turkey-Q5 (TurkeyQ5.kt) */
> + {"gr", 0x39}, /* Greece (Greece5.kt) */
> + {"ar", 0x3a}, /* Arabic (Arabic5.kt) */
> + {"lt", 0x3b}, /* Lithuania (Lithuania5.kt) */
> + {"nl-be", 0x3c}, /* Belgium (Belgian5.kt) */
> + {"be", 0x3c}, /* Belgium (Belgian5.kt) */
> + };
> +
> + for (i = 0;
> + i < sizeof(languages) / sizeof(struct layout_values);
> + i++) {
> + if (!strcmp(keyboard_layout, languages[i].lang)) {
> + ret = languages[i].dip;
> + return ret;
> + }
> + }
> + /* Found no known language code */
> +
> + if ((keyboard_layout[0] >= '0') && (keyboard_layout[0] <= '9')) {
> + unsigned int tmp;
> + /* As a fallback we also accept numeric dip switch value */
> + if (!qemu_strtoui(keyboard_layout, NULL, 0, &tmp)) {
> + ret = (unsigned char)tmp;
> + }
> + }
> + }
> + if (ret == 0xff) {
> + /* Final fallback if keyboard_layout was not set or recognized */
> + ret = 0x21; /* en-us layout */
> + }
> + return ret;
> +}
> +
> static void handle_kbd_command(ESCCChannelState *s, int val)
> {
> trace_escc_kbd_command(val);
> @@ -751,7 +823,7 @@ static void handle_kbd_command(ESCCChannelState *s, int
> val) case 0xf:
> clear_queue(s);
> put_queue(s, 0xfe);
> - put_queue(s, 0x21); /* en-us layout */
> + put_queue(s, sun_keyboard_layout_dip_switch());
> break;
> default:
> break;
> --
> 2.14.5
Hi Mark,
could you please pick it up?
Regards,
Artyom
сб, 19 сент. 2020 г., 20:47 Henrik Carlqvist <hc94@poolhem.se>:
> Just wanted to check that my patch hasn't been forgotten... I was hoping
> that
> it would make it into some branch in git.
>
> Do you want me to do any more changes to the patch or the description?
>
> Best regards Henrik
>
> On Mon, 3 Aug 2020 22:20:49 +0200
> Henrik Carlqvist <hc981@poolhem.se> wrote:
>
> > This is my second attempt to contribute a patch which makes the -k switch
> > useful for sparc emulation as its value is used to emulate the dip switch
> > in a SUN keyboard for language layout setting.
> >
> > Unfortunately my glib version is too old to compile later versions of
> qemu
> > so even though this patch is made from latest git I have only been able
> to
> > test it myself with qemu version 4.1.1. I think and hope that this patch
> > will compile and work also with the latest version of git as it only
> affects
> > one file and there hasn't been much changes to that file since tested
> > version 4.1.1.
> >
> > Best regards Henrik
> >
> > From e302b02dec32c28297ed20d852c5fba2c1682f5a Mon Sep 17 00:00:00 2001
> > From: Henrik Carlqvist <hc1245@poolhem.se>
> > Date: Mon, 3 Aug 2020 22:11:55 +0200
> > Subject: [PATCH] Emulating sun keyboard language layout dip switches,
> taking
> > the value for the dip switches from the "-k" option to qemu.
> >
> > SUN Type 4, 5 and 5c keyboards have dip switches to choose the language
> > layout of the keyboard. Solaris makes an ioctl to query the value of the
> > dipswitches and uses that value to select keyboard layout. Also the SUN
> > bios like the one in the file ss5.bin uses this value to support at least
> > some keyboard layouts. However, the OpenBIOS provided with qemu is
> > hardcoded to always use an US keyboard layout.
> >
> > Before this patch, qemu allways gave dip switch value 0x21 (US keyboard),
> > this patch uses the command line switch "-k" (keyboard layout) to select
> > dip switch value. A table is used to lookup values from arguments like:
> >
> > -k fr
> > -k es
> >
> > But the patch also accepts numeric dip switch values directly to the -k
> > switch:
> >
> > -k 0x2b
> > -k 43
> >
> > Both values above are the same and select swedish keyboard as explained
> in
> > table 3-15 at
> > https://docs.oracle.com/cd/E19683-01/806-6642/new-43/index.html
> >
> > Unless you want to do a full Solaris installation but happen to have
> > access to a bios file, the easiest way to test that the patch works is
> to:
> >
> > qemu-system-sparc -k sv -bios /path/to/ss5.bin
> >
> > If you already happen to have a Solaris installation in a qemu disk image
> > file you can easily try different keyboard layouts after this patch is
> > applied.
> >
> > Signed-off-by: Henrik Carlqvist <hc1245@poolhem.se>
> > ---
> > hw/char/escc.c | 74
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file
> changed,
> > 73 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/char/escc.c b/hw/char/escc.c
> > index 7d16ee8688..7287056b5f 100644
> > --- a/hw/char/escc.c
> > +++ b/hw/char/escc.c
> > @@ -30,6 +30,8 @@
> > #include "qemu/module.h"
> > #include "hw/char/escc.h"
> > #include "ui/console.h"
> > +#include "sysemu/sysemu.h"
> > +#include "qemu/cutils.h"
> > #include "trace.h"
> >
> > /*
> > @@ -175,6 +177,7 @@
> > #define R_MISC1I 14
> > #define R_EXTINT 15
> >
> > +static unsigned char sun_keyboard_layout_dip_switch(void);
> > static void handle_kbd_command(ESCCChannelState *s, int val);
> > static int serial_can_receive(void *opaque);
> > static void serial_receive_byte(ESCCChannelState *s, int ch);
> > @@ -730,6 +733,75 @@ static QemuInputHandler sunkbd_handler = {
> > .event = sunkbd_handle_event,
> > };
> >
> > +static unsigned char sun_keyboard_layout_dip_switch(void)
> > +{
> > + /* Return the value of the dip-switches in a SUN Type 5 keyboard */
> > + static unsigned char ret = 0xff;
> > +
> > + if ((ret == 0xff) && keyboard_layout) {
> > + int i;
> > + struct layout_values {
> > + const char *lang;
> > + unsigned char dip;
> > + } languages[] =
> > + /* Dip values from table 3-16 Layouts for Type 4, 5, and 5c
> Keyboards
> > */+ {
> > + {"en-us", 0x21}, /* U.S.A. (US5.kt) */
> > + /* 0x22 is some other US
> (US_UNIX5.kt)*/
> > + {"fr", 0x23}, /* France (France5.kt) */
> > + {"da", 0x24}, /* Denmark (Denmark5.kt) */
> > + {"de", 0x25}, /* Germany (Germany5.kt) */
> > + {"it", 0x26}, /* Italy (Italy5.kt) */
> > + {"nl", 0x27}, /* The Netherlands (Netherland5.kt) */
> > + {"no", 0x28}, /* Norway (Norway.kt) */
> > + {"pt", 0x29}, /* Portugal (Portugal5.kt) */
> > + {"es", 0x2a}, /* Spain (Spain5.kt) */
> > + {"sv", 0x2b}, /* Sweden (Sweden5.kt) */
> > + {"fr-ch", 0x2c}, /* Switzerland/French (Switzer_Fr5.kt)
> */
> > + {"de-ch", 0x2d}, /* Switzerland/German (Switzer_Ge5.kt)
> */
> > + {"en-gb", 0x2e}, /* Great Britain (UK5.kt) */
> > + {"ko", 0x2f}, /* Korea (Korea5.kt) */
> > + {"tw", 0x30}, /* Taiwan (Taiwan5.kt) */
> > + {"ja", 0x31}, /* Japan (Japan5.kt) */
> > + {"fr-ca", 0x32}, /* Canada/French (Canada_Fr5.kt) */
> > + {"hu", 0x33}, /* Hungary (Hungary5.kt) */
> > + {"pl", 0x34}, /* Poland (Poland5.kt) */
> > + {"cz", 0x35}, /* Czech (Czech5.kt) */
> > + {"ru", 0x36}, /* Russia (Russia5.kt) */
> > + {"lv", 0x37}, /* Latvia (Latvia5.kt) */
> > + {"tr", 0x38}, /* Turkey-Q5 (TurkeyQ5.kt) */
> > + {"gr", 0x39}, /* Greece (Greece5.kt) */
> > + {"ar", 0x3a}, /* Arabic (Arabic5.kt) */
> > + {"lt", 0x3b}, /* Lithuania (Lithuania5.kt) */
> > + {"nl-be", 0x3c}, /* Belgium (Belgian5.kt) */
> > + {"be", 0x3c}, /* Belgium (Belgian5.kt) */
> > + };
> > +
> > + for (i = 0;
> > + i < sizeof(languages) / sizeof(struct layout_values);
> > + i++) {
> > + if (!strcmp(keyboard_layout, languages[i].lang)) {
> > + ret = languages[i].dip;
> > + return ret;
> > + }
> > + }
> > + /* Found no known language code */
> > +
> > + if ((keyboard_layout[0] >= '0') && (keyboard_layout[0] <= '9'))
> {
> > + unsigned int tmp;
> > + /* As a fallback we also accept numeric dip switch value */
> > + if (!qemu_strtoui(keyboard_layout, NULL, 0, &tmp)) {
> > + ret = (unsigned char)tmp;
> > + }
> > + }
> > + }
> > + if (ret == 0xff) {
> > + /* Final fallback if keyboard_layout was not set or recognized
> */
> > + ret = 0x21; /* en-us layout */
> > + }
> > + return ret;
> > +}
> > +
> > static void handle_kbd_command(ESCCChannelState *s, int val)
> > {
> > trace_escc_kbd_command(val);
> > @@ -751,7 +823,7 @@ static void handle_kbd_command(ESCCChannelState *s,
> int
> > val) case 0xf:
> > clear_queue(s);
> > put_queue(s, 0xfe);
> > - put_queue(s, 0x21); /* en-us layout */
> > + put_queue(s, sun_keyboard_layout_dip_switch());
> > break;
> > default:
> > break;
> > --
> > 2.14.5
>
On 10/10/2020 15:44, Artyom Tarasenko wrote: > Hi Mark, > > could you please pick it up? > > Regards, > Artyom Sure, I'll add it to my list. I'm currently starting to work through my backlog... ATB, Mark.
This is really annoying, no matter how I try I am unable to submit a valid
patch.
Some googling revealed that my patch had been rejected at
https://patchew.org/QEMU/20200710201911.3a3e336c.hc981@poolhem.se/
The apply log points to line 104 which is broken in my patch, it looks like
this:
+}
+
static void handle_kbd_command(ESCCChannelState *s, int val)
{
trace_escc_kbd_command(val);
@@ -751,7 +823,7 @@ static void handle_kbd_command(ESCCChannelState *s, int
val) case 0xf:
clear_queue(s);
put_queue(s, 0xfe);
- put_queue(s, 0x21); /* en-us layout */
+ put_queue(s, sun_keyboard_layout_dip_switch());
Line 104 is the line with @@ which is obviously broken as it does not only
contain line numbers but also code as a line wrapped function declaration
repeated from an earlier row.
My original patch which I created with diff -ruN did not have this problem,
but when I try to create my patch with git to get the Signed-off-by: the patch
created by git gets mangled like this. Even the output from "git diff" is
mangled like that even though my patched code looks fine.
I am aware that this mailing list is not supposed to be some kind of git
support forum, but could I please get some hint on how to submit my patch so
that it gets accepted?
Best regards Henrik
On Sat, 19 Sep 2020 19:47:12 +0200
Henrik Carlqvist <hc94@poolhem.se> wrote:
> Just wanted to check that my patch hasn't been forgotten... I was hoping
> that it would make it into some branch in git.
>
> Do you want me to do any more changes to the patch or the description?
>
> Best regards Henrik
>
> On Mon, 3 Aug 2020 22:20:49 +0200
> Henrik Carlqvist <hc981@poolhem.se> wrote:
>
> > This is my second attempt to contribute a patch which makes the -k switch
> > useful for sparc emulation as its value is used to emulate the dip switch
> > in a SUN keyboard for language layout setting.
> >
> > Unfortunately my glib version is too old to compile later versions of qemu
> > so even though this patch is made from latest git I have only been able to
> > test it myself with qemu version 4.1.1. I think and hope that this patch
> > will compile and work also with the latest version of git as it only
> > affects one file and there hasn't been much changes to that file since
> > tested version 4.1.1.
> >
> > Best regards Henrik
> >
> > From e302b02dec32c28297ed20d852c5fba2c1682f5a Mon Sep 17 00:00:00 2001
> > From: Henrik Carlqvist <hc1245@poolhem.se>
> > Date: Mon, 3 Aug 2020 22:11:55 +0200
> > Subject: [PATCH] Emulating sun keyboard language layout dip switches,
> > taking
> > the value for the dip switches from the "-k" option to qemu.
> >
> > SUN Type 4, 5 and 5c keyboards have dip switches to choose the language
> > layout of the keyboard. Solaris makes an ioctl to query the value of the
> > dipswitches and uses that value to select keyboard layout. Also the SUN
> > bios like the one in the file ss5.bin uses this value to support at least
> > some keyboard layouts. However, the OpenBIOS provided with qemu is
> > hardcoded to always use an US keyboard layout.
> >
> > Before this patch, qemu allways gave dip switch value 0x21 (US keyboard),
> > this patch uses the command line switch "-k" (keyboard layout) to select
> > dip switch value. A table is used to lookup values from arguments like:
> >
> > -k fr
> > -k es
> >
> > But the patch also accepts numeric dip switch values directly to the -k
> > switch:
> >
> > -k 0x2b
> > -k 43
> >
> > Both values above are the same and select swedish keyboard as explained in
> > table 3-15 at
> > https://docs.oracle.com/cd/E19683-01/806-6642/new-43/index.html
> >
> > Unless you want to do a full Solaris installation but happen to have
> > access to a bios file, the easiest way to test that the patch works is to:
> >
> > qemu-system-sparc -k sv -bios /path/to/ss5.bin
> >
> > If you already happen to have a Solaris installation in a qemu disk image
> > file you can easily try different keyboard layouts after this patch is
> > applied.
> >
> > Signed-off-by: Henrik Carlqvist <hc1245@poolhem.se>
> > ---
> > hw/char/escc.c | 74
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed,
> > 73 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/char/escc.c b/hw/char/escc.c
> > index 7d16ee8688..7287056b5f 100644
> > --- a/hw/char/escc.c
> > +++ b/hw/char/escc.c
> > @@ -30,6 +30,8 @@
> > #include "qemu/module.h"
> > #include "hw/char/escc.h"
> > #include "ui/console.h"
> > +#include "sysemu/sysemu.h"
> > +#include "qemu/cutils.h"
> > #include "trace.h"
> >
> > /*
> > @@ -175,6 +177,7 @@
> > #define R_MISC1I 14
> > #define R_EXTINT 15
> >
> > +static unsigned char sun_keyboard_layout_dip_switch(void);
> > static void handle_kbd_command(ESCCChannelState *s, int val);
> > static int serial_can_receive(void *opaque);
> > static void serial_receive_byte(ESCCChannelState *s, int ch);
> > @@ -730,6 +733,75 @@ static QemuInputHandler sunkbd_handler = {
> > .event = sunkbd_handle_event,
> > };
> >
> > +static unsigned char sun_keyboard_layout_dip_switch(void)
> > +{
> > + /* Return the value of the dip-switches in a SUN Type 5 keyboard */
> > + static unsigned char ret = 0xff;
> > +
> > + if ((ret == 0xff) && keyboard_layout) {
> > + int i;
> > + struct layout_values {
> > + const char *lang;
> > + unsigned char dip;
> > + } languages[] =
> > + /* Dip values from table 3-16 Layouts for Type 4, 5, and 5c Keyboards
> > */+ {
> > + {"en-us", 0x21}, /* U.S.A. (US5.kt) */
> > + /* 0x22 is some other US (US_UNIX5.kt)*/
> > + {"fr", 0x23}, /* France (France5.kt) */
> > + {"da", 0x24}, /* Denmark (Denmark5.kt) */
> > + {"de", 0x25}, /* Germany (Germany5.kt) */
> > + {"it", 0x26}, /* Italy (Italy5.kt) */
> > + {"nl", 0x27}, /* The Netherlands (Netherland5.kt) */
> > + {"no", 0x28}, /* Norway (Norway.kt) */
> > + {"pt", 0x29}, /* Portugal (Portugal5.kt) */
> > + {"es", 0x2a}, /* Spain (Spain5.kt) */
> > + {"sv", 0x2b}, /* Sweden (Sweden5.kt) */
> > + {"fr-ch", 0x2c}, /* Switzerland/French (Switzer_Fr5.kt)
> > */+ {"de-ch", 0x2d}, /* Switzerland/German (Switzer_Ge5.kt)
> > */+ {"en-gb", 0x2e}, /* Great Britain (UK5.kt) */
> > + {"ko", 0x2f}, /* Korea (Korea5.kt) */
> > + {"tw", 0x30}, /* Taiwan (Taiwan5.kt) */
> > + {"ja", 0x31}, /* Japan (Japan5.kt) */
> > + {"fr-ca", 0x32}, /* Canada/French (Canada_Fr5.kt) */
> > + {"hu", 0x33}, /* Hungary (Hungary5.kt) */
> > + {"pl", 0x34}, /* Poland (Poland5.kt) */
> > + {"cz", 0x35}, /* Czech (Czech5.kt) */
> > + {"ru", 0x36}, /* Russia (Russia5.kt) */
> > + {"lv", 0x37}, /* Latvia (Latvia5.kt) */
> > + {"tr", 0x38}, /* Turkey-Q5 (TurkeyQ5.kt) */
> > + {"gr", 0x39}, /* Greece (Greece5.kt) */
> > + {"ar", 0x3a}, /* Arabic (Arabic5.kt) */
> > + {"lt", 0x3b}, /* Lithuania (Lithuania5.kt) */
> > + {"nl-be", 0x3c}, /* Belgium (Belgian5.kt) */
> > + {"be", 0x3c}, /* Belgium (Belgian5.kt) */
> > + };
> > +
> > + for (i = 0;
> > + i < sizeof(languages) / sizeof(struct layout_values);
> > + i++) {
> > + if (!strcmp(keyboard_layout, languages[i].lang)) {
> > + ret = languages[i].dip;
> > + return ret;
> > + }
> > + }
> > + /* Found no known language code */
> > +
> > + if ((keyboard_layout[0] >= '0') && (keyboard_layout[0] <= '9')) {
> > + unsigned int tmp;
> > + /* As a fallback we also accept numeric dip switch value */
> > + if (!qemu_strtoui(keyboard_layout, NULL, 0, &tmp)) {
> > + ret = (unsigned char)tmp;
> > + }
> > + }
> > + }
> > + if (ret == 0xff) {
> > + /* Final fallback if keyboard_layout was not set or recognized */
> > + ret = 0x21; /* en-us layout */
> > + }
> > + return ret;
> > +}
> > +
> > static void handle_kbd_command(ESCCChannelState *s, int val)
> > {
> > trace_escc_kbd_command(val);
> > @@ -751,7 +823,7 @@ static void handle_kbd_command(ESCCChannelState *s,
> > int val) case 0xf:
> > clear_queue(s);
> > put_queue(s, 0xfe);
> > - put_queue(s, 0x21); /* en-us layout */
> > + put_queue(s, sun_keyboard_layout_dip_switch());
> > break;
> > default:
> > break;
> > --
> > 2.14.5
© 2016 - 2024 Red Hat, Inc.