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
3a1a09a2
Commit
3a1a09a2
authored
18 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Removed ugly ec_slave_has_subbus() function.
parent
e5081136
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
TODO
+1
-1
1 addition, 1 deletion
TODO
master/slave.c
+0
-12
0 additions, 12 deletions
master/slave.c
master/slave.h
+0
-1
0 additions, 1 deletion
master/slave.h
with
1 addition
and
14 deletions
TODO
+
1
−
1
View file @
3a1a09a2
...
...
@@ -10,7 +10,7 @@ $Id$
- Remove ecrt_master_run(). Make master FSM run in process context instead.
- Remove addressing scheme "X:Y".
- Allow only MAC address as device ID.
- Remove ugly ec_slave_is_coupler()
and ec_slave_has_subbus()
.
- Remove ugly ec_slave_is_coupler().
* Future features:
- SDO dictionary and -access in operation mode.
...
...
This diff is collapsed.
Click to expand it.
master/slave.c
+
0
−
12
View file @
3a1a09a2
...
...
@@ -1193,18 +1193,6 @@ int ec_slave_is_coupler(const ec_slave_t *slave /**< EtherCAT slave */)
/*****************************************************************************/
/**
\return non-zero if slave is a bus coupler
*/
int
ec_slave_has_subbus
(
const
ec_slave_t
*
slave
/**< EtherCAT slave */
)
{
return
slave
->
sii_vendor_id
==
0x00000002
&&
slave
->
sii_product_code
==
0x04602c22
;
}
/*****************************************************************************/
/**
\return 0 in case of success, else < 0
*/
...
...
This diff is collapsed.
Click to expand it.
master/slave.h
+
0
−
1
View file @
3a1a09a2
...
...
@@ -291,7 +291,6 @@ void ec_slave_fmmu_config(const ec_slave_t *, const ec_fmmu_t *, uint8_t *);
uint16_t
ec_slave_calc_sync_size
(
const
ec_slave_t
*
,
const
ec_sii_sync_t
*
);
int
ec_slave_is_coupler
(
const
ec_slave_t
*
);
int
ec_slave_has_subbus
(
const
ec_slave_t
*
);
int
ec_slave_validate
(
const
ec_slave_t
*
,
uint32_t
,
uint32_t
);
...
...
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