Message ID | 20230114153853.76b68899.hc94@poolhem.se |
---|---|
State | New |
Headers | show |
Series | [v5] Emulate dip switch language layout settings on SUN keyboard | expand |
On 14/01/2023 14:38, Henrik Carlqvist wrote: > https://patchew.org/QEMU/20230114125029.7395a547.hc981@poolhem.se/ > complains that "patch is empty", so here is my fifth attempt... > > regards Henrik > > 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 17a908c59b..53022ccf39 100644 > --- a/hw/char/escc.c > +++ b/hw/char/escc.c > @@ -31,6 +31,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" > > /* > @@ -190,6 +192,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); > @@ -846,6 +849,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); > @@ -867,7 +939,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; Did you see my comments re: OpenBIOS for the earlier version of this patch? ATB, Mark.
On Sun, 22 Jan 2023 18:07:47 +0000
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote:
> Did you see my comments re: OpenBIOS for the earlier version of this patch?
Sorry again for missing that comment, I sent a reply (
https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg05134.html )
I have now unsubscribed from the mailing list and hope that I will get copies
of any replies which then will be easier for me to note with a more reasonable
flow of emails through my inbox.
Having read about the CI gitlab issue I understand that my patch might not be
considered for integration until februari, but I am in no hurry, my first
attempt to submit this patch was in 2020 (
https://lists.nongnu.org/archive/html/qemu-devel/2020-07/msg03826.html ), that
attempt resulted in a broken patch as my mail client wrapped long lines.
Best regards Henrik
Would you please consider this patch or let me know if you want me to somehow update it before it can be accepted? Best regards Henrik On Sat, 14 Jan 2023 15:38:53 +0100 Henrik Carlqvist <hc94@poolhem.se> wrote: > https://patchew.org/QEMU/20230114125029.7395a547.hc981@poolhem.se/ > complains that "patch is empty", so here is my fifth attempt... > > regards Henrik > > 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 17a908c59b..53022ccf39 100644 > --- a/hw/char/escc.c > +++ b/hw/char/escc.c > @@ -31,6 +31,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" > > /* > @@ -190,6 +192,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); > @@ -846,6 +849,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); > @@ -867,7 +939,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.35.1 >
On 12/02/2023 11:31, Henrik Carlqvist wrote: > Would you please consider this patch or let me know if you want me to somehow > update it before it can be accepted? I've done a quick grep for similar examples for serial devices that use keyboard_layout but it looks like this would be the first. My first instinct is that you'd want to make this a device property that is configured during machine init using keyboard_layout (rather than using keyboard_layout directly), but I'd be interested to hear what Paolo and Marc-André think about what the best approach should be. Another aspect to consider is whether keyboard_layout should just use standard strings, in which case it may not make sense to accept numeric hex values. Paolo, Marc-André - what do you think? ATB, Mark. > On Sat, 14 Jan 2023 15:38:53 +0100 > Henrik Carlqvist <hc94@poolhem.se> wrote: > >> https://patchew.org/QEMU/20230114125029.7395a547.hc981@poolhem.se/ >> complains that "patch is empty", so here is my fifth attempt... >> >> regards Henrik >> >> 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 17a908c59b..53022ccf39 100644 >> --- a/hw/char/escc.c >> +++ b/hw/char/escc.c >> @@ -31,6 +31,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" >> >> /* >> @@ -190,6 +192,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); >> @@ -846,6 +849,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); >> @@ -867,7 +939,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.35.1 >> >
On Sat, Jan 14, 2023 at 03:38:53PM +0100, Henrik Carlqvist wrote: > https://patchew.org/QEMU/20230114125029.7395a547.hc981@poolhem.se/ > complains that "patch is empty", so here is my fifth attempt... > > regards Henrik > > 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 I'm not convinced this is a sensible thing to do The '-k' argument / keyboard_layout global in QEMU is used to control the keyboard layout used by the various UI frontends in QEMU, when they are converting input events received from the user into QMEU's internal keycodes. Overload this to also change the virtual hardware settings, which is guest ABI sensitive feels like a bad idea, given that we usually aim to separate backend and frontend configuration tunables. IOW, it looks like there are two distinct configuration axes that need to be controllable independently. Since it is a hardware property then the obvious place to put this would be as a property in the hardware device - ie the escc device. This could then be set with -global escc.sunkbd_layout=XXX IIUC. > > 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 17a908c59b..53022ccf39 100644 > --- a/hw/char/escc.c > +++ b/hw/char/escc.c > @@ -31,6 +31,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" > > /* > @@ -190,6 +192,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); > @@ -846,6 +849,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); > @@ -867,7 +939,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.35.1 > > With regards, Daniel
diff --git a/hw/char/escc.c b/hw/char/escc.c index 17a908c59b..53022ccf39 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -31,6 +31,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" /* @@ -190,6 +192,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); @@ -846,6 +849,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); @@ -867,7 +939,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;
https://patchew.org/QEMU/20230114125029.7395a547.hc981@poolhem.se/ complains that "patch is empty", so here is my fifth attempt... regards Henrik 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(-)