diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-22 15:56:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 15:56:42 +0100 |
| commit | ebce735dac2f28e8034c6fd1ba7a7537fd63fbfa (patch) | |
| tree | 3e9ef7a900be6fce016a72b7b6cd7de614ada47b /include/lib/smccc.h | |
| parent | b70dcbc17222687859ac1cf58d4d7c5cb5c379fe (diff) | |
| parent | 033648652f2d66abe2454a75ded891a47cb13446 (diff) | |
| download | platform_external_arm-trusted-firmware-ebce735dac2f28e8034c6fd1ba7a7537fd63fbfa.tar.gz platform_external_arm-trusted-firmware-ebce735dac2f28e8034c6fd1ba7a7537fd63fbfa.tar.bz2 platform_external_arm-trusted-firmware-ebce735dac2f28e8034c6fd1ba7a7537fd63fbfa.zip | |
Merge pull request #1406 from robertovargas-arm/uuid
Make TF UUID RFC 4122 compliant
Diffstat (limited to 'include/lib/smccc.h')
| -rw-r--r-- | include/lib/smccc.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/lib/smccc.h b/include/lib/smccc.h index 660c1dbd2..cb722b0e2 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -57,6 +57,7 @@ * does not equal SMC_UNK. This is to ensure that the caller won't mistake the * returned UUID in x0 for an invalid SMC error return */ +#if !ERROR_DEPRECATED #define DEFINE_SVC_UUID(_name, _tl, _tm, _th, _cl, _ch, \ _n0, _n1, _n2, _n3, _n4, _n5) \ CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\ @@ -64,6 +65,24 @@ _tl, _tm, _th, _cl, _ch, \ { _n0, _n1, _n2, _n3, _n4, _n5 } \ } +#endif + + +#define DEFINE_SVC_UUID2(_name, _tl, _tm, _th, _cl, _ch, \ + _n0, _n1, _n2, _n3, _n4, _n5) \ + CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\ + static const uuid_t _name = { \ + {(_tl >> 24) & 0xFF, \ + (_tl >> 16) & 0xFF, \ + (_tl >> 8) & 0xFF, \ + (_tl & 0xFF)}, \ + {(_tm >> 8) & 0xFF, \ + (_tm & 0xFF)}, \ + {(_th >> 8) & 0xFF, \ + (_th & 0xFF)}, \ + _cl, _ch, \ + { _n0, _n1, _n2, _n3, _n4, _n5 } \ + } #endif /*__ASSEMBLY__*/ #endif /* __SMCCC_H__ */ |