upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-07-02 22:09:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove bus_space_vaddr(), it does not exists in FreeBSD.

Browse source
This commit is contained in:
Olivier Houchard 2004-09-23 21:59:14 +00:00
parent 4637f47217
commit a5bb1c8501
3 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/arm/arm/nexus_io.c
View file

@ -72,9 +72,6 @@ struct bus_space mainbus_bs_tag = {
nexus_bs_alloc,
nexus_bs_free,
/* get kernel virtual address */
0, /* there is no linear mapping */
/* barrier */
nexus_bs_barrier,

52
sys/arm/include/bus.h
View file

@ -115,8 +115,6 @@ struct bus_space {
bus_size_t);
/* get kernel virtual address */
void * (*bs_vaddr) (void *, bus_space_handle_t);
/* barrier */
void (*bs_barrier) (void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
@ -248,12 +246,6 @@ struct bus_space {
#define bus_space_free(t, h, s) \
(*(t)->bs_free)((t)->bs_cookie, (h), (s))
/*
* Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
*/
#define bus_space_vaddr(t, h) \
(*(t)->bs_vaddr)((t)->bs_cookie, (h))
/*
* Bus barrier operations.
*/
@ -398,9 +390,6 @@ int __bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart, \
void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \
bus_size_t size);
#define bs_vaddr_proto(f) \
void * __bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh);
#define bs_mmap_proto(f) \
int __bs_c(f,_bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int);
@ -562,7 +551,6 @@ bs_unmap_proto(f); \
bs_subregion_proto(f); \
bs_alloc_proto(f); \
bs_free_proto(f); \
bs_vaddr_proto(f); \
bs_mmap_proto(f); \
bs_barrier_proto(f); \
bs_r_1_proto(f); \
@ -619,11 +607,6 @@ bs_c_8_proto(f);
#define BUS_DMA_BUS3 0x040
#define BUS_DMA_BUS4 0x080
/*
* Private flags stored in the DMA map.
*/
#define ARM32_DMAMAP_COHERENT 0x10000 /* no cache flush necessary on sync */
/* Forwards needed by prototypes below. */
struct mbuf;
struct uio;
@ -689,6 +672,7 @@ typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t
#define ARM32_BUFTYPE_RAW 4
struct arm32_dma_range *bus_dma_get_range(void);
int bus_dma_get_range_nb(void);
#endif /* _ARM32_BUS_DMA_PRIVATE */
/*
@ -757,4 +741,38 @@ void bus_dmamem_free (bus_dma_tag_t tag, void *vaddr, bus_dmamap_t map);
*/
void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op);
#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF
#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
#define BUS_SPACE_MAXADDR 0xFFFFFFFF
#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF
#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
#define BUS_SPACE_MAXSIZE 0xFFFFFFFF
/* XXX: is this right ? */
#define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o))
#define bus_space_read_stream_2(t, h, o) bus_space_read_2((t), (h), (o))
#define bus_space_read_stream_4(t, h, o) bus_space_read_4((t), (h), (o))
#define bus_space_read_multi_stream_1(t, h, o, a, c) \
bus_space_read_multi_1((t), (h), (o), (a), (c))
#define bus_space_read_multi_stream_2(t, h, o, a, c) \
bus_space_read_multi_2((t), (h), (o), (a), (c))
#define bus_space_read_multi_stream_4(t, h, o, a, c) \
bus_space_read_multi_4((t), (h), (o), (a), (c))
#define bus_space_write_stream_1(t, h, o, v) \
bus_space_write_1((t), (h), (o), (v))
#define bus_space_write_stream_2(t, h, o, v) \
bus_space_write_2((t), (h), (o), (v))
#define bus_space_write_stream_4(t, h, o, v) \
bus_space_write_4((t), (h), (o), (v))
#define bus_space_write_multi_stream_1(t, h, o, a, c) \
bus_space_write_multi_1((t), (h), (o), (a), (c))
#define bus_space_write_multi_stream_2(t, h, o, a, c) \
bus_space_write_multi_2((t), (h), (o), (a), (c))
#define bus_space_write_multi_stream_4(t, h, o, a, c) \
bus_space_write_multi_4((t), (h), (o), (a), (c))
#endif /* _MACHINE_BUS_H_ */

11
sys/arm/sa11x0/sa11x0_io.c
View file

@ -76,9 +76,6 @@ struct bus_space sa11x0_bs_tag = {
sa11x0_bs_alloc,
sa11x0_bs_free,
/* get kernel virtual address */
sa11x0_bs_vaddr,
/* barrier */
sa11x0_bs_barrier,
@ -221,14 +218,6 @@ sa11x0_bs_subregion(t, bsh, offset, size, nbshp)
return (0);
}
void *
sa11x0_bs_vaddr(t, bsh)
void *t;
bus_space_handle_t bsh;
{
return ((void *)bsh);
}
void
sa11x0_bs_barrier(t, bsh, offset, len, flags)
void *t;