rtt: Refactor some of the code

Author: HrMitrev

UsingRTT.md

@@ -119,9 +119,9 @@ grep 2000 HelloWorld.ino.map | grep RTT
 	sets RTT ident to *string*. If *string* contains a space, replace the space with an
         underscore _. Setting ident string is optional, RTT works fine without.
 
-- ``monitor rtt down string``
+- ``monitor rtt send string``
 
-	push *string* to the rtt down buffer. It is equivalent to pushing the string to ttyBmpTarg.
+	push *string* to the RTT down buffer. It is equivalent to pushing the string to ttyBmpTarg.
 
 - ``monitor rtt ident``
 

src/command.c

@@ -96,8 +96,8 @@ const command_s cmd_list[] = {
 #endif
 #ifdef ENABLE_RTT
 	{"rtt", cmd_rtt,
-		"[enable|disable|status|channel [0..15 ...]|ident [STR]|down [STR]|cblock|ram [RAM_START RAM_END]|poll [MAXMS MINMS "
-		"MAXERR]]"},
+		"[enable|disable|status|channel [0..15 ...]|ident [STR]|send [STR]|cblock|ram [RAM_START RAM_END]|"
+		"poll [MAXMS MINMS MAXERR]]"},
 #endif
 #ifdef PLATFORM_HAS_TRACESWO
 #if defined TRACESWO_PROTOCOL && TRACESWO_PROTOCOL == 2
@@ -564,19 +564,10 @@ static bool cmd_rtt(target_s *t, int argc, const char **argv)
 			if (rtt_ident[i] == '_')
 				rtt_ident[i] = ' ';
 		}
-	} else if (argc == 3 && strncmp(argv[1], "down", command_len) == 0) {
-		/*
-		 * here we bypass the if statement to save flash
-		 * as it's not critical to check if the rtt block is found
-		 */
-		if(rtt_found || true) {
-			uint16_t len = strlen(argv[2]);
-			rtt_load_recv_buf(argv[2], len);
-		} else {
-			gdb_out("the rtt block is not yet found\n");
-		}
-	}
-	else if (argc == 2 && strncmp(argv[1], "ram", command_len) == 0)
+	} else if (argc == 3 && strncmp(argv[1], "send", command_len) == 0) {
+		size_t len = strlen(argv[2]);
+		rtt_load_recv_buf(argv[2], len);
+	} else if (argc == 2 && strncmp(argv[1], "ram", command_len) == 0)
 		rtt_flag_ram = false;
 	else if (argc == 4 && strncmp(argv[1], "ram", command_len) == 0) {
 		const int cnt1 = sscanf(argv[2], "%" SCNx32, &rtt_ram_start);

src/include/rtt.h

@@ -60,6 +60,6 @@ typedef struct rtt_channel {
 extern rtt_channel_s rtt_channel[MAX_RTT_CHAN];
 
 void poll_rtt(target_s *cur_target);
-void rtt_load_recv_buf(const char *data_buf, uint16_t len);
+void rtt_load_recv_buf(const char *data_buf, size_t len);
 
 #endif /* INCLUDE_RTT_H */

src/platforms/common/stm32/rtt_if.c

@@ -58,20 +58,20 @@ inline static bool recv_set_nak()
 	return recv_bytes_free() < 2U * CDCACM_PACKET_SIZE;
 }
 
-void rtt_load_recv_buf(const char *data_buf, uint16_t len)
+void rtt_load_recv_buf(const char *data_buf, size_t len)
 {
 	/* copy data to recv_buf */
-	for (int i = 0; i < len; i++) {
+	for (size_t i = 0; i < len; i++) {
 		uint32_t next_recv_head = (recv_head + 1U) % sizeof(recv_buf);
 		if (next_recv_head == recv_tail)
 			break; /* overflow */
 		recv_buf[recv_head] = data_buf[i];
 		recv_head = next_recv_head;
 	}
 }
+
 /* debug_serial_receive_callback is called when usb uart has received new data for target.
    this routine has to be fast */
-
 void rtt_serial_receive_callback(usbd_device *dev, uint8_t ep)
 {
 	(void)dev;