diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /drivers/net/wireless/zd1211rw/zd_chip.c | |
parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 61 |
1 files changed, 46 insertions, 15 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 58419985e00f..7c4e32cf0d47 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -1435,9 +1435,43 @@ static int ofdm_qual_db(u8 status_quality, u8 rate, unsigned int size) | |||
1435 | break; | 1435 | break; |
1436 | } | 1436 | } |
1437 | 1437 | ||
1438 | switch (rate) { | ||
1439 | case ZD_OFDM_RATE_6M: | ||
1440 | case ZD_OFDM_RATE_9M: | ||
1441 | i += 3; | ||
1442 | break; | ||
1443 | case ZD_OFDM_RATE_12M: | ||
1444 | case ZD_OFDM_RATE_18M: | ||
1445 | i += 5; | ||
1446 | break; | ||
1447 | case ZD_OFDM_RATE_24M: | ||
1448 | case ZD_OFDM_RATE_36M: | ||
1449 | i += 9; | ||
1450 | break; | ||
1451 | case ZD_OFDM_RATE_48M: | ||
1452 | case ZD_OFDM_RATE_54M: | ||
1453 | i += 15; | ||
1454 | break; | ||
1455 | default: | ||
1456 | return -EINVAL; | ||
1457 | } | ||
1458 | |||
1438 | return i; | 1459 | return i; |
1439 | } | 1460 | } |
1440 | 1461 | ||
1462 | static int ofdm_qual_percent(u8 status_quality, u8 rate, unsigned int size) | ||
1463 | { | ||
1464 | int r; | ||
1465 | |||
1466 | r = ofdm_qual_db(status_quality, rate, size); | ||
1467 | ZD_ASSERT(r >= 0); | ||
1468 | if (r < 0) | ||
1469 | r = 0; | ||
1470 | |||
1471 | r = (r * 100)/29; | ||
1472 | return r <= 100 ? r : 100; | ||
1473 | } | ||
1474 | |||
1441 | static unsigned int log10times100(unsigned int x) | 1475 | static unsigned int log10times100(unsigned int x) |
1442 | { | 1476 | { |
1443 | static const u8 log10[] = { | 1477 | static const u8 log10[] = { |
@@ -1481,31 +1515,28 @@ static int cck_snr_db(u8 status_quality) | |||
1481 | return r; | 1515 | return r; |
1482 | } | 1516 | } |
1483 | 1517 | ||
1484 | static int rx_qual_db(const void *rx_frame, unsigned int size, | 1518 | static int cck_qual_percent(u8 status_quality) |
1485 | const struct rx_status *status) | ||
1486 | { | 1519 | { |
1487 | return (status->frame_status&ZD_RX_OFDM) ? | 1520 | int r; |
1488 | ofdm_qual_db(status->signal_quality_ofdm, | 1521 | |
1489 | zd_ofdm_plcp_header_rate(rx_frame), | 1522 | r = cck_snr_db(status_quality); |
1490 | size) : | 1523 | r = (100*r)/17; |
1491 | cck_snr_db(status->signal_quality_cck); | 1524 | return r <= 100 ? r : 100; |
1492 | } | 1525 | } |
1493 | 1526 | ||
1494 | u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size, | 1527 | u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size, |
1495 | const struct rx_status *status) | 1528 | const struct rx_status *status) |
1496 | { | 1529 | { |
1497 | int r = rx_qual_db(rx_frame, size, status); | 1530 | return (status->frame_status&ZD_RX_OFDM) ? |
1498 | if (r < 0) | 1531 | ofdm_qual_percent(status->signal_quality_ofdm, |
1499 | r = 0; | 1532 | zd_ofdm_plcp_header_rate(rx_frame), |
1500 | r = (r * 100) / 14; | 1533 | size) : |
1501 | if (r > 100) | 1534 | cck_qual_percent(status->signal_quality_cck); |
1502 | r = 100; | ||
1503 | return r; | ||
1504 | } | 1535 | } |
1505 | 1536 | ||
1506 | u8 zd_rx_strength_percent(u8 rssi) | 1537 | u8 zd_rx_strength_percent(u8 rssi) |
1507 | { | 1538 | { |
1508 | int r = (rssi*100) / 30; | 1539 | int r = (rssi*100) / 41; |
1509 | if (r > 100) | 1540 | if (r > 100) |
1510 | r = 100; | 1541 | r = 100; |
1511 | return (u8) r; | 1542 | return (u8) r; |