summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e03e4ab)
raw | patch | inline | side by side (parent: e03e4ab)
author | Sam Nelson <sam.nelson@ti.com> | |
Mon, 7 Oct 2019 19:27:53 +0000 (15:27 -0400) | ||
committer | Sam Nelson <sam.nelson@ti.com> | |
Tue, 8 Oct 2019 19:51:04 +0000 (15:51 -0400) |
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
packages/ti/sdo/ipc/SharedRegion.c | patch | blob | history |
index 63dab584e938474d4dd73bf1c07c4f95542b2502..33160ef7b8b33cb6126dc558b61f082bb5ca3071 100644 (file)
if (((uintptr_t)addr >= (uintptr_t)region->entry.base) &&
((uintptr_t)addr < ((uintptr_t)region->entry.base + (SizeT)region->entry.len))) {
retPtr = (SharedRegion_SRPtr)((id << ti_sdo_ipc_SharedRegion_numOffsetBits)
if (((uintptr_t)addr >= (uintptr_t)region->entry.base) &&
((uintptr_t)addr < ((uintptr_t)region->entry.base + (SizeT)region->entry.len))) {
retPtr = (SharedRegion_SRPtr)((id << ti_sdo_ipc_SharedRegion_numOffsetBits)
- | ((UInt32)addr - (UInt32)region->entry.base));
+ | ((UArg)addr - (UArg)region->entry.base));
}
else {
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_addrOutOfRange);
}
else {
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_addrOutOfRange);
else {
if ((entry->createHeap) && (region->heap == NULL)) {
/* sharedAddr should match creator's for each region */
else {
if ((entry->createHeap) && (region->heap == NULL)) {
/* sharedAddr should match creator's for each region */
- sharedAddr = (Ptr)((UInt32)entry->base +
+ sharedAddr = (Ptr)((UArg)entry->base +
region->reservedSize);
/* set the pointer to a heap handle */
region->reservedSize);
/* set the pointer to a heap handle */
region = &(SharedRegion_module->regions[i]);
if (region->entry.isValid) {
if (base >= region->entry.base) {
region = &(SharedRegion_module->regions[i]);
if (region->entry.isValid) {
if (base >= region->entry.base) {
- if (base < (Ptr)((UInt32)region->entry.base +
+ if (base < (Ptr)((UArg)region->entry.base +
(SizeT)region->entry.len)) {
Hwi_restore(key);
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_overlap);
(SizeT)region->entry.len)) {
Hwi_restore(key);
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_overlap);
}
}
else {
}
}
else {
- if ((Ptr)((UInt32)base + len) > region->entry.base) {
+ if ((Ptr)((UArg)base + len) > region->entry.base) {
Hwi_restore(key);
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_overlap);
return (SharedRegion_E_FAIL);
Hwi_restore(key);
Assert_isTrue(FALSE, ti_sdo_ipc_SharedRegion_A_overlap);
return (SharedRegion_E_FAIL);
(region->entry.createHeap) &&
(region->heap == NULL)) {
/* sharedAddr should match creator's for each region */
(region->entry.createHeap) &&
(region->heap == NULL)) {
/* sharedAddr should match creator's for each region */
- sharedAddr = (Ptr)((UInt32)region->entry.base +
+ sharedAddr = (Ptr)((UArg)region->entry.base +
region->reservedSize);
/* get the heap handle from SharedRegion Module state */
region->reservedSize);
/* get the heap handle from SharedRegion Module state */
curSize = region->reservedSize;
/* No need to round here since curSize is already aligned */
curSize = region->reservedSize;
/* No need to round here since curSize is already aligned */
- retPtr = (Ptr)((UInt32)region->entry.base + curSize);
+ retPtr = (Ptr)((UArg)region->entry.base + curSize);
/* Round the new size to the min alignment since */
newSize = _Ipc_roundup(size, minAlign);
/* Round the new size to the min alignment since */
newSize = _Ipc_roundup(size, minAlign);
(region->entry.createHeap) &&
(region->heap == NULL)) {
/* get the next free address in each region */
(region->entry.createHeap) &&
(region->heap == NULL)) {
/* get the next free address in each region */
- sharedAddr = (Ptr)((UInt32)region->entry.base +
+ sharedAddr = (Ptr)((UArg)region->entry.base +
region->reservedSize);
/* Create the HeapMemMP in the region. */
region->reservedSize);
/* Create the HeapMemMP in the region. */