diff options
author | marcel <marcel@FreeBSD.org> | 2003-01-05 21:40:45 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2003-01-05 21:40:45 +0000 |
commit | d692da2da6486196a1f23bd51470be4489ae66e8 (patch) | |
tree | 58047a278aaf7e07bb80cedd2669bafbcc38a0d0 /sys | |
parent | 4b596ebb0218d8a870e7035797bbecdb07c36a83 (diff) | |
download | FreeBSD-src-d692da2da6486196a1f23bd51470be4489ae66e8.zip FreeBSD-src-d692da2da6486196a1f23bd51470be4489ae66e8.tar.gz |
Make all memory I/O addresses (explicitly) 64-bit. Memory mapped
devices aren't necessarily mapped within 4GB. I/O port addresses
are offsets into the memory mapped I/O port space, which is not
larger than 16MB. No need to convert those to 64 bit types.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/ia64/include/cpufunc.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h index ce3330e..d701e67 100644 --- a/sys/ia64/include/cpufunc.h +++ b/sys/ia64/include/cpufunc.h @@ -163,7 +163,7 @@ outsl(u_int port, const void *addr, size_t count) } static __inline u_int8_t -readb(u_int addr) +readb(u_int64_t addr) { volatile u_int8_t *p = ia64_memory_address(addr); u_int8_t v = *p; @@ -172,7 +172,7 @@ readb(u_int addr) } static __inline u_int16_t -readw(u_int addr) +readw(u_int64_t addr) { volatile u_int16_t *p = ia64_memory_address(addr); u_int16_t v = *p; @@ -181,7 +181,7 @@ readw(u_int addr) } static __inline u_int32_t -readl(u_int addr) +readl(u_int64_t addr) { volatile u_int32_t *p = ia64_memory_address(addr); u_int32_t v = *p; @@ -190,7 +190,7 @@ readl(u_int addr) } static __inline void -writeb(u_int addr, u_int8_t data) +writeb(u_int64_t addr, u_int8_t data) { volatile u_int8_t *p = ia64_memory_address(addr); *p = data; @@ -198,7 +198,7 @@ writeb(u_int addr, u_int8_t data) } static __inline void -writew(u_int addr, u_int16_t data) +writew(u_int64_t addr, u_int16_t data) { volatile u_int16_t *p = ia64_memory_address(addr); *p = data; @@ -206,7 +206,7 @@ writew(u_int addr, u_int16_t data) } static __inline void -writel(u_int addr, u_int32_t data) +writel(u_int64_t addr, u_int32_t data) { volatile u_int32_t *p = ia64_memory_address(addr); *p = data; @@ -214,7 +214,7 @@ writel(u_int addr, u_int32_t data) } static __inline void -memcpy_fromio(u_int8_t *addr, size_t ofs, size_t count) +memcpy_fromio(u_int8_t *addr, u_int64_t ofs, size_t count) { volatile u_int8_t *p = ia64_memory_address(ofs); while (count--) @@ -222,7 +222,7 @@ memcpy_fromio(u_int8_t *addr, size_t ofs, size_t count) } static __inline void -memcpy_io(size_t dst, size_t src, size_t count) +memcpy_io(u_int64_t dst, u_int64_t src, size_t count) { volatile u_int8_t *dp = ia64_memory_address(dst); volatile u_int8_t *sp = ia64_memory_address(src); @@ -231,7 +231,7 @@ memcpy_io(size_t dst, size_t src, size_t count) } static __inline void -memcpy_toio(size_t ofs, u_int8_t *addr, size_t count) +memcpy_toio(u_int64_t ofs, u_int8_t *addr, size_t count) { volatile u_int8_t *p = ia64_memory_address(ofs); while (count--) @@ -239,7 +239,7 @@ memcpy_toio(size_t ofs, u_int8_t *addr, size_t count) } static __inline void -memset_io(size_t ofs, u_int8_t value, size_t count) +memset_io(u_int64_t ofs, u_int8_t value, size_t count) { volatile u_int8_t *p = ia64_memory_address(ofs); while (count--) @@ -254,7 +254,7 @@ memsetw(u_int16_t *addr, int val, size_t size) } static __inline void -memsetw_io(size_t ofs, u_int16_t value, size_t count) +memsetw_io(u_int64_t ofs, u_int16_t value, size_t count) { volatile u_int16_t *p = ia64_memory_address(ofs); while (count--) |