Tethering: Power on Wi-Fi before enable Wi-Fi tethering

[apps/native/ug-mobile-ap.git] / include / mobile_hotspot.h

diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h
index 98b69ce..acf07d8 100644 (file)
--- a/include/mobile_hotspot.h
+++ b/include/mobile_hotspot.h
@@ -1,13 +1,13 @@
 /*
 * ug-mobile-ap
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
+* Copyright 2012-2013  Samsung Electronics Co., Ltd
 
-* Licensed under the Flora License, Version 1.0 (the "License");
+* Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license/
+* http://floralicense.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 #if !defined(PACKAGE)
-#define PACKAGE "ug-setting-mobile-ap-ug"
+#define PACKAGE "ug-setting-mobileap-efl"
 #endif
 
 #if !defined(LOCALEDIR)
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 #if !defined(EDJDIR)
-#define EDJDIR "/usr/ug/res/edje/ug-setting-mobile-ap-ug"
+#define EDJDIR "/usr/ug/res/edje/ug-setting-mobileap-efl"
 #endif
 
 #if !defined(PREFIX)
@@ -92,8 +92,13 @@ extern "C" {
 
 #define _EDJ(obj)                      elm_layout_edje_get(obj)
 
+#define TETHERING_WIFI_MAX_CONNECTED_STA       8
+#define TETHERING_BT_MAX_CONNECTED_STA         7
+#define TETHERING_USB_MAX_CONNECTED_STA                1
+#define TETHERING_MAX_CONNECTED_STA \
+       (TETHERING_WIFI_MAX_CONNECTED_STA + TETHERING_BT_MAX_CONNECTED_STA + TETHERING_USB_MAX_CONNECTED_STA)
+
 /* This is from tethering_private.h */
-#define TETHERING_MAX_CONNECTED_STA    16      /**< Maximum connected station. 8(Wi-Fi) + 7(BT) + 1(USB) */
 #define TETHERING_TYPE_MAX             4       /**< All, USB, Wi-Fi, BT */
 
 typedef enum {
@@ -110,7 +115,6 @@ typedef enum {
        /* One button pop-up */
        MH_POP_INFORMATION,
        MH_POP_USB_CONNECT,
-       MH_POP_WIFI_PASSWORD_SHORT,
 
        /* No button & timeout pop-up */
        MH_POP_INFORMATION_WO_BUTTON,
@@ -145,6 +149,7 @@ typedef struct ap_app_main {
        Elm_Genlist_Item_Class          *usage_itc;
        Elm_Genlist_Item_Class          *dev_itc[TETHERING_TYPE_MAX];
 
+       Elm_Object_Item                 *sp_item[4];
        Elm_Object_Item                 *wifi_item;
        Elm_Object_Item                 *setup_item;
        Elm_Object_Item                 *bt_item;
@@ -168,7 +173,6 @@ typedef struct {
        Evas_Object                     *title_back_btn;
        Evas_Object                     *hide_btn;
        Evas_Object                     *security_btn;
-       Evas_Object                     *pw_layout;
        Evas_Object                     *pw_entry;
 
        Elm_Genlist_Item_Class          *sp_itc;
@@ -178,6 +182,7 @@ typedef struct {
        Elm_Genlist_Item_Class          *pw_itc;
        Elm_Genlist_Item_Class          *name_itc;
 
+       Elm_Object_Item                 *sp_item[2];
        Elm_Object_Item                 *hide_item;
        Elm_Object_Item                 *security_item;
        Elm_Object_Item                 *pw_item;
@@ -222,8 +227,8 @@ typedef struct {
        mh_data_usage_t                 data_statistics;
        mh_clients_t                    clients;
 
-       int                             popup_type;
-       char                            popup_string[MH_LABEL_LENGTH_MAX];
+       enum ug_event                   rotate_state;
+       Ecore_IMF_Input_Panel_State     imf_state;
 } mh_appdata_t;
 
 typedef struct {