Imported Upstream version 1.4.2~pre2~a

[ap-utils.git] / src / ap-config.c

diff --git a/src/ap-config.c b/src/ap-config.c
index 7865e51532757c6d73ad3ed02327aea7843ae7c0..4ef92872b66cd571cb90848d2fcb9f26023e6f3c 100644 (file)
--- a/src/ap-config.c
+++ b/src/ap-config.c
@@ -40,6 +40,10 @@ int sockfd, atmel410_filter=0;
 struct in_addr ap_ip;
 char *prog_title = "Wireless Access Point Configurator";
 
+extern char IS_ATMEL410_SBRIDGES;
+extern char IS_ATMEL12350_TELLUS;
+extern char IS_ATMEL12350_VERNET;
+
 void config_menu()
 {
     struct umitems umenu_atmel[] = {
@@ -66,13 +70,13 @@ void config_menu()
     };
     
     switch (ap_type) {
-        case ATMEL410:
+       case ATMEL410:
        case ATMEL12350:
-               uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
-              break;
+           uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
+           break;
        case NWN:
-              uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
-              break;
+           uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
+           break;
     }
 }
 
@@ -81,8 +85,7 @@ void command_menu()
 {
     struct umitems command_umenu_atmel[] = {
        {_("Upload"), _("Make current configuration active"), upload, 0},
-       {_("Defaults"), _("Restore factory default settings"), defaults,
-        0},
+       {_("Defaults"), _("Restore factory default settings"), defaults, 0},
        {_("Reset"),
         _("Reset AP. All not uploaded configuration will be lost"),
         reset, 0},
@@ -106,10 +109,9 @@ void command_menu()
            uni_menu(command_umenu_nwn,
                sizeof(command_umenu_nwn) / sizeof(command_umenu_nwn[0]));
            break;
-       }    
+    }    
 }
 
-
 void stat_menu()
 {
     struct umitems umenu_atmel[] = {
@@ -139,13 +141,13 @@ void stat_menu()
        case NWN:
            uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
            break;
-       }    
+    }    
 }
 
 void _auth()
 {
-       if(get_opts() == 0)
-               connect_options((unsigned long) NULL, (int) NULL);
+    if(get_opts() == 0)
+       connect_options((unsigned long) NULL, (int) NULL);
 }
 
 void main_menu()
@@ -173,7 +175,6 @@ int main( /*int argc, char **argv */ )
     WINDOW *win_for_title;
     char message[100];
 
-
 #ifdef HAVE_GETTEXT
     /* locale support init */
     setlocale(LC_ALL, "");
@@ -251,10 +252,9 @@ int main( /*int argc, char **argv */ )
     wrefresh(main_win);
 
     about();
-    if (get_opts() == 0) {
-               connect_options((unsigned long) NULL, (int) NULL);
+    if (get_opts() == 0)
+       connect_options((unsigned long) NULL, (int) NULL);
 
-    }
     while (1)
        main_menu();