Cellular: Common routine for string and hexstring reading

Author: Mirela Chirica

features/cellular/framework/AT/ATHandler.cpp

@@ -458,120 +458,82 @@ ssize_t ATHandler::read_bytes(uint8_t *buf, size_t len)
     return read_len;
 }
 
-ssize_t ATHandler::read_string(char *buf, size_t size, bool read_even_stop_tag)
+ssize_t ATHandler::read(char *buf, size_t size, bool read_even_stop_tag, bool hex)
 {
     tr_debug("%s", __func__);
-    at_debug("\n----------read_string buff:----------\n");
+    at_debug("\n----------read buff:----------\n");
     for (size_t i = _recv_pos; i < _recv_len; i++) {
         at_debug("%c", _recv_buff[i]);
     }
-    at_debug("\n----------buff----------\n");
+    at_debug("\n----------read end----------\n");
 
     if (_last_err || !_stop_tag || (_stop_tag->found && read_even_stop_tag == false)) {
         return -1;
     }
 
-    uint8_t *pbuf = (uint8_t*)buf;
-
-    size_t len = 0;
     size_t match_pos = 0;
-
-    consume_char('\"');
-
-    for (; len < (size + match_pos); len++) {
-        int c = get_char();
-        if (c == -1) {
-            pbuf[len] = '\0';
-            set_error(NSAPI_ERROR_DEVICE_ERROR);
-            return -1;
-        } else if (c == _delimiter) {
-            pbuf[len] = '\0';
-            break;
-        } else if (c == '\"') {
-            match_pos = 0;
-            if (len > 0) {
-                len--;
-            }
-            continue;
-        } else if (_stop_tag->len && c == _stop_tag->tag[match_pos]) {
-            match_pos++;
-            if (match_pos == _stop_tag->len) {
-                _stop_tag->found = true;
-                // remove tag from string if it was matched
-                len -= (_stop_tag->len - 1);
-                pbuf[len] = '\0';
-                break;
-            }
-        } else if (match_pos) {
-            match_pos = 0;
-        }
-
-        pbuf[len] = c;
-    }
-
-    // Do we need _stop_found set after reading by size -> is _stop_tag_by_len needed or not?
-    return len;
-}
-
-ssize_t ATHandler::read_hex_string(char *buf, size_t size)
-{
-    tr_debug("%s", __func__);
-    at_debug("\n----------read_hex_string buff:----------\n");
-    for (size_t i = _recv_pos; i < _recv_len; i++) {
-        at_debug("%c", _recv_buff[i]);
-    }
-    at_debug("\n----------read_hex_string end----------\n");
-
-    if (_last_err || !_stop_tag || _stop_tag->found) {
-        return -1;
-    }
-
-    size_t match_pos = 0, str_len = 0;
     size_t upper = 0, lower = 0;
-    size_t hex_size = size*2;
+    size_t read_size = hex ? size*2 : size;
 
     uint8_t *pbuf = (uint8_t*)buf;
 
     consume_char('\"');
 
-    for (size_t hex_len = 0; hex_len < (hex_size + match_pos); hex_len++) {
+    size_t read_idx = 0;
+    size_t buf_idx = 0;
+
+    for (; read_idx < (read_size + match_pos); read_idx++) {
         char c = get_char();
+        buf_idx = hex ? read_idx/2 : read_idx;
         if (c == -1) {
-            pbuf[str_len] = '\0';
+            pbuf[buf_idx] = '\0';
             set_error(NSAPI_ERROR_DEVICE_ERROR);
             return -1;
         } else if (c == _delimiter) {
-            pbuf[str_len] = '\0';
+            pbuf[buf_idx] = '\0';
             break;
         } else if (c == '\"') {
             match_pos = 0;
-            if (str_len > 0) {
-                str_len--;
+            if (read_idx > 0) {
+                read_idx--;
             }
             continue;
         } else if (_stop_tag->len && c == _stop_tag->tag[match_pos]) {
             match_pos++;
             if (match_pos == _stop_tag->len) {
                 _stop_tag->found = true;
                 // remove tag from string if it was matched
-                str_len -= (_stop_tag->len - 1);
-                pbuf[str_len] = '\0';
+                buf_idx -= (_stop_tag->len - 1);
+                pbuf[buf_idx] = '\0';
                 break;
             }
         } else if (match_pos) {
             match_pos = 0;
         }
 
-        if (hex_len % 2 == 0) {
-            upper = hex_str_to_int(&c, 1);
+        if (!hex) {
+           pbuf[buf_idx] = c;
         } else {
-            lower = hex_str_to_int(&c, 1);
-            pbuf[str_len] = ((upper<<4) & 0xF0) | (lower & 0x0F);
-            str_len++;
+            if (read_idx % 2 == 0) {
+                upper = hex_str_to_int(&c, 1);
+            } else {
+                lower = hex_str_to_int(&c, 1);
+                pbuf[buf_idx] = ((upper<<4) & 0xF0) | (lower & 0x0F);
+            }
         }
     }
 
-    return str_len;
+    return buf_idx + 1;
+}
+
+ssize_t ATHandler::read_string(char *buf, size_t size, bool read_even_stop_tag)
+{
+    return read(buf, size, read_even_stop_tag, false);
+}
+
+ssize_t ATHandler::read_hex_string(char *buf, size_t size)
+{
+    return read(buf, size, false, true);
 }
 
 int32_t ATHandler::read_int()

features/cellular/framework/AT/ATHandler.h

@@ -493,6 +493,8 @@ class ATHandler
 
     // check is urc is already added
     bool find_urc_handler(const char *prefix, mbed::Callback<void()> callback);
+
+    ssize_t read(char *buf, size_t size, bool read_even_stop_tag, bool hex);
 };
 
 } // namespace mbed