Update description to cover all current utilities

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

diff --git a/lib/radio.c b/lib/radio.c
index 1e7ee0eabe51946164e2f249257fbed42b7cd490..f7551fcf4ba3b8b59df03f8ecb3bfe22a4120e19 100644 (file)
--- a/lib/radio.c
+++ b/lib/radio.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include "ap-utils.h"
-#include "ap-curses.h"
 
 #define RADIO_HELP _("[key] - power level; UIOP or LR - antenna; W - write config; Q - quit to menu")
 
@@ -90,6 +89,13 @@ void power()
     varbind varbinds[2];
     int i, c = 0, antenna_vlen;
 
+    if (ap_type == ATMEL12350) {
+       TestModeRadioConfiguration[5] = 0xE0;
+       TestModeRadioConfiguration[6] = 0x3E;
+       operAntennaSettings[5] = 0xE0;
+       operAntennaSettings[6] = 0x3E;
+    }
+
     varbinds[0].oid = TestModeRadioConfiguration;
     varbinds[0].len_oid = sizeof(TestModeRadioConfiguration);
     varbinds[0].value = TestModeRadioConfiguration;
@@ -102,7 +108,7 @@ void power()
     varbinds[1].type = NULL_VALUE;
 
     print_help(WAIT_RET);
-    if (snmp(varbinds, 2, GET) <= 0) {
+    if (snmp(varbinds, 2, GET) < 2) {
        print_helperr(ERR_RET);
        goto exit;
     }
@@ -111,7 +117,7 @@ void power()
     memcpy(power, varbinds[0].value, 14);
     antenna_vlen = varbinds[1].len_val;
 
-    print_title(_("Radio Configuration"));
+    print_top(NULL, _("Radio Configuration"));
     mvwaddstr(main_sub, 0, 1, _("Output RF signal power level (CR31 register values)"));
     mvwaddstr(main_sub, 1, 1, "---------------------------------------------------");
     mvwaddstr(main_sub, 2, 1, _("Key Channel Level"));
@@ -293,6 +299,8 @@ void power()
                print_helperr(ERR_SET);
                goto exit;
            }
+           wbkgd(main_sub, A_NORMAL);
+           wrefresh(main_sub);
            break;
        default:
            continue;
@@ -304,6 +312,7 @@ void power()
   exit:
     getch();
   quit:
-    print_title("");
+    print_top(NULL, NULL);
     clear_main(0);
 }
+