summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-03-04 19:04:32 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-03-04 19:04:32 +0000
commitb92139fa0b17068e588e0c97165b00e004cdce29 (patch)
treefb8e1dcc707a77010563021a177edf48e97eecf1 /sys/dev/ic
parentf9c12595c3b8fbda49b6301798131a4ca6a21579 (diff)
Fix another panic in bcw_phy_init() for sparc64. Now firmware loads
and radio initializes on sparc64, too.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/bcw.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/bcw.c b/sys/dev/ic/bcw.c
index 302fc7ae73f..0fa159d043f 100644
--- a/sys/dev/ic/bcw.c
+++ b/sys/dev/ic/bcw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcw.c,v 1.67 2007/03/04 16:10:10 mglocker Exp $ */
+/* $OpenBSD: bcw.c,v 1.68 2007/03/04 19:04:31 mglocker Exp $ */
/*
* Copyright (c) 2006 Jon Simola <jsimola@gmail.com>
@@ -3241,7 +3241,7 @@ bcw_phy_initg(struct bcw_softc *sc)
if (sc->sc_boardflags & BCW_BF_PACTRL)
bcw_phy_write16(sc, 0x002e, 0x8075);
else
- bcw_phy_write16(sc, 0x002f, 0x807f);
+ bcw_phy_write16(sc, 0x002e, 0x807f);
if (sc->sc_phy_rev < 2)
bcw_phy_write16(sc, 0x002f, 0x0101);
else
@@ -4670,9 +4670,9 @@ bcw_phy_lo_g_measure(struct bcw_softc *sc)
regstack[6] = bcw_phy_read16(sc, 0x2a);
regstack[7] = bcw_phy_read16(sc, 0x35);
regstack[8] = bcw_phy_read16(sc, 0x60);
- regstack[9] = bcw_phy_read16(sc, 0x43);
- regstack[10] = bcw_phy_read16(sc, 0x7a);
- regstack[11] = bcw_phy_read16(sc, 0x52);
+ regstack[9] = bcw_radio_read16(sc, 0x43);
+ regstack[10] = bcw_radio_read16(sc, 0x7a);
+ regstack[11] = bcw_radio_read16(sc, 0x52);
if (sc->sc_phy_connected) {
regstack[12] = bcw_phy_read16(sc, 0x0811);
regstack[13] = bcw_phy_read16(sc, 0x0812);