Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Beam Positoning Monitor - Software
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
Beam Positoning Monitor - Software
Commits
43417e99
Commit
43417e99
authored
8 years ago
by
Lucas Russo
Browse files
Options
Downloads
Patches
Plain Diff
fmc250m_4ch: fix wrong SMIO base address
parent
9a28b0dd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
+3
-2
3 additions, 2 deletions
src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
with
3 additions
and
2 deletions
src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
+
3
−
2
View file @
43417e99
...
@@ -44,6 +44,7 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
...
@@ -44,6 +44,7 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
smio_fmc250m_4ch_t
*
self
=
(
smio_fmc250m_4ch_t
*
)
zmalloc
(
sizeof
*
self
);
smio_fmc250m_4ch_t
*
self
=
(
smio_fmc250m_4ch_t
*
)
zmalloc
(
sizeof
*
self
);
ASSERT_ALLOC
(
self
,
err_self_alloc
);
ASSERT_ALLOC
(
self
,
err_self_alloc
);
uint32_t
inst_id
=
smio_get_inst_id
(
parent
);
uint32_t
inst_id
=
smio_get_inst_id
(
parent
);
uint64_t
base
=
smio_get_base
(
parent
);
/* Check if Instance ID is within our expected limits */
/* Check if Instance ID is within our expected limits */
ASSERT_TEST
(
inst_id
<
NUM_FMC250M_4CH_SMIOS
,
"Number of FMC250M_4CH SMIOs instances exceeded"
,
ASSERT_TEST
(
inst_id
<
NUM_FMC250M_4CH_SMIOS
,
"Number of FMC250M_4CH SMIOs instances exceeded"
,
...
@@ -139,13 +140,13 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
...
@@ -139,13 +140,13 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
_smio_fmc250m_4ch_set_type
(
self
,
0x0
);
_smio_fmc250m_4ch_set_type
(
self
,
0x0
);
DBE_DEBUG
(
DBG_SM_IO
|
DBG_LVL_TRACE
,
"[sm_io:fmc250m_4ch_core] Registering FMC_ADC_COMMON SMIO
\n
"
);
DBE_DEBUG
(
DBG_SM_IO
|
DBG_LVL_TRACE
,
"[sm_io:fmc250m_4ch_core] Registering FMC_ADC_COMMON SMIO
\n
"
);
smio_register_sm
(
parent
,
0x2403f569
,
FMC_250M_FMC_ADC_COMMON_OFFS
,
inst_id
);
smio_register_sm
(
parent
,
0x2403f569
,
base
|
FMC_250M_FMC_ADC_COMMON_OFFS
,
inst_id
);
/* Now, initialize the FMC250M_4CH with the appropriate structures*/
/* Now, initialize the FMC250M_4CH with the appropriate structures*/
if
(
self
->
type
==
TYPE_FMC250M_4CH_ACTIVE
)
{
if
(
self
->
type
==
TYPE_FMC250M_4CH_ACTIVE
)
{
DBE_DEBUG
(
DBG_SM_IO
|
DBG_LVL_TRACE
,
"[sm_io:fmc250m_4ch_core] Active Board detected. "
DBE_DEBUG
(
DBG_SM_IO
|
DBG_LVL_TRACE
,
"[sm_io:fmc250m_4ch_core] Active Board detected. "
"Registering FMC_ADC_ACTIVE SMIO
\n
"
);
"Registering FMC_ADC_ACTIVE SMIO
\n
"
);
smio_register_sm
(
parent
,
0x88c67d9c
,
FMC_250M_FMC_ACTIVE_CLK_OFFS
,
inst_id
);
smio_register_sm
(
parent
,
0x88c67d9c
,
base
|
FMC_250M_FMC_ACTIVE_CLK_OFFS
,
inst_id
);
}
}
else
{
/* PASSIVE or Unsupported*/
else
{
/* PASSIVE or Unsupported*/
if
(
self
->
type
!=
TYPE_FMC250M_4CH_PASSIVE
)
{
if
(
self
->
type
!=
TYPE_FMC250M_4CH_PASSIVE
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment