Skip to content

Commit bbbea50

Browse files
aacuevasjonnew
andauthored
Update some datasheets with new fw0.7 options (#33)
* Update some datasheets with new fw0.7 options * Fix application time in a heartbeat and memusage datasheets --------- Co-authored-by: Jonathan Newman <jpn@open-ephys.org>
1 parent 56027f6 commit bbbea50

File tree

4 files changed

+78
-47
lines changed

4 files changed

+78
-47
lines changed

source/Hardware Guide/Datasheets/ds90ub9x-raw.rst

+63-37
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DS90UB9X Raw Device
44
###########################################
55
:Authors: Aarón Cuevas López
6-
:Version: 1
6+
:Version: 3
77
:IO: Frame Source, Register Access
88
:ONIX ID: 24
99
:ONIX Hubs: :ref:`pcie_host`
@@ -54,9 +54,12 @@ Managed register access is provided at offset 0x8000.
5454
- On Reset
5555
- 1280
5656
- None
57-
- Frame size register
58-
* Bits(15:0): In parallel mode: frame data size in samples. In serial mode: Number of words per frame in each line (total frame size= this x num streams x num lines per stream).
59-
* Bit(31:15); number of frames to aggregate. 0 = do not perform aggregation
57+
- Amount of data to read into a frame
58+
59+
* Bits 0-15: In parallel mode: frame data size in samples.
60+
In serial mode: Number of words per frame in each line.
61+
* Bits 16-31: Number of frames to aggregate. 0 = do not perform aggregation
62+
6063

6164
* - 0x8002
6265
- TRIGGER
@@ -118,72 +121,79 @@ Managed register access is provided at offset 0x8000.
118121
* Bit 0: not included
119122
* Bit 1: '0' = HSYNC, '1' = VSYNC
120123
* Bit 2: '0' = Rising edge, '1' = Falling edge
121-
* Bit 3: If '1', when aggregate, use mark settings to select the first frame
124+
* Bit 3: When using aggregation, use mark settings to select the first frame
122125

123126
* - 0x8007
124127
- MAGIC_MASK
125-
- R/W
126-
- On Reset
128+
- R/W
129+
- On Reset
127130
- 0
128131
- None
129-
- Controls Magic word detection and its masking
130-
131-
* Bits 15-0: Bitmask for magic word detection. If all 0, magic word detection is disabled.
132-
* Bit 31: also check inverse mask.
133-
* Bit 30: When aggregate, wait for the first non-inverted magic word
134-
132+
- Bitmask for magic word detection and related options.
133+
134+
* Bits 0-15: Bitmask. If all 0, magic word detection is disabled.
135+
* Bit 31: Also check for bit-inverse mask.
136+
* Bit 30: When aggregation is enabled, wait for the first non-inverted magic word
137+
135138
* - 0x8008
136139
- MAGIC
137-
- R/W
138-
- On Reset
140+
- R/W
141+
- On Reset
139142
- 0
140143
- None
141-
- 16 bit magic word. After trigger, if magic_mask is not 0, wait for this word in the stream before starting a frame
144+
- After trigger, if magic_mask is not 0, wait until a specific word in the stream to start a frame. (Bits 0-15)
142145

143146
* - 0x8009
144147
- MAGIC_WAIT
145-
- R/W
148+
- R/W
146149
- On Reset
147150
- 0
148151
- None
149-
- Max number of samples to wait from trigger to magic word detection before canceling and going back to trigger detection. 0 means wait indefinitely
150-
152+
- Max number of samples to wait from trigger to mask detection before canceling and going back to trigger detection. 0 means wait indefinitely
153+
151154
* - 0x800A
152155
- DATAMODE
153-
- R/W
154-
- On Reset
156+
- R/W
157+
- On Reset
155158
- 0
156159
- None
157-
- Parallel/Serial data mode selection and options
158-
160+
- Data operation mode
161+
159162
* Bit 0: '0' = Normal parallel mode. '1' = Serial mode
160-
* Bit 1: '1' = Include "index" field in normal mode, '0'= Do not include it in normal mode
161-
* Bit 2: Number of serial streams '0' = 1 stream, '1' = 2 streams
162-
* Bit 3: reserved
163-
* Bits 7-4: Number of bits per word - 1 (i.e.: '0x0' = 1bit, '0xF' = 16bits)
164-
* Bits 9-8 number of lines per stream '00' = 1, '01' = 2. '10' = 4, '11' = 8
165-
* Bit 10: data order in serial mode '0' = MSB first, '1' = LSB first
166-
163+
* Bit 1: '1' = Include "index" field in parallel mode, '0'= Do not include it in parallel mode.
164+
* Bit 2: Number of serial streams '0' = 1 stream, '1' = 2 streams.
165+
* Bit 3: reserved.
166+
* Bits 7-4: Number of bits per word - 1 (i.e.: '0x0' = 1bit, '0xF' = 16bits).
167+
* Bits 9-8 number of lines per stream '00' = 1, '01' = 2. '10' = 4, '11' = 8.
168+
* Bit 10: data order in serial mode '0' = MSB first, '1' = LSB first
169+
167170
* - 0x800B
168171
- DATALINES0
169172
- R/W
170-
- On Reset
173+
- On Reset
171174
- 0
172175
- None
173-
- Input lines for stream 0. Each 4 bits specify the input: 0x0-0xB: Data lines 0-11. 0xC: Hsync, 0xD: Vsync, 0xE: Reserved 0xF: zero-input
176+
- Input lines for serial stream 0. Each 4 bits specify the input:
177+
178+
* 0x0-0xB: Data lines 0-11
179+
* 0xC: Hsync
180+
* 0xD: Vsync
181+
* 0xE: Reserved
182+
* 0xF: zero-input
174183

175184
* - 0x800C
176185
- DATALINES1
177186
- R/W
178-
- On Reset
187+
- On Reset
179188
- 0
180189
- None
181-
- Input lines for stream 1. Each 4 bits specify the input: 0x0-0xB: Data lines 0-11. 0xC: Hsync, 0xD: Vsync, 0xE: Reserved 0xF: zero-input
190+
- Input lines for serial stream 1. Each 4 bits specify the input:
191+
0x0-0xB: Data lines 0-11. 0xC: Hsync, 0xD: Vsync, 0xE: Reserved 0xF: zero-input
182192

183193
* - 0x8010
184194
- GPIO_DIR
185195
- R/W
186-
- On Reset
196+
- Immediate
187197
- 0
188198
- None
189199
- Bits 0-3 determine the direction of GPIO 0-3. For each bit:
@@ -194,7 +204,7 @@ Managed register access is provided at offset 0x8000.
194204
* - 0x8011
195205
- GPIO_VAL
196206
- R/W
197-
- On Reset
207+
- Immediate
198208
- 0
199209
- None
200210
- Bits 0-3 determine the value of GPIO 0-3. For each bit:
@@ -203,7 +213,7 @@ Managed register access is provided at offset 0x8000.
203213
* 0b1: High
204214

205215
* - 0x8012
206-
- GPIO_VAL
216+
- LINK_STATUS
207217
- R
208218
- On DS90UBX LOCK or PASS pin state change
209219
- N/A
@@ -213,6 +223,22 @@ Managed register access is provided at offset 0x8000.
213223

214224
* Bit 0: DS90UBX LOCK pin state
215225
* Bit 1: DS90UBX PASS pin state
226+
227+
* - 0x8013
228+
- DS90UBX_I2C_LAST_L
229+
- R
230+
- On I2C access
231+
- N/A
232+
- None
233+
- Acquisition clock counter value of last i2c raw access (low 32 bits)
234+
235+
* - 0x8014
236+
- DS90UBX_I2C_LAST_H
237+
- R
238+
- On I2C access
239+
- N/A
240+
- None
241+
- Acquisition clock counter value of last i2c raw access (high 32 bits)
216242

217243

218244
Unmanaged Registers

source/Hardware Guide/Datasheets/fmc-link-control.rst

+13-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FMC Link Controller
44
###########################################
55
:Authors: Jonathan P. Newman
6-
:Version: 1
6+
:Version: 2
77
:IO: Frame Source, Register Access
88
:ONIX ID: 23
99
:ONIX Hubs: :ref:`pcie_host`
@@ -106,19 +106,24 @@ Register Programming
106106

107107
* - 0x05
108108
- LINKSTATE
109-
- Register
110-
- Immediate
109+
- R
110+
- When LOCK or PASS change
111111
- 0
112-
- None
113-
- Link state (bits 31 downto 2: ignore, bit 1: pass, bit 0: lock)
112+
- None
113+
- Link state
114+
115+
* Bit 0: LOCK
116+
* Bit 1: PASS
114117

115118
* - 0x06
116119
- LINKOPTS
117-
- R/W
118-
- Immediate
120+
- R/W
121+
- Inmmediate
119122
- 0
120123
- None
121-
- Port options. Bit 0: '0' Port auto-shutdown disabled '1' Port auto-shutdown enabled
124+
- Misc. options for the link device
125+
126+
* Bit 0: `0` Port auto-shutdown disabled `1` Port auto-shutdown enabled
122127

123128
.. _onidatasheet_fmc_link_control_d2h:
124129

source/Hardware Guide/Datasheets/heartbeat.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Register Programming
4545
* - 0x01
4646
- CLK_DIV
4747
- R/W
48-
- On Reset
48+
- Immediate
4949
- CLK_HZ / HB_HZ where HB_HZ is a implementation dependent default rate
5050
- None
5151
- Heartbeat clock divider ratio. Minimum value is CLK_HZ / 10e6

source/Hardware Guide/Datasheets/memory-usage.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Register Programming
4545
* - 0x01
4646
- CLK_DIV
4747
- R/W
48-
- On Reset
48+
- Immediate
4949
- CLK_HZ / HB_HZ where HB_HZ is a implementation dependent default rate
5050
- None
5151
- Read frequency clock divider ratio. Minimum value is CLK_HZ / 10e6

0 commit comments

Comments
 (0)