diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmutil/utils.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmutil/utils.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c index 906e89ddf319..0543607002fd 100644 --- a/drivers/net/wireless/brcm80211/brcmutil/utils.c +++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c | |||
@@ -267,15 +267,43 @@ char *brcmu_boardrev_str(u32 brev, char *buf) | |||
267 | char c; | 267 | char c; |
268 | 268 | ||
269 | if (brev < 0x100) { | 269 | if (brev < 0x100) { |
270 | snprintf(buf, 8, "%d.%d", (brev & 0xf0) >> 4, brev & 0xf); | 270 | snprintf(buf, BRCMU_BOARDREV_LEN, "%d.%d", |
271 | (brev & 0xf0) >> 4, brev & 0xf); | ||
271 | } else { | 272 | } else { |
272 | c = (brev & 0xf000) == 0x1000 ? 'P' : 'A'; | 273 | c = (brev & 0xf000) == 0x1000 ? 'P' : 'A'; |
273 | snprintf(buf, 8, "%c%03x", c, brev & 0xfff); | 274 | snprintf(buf, BRCMU_BOARDREV_LEN, "%c%03x", c, brev & 0xfff); |
274 | } | 275 | } |
275 | return buf; | 276 | return buf; |
276 | } | 277 | } |
277 | EXPORT_SYMBOL(brcmu_boardrev_str); | 278 | EXPORT_SYMBOL(brcmu_boardrev_str); |
278 | 279 | ||
280 | char *brcmu_dotrev_str(u32 dotrev, char *buf) | ||
281 | { | ||
282 | u8 dotval[4]; | ||
283 | |||
284 | if (!dotrev) { | ||
285 | snprintf(buf, BRCMU_DOTREV_LEN, "unknown"); | ||
286 | return buf; | ||
287 | } | ||
288 | dotval[0] = (dotrev >> 24) & 0xFF; | ||
289 | dotval[1] = (dotrev >> 16) & 0xFF; | ||
290 | dotval[2] = (dotrev >> 8) & 0xFF; | ||
291 | dotval[3] = dotrev & 0xFF; | ||
292 | |||
293 | if (dotval[3]) | ||
294 | snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d.%d.%d", dotval[0], | ||
295 | dotval[1], dotval[2], dotval[3]); | ||
296 | else if (dotval[2]) | ||
297 | snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d.%d", dotval[0], | ||
298 | dotval[1], dotval[2]); | ||
299 | else | ||
300 | snprintf(buf, BRCMU_DOTREV_LEN, "%d.%d", dotval[0], | ||
301 | dotval[1]); | ||
302 | |||
303 | return buf; | ||
304 | } | ||
305 | EXPORT_SYMBOL(brcmu_dotrev_str); | ||
306 | |||
279 | #if defined(DEBUG) | 307 | #if defined(DEBUG) |
280 | /* pretty hex print a pkt buffer chain */ | 308 | /* pretty hex print a pkt buffer chain */ |
281 | void brcmu_prpkt(const char *msg, struct sk_buff *p0) | 309 | void brcmu_prpkt(const char *msg, struct sk_buff *p0) |