author | Mongo |
Tue, 13 Dec 2011 17:38:12 +0100 | |
changeset 671 | 06b30f679531 |
parent 666 | 9febdd6fdc71 |
permissions | -rw-r--r-- |
0 | 1 |
/* |
208 | 2 |
This file is part of CanFestival, a library implementing CanOpen |
3 |
Stack. |
|
4 |
||
5 |
Copyright (C): Edouard TISSERANT and Francis DUPIN |
|
6 |
||
7 |
See COPYING file for copyrights details. |
|
8 |
||
9 |
This library is free software; you can redistribute it and/or |
|
10 |
modify it under the terms of the GNU Lesser General Public |
|
11 |
License as published by the Free Software Foundation; either |
|
12 |
version 2.1 of the License, or (at your option) any later version. |
|
13 |
||
14 |
This library is distributed in the hope that it will be useful, |
|
15 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
16 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
17 |
Lesser General Public License for more details. |
|
18 |
||
19 |
You should have received a copy of the GNU Lesser General Public |
|
20 |
License along with this library; if not, write to the Free Software |
|
21 |
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
|
22 |
USA |
|
0 | 23 |
*/ |
208 | 24 |
/*! |
25 |
** @file objacces.c |
|
26 |
** @author Edouard TISSERANT and Francis DUPIN |
|
27 |
** @date Tue Jun 5 08:55:23 2007 |
|
28 |
** |
|
29 |
** @brief |
|
30 |
** |
|
31 |
** |
|
32 |
*/ |
|
33 |
||
34 |
||
35 |
||
0 | 36 |
|
71 | 37 |
/* #define DEBUG_WAR_CONSOLE_ON */ |
38 |
/* #define DEBUG_ERR_CONSOLE_ON */ |
|
11 | 39 |
|
1
b3dc740b4b04
Commit some Fix from Francis on sdo.c and abjacces.c. Fix endianisation problems while accessing OD. Also fix SDO abord handling bug.
etisserant
parents:
0
diff
changeset
|
40 |
|
378
d2abf6c8c27b
As requested long ago, added CoData* parameter to all this applications callback, let application designer use identical callback for multiple nodes, and reduce source code length.
etisserant
parents:
215
diff
changeset
|
41 |
#include "data.h" |
0 | 42 |
|
629 | 43 |
//We need the function implementation for linking |
44 |
//Only a placeholder with a define isnt enough! |
|
208 | 45 |
UNS8 accessDictionaryError(UNS16 index, UNS8 subIndex, |
539
187058b4a4b8
Changed OD size from UNS8 to UNS32, and repercuted change to PDO and SDO. Thanks to Jari Kuusisto for patch.
etisserant
parents:
469
diff
changeset
|
46 |
UNS32 sizeDataDict, UNS32 sizeDataGiven, UNS32 code) |
0 | 47 |
{ |
629 | 48 |
#ifdef DEBUG_WAR_CONSOLE_ON |
0 | 49 |
MSG_WAR(0x2B09,"Dictionary index : ", index); |
50 |
MSG_WAR(0X2B10," subindex : ", subIndex); |
|
51 |
switch (code) { |
|
208 | 52 |
case OD_NO_SUCH_OBJECT: |
53 |
MSG_WAR(0x2B11,"Index not found ", index); |
|
54 |
break; |
|
55 |
case OD_NO_SUCH_SUBINDEX : |
|
56 |
MSG_WAR(0x2B12,"SubIndex not found ", subIndex); |
|
57 |
break; |
|
58 |
case OD_WRITE_NOT_ALLOWED : |
|
59 |
MSG_WAR(0x2B13,"Write not allowed, data is read only ", index); |
|
60 |
break; |
|
61 |
case OD_LENGTH_DATA_INVALID : |
|
62 |
MSG_WAR(0x2B14,"Conflict size data. Should be (bytes) : ", sizeDataDict); |
|
63 |
MSG_WAR(0x2B15,"But you have given the size : ", sizeDataGiven); |
|
64 |
break; |
|
65 |
case OD_NOT_MAPPABLE : |
|
66 |
MSG_WAR(0x2B16,"Not mappable data in a PDO at index : ", index); |
|
67 |
break; |
|
68 |
case OD_VALUE_TOO_LOW : |
|
69 |
MSG_WAR(0x2B17,"Value range error : value too low. SDOabort : ", code); |
|
70 |
break; |
|
71 |
case OD_VALUE_TOO_HIGH : |
|
72 |
MSG_WAR(0x2B18,"Value range error : value too high. SDOabort : ", code); |
|
73 |
break; |
|
0 | 74 |
default : |
75 |
MSG_WAR(0x2B20, "Unknown error code : ", code); |
|
76 |
} |
|
629 | 77 |
#endif |
78 |
||
469
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
79 |
return 0; |
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
80 |
} |
208 | 81 |
|
82 |
UNS32 _getODentry( CO_Data* d, |
|
83 |
UNS16 wIndex, |
|
84 |
UNS8 bSubindex, |
|
85 |
void * pDestData, |
|
539
187058b4a4b8
Changed OD size from UNS8 to UNS32, and repercuted change to PDO and SDO. Thanks to Jari Kuusisto for patch.
etisserant
parents:
469
diff
changeset
|
86 |
UNS32 * pExpectedSize, |
208 | 87 |
UNS8 * pDataType, |
88 |
UNS8 checkAccess, |
|
89 |
UNS8 endianize) |
|
215 | 90 |
{ /* DO NOT USE MSG_ERR because the macro may send a PDO -> infinite |
208 | 91 |
loop if it fails. */ |
0 | 92 |
UNS32 errorCode; |
539
187058b4a4b8
Changed OD size from UNS8 to UNS32, and repercuted change to PDO and SDO. Thanks to Jari Kuusisto for patch.
etisserant
parents:
469
diff
changeset
|
93 |
UNS32 szData; |
0 | 94 |
const indextable *ptrTable; |
95 |
ODCallback_t *Callback; |
|
96 |
||
97 |
ptrTable = (*d->scanIndexOD)(wIndex, &errorCode, &Callback); |
|
98 |
||
99 |
if (errorCode != OD_SUCCESSFUL) |
|
100 |
return errorCode; |
|
101 |
if( ptrTable->bSubCount <= bSubindex ) { |
|
71 | 102 |
/* Subindex not found */ |
0 | 103 |
accessDictionaryError(wIndex, bSubindex, 0, 0, OD_NO_SUCH_SUBINDEX); |
104 |
return OD_NO_SUCH_SUBINDEX; |
|
105 |
} |
|
208 | 106 |
|
402
77f875d45250
Fixed faulty read access checking on OD access. Added read acces s checking in SDO (was disabled)
etisserant
parents:
378
diff
changeset
|
107 |
if (checkAccess && (ptrTable->pSubindex[bSubindex].bAccessType & WO)) { |
208 | 108 |
MSG_WAR(0x2B30, "Access Type : ", ptrTable->pSubindex[bSubindex].bAccessType); |
450 | 109 |
accessDictionaryError(wIndex, bSubindex, 0, 0, OD_READ_NOT_ALLOWED); |
0 | 110 |
return OD_READ_NOT_ALLOWED; |
111 |
} |
|
112 |
||
666
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
113 |
if (pDestData == 0) { |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
114 |
return SDOABT_GENERAL_ERROR; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
115 |
} |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
116 |
|
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
117 |
if (ptrTable->pSubindex[bSubindex].size > *pExpectedSize) { |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
118 |
/* Requested variable is too large to fit into a transfer line, inform * |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
119 |
* the caller about the real size of the requested variable. */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
120 |
*pExpectedSize = ptrTable->pSubindex[bSubindex].size; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
121 |
return SDOABT_OUT_OF_MEMORY; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
122 |
} |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
123 |
|
0 | 124 |
*pDataType = ptrTable->pSubindex[bSubindex].bDataType; |
208 | 125 |
szData = ptrTable->pSubindex[bSubindex].size; |
126 |
||
12 | 127 |
# ifdef CANOPEN_BIG_ENDIAN |
666
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
128 |
if(endianize && *pDataType > boolean && !( |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
129 |
*pDataType >= visible_string && |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
130 |
*pDataType <= domain)) { |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
131 |
/* data must be transmited with low byte first */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
132 |
UNS8 i, j = 0; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
133 |
MSG_WAR(boolean, "data type ", *pDataType); |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
134 |
MSG_WAR(visible_string, "data type ", *pDataType); |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
135 |
for ( i = szData ; i > 0 ; i--) { |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
136 |
MSG_WAR(i," ", j); |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
137 |
((UNS8*)pDestData)[j++] = |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
138 |
((UNS8*)ptrTable->pSubindex[bSubindex].pObject)[i-1]; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
139 |
} |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
140 |
*pExpectedSize = szData; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
141 |
} |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
142 |
else /* no endianisation change */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
143 |
# endif |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
144 |
|
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
145 |
if(*pDataType != visible_string) { |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
146 |
memcpy(pDestData, ptrTable->pSubindex[bSubindex].pObject,szData); |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
147 |
*pExpectedSize = szData; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
148 |
}else{ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
149 |
/* TODO : CONFORM TO DS-301 : |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
150 |
* - stop using NULL terminated strings |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
151 |
* - store string size in td_subindex |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
152 |
* */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
153 |
/* Copy null terminated string to user, and return discovered size */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
154 |
UNS8 *ptr = (UNS8*)ptrTable->pSubindex[bSubindex].pObject; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
155 |
UNS8 *ptr_start = ptr; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
156 |
/* *pExpectedSize IS < szData . if null, use szData */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
157 |
UNS8 *ptr_end = ptr + (*pExpectedSize ? *pExpectedSize : szData) ; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
158 |
UNS8 *ptr_dest = (UNS8*)pDestData; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
159 |
while( *ptr && ptr < ptr_end){ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
160 |
*(ptr_dest++) = *(ptr++); |
208 | 161 |
} |
666
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
162 |
|
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
163 |
*pExpectedSize = (UNS32) (ptr - ptr_start); |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
164 |
/* terminate string if not maximum length */ |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
165 |
if (*pExpectedSize < szData) |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
166 |
*(ptr) = 0; |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
167 |
} |
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
168 |
|
9febdd6fdc71
patch from Stefan Kratochwil <entwicklung@inovel.de> : canfestival-3-fm3_698.patch
fbeaulier
parents:
648
diff
changeset
|
169 |
return OD_SUCCESSFUL; |
208 | 170 |
} |
171 |
||
172 |
UNS32 _setODentry( CO_Data* d, |
|
173 |
UNS16 wIndex, |
|
174 |
UNS8 bSubindex, |
|
175 |
void * pSourceData, |
|
539
187058b4a4b8
Changed OD size from UNS8 to UNS32, and repercuted change to PDO and SDO. Thanks to Jari Kuusisto for patch.
etisserant
parents:
469
diff
changeset
|
176 |
UNS32 * pExpectedSize, |
208 | 177 |
UNS8 checkAccess, |
178 |
UNS8 endianize) |
|
0 | 179 |
{ |
539
187058b4a4b8
Changed OD size from UNS8 to UNS32, and repercuted change to PDO and SDO. Thanks to Jari Kuusisto for patch.
etisserant
parents:
469
diff
changeset
|
180 |
UNS32 szData; |
0 | 181 |
UNS8 dataType; |
182 |
UNS32 errorCode; |
|
183 |
const indextable *ptrTable; |
|
184 |
ODCallback_t *Callback; |
|
185 |
||
186 |
ptrTable =(*d->scanIndexOD)(wIndex, &errorCode, &Callback); |
|
187 |
if (errorCode != OD_SUCCESSFUL) |
|
188 |
return errorCode; |
|
189 |
||
190 |
if( ptrTable->bSubCount <= bSubindex ) { |
|
215 | 191 |
/* Subindex not found */ |
0 | 192 |
accessDictionaryError(wIndex, bSubindex, 0, *pExpectedSize, OD_NO_SUCH_SUBINDEX); |
193 |
return OD_NO_SUCH_SUBINDEX; |
|
194 |
} |
|
1
b3dc740b4b04
Commit some Fix from Francis on sdo.c and abjacces.c. Fix endianisation problems while accessing OD. Also fix SDO abord handling bug.
etisserant
parents:
0
diff
changeset
|
195 |
if (checkAccess && (ptrTable->pSubindex[bSubindex].bAccessType == RO)) { |
208 | 196 |
MSG_WAR(0x2B25, "Access Type : ", ptrTable->pSubindex[bSubindex].bAccessType); |
0 | 197 |
accessDictionaryError(wIndex, bSubindex, 0, *pExpectedSize, OD_WRITE_NOT_ALLOWED); |
198 |
return OD_WRITE_NOT_ALLOWED; |
|
199 |
} |
|
200 |
||
201 |
||
208 | 202 |
dataType = ptrTable->pSubindex[bSubindex].bDataType; |
203 |
szData = ptrTable->pSubindex[bSubindex].size; |
|
0 | 204 |
|
205 |
if( *pExpectedSize == 0 || |
|
208 | 206 |
*pExpectedSize == szData || |
421
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
207 |
/* allow to store a shorter string than entry size */ |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
208 |
(dataType == visible_string && *pExpectedSize < szData)) |
208 | 209 |
{ |
210 |
#ifdef CANOPEN_BIG_ENDIAN |
|
421
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
211 |
/* re-endianize do not occur for bool, strings time and domains */ |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
212 |
if(endianize && dataType > boolean && !( |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
213 |
dataType >= visible_string && |
431 | 214 |
dataType <= domain)) |
208 | 215 |
{ |
215 | 216 |
/* we invert the data source directly. This let us do range |
208 | 217 |
testing without */ |
215 | 218 |
/* additional temp variable */ |
208 | 219 |
UNS8 i; |
220 |
for ( i = 0 ; i < ( ptrTable->pSubindex[bSubindex].size >> 1) ; i++) |
|
221 |
{ |
|
222 |
UNS8 tmp =((UNS8 *)pSourceData) [(ptrTable->pSubindex[bSubindex].size - 1) - i]; |
|
223 |
((UNS8 *)pSourceData) [(ptrTable->pSubindex[bSubindex].size - 1) - i] = ((UNS8 *)pSourceData)[i]; |
|
224 |
((UNS8 *)pSourceData)[i] = tmp; |
|
225 |
} |
|
226 |
} |
|
227 |
#endif |
|
0 | 228 |
errorCode = (*d->valueRangeTest)(dataType, pSourceData); |
229 |
if (errorCode) { |
|
208 | 230 |
accessDictionaryError(wIndex, bSubindex, szData, *pExpectedSize, errorCode); |
231 |
return errorCode; |
|
0 | 232 |
} |
2
8d4a822f95e4
Fixed Endianisation/ValueRange order in SetODentry
etisserant
parents:
1
diff
changeset
|
233 |
memcpy(ptrTable->pSubindex[bSubindex].pObject,pSourceData, *pExpectedSize); |
421
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
234 |
/* TODO : CONFORM TO DS-301 : |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
235 |
* - stop using NULL terminated strings |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
236 |
* - store string size in td_subindex |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
237 |
* */ |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
238 |
/* terminate visible_string with '\0' */ |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
239 |
if(dataType == visible_string && *pExpectedSize < szData) |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
240 |
((UNS8*)ptrTable->pSubindex[bSubindex].pObject)[*pExpectedSize] = 0; |
6221b4db8c42
Added support for null terminated strings as VISIBLE_STRING.
etisserant
parents:
419
diff
changeset
|
241 |
|
0 | 242 |
*pExpectedSize = szData; |
208 | 243 |
|
215 | 244 |
/* Callbacks */ |
0 | 245 |
if(Callback && Callback[bSubindex]){ |
437
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
246 |
errorCode = (Callback[bSubindex])(d, ptrTable, bSubindex); |
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
247 |
if(errorCode != OD_SUCCESSFUL) |
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
248 |
{ |
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
249 |
return errorCode; |
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
250 |
} |
129bbe0504e4
Now OD callback return val ahev influance on SDO transmission (if callback fall, SDO abord may be signaled)
etisserant
parents:
431
diff
changeset
|
251 |
} |
208 | 252 |
|
215 | 253 |
/* TODO : Store dans NVRAM */ |
161
c4908cc776a9
SetODEntry now call CO_data->storeODSubEntry(Index,SubIndex) for variables to be Stored (when column Save==True in GUI)
etisserant
parents:
75
diff
changeset
|
254 |
if (ptrTable->pSubindex[bSubindex].bAccessType & TO_BE_SAVE){ |
378
d2abf6c8c27b
As requested long ago, added CoData* parameter to all this applications callback, let application designer use identical callback for multiple nodes, and reduce source code length.
etisserant
parents:
215
diff
changeset
|
255 |
(*d->storeODSubIndex)(d, wIndex, bSubindex); |
161
c4908cc776a9
SetODEntry now call CO_data->storeODSubEntry(Index,SubIndex) for variables to be Stored (when column Save==True in GUI)
etisserant
parents:
75
diff
changeset
|
256 |
} |
0 | 257 |
return OD_SUCCESSFUL; |
208 | 258 |
}else{ |
0 | 259 |
*pExpectedSize = szData; |
260 |
accessDictionaryError(wIndex, bSubindex, szData, *pExpectedSize, OD_LENGTH_DATA_INVALID); |
|
261 |
return OD_LENGTH_DATA_INVALID; |
|
208 | 262 |
} |
263 |
} |
|
264 |
||
0 | 265 |
const indextable * scanIndexOD (CO_Data* d, UNS16 wIndex, UNS32 *errorCode, ODCallback_t **Callback) |
266 |
{ |
|
267 |
return (*d->scanIndexOD)(wIndex, errorCode, Callback); |
|
268 |
} |
|
269 |
||
270 |
UNS32 RegisterSetODentryCallBack(CO_Data* d, UNS16 wIndex, UNS8 bSubindex, ODCallback_t Callback) |
|
271 |
{ |
|
469
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
272 |
UNS32 errorCode; |
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
273 |
ODCallback_t *CallbackList; |
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
274 |
const indextable *odentry; |
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
275 |
|
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
276 |
odentry = scanIndexOD (d, wIndex, &errorCode, &CallbackList); |
f2b07ea215b5
Applied edward's patch for OD acces macros (optimization) and boudaries check (safety).
etisserant
parents:
450
diff
changeset
|
277 |
if(errorCode == OD_SUCCESSFUL && CallbackList && bSubindex < odentry->bSubCount) |
208 | 278 |
CallbackList[bSubindex] = Callback; |
279 |
return errorCode; |
|
280 |
} |
|
281 |
||
378
d2abf6c8c27b
As requested long ago, added CoData* parameter to all this applications callback, let application designer use identical callback for multiple nodes, and reduce source code length.
etisserant
parents:
215
diff
changeset
|
282 |
void _storeODSubIndex (CO_Data* d, UNS16 wIndex, UNS8 bSubindex){} |