diff --git a/ThirdParty/sw_services/xilopenamp/src/bm_env.c b/ThirdParty/sw_services/xilopenamp/src/bm_env.c index c2b9d892..aa422303 100644 --- a/ThirdParty/sw_services/xilopenamp/src/bm_env.c +++ b/ThirdParty/sw_services/xilopenamp/src/bm_env.c @@ -55,20 +55,9 @@ #else #define MEM_BARRIER() #endif - static void acquire_spin_lock(void *plock); static void release_spin_lock(void *plock); -extern void restore_global_interrupts(); -extern void disable_global_interrupts(); -extern void platform_interrupt_enable(unsigned int vector,unsigned int polarity, unsigned int priority); -extern void platform_interrupt_disable(unsigned int vector); -extern void platform_cache_all_flush_invalidate(); -extern void platform_cache_disable(); -extern void platform_map_mem_region(unsigned int va,unsigned int pa, unsigned int size,int is_mem_mapped,int cache_type); -extern unsigned long platform_vatopa(unsigned long addr); -extern void *platform_patova(unsigned long addr); - struct isr_info isr_table[ISR_COUNT]; int Intr_Count = 0; /* Flag to show status of global interrupts. 0 for disabled and 1 for enabled. This @@ -469,9 +458,7 @@ void env_disable_interrupt(unsigned int vector) void env_map_memory(unsigned int pa, unsigned int va, unsigned int size, unsigned int flags) { - int is_mem_mapped = 0; - int cache_type = 0; - platform_map_mem_region(va, pa, size, is_mem_mapped, cache_type); + platform_map_mem_region(va, pa, size, flags); } /** diff --git a/ThirdParty/sw_services/xilopenamp/src/hil.h b/ThirdParty/sw_services/xilopenamp/src/hil.h index b781a884..b8be5d32 100644 --- a/ThirdParty/sw_services/xilopenamp/src/hil.h +++ b/ThirdParty/sw_services/xilopenamp/src/hil.h @@ -1,6 +1,3 @@ -#ifndef _HIL_H_ -#define _HIL_H_ - /* * Copyright (c) 2014, Mentor Graphics Corporation * All rights reserved. @@ -41,6 +38,8 @@ * interface is used by both RPMSG and remoteproc components. * ***************************************************************************/ +#ifndef _HIL_H_ +#define _HIL_H_ #include "virtio.h" #include "config.h" diff --git a/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.c b/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.c index 4d45c0e7..e6282adf 100644 --- a/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.c +++ b/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.c @@ -1,3 +1,32 @@ +/* + * Copyright (c) 2014, Mentor Graphics Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of Mentor Graphics Corporation nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include "open_amp.h" #include "rpmsg_retarget.h" #include diff --git a/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.h b/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.h index cb268b35..e055b4c9 100644 --- a/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.h +++ b/ThirdParty/sw_services/xilopenamp/src/rpmsg_retarget.h @@ -1,3 +1,32 @@ +/* + * Copyright (c) 2014, Mentor Graphics Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of Mentor Graphics Corporation nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include "open_amp.h" /* RPC response buffer size */ #define RPC_BUFF_SIZE 512 diff --git a/ThirdParty/sw_services/xilopenamp/src/virtqueue.h b/ThirdParty/sw_services/xilopenamp/src/virtqueue.h index 8bc2ecb3..72a310a7 100644 --- a/ThirdParty/sw_services/xilopenamp/src/virtqueue.h +++ b/ThirdParty/sw_services/xilopenamp/src/virtqueue.h @@ -1,8 +1,4 @@ -#ifndef VIRTQUEUE_H_ -#define VIRTQUEUE_H_ - -/*- - * Copyright (c) 2011, Bryan Venteicher +/* Copyright (c) 2011, Bryan Venteicher * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +25,9 @@ * $FreeBSD$ */ +#ifndef VIRTQUEUE_H_ +#define VIRTQUEUE_H_ + typedef unsigned int uint_t; typedef signed char int8_t; typedef unsigned char uint8_t;