Skip to content

Commit 9b83e3c

Browse files
committed
elbpcom: --space now defaults to 0 (the hm2 register file)
1 parent 8baf326 commit 9b83e3c

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

docs/man/man1/elbpcom.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Common options:
99
.BI [\-\-ip= IP ]
1010
.BI [\-\-port= PORT ]
1111
.BI [\-\-timeout= TIMEOUT ]
12+
.BI [\-\-space= MEMSPACE ]
1213
.RE
1314

1415
Reading data:
1516
.RS
1617
.SY elbpcom
1718
.BI [ common\ options ]
18-
.BI \-\-space= SPACE
1919
.B [\-\-info]
2020
.BI \-\-address= ADDRESS
2121
.BI \-\-read= LENGTH
@@ -25,7 +25,6 @@ Writing data:
2525
.RS
2626
.SY elbpcom
2727
.BI [ common\ options ]
28-
.BI \-\-space= SPACE
2928
.BI \-\-address= ADDRESS
3029
.BI \-\-write= HEXDATA
3130
.RE
@@ -54,13 +53,14 @@ If not specified, the default values are
5453
.BI \-\-ip= 192.168.1.121
5554
.BI \-\-port= 27181
5655
.BI \-\-timeout= .2
56+
.BI \-\-space= 0
5757
.RE
5858

5959
This example demonstrates reading the HOSTMOT2 identifying string from the
6060
IDROM in space 0:
6161
.RS
6262
.nf
63-
$ elbpcom \-\-space 0 \-\-address 0x104 \-\-read 8
63+
$ elbpcom \-\-address 0x104 \-\-read 8
6464
> 82420401
6565
< 484f53544d4f5432
6666
HOSTMOT2

src/hal/utils/elbpcom.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
help="UDP port of board (default: 27181)", type="int", default=27181)
3333
parser.add_option("-t", "--timeout", dest="timeout",
3434
help="Response timeout in seconds (default: 0.2)", type="float", default=.2)
35-
parser.add_option("-s", "--space", dest="space", default=None,
35+
parser.add_option("-s", "--space", dest="space", default=0,
3636
choices = ["0", "1", "2", "3", "4", "5", "6", "7"],
37-
help="Address space to read or write")
37+
help="Address space to read or write (default: 0, the hm2 register file)")
3838
parser.add_option("--info", dest="info", action="store_true",
3939
default=False,
4040
help="Select info area for read operation (default: memory space)")
@@ -109,7 +109,6 @@ def optimal_size(space, info, address, nbytes):
109109
raise ValueError("Access size incompatible with address or length (address=%d nbytes=%d memsizes=%d)" % (address, nbytes, memsizes))
110110

111111
if options.read:
112-
if options.space is None: raise SystemExit("--read must specify --space")
113112
if options.address is None: raise SystemExit("--read must specify --address")
114113
size = optimal_size(options.space, options.info, options.address, options.read if options.increment else 0)
115114
command = make_read_request(options.space, options.info, size, options.increment, options.address, options.read)
@@ -118,7 +117,6 @@ def optimal_size(space, info, address, nbytes):
118117
transact(command)
119118

120119
elif options.write:
121-
if options.space is None: raise SystemExit("--write must specify --space")
122120
if options.address is None: raise SystemExit("--write must specify --address")
123121
write = options.write.decode("hex")
124122
size = optimal_size(options.space, options.info, options.address, len(write) if options.increment else 0)

0 commit comments

Comments
 (0)