diff options
| author | Rom Lemarchand <romlem@google.com> | 2013-10-22 15:42:03 -0700 |
|---|---|---|
| committer | Rom Lemarchand <romlem@google.com> | 2013-11-06 08:28:52 -0800 |
| commit | 02c67a70314b1debffd715fbb06ad006494a9a27 (patch) | |
| tree | da3b6e7b063c0c9bda2066c14682b752398750b7 /camera | |
| parent | 66822078e37fcea298587b2b479578cd3ce93e7d (diff) | |
| download | mako-02c67a70314b1debffd715fbb06ad006494a9a27.tar.gz | |
mako: rename ion_allocation_data.heap_mask to heap_id_mask
Rename the heap_mask field in ion_allocation_data struct to heap_id_mask and
match the new kernel header.
Change-Id: Iecafe2ebcd80ec2a55b21eef296aef22f130841b
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera/HAL/core/src/QCameraHWI.cpp | 4 | ||||
| -rwxr-xr-x | camera/QCameraHWI.cpp | 4 | ||||
| -rw-r--r-- | camera/QualcommCameraHardware.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/camera/QCamera/HAL/core/src/QCameraHWI.cpp b/camera/QCamera/HAL/core/src/QCameraHWI.cpp index e2af277..0e5070d 100644 --- a/camera/QCamera/HAL/core/src/QCameraHWI.cpp +++ b/camera/QCamera/HAL/core/src/QCameraHWI.cpp @@ -2172,7 +2172,7 @@ int QCameraHardwareInterface::allocate_ion_memory(QCameraHalHeap_t *p_camera_mem p_camera_memory->alloc[cnt].len = (p_camera_memory->alloc[cnt].len + 4095) & (~4095); p_camera_memory->alloc[cnt].align = 4096; p_camera_memory->alloc[cnt].flags = ION_FLAG_CACHED; - p_camera_memory->alloc[cnt].heap_mask = ion_type; + p_camera_memory->alloc[cnt].heap_id_mask = ion_type; rc = ioctl(p_camera_memory->main_ion_fd[cnt], ION_IOC_ALLOC, &p_camera_memory->alloc[cnt]); @@ -2230,7 +2230,7 @@ int QCameraHardwareInterface::allocate_ion_memory(QCameraStatHeap_t *p_camera_me p_camera_memory->alloc[cnt].len = (p_camera_memory->alloc[cnt].len + 4095) & (~4095); p_camera_memory->alloc[cnt].align = 4096; p_camera_memory->alloc[cnt].flags = ION_FLAG_CACHED; - p_camera_memory->alloc[cnt].heap_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); + p_camera_memory->alloc[cnt].heap_id_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); rc = ioctl(p_camera_memory->main_ion_fd[cnt], ION_IOC_ALLOC, &p_camera_memory->alloc[cnt]); if (rc < 0) { diff --git a/camera/QCameraHWI.cpp b/camera/QCameraHWI.cpp index e8759be..b109596 100755 --- a/camera/QCameraHWI.cpp +++ b/camera/QCameraHWI.cpp @@ -2310,7 +2310,7 @@ int QCameraHardwareInterface::allocate_ion_memory(QCameraHalHeap_t *p_camera_mem p_camera_memory->alloc[cnt].len = (p_camera_memory->alloc[cnt].len + 4095) & (~4095); p_camera_memory->alloc[cnt].align = 4096; p_camera_memory->alloc[cnt].flags = ION_FLAG_CACHED; - p_camera_memory->alloc[cnt].heap_mask = ion_type; + p_camera_memory->alloc[cnt].heap_id_mask = ion_type; rc = ioctl(p_camera_memory->main_ion_fd[cnt], ION_IOC_ALLOC, &p_camera_memory->alloc[cnt]); if (rc < 0) { @@ -2367,7 +2367,7 @@ int QCameraHardwareInterface::allocate_ion_memory(QCameraStatHeap_t *p_camera_me p_camera_memory->alloc[cnt].len = (p_camera_memory->alloc[cnt].len + 4095) & (~4095); p_camera_memory->alloc[cnt].align = 4096; p_camera_memory->alloc[cnt].flags = ION_FLAG_CACHED; - p_camera_memory->alloc[cnt].heap_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); + p_camera_memory->alloc[cnt].heap_id_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); rc = ioctl(p_camera_memory->main_ion_fd[cnt], ION_IOC_ALLOC, &p_camera_memory->alloc[cnt]); if (rc < 0) { diff --git a/camera/QualcommCameraHardware.cpp b/camera/QualcommCameraHardware.cpp index 915ded3..c4aa886 100644 --- a/camera/QualcommCameraHardware.cpp +++ b/camera/QualcommCameraHardware.cpp @@ -3674,7 +3674,7 @@ int QualcommCameraHardware::allocate_ion_memory(int *main_ion_fd, struct ion_all alloc->len = (alloc->len + 4095) & (~4095); alloc->align = 4096; alloc->flags = 0; - alloc->heap_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); + alloc->heap_id_mask = (0x1 << ion_type | 0x1 << ION_IOMMU_HEAP_ID); rc = ioctl(*main_ion_fd, ION_IOC_ALLOC, alloc); if (rc < 0) { |