From 7c3743a6d1cf06fe5130628c9f39cc3c41128d22 Mon Sep 17 00:00:00 2001 From: Joan Lledó Date: Sat, 8 Jan 2022 13:15:37 +0100 Subject: pci-arbiter: Stop using deprecated region memory pointer Use a internal array of pointers instead * pci-arbiter/device_map.h: * Update device_map_region() prototype * Now it receives an output address as parameter * pci-arbiter/device_map.c: * Update device_map_region() definition to match the new prototype * Support for legacy mappings * When the base address is lower than 1 mb * pci-arbiter/func_files.c: * pci-arbiter/netfs_impl.c: * Update calls to device_map_region to match the new prototype * Use the internal array of pointers instead of region->memory * pci-arbiter/pcifs.h: * struct pcifs_dirent: Declare the internal array of pointers Message-Id: <20220108121537.6277-2-jlledom@mailfence.com> --- pci-arbiter/func_files.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pci-arbiter/func_files.c') diff --git a/pci-arbiter/func_files.c b/pci-arbiter/func_files.c index 81ebfded..40706135 100644 --- a/pci-arbiter/func_files.c +++ b/pci-arbiter/func_files.c @@ -205,13 +205,13 @@ io_region_file (struct pcifs_dirent * e, off_t offset, size_t * len, else { /* Ensure the region is mapped */ - err = device_map_region (e->device, region); + err = device_map_region (e->device, region, &e->region_maps[reg_num]); if (err) return err; if (read) - memcpy (data, region->memory + offset, *len); + memcpy (data, e->region_maps[reg_num] + offset, *len); else - memcpy (region->memory + offset, data, *len); + memcpy (e->region_maps[reg_num] + offset, data, *len); } return err; -- cgit v1.2.3