Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B719C64E7A for ; Sat, 28 Nov 2020 19:39:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5200921534 for ; Sat, 28 Nov 2020 19:39:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poolhem.se header.i=@poolhem.se header.b="quBjT+Sz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5200921534 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=poolhem.se Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kj63u-0005Sk-Jt for qemu-devel@archiver.kernel.org; Sat, 28 Nov 2020 14:39:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj638-00053Y-8b for qemu-devel@nongnu.org; Sat, 28 Nov 2020 14:38:26 -0500 Received: from mailout12.inleed.net ([2a0b:dc80:cafe:112::1]:58673 helo=ns12.inleed.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj635-0006NA-0U for qemu-devel@nongnu.org; Sat, 28 Nov 2020 14:38:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=poolhem.se; s=x; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References: In-Reply-To:Message-Id:Subject:Cc:To:From:Date:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=e6lMHZeogXuI713AmkRLjQyCEEeTBeJlP5XGjCJQUow=; b=quBjT+Sz4dl5E2M90n6/TTe/7s mmYHYsv1sxHCI6DcimpUGfSSOMBAJ+uSDK6sYQJJKMQXMzfMcxSoeD/g5HWGsvoYA5HHR9u23eUuz G71UbhI0lkVtipBLNDhGhL52O3xxMvyzonkjEHPvvta2N7uSZq6UacWngoiDhg7NZsnAOsaLNKs/h cQmVhNVve4pNwSmUHIGwXUPSl+PVPtwCgy0Te01MBrgA4gq3epA5Eh9aKksH2MoEo3coVR5d/9cuJ U6VWwgGppnz3PI3jKiufIyYjlHlFwrTmzUN+to/CrqFg2kl52cltsKz7rJTPUEQNXg+byrslt8c14 D6ba8aAw==; Received: from [213.115.245.47] (helo=balrog.lkp.se) by ns12.inleed.net with esmtpa (Exim 4.94) (envelope-from ) id 1kj632-00BHta-Nb; Sat, 28 Nov 2020 20:38:20 +0100 Date: Sat, 28 Nov 2020 20:38:10 +0100 From: Henrik Carlqvist To: Henrik Carlqvist Subject: Re: Ping2: [PATCH v2] Emulate dip switch language layout settings on SUN keyboard Message-Id: <20201128203810.07446c6c.hc981@poolhem.se> In-Reply-To: <20200919194712.1ddd62cf.hc94@poolhem.se> References: <20200803222049.2967aeda.hc981@poolhem.se> <20200919194712.1ddd62cf.hc94@poolhem.se> X-Mailer: Sylpheed version 0.9.7 (GTK+ 1.2.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Authenticated-Id: henrik@poolhem.se Received-SPF: none client-ip=2a0b:dc80:cafe:112::1; envelope-from=hc981@poolhem.se; helo=ns12.inleed.net X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, SPF_HELO_SOFTFAIL=0.732, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, atar4qemu@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 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 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 > > 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 > > --- > > 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