Skip to content

Commit 4d460d2

Browse files
committed
esp_get_mac: replace deprecated mem2array with read_memory
1 parent 2d92be8 commit 4d460d2

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

tcl/target/esp_common.cfg

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,19 @@ proc esp_get_mac {args} {
251251
}
252252

253253
if { [string equal [target current] esp32c3] } {
254-
mem2array mac 8 $EFUSE_MAC_ADDR_REG 6
254+
set mac_list [read_memory $EFUSE_MAC_ADDR_REG 8 6]
255255
} else {
256256
xtensa set_permissive 1
257-
mem2array mac 8 $EFUSE_MAC_ADDR_REG 6
257+
set mac_list [read_memory $EFUSE_MAC_ADDR_REG 8 6]
258258
xtensa set_permissive 0
259259
}
260260

261+
set i 0
262+
foreach n $mac_list {
263+
set mac($i) $n
264+
incr i
265+
}
266+
261267
if {[info exists format]} {
262268
format %02x:%02x:%02x:%02x:%02x:%02x $mac(5) $mac(4) $mac(3) $mac(2) $mac(1) $mac(0)
263269
} else {

testing/esp/test_cli.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ def get_mac_manually(self):
3030
"""
3131
if testee_info.arch == "xtensa":
3232
self.oocd.cmd_exec("xtensa set_permissive 1")
33-
self.oocd.cmd_exec("mem2array mac 8 $EFUSE_MAC_ADDR_REG 6")
33+
self.oocd.cmd_exec("set mac_list [read_memory $EFUSE_MAC_ADDR_REG 8 6]")
3434
self.oocd.cmd_exec("xtensa set_permissive 0")
3535
else: #riscv32
36-
self.oocd.cmd_exec("mem2array mac 8 $EFUSE_MAC_ADDR_REG 6")
37-
m0 = self.oocd.cmd_exec("format %02x $mac(0)").strip('\n')
38-
m1 = self.oocd.cmd_exec("format %02x $mac(1)").strip('\n')
39-
m2 = self.oocd.cmd_exec("format %02x $mac(2)").strip('\n')
40-
m3 = self.oocd.cmd_exec("format %02x $mac(3)").strip('\n')
41-
m4 = self.oocd.cmd_exec("format %02x $mac(4)").strip('\n')
42-
m5 = self.oocd.cmd_exec("format %02x $mac(5)").strip('\n')
43-
get_logger().debug("Read using mem2array: '%s %s %s %s %s %s'" % (m5, m4, m3, m2, m1, m0))
36+
self.oocd.cmd_exec("set mac_list [read_memory $EFUSE_MAC_ADDR_REG 8 6]")
37+
m0 = self.oocd.cmd_exec("format %02x [lindex $mac_list 0]").strip('\n')
38+
m1 = self.oocd.cmd_exec("format %02x [lindex $mac_list 1]").strip('\n')
39+
m2 = self.oocd.cmd_exec("format %02x [lindex $mac_list 2]").strip('\n')
40+
m3 = self.oocd.cmd_exec("format %02x [lindex $mac_list 3]").strip('\n')
41+
m4 = self.oocd.cmd_exec("format %02x [lindex $mac_list 4]").strip('\n')
42+
m5 = self.oocd.cmd_exec("format %02x [lindex $mac_list 5]").strip('\n')
43+
get_logger().debug("Read using read_memory: '%s %s %s %s %s %s'" % (m5, m4, m3, m2, m1, m0))
4444
return (m5, m4, m3, m2, m1, m0)
4545

4646
def test_mac_cmd(self):

0 commit comments

Comments
 (0)