Use bus_space_handle_t to represent host port and virtual addresses;
bus_addr_t may not be appropriate. Sponsored by: DARPA, Network Associates Laboratories
This commit is contained in:
parent
61e30fa211
commit
8e6ed1abea
@ -866,7 +866,7 @@ static __inline void
|
|||||||
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -888,7 +888,7 @@ static __inline void
|
|||||||
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -910,7 +910,7 @@ static __inline void
|
|||||||
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -954,7 +954,7 @@ static __inline void
|
|||||||
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -976,7 +976,7 @@ static __inline void
|
|||||||
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -998,7 +998,7 @@ static __inline void
|
|||||||
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1048,8 +1048,8 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1094,8 +1094,8 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1140,8 +1140,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
|
@ -866,7 +866,7 @@ static __inline void
|
|||||||
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -888,7 +888,7 @@ static __inline void
|
|||||||
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -910,7 +910,7 @@ static __inline void
|
|||||||
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -954,7 +954,7 @@ static __inline void
|
|||||||
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -976,7 +976,7 @@ static __inline void
|
|||||||
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -998,7 +998,7 @@ static __inline void
|
|||||||
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1048,8 +1048,8 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1094,8 +1094,8 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1140,8 +1140,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
|
@ -866,7 +866,7 @@ static __inline void
|
|||||||
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -888,7 +888,7 @@ static __inline void
|
|||||||
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -910,7 +910,7 @@ static __inline void
|
|||||||
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -954,7 +954,7 @@ static __inline void
|
|||||||
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int8_t value, size_t count)
|
bus_size_t offset, u_int8_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -976,7 +976,7 @@ static __inline void
|
|||||||
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int16_t value, size_t count)
|
bus_size_t offset, u_int16_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -998,7 +998,7 @@ static __inline void
|
|||||||
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
|
||||||
bus_size_t offset, u_int32_t value, size_t count)
|
bus_size_t offset, u_int32_t value, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr = bsh + offset;
|
bus_space_handle_t addr = bsh + offset;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1048,8 +1048,8 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1094,8 +1094,8 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
@ -1140,8 +1140,8 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1,
|
|||||||
bus_size_t off1, bus_space_handle_t bsh2,
|
bus_size_t off1, bus_space_handle_t bsh2,
|
||||||
bus_size_t off2, size_t count)
|
bus_size_t off2, size_t count)
|
||||||
{
|
{
|
||||||
bus_addr_t addr1 = bsh1 + off1;
|
bus_space_handle_t addr1 = bsh1 + off1;
|
||||||
bus_addr_t addr2 = bsh2 + off2;
|
bus_space_handle_t addr2 = bsh2 + off2;
|
||||||
|
|
||||||
#if defined(_I386_BUS_PIO_H_)
|
#if defined(_I386_BUS_PIO_H_)
|
||||||
#if defined(_I386_BUS_MEMIO_H_)
|
#if defined(_I386_BUS_MEMIO_H_)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user