Diff: MuRata.cpp

Revision:

4:7388451219ee

Parent:

3:90ea1b8b2621

Child:

6:2efbb7a3ca36

--- a/MuRata.cpp	Thu Feb 05 04:02:41 2015 +0000
+++ b/MuRata.cpp	Thu Feb 05 17:43:18 2015 +0000
@@ -18,84 +18,77 @@
 
 SSIDRecordIndication * MuRata::Get_ScanResultIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_WIFI
-            && _payload.GetSubCommandID() == WIFI_SCAN_RESULT_IND) {
-        return new SSIDRecordIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_WIFI
+                && _payload.GetSubCommandID() == WIFI_SCAN_RESULT_IND)
+            return new SSIDRecordIndication(&_payload);
 
     return NULL;
 }
 
 WIFIConnectionIndication * MuRata::Get_WiFiStatusIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_WIFI
-            && _payload.GetSubCommandID() == WIFI_NETWORK_STATUS_IND) {
-        return new WIFIConnectionIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_WIFI
+                && _payload.GetSubCommandID() == WIFI_NETWORK_STATUS_IND)
+            return new WIFIConnectionIndication(&_payload);
 
     return NULL;
 }
 
 PowerUpIndication * MuRata::Get_PowerUpIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_GEN
-            && _payload.GetSubCommandID() == GEN_PWR_UP_IND) {
-        return new PowerUpIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_GEN
+                && _payload.GetSubCommandID() == GEN_PWR_UP_IND)
+            return new PowerUpIndication(&_payload);
 
     return NULL;
 }
 
 TCPStatusIndication * MuRata::Get_TcpConnectionStatusIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_SNIC
-            && _payload.GetSubCommandID() == SNIC_TCP_CONNECTION_STATUS_IND) {
-        return new TCPStatusIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_SNIC
+                && _payload.GetSubCommandID() == SNIC_TCP_CONNECTION_STATUS_IND)
+            return new TCPStatusIndication(&_payload);
 
     return NULL;
 }
 
 SocketReceiveInidcation * MuRata::Get_SocketReceiveIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_SNIC
-            && _payload.GetSubCommandID() == SNIC_CONNECTION_RECV_IND) {
-        return new SocketReceiveInidcation(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_SNIC
+                && _payload.GetSubCommandID() == SNIC_CONNECTION_RECV_IND)
+            return new SocketReceiveInidcation(&_payload);
 
     return NULL;
 }
 
 UDPReceivedIndication * MuRata::Get_UDPReceiveIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_SNIC
-            && _payload.GetSubCommandID() == SNIC_UDP_RECV_IND) {
-        return new UDPReceivedIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_SNIC
+                && _payload.GetSubCommandID() == SNIC_UDP_RECV_IND)
+            return new UDPReceivedIndication(&_payload);
 
     return NULL;
 }
 
 HTTPResponseIndication * MuRata::Get_HTTPResponseIndication()
 {
-    while (FrameReceive()
-            && _payload.GetResponseFlag() == Request_Indication
-            && _frame.GetCommandID() == CMD_ID_SNIC
-            && _payload.GetSubCommandID() == SNIC_HTTP_RSP_IND) {
-        return new HTTPResponseIndication(&_payload);
-    }
+    while (FrameReceive())
+        if (_payload.GetResponseFlag() == Request_Indication
+                && _frame.GetCommandID() == CMD_ID_SNIC
+                && _payload.GetSubCommandID() == SNIC_HTTP_RSP_IND)
+            return new HTTPResponseIndication(&_payload);
 
     return NULL;
 }
@@ -840,7 +833,4 @@
 CreateSocketResponse * MuRata::SNIC_CreateSimpleTLSTCP(const bool bind, IPAddress * localIP, const int localPort)
 {
     return SNIC_CreateSocket(SNIC_TCP_CREAET_SIMPLE_TLS_SOCKET_REQ, bind, localIP, localPort);
-}
-
-
-
+}
\ No newline at end of file