diff options
-rw-r--r-- | include/device/ipc-v4/net.h | 2 | ||||
-rw-r--r-- | include/net.h | 17 | ||||
-rw-r--r-- | samsung-ipc/net.c | 4 | ||||
-rw-r--r-- | tools/modemctrl.c | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/include/device/ipc-v4/net.h b/include/device/ipc-v4/net.h index c72f526..0a7eece 100644 --- a/include/device/ipc-v4/net.h +++ b/include/device/ipc-v4/net.h @@ -29,7 +29,7 @@ #define IPC_NET_ACCESS_TECHNOLOGY_EDGE 0x03 #define IPC_NET_ACCESS_TECHNOLOGY_UMTS 0x04 -struct ipc_net_current_plmn { +struct ipc_net_current_plmn_response { char unk0; unsigned char slevel; char unk1; diff --git a/include/net.h b/include/net.h index 2d5cd8b..c201631 100644 --- a/include/net.h +++ b/include/net.h @@ -63,14 +63,19 @@ #define IPC_NET_MODE_SEL_UMTS_ONLY 0x03 struct ipc_net_regist_get { + /* ignore, ipc_net_regist_get_setup will do for you */ unsigned char net; + /* IPC_NET_SERVICE_DOMAIN_.. */ unsigned char domain; } __attribute__((__packed__)); -struct ipc_net_regist { - unsigned char act; // IPC_NET_ACCESS_TECHNOLOGY_... - unsigned char domain; // IPC_NET_SERVICE_DOMAIN_... - unsigned char reg_state; // IPC_NET_REGISTRATION_STATE_... +struct ipc_net_regist_response { + /* IPC_NET_ACCESS_TECHNOLOGY_... */ + unsigned char act; + /* IPC_NET_SERVICE_DOMAIN_... */ + unsigned char domain; + /* IPC_NET_REGISTRATION_STATE_... */ + unsigned char reg_state; unsigned char edge; unsigned short lac; unsigned int cid; @@ -102,8 +107,8 @@ struct ipc_net_plmn_sel_set { unsigned char act; // IPC_NET_ACCESS_TECHNOLOGY_... } __attribute__((__packed__)); -void ipc_net_regist_setup(struct ipc_net_regist_get *message, unsigned char domain); -void ipc_net_plmn_sel_setup(struct ipc_net_plmn_sel_set *message, unsigned char mode, char *plmn, unsigned char act); +void ipc_net_regist_get_setup(struct ipc_net_regist_get *message, unsigned char domain); +void ipc_net_plmn_sel_set_setup(struct ipc_net_plmn_sel_set *message, unsigned char mode, char *plmn, unsigned char act); #endif diff --git a/samsung-ipc/net.c b/samsung-ipc/net.c index 0b9f0c4..bc1d8b4 100644 --- a/samsung-ipc/net.c +++ b/samsung-ipc/net.c @@ -21,14 +21,14 @@ #include <string.h> #include <radio.h> -void ipc_net_regist_setup(struct ipc_net_regist_get *message, unsigned char domain) +void ipc_net_regist_get_setup(struct ipc_net_regist_get *message, unsigned char domain) { //FIXME: could that be IPC_NET_ACCESS_TECHNOLOGY_... (act) ? message->net = 0xff; message->domain = domain; } -void ipc_net_plmn_sel_setup(struct ipc_net_plmn_sel_set *message, unsigned char mode, char *plmn, unsigned char act) +void ipc_net_plmn_sel_set_setup(struct ipc_net_plmn_sel_set *message, unsigned char mode, char *plmn, unsigned char act) { int message_plmn_len = sizeof(message->plmn) / sizeof(char); int plmn_len; diff --git a/tools/modemctrl.c b/tools/modemctrl.c index eb8808f..0e6f5fc 100644 --- a/tools/modemctrl.c +++ b/tools/modemctrl.c @@ -314,14 +314,14 @@ void modem_response_pwr(struct ipc_client *client, struct ipc_message_info *resp void modem_response_net(struct ipc_client *client, struct ipc_message_info *resp) { - struct ipc_net_regist *regi; + struct ipc_net_regist_response *regi; struct ipc_net_plmn_entry *plmn; char mnc[6]; switch(IPC_COMMAND(resp)) { case IPC_NET_REGIST: - regi = (struct ipc_net_regist *)resp->data; + regi = (struct ipc_net_regist_response*) resp->data; if(regi->reg_state == IPC_NET_REGISTRATION_STATE_HOME) { printf("[I] Registered with network successfully!\n"); |