mirror of
https://github.com/qemu/qemu.git
synced 2025-08-09 10:25:06 +00:00
hw/devices: Move TI touchscreen declarations into a new header
Since uWireSlave is only used in this new header, there is no need to expose it via "qemu/typedefs.h". Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20190412165416.7977-9-philmd@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
98fa33276e
commit
a331dd0299
@ -669,6 +669,7 @@ F: hw/input/tsc2005.c
|
|||||||
F: hw/misc/cbus.c
|
F: hw/misc/cbus.c
|
||||||
F: hw/timer/twl92230.c
|
F: hw/timer/twl92230.c
|
||||||
F: include/hw/display/blizzard.h
|
F: include/hw/display/blizzard.h
|
||||||
|
F: include/hw/input/tsc2xxx.h
|
||||||
F: include/hw/misc/cbus.h
|
F: include/hw/misc/cbus.h
|
||||||
|
|
||||||
Palm
|
Palm
|
||||||
@ -678,6 +679,7 @@ L: qemu-arm@nongnu.org
|
|||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: hw/arm/palm.c
|
F: hw/arm/palm.c
|
||||||
F: hw/input/tsc210x.c
|
F: hw/input/tsc210x.c
|
||||||
|
F: include/hw/input/tsc2xxx.h
|
||||||
|
|
||||||
Raspberry Pi
|
Raspberry Pi
|
||||||
M: Peter Maydell <peter.maydell@linaro.org>
|
M: Peter Maydell <peter.maydell@linaro.org>
|
||||||
|
@ -30,8 +30,8 @@
|
|||||||
#include "ui/console.h"
|
#include "ui/console.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
#include "hw/devices.h"
|
|
||||||
#include "hw/display/blizzard.h"
|
#include "hw/display/blizzard.h"
|
||||||
|
#include "hw/input/tsc2xxx.h"
|
||||||
#include "hw/misc/cbus.h"
|
#include "hw/misc/cbus.h"
|
||||||
#include "hw/misc/tmp105.h"
|
#include "hw/misc/tmp105.h"
|
||||||
#include "hw/block/flash.h"
|
#include "hw/block/flash.h"
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "hw/arm/omap.h"
|
#include "hw/arm/omap.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "hw/arm/arm.h"
|
#include "hw/arm/arm.h"
|
||||||
#include "hw/devices.h"
|
#include "hw/input/tsc2xxx.h"
|
||||||
#include "hw/loader.h"
|
#include "hw/loader.h"
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "ui/console.h"
|
#include "ui/console.h"
|
||||||
#include "hw/devices.h"
|
#include "hw/input/tsc2xxx.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
|
|
||||||
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
|
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "ui/console.h"
|
#include "ui/console.h"
|
||||||
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
|
#include "hw/arm/omap.h" /* For I2SCodec */
|
||||||
#include "hw/devices.h"
|
#include "hw/input/tsc2xxx.h"
|
||||||
|
|
||||||
#define TSC_DATA_REGISTERS_PAGE 0x0
|
#define TSC_DATA_REGISTERS_PAGE 0x0
|
||||||
#define TSC_CONTROL_REGISTERS_PAGE 0x1
|
#define TSC_CONTROL_REGISTERS_PAGE 0x1
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "exec/memory.h"
|
#include "exec/memory.h"
|
||||||
# define hw_omap_h "omap.h"
|
# define hw_omap_h "omap.h"
|
||||||
#include "hw/irq.h"
|
#include "hw/irq.h"
|
||||||
|
#include "hw/input/tsc2xxx.h"
|
||||||
#include "target/arm/cpu-qom.h"
|
#include "target/arm/cpu-qom.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
|
|
||||||
@ -679,11 +680,6 @@ qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s);
|
|||||||
void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler);
|
void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler);
|
||||||
void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down);
|
void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down);
|
||||||
|
|
||||||
struct uWireSlave {
|
|
||||||
uint16_t (*receive)(void *opaque);
|
|
||||||
void (*send)(void *opaque, uint16_t data);
|
|
||||||
void *opaque;
|
|
||||||
};
|
|
||||||
struct omap_uwire_s;
|
struct omap_uwire_s;
|
||||||
void omap_uwire_attach(struct omap_uwire_s *s,
|
void omap_uwire_attach(struct omap_uwire_s *s,
|
||||||
uWireSlave *slave, int chipselect);
|
uWireSlave *slave, int chipselect);
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
/* Devices that have nowhere better to go. */
|
/* Devices that have nowhere better to go. */
|
||||||
|
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "ui/console.h"
|
|
||||||
|
|
||||||
/* smc91c111.c */
|
/* smc91c111.c */
|
||||||
void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
|
void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
|
||||||
@ -12,18 +11,4 @@ void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
|
|||||||
/* lan9118.c */
|
/* lan9118.c */
|
||||||
void lan9118_init(NICInfo *, uint32_t, qemu_irq);
|
void lan9118_init(NICInfo *, uint32_t, qemu_irq);
|
||||||
|
|
||||||
/* tsc210x.c */
|
|
||||||
uWireSlave *tsc2102_init(qemu_irq pint);
|
|
||||||
uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav);
|
|
||||||
I2SCodec *tsc210x_codec(uWireSlave *chip);
|
|
||||||
uint32_t tsc210x_txrx(void *opaque, uint32_t value, int len);
|
|
||||||
void tsc210x_set_transform(uWireSlave *chip,
|
|
||||||
MouseTransformInfo *info);
|
|
||||||
void tsc210x_key_event(uWireSlave *chip, int key, int down);
|
|
||||||
|
|
||||||
/* tsc2005.c */
|
|
||||||
void *tsc2005_init(qemu_irq pintdav);
|
|
||||||
uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len);
|
|
||||||
void tsc2005_set_transform(void *opaque, MouseTransformInfo *info);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
36
include/hw/input/tsc2xxx.h
Normal file
36
include/hw/input/tsc2xxx.h
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* TI touchscreen controller
|
||||||
|
*
|
||||||
|
* Copyright (c) 2006 Andrzej Zaborowski
|
||||||
|
* Copyright (C) 2008 Nokia Corporation
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef HW_INPUT_TSC2XXX_H
|
||||||
|
#define HW_INPUT_TSC2XXX_H
|
||||||
|
|
||||||
|
#include "hw/irq.h"
|
||||||
|
#include "ui/console.h"
|
||||||
|
|
||||||
|
typedef struct uWireSlave {
|
||||||
|
uint16_t (*receive)(void *opaque);
|
||||||
|
void (*send)(void *opaque, uint16_t data);
|
||||||
|
void *opaque;
|
||||||
|
} uWireSlave;
|
||||||
|
|
||||||
|
/* tsc210x.c */
|
||||||
|
uWireSlave *tsc2102_init(qemu_irq pint);
|
||||||
|
uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav);
|
||||||
|
I2SCodec *tsc210x_codec(uWireSlave *chip);
|
||||||
|
uint32_t tsc210x_txrx(void *opaque, uint32_t value, int len);
|
||||||
|
void tsc210x_set_transform(uWireSlave *chip, MouseTransformInfo *info);
|
||||||
|
void tsc210x_key_event(uWireSlave *chip, int key, int down);
|
||||||
|
|
||||||
|
/* tsc2005.c */
|
||||||
|
void *tsc2005_init(qemu_irq pintdav);
|
||||||
|
uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len);
|
||||||
|
void tsc2005_set_transform(void *opaque, MouseTransformInfo *info);
|
||||||
|
|
||||||
|
#endif
|
@ -99,7 +99,6 @@ typedef struct RAMBlock RAMBlock;
|
|||||||
typedef struct Range Range;
|
typedef struct Range Range;
|
||||||
typedef struct SHPCDevice SHPCDevice;
|
typedef struct SHPCDevice SHPCDevice;
|
||||||
typedef struct SSIBus SSIBus;
|
typedef struct SSIBus SSIBus;
|
||||||
typedef struct uWireSlave uWireSlave;
|
|
||||||
typedef struct VirtIODevice VirtIODevice;
|
typedef struct VirtIODevice VirtIODevice;
|
||||||
typedef struct Visitor Visitor;
|
typedef struct Visitor Visitor;
|
||||||
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
|
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
|
||||||
|
Loading…
Reference in New Issue
Block a user