Re: cvs commit: src/sys/dev/netif/vr Makefile if_vr.c if_vrreg.h

[Sepherosa Ziehau <sepherosa@xxxxxxxxx>]

Sorry.  It's all my fault.
When I removed pci port/memory code, I also removed a line that read
pci revid, so vr_softc.vr_revid was left uninitialized.
Attached patch can solve it.
Sorry again -_-

Best Regards,
sephe

On 6/20/05, walt <wa1ter@xxxxxxxxxxxxx> wrote:
> 
> On Mon, 20 Jun 2005, Joerg Sonnenberger wrote:
> 
> > joerg       2005/06/20 06:01:15 PDT
> >
> > DragonFly src repository
> >
> >   Modified files:
> >     sys/dev/netif/vr     Makefile if_vr.c if_vrreg.h
> 
> I'm getting watchdog timeouts after these updates, and some strange
> diagnostics during boot:
> 
> vr0: <VIA VT6102 Rhine II 10/100BaseTX> port 0xec00-0xecff mem
> 0xe9041000-0xe90410ff irq 11 at device 18.0 on pci0
> miibus0: <MII bus> on vr0
> ukphy0: <Generic IEEE 802.3u media interface> on miibus0
> ukphy0:  100baseT4
> ukphy1: <Generic IEEE 802.3u media interface> on miibus0
> ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
> ukphy2: <Generic IEEE 802.3u media interface> on miibus0
> ukphy2:  100baseT4
> ukphy3: <Generic IEEE 802.3u media interface> on miibus0
> ukphy3:  100baseT4
> ukphy4: <Generic IEEE 802.3u media interface> on miibus0
> ukphy4:  100baseT4
> <and so on... up to ukphy31>
> vr0: MAC address: 00:0d:87:a2:ce:02
> 
> Do you need more info?
> 
> 


-- 
Live Free or Die

Index: if_vr.c
===================================================================
RCS file: /opt/df_cvs/src/sys/dev/netif/vr/if_vr.c,v
retrieving revision 1.32
diff -u -p -r1.32 if_vr.c
--- if_vr.c	20 Jun 2005 13:30:53 -0000	1.32
+++ if_vr.c	20 Jun 2005 23:37:47 -0000
@@ -697,6 +697,7 @@ vr_attach(device_t dev)
 	}
 
 	pci_enable_busmaster(dev);
+	sc->vr_revid = pci_get_revid(dev);
 
 	rid = VR_RID;
 	sc->vr_res = bus_alloc_resource_any(dev, VR_RES, &rid, RF_ACTIVE);