Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
d0b46b44
Commit
d0b46b44
authored
Dec 04, 2015
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Profinet async bugfix
parent
b664f1e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
profibus/lib/rt/src/os_linux/rt_io_m_pncontrollersoftingpnak.cpp
...s/lib/rt/src/os_linux/rt_io_m_pncontrollersoftingpnak.cpp
+6
-3
profibus/lib/rt/src/os_linux/rt_pn_iface.cpp
profibus/lib/rt/src/os_linux/rt_pn_iface.cpp
+3
-3
No files found.
profibus/lib/rt/src/os_linux/rt_io_m_pncontrollersoftingpnak.cpp
View file @
d0b46b44
...
...
@@ -247,6 +247,11 @@ static pwr_tStatus IoAgentWrite (
for
(
ii
=
1
;
ii
<
local
->
device_data
.
size
();
ii
++
)
{
if
(
slave_list
!=
NULL
)
{
sp
=
(
pwr_sClass_PnDevice
*
)
slave_list
->
op
;
slave_list
=
slave_list
->
next
;
}
if
(
local
->
device_data
[
ii
]
->
device_state
==
PNAK_DEVICE_STATE_CONNECTED
)
{
for
(
jj
=
0
;
jj
<
local
->
device_data
[
ii
]
->
iocr_data
.
size
();
jj
++
)
{
...
...
@@ -283,8 +288,6 @@ static pwr_tStatus IoAgentWrite (
}
if
(
slave_list
!=
NULL
)
{
sp
=
(
pwr_sClass_PnDevice
*
)
slave_list
->
op
;
slave_list
=
slave_list
->
next
;
/* Check if there is a write request pending ?? */
...
...
@@ -299,7 +302,7 @@ static pwr_tStatus IoAgentWrite (
}
pack_write_req
(
&
local
->
service_req_res
,
local
->
device_data
[
ii
]
->
device_ref
,
&
sp
->
WriteReq
);
sts
=
pnak_send_service_req_res
(
0
,
&
local
->
service_req_res
);
errh_Info
(
"Profinet - Asynch write, dev: %d"
,
local
->
device_data
[
ii
]
->
device_ref
);
break
;
}
}
...
...
profibus/lib/rt/src/os_linux/rt_pn_iface.cpp
View file @
d0b46b44
...
...
@@ -272,9 +272,9 @@ void pack_write_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, unsigned short device
/* Calculate length of service */
service_desc
->
DataLength
=
sizeof
(
T_PN_SERVICE_
GET_DEVICE_STA
TE_REQ
)
+
wr_req
->
Length
;
service_desc
->
DataLength
=
sizeof
(
T_PN_SERVICE_
WRI
TE_REQ
)
+
wr_req
->
Length
;
pWR
=
(
T_PN_SERVICE_WRITE_REQ
*
)
service_desc
+
1
;
pWR
=
(
T_PN_SERVICE_WRITE_REQ
*
)
(
service_desc
+
1
)
;
pWR
->
VersionHighByte
=
1
;
pWR
->
VersionLowByte
=
0
;
...
...
@@ -292,7 +292,7 @@ void pack_write_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, unsigned short device
pWR
->
LengthHighByte
=
_PN_U16_HIGH_BYTE
(
wr_req
->
Length
);
pWR
->
LengthLowByte
=
_PN_U16_LOW_BYTE
(
wr_req
->
Length
);
pData
=
(
unsigned
char
*
)
pWR
+
1
;
pData
=
(
unsigned
char
*
)
(
pWR
+
1
)
;
memcpy
(
pData
,
wr_req
->
Data
,
wr_req
->
Length
);
}
...
...
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