Re: [PATCH v3 06/10] hw/isa/vt82c686: Instantiate USB functions in host device

[BB]

Am 31. August 2022 17:03:35 MESZ schrieb BALATON Zoltan <balaton@eik.bme.hu>:
>On Wed, 31 Aug 2022, BB wrote:
>> Am 31. August 2022 15:23:37 MESZ schrieb BALATON Zoltan <balaton@eik.bme.hu>:
>>> On Wed, 31 Aug 2022, Bernhard Beschow wrote:
>>>> The USB functions can be enabled/disabled through the ISA function. Also
>>>> its interrupt routing can be influenced there.
>>>> 
>>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>>>> ---
>>>> hw/isa/vt82c686.c   | 12 ++++++++++++
>>>> hw/mips/fuloong2e.c |  3 ---
>>>> hw/ppc/pegasos2.c   |  4 ----
>>>> 3 files changed, 12 insertions(+), 7 deletions(-)
>>>> 
>>>> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
>>>> index 9d946cea54..66a4b9c230 100644
>>>> --- a/hw/isa/vt82c686.c
>>>> +++ b/hw/isa/vt82c686.c
>>>> @@ -23,6 +23,7 @@
>>>> #include "hw/intc/i8259.h"
>>>> #include "hw/irq.h"
>>>> #include "hw/dma/i8257.h"
>>>> +#include "hw/usb/hcd-uhci.h"
>>>> #include "hw/timer/i8254.h"
>>>> #include "hw/rtc/mc146818rtc.h"
>>>> #include "migration/vmstate.h"
>>>> @@ -546,6 +547,7 @@ struct ViaISAState {
>>>>     qemu_irq *isa_irqs;
>>>>     ViaSuperIOState via_sio;
>>>>     PCIIDEState ide;
>>>> +    UHCIState uhci[2];
>>>> };
>>>> 
>>>> static const VMStateDescription vmstate_via = {
>>>> @@ -563,6 +565,8 @@ static void via_isa_init(Object *obj)
>>>>     ViaISAState *s = VIA_ISA(obj);
>>>> 
>>>>     object_initialize_child(obj, "ide", &s->ide, "via-ide");
>>>> +    object_initialize_child(obj, "uhci1", &s->uhci[0], 
>>>> "vt82c686b-usb-uhci");
>>>> +    object_initialize_child(obj, "uhci2", &s->uhci[1], 
>>>> "vt82c686b-usb-uhci");
>>> 
>>> Sorry for not saying this yesterday, this can also be done separately so no 
>>> need for another version of this series if not needed for another reason 
>>> but could we add a define for vt82c686b-usb-uhci in 
>>> include/hw/isa/vt82c686.h and use that here and in 
>>> hw/usb/vt82c686-uhci-pci.c ?
>> 
>> Would creating a dedicated header work, too? Board code doesn't need to see 
>> the define any longer.
>
>I don't think it needs a separate header just for this so I'd put it in 
>vt82c686.h but I don't mind either way.

Alright, I'll take the easy route for now. Splitting in dedicated headers (also 
for the other devices) could be done in a separate series.

Regards,
Bernhard
>
>Regards,
>BALATON Zoltan