Imported Upstream version 1.5

[ap-utils.git] / lib / scr.c

diff --git a/lib/scr.c b/lib/scr.c
index 08a8f5b29cc3e259e69e31a9455105b3a09c3281..6ad506a3bcbefc3b2da320e9658380e4d9ac96b5 100644 (file)
--- a/lib/scr.c
+++ b/lib/scr.c
@@ -25,6 +25,7 @@
 #include <menu.h>
 
 extern WINDOW *main_sub, *win_for_help, *main_win;
+extern short ap_type, ap_vendorext;
 
 enum { dBm, percentage, rawval } sts_viewtype = dBm;
 
@@ -43,7 +44,7 @@ scroll_rows(struct MacListStat *first, int begin, int end, int row,
     i = 0;
     while (end-- > begin) {
        if (stat == 1) {
-           /* NWN view */
+           /* NWN STAtions listing */
            sprintf(message,
                "%4u       %02X%02X%02X%02X%02X%02X        %3u%5u     %3d",
                begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
@@ -54,7 +55,7 @@ scroll_rows(struct MacListStat *first, int begin, int end, int row,
                conv_rssi(curr->rssi)
            );
        } else if (stat == 2) {
-           /* ATMEL STAtions view */
+           /* ATMEL STAtions listing */
            char parentmac[13] = "      -     ";
            char rssi[5] = "   -";
            char quality[5] = "   -";
@@ -96,7 +97,7 @@ scroll_rows(struct MacListStat *first, int begin, int end, int row,
                parentmac, rssi, quality, status, port, ip
            );
        } else {
-           /* used for MAC auth table listing */
+           /* MAC auth table listing */
            sprintf(message, " %3u     %02X%02X%02X%02X%02X%02X",
                begin + i, curr->addr[0] & 0xFF, curr->addr[1] & 0xFF,
                curr->addr[2] & 0xFF, curr->addr[3] & 0xFF,
@@ -220,7 +221,7 @@ int conv_rssi(int raw_rssi)
 {
     switch (sts_viewtype) {
        case dBm:
-          return (-96 + raw_rssi); 
+          return (dbmconv(raw_rssi)); 
        case percentage:
           return ((int)((minimum (raw_rssi, 40)) * (float)2.5));
        case rawval: