Attachment 152576 Details for Bug 233011 – dwmw2-mac80211.patch

[patch] dwmw2-mac80211.patch

dwmw2-mac80211.patch (text/plain), 1.51 KB, created by John W. Linville on 2007-04-13 18:46:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. Linville

Created: 2007-04-13 18:46:17 UTC

Size: 1.51 KB

patch

obsolete

>diff --git a/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c
>index af4013d..e904cb6 100644
>--- a/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c
>+++ b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c
>@@ -269,10 +269,19 @@ static inline u16 adjust_phyreg_for_phytype(struct bcm43xx_phy *phy,
> u16 bcm43xx_phy_read(struct bcm43xx_wldev *dev, u16 offset)
> {
> 	struct bcm43xx_phy *phy = &dev->phy;
>+	u16 foo;
> 
> 	offset = adjust_phyreg_for_phytype(phy, offset);
>+#if 0
> 	bcm43xx_write16(dev, BCM43xx_MMIO_PHY_CONTROL, offset);
> 	return bcm43xx_read16(dev, BCM43xx_MMIO_PHY_DATA);
>+#else
>+	printk("phy_read %x...", offset);
>+	outw(offset, dev->dev->bus->mmio + BCM43xx_MMIO_PHY_CONTROL - isa_io_base);
>+	foo = inw(dev->dev->bus->mmio + BCM43xx_MMIO_PHY_DATA - isa_io_base);
>+	printk(" = %x\n", foo);
>+	return foo;
>+#endif
> }
> 
> void bcm43xx_phy_write(struct bcm43xx_wldev *dev, u16 offset, u16 val)
>@@ -280,9 +289,15 @@ void bcm43xx_phy_write(struct bcm43xx_wldev *dev, u16 offset, u16 val)
> 	struct bcm43xx_phy *phy = &dev->phy;
> 
> 	offset = adjust_phyreg_for_phytype(phy, offset);
>+#if 0
> 	bcm43xx_write16(dev, BCM43xx_MMIO_PHY_CONTROL, offset);
> 	mmiowb();
> 	bcm43xx_write16(dev, BCM43xx_MMIO_PHY_DATA, val);
>+#else
>+	printk("phy_write %x... = %x\n", offset, val);
>+	outw(offset, dev->dev->bus->mmio + BCM43xx_MMIO_PHY_CONTROL - isa_io_base);
>+	outw(val, dev->dev->bus->mmio + BCM43xx_MMIO_PHY_DATA - isa_io_base);
>+#endif
> }
> 
> /* This func is called "PHY calibrate" in the specs... */

Actions: View | Diff

Attachments on bug 233011: 152576 | 152683 | 152718 | 193621 | 195141 | 196261