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
b4a073d2
Commit
b4a073d2
authored
Sep 10, 2012
by
Samuel Iglesias Gonsálvez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tdc: change return value to tdc_activate_acquisition
Signed-off-by:
Samuel Iglesias Gonsálvez
<
siglesias@igalia.com
>
parent
e2a0960f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
tdc-core.c
drivers/tdc-core.c
+6
-6
tdc-zio.c
drivers/tdc-zio.c
+1
-1
tdc.h
drivers/tdc.h
+1
-1
No files found.
drivers/tdc-core.c
View file @
b4a073d2
...
...
@@ -75,22 +75,22 @@ void tdc_clear_da_capo_flag(struct spec_tdc *tdc)
writel
(
TDC_CTRL_CLEAR_DACAPO_FLAG
,
tdc
->
base
+
TDC_CTRL_REG
);
}
void
tdc_activate_acquisition
(
struct
spec_tdc
*
tdc
)
int
tdc_activate_acquisition
(
struct
spec_tdc
*
tdc
)
{
u32
acam_status_test
;
/* Before activate the adquisition is required to reset the ACAM chip */
tdc_acam_reset
(
tdc
);
acam_status_test
=
tdc_acam_status
(
tdc
)
-
0xC4000800
;
if
(
acam_status_test
==
0
)
pr_err
(
"ACAM status OK! 0x%x
\n
"
,
acam_status_test
);
else
pr_err
(
"ACAM status Not OK! 0x%x
\n
"
,
acam_status_test
+
0xC4000800
);
if
(
acam_status_test
!=
0
)
{
pr_err
(
"ACAM status not ready! 0x%x
\n
"
,
acam_status_test
);
return
-
EBUSY
;
}
/* Enable IRQ */
writel
(
0xC
,
tdc
->
base
+
TDC_IRQ_REG
+
0x8
);
writel
(
TDC_CTRL_EN_ACQ
,
tdc
->
base
+
TDC_CTRL_REG
);
return
0
;
}
void
tdc_deactivate_acquisition
(
struct
spec_tdc
*
tdc
)
...
...
drivers/tdc-zio.c
View file @
b4a073d2
...
...
@@ -139,7 +139,7 @@ static int tdc_zio_conf_set(struct device *dev,
case
TDC_ATTR_DEV_ACTIVATE_ACQUISITION
:
if
(
usr_val
)
{
atomic_set
(
&
tdc
->
busy
,
1
);
tdc_activate_acquisition
(
tdc
);
return
tdc_activate_acquisition
(
tdc
);
}
else
{
atomic_set
(
&
tdc
->
busy
,
0
);
tdc_deactivate_acquisition
(
tdc
);
...
...
drivers/tdc.h
View file @
b4a073d2
...
...
@@ -106,7 +106,7 @@ extern u32 tdc_get_circular_buffer_wr_pointer(struct spec_tdc *tdc);
extern
u32
tdc_get_dac_word
(
struct
spec_tdc
*
tdc
);
extern
void
tdc_clear_da_capo_flag
(
struct
spec_tdc
*
tdc
);
extern
void
tdc_activate_acquisition
(
struct
spec_tdc
*
tdc
);
extern
int
tdc_activate_acquisition
(
struct
spec_tdc
*
tdc
);
extern
void
tdc_deactivate_acquisition
(
struct
spec_tdc
*
tdc
);
#endif
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