Re: CVS commit: src/sys/dev

[Takeshi Nakayama <tn%catvmics.ne.jp@localhost>]

>>> Juan RP <xtraeme%gmail.com@localhost> wrote

> Thanks for catching this. Would the following patch be ok?

Yes it's ok to yds(4), but..

> AFAIK, all mpu drivers should be passing the device_t to mpu_intr()
> so device_private() should return correctly the softc.
> 
> I checked all the other drivers, they seem to be ok.

mpu_acpi.c and mpu_isa.c seem to pass the mpu_softc.

% grep -B1 mpu_intr */*
acpi/mpu_acpi.c-            (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : 
IST_LEVEL,
acpi/mpu_acpi.c:            IPL_AUDIO, mpu_intr, sc);
--
ic/mpu.c-int
ic/mpu.c:mpu_intr(void *addr)
--
ic/mpuvar.h-void        mpu_attach(struct mpu_softc *);
ic/mpuvar.h:int mpu_intr(void *);
--
isa/mpu_isa.c-  sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
isa/mpu_isa.c:      IST_EDGE, IPL_AUDIO, mpu_intr, sc);
--
isa/sbdsp.c-    if ((irq & SBP_IRQ_MPU401) && sc->sc_mpudev) {
isa/sbdsp.c:            mpu_intr(sc->sc_mpudev);
--
isa/ym.c-               if (ist & SA3_IRQ_STAT_MPU) {
isa/ym.c:                       mpu_intr(sc->sc_mpudev);
--
isapnp/mpu_isapnp.c-    sc->sc_ih = isa_intr_establish(ipa->ipa_ic, 
ipa->ipa_irq[0].num,
isapnp/mpu_isapnp.c:        ipa->ipa_irq[0].type, IPL_AUDIO, mpu_intr, 
&sc->sc_mpu);
--
pci/cmpci.c-    if (intrstat & CMPCI_REG_UART_INTR && sc->sc_mpudev != NULL)
pci/cmpci.c:            mpu_intr(sc->sc_mpudev);
--
pci/eso.c-      if ((irqctl & ESO_IO_IRQCTL_MPUIRQ) && sc->sc_mpudev != NULL)
pci/eso.c:              mpu_intr(sc->sc_mpudev);
--
pci/fms.c-      if (istat & FM_INTSTATUS_MPU)
pci/fms.c:              mpu_intr(sc->sc_mpu_dev);
--
pci/yds.c-              if (sc->sc_mpu)
pci/yds.c:                      return mpu_intr(sc->sc_mpu);

Takeshi Nakayama