* [PULL 0/1] Input 20200921 patches
@ 2020-09-21 11:09 Gerd Hoffmann
2020-09-21 11:09 ` [PULL 1/1] hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure Gerd Hoffmann
2020-09-22 21:01 ` [PULL 0/1] Input 20200921 patches Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2020-09-21 11:09 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, qemu-arm, Gerd Hoffmann
The following changes since commit 053a4177817db307ec854356e95b5b350800a216:
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' i=
nto staging (2020-09-18 16:34:26 +0100)
are available in the Git repository at:
git://git.kraxel.org/qemu tags/input-20200921-pull-request
for you to fetch changes up to 38b01a997e6678b4ba86ab12a78a39b7d94ee7d0:
hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure (2020-09-21 =
11:22:34 +0200)
----------------------------------------------------------------
input: tsc2xxx fix.
----------------------------------------------------------------
Philippe Mathieu-Daud=C3=A9 (1):
hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure
include/hw/input/tsc2xxx.h | 8 +++++++-
include/ui/console.h | 8 --------
2 files changed, 7 insertions(+), 9 deletions(-)
--=20
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure
2020-09-21 11:09 [PULL 0/1] Input 20200921 patches Gerd Hoffmann
@ 2020-09-21 11:09 ` Gerd Hoffmann
2020-09-22 21:01 ` [PULL 0/1] Input 20200921 patches Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2020-09-21 11:09 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-arm, Gerd Hoffmann, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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 <epoxy/gl.h>
^~~~~~~~~~~~
1 error generated.
gmake: *** [Makefile.ninja:1735:
libqemu-aarch64-softmmu.fa.p/hw_arm_nseries.c.o] Error 1
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200907010155.815131-1-f4bug@amsat.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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 3cd8f1bf55be..5b76ebc17761 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
-#include "ui/console.h"
+typedef struct MouseTransformInfo {
+ /* Touchscreen resolution */
+ int x;
+ int y;
+ /* Calibration values as used/generated by tslib */
+ int a[7];
+} MouseTransformInfo;
typedef struct uWireSlave {
uint16_t (*receive)(void *opaque);
diff --git a/include/ui/console.h b/include/ui/console.h
index 8602203523d9..f02da5372599 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -65,14 +65,6 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
void kbd_put_ledstate(int ledstate);
-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);
/* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PULL 0/1] Input 20200921 patches
2020-09-21 11:09 [PULL 0/1] Input 20200921 patches Gerd Hoffmann
2020-09-21 11:09 ` [PULL 1/1] hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure Gerd Hoffmann
@ 2020-09-22 21:01 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2020-09-22 21:01 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-arm, QEMU Developers
On Mon, 21 Sep 2020 at 12:09, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 053a4177817db307ec854356e95b5b350800a216:
>
> Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' i=
> nto staging (2020-09-18 16:34:26 +0100)
>
> are available in the Git repository at:
>
> git://git.kraxel.org/qemu tags/input-20200921-pull-request
>
> for you to fetch changes up to 38b01a997e6678b4ba86ab12a78a39b7d94ee7d0:
>
> hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure (2020-09-21 =
> 11:22:34 +0200)
>
> ----------------------------------------------------------------
> input: tsc2xxx fix.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-22 21:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-21 11:09 [PULL 0/1] Input 20200921 patches Gerd Hoffmann
2020-09-21 11:09 ` [PULL 1/1] hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure Gerd Hoffmann
2020-09-22 21:01 ` [PULL 0/1] Input 20200921 patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).