diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-07-18 20:12:16 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-07-18 20:12:16 +0000 |
| commit | 0efb76d687510bb7bb35b232135b85962335c796 (patch) | |
| tree | 1550e6ece6648c3d64087942188a6659aeec1e54 /sys/dev | |
| parent | 010bc43ef35372eccc7b261897f0fc00c14902af (diff) | |
RF registers are 20 bits on RT2501USB, not 21.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_rum.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_rumreg.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 058d2b0141b..e5bbc9b1049 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.7 2006/07/18 20:07:59 damien Exp $ */ +/* $OpenBSD: if_rum.c,v 1.8 2006/07/18 20:12:15 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org> @@ -1556,7 +1556,7 @@ rum_rf_write(struct rum_softc *sc, uint8_t reg, uint32_t val) return; } - tmp = RT2573_RF_BUSY | RT2573_RF_21BIT | (val & 0xfffff) << 2 | + tmp = RT2573_RF_BUSY | RT2573_RF_20BIT | (val & 0xfffff) << 2 | (reg & 3); rum_write(sc, RT2573_PHY_CSR4, tmp); diff --git a/sys/dev/usb/if_rumreg.h b/sys/dev/usb/if_rumreg.h index cb7d905936f..f1e70c358e1 100644 --- a/sys/dev/usb/if_rumreg.h +++ b/sys/dev/usb/if_rumreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rumreg.h,v 1.2 2006/07/18 19:56:12 damien Exp $ */ +/* $OpenBSD: if_rumreg.h,v 1.3 2006/07/18 20:12:15 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org> @@ -319,8 +319,8 @@ struct rum_rx_desc { #define RT2573_BBP_READ (1 << 15) #define RT2573_BBP_BUSY (1 << 16) /* possible flags for register PHY_CSR4 */ -#define RT2573_RF_21BIT (21 << 24) -#define RT2573_RF_BUSY (1 << 31) +#define RT2573_RF_20BIT (20 << 24) +#define RT2573_RF_BUSY (1 << 31) /* possible values for register STA_CSR4 */ #define RT2573_TX_STAT_VALID (1 << 0) |