Skip to content

Commit 2f8e679

Browse files
author
Cruz Monrreal
authored
Merge pull request #7592 from orenc17/remove_uvisor
Remove uVisor from mbed-os
2 parents 5ffcc01 + 787317b commit 2f8e679

File tree

171 files changed

+24
-7887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+24
-7887
lines changed

cmsis/TARGET_CORTEX_M/core_cmSecureAccess.h

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -41,86 +41,6 @@
4141

4242
/* ########################### Core Secure Access ########################### */
4343

44-
#ifdef FEATURE_UVISOR
45-
#include "uvisor-lib/uvisor-lib.h"
46-
47-
/* Secure uVisor implementation. */
48-
49-
/** Set the value at the target address.
50-
*
51-
* Equivalent to: `*address = value`.
52-
* @param address[in] Target address
53-
* @param value[in] Value to write at the address location.
54-
*/
55-
#define SECURE_WRITE(address, value) \
56-
uvisor_write(public_box, UVISOR_RGW_SHARED, address, value, UVISOR_RGW_OP_WRITE, 0xFFFFFFFFUL)
57-
58-
/** Get the value at the target address.
59-
*
60-
* @param address[in] Target address
61-
* @returns The value `*address`.
62-
*/
63-
#define SECURE_READ(address) \
64-
uvisor_read(public_box, UVISOR_RGW_SHARED, address, UVISOR_RGW_OP_READ, 0xFFFFFFFFUL)
65-
66-
/** Get the selected bits at the target address.
67-
*
68-
* @param address[in] Target address
69-
* @param mask[in] Bits to select out of the target address
70-
* @returns The value `*address & mask`.
71-
*/
72-
#define SECURE_BITS_GET(address, mask) \
73-
UVISOR_BITS_GET(public_box, UVISOR_RGW_SHARED, address, mask)
74-
75-
/** Check the selected bits at the target address.
76-
*
77-
* @param address[in] Address at which to check the bits
78-
* @param mask[in] Bits to select out of the target address
79-
* @returns The value `((*address & mask) == mask)`.
80-
*/
81-
#define SECURE_BITS_CHECK(address, mask) \
82-
UVISOR_BITS_CHECK(public_box, UVISOR_RGW_SHARED, address, mask)
83-
84-
/** Set the selected bits to 1 at the target address.
85-
*
86-
* Equivalent to: `*address |= mask`.
87-
* @param address[in] Target address
88-
* @param mask[in] Bits to select out of the target address
89-
*/
90-
#define SECURE_BITS_SET(address, mask) \
91-
UVISOR_BITS_SET(public_box, UVISOR_RGW_SHARED, address, mask)
92-
93-
/** Clear the selected bits at the target address.
94-
*
95-
* Equivalent to: `*address &= ~mask`.
96-
* @param address[in] Target address
97-
* @param mask[in] Bits to select out of the target address
98-
*/
99-
#define SECURE_BITS_CLEAR(address, mask) \
100-
UVISOR_BITS_CLEAR(public_box, UVISOR_RGW_SHARED, address, mask)
101-
102-
/** Set the selected bits at the target address to the given value.
103-
*
104-
* Equivalent to: `*address = (*address & ~mask) | (value & mask)`.
105-
* @param address[in] Target address
106-
* @param mask[in] Bits to select out of the target address
107-
* @param value[in] Value to write at the address location. Note: The value
108-
* must be already shifted to the correct bit position
109-
*/
110-
#define SECURE_BITS_SET_VALUE(address, mask, value) \
111-
UVISOR_BITS_SET_VALUE(public_box, UVISOR_RGW_SHARED, address, mask, value)
112-
113-
/** Toggle the selected bits at the target address.
114-
*
115-
* Equivalent to: `*address ^= mask`.
116-
* @param address[in] Target address
117-
* @param mask[in] Bits to select out of the target address
118-
*/
119-
#define SECURE_BITS_TOGGLE(address, mask) \
120-
UVISOR_BITS_TOGGLE(public_box, UVISOR_RGW_SHARED, address, mask)
121-
122-
#else
123-
12444
/* Insecure fallback implementation. */
12545

12646
/** Set the value at the target address.
@@ -196,6 +116,4 @@
196116
#define SECURE_BITS_TOGGLE(address, mask) \
197117
*(address) ^= (mask)
198118

199-
#endif
200-
201119
#endif /* __CORE_CM_SECURE_ACCESS_H */

doxyfile_options

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,6 @@ EXCLUDE_PATTERNS = */tools/* \
846846
*/features/storage/* \
847847
*/features/unsupported/* \
848848
*/features/lwipstack/* \
849-
*/features/FEATURE_UVISOR/* \
850849
*/features/nanostack/sal-stack-nanostack/* \
851850
*/features/nanostack/coap-service/* \
852851
*/mbed-trace/* \

doxygen_options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
"EXPAND_AS_DEFINED": "",
1111
"SKIP_FUNCTION_MACROS": "NO",
1212
"STRIP_CODE_COMMENTS": "NO",
13-
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */features/FEATURE_UVISOR/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/*"
13+
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/*"
1414
}

features/FEATURE_UVISOR/AUTHORS.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)