Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC TDC 1ns 5cha - Software
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
FMC TDC 1ns 5cha - Software
Commits
198ac041
Commit
198ac041
authored
Apr 09, 2015
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: remove kill buffer
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
79351981
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
11 deletions
+2
-11
ft-core.c
kernel/ft-core.c
+2
-4
ft-zio.c
kernel/ft-zio.c
+0
-7
No files found.
kernel/ft-core.c
View file @
198ac041
...
...
@@ -56,7 +56,7 @@ static void ft_reset_channel(struct fmctdc_dev *ft, int channel)
st
->
cur_seq_id
=
0
;
st
->
expected_edge
=
1
;
ft_zio_kill_buffer
(
ft
,
channel
);
zio_trigger_abort_disable
(
&
ft
->
zdev
->
cset
[
channel
-
FT_CH_1
],
0
);
}
int
ft_enable_termination
(
struct
fmctdc_dev
*
ft
,
int
channel
,
int
enable
)
...
...
@@ -119,10 +119,8 @@ void ft_enable_acquisition(struct fmctdc_dev *ft, int enable)
if
(
!
enable
)
{
/* Disable all running acquisition and reset channels */
for
(
i
=
0
;
i
<
ft
->
zdev
->
n_cset
;
++
i
)
{
for
(
i
=
0
;
i
<
ft
->
zdev
->
n_cset
;
++
i
)
ft_reset_channel
(
ft
,
i
+
FT_CH_1
);
zio_trigger_abort_disable
(
&
ft
->
zdev
->
cset
[
i
],
0
);
}
}
else
{
for
(
i
=
0
;
i
<
ft
->
zdev
->
n_cset
;
++
i
)
zio_arm_trigger
(
ft
->
zdev
->
cset
[
i
].
ti
);
...
...
kernel/ft-zio.c
View file @
198ac041
...
...
@@ -74,13 +74,6 @@ static enum ft_devtype __ft_get_type(struct device *dev)
return
FT_TYPE_INPUT
;
}
void
ft_zio_kill_buffer
(
struct
fmctdc_dev
*
ft
,
int
channel
)
{
if
(
ft
->
zdev
)
return
;
zio_trigger_abort_disable
(
&
ft
->
zdev
->
cset
[
channel
-
FT_CH_1
],
0
);
}
/* TDC input attributes: only the user offset is special */
static
int
ft_zio_info_channel
(
struct
device
*
dev
,
struct
zio_attribute
*
zattr
,
uint32_t
*
usr_val
)
...
...
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