# HG changeset patch # User Mychaela Falconia # Date 1447561570 0 # Node ID 0d7cc054ef7252d9f6711f7076ed6a641bd6ef34 # Parent 3f67d5bf96effc9ef53de144ed063ff527ffdac7 rvinterf/lowlevel: updates for the new knowledge of TM predating ETM diff -r 3f67d5bf96ef -r 0d7cc054ef72 rvinterf/lowlevel/format.c --- a/rvinterf/lowlevel/format.c Sun Nov 15 03:47:19 2015 +0000 +++ b/rvinterf/lowlevel/format.c Sun Nov 15 04:26:10 2015 +0000 @@ -104,14 +104,14 @@ } void -print_etm_output_raw() +print_tm_output_raw() { int i; char *dp; dp = fmtbuf; - strcpy(dp, "ETM:"); - dp += 4; + strcpy(dp, "TM:"); + dp += 3; for (i = 1; i < rxpkt_len; i++) { sprintf(dp, " %02X", rxpkt[i]); dp += 3; diff -r 3f67d5bf96ef -r 0d7cc054ef72 rvinterf/lowlevel/rvifmain.c --- a/rvinterf/lowlevel/rvifmain.c Sun Nov 15 03:47:19 2015 +0000 +++ b/rvinterf/lowlevel/rvifmain.c Sun Nov 15 04:26:10 2015 +0000 @@ -179,7 +179,7 @@ return; case RVT_TM_HEADER: if (!no_output || logF) - print_etm_output_raw(); + print_tm_output_raw(); if (client_head) forward_nonrvt_pkt(); return; diff -r 3f67d5bf96ef -r 0d7cc054ef72 rvinterf/lowlevel/rvtdump.c --- a/rvinterf/lowlevel/rvtdump.c Sun Nov 15 03:47:19 2015 +0000 +++ b/rvinterf/lowlevel/rvtdump.c Sun Nov 15 04:26:10 2015 +0000 @@ -115,7 +115,7 @@ print_g23_trace(); return; case RVT_TM_HEADER: - print_etm_output_raw(); + print_tm_output_raw(); return; case RVT_AT_HEADER: print_ati_output(); diff -r 3f67d5bf96ef -r 0d7cc054ef72 rvinterf/lowlevel/tfc139.c --- a/rvinterf/lowlevel/tfc139.c Sun Nov 15 03:47:19 2015 +0000 +++ b/rvinterf/lowlevel/tfc139.c Sun Nov 15 04:26:10 2015 +0000 @@ -63,7 +63,7 @@ int i, csum, csum_offset; pkt[0] = RVT_TM_HEADER; - pkt[1] = 0x40; /* Compal's non-standard addition */ + pkt[1] = 0x40; /* old TM3 MEM_WRITE command */ pkt[2] = addr; pkt[3] = addr >> 8; pkt[4] = addr >> 16; @@ -149,12 +149,12 @@ } static void -handle_etm_response() +handle_tm_response() { char msgbuf[80]; if (rxpkt_len != 4 || rxpkt[1] != 0x40 || rxpkt[2] || rxpkt[3] != 0x40){ - output_line("ETM response differs from expected"); + output_line("TM response differs from expected"); return; } sprintf(msgbuf, "Sending stack smash write at 0x%x", stack_smash_addr); @@ -185,8 +185,8 @@ print_g23_trace(); return; case RVT_TM_HEADER: - print_etm_output_raw(); - handle_etm_response(); + print_tm_output_raw(); + handle_tm_response(); return; default: unknown: