Skip to content
Snippets Groups Projects
Commit a936c064 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

Revert "update wrapper with different hilink api calls based on hilink software version" 

This reverts commit 4d2956ff.
parent 451933f6
Branches refactor_fixes_suggestions
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 115 deletions
libmobile.c
+ 38
− 115
View file @ a936c064
...@@ -2,19 +2,14 @@ ...@@ -2,19 +2,14 @@
static char *zte = "usb0"; static char *zte = "usb0";
static char *hilink = "eth5"; static char *hilink = "eth5";
static char *software_version = "22.200.05.00.1080";
// check other libraries to maintain similar structure, libwifi, libethernet, libdsl // check other libraries to maintain similar structure, libwifi, libethernet, libdsl
struct json_object *mobile_set_pin(struct dongle dev, char *current_pin, char *new_pin) struct json_object *mobile_set_pin(struct dongle dev, char *current_pin, char *new_pin)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_set_pin_zte(dev.ip, current_pin, new_pin); return mobile_set_pin_zte(dev.ip, current_pin, new_pin);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_set_pin_hilink(current_pin, new_pin);
return mobile_set_pin_hilink_huawei(current_pin, new_pin);
else
return mobile_set_pin_hilink_tre(current_pin, new_pin);
}
return NULL; return NULL;
} }
...@@ -23,12 +18,8 @@ struct json_object *mobile_disable_pin(struct dongle dev, char *pin) ...@@ -23,12 +18,8 @@ struct json_object *mobile_disable_pin(struct dongle dev, char *pin)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_disable_pin_zte(dev.ip, pin); return mobile_disable_pin_zte(dev.ip, pin);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_disable_pin_hilink(pin);
return mobile_disable_pin_hilink_huawei(pin);
else
return mobile_disable_pin_hilink_tre(pin);
}
return NULL; return NULL;
} }
...@@ -37,12 +28,8 @@ struct json_object *mobile_verify_pin(struct dongle dev, char *pin) ...@@ -37,12 +28,8 @@ struct json_object *mobile_verify_pin(struct dongle dev, char *pin)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_verify_pin_zte(dev.ip, pin); return mobile_verify_pin_zte(dev.ip, pin);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_set_pin_hilink(pin, pin);
return mobile_set_pin_hilinki_huawei(pin, pin);
else
return mobile_set_pin_hilink_tre(pin, pin);
}
return NULL; return NULL;
} }
...@@ -51,12 +38,8 @@ struct json_object *mobile_enable_pin(struct dongle dev, char *pin) ...@@ -51,12 +38,8 @@ struct json_object *mobile_enable_pin(struct dongle dev, char *pin)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_enable_pin_zte(dev.ip, pin); return mobile_enable_pin_zte(dev.ip, pin);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_enable_pin_hilink(pin);
return mobile_enable_pin_hilink_huawei(pin);
else
return mobile_enable_pin_hilink_tre(pin);
}
return NULL; return NULL;
} }
...@@ -65,12 +48,8 @@ struct json_object *mobile_get_remaining_tries(struct dongle dev) ...@@ -65,12 +48,8 @@ struct json_object *mobile_get_remaining_tries(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_remaining_tries_zte(dev.ip); return mobile_get_remaining_tries_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_remaining_tries_hilink();
return mobile_get_remaining_tries_hilink_huawei();
else
return mobile_get_remaining_tries_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -79,12 +58,8 @@ struct json_object *mobile_unlock_sim(struct dongle dev, char *pin, char *puk) ...@@ -79,12 +58,8 @@ struct json_object *mobile_unlock_sim(struct dongle dev, char *pin, char *puk)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_unlock_sim_zte(dev.ip, pin, puk); return mobile_unlock_sim_zte(dev.ip, pin, puk);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_unlock_sim_hilink(pin, puk);
return mobile_unlock_sim_hilink_huawei(pin, puk);
else
return mobile_unlock_sim_hilink_tre(pin, puk);
}
return NULL; return NULL;
} }
...@@ -93,12 +68,8 @@ struct json_object *mobile_get_apn_profiles(struct dongle dev) ...@@ -93,12 +68,8 @@ struct json_object *mobile_get_apn_profiles(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_apn_profiles_zte(dev.ip); return mobile_get_apn_profiles_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_apn_profiles_hilink();
return mobile_get_apn_profiles_hilink_huawei();
else
return mobile_get_apn_profiles_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -107,12 +78,8 @@ struct json_object *mobile_delete_apn_profile(struct dongle dev, char *name) ...@@ -107,12 +78,8 @@ struct json_object *mobile_delete_apn_profile(struct dongle dev, char *name)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_delete_apn_profile_zte(dev.ip, name); return mobile_delete_apn_profile_zte(dev.ip, name);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_delete_apn_profile_hilink(0);
return mobile_delete_apn_profile_hilink_huawei(0);
else
return mobile_delete_apn_profile_hilink_zte(0);
}
return NULL; return NULL;
} }
...@@ -121,12 +88,8 @@ struct json_object *mobile_set_apn_profile(struct dongle dev, char *name) ...@@ -121,12 +88,8 @@ struct json_object *mobile_set_apn_profile(struct dongle dev, char *name)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_set_apn_profile_zte(dev.ip, name); return mobile_set_apn_profile_zte(dev.ip, name);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_set_apn_profile_hilink(name, name, name, name);
return mobile_set_apn_profile_hilink_huawei(name, name, name, name);
else
return mobile_set_apn_profile_hilink_tre(name, name, name, name);
}
return NULL; return NULL;
} }
...@@ -135,12 +98,8 @@ struct json_object *mobile_create_apn_profile(struct dongle dev, char *profile_n ...@@ -135,12 +98,8 @@ struct json_object *mobile_create_apn_profile(struct dongle dev, char *profile_n
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_create_apn_profile_zte(dev.ip, profile_name, wan_apn, pdp_type); return mobile_create_apn_profile_zte(dev.ip, profile_name, wan_apn, pdp_type);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_create_apn_profile_hilink(profile_name, profile_name, profile_name, profile_name);
return mobile_create_apn_profile_hilink_huawei(profile_name, profile_name, profile_name, profile_name);
else
return mobile_create_apn_profile_hilink_tre(profile_name, profile_name, profile_name, profile_name);
}
return NULL; return NULL;
} }
...@@ -149,12 +108,8 @@ struct json_object *mobile_get_current_apn(struct dongle dev) ...@@ -149,12 +108,8 @@ struct json_object *mobile_get_current_apn(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_current_apn_zte(dev.ip); return mobile_get_current_apn_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_current_apn_hilink();
return mobile_get_current_apn_hilink_huawei();
else
return mobile_get_current_apn_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -163,12 +118,8 @@ struct json_object *mobile_get_rssi(struct dongle dev) ...@@ -163,12 +118,8 @@ struct json_object *mobile_get_rssi(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_rssi_zte(dev.ip); return mobile_get_rssi_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_signal_strength_hilink();
return mobile_get_signal_strength_hilink_huawei();
else
return mobile_get_signal_strength_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -177,12 +128,8 @@ struct json_object *mobile_connect_network(struct dongle dev) ...@@ -177,12 +128,8 @@ struct json_object *mobile_connect_network(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_connect_network_zte(dev.ip); return mobile_connect_network_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_connect_network_hilink();
return mobile_connect_network_hilink_huawei();
else
return mobile_connect_network_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -191,12 +138,8 @@ struct json_object *mobile_disconnect_network(struct dongle dev) ...@@ -191,12 +138,8 @@ struct json_object *mobile_disconnect_network(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_disconnect_network_zte(dev.ip); return mobile_disconnect_network_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_disconnect_network_hilink();
return mobile_disconnect_network_hilink_huawei();
else
return mobile_disconnect_network_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -205,12 +148,8 @@ struct json_object *mobile_get_modem_state(struct dongle dev) ...@@ -205,12 +148,8 @@ struct json_object *mobile_get_modem_state(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_modem_state_zte(dev.ip); return mobile_get_modem_state_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_provider_hilink();
return mobile_get_provider_hilink_huawei();
else
return mobile_get_provider_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -219,12 +158,8 @@ struct json_object *mobile_enable_roaming(struct dongle dev) ...@@ -219,12 +158,8 @@ struct json_object *mobile_enable_roaming(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_enable_roaming_zte(dev.ip); return mobile_enable_roaming_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_enable_roaming_hilink();
return mobile_enable_roaming_hilink_huawei();
else
return mobile_enable_roaming_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -233,12 +168,8 @@ struct json_object *mobile_disable_roaming(struct dongle dev) ...@@ -233,12 +168,8 @@ struct json_object *mobile_disable_roaming(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_disable_roaming_zte(dev.ip); return mobile_disable_roaming_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_disable_roaming_hilink();
return mobile_disable_roaming_hilink_huawei();
else
return mobile_disable_roaming_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -247,12 +178,8 @@ struct json_object *mobile_get_roam_status(struct dongle dev) ...@@ -247,12 +178,8 @@ struct json_object *mobile_get_roam_status(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_roam_status_zte(dev.ip); return mobile_get_roam_status_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_roam_status_hilink();
return mobile_get_roam_status_hilink_huawei();
else
return mobile_get_roam_status_hilink_tre();
}
return NULL; return NULL;
} }
...@@ -261,12 +188,8 @@ struct json_object *mobile_get_pin_status(struct dongle dev) ...@@ -261,12 +188,8 @@ struct json_object *mobile_get_pin_status(struct dongle dev)
{ {
if (strcmp(dev.if_name, zte) == 0) if (strcmp(dev.if_name, zte) == 0)
return mobile_get_pin_status_zte(dev.ip); return mobile_get_pin_status_zte(dev.ip);
else if (strcmp(dev.if_name, hilink) == 0) { else if (strcmp(dev.if_name, hilink) == 0)
if (strcmp(dev.software_version, software_version) == 0) return mobile_get_pin_status_hilink();
return mobile_get_pin_status_hilink_huawei();
else
return mobile_get_pin_status_hilink_tre();
}
return NULL; return NULL;
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment