diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-05-15 16:00:13 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-05-15 16:00:13 +0000 |
| commit | 6493fad3e9fee3c3b42e9f139d978a3dcdbf0fa4 (patch) | |
| tree | 80a288f92e8c2adc67c5f55b6ebce81fe9f25c53 | |
| parent | 40ce419ad2d54a5dd60f12b4677893ba003ccee7 (diff) | |
properly identify the RT3052 radio (dual-band 2T2R) in dmesg.
| -rw-r--r-- | sys/dev/ic/rt2860reg.h | 5 | ||||
| -rw-r--r-- | sys/dev/usb/if_run.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ic/rt2860reg.h b/sys/dev/ic/rt2860reg.h index 8b1b143b1d0..03c110453c1 100644 --- a/sys/dev/ic/rt2860reg.h +++ b/sys/dev/ic/rt2860reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860reg.h,v 1.17 2009/05/11 19:14:50 damien Exp $ */ +/* $OpenBSD: rt2860reg.h,v 1.18 2009/05/15 16:00:12 damien Exp $ */ /*- * Copyright (c) 2007 @@ -271,7 +271,7 @@ #define RT2860_USB_PHY_WD_EN (1 << 16) #define RT2860_USB_PHY_MAN_RST (1 << 15) #define RT2860_USB_RX_AGG_LMT(x) ((x) << 8) /* in unit of 1KB */ -#define RT2860_USB_RX_AGG_TO(x) ((x) << 0) /* in unit of 33ns */ +#define RT2860_USB_RX_AGG_TO(x) ((x) & 0xff) /* in unit of 33ns */ /* possible flags for register US_CYC_CNT */ #define RT2860_TEST_EN (1 << 24) @@ -835,6 +835,7 @@ struct rt2860_rxwi { #define RT3070_RF_2020 6 /* b/g */ #define RT3070_RF_3021 7 /* 1T2R */ #define RT3070_RF_3022 8 /* 2T2R */ +#define RT3070_RF_3052 9 /* dual-band 2T2R */ /* USB commands for RT2870 only */ #define RT2870_RESET 1 diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index ee847cca726..7ceda33e4ea 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.23 2009/05/15 15:53:55 damien Exp $ */ +/* $OpenBSD: if_run.c,v 1.24 2009/05/15 16:00:12 damien Exp $ */ /*- * Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1046,6 +1046,7 @@ run_get_rf(int rev) case RT3070_RF_2020: return "RT2020"; case RT3070_RF_3021: return "RT3021"; case RT3070_RF_3022: return "RT3022"; + case RT3070_RF_3052: return "RT3052"; } return "unknown"; } |