diff options
author | Sam Nelson | 2019-10-07 14:36:54 -0500 |
---|---|---|
committer | Sam Nelson | 2019-10-08 14:51:05 -0500 |
commit | 8fad2b3a2be9b9702536afaf72fa26f74f8cefa3 (patch) | |
tree | bb106b1a734507c4365c985afd959c12d8e5777d | |
parent | b803b1d7a3fa3145086ea168be49a5af2a71acf0 (diff) | |
download | ipcdev-8fad2b3a2be9b9702536afaf72fa26f74f8cefa3.tar.gz ipcdev-8fad2b3a2be9b9702536afaf72fa26f74f8cefa3.tar.xz ipcdev-8fad2b3a2be9b9702536afaf72fa26f74f8cefa3.zip |
HeapBufMP: Update handling for > 32 bit addresses
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
-rw-r--r-- | packages/ti/sdo/ipc/heaps/HeapBufMP.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/ti/sdo/ipc/heaps/HeapBufMP.c b/packages/ti/sdo/ipc/heaps/HeapBufMP.c index e3a8146..a3d1293 100644 --- a/packages/ti/sdo/ipc/heaps/HeapBufMP.c +++ b/packages/ti/sdo/ipc/heaps/HeapBufMP.c | |||
@@ -445,8 +445,8 @@ Int ti_sdo_ipc_heaps_HeapBufMP_Instance_init( | |||
445 | } | 445 | } |
446 | 446 | ||
447 | /* Open the ListMP */ | 447 | /* Open the ListMP */ |
448 | localAddr = (Ptr)_Ipc_roundup( | 448 | localAddr = (Ptr)_Ipc_ptrRoundup( |
449 | (UInt32)obj->attrs + sizeof(ti_sdo_ipc_heaps_HeapBufMP_Attrs), | 449 | (UArg)obj->attrs + sizeof(ti_sdo_ipc_heaps_HeapBufMP_Attrs), |
450 | minAlign); | 450 | minAlign); |
451 | status = ListMP_openByAddr(localAddr, | 451 | status = ListMP_openByAddr(localAddr, |
452 | (ListMP_Handle *)&(obj->freeList)); | 452 | (ListMP_Handle *)&(obj->freeList)); |
@@ -489,7 +489,7 @@ Int ti_sdo_ipc_heaps_HeapBufMP_Instance_init( | |||
489 | ti_sdo_ipc_Ipc_A_addrNotInSharedRegion); | 489 | ti_sdo_ipc_Ipc_A_addrNotInSharedRegion); |
490 | 490 | ||
491 | /* Assert that sharedAddr is cached aligned if region requires align. */ | 491 | /* Assert that sharedAddr is cached aligned if region requires align. */ |
492 | Assert_isTrue(((UInt32)params->sharedAddr % | 492 | Assert_isTrue(((UArg)params->sharedAddr % |
493 | SharedRegion_getCacheLineSize(obj->regionId) == 0), | 493 | SharedRegion_getCacheLineSize(obj->regionId) == 0), |
494 | ti_sdo_ipc_Ipc_A_addrNotCacheAligned); | 494 | ti_sdo_ipc_Ipc_A_addrNotCacheAligned); |
495 | 495 | ||
@@ -677,12 +677,12 @@ Void ti_sdo_ipc_heaps_HeapBufMP_free(ti_sdo_ipc_heaps_HeapBufMP_Object *obj, | |||
677 | { | 677 | { |
678 | IArg key; | 678 | IArg key; |
679 | 679 | ||
680 | Assert_isTrue(((UInt32)block >= (UInt32)obj->buf) && | 680 | Assert_isTrue(((UArg)block >= (UArg)obj->buf) && |
681 | ((UInt32)block < ((UInt32)obj->buf + obj->blockSize * obj->numBlocks)), | 681 | ((UArg)block < ((UArg)obj->buf + obj->blockSize * obj->numBlocks)), |
682 | ti_sdo_ipc_heaps_HeapBufMP_A_invBlockFreed); | 682 | ti_sdo_ipc_heaps_HeapBufMP_A_invBlockFreed); |
683 | 683 | ||
684 | /* Assert that 'addr' is block-aligned */ | 684 | /* Assert that 'addr' is block-aligned */ |
685 | Assert_isTrue((UInt32)block % obj->align == 0, | 685 | Assert_isTrue((UArg)block % obj->align == 0, |
686 | ti_sdo_ipc_heaps_HeapBufMP_A_badAlignment); | 686 | ti_sdo_ipc_heaps_HeapBufMP_A_badAlignment); |
687 | 687 | ||
688 | /* | 688 | /* |
@@ -831,7 +831,7 @@ Void ti_sdo_ipc_heaps_HeapBufMP_postInit(ti_sdo_ipc_heaps_HeapBufMP_Object *obj, | |||
831 | 831 | ||
832 | /* Create the freeList */ | 832 | /* Create the freeList */ |
833 | ListMP_Params_init(&listMPParams); | 833 | ListMP_Params_init(&listMPParams); |
834 | listMPParams.sharedAddr = (Ptr)_Ipc_roundup((UInt32)obj->attrs + | 834 | listMPParams.sharedAddr = (Ptr)_Ipc_ptrRoundup((UArg)obj->attrs + |
835 | sizeof(ti_sdo_ipc_heaps_HeapBufMP_Attrs), minAlign); | 835 | sizeof(ti_sdo_ipc_heaps_HeapBufMP_Attrs), minAlign); |
836 | listMPParams.gate = (GateMP_Handle)obj->gate; | 836 | listMPParams.gate = (GateMP_Handle)obj->gate; |
837 | obj->freeList = (ti_sdo_ipc_ListMP_Handle)ListMP_create(&listMPParams); | 837 | obj->freeList = (ti_sdo_ipc_ListMP_Handle)ListMP_create(&listMPParams); |
@@ -850,7 +850,7 @@ Void ti_sdo_ipc_heaps_HeapBufMP_postInit(ti_sdo_ipc_heaps_HeapBufMP_Object *obj, | |||
850 | obj->attrs->exact = obj->exact ? 1 : 0; | 850 | obj->attrs->exact = obj->exact ? 1 : 0; |
851 | 851 | ||
852 | /* Adjust obj->buf and put a SRPtr in attrs */ | 852 | /* Adjust obj->buf and put a SRPtr in attrs */ |
853 | buf = obj->buf = (Ptr)_Ipc_roundup(obj->buf, obj->align); | 853 | buf = obj->buf = (Ptr)_Ipc_ptrRoundup(obj->buf, obj->align); |
854 | obj->attrs->bufPtr = SharedRegion_getSRPtr(obj->buf, obj->regionId); | 854 | obj->attrs->bufPtr = SharedRegion_getSRPtr(obj->buf, obj->regionId); |
855 | 855 | ||
856 | /* | 856 | /* |