Xtensa port: Removed duplicate file and renamed to sys_io.h as other platforms.
Change-Id: I293bfa9ff8c5e641c727612c56968cec901dbfec Signed-off-by: Mazen NEIFER <mazen@nestwave.com>
This commit is contained in:
parent
5718676aad
commit
aacfd63331
3 changed files with 3 additions and 114 deletions
|
@ -20,6 +20,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
|
||||
#include "sys_io.h" /* Include from the very same folder of this file */
|
||||
#include <stdint.h>
|
||||
#include <sw_isr_table.h>
|
||||
#include <arch/xtensa/xtensa_irq.h>
|
||||
|
|
|
@ -51,15 +51,14 @@ static ALWAYS_INLINE int sys_test_and_set_bit(mem_addr_t addr, unsigned int bit)
|
|||
{
|
||||
int retval = (*(volatile int *)addr) & (1 << bit);
|
||||
*(volatile int *)addr = (*(volatile int *)addr) | (1 << bit);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE int sys_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
static ALWAYS_INLINE
|
||||
int sys_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int retval = (*(volatile int *)addr) & (1 << bit);
|
||||
*(volatile int *)addr = (*(volatile int *)addr) & ~(1 << bit);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2016 Cadence Design Systems, Inc.
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef XTENSA_SYS_IO_H
|
||||
#define XTENSA_SYS_IO_H
|
||||
|
||||
#if !defined(_ASMLANGUAGE)
|
||||
|
||||
#include <sys_io.h>
|
||||
|
||||
/* Memory mapped registers I/O functions */
|
||||
|
||||
static ALWAYS_INLINE uint32_t sys_read32(mem_addr_t addr)
|
||||
{
|
||||
return *(volatile uint32_t *)addr;
|
||||
}
|
||||
|
||||
|
||||
static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
|
||||
{
|
||||
*(volatile uint32_t *)addr = data;
|
||||
}
|
||||
|
||||
|
||||
/* Memory bit manipulation functions */
|
||||
|
||||
static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
uint32_t temp = *(volatile uint32_t *)addr;
|
||||
|
||||
*(volatile uint32_t *)addr = temp | (1 << bit);
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
uint32_t temp = *(volatile uint32_t *)addr;
|
||||
|
||||
*(volatile uint32_t *)addr = temp & ~(1 << bit);
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int temp = *(volatile int *)addr;
|
||||
return (int)(temp & (1 << bit));
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE int sys_test_and_set_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int retval = (*(volatile int *)addr) & (1 << bit);
|
||||
*(volatile int *)addr = (*(volatile int *)addr) | (1 << bit);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE int sys_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int retval = (*(volatile int *)addr) & (1 << bit);
|
||||
*(volatile int *)addr = (*(volatile int *)addr) & ~(1 << bit);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE
|
||||
void sys_bitfield_set_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
/* Doing memory offsets in terms of 32-bit values to prevent
|
||||
* alignment issues
|
||||
*/
|
||||
sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE
|
||||
void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE
|
||||
int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
|
||||
}
|
||||
|
||||
|
||||
static ALWAYS_INLINE
|
||||
int sys_bitfield_test_and_set_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = sys_bitfield_test_bit(addr, bit);
|
||||
sys_bitfield_set_bit(addr, bit);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ALWAYS_INLINE
|
||||
int sys_bitfield_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = sys_bitfield_test_bit(addr, bit);
|
||||
sys_bitfield_clear_bit(addr, bit);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#endif /* !_ASMLANGUAGE */
|
||||
|
||||
|
||||
#endif /* XTENSA_SYS_IO_H */
|
Loading…
Add table
Add a link
Reference in a new issue