hw: Remove "hw/devices.h"
v3 cover hw: Remove "hw/devices.h"
Hi,
As his first comment describes itself, the "hw/devices.h" contains declarations for "Devices that have nowhere better to go." This series remove it, creating new headers for devices covered there. MAINTAINERS is updated.
I also included 2 cleanups while working on this, in "qemu/typedefs.h" and "hw/net/ne2000-isa.h" header guard.
v3:
- rebased
- added 2 patches suggested by Markus
- addressed Markus review comments
- added Markus's R-b
v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00925.html
- added R-b, T-b tags
- addressed many review comments from Thomas
v1: https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg00611.html
Phil.
$ git backport-diff -u remove_hw_devices-v2 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/12:[----] [-C] 'hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string' 002/12:[down] 'hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string' 003/12:[down] 'hw/display/tc6393xb: Remove unused functions'
004/12:[0006] [FC] 'hw/devices: Move TC6393XB declarations into a new header' 005/12:[----] [-C] 'hw/devices: Move Blizzard declarations into a new header' 006/12:[----] [-C] 'hw/devices: Move CBus declarations into a new header' 007/12:[0002] [FC] 'hw/devices: Move Gamepad declarations into a new header' 008/12:[0002] [FC] 'hw/devices: Move TI touchscreen declarations into a new header' 009/12:[----] [--] 'hw/devices: Move LAN9118 declarations into a new header' 010/12:[----] [--] 'hw/net/ne2000-isa: Add guards to the header'
011/12:[----] [--] 'hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string' 012/12:[----] [--] 'hw/devices: Move SMSC 91C111 declaration into a new header'
Philippe Mathieu-Daudé (12):
hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded
string
hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string hw/display/tc6393xb: Remove unused functions
hw/devices: Move TC6393XB declarations into a new header hw/devices: Move Blizzard declarations into a new header hw/devices: Move CBus declarations into a new header hw/devices: Move Gamepad declarations into a new header hw/devices: Move TI touchscreen declarations into a new header hw/devices: Move LAN9118 declarations into a new header hw/net/ne2000-isa: Add guards to the header hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded
string
hw/devices: Move SMSC 91C111 declaration into a new header
MAINTAINERS | 7 ++++ hw/arm/aspeed.c | 13 +++++--- hw/arm/exynos4_boards.c | 3 +- hw/arm/gumstix.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/mps2-tz.c | 3 +- hw/arm/mps2.c | 2 +- hw/arm/nseries.c | 7 ++-- hw/arm/palm.c | 2 +- hw/arm/realview.c | 3 +- hw/arm/stellaris.c | 2 +- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/tc6393xb.c | 18 +--------- hw/input/stellaris_input.c | 2 +- hw/input/tsc2005.c | 2 +- hw/input/tsc210x.c | 4 +-- hw/misc/cbus.c | 2 +- hw/net/lan9118.c | 3 +- hw/net/smc91c111.c | 2 +- include/hw/arm/omap.h | 6 +--- include/hw/devices.h | 62 ----------------------------------- include/hw/display/blizzard.h | 22 +++++++++++++ include/hw/display/tc6393xb.h | 24 ++++++++++++++ include/hw/input/gamepad.h | 19 +++++++++++ include/hw/input/tsc2xxx.h | 36 ++++++++++++++++++++ include/hw/misc/cbus.h | 32 ++++++++++++++++++ include/hw/net/lan9118.h | 21 ++++++++++++ include/hw/net/ne2000-isa.h | 6 ++++ include/hw/net/smc91c111.h | 19 +++++++++++ include/qemu/typedefs.h | 1 - 35 files changed, 226 insertions(+), 113 deletions(-) delete mode 100644 include/hw/devices.h create mode 100644 include/hw/display/blizzard.h create mode 100644 include/hw/display/tc6393xb.h create mode 100644 include/hw/input/gamepad.h create mode 100644 include/hw/input/tsc2xxx.h create mode 100644 include/hw/misc/cbus.h create mode 100644 include/hw/net/lan9118.h create mode 100644 include/hw/net/smc91c111.h
Signature · 1 line
2.20.1
PATCH v3 1/12 hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
--- hw/arm/aspeed.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
hw/arm/aspeed.c +9 -4
@@ -19,6 +19,8 @@#include "hw/arm/aspeed_soc.h" #include "hw/boards.h" #include "hw/i2c/smbus_eeprom.h" +#include "hw/misc/pca9552.h" +#include "hw/misc/tmp105.h" #include "qemu/log.h" #include "sysemu/block-backend.h" #include "hw/loader.h"
@@ -267,7 +269,8 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc) eeprom_buf);/* The AST2500 EVB expects a LM75 but a TMP105 is compatible */ -i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),7 ),"tmp105" ,0x4d ); +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),7 ), +TYPE_TMP105 ,0x4d );/* The AST2500 EVB does not have an RTC. Let's pretend that one is * plugged on the I2C bus header */
@@ -288,13 +291,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)AspeedSoCState *soc = &bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 ); -i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),3 ),"pca9552" ,0x60 ); +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),3 ),TYPE_PCA9552 , +0x60 );i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),4 ),"tmp423" ,0x4c );i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),5 ),"tmp423" ,0x4c );/* The Witherspoon expects a TMP275 but a TMP105 is compatible */ -i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),9 ),"tmp105" ,0x4a ); +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),9 ),TYPE_TMP105 , +0x4a );/* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is * good enough */
@@ -302,7 +307,7 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)smbus_eeprom_init_one (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),0x51 , eeprom_buf); -i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"pca9552" , +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),TYPE_PCA9552 ,0x60 ); }
Signature · 1 line
2.20.1
PATCH v3 2/12 hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string
In reply to Philippe Mathieu-Daudé--- hw/arm/nseries.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/arm/nseries.c +2 -1
@@ -31,6 +31,7 @@#include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/devices.h" +#include "hw/misc/tmp105.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h"
@@ -218,7 +219,7 @@ static void n8x0_i2c_setup(struct n800_s *s)qemu_register_powerdown_notifier (&n8x0_system_powerdown_notifier);/* Attach a TMP105 PM chip (A0 wired to ground) */ - dev =i2c_create_slave (i2c,"tmp105" ,N8X0_TMP105_ADDR ); + dev =i2c_create_slave (i2c,TYPE_TMP105 ,N8X0_TMP105_ADDR );qdev_connect_gpio_out (dev,0 , tmp_irq); }
Signature · 1 line
2.20.1
PATCH v3 3/12 hw/display/tc6393xb: Remove unused functions
In reply to Philippe Mathieu-DaudéNo code used the tc6393xb_gpio_in_get() and tc6393xb_gpio_out_set() functions since their introduction in commit 88d2c950b002. Time to remove them.
--- hw/display/tc6393xb.c | 16 ---------------- include/hw/devices.h | 3 --- 2 files changed, 19 deletions(-)
hw/display/tc6393xb.c +0 -16
@@ -137,11 +137,6 @@ struct TC6393xbState { blanked :1 ; }; -qemu_irq *tc6393xb_gpio_in_get (TC6393xbState *s) -{ -return s->gpio_in; -} -static void tc6393xb_gpio_set (void *opaque,int line,int level) {// TC6393xbState *s = opaque;
@@ -154,17 +149,6 @@ static void tc6393xb_gpio_set(void *opaque, int line, int level)// FIXME: how does the chip reflect the GPIO input level change? } -void tc6393xb_gpio_out_set (TC6393xbState *s,int line, -qemu_irq handler) -{ -if (line >=TC6393XB_GPIOS ) { -fprintf (stderr,"TC6393xb: no GPIO pin %d\n" , line); -return ; - } - - s->handler[line] = handler; -} -static void tc6393xb_gpio_handler_update (TC6393xbState *s) {uint32_t level, diff;
include/hw/devices.h +0 -3
@@ -54,9 +54,6 @@ void retu_key_event(void *retu, int state);typedef struct TC6393xbState TC6393xbState ;TC6393xbState *tc6393xb_init (struct MemoryRegion *sysmem,uint32_t base,qemu_irq irq); -void tc6393xb_gpio_out_set (TC6393xbState *s,int line, -qemu_irq handler); -qemu_irq *tc6393xb_gpio_in_get (TC6393xbState *s);qemu_irq tc6393xb_l3v_get (TC6393xbState *s);#endif
Signature · 1 line
2.20.1
PATCH v3 4/12 hw/devices: Move TC6393XB declarations into a new header
In reply to Philippe Mathieu-Daudé--- MAINTAINERS | 1 + hw/arm/tosa.c | 2 +- hw/display/tc6393xb.c | 2 +- include/hw/devices.h | 6 ------ include/hw/display/tc6393xb.h | 24 ++++++++++++++++++++++++ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 include/hw/display/tc6393xb.h
MAINTAINERS +1 -0
@@ -714,6 +714,7 @@ F: hw/misc/mst_fpga.c F: hw/misc/max111x.c F: include/hw/arm/pxa.h F: include/hw/arm/sharpsl.h +F: include/hw/display/tc6393xb.h SABRELITE / i.MX6 M: Peter Maydell <[email protected]>
hw/arm/tosa.c +1 -1
@@ -16,10 +16,10 @@#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/arm.h" -#include "hw/devices.h" #include "hw/arm/sharpsl.h" #include "hw/pcmcia.h" #include "hw/boards.h" +#include "hw/display/tc6393xb.h" #include "hw/i2c/i2c.h" #include "hw/ssi/ssi.h" #include "hw/sysbus.h"
hw/display/tc6393xb.c +1 -1
@@ -14,7 +14,7 @@#include "qapi/error.h" #include "qemu/host-utils.h" #include "hw/hw.h" -#include "hw/devices.h" +#include "hw/display/tc6393xb.h" #include "hw/block/flash.h" #include "ui/console.h" #include "ui/pixel_ops.h"
include/hw/devices.h +0 -6
@@ -50,10 +50,4 @@ void *tahvo_init(qemu_irq irq, int betty);void retu_key_event (void *retu,int state); -/* tc6393xb.c */ -typedef struct TC6393xbState TC6393xbState ; -TC6393xbState *tc6393xb_init (struct MemoryRegion *sysmem, -uint32_t base,qemu_irq irq); -qemu_irq tc6393xb_l3v_get (TC6393xbState *s); -#endif
include/hw/display/tc6393xb.h new file +24 -0
@@ -0,0 +1,24 @@ +/* +* Toshiba TC6393XB I/O Controller. +* Found in Sharp Zaurus SL-6000 (tosa) or some +* Toshiba e-Series PDAs. +* +* Copyright (c) 2007 Hervé Poussineau +* +* 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_DISPLAY_TC6393XB_H +#define HW_DISPLAY_TC6393XB_H + +#include "exec/memory.h" +#include "hw/irq.h" + +typedef struct TC6393xbState TC6393xbState ; + +TC6393xbState *tc6393xb_init (struct MemoryRegion *sysmem, +uint32_t base,qemu_irq irq); +qemu_irq tc6393xb_l3v_get (TC6393xbState *s); + +#endif
Signature · 1 line
2.20.1
PATCH v3 5/12 hw/devices: Move Blizzard declarations into a new header
In reply to Philippe Mathieu-DaudéAdd an entries the Blizzard device in MAINTAINERS.
--- MAINTAINERS | 2 ++ hw/arm/nseries.c | 1 + hw/display/blizzard.c | 2 +- include/hw/devices.h | 7 ------- include/hw/display/blizzard.h | 22 ++++++++++++++++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 include/hw/display/blizzard.h
MAINTAINERS +2 -0
@@ -663,10 +663,12 @@ M: Peter Maydell <[email protected]> L: [email protected] S: Odd Fixes F: hw/arm/nseries.c +F: hw/display/blizzard.c F: hw/input/lm832x.c F: hw/input/tsc2005.c F: hw/misc/cbus.c F: hw/timer/twl92230.c +F: include/hw/display/blizzard.h Palm M: Andrzej Zaborowski <[email protected]>
hw/arm/nseries.c +1 -0
@@ -31,6 +31,7 @@#include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/devices.h" +#include "hw/display/blizzard.h" #include "hw/misc/tmp105.h" #include "hw/block/flash.h" #include "hw/hw.h"
hw/display/blizzard.c +1 -1
@@ -21,7 +21,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/display/blizzard.h" #include "ui/pixel_ops.h" typedef void (*blizzard_fn_t )(uint8_t *,const uint8_t *,unsigned int );
include/hw/devices.h +0 -7
@@ -29,13 +29,6 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info);/* stellaris_input.c */ void stellaris_gamepad_init (int n,qemu_irq *irq,const int *keycode); -/* blizzard.c */ -void *s1d13745_init (qemu_irq gpio_int); -void s1d13745_write (void *opaque,int dc,uint16_t value); -void s1d13745_write_block (void *opaque,int dc, -void *buf,size_t len,int pitch); -uint16_t s1d13745_read (void *opaque,int dc); -/* cbus.c */ typedef struct { qemu_irq clk;
include/hw/display/blizzard.h new file +22 -0
@@ -0,0 +1,22 @@ +/* +* Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller. +* +* Copyright (C) 2008 Nokia Corporation +* Written by Andrzej Zaborowski +* +* 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_DISPLAY_BLIZZARD_H +#define HW_DISPLAY_BLIZZARD_H + +#include "hw/irq.h" + +void *s1d13745_init (qemu_irq gpio_int); +void s1d13745_write (void *opaque,int dc,uint16_t value); +void s1d13745_write_block (void *opaque,int dc, +void *buf,size_t len,int pitch); +uint16_t s1d13745_read (void *opaque,int dc); + +#endif
Signature · 1 line
2.20.1
PATCH v3 6/12 hw/devices: Move CBus declarations into a new header
In reply to Philippe Mathieu-Daudé--- MAINTAINERS | 1 + hw/arm/nseries.c | 1 + hw/misc/cbus.c | 2 +- include/hw/devices.h | 14 -------------- include/hw/misc/cbus.h | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 include/hw/misc/cbus.h
MAINTAINERS +1 -0
@@ -669,6 +669,7 @@ F: hw/input/tsc2005.c F: hw/misc/cbus.c F: hw/timer/twl92230.c F: include/hw/display/blizzard.h +F: include/hw/misc/cbus.h Palm M: Andrzej Zaborowski <[email protected]>
hw/arm/nseries.c +1 -0
@@ -32,6 +32,7 @@#include "hw/i2c/i2c.h" #include "hw/devices.h" #include "hw/display/blizzard.h" +#include "hw/misc/cbus.h" #include "hw/misc/tmp105.h" #include "hw/block/flash.h" #include "hw/hw.h"
hw/misc/cbus.c +1 -1
@@ -23,7 +23,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" -#include "hw/devices.h" +#include "hw/misc/cbus.h" #include "sysemu/sysemu.h" //#define DEBUG
include/hw/devices.h +0 -14
@@ -29,18 +29,4 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info);/* stellaris_input.c */ void stellaris_gamepad_init (int n,qemu_irq *irq,const int *keycode); -/* cbus.c */ -typedef struct { -qemu_irq clk; -qemu_irq dat; -qemu_irq sel; -}CBus ; -CBus *cbus_init (qemu_irq dat_out); -void cbus_attach (CBus *bus,void *slave_opaque); - -void *retu_init (qemu_irq irq,int vilma); -void *tahvo_init (qemu_irq irq,int betty); - -void retu_key_event (void *retu,int state); -#endif
include/hw/misc/cbus.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* CBUS three-pin bus and the Retu / Betty / Tahvo / Vilma / Avilma / +* Hinku / Vinku / Ahne / Pihi chips used in various Nokia platforms. +* Based on reverse-engineering of a linux driver. +* +* Copyright (C) 2008 Nokia Corporation +* Written by Andrzej Zaborowski +* +* 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_MISC_CBUS_H +#define HW_MISC_CBUS_H + +#include "hw/irq.h" + +typedef struct { +qemu_irq clk; +qemu_irq dat; +qemu_irq sel; +}CBus ; + +CBus *cbus_init (qemu_irq dat_out); +void cbus_attach (CBus *bus,void *slave_opaque); + +void *retu_init (qemu_irq irq,int vilma); +void *tahvo_init (qemu_irq irq,int betty); + +void retu_key_event (void *retu,int state); + +#endif
Signature · 1 line
2.20.1
PATCH v3 7/12 hw/devices: Move Gamepad declarations into a new header
In reply to Philippe Mathieu-Daudé---
v3:
Drop "Gamepad devices that have nowhere better to go" comment (Markus)
--- MAINTAINERS | 1 + hw/arm/stellaris.c | 2 +- hw/input/stellaris_input.c | 2 +- include/hw/devices.h | 3 --- include/hw/input/gamepad.h | 19 +++++++++++++++++++ 5 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 include/hw/input/gamepad.h
MAINTAINERS +1 -0
@@ -744,6 +744,7 @@ M: Peter Maydell <[email protected]> L: [email protected] S: Maintained F: hw/*/stellaris* +F: include/hw/input/gamepad.h Versatile Express M: Peter Maydell <[email protected]>
hw/arm/stellaris.c +1 -1
@@ -12,7 +12,6 @@#include "hw/sysbus.h" #include "hw/ssi/ssi.h" #include "hw/arm/arm.h" -#include "hw/devices.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h"
@@ -22,6 +21,7 @@#include "sysemu/sysemu.h" #include "hw/arm/armv7m.h" #include "hw/char/pl011.h" +#include "hw/input/gamepad.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/misc/unimp.h" #include "cpu.h"
hw/input/stellaris_input.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/devices.h" +#include "hw/input/gamepad.h" #include "ui/console.h" typedef struct {
include/hw/devices.h +0 -3
@@ -26,7 +26,4 @@ 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); -/* stellaris_input.c */ -void stellaris_gamepad_init (int n,qemu_irq *irq,const int *keycode); -#endif
include/hw/input/gamepad.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Gamepad style buttons connected to IRQ/GPIO lines +* +* Copyright (c) 2007 CodeSourcery. +* Written by Paul Brook +* +* 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_GAMEPAD_H +#define HW_INPUT_GAMEPAD_H + +#include "hw/irq.h" + +/* stellaris_input.c */ +void stellaris_gamepad_init (int n,qemu_irq *irq,const int *keycode); + +#endif
Signature · 1 line
2.20.1
PATCH v3 8/12 hw/devices: Move TI touchscreen declarations into a new header
In reply to Philippe Mathieu-DaudéSince uWireSlave is only used in this new header, there is no need to expose it via "qemu/typedefs.h".
---
v3:
Drop "TI 4/8-wire resistive touch screen converters" comment (Markus)
--- MAINTAINERS | 2 ++ hw/arm/nseries.c | 2 +- hw/arm/palm.c | 2 +- hw/input/tsc2005.c | 2 +- hw/input/tsc210x.c | 4 ++-- include/hw/arm/omap.h | 6 +----- include/hw/devices.h | 15 --------------- include/hw/input/tsc2xxx.h | 36 ++++++++++++++++++++++++++++++++++++ include/qemu/typedefs.h | 1 - 9 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 include/hw/input/tsc2xxx.h
MAINTAINERS +2 -0
@@ -669,6 +669,7 @@ F: hw/input/tsc2005.c F: hw/misc/cbus.c F: hw/timer/twl92230.c F: include/hw/display/blizzard.h +F: include/hw/input/tsc2xxx.h F: include/hw/misc/cbus.h Palm
@@ -678,6 +679,7 @@ L: [email protected] S: Odd Fixes F: hw/arm/palm.c F: hw/input/tsc210x.c +F: include/hw/input/tsc2xxx.h Raspberry Pi M: Peter Maydell <[email protected]>
hw/arm/nseries.c +1 -1
@@ -30,8 +30,8 @@#include "ui/console.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" -#include "hw/devices.h" #include "hw/display/blizzard.h" +#include "hw/input/tsc2xxx.h" #include "hw/misc/cbus.h" #include "hw/misc/tmp105.h" #include "hw/block/flash.h"
hw/arm/palm.c +1 -1
@@ -26,7 +26,7 @@#include "hw/arm/omap.h" #include "hw/boards.h" #include "hw/arm/arm.h" -#include "hw/devices.h" +#include "hw/input/tsc2xxx.h" #include "hw/loader.h" #include "exec/address-spaces.h" #include "cpu.h"
hw/input/tsc2005.c +1 -1
@@ -23,7 +23,7 @@#include "hw/hw.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/input/tsc2xxx.h" #include "trace.h" #define TSC_CUT_RESOLUTION (value, p) ((value) >> (16 - (p ? 12 : 10)))
hw/input/tsc210x.c +2 -2
@@ -24,8 +24,8 @@#include "audio/audio.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */ -#include "hw/devices.h" +#include "hw/arm/omap.h" /* For I2SCodec */ +#include "hw/input/tsc2xxx.h" #define TSC_DATA_REGISTERS_PAGE 0x0#define TSC_CONTROL_REGISTERS_PAGE 0x1
include/hw/arm/omap.h +1 -5
@@ -20,6 +20,7 @@#include "exec/memory.h" # define hw_omap_h "omap.h"#include "hw/irq.h" +#include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.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_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 ;void omap_uwire_attach (struct omap_uwire_s *s,uWireSlave *slave,int chipselect);
include/hw/devices.h +0 -15
@@ -4,7 +4,6 @@/* Devices that have nowhere better to go. */ #include "hw/hw.h" -#include "ui/console.h" /* smc91c111.c */ void smc91c111_init (NICInfo *,uint32_t ,qemu_irq );
@@ -12,18 +11,4 @@ void smc91c111_init(NICInfo *, uint32_t, qemu_irq);/* lan9118.c */ 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
include/hw/input/tsc2xxx.h new file +36 -0
@@ -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
include/qemu/typedefs.h +0 -1
@@ -99,7 +99,6 @@ typedef struct RAMBlock RAMBlock;typedef struct Range Range ;typedef struct SHPCDevice SHPCDevice ;typedef struct SSIBus SSIBus ; -typedef struct uWireSlave uWireSlave ;typedef struct VirtIODevice VirtIODevice ;typedef struct Visitor Visitor ;typedef void SaveStateHandler (QEMUFile *f,void *opaque);
Signature · 1 line
2.20.1
PATCH v3 9/12 hw/devices: Move LAN9118 declarations into a new header
In reply to Philippe Mathieu-Daudé--- hw/arm/kzm.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/realview.c | 1 + hw/arm/vexpress.c | 2 +- hw/net/lan9118.c | 2 +- include/hw/devices.h | 3 --- include/hw/net/lan9118.h | 19 +++++++++++++++++++ 7 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 include/hw/net/lan9118.h
hw/arm/kzm.c +1 -1
@@ -22,7 +22,7 @@#include "qemu/error-report.h" #include "exec/address-spaces.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/char/serial.h" #include "sysemu/qtest.h"
hw/arm/mps2.c +1 -1
@@ -36,7 +36,7 @@#include "hw/timer/cmsdk-apb-timer.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "hw/misc/mps2-scc.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "net/net.h" typedef enum MPS2FPGAType {
hw/arm/realview.c +1 -0
@@ -15,6 +15,7 @@#include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h"
hw/arm/vexpress.c +1 -1
@@ -28,7 +28,7 @@#include "hw/sysbus.h" #include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" #include "sysemu/sysemu.h"
hw/net/lan9118.c +1 -1
@@ -14,7 +14,7 @@#include "hw/sysbus.h" #include "net/net.h" #include "net/eth.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h"
include/hw/devices.h +0 -3
@@ -8,7 +8,4 @@/* smc91c111.c */ void smc91c111_init (NICInfo *,uint32_t ,qemu_irq ); -/* lan9118.c */ -void lan9118_init (NICInfo *,uint32_t ,qemu_irq ); -#endif
include/hw/net/lan9118.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* SMSC LAN9118 Ethernet interface emulation +* +* Copyright (c) 2009 CodeSourcery, LLC. +* Written by Paul Brook +* +* 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_NET_LAN9118_H +#define HW_NET_LAN9118_H + +#include "hw/irq.h" +#include "net/net.h" + +void lan9118_init (NICInfo *,uint32_t ,qemu_irq ); + +#endif
Signature · 1 line
2.20.1
PATCH v3 10/12 hw/net/ne2000-isa: Add guards to the header
In reply to Philippe Mathieu-Daudé--- include/hw/net/ne2000-isa.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/hw/net/ne2000-isa.h +6 -0
@@ -6,6 +6,10 @@* 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_NET_NE2K_ISA_H +#define HW_NET_NE2K_ISA_H +#include "hw/hw.h" #include "hw/qdev.h" #include "hw/isa/isa.h"
@@ -31,3 +35,5 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq, }return d; } + +#endif
Signature · 1 line
2.20.1
PATCH v3 11/12 hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string
In reply to Philippe Mathieu-Daudé--- hw/arm/exynos4_boards.c | 3 ++- hw/arm/mps2-tz.c | 3 ++- hw/net/lan9118.c | 1 - include/hw/net/lan9118.h | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-)
hw/arm/exynos4_boards.c +2 -1
@@ -32,6 +32,7 @@#include "hw/arm/arm.h" #include "exec/address-spaces.h" #include "hw/arm/exynos4210.h" +#include "hw/net/lan9118.h" #include "hw/boards.h" #undef DEBUG
@@ -92,7 +93,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq)/* This should be a 9215 but the 9118 is close enough */ if (nd_table[0 ].used) {qemu_check_nic_model (&nd_table[0 ],"lan9118" ); - dev =qdev_create (NULL ,"lan9118" ); + dev =qdev_create (NULL ,TYPE_LAN9118 );qdev_set_nic_properties (dev, &nd_table[0 ]);qdev_prop_set_uint32 (dev,"mode_16bit" ,1 );qdev_init_nofail (dev);
hw/arm/mps2-tz.c +2 -1
@@ -56,6 +56,7 @@#include "hw/arm/armsse.h" #include "hw/dma/pl080.h" #include "hw/ssi/pl022.h" +#include "hw/net/lan9118.h" #include "net/net.h" #include "hw/core/split-irq.h"
@@ -244,7 +245,7 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,* except that it doesn't support the checksum-offload feature. */ qemu_check_nic_model (nd,"lan9118" ); - mms->lan9118 =qdev_create (NULL ,"lan9118" ); + mms->lan9118 =qdev_create (NULL ,TYPE_LAN9118 );qdev_set_nic_properties (mms->lan9118, nd);qdev_init_nofail (mms->lan9118);
hw/net/lan9118.c +0 -1
@@ -175,7 +175,6 @@ static const VMStateDescription vmstate_lan9118_packet = { } }; -#define TYPE_LAN9118 "lan9118"#define LAN9118 (obj) OBJECT_CHECK(lan9118_state, (obj), TYPE_LAN9118) typedef struct {
include/hw/net/lan9118.h +2 -0
@@ -14,6 +14,8 @@#include "hw/irq.h" #include "net/net.h" +#define TYPE_LAN9118 "lan9118" +void lan9118_init (NICInfo *,uint32_t ,qemu_irq );#endif
Signature · 1 line
2.20.1
PATCH v3 12/12 hw/devices: Move SMSC 91C111 declaration into a new header
In reply to Philippe Mathieu-DaudéThis commit finally deletes "hw/devices.h".
--- hw/arm/gumstix.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/net/smc91c111.c | 2 +- include/hw/devices.h | 11 ----------- include/hw/net/smc91c111.h | 19 +++++++++++++++++++ 8 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 include/hw/devices.h create mode 100644 include/hw/net/smc91c111.h
hw/arm/gumstix.c +1 -1
@@ -40,7 +40,7 @@#include "hw/arm/pxa.h" #include "net/net.h" #include "hw/block/flash.h" -#include "hw/devices.h" +#include "hw/net/smc91c111.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h"
hw/arm/integratorcp.c +1 -1
@@ -12,10 +12,10 @@#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/devices.h" #include "hw/boards.h" #include "hw/arm/arm.h" #include "hw/misc/arm_integrator_debug.h" +#include "hw/net/smc91c111.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h"
hw/arm/mainstone.c +1 -1
@@ -18,7 +18,7 @@#include "hw/arm/pxa.h" #include "hw/arm/arm.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/net/smc91c111.h" #include "hw/boards.h" #include "hw/block/flash.h" #include "hw/sysbus.h"
hw/arm/realview.c +1 -1
@@ -14,8 +14,8 @@#include "hw/sysbus.h" #include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/devices.h" #include "hw/net/lan9118.h" +#include "hw/net/smc91c111.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h"
hw/arm/versatilepb.c +1 -1
@@ -13,7 +13,7 @@#include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" -#include "hw/devices.h" +#include "hw/net/smc91c111.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h"
hw/net/smc91c111.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/net/smc91c111.h" #include "qemu/log.h" /* For crc32 */ #include <zlib.h>
include/hw/devices.h deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef QEMU_DEVICES_H -#define QEMU_DEVICES_H - -/* Devices that have nowhere better to go. */ - -#include "hw/hw.h" - -/* smc91c111.c */ -void smc91c111_init (NICInfo *,uint32_t ,qemu_irq ); - -#endif
include/hw/net/smc91c111.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* SMSC 91C111 Ethernet interface emulation +* +* Copyright (c) 2005 CodeSourcery, LLC. +* Written by Paul Brook +* +* 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_NET_SMC91C111_H +#define HW_NET_SMC91C111_H + +#include "hw/irq.h" +#include "net/net.h" + +void smc91c111_init (NICInfo *,uint32_t ,qemu_irq ); + +#endif
Signature · 1 line
2.20.1
Quoted 10 lines · Philippe Mathieu-Daudé
Hi,
As his first comment describes itself, the "
hw/devices.h" contains declarations for "Devices that have nowhere better to go." This series remove it, creating new headers for devices covered there.MAINTAINERSis updated.
I also included 2 cleanups while working on this, in "qemu/typedefs.h" and "hw/net/ne2000-isa.h" header guard.
Quoted 5 lines
v3:
- rebased
- added 2 patches suggested by Markus
- addressed Markus review comments
- added Markus's R-b
Since these are almost all arm devices I'll take this via the target-arm tree (I'm going to make a pullreq later today).
thanks
-- PMM
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Philippe Mathieu-Daudé
Hi,
As his first comment describes itself, the "
hw/devices.h" contains declarations for "Devices that have nowhere better to go." This series remove it, creating new headers for devices covered there.MAINTAINERSis updated.
I also included 2 cleanups while working on this, in "qemu/typedefs.h" and "hw/net/ne2000-isa.h" header guard.
Quoted 8 lines
Quoted 5 lines
v3:
- rebased
- added 2 patches suggested by Markus
- addressed Markus review comments
- added Markus's R-bSince these are almost all arm devices I'll take this via the target-arm tree (I'm going to make a pullreq later today).
Thanks Peter!