diff options
author | Alan Cox <alan@linux.intel.com> | 2017-04-28 13:10:13 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-28 14:27:26 +0200 |
commit | 31d677a9cab0cf532b21c8896f4906b96423c07b (patch) | |
tree | b92c4c03e90583a288e387aec595d05c07be717b /drivers/staging/media/atomisp/pci/atomisp2/hrt | |
parent | 08674e986293c36dcb078702009760291bec4f2c (diff) |
atomisp: remove some more unused files
The extra list contains some which are used and some which are not. At this
point I think we can safely remove those that are simply not used.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/hrt')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c | 116 | ||||
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c | 103 |
2 files changed, 0 insertions, 219 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c b/drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c deleted file mode 100644 index c870266ae880..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c +++ /dev/null @@ -1,116 +0,0 @@ - -#include "device_access.h" - -#include "assert_support.h" - -#include <hrt/master_port.h> /* hrt_master_port_load() */ - -/* - * This is an HRT backend implementation for CSIM - */ - -static sys_address base_address = (sys_address)-1; - -void device_set_base_address( - const sys_address base_addr) -{ - base_address = base_addr; -return; -} - - -sys_address device_get_base_address(void) -{ -return base_address; -} - -uint8_t device_load_uint8( - const hrt_address addr) -{ -assert(base_address != (sys_address)-1); -return hrt_master_port_uload_8(base_address + addr); -} - -uint16_t device_load_uint16( - const hrt_address addr) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x01) == 0); -return hrt_master_port_uload_16(base_address + addr); -} - -uint32_t device_load_uint32( - const hrt_address addr) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x03) == 0); -return hrt_master_port_uload_32(base_address + addr); -} - -uint64_t device_load_uint64( - const hrt_address addr) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x07) == 0); -assert(0); -return 0; -} - -void device_store_uint8( - const hrt_address addr, - const uint8_t data) -{ -assert(base_address != (sys_address)-1); -hrt_master_port_store_8(base_address + addr, data); -return; -} - -void device_store_uint16( - const hrt_address addr, - const uint16_t data) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x01) == 0); -hrt_master_port_store_16(base_address + addr, data); -return; -} - -void device_store_uint32( - const hrt_address addr, - const uint32_t data) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x03) == 0); -hrt_master_port_store_32(base_address + addr, data); -return; -} - -void device_store_uint64( - const hrt_address addr, - const uint64_t data) -{ -assert(base_address != (sys_address)-1); -assert((addr & 0x07) == 0); -assert(0); -(void)data; -return; -} - -void device_load( - const hrt_address addr, - void *data, - const size_t size) -{ -assert(base_address != (sys_address)-1); - hrt_master_port_load((uint32_t)(base_address + addr), data, size); -} - -void device_store( - const hrt_address addr, - const void *data, - const size_t size) -{ -assert(base_address != (sys_address)-1); - hrt_master_port_store((uint32_t)(base_address + addr), data, size); -return; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c b/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c deleted file mode 100644 index 60e70cbddfe8..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c +++ /dev/null @@ -1,103 +0,0 @@ - -#include "memory_access.h" - -#include <stddef.h> /* NULL */ -#include <stdbool.h> - -#include "device_access.h" - -#include "mmu_device.h" - -#include "assert_support.h" - -/* Presently system specific */ -#include <hmm/hmm.h> -/* Presently system specific */ -#include "hive_isp_css_mm_hrt.h" - -/* - * This is an HRT backend implementation for CSIM - * 31 July 2012, rvanimme: this implementation is also used in Android context - */ - -static sys_address page_table_base_address = (sys_address)-1; - -void mmgr_set_base_address(const sys_address base_addr) -{ - page_table_base_address = base_addr; - -/* - * This is part of "device_access.h", but it may be - * that "hive_isp_css_mm_hrt.h" requires it - */ -/* hrt_isp_css_mm_set_ddr_address_offset(offset); */ -/* mmu_set_page_table_base_index(MMU0_ID, page_table_base_address); */ -} - -ia_css_ptr mmgr_malloc(const size_t size) -{ - return mmgr_alloc_attr(size, MMGR_ATTRIBUTE_CACHED); -} - -ia_css_ptr mmgr_calloc(const size_t N, const size_t size) -{ - return mmgr_alloc_attr(N * size, - MMGR_ATTRIBUTE_CLEARED|MMGR_ATTRIBUTE_CACHED); -} - -ia_css_ptr mmgr_alloc_attr(const size_t size, const uint16_t attribute) -{ - ia_css_ptr ptr; - size_t extra_space = 0; - size_t aligned_size = size; - - assert(page_table_base_address != (sys_address)-1); - assert((attribute & MMGR_ATTRIBUTE_UNUSED) == 0); - WARN_ON(attribute & MMGR_ATTRIBUTE_CONTIGUOUS); - - if (attribute & MMGR_ATTRIBUTE_CLEARED) { - if (attribute & MMGR_ATTRIBUTE_CACHED) { - ptr = hrt_isp_css_mm_calloc_cached( - aligned_size + extra_space); - } else { /* !MMGR_ATTRIBUTE_CACHED */ - ptr = hrt_isp_css_mm_calloc( - aligned_size + extra_space); - } - } else { /* MMGR_ATTRIBUTE_CLEARED */ - if (attribute & MMGR_ATTRIBUTE_CACHED) { - ptr = hrt_isp_css_mm_alloc_cached( - aligned_size + extra_space); - } else { /* !MMGR_ATTRIBUTE_CACHED */ - ptr = hrt_isp_css_mm_alloc( - aligned_size + extra_space); - } - } - return ptr; -} - -ia_css_ptr mmgr_mmap(const void *ptr, const size_t size, uint16_t attribute, - void *context) -{ - struct hrt_userbuffer_attr *userbuffer_attr = context; - return hrt_isp_css_mm_alloc_user_ptr(size, (void *)ptr, - userbuffer_attr->pgnr, - userbuffer_attr->type, - attribute & HRT_BUF_FLAG_CACHED); -} - -void mmgr_clear( - ia_css_ptr vaddr, - const size_t size) -{ - hmm_set(vaddr, 0, size); -} - -void mmgr_load(const ia_css_ptr vaddr, void *data, const size_t size) -{ - hmm_load(vaddr, data, size); -} - -void mmgr_store(const ia_css_ptr vaddr, const void *data, const size_t size) -{ - hmm_store(vaddr, data, size); -} |