From nobody Mon Feb 9 01:22:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1731062684; cv=none; d=zohomail.com; s=zohoarc; b=K51ZVxBbb7UcrlmpoGP/Ge3GEn+u+mBxA0nRAwiXx7bzOB2WyLeOAuc04UNKgSjsQZpqoplpUcAxGyWKKH+wxJUwp4KQwfFYweSOHK8LfHk8sI/f0xShBm7TirrjJeinfWnAf6rmkkLznHRudlm3AE/Xla42gXdlSFqUMmgXGIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731062684; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wJOS9Ag53Kv/GbDr7S6/91HkLwymBcQX1jpDo1XmfPQ=; b=KiCjx+CWTNGvBRS6jkDr0b01rSGI6fei2/AexuAOrBOlzmPPy4MEuhlZuTZZMbXfhSjDGlR/vNjAyIEE4tDAc4uxK0FkB5CSN4Dk0OwaOULpdvQofr0yS3Ln7apKklqoBrq1nOYDuNzAXR8AlCpNxy+nQoNepW1A2tbr4tiiqFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1731062684819255.8525849458116; Fri, 8 Nov 2024 02:44:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9MT1-0004Op-GO; Fri, 08 Nov 2024 05:43:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9MSy-0004GH-23 for qemu-devel@nongnu.org; Fri, 08 Nov 2024 05:43:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9MSw-0006AC-7M for qemu-devel@nongnu.org; Fri, 08 Nov 2024 05:43:47 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382--9fu7frRP1SMi8sFx9MnxA-1; Fri, 08 Nov 2024 05:43:44 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C98D51955DC1; Fri, 8 Nov 2024 10:43:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.118]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 918451953880; Fri, 8 Nov 2024 10:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731062625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wJOS9Ag53Kv/GbDr7S6/91HkLwymBcQX1jpDo1XmfPQ=; b=RNq8Bgz/Cjghq87yApNbvhMsTAbg+Ot6CKxUYrgysfDtRAgY8vILrXZ63E7uxdRbWy5NDf u3TF2UcbmTZstntBLLMz/PZfjDq+MnkvapdoFvSVKEtpZjaeSSTPyOOgvqAz5UKY+zoTBV Ew6ocube3Zle7ssn/ELMQEMO9fSZsmA= X-MC-Unique: -9fu7frRP1SMi8sFx9MnxA-1 X-Mimecast-MFC-AGG-ID: -9fu7frRP1SMi8sFx9MnxA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Mark Cave-Ayland , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 09/10] next-kbd: convert to use qemu_input_handler_register() Date: Fri, 8 Nov 2024 11:43:09 +0100 Message-ID: <20241108104312.534448-10-thuth@redhat.com> In-Reply-To: <20241108104312.534448-1-thuth@redhat.com> References: <20241108104312.534448-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731062686210116600 From: Mark Cave-Ayland Convert the next-kbd device from the legacy UI qemu_add_kbd_event_handler() function to use qemu_input_handler_register(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20241106120928.242443-2-mark.cave-ayland@ilande.co.uk> [thuth: Removed the NEXTKBD_NO_KEY definition - replaced by 0 now] Signed-off-by: Thomas Huth --- hw/m68k/next-kbd.c | 158 +++++++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 55 deletions(-) diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c index bc67810f31..dacc26413f 100644 --- a/hw/m68k/next-kbd.c +++ b/hw/m68k/next-kbd.c @@ -68,7 +68,6 @@ struct NextKBDState { uint16_t shift; }; =20 -static void queue_code(void *opaque, int code); =20 /* lots of magic numbers here */ static uint32_t kbd_read_byte(void *opaque, hwaddr addr) @@ -166,68 +165,70 @@ static const MemoryRegionOps kbd_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static void nextkbd_event(void *opaque, int ch) -{ - /* - * Will want to set vars for caps/num lock - * if (ch & 0x80) -> key release - * there's also e0 escaped scancodes that might need to be handled - */ - queue_code(opaque, ch); -} - -static const unsigned char next_keycodes[128] =3D { - 0x00, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x50, 0x4F, - 0x4E, 0x1E, 0x1F, 0x20, 0x1D, 0x1C, 0x1B, 0x00, - 0x42, 0x43, 0x44, 0x45, 0x48, 0x47, 0x46, 0x06, - 0x07, 0x08, 0x00, 0x00, 0x2A, 0x00, 0x39, 0x3A, - 0x3B, 0x3C, 0x3D, 0x40, 0x3F, 0x3E, 0x2D, 0x2C, - 0x2B, 0x26, 0x00, 0x00, 0x31, 0x32, 0x33, 0x34, - 0x35, 0x37, 0x36, 0x2e, 0x2f, 0x30, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +static const int qcode_to_nextkbd_keycode[] =3D { + [Q_KEY_CODE_ESC] =3D 0x49, + [Q_KEY_CODE_1] =3D 0x4a, + [Q_KEY_CODE_2] =3D 0x4b, + [Q_KEY_CODE_3] =3D 0x4c, + [Q_KEY_CODE_4] =3D 0x4d, + [Q_KEY_CODE_5] =3D 0x50, + [Q_KEY_CODE_6] =3D 0x4f, + [Q_KEY_CODE_7] =3D 0x4e, + [Q_KEY_CODE_8] =3D 0x1e, + [Q_KEY_CODE_9] =3D 0x1f, + [Q_KEY_CODE_0] =3D 0x20, + [Q_KEY_CODE_MINUS] =3D 0x1d, + [Q_KEY_CODE_EQUAL] =3D 0x1c, + [Q_KEY_CODE_BACKSPACE] =3D 0x1b, + + [Q_KEY_CODE_Q] =3D 0x42, + [Q_KEY_CODE_W] =3D 0x43, + [Q_KEY_CODE_E] =3D 0x44, + [Q_KEY_CODE_R] =3D 0x45, + [Q_KEY_CODE_T] =3D 0x48, + [Q_KEY_CODE_Y] =3D 0x47, + [Q_KEY_CODE_U] =3D 0x46, + [Q_KEY_CODE_I] =3D 0x06, + [Q_KEY_CODE_O] =3D 0x07, + [Q_KEY_CODE_P] =3D 0x08, + [Q_KEY_CODE_RET] =3D 0x2a, + [Q_KEY_CODE_A] =3D 0x39, + [Q_KEY_CODE_S] =3D 0x3a, + + [Q_KEY_CODE_D] =3D 0x3b, + [Q_KEY_CODE_F] =3D 0x3c, + [Q_KEY_CODE_G] =3D 0x3d, + [Q_KEY_CODE_H] =3D 0x40, + [Q_KEY_CODE_J] =3D 0x3f, + [Q_KEY_CODE_K] =3D 0x3e, + [Q_KEY_CODE_L] =3D 0x2d, + [Q_KEY_CODE_SEMICOLON] =3D 0x2c, + [Q_KEY_CODE_APOSTROPHE] =3D 0x2b, + [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x26, + [Q_KEY_CODE_Z] =3D 0x31, + [Q_KEY_CODE_X] =3D 0x32, + [Q_KEY_CODE_C] =3D 0x33, + [Q_KEY_CODE_V] =3D 0x34, + + [Q_KEY_CODE_B] =3D 0x35, + [Q_KEY_CODE_N] =3D 0x37, + [Q_KEY_CODE_M] =3D 0x36, + [Q_KEY_CODE_COMMA] =3D 0x2e, + [Q_KEY_CODE_DOT] =3D 0x2f, + [Q_KEY_CODE_SLASH] =3D 0x30, + + [Q_KEY_CODE_SPC] =3D 0x38, }; =20 -static void queue_code(void *opaque, int code) +static void nextkbd_put_keycode(NextKBDState *s, int keycode) { - NextKBDState *s =3D NEXTKBD(opaque); KBDQueue *q =3D &s->queue; - int key =3D code & KD_KEYMASK; - int release =3D code & 0x80; - static int ext; - - if (code =3D=3D 0xE0) { - ext =3D 1; - } - - if (code =3D=3D 0x2A || code =3D=3D 0x1D || code =3D=3D 0x36) { - if (code =3D=3D 0x2A) { - s->shift =3D KD_LSHIFT; - } else if (code =3D=3D 0x36) { - s->shift =3D KD_RSHIFT; - ext =3D 0; - } else if (code =3D=3D 0x1D && !ext) { - s->shift =3D KD_LCOMM; - } else if (code =3D=3D 0x1D && ext) { - ext =3D 0; - s->shift =3D KD_RCOMM; - } - return; - } else if (code =3D=3D (0x2A | 0x80) || code =3D=3D (0x1D | 0x80) || - code =3D=3D (0x36 | 0x80)) { - s->shift =3D 0; - return; - } =20 if (q->count >=3D KBD_QUEUE_SIZE) { return; } =20 - q->data[q->wptr] =3D next_keycodes[key] | release; - + q->data[q->wptr] =3D keycode; if (++q->wptr =3D=3D KBD_QUEUE_SIZE) { q->wptr =3D 0; } @@ -241,6 +242,53 @@ static void queue_code(void *opaque, int code) /* s->update_irq(s->update_arg, 1); */ } =20 +static void nextkbd_event(DeviceState *dev, QemuConsole *src, InputEvent *= evt) +{ + NextKBDState *s =3D NEXTKBD(dev); + int qcode, keycode; + bool key_down =3D evt->u.key.data->down; + + qcode =3D qemu_input_key_value_to_qcode(evt->u.key.data->key); + if (qcode >=3D ARRAY_SIZE(qcode_to_nextkbd_keycode)) { + return; + } + + /* Shift key currently has no keycode, so handle separately */ + if (qcode =3D=3D Q_KEY_CODE_SHIFT) { + if (key_down) { + s->shift |=3D KD_LSHIFT; + } else { + s->shift &=3D ~KD_LSHIFT; + } + } + + if (qcode =3D=3D Q_KEY_CODE_SHIFT_R) { + if (key_down) { + s->shift |=3D KD_RSHIFT; + } else { + s->shift &=3D ~KD_RSHIFT; + } + } + + keycode =3D qcode_to_nextkbd_keycode[qcode]; + if (!keycode) { + return; + } + + /* If key release event, create keyboard break code */ + if (!key_down) { + keycode |=3D 0x80; + } + + nextkbd_put_keycode(s, keycode); +} + +static const QemuInputHandler nextkbd_handler =3D { + .name =3D "QEMU NeXT Keyboard", + .mask =3D INPUT_EVENT_MASK_KEY, + .event =3D nextkbd_event, +}; + static void nextkbd_reset(DeviceState *dev) { NextKBDState *nks =3D NEXTKBD(dev); @@ -256,7 +304,7 @@ static void nextkbd_realize(DeviceState *dev, Error **e= rrp) memory_region_init_io(&s->mr, OBJECT(dev), &kbd_ops, s, "next.kbd", 0x= 1000); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mr); =20 - qemu_add_kbd_event_handler(nextkbd_event, s); + qemu_input_handler_register(dev, &nextkbd_handler); } =20 static const VMStateDescription nextkbd_vmstate =3D { --=20 2.47.0