Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
adc-lib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
adc-lib
Commits
ba3fdb3a
Commit
ba3fdb3a
authored
Oct 17, 2018
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/library'
parents
5e7ab5ee
f36a5ebf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
buffer-zio.c
lib/buffer-zio.c
+1
-1
fmc-adc-100m14b4cha.c
lib/fmc-adc-100m14b4cha.c
+5
-0
No files found.
lib/buffer-zio.c
View file @
ba3fdb3a
...
...
@@ -179,7 +179,7 @@ int adc_zio_fill_buffer(struct adc_dev *dev,
if
(
!
to
)
to_ms
=
-
1
;
else
to_ms
=
to
->
tv_sec
/
1000
+
(
to
->
tv_usec
+
500
)
/
1000
;
to_ms
=
to
->
tv_sec
*
1000
+
(
to
->
tv_usec
+
500
)
/
1000
;
ret
=
poll
(
&
p
,
1
,
to_ms
);
switch
(
ret
)
{
case
0
:
...
...
lib/fmc-adc-100m14b4cha.c
View file @
ba3fdb3a
...
...
@@ -734,6 +734,10 @@ static int adc_100m14b4cha_trigger_fire(struct adc_dev *dev)
(1LL << ADC_CONF_BRD_N_TRG_EXT) | \
(1LL << ADC_CONF_BRD_N_TRG_THR) | \
(1LL << ADC_CONF_BRD_N_TRG_TIM)
#define ADC_100M_4CH_14BIT_CUS_MASK (1ULL << ADC_CONF_100M14B4CHA_BUF_TYPE) | \
(1ULL << ADC_CONF_100M14B4CHA_TRG_SW_EN) | \
(1ULL << ADC_CONF_100M14B4CHA_ACQ_MSHOT_MAX) | \
(1ULL << ADC_CONF_100M14B4CHA_BUF_SIZE_KB)
#define ADC_100M_4CH_14BIT_TRG_EXT_MASK (1LL << ADC_CONF_TRG_EXT_ENABLE) | \
(1LL << ADC_CONF_TRG_EXT_POLARITY) | \
(1LL << ADC_CONF_TRG_EXT_DELAY)
...
...
@@ -773,6 +777,7 @@ struct adc_board_type fmcadc_100ms_4ch_14bit = {
[
ADC_CONF_TYPE_BRD
]
=
ADC_100M_4CH_14BIT_BRD_MASK
,
[
ADC_CONF_TYPE_CHN
]
=
ADC_100M_4CH_14BIT_CHN_MASK
,
[
ADC_CONF_TYPE_ACQ
]
=
ADC_100M_4CH_14BIT_ACQ_MASK
,
[
ADC_CONF_TYPE_CUS
]
=
ADC_100M_4CH_14BIT_CUS_MASK
,
[
ADC_CONF_TYPE_TRG_EXT
]
=
ADC_100M_4CH_14BIT_TRG_EXT_MASK
,
[
ADC_CONF_TYPE_TRG_THR
]
=
ADC_100M_4CH_14BIT_TRG_THR_MASK
,
[
ADC_CONF_TYPE_TRG_TIM
]
=
ADC_100M_4CH_14BIT_TRG_TIM_MASK
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment