* [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 19:40 ` Thomas Huth
2019-01-07 6:48 ` Cédric Le Goater
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
` (14 subsequent siblings)
15 siblings, 2 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/arm/aspeed.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 5158985482..817f9e1400 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -19,6 +19,8 @@
#include "hw/arm/aspeed_soc.h"
#include "hw/boards.h"
#include "hw/i2c/smbus.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);
}
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
2019-01-04 17:58 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Philippe Mathieu-Daudé
@ 2019-01-04 19:40 ` Thomas Huth
2019-01-07 6:48 ` Cédric Le Goater
1 sibling, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-04 19:40 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell, QEMU Trivial,
Igor Mitsyanko, Beniamino Galvani, Michael Walle,
Richard Henderson, Jan Kiszka, Jason Wang, Gerd Hoffmann,
Peter Chubb, Aurelien Jarno, Cédric Le Goater,
Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/aspeed.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 5158985482..817f9e1400 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -19,6 +19,8 @@
> #include "hw/arm/aspeed_soc.h"
> #include "hw/boards.h"
> #include "hw/i2c/smbus.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);
> }
>
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
2019-01-04 17:58 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Philippe Mathieu-Daudé
2019-01-04 19:40 ` Thomas Huth
@ 2019-01-07 6:48 ` Cédric Le Goater
1 sibling, 0 replies; 39+ messages in thread
From: Cédric Le Goater @ 2019-01-07 6:48 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno, Bastian Koppelmann,
Rob Herring
On 1/4/19 6:58 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> hw/arm/aspeed.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 5158985482..817f9e1400 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -19,6 +19,8 @@
> #include "hw/arm/aspeed_soc.h"
> #include "hw/boards.h"
> #include "hw/i2c/smbus.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);
> }
>
>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 22:24 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2019-01-07 9:56 ` [Qemu-devel] " Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition Philippe Mathieu-Daudé
` (13 subsequent siblings)
15 siblings, 2 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/alpha/typhoon.c | 1 -
hw/arm/allwinner-a10.c | 1 -
hw/arm/collie.c | 1 -
hw/arm/cubieboard.c | 1 -
hw/arm/highbank.c | 1 -
hw/arm/mps2-tz.c | 1 -
hw/arm/musicpal.c | 1 -
hw/arm/nrf51_soc.c | 1 -
hw/arm/spitz.c | 1 -
hw/arm/virt.c | 1 -
hw/arm/z2.c | 1 -
hw/display/sm501.c | 1 -
hw/hppa/dino.c | 1 -
hw/intc/allwinner-a10-pic.c | 1 -
hw/lm32/lm32_boards.c | 1 -
hw/lm32/milkymist.c | 1 -
hw/microblaze/petalogix_ml605_mmu.c | 1 -
hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 -
hw/net/dp8393x.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/sh4/r2d.c | 1 -
hw/tricore/tricore_testboard.c | 1 -
hw/usb/tusb6010.c | 1 -
23 files changed, 23 deletions(-)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 8004afe45b..90aa71eb01 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/hw.h"
-#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 9fe875cdb5..8c07086a01 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -20,7 +20,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "hw/arm/allwinner-a10.h"
static void aw_a10_init(Object *obj)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 48b732c176..3ca4e078fe 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -12,7 +12,6 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
-#include "hw/devices.h"
#include "strongarm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 32f1edd2fa..84187d3916 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -20,7 +20,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm/allwinner-a10.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index fb9efa02c3..96ccf18d86 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -21,7 +21,6 @@
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/kvm.h"
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 82b1d020a5..1232d6ff95 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -49,7 +49,6 @@
#include "hw/arm/iotkit.h"
#include "hw/dma/pl080.h"
#include "hw/ssi/pl022.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "hw/core/split-irq.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index d22532a11c..de4a12e496 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -15,7 +15,6 @@
#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index b89c1bdea0..d53b45a094 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -14,7 +14,6 @@
#include "hw/arm/arm.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
-#include "hw/devices.h"
#include "hw/misc/unimp.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index c4bc3deedf..22f5958b9d 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -21,7 +21,6 @@
#include "hw/ssi/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
-#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "hw/audio/wm8750.h"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index c2641e56ea..f02d157be6 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -37,7 +37,6 @@
#include "hw/vfio/vfio-calxeda-xgmac.h"
#include "hw/vfio/vfio-amd-xgbe.h"
#include "hw/display/ramfb.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/device_tree.h"
#include "sysemu/numa.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 697a822f1e..7afa352a96 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -15,7 +15,6 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi/ssi.h"
#include "hw/boards.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 4a8686f0f5..2122291308 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -32,7 +32,6 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
-#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/i2c/i2c.h"
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 31e09942b5..25c3178097 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -15,7 +15,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/hw.h"
-#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index 11f13663c8..1aa628cbbb 100644
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -17,7 +17,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/intc/allwinner-a10-pic.h"
#include "qemu/log.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index fd8eccca14..6b2fac55fb 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -25,7 +25,6 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 63c6894c95..08e39260d3 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -27,7 +27,6 @@
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index c730878d25..18048d3555 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -35,7 +35,6 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
#include "exec/address-spaces.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 5cf7b84c79..4ab343b44b 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -33,7 +33,6 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "hw/char/xilinx_uartlite.h"
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index b53fcaa8bc..98cb4e58c7 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "qapi/error.h"
#include "qemu/timer.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 5177120574..8142d68ca2 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -31,7 +31,6 @@
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 6a5fc46a47..64590c2b9b 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -31,7 +31,6 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index a58096f05e..364321735a 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -24,7 +24,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/hw.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index 501706e2b2..f76b59afe8 100644
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -24,7 +24,6 @@
#include "hw/usb.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
-#include "hw/devices.h"
#include "hw/sysbus.h"
#define TYPE_TUSB6010 "tusb6010"
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [Qemu-ppc] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
@ 2019-01-04 22:24 ` BALATON Zoltan
2019-01-07 9:56 ` [Qemu-devel] " Thomas Huth
1 sibling, 0 replies; 39+ messages in thread
From: BALATON Zoltan @ 2019-01-04 22:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Thomas Huth, Peter Maydell, Gerd Hoffmann,
Magnus Damm, David Gibson, Philippe Mathieu-Daudé,
qemu-ppc
On Fri, 4 Jan 2019, Philippe Mathieu-Daudé wrote:
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 4a8686f0f5..2122291308 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -32,7 +32,6 @@
> #include "hw/hw.h"
> #include "hw/char/serial.h"
> #include "ui/console.h"
> -#include "hw/devices.h"
> #include "hw/sysbus.h"
> #include "hw/pci/pci.h"
> #include "hw/i2c/i2c.h"
Looks like I forgot to drop this include in ca8a110470
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
2019-01-04 22:24 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
@ 2019-01-07 9:56 ` Thomas Huth
1 sibling, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 9:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Jason Wang, Gerd Hoffmann, Edgar E. Iglesias,
Rob Herring, Magnus Damm, Joel Stanley, David Gibson,
Beniamino Galvani, qemu-arm, Peter Chubb, Cédric Le Goater,
Richard Henderson, Andrew Jeffery, Bastian Koppelmann,
Philippe Mathieu-Daudé,
Igor Mitsyanko, Michael Walle, qemu-trivial, Jan Kiszka,
Aurelien Jarno
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/alpha/typhoon.c | 1 -
> hw/arm/allwinner-a10.c | 1 -
> hw/arm/collie.c | 1 -
> hw/arm/cubieboard.c | 1 -
> hw/arm/highbank.c | 1 -
> hw/arm/mps2-tz.c | 1 -
> hw/arm/musicpal.c | 1 -
> hw/arm/nrf51_soc.c | 1 -
> hw/arm/spitz.c | 1 -
> hw/arm/virt.c | 1 -
> hw/arm/z2.c | 1 -
> hw/display/sm501.c | 1 -
> hw/hppa/dino.c | 1 -
> hw/intc/allwinner-a10-pic.c | 1 -
> hw/lm32/lm32_boards.c | 1 -
> hw/lm32/milkymist.c | 1 -
> hw/microblaze/petalogix_ml605_mmu.c | 1 -
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 -
> hw/net/dp8393x.c | 1 -
> hw/ppc/virtex_ml507.c | 1 -
> hw/sh4/r2d.c | 1 -
> hw/tricore/tricore_testboard.c | 1 -
> hw/usb/tusb6010.c | 1 -
> 23 files changed, 23 deletions(-)
Works for me.
Tested-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 6:32 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 04/16] hw/devices: Move TC6393XB declarations into a new header Philippe Mathieu-Daudé
` (12 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Introduced in 64b40bc54a9, this definition is no more used since
a0b753dfd39. Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/devices.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 0e27feb0c2..4019b3be17 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -51,7 +51,6 @@ void retu_key_event(void *retu, int state);
/* tc6393xb.c */
typedef struct TC6393xbState TC6393xbState;
-#define TC6393XB_RAM 0x110000 /* amount of ram for Video and USB */
TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem,
uint32_t base, qemu_irq irq);
void tc6393xb_gpio_out_set(TC6393xbState *s, int line,
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition
2019-01-04 17:58 ` [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition Philippe Mathieu-Daudé
@ 2019-01-07 6:32 ` Thomas Huth
2019-01-07 7:56 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 6:32 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Introduced in 64b40bc54a9, this definition is no more used since
> a0b753dfd39. Remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> include/hw/devices.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/hw/devices.h b/include/hw/devices.h
> index 0e27feb0c2..4019b3be17 100644
> --- a/include/hw/devices.h
> +++ b/include/hw/devices.h
> @@ -51,7 +51,6 @@ void retu_key_event(void *retu, int state);
>
> /* tc6393xb.c */
> typedef struct TC6393xbState TC6393xbState;
> -#define TC6393XB_RAM 0x110000 /* amount of ram for Video and USB */
> TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem,
> uint32_t base, qemu_irq irq);
> void tc6393xb_gpio_out_set(TC6393xbState *s, int line,
>
I think I'd simply squash this into the next patch and mention it in the
patch description there that you removed the #define.
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition
2019-01-07 6:32 ` Thomas Huth
@ 2019-01-07 7:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 7:56 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/7/19 7:32 AM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Introduced in 64b40bc54a9, this definition is no more used since
>> a0b753dfd39. Remove it.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> include/hw/devices.h | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/include/hw/devices.h b/include/hw/devices.h
>> index 0e27feb0c2..4019b3be17 100644
>> --- a/include/hw/devices.h
>> +++ b/include/hw/devices.h
>> @@ -51,7 +51,6 @@ void retu_key_event(void *retu, int state);
>>
>> /* tc6393xb.c */
>> typedef struct TC6393xbState TC6393xbState;
>> -#define TC6393XB_RAM 0x110000 /* amount of ram for Video and USB */
>> TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem,
>> uint32_t base, qemu_irq irq);
>> void tc6393xb_gpio_out_set(TC6393xbState *s, int line,
>>
>
> I think I'd simply squash this into the next patch and mention it in the
> patch description there that you removed the #define.
OK.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 04/16] hw/devices: Move TC6393XB declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard " Philippe Mathieu-Daudé
` (11 subsequent siblings)
15 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/arm/tosa.c | 2 +-
hw/display/tc6393xb.c | 2 +-
include/hw/devices.h | 9 ---------
include/hw/display/tc6393xb.h | 25 +++++++++++++++++++++++++
5 files changed, 28 insertions(+), 11 deletions(-)
create mode 100644 include/hw/display/tc6393xb.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 19792cfb2d..dff4b98401 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -685,6 +685,7 @@ F: hw/gpio/zaurus.c
F: hw/misc/mst_fpga.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 <peter.maydell@linaro.org>
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 7a925fa5e6..b6d464ab16 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -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"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 3360be6f84..2a59af2dc3 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -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"
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 4019b3be17..5ad134232c 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -49,13 +49,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);
-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
diff --git a/include/hw/display/tc6393xb.h b/include/hw/display/tc6393xb.h
new file mode 100644
index 0000000000..434c345aa1
--- /dev/null
+++ b/include/hw/display/tc6393xb.h
@@ -0,0 +1,25 @@
+/*
+ * 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);
+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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 04/16] hw/devices: Move TC6393XB declarations into a new header Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 6:39 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus " Philippe Mathieu-Daudé
` (10 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/arm/nseries.c | 1 +
hw/display/blizzard.c | 2 +-
include/hw/devices.h | 7 -------
include/hw/display/blizzard.h | 21 +++++++++++++++++++++
5 files changed, 24 insertions(+), 8 deletions(-)
create mode 100644 include/hw/display/blizzard.h
diff --git a/MAINTAINERS b/MAINTAINERS
index dff4b98401..156ce9a698 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Odd Fixes
F: hw/arm/nseries.c
+F: include/hw/display/blizzard.h
Palm
M: Andrzej Zaborowski <balrogg@gmail.com>
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 906b7ca22d..9521be1cef 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -31,6 +31,7 @@
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "hw/devices.h"
+#include "hw/display/blizzard.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 291abe6fca..471bd0ed99 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -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);
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 5ad134232c..25f895b330 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -28,13 +28,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;
diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h
new file mode 100644
index 0000000000..8132557da1
--- /dev/null
+++ b/include/hw/display/blizzard.h
@@ -0,0 +1,21 @@
+/*
+ * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller.
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Written by Andrzej Zaborowski <andrew@openedhand.com>
+ *
+ * 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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard " Philippe Mathieu-Daudé
@ 2019-01-07 6:39 ` Thomas Huth
2019-01-07 7:58 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 6:39 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> MAINTAINERS | 1 +
> hw/arm/nseries.c | 1 +
> hw/display/blizzard.c | 2 +-
> include/hw/devices.h | 7 -------
> include/hw/display/blizzard.h | 21 +++++++++++++++++++++
> 5 files changed, 24 insertions(+), 8 deletions(-)
> create mode 100644 include/hw/display/blizzard.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index dff4b98401..156ce9a698 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
> L: qemu-arm@nongnu.org
> S: Odd Fixes
> F: hw/arm/nseries.c
> +F: include/hw/display/blizzard.h
While you're at it, also add an entry for hw/display/blizzard.c here?
> Palm
> M: Andrzej Zaborowski <balrogg@gmail.com>
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 906b7ca22d..9521be1cef 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -31,6 +31,7 @@
> #include "hw/boards.h"
> #include "hw/i2c/i2c.h"
> #include "hw/devices.h"
> +#include "hw/display/blizzard.h"
> #include "hw/block/flash.h"
> #include "hw/hw.h"
> #include "hw/bt.h"
> diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
> index 291abe6fca..471bd0ed99 100644
> --- a/hw/display/blizzard.c
> +++ b/hw/display/blizzard.c
> @@ -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);
> diff --git a/include/hw/devices.h b/include/hw/devices.h
> index 5ad134232c..25f895b330 100644
> --- a/include/hw/devices.h
> +++ b/include/hw/devices.h
> @@ -28,13 +28,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;
> diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h
> new file mode 100644
> index 0000000000..8132557da1
> --- /dev/null
> +++ b/include/hw/display/blizzard.h
> @@ -0,0 +1,21 @@
> +/*
> + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller.
> + *
> + * Copyright (C) 2008 Nokia Corporation
> + * Written by Andrzej Zaborowski <andrew@openedhand.com>
I don't think that this e-mail address is still valid since that company
has been bought up > 10 years ago... so it likely does not make sense to
mention it in new files anymore. So just mention the name?
> + * 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
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
2019-01-07 6:39 ` Thomas Huth
@ 2019-01-07 7:58 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 7:58 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/7/19 7:39 AM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> MAINTAINERS | 1 +
>> hw/arm/nseries.c | 1 +
>> hw/display/blizzard.c | 2 +-
>> include/hw/devices.h | 7 -------
>> include/hw/display/blizzard.h | 21 +++++++++++++++++++++
>> 5 files changed, 24 insertions(+), 8 deletions(-)
>> create mode 100644 include/hw/display/blizzard.h
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index dff4b98401..156ce9a698 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>> L: qemu-arm@nongnu.org
>> S: Odd Fixes
>> F: hw/arm/nseries.c
>> +F: include/hw/display/blizzard.h
>
> While you're at it, also add an entry for hw/display/blizzard.c here?
Good idea :)
>
>> Palm
>> M: Andrzej Zaborowski <balrogg@gmail.com>
>> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
>> index 906b7ca22d..9521be1cef 100644
>> --- a/hw/arm/nseries.c
>> +++ b/hw/arm/nseries.c
>> @@ -31,6 +31,7 @@
>> #include "hw/boards.h"
>> #include "hw/i2c/i2c.h"
>> #include "hw/devices.h"
>> +#include "hw/display/blizzard.h"
>> #include "hw/block/flash.h"
>> #include "hw/hw.h"
>> #include "hw/bt.h"
>> diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
>> index 291abe6fca..471bd0ed99 100644
>> --- a/hw/display/blizzard.c
>> +++ b/hw/display/blizzard.c
>> @@ -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);
>> diff --git a/include/hw/devices.h b/include/hw/devices.h
>> index 5ad134232c..25f895b330 100644
>> --- a/include/hw/devices.h
>> +++ b/include/hw/devices.h
>> @@ -28,13 +28,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;
>> diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h
>> new file mode 100644
>> index 0000000000..8132557da1
>> --- /dev/null
>> +++ b/include/hw/display/blizzard.h
>> @@ -0,0 +1,21 @@
>> +/*
>> + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller.
>> + *
>> + * Copyright (C) 2008 Nokia Corporation
>> + * Written by Andrzej Zaborowski <andrew@openedhand.com>
>
> I don't think that this e-mail address is still valid since that company
> has been bought up > 10 years ago... so it likely does not make sense to
> mention it in new files anymore. So just mention the name?
Sure, I had no idea.
TIL: check email domain when moving emails.
>> + * 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
>>
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
Thanks!
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard " Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:00 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad " Philippe Mathieu-Daudé
` (9 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/arm/nseries.c | 1 +
hw/misc/cbus.c | 2 +-
include/hw/devices.h | 14 --------------
include/hw/misc/cbus.h | 31 +++++++++++++++++++++++++++++++
5 files changed, 34 insertions(+), 15 deletions(-)
create mode 100644 include/hw/misc/cbus.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 156ce9a698..63ed6636ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -641,6 +641,7 @@ L: qemu-arm@nongnu.org
S: Odd Fixes
F: hw/arm/nseries.c
F: include/hw/display/blizzard.h
+F: include/hw/misc/cbus.h
Palm
M: Andrzej Zaborowski <balrogg@gmail.com>
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 9521be1cef..ac876b5878 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -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/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 25e337ea77..16ee704bca 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -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
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 25f895b330..8b649541b1 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -28,18 +28,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
diff --git a/include/hw/misc/cbus.h b/include/hw/misc/cbus.h
new file mode 100644
index 0000000000..1ce1855ccf
--- /dev/null
+++ b/include/hw/misc/cbus.h
@@ -0,0 +1,31 @@
+/*
+ * 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 <andrew@openedhand.com>
+ *
+ * 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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus declarations into a new header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus " Philippe Mathieu-Daudé
@ 2019-01-07 7:00 ` Thomas Huth
0 siblings, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> MAINTAINERS | 1 +
> hw/arm/nseries.c | 1 +
> hw/misc/cbus.c | 2 +-
> include/hw/devices.h | 14 --------------
> include/hw/misc/cbus.h | 31 +++++++++++++++++++++++++++++++
> 5 files changed, 34 insertions(+), 15 deletions(-)
> create mode 100644 include/hw/misc/cbus.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 156ce9a698..63ed6636ef 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -641,6 +641,7 @@ L: qemu-arm@nongnu.org
> S: Odd Fixes
> F: hw/arm/nseries.c
> F: include/hw/display/blizzard.h
> +F: include/hw/misc/cbus.h
(note: I've added an entry for cbus.c here:
https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg00097.html
you likely got to rebase this patch in case it hits master before
your patch)
> Palm
> M: Andrzej Zaborowski <balrogg@gmail.com>
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 9521be1cef..ac876b5878 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -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/block/flash.h"
> #include "hw/hw.h"
> #include "hw/bt.h"
> diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
> index 25e337ea77..16ee704bca 100644
> --- a/hw/misc/cbus.c
> +++ b/hw/misc/cbus.c
> @@ -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
> diff --git a/include/hw/devices.h b/include/hw/devices.h
> index 25f895b330..8b649541b1 100644
> --- a/include/hw/devices.h
> +++ b/include/hw/devices.h
> @@ -28,18 +28,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
> diff --git a/include/hw/misc/cbus.h b/include/hw/misc/cbus.h
> new file mode 100644
> index 0000000000..1ce1855ccf
> --- /dev/null
> +++ b/include/hw/misc/cbus.h
> @@ -0,0 +1,31 @@
> +/*
> + * 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 <andrew@openedhand.com>
I'd drop the invalid e-mail address here, too, I think.
> + * 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
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus " Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices Philippe Mathieu-Daudé
` (8 subsequent siblings)
15 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/arm/stellaris.c | 2 +-
hw/input/stellaris_input.c | 2 +-
include/hw/devices.h | 3 ---
include/hw/input/gamepad.h | 11 +++++++++++
5 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 include/hw/input/gamepad.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 63ed6636ef..f571b29077 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Maintained
F: hw/*/stellaris*
+F: include/hw/input/gamepad.h
Versatile Express
M: Peter Maydell <peter.maydell@linaro.org>
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 6c69ce79b2..0b4b382cdc 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -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/misc/unimp.h"
#include "cpu.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 99168bfeef..20c87d86f4 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -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 {
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 8b649541b1..d9c06de7ab 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -25,7 +25,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
diff --git a/include/hw/input/gamepad.h b/include/hw/input/gamepad.h
new file mode 100644
index 0000000000..5cd33a55bd
--- /dev/null
+++ b/include/hw/input/gamepad.h
@@ -0,0 +1,11 @@
+#ifndef HW_INPUT_GAMEPAD_H
+#define HW_INPUT_GAMEPAD_H
+
+/* Gamepad devices that have nowhere better to go. */
+
+#include "hw/irq.h"
+
+/* stellaris_input.c */
+void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode);
+
+#endif
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad " Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:18 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header Philippe Mathieu-Daudé
` (7 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index f571b29077..03872552ee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Odd Fixes
F: hw/arm/nseries.c
+F: hw/input/tsc2*.c
F: include/hw/display/blizzard.h
F: include/hw/misc/cbus.h
@@ -649,6 +650,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
S: Odd Fixes
F: hw/arm/palm.c
+F: hw/input/tsc2*.c
Raspberry Pi
M: Peter Maydell <peter.maydell@linaro.org>
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices
2019-01-04 17:58 ` [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices Philippe Mathieu-Daudé
@ 2019-01-07 7:18 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:18 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> MAINTAINERS | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f571b29077..03872552ee 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
> L: qemu-arm@nongnu.org
> S: Odd Fixes
> F: hw/arm/nseries.c
> +F: hw/input/tsc2*.c
> F: include/hw/display/blizzard.h
> F: include/hw/misc/cbus.h
>
> @@ -649,6 +650,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
> L: qemu-arm@nongnu.org
> S: Odd Fixes
> F: hw/arm/palm.c
> +F: hw/input/tsc2*.c
The Palm machine does not seem to use tsc2005, does it? So I think this
entry here is wrong.
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices
2019-01-07 7:18 ` Thomas Huth
@ 2019-01-07 8:02 ` Philippe Mathieu-Daudé
2019-01-07 8:05 ` Thomas Huth
0 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 8:02 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
Hi Thomas,
On 1/7/19 8:18 AM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> MAINTAINERS | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index f571b29077..03872552ee 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>> L: qemu-arm@nongnu.org
>> S: Odd Fixes
>> F: hw/arm/nseries.c
>> +F: hw/input/tsc2*.c
>> F: include/hw/display/blizzard.h
>> F: include/hw/misc/cbus.h
>>
>> @@ -649,6 +650,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>> L: qemu-arm@nongnu.org
>> S: Odd Fixes
>> F: hw/arm/palm.c
>> +F: hw/input/tsc2*.c
>
> The Palm machine does not seem to use tsc2005, does it? So I think this
> entry here is wrong.
It does use another touchscreen controller, the tsc2102, which in the
next patch are declared in the same header (you suggested "tsc2xxx.h):
$ git grep tsc2.*init hw/arm/
hw/arm/nseries.c:284: s->ts.chip = tsc2301_init(penirq, kbirq, dav);
hw/arm/nseries.c:306: s->ts.opaque = tsc2005_init(pintdav);
hw/arm/palm.c:88: tsc = tsc2102_init(qdev_get_gpio_in(cpu->gpio,
PALMTE_PINTDAV_GPIO));
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices
2019-01-07 8:02 ` Philippe Mathieu-Daudé
@ 2019-01-07 8:05 ` Thomas Huth
2019-01-07 11:44 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 8:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-07 09:02, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 1/7/19 8:18 AM, Thomas Huth wrote:
>> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>> MAINTAINERS | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index f571b29077..03872552ee 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>>> L: qemu-arm@nongnu.org
>>> S: Odd Fixes
>>> F: hw/arm/nseries.c
>>> +F: hw/input/tsc2*.c
>>> F: include/hw/display/blizzard.h
>>> F: include/hw/misc/cbus.h
>>>
>>> @@ -649,6 +650,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>>> L: qemu-arm@nongnu.org
>>> S: Odd Fixes
>>> F: hw/arm/palm.c
>>> +F: hw/input/tsc2*.c
>>
>> The Palm machine does not seem to use tsc2005, does it? So I think this
>> entry here is wrong.
>
> It does use another touchscreen controller, the tsc2102, which in the
> next patch are declared in the same header (you suggested "tsc2xxx.h):
So using the tsc2*.c wildcard for the *C* file is still wrong here,
isn't it?
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices
2019-01-07 8:05 ` Thomas Huth
@ 2019-01-07 11:44 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 11:44 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/7/19 9:05 AM, Thomas Huth wrote:
> On 2019-01-07 09:02, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 1/7/19 8:18 AM, Thomas Huth wrote:
>>> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> ---
>>>> MAINTAINERS | 2 ++
>>>> 1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>>> index f571b29077..03872552ee 100644
>>>> --- a/MAINTAINERS
>>>> +++ b/MAINTAINERS
>>>> @@ -640,6 +640,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>>>> L: qemu-arm@nongnu.org
>>>> S: Odd Fixes
>>>> F: hw/arm/nseries.c
>>>> +F: hw/input/tsc2*.c
>>>> F: include/hw/display/blizzard.h
>>>> F: include/hw/misc/cbus.h
>>>>
>>>> @@ -649,6 +650,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
>>>> L: qemu-arm@nongnu.org
>>>> S: Odd Fixes
>>>> F: hw/arm/palm.c
>>>> +F: hw/input/tsc2*.c
>>>
>>> The Palm machine does not seem to use tsc2005, does it? So I think this
>>> entry here is wrong.
>>
>> It does use another touchscreen controller, the tsc2102, which in the
>> next patch are declared in the same header (you suggested "tsc2xxx.h):
>
> So using the tsc2*.c wildcard for the *C* file is still wrong here,
> isn't it?
Oh I got it now! Yes, you are right :) I'll update.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:22 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 10/16] typedefs: Remove MouseTransformInfo Philippe Mathieu-Daudé
` (6 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Since uWireSlave is only used in this new header, there is no
need to expose it via "qemu/typedefs.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 | 14 --------------
include/hw/input/ti_uwire_tsc.h | 28 ++++++++++++++++++++++++++++
include/qemu/typedefs.h | 1 -
9 files changed, 36 insertions(+), 25 deletions(-)
create mode 100644 include/hw/input/ti_uwire_tsc.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 03872552ee..4722805d9e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -642,6 +642,7 @@ S: Odd Fixes
F: hw/arm/nseries.c
F: hw/input/tsc2*.c
F: include/hw/display/blizzard.h
+F: include/hw/input/ti_uwire_tsc.h
F: include/hw/misc/cbus.h
Palm
@@ -651,6 +652,7 @@ L: qemu-arm@nongnu.org
S: Odd Fixes
F: hw/arm/palm.c
F: hw/input/tsc2*.c
+F: include/hw/input/ti_uwire_tsc.h
Raspberry Pi
M: Peter Maydell <peter.maydell@linaro.org>
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index ac876b5878..f1c94ca607 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -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/ti_uwire_tsc.h"
#include "hw/misc/cbus.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 285f43709d..2327a25be3 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -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/ti_uwire_tsc.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
#include "cpu.h"
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 2b9108a193..d3c79f7825 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -23,7 +23,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
-#include "hw/devices.h"
+#include "hw/input/ti_uwire_tsc.h"
#include "trace.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index 1cad57f644..8e4c282989 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -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/ti_uwire_tsc.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index e7fbd340f3..fc0fe4f7a2 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -20,6 +20,7 @@
#include "exec/memory.h"
# define hw_omap_h "omap.h"
#include "hw/irq.h"
+#include "hw/input/ti_uwire_tsc.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);
diff --git a/include/hw/devices.h b/include/hw/devices.h
index d9c06de7ab..ba9034050b 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -11,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
diff --git a/include/hw/input/ti_uwire_tsc.h b/include/hw/input/ti_uwire_tsc.h
new file mode 100644
index 0000000000..0f8f296bc3
--- /dev/null
+++ b/include/hw/input/ti_uwire_tsc.h
@@ -0,0 +1,28 @@
+#ifndef HW_INPUT_TI_UWIRE_TOUCHSCREEN_H
+#define HW_INPUT_TI_UWIRE_TOUCHSCREEN_H
+
+/* TI 4/8-wire resistive touch screen converters */
+
+#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
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index d59df20c4d..5d2b2925fb 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -111,7 +111,6 @@ typedef struct SerialState SerialState;
typedef struct SHPCDevice SHPCDevice;
typedef struct SMBusDevice SMBusDevice;
typedef struct SSIBus SSIBus;
-typedef struct uWireSlave uWireSlave;
typedef struct VirtIODevice VirtIODevice;
typedef struct Visitor Visitor;
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header Philippe Mathieu-Daudé
@ 2019-01-07 7:22 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:22 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Since uWireSlave is only used in this new header, there is no
> need to expose it via "qemu/typedefs.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 | 14 --------------
> include/hw/input/ti_uwire_tsc.h | 28 ++++++++++++++++++++++++++++
I'd maybe rather name the new file "tsc2xxx.h" instead, so that it
resembles the names of the .c files. Just my 0.02 €.
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header
2019-01-07 7:22 ` Thomas Huth
@ 2019-01-07 8:02 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 8:02 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/7/19 8:22 AM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Since uWireSlave is only used in this new header, there is no
>> need to expose it via "qemu/typedefs.h".
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> 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 | 14 --------------
>> include/hw/input/ti_uwire_tsc.h | 28 ++++++++++++++++++++++++++++
>
> I'd maybe rather name the new file "tsc2xxx.h" instead, so that it
> resembles the names of the .c files. Just my 0.02 €.
Good idea :)
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 10/16] typedefs: Remove MouseTransformInfo
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State Philippe Mathieu-Daudé
` (5 subsequent siblings)
15 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
MouseTransformInfo is only used in "ui/console.h", there is no
need to expose it via "qemu/typedefs.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/qemu/typedefs.h | 1 -
include/ui/console.h | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 5d2b2925fb..927b340bb4 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -56,7 +56,6 @@ typedef struct MigrationIncomingState MigrationIncomingState;
typedef struct MigrationState MigrationState;
typedef struct Monitor Monitor;
typedef struct MonitorDef MonitorDef;
-typedef struct MouseTransformInfo MouseTransformInfo;
typedef struct MSIMessage MSIMessage;
typedef struct NetClientState NetClientState;
typedef struct NetFilterState NetFilterState;
diff --git a/include/ui/console.h b/include/ui/console.h
index c17803c530..28fd76c1c5 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -65,13 +65,13 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
void kbd_put_ledstate(int ledstate);
-struct MouseTransformInfo {
+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);
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (9 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 10/16] typedefs: Remove MouseTransformInfo Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:26 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header Philippe Mathieu-Daudé
` (4 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
PS2State is only used in "hw/input/ps2.h", there is no
need to expose it via "qemu/typedefs.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/input/ps2.h | 2 ++
include/qemu/typedefs.h | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h
index 213aa16aa3..b60455d4f6 100644
--- a/include/hw/input/ps2.h
+++ b/include/hw/input/ps2.h
@@ -31,6 +31,8 @@
#define PS2_MOUSE_BUTTON_SIDE 0x08
#define PS2_MOUSE_BUTTON_EXTRA 0x10
+typedef struct PS2State PS2State;
+
/* ps2.c */
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 927b340bb4..181f8fa68e 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -82,7 +82,6 @@ typedef struct PixelFormat PixelFormat;
typedef struct PostcopyDiscardState PostcopyDiscardState;
typedef struct Property Property;
typedef struct PropertyInfo PropertyInfo;
-typedef struct PS2State PS2State;
typedef struct QEMUBH QEMUBH;
typedef struct QemuConsole QemuConsole;
typedef struct QemuDmaBuf QemuDmaBuf;
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State
2019-01-04 17:58 ` [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State Philippe Mathieu-Daudé
@ 2019-01-07 7:26 ` Thomas Huth
0 siblings, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-trivial, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> PS2State is only used in "hw/input/ps2.h", there is no
> need to expose it via "qemu/typedefs.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> include/hw/input/ps2.h | 2 ++
> include/qemu/typedefs.h | 1 -
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h
> index 213aa16aa3..b60455d4f6 100644
> --- a/include/hw/input/ps2.h
> +++ b/include/hw/input/ps2.h
> @@ -31,6 +31,8 @@
> #define PS2_MOUSE_BUTTON_SIDE 0x08
> #define PS2_MOUSE_BUTTON_EXTRA 0x10
>
> +typedef struct PS2State PS2State;
> +
> /* ps2.c */
> void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
> void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 927b340bb4..181f8fa68e 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -82,7 +82,6 @@ typedef struct PixelFormat PixelFormat;
> typedef struct PostcopyDiscardState PostcopyDiscardState;
> typedef struct Property Property;
> typedef struct PropertyInfo PropertyInfo;
> -typedef struct PS2State PS2State;
> typedef struct QEMUBH QEMUBH;
> typedef struct QemuConsole QemuConsole;
> typedef struct QemuDmaBuf QemuDmaBuf;
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (10 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:29 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header Philippe Mathieu-Daudé
` (3 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 | 21 +++++++++++++++++++++
7 files changed, 26 insertions(+), 7 deletions(-)
create mode 100644 include/hw/net/lan9118.h
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 864c7bd411..139934c4ec 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -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"
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index e3d698ba6c..54b7395849 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -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 {
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 242f5a87b6..e9983c8763 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -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"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index c02d18ee61..12e2c3986f 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -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"
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index a6269d9463..a428b16eda 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -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"
diff --git a/include/hw/devices.h b/include/hw/devices.h
index ba9034050b..ebc45c8799 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -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
diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h
new file mode 100644
index 0000000000..340d6681b7
--- /dev/null
+++ b/include/hw/net/lan9118.h
@@ -0,0 +1,21 @@
+/*
+ * SMSC LAN9118 Ethernet interface emulation
+ *
+ * Copyright (c) 2009 CodeSourcery, LLC.
+ * Written by Paul Brook
+ *
+ * This code is licensed under the GNU GPL v2
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header Philippe Mathieu-Daudé
@ 2019-01-07 7:29 ` Thomas Huth
2019-01-07 8:04 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 | 21 +++++++++++++++++++++
> 7 files changed, 26 insertions(+), 7 deletions(-)
> create mode 100644 include/hw/net/lan9118.h
>
> diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
> index 864c7bd411..139934c4ec 100644
> --- a/hw/arm/kzm.c
> +++ b/hw/arm/kzm.c
> @@ -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"
>
> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
> index e3d698ba6c..54b7395849 100644
> --- a/hw/arm/mps2.c
> +++ b/hw/arm/mps2.c
> @@ -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 {
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index 242f5a87b6..e9983c8763 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -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"
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index c02d18ee61..12e2c3986f 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -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"
> diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
> index a6269d9463..a428b16eda 100644
> --- a/hw/net/lan9118.c
> +++ b/hw/net/lan9118.c
> @@ -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"
> diff --git a/include/hw/devices.h b/include/hw/devices.h
> index ba9034050b..ebc45c8799 100644
> --- a/include/hw/devices.h
> +++ b/include/hw/devices.h
> @@ -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
> diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h
> new file mode 100644
> index 0000000000..340d6681b7
> --- /dev/null
> +++ b/include/hw/net/lan9118.h
> @@ -0,0 +1,21 @@
> +/*
> + * SMSC LAN9118 Ethernet interface emulation
> + *
> + * Copyright (c) 2009 CodeSourcery, LLC.
> + * Written by Paul Brook
> + *
> + * This code is licensed under the GNU GPL v2
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.
Since your contribution here is after 2012 and the file content is also
just a trivial one-line prototype, please change the license code to say
GPLv2+ only right from the start. We should avoid these v2 + v2+
statements in new files.
> + */
> +
> +#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
>
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header
2019-01-07 7:29 ` Thomas Huth
@ 2019-01-07 8:04 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-07 8:04 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/7/19 8:29 AM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> 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 | 21 +++++++++++++++++++++
>> 7 files changed, 26 insertions(+), 7 deletions(-)
>> create mode 100644 include/hw/net/lan9118.h
>>
>> diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
>> index 864c7bd411..139934c4ec 100644
>> --- a/hw/arm/kzm.c
>> +++ b/hw/arm/kzm.c
>> @@ -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"
>>
>> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
>> index e3d698ba6c..54b7395849 100644
>> --- a/hw/arm/mps2.c
>> +++ b/hw/arm/mps2.c
>> @@ -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 {
>> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
>> index 242f5a87b6..e9983c8763 100644
>> --- a/hw/arm/realview.c
>> +++ b/hw/arm/realview.c
>> @@ -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"
>> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
>> index c02d18ee61..12e2c3986f 100644
>> --- a/hw/arm/vexpress.c
>> +++ b/hw/arm/vexpress.c
>> @@ -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"
>> diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
>> index a6269d9463..a428b16eda 100644
>> --- a/hw/net/lan9118.c
>> +++ b/hw/net/lan9118.c
>> @@ -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"
>> diff --git a/include/hw/devices.h b/include/hw/devices.h
>> index ba9034050b..ebc45c8799 100644
>> --- a/include/hw/devices.h
>> +++ b/include/hw/devices.h
>> @@ -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
>> diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h
>> new file mode 100644
>> index 0000000000..340d6681b7
>> --- /dev/null
>> +++ b/include/hw/net/lan9118.h
>> @@ -0,0 +1,21 @@
>> +/*
>> + * SMSC LAN9118 Ethernet interface emulation
>> + *
>> + * Copyright (c) 2009 CodeSourcery, LLC.
>> + * Written by Paul Brook
>> + *
>> + * This code is licensed under the GNU GPL v2
>> + *
>> + * Contributions after 2012-01-13 are licensed under the terms of the
>> + * GNU GPL, version 2 or (at your option) any later version.
>
> Since your contribution here is after 2012 and the file content is also
> just a trivial one-line prototype, please change the license code to say
> GPLv2+ only right from the start. We should avoid these v2 + v2+
> statements in new files.
OK.
>
>> + */
>> +
>> +#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
>>
>
> Thomas
>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (11 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:34 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 14/16] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string Philippe Mathieu-Daudé
` (2 subsequent siblings)
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/net/ne2000-isa.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index ff2bed9c95..527337c454 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header Philippe Mathieu-Daudé
@ 2019-01-07 7:34 ` Thomas Huth
0 siblings, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-trivial, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> include/hw/net/ne2000-isa.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
> index ff2bed9c95..527337c454 100644
> --- a/include/hw/net/ne2000-isa.h
> +++ b/include/hw/net/ne2000-isa.h
> @@ -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
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 14/16] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (12 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function Philippe Mathieu-Daudé
15 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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(-)
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 750162cc95..ea8100f65a 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -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);
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 1232d6ff95..b6a8693d7c 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -49,6 +49,7 @@
#include "hw/arm/iotkit.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"
@@ -219,7 +220,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);
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index a428b16eda..b29e3fee49 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -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 {
diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h
index 340d6681b7..2a3e2b0dea 100644
--- a/include/hw/net/lan9118.h
+++ b/include/hw/net/lan9118.h
@@ -16,6 +16,8 @@
#include "hw/irq.h"
#include "net/net.h"
+#define TYPE_LAN9118 "lan9118"
+
void lan9118_init(NICInfo *, uint32_t, qemu_irq);
#endif
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (13 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 14/16] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-07 7:38 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function Philippe Mathieu-Daudé
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
This commit finally deletes "hw/devices.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 | 18 ++++++++++++++++++
8 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 include/hw/devices.h
create mode 100644 include/hw/net/smc91c111.h
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 56cb763c4e..98c3e6d41c 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -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"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 4eceebb9ea..0b6f24465e 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -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"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 0beb5c426b..fbe8d5cbd4 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -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"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index e9983c8763..05a244df25 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -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"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 22b09a1e61..70b5fda737 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -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"
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 99da2d9297..d19ea0750d 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -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>
diff --git a/include/hw/devices.h b/include/hw/devices.h
deleted file mode 100644
index ebc45c8799..0000000000
--- a/include/hw/devices.h
+++ /dev/null
@@ -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
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
new file mode 100644
index 0000000000..46f7d9a5d4
--- /dev/null
+++ b/include/hw/net/smc91c111.h
@@ -0,0 +1,18 @@
+/*
+ * SMSC 91C111 Ethernet interface emulation
+ *
+ * Copyright (c) 2005 CodeSourcery, LLC.
+ * Written by Paul Brook
+ *
+ * This code is licensed under the GPL
+ */
+
+#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
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header
2019-01-04 17:58 ` [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header Philippe Mathieu-Daudé
@ 2019-01-07 7:38 ` Thomas Huth
0 siblings, 0 replies; 39+ messages in thread
From: Thomas Huth @ 2019-01-07 7:38 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> This commit finally deletes "hw/devices.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 | 18 ++++++++++++++++++
> 8 files changed, 24 insertions(+), 17 deletions(-)
> delete mode 100644 include/hw/devices.h
> create mode 100644 include/hw/net/smc91c111.h
[...]
> diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
> new file mode 100644
> index 0000000000..46f7d9a5d4
> --- /dev/null
> +++ b/include/hw/net/smc91c111.h
> @@ -0,0 +1,18 @@
> +/*
> + * SMSC 91C111 Ethernet interface emulation
> + *
> + * Copyright (c) 2005 CodeSourcery, LLC.
> + * Written by Paul Brook
> + *
> + * This code is licensed under the GPL
I'd like to suggest to use here GPLv2+, too, since just "GPL" is quite
inaccurate.
> + */
> +
> +#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
>
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
` (14 preceding siblings ...)
2019-01-04 17:58 ` [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header Philippe Mathieu-Daudé
@ 2019-01-04 17:58 ` Philippe Mathieu-Daudé
2019-01-04 19:35 ` Thomas Huth
15 siblings, 1 reply; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-04 17:58 UTC (permalink / raw)
To: qemu-devel, Thomas Huth
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring,
Philippe Mathieu-Daudé
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
As init helper in "hw/char/pl011.h"
---
hw/net/smc91c111.c | 17 -----------------
include/hw/net/smc91c111.h | 25 ++++++++++++++++++++++++-
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d19ea0750d..3472852270 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -18,7 +18,6 @@
/* Number of 2k memory pages available. */
#define NUM_PACKETS 4
-#define TYPE_SMC91C111 "smc91c111"
#define SMC91C111(obj) OBJECT_CHECK(smc91c111_state, (obj), TYPE_SMC91C111)
typedef struct {
@@ -809,20 +808,4 @@ static void smc91c111_register_types(void)
type_register_static(&smc91c111_info);
}
-/* Legacy helper function. Should go away when machine config files are
- implemented. */
-void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
-{
- DeviceState *dev;
- SysBusDevice *s;
-
- qemu_check_nic_model(nd, "smc91c111");
- dev = qdev_create(NULL, TYPE_SMC91C111);
- qdev_set_nic_properties(dev, nd);
- qdev_init_nofail(dev);
- s = SYS_BUS_DEVICE(dev);
- sysbus_mmio_map(s, 0, base);
- sysbus_connect_irq(s, 0, irq);
-}
-
type_init(smc91c111_register_types)
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
index 46f7d9a5d4..0a1097ddd2 100644
--- a/include/hw/net/smc91c111.h
+++ b/include/hw/net/smc91c111.h
@@ -10,9 +10,32 @@
#ifndef HW_NET_SMC91C111_H
#define HW_NET_SMC91C111_H
+#include "hw/qdev.h"
#include "hw/irq.h"
+#include "hw/sysbus.h"
#include "net/net.h"
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+#define TYPE_SMC91C111 "smc91c111"
+
+/*
+ * Legacy helper function. Should go away when machine config files are
+ * implemented.
+ */
+static inline DeviceState *smc91c111_init(NICInfo *nd,
+ uint32_t base, qemu_irq irq)
+{
+ DeviceState *dev;
+ SysBusDevice *s;
+
+ qemu_check_nic_model(nd, "smc91c111");
+ dev = qdev_create(NULL, TYPE_SMC91C111);
+ qdev_set_nic_properties(dev, nd);
+ qdev_init_nofail(dev);
+ s = SYS_BUS_DEVICE(dev);
+ sysbus_mmio_map(s, 0, base);
+ sysbus_connect_irq(s, 0, irq);
+
+ return dev;
+}
#endif
--
2.17.2
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function
2019-01-04 17:58 ` [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function Philippe Mathieu-Daudé
@ 2019-01-04 19:35 ` Thomas Huth
2019-02-04 23:11 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Huth @ 2019-01-04 19:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Philippe Mathieu-Daudé,
Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> As init helper in "hw/char/pl011.h"
> ---
> hw/net/smc91c111.c | 17 -----------------
> include/hw/net/smc91c111.h | 25 ++++++++++++++++++++++++-
> 2 files changed, 24 insertions(+), 18 deletions(-)
Why? If you move code around like this, you should mention the reason in
the patch description.
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function
2019-01-04 19:35 ` Thomas Huth
@ 2019-02-04 23:11 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 39+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 23:11 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Edgar E. Iglesias, Magnus Damm, David Gibson, Andrew Jeffery,
qemu-arm, qemu-ppc, Joel Stanley, Peter Maydell,
Andrzej Zaborowski, Igor Mitsyanko, Beniamino Galvani,
Michael Walle, Richard Henderson, Jan Kiszka, Jason Wang,
Gerd Hoffmann, Peter Chubb, Aurelien Jarno,
Cédric Le Goater, Bastian Koppelmann, Rob Herring
On 1/4/19 8:35 PM, Thomas Huth wrote:
> On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> As init helper in "hw/char/pl011.h"
>> ---
>> hw/net/smc91c111.c | 17 -----------------
>> include/hw/net/smc91c111.h | 25 ++++++++++++++++++++++++-
>> 2 files changed, 24 insertions(+), 18 deletions(-)
>
> Why? If you move code around like this, you should mention the reason in
> the patch description.
Oops this one wasn't supposed to be sent, I planned to drop it before
sending but probably forgot because it was late friday :/
^ permalink raw reply [flat|nested] 39+ messages in thread