From nobody Fri May 3 11:18:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599440520; cv=none; d=zohomail.com; s=zohoarc; b=P4RhbaYG5CyzGYTGpFNePHMJ0iemWYno6805g8L2G7id/t1Q9KGJQULEMechNThpS1hdttYSXYfAipZY45ZG5yi0nw4VKHcZjotv2GSUk0qbJPpIaXe9lNxJBaC3HF4WD7c8tda5NrdWBV0uMnz9MYSU589yKJLfiJXicajduRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599440520; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=vWtZijcXDpyF8N5x5cBJXC3hkGzf/vTxCrAXrlAJYHc=; b=BecF5jDC/7hugDUKsCeZG3pm98Gw9Ky+LIBlDuwK+7iZd0Ko3ZxakZod0d9cBn7/aNt0i+BzR6OJorDq9vsybTnPYJ6dAzOQ1Bkltot4D2JEZcAWjnHDMQ4ENYbcAI+QWqBc6JMUER5JccfehcEtUNDgjZi6643nXZTniMAESlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1599440520267651.7143474871792; Sun, 6 Sep 2020 18:02:00 -0700 (PDT) Received: by mail-wm1-f67.google.com with SMTP id z9so12629584wmk.1 for ; Sun, 06 Sep 2020 18:01:59 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id o16sm23736024wrp.52.2020.09.06.18.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vWtZijcXDpyF8N5x5cBJXC3hkGzf/vTxCrAXrlAJYHc=; b=HY9Afm58oC7YBks8dw/HeX/gzx/AceREP8ZE/1LLJwEtI9U/gQKDW3jySSmk6I34x5 5+HmzxpdPFwImcF83oiTZWPT43FN2DC3PP/keZhlcpq3ZwmgvDlCrLQ8MkrFvePgwpFr 4g4hHXe5MFYFP+2yh0QXT1sq2YoUCfWYI+4h194OW742pUWHRQP865KNv45CJC3ps1B2 NmbcoXVpAoa5oWqRGoY7d05rORUhT4XIVEvzRbnOawlnTi6Schao3Yz9TA1jcObB8R9G tagCLmXMFs6xUny4oFYGKARdSfiqvAsqQn3pqFPEJakYcDk17Mx4jhThoOcEIUTzHgnu rGIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=vWtZijcXDpyF8N5x5cBJXC3hkGzf/vTxCrAXrlAJYHc=; b=pC9juoGVd4bYLDEIcfxf7F5iSdUVn07bw1y8mE7xTmeRW5x8QxCBq5yphezpGXjd/B WXXVE8D7KdRiXD66MH7sBD9hU6FmfFS0Ol6WADa7TR52v4z1J3Lw9J9RugoHts+ocmnT JNNbOQkQMWuNqhAXzADLn3mwHpxkhQNlWxuZ/5MNQwYfbb5Q9LIPzXkn8EKctVl9PF/Z nuL2/AdlvkkLF3i7TInMfptfLOp9eRY72N0zKrZPB3Zak0sIm/yQ6UxVyANuL/Lu+h5u lpUJAnVmNthCFZg+8LbhoNGmTnm/pcu4YfIwqXuZwr3hsK/KfiChzZDkd/5BGUq1dc72 e6aw== X-Gm-Message-State: AOAM532QjiI+sDWkzDHJGordPFL5yPygRM8iHUuuDW9S9ohISgNlEfYq qJ0vvp6mjwA4QwdPdXENaUI= X-Google-Smtp-Source: ABdhPJxIgZcXrbG9m4W5mWtXM539pmqr2aTBVv66avDiE8egMiSk0SDCCjZrNq2xMzxeLLplBfG4tA== X-Received: by 2002:a1c:a90a:: with SMTP id s10mr18107430wme.11.1599440518243; Sun, 06 Sep 2020 18:01:58 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrzej Zaborowski , Peter Maydell , qemu-arm@nongnu.org, Gerd Hoffmann , Brad Smith , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure Date: Mon, 7 Sep 2020 03:01:55 +0200 Message-Id: <20200907010155.815131-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Commit a5d7eb6534a ("Add TSC2301 touchscreen & keypad controller") added the MouseTransformInfo declaration in "ui/console.h", however it is only used in "hw/input/tsc2xxx.h". Reduce the structure exposure by moving it to the single include where it is used. This should fix a build failure on OpenBSD: In file included from hw/arm/nseries.c:30: In file included from include/hw/arm/omap.h:24: In file included from include/hw/input/tsc2xxx.h:14: include/ui/console.h:11:11: fatal error: 'epoxy/gl.h' file not found # include ^~~~~~~~~~~~ 1 error generated. gmake: *** [Makefile.ninja:1735: libqemu-aarch64-softmmu.fa.p/hw_arm_nseries.c.o] Error 1 Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/input/tsc2xxx.h | 8 +++++++- include/ui/console.h | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/hw/input/tsc2xxx.h b/include/hw/input/tsc2xxx.h index 3cd8f1bf55b..5b76ebc1776 100644 --- a/include/hw/input/tsc2xxx.h +++ b/include/hw/input/tsc2xxx.h @@ -11,7 +11,13 @@ #ifndef HW_INPUT_TSC2XXX_H #define HW_INPUT_TSC2XXX_H =20 -#include "ui/console.h" +typedef struct MouseTransformInfo { + /* Touchscreen resolution */ + int x; + int y; + /* Calibration values as used/generated by tslib */ + int a[7]; +} MouseTransformInfo; =20 typedef struct uWireSlave { uint16_t (*receive)(void *opaque); diff --git a/include/ui/console.h b/include/ui/console.h index f35b4fc082b..30eed00dfcd 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -65,14 +65,6 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entr= y); =20 void kbd_put_ledstate(int ledstate); =20 -typedef struct MouseTransformInfo { - /* Touchscreen resolution */ - int x; - int y; - /* Calibration values as used/generated by tslib */ - int a[7]; -} MouseTransformInfo; - void hmp_mouse_set(Monitor *mon, const QDict *qdict); =20 /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx --=20 2.26.2