Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-21 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separated master requesting into open and reserve for userspace library.

Browse Source 
(thanks to Martin Troxler).
This commit is contained in:
Florian Pose
2009-07-10 10:07:48 +00:00
parent e4a8e667f4
commit fbb6b62eaf
4 changed files with 127 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common.c
+17 -9
View File
@@ -50,9 +50,25 @@ unsigned int ecrt_version_magic(void)
/*****************************************************************************/
ec_master_t *ecrt_request_master(unsigned int master_index)
{
ec_master_t *master = ecrt_open_master(master_index);
if (master) {
if (ecrt_master_reserve(master) < 0) {
close(master->fd);
free(master);
master = 0;
}
}
return master;
}
/*****************************************************************************/
#define MAX_PATH_LEN 64
ec_master_t *ecrt_request_master(unsigned int master_index)
ec_master_t *ecrt_open_master(unsigned int master_index)
{
char path[MAX_PATH_LEN];
ec_master_t *master;
@@ -75,14 +91,6 @@ ec_master_t *ecrt_request_master(unsigned int master_index)
return 0;
}
if (ioctl(master->fd, EC_IOCTL_REQUEST, NULL) == -1) {
fprintf(stderr, "Failed to request master %u: %s\n",
master_index, strerror(errno));
close(master->fd);
free(master);
return 0;
}
return master;
}