Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Adjust I/O macros to work on 64-bit machines

Browse source 
At present these macros give warnings on 64-bit machines and do not
correctly do 32-bit accesses. Update them to use linux types.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-02-16 20:24:46 -07:00 • committed by Bin Meng
parent c6d84a30fe
commit 3a44bfdf08
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/x86/include/asm/io.h
View file

@ -57,19 +57,19 @@
* memory location directly. * memory location directly.
*/ */
#define readb(addr) (*(volatile unsigned char *) (addr)) #define readb(addr) (*(volatile u8 *)(uintptr_t)(addr))
#define readw(addr) (*(volatile unsigned short *) (addr)) #define readw(addr) (*(volatile u16 *)(uintptr_t)(addr))
#define readl(addr) (*(volatile unsigned int *) (addr)) #define readl(addr) (*(volatile u32 *)(uintptr_t)(addr))
#define readq(addr) (*(volatile unsigned long long *) (addr)) #define readq(addr) (*(volatile u64 *)(uintptr_t)(addr))
#define __raw_readb readb #define __raw_readb readb
#define __raw_readw readw #define __raw_readw readw
#define __raw_readl readl #define __raw_readl readl
#define __raw_readq readq #define __raw_readq readq
#define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) #define writeb(b, addr) (*(volatile u8 *)(addr) = (b))
#define writew(b,addr) (*(volatile unsigned short *) (addr) = (b)) #define writew(b, addr) (*(volatile u16 *)(addr) = (b))
#define writel(b,addr) (*(volatile unsigned int *) (addr) = (b)) #define writel(b, addr) (*(volatile u32 *)(addr) = (b))
#define writeq(b,addr) (*(volatile unsigned long long *) (addr) = (b)) #define writeq(b, addr) (*(volatile u64 *)(addr) = (b))
#define __raw_writeb writeb #define __raw_writeb writeb
#define __raw_writew writew #define __raw_writew writew
#define __raw_writel writel #define __raw_writel writel