summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2010-02-08 18:26:32 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2010-02-08 18:26:32 +0000
commit0826d922490b08dede282d623766dad507115755 (patch)
treea5e4547761a6b817cd01701b369150e979e00a77 /sys/dev
parent36b57dbdcb722c47d8af5c5d44b826a085ebc35f (diff)
s/RT2860_MCU_CMD_BOOT/RT2860_MCU_CMD_RFRESET/
no binary change.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/rt2860.c6
-rw-r--r--sys/dev/ic/rt2860reg.h4
-rw-r--r--sys/dev/usb/if_run.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index eed741792fc..00e54f0bc56 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860.c,v 1.39 2010/02/07 09:14:55 damien Exp $ */
+/* $OpenBSD: rt2860.c,v 1.40 2010/02/08 18:26:31 damien Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -2880,8 +2880,8 @@ rt2860_init(struct ifnet *ifp)
ic->ic_bss->ni_chan = ic->ic_ibss_chan;
rt2860_set_chan(sc, ic->ic_ibss_chan);
- /* XXX not clear what the following 8051 command does.. */
- (void)rt2860_mcu_cmd(sc, RT2860_MCU_CMD_BOOT, 0);
+ /* reset RF from MCU */
+ (void)rt2860_mcu_cmd(sc, RT2860_MCU_CMD_RFRESET, 0);
/* set RTS threshold */
tmp = RAL_READ(sc, RT2860_TX_RTS_CFG);
diff --git a/sys/dev/ic/rt2860reg.h b/sys/dev/ic/rt2860reg.h
index ddc988c35e6..bf1e386e428 100644
--- a/sys/dev/ic/rt2860reg.h
+++ b/sys/dev/ic/rt2860reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860reg.h,v 1.24 2010/02/07 11:49:04 damien Exp $ */
+/* $OpenBSD: rt2860reg.h,v 1.25 2010/02/08 18:26:31 damien Exp $ */
/*-
* Copyright (c) 2007
@@ -302,7 +302,7 @@
#define RT2860_MCU_CMD_LED1 0x52
#define RT2860_MCU_CMD_LED2 0x53
#define RT2860_MCU_CMD_LED3 0x54
-#define RT2860_MCU_CMD_BOOT 0x72
+#define RT2860_MCU_CMD_RFRESET 0x72
#define RT2860_MCU_CMD_ANTSEL 0x73
#define RT2860_MCU_CMD_BBP 0x80
#define RT2860_MCU_CMD_PSLEVEL 0x83
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 10debf45ccb..3545772dc75 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_run.c,v 1.51 2010/02/08 17:21:01 damien Exp $ */
+/* $OpenBSD: if_run.c,v 1.52 2010/02/08 18:26:31 damien Exp $ */
/*-
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -731,7 +731,7 @@ run_load_microcode(struct run_softc *sc)
usbd_delay_ms(sc->sc_udev, 10);
run_write(sc, RT2860_H2M_MAILBOX, 0);
- if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_BOOT, 0)) != 0)
+ if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_RFRESET, 0)) != 0)
return error;
/* wait until microcontroller is ready */