Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ICS Control System Infrastructure
etherlabmaster
Commits
4c8f2fd1
Commit
4c8f2fd1
authored
18 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Renamed slave configuration states "sync" to "mbox_sync" and "sync2" to
"pdo_sync".
parent
6337f7f9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
master/fsm_slave.c
+13
-13
13 additions, 13 deletions
master/fsm_slave.c
with
13 additions
and
13 deletions
master/fsm_slave.c
+
13
−
13
View file @
4c8f2fd1
...
...
@@ -56,17 +56,17 @@ void ec_fsm_slave_scan_state_eeprom_data(ec_fsm_slave_t *);
void
ec_fsm_slave_conf_state_start
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_init
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_clear_fmmus
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_
mbox_
sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_preop
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_sync
2
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_
pdo_
sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_fmmu
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_sdoconf
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_saveop
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_state_op
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_
mbox_
sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_preop
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_sync
2
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_
pdo_
sync
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_fmmu
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_sdoconf
(
ec_fsm_slave_t
*
);
void
ec_fsm_slave_conf_enter_saveop
(
ec_fsm_slave_t
*
);
...
...
@@ -603,7 +603,7 @@ void ec_fsm_slave_conf_state_init(ec_fsm_slave_t *fsm /**< slave state machine *
// TODO: Implement state machine for CRC checking.
if
(
!
slave
->
base_fmmu_count
)
{
// skip FMMU configuration
ec_fsm_slave_conf_enter_sync
(
fsm
);
ec_fsm_slave_conf_enter_
mbox_
sync
(
fsm
);
return
;
}
...
...
@@ -651,7 +651,7 @@ void ec_fsm_slave_conf_state_clear_fmmus(ec_fsm_slave_t *fsm
return
;
}
ec_fsm_slave_conf_enter_sync
(
fsm
);
ec_fsm_slave_conf_enter_
mbox_
sync
(
fsm
);
}
/*****************************************************************************/
...
...
@@ -659,7 +659,7 @@ void ec_fsm_slave_conf_state_clear_fmmus(ec_fsm_slave_t *fsm
/**
*/
void
ec_fsm_slave_conf_enter_sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
void
ec_fsm_slave_conf_enter_
mbox_
sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
{
ec_master_t
*
master
=
fsm
->
slave
->
master
;
ec_slave_t
*
slave
=
fsm
->
slave
;
...
...
@@ -699,7 +699,7 @@ void ec_fsm_slave_conf_enter_sync(ec_fsm_slave_t *fsm /**< slave state machine *
ec_master_queue_datagram
(
fsm
->
slave
->
master
,
datagram
);
fsm
->
retries
=
EC_FSM_RETRIES
;
fsm
->
state
=
ec_fsm_slave_conf_state_sync
;
fsm
->
state
=
ec_fsm_slave_conf_state_
mbox_
sync
;
}
/*****************************************************************************/
...
...
@@ -708,7 +708,7 @@ void ec_fsm_slave_conf_enter_sync(ec_fsm_slave_t *fsm /**< slave state machine *
Slave configuration state: SYNC.
*/
void
ec_fsm_slave_conf_state_sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
void
ec_fsm_slave_conf_state_
mbox_
sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
{
ec_datagram_t
*
datagram
=
fsm
->
datagram
;
ec_slave_t
*
slave
=
fsm
->
slave
;
...
...
@@ -784,7 +784,7 @@ void ec_fsm_slave_conf_state_preop(ec_fsm_slave_t *fsm /**< slave state machine
return
;
}
ec_fsm_slave_conf_enter_sync
2
(
fsm
);
ec_fsm_slave_conf_enter_
pdo_
sync
(
fsm
);
}
/*****************************************************************************/
...
...
@@ -792,7 +792,7 @@ void ec_fsm_slave_conf_state_preop(ec_fsm_slave_t *fsm /**< slave state machine
/**
*/
void
ec_fsm_slave_conf_enter_sync
2
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
void
ec_fsm_slave_conf_enter_
pdo_
sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
{
ec_slave_t
*
slave
=
fsm
->
slave
;
ec_datagram_t
*
datagram
=
fsm
->
datagram
;
...
...
@@ -815,7 +815,7 @@ void ec_fsm_slave_conf_enter_sync2(ec_fsm_slave_t *fsm /**< slave state machine
ec_master_queue_datagram
(
fsm
->
slave
->
master
,
datagram
);
fsm
->
retries
=
EC_FSM_RETRIES
;
fsm
->
state
=
ec_fsm_slave_conf_state_sync
2
;
fsm
->
state
=
ec_fsm_slave_conf_state_
pdo_
sync
;
}
/*****************************************************************************/
...
...
@@ -824,7 +824,7 @@ void ec_fsm_slave_conf_enter_sync2(ec_fsm_slave_t *fsm /**< slave state machine
Slave configuration state: SYNC2.
*/
void
ec_fsm_slave_conf_state_sync
2
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
void
ec_fsm_slave_conf_state_
pdo_
sync
(
ec_fsm_slave_t
*
fsm
/**< slave state machine */
)
{
ec_datagram_t
*
datagram
=
fsm
->
datagram
;
ec_slave_t
*
slave
=
fsm
->
slave
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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