On Wednesday 25 of October 2017 08:53:07 KONRAD Frederic wrote:
> Can't this be merged in the previous patch?
Yes, my intention has been to keep other authors
patches fully documenting their effort.
So I cleaned and keep in logical chunks mine patches
and do only formating of others. But I am happy
to collapse these to into single one.
If the rest goes OK, then if the core and standalone
usable patches
[PATCH 1/6] CAN bus simple SJA1000 PCI card emulation for QEMU
[PATCH 2/6] CAN bus Kvaser PCI CAN-S (single SJA1000 channel) emulation added.
are accepted I prepare updated series.
If review leads to need update whole series, I merge
this to previous one before posting.
Thanks much for your time,
Pavel
> On 10/25/2017 01:29 AM, p...@cmp.felk.cvut.cz wrote:
> > From: Deniz Eren <deniz.e...@icloud.com>
> >
> > Signed-off-by: Pavel Pisa <p...@cmp.felk.cvut.cz>
> > ---
> > hw/can/can_pcm3680_pci.c | 11 +++++++++++
> > 1 file changed, 11 insertions(+)
> >
> > diff --git a/hw/can/can_pcm3680_pci.c b/hw/can/can_pcm3680_pci.c
> > index 77523f2ddb..bc6b164ea7 100644
> > --- a/hw/can/can_pcm3680_pci.c
> > +++ b/hw/can/can_pcm3680_pci.c
> > @@ -61,6 +61,7 @@ typedef struct Pcm3680iPCIState {
> > MemoryRegion sja_io[2];
> >
> > CanSJA1000State sja_state[2];
> > + qemu_irq irq;
> >
> > char *model; /* The model that support, only SJA1000
> > now. */ char *canbus[2];
> > @@ -69,10 +70,16 @@ typedef struct Pcm3680iPCIState {
> >
> > static void pcm3680i_pci_irq_raise(void *opaque)
> > {
> > + Pcm3680iPCIState *d = (Pcm3680iPCIState *)opaque;
> > +
> > + qemu_irq_raise(d->irq);
> > }
> >
> > static void pcm3680i_pci_irq_lower(void *opaque)
> > {
> > + Pcm3680iPCIState *d = (Pcm3680iPCIState *)opaque;
> > +
> > + qemu_irq_lower(d->irq);
> > }
> >
> > static void
> > @@ -206,6 +213,8 @@ static int pcm3680i_pci_init(PCIDevice *pci_dev)
> > pci_conf = pci_dev->config;
> > pci_conf[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
> >
> > + d->irq = pci_allocate_irq(&d->dev);
> > +
> > can_sja_init(s1, pcm3680i_pci_irq_raise, pcm3680i_pci_irq_lower,
> > d); can_sja_init(s2, pcm3680i_pci_irq_raise, pcm3680i_pci_irq_lower, d);
> >
> > @@ -254,6 +263,8 @@ static void pcm3680i_pci_exit(PCIDevice *pci_dev)
> >
> > can_sja_exit(s1);
> > can_sja_exit(s2);
> > +
> > + qemu_free_irq(d->irq);
> > }
> >
> > static const VMStateDescription vmstate_pcm3680i_pci = {
