diff options
| author | Roger Hardiman <roger@FreeBSD.org> | 1999-09-17 17:06:36 +0000 |
|---|---|---|
| committer | Roger Hardiman <roger@FreeBSD.org> | 1999-09-17 17:06:36 +0000 |
| commit | 1ea586719fbcd120f130c335350e1209a5212f92 (patch) | |
| tree | f9df67e08ca5225a6bf5264d74bc02a36a0cee3a /sys/dev/bktr | |
| parent | eeeeec707acbac5b5fadc69c9e1552297ce38fcf (diff) | |
| download | src-1ea586719fbcd120f130c335350e1209a5212f92.tar.gz src-1ea586719fbcd120f130c335350e1209a5212f92.zip | |
Sync with driver release 1.74
Notes
Notes:
svn path=/head/; revision=51351
Diffstat (limited to 'sys/dev/bktr')
| -rw-r--r-- | sys/dev/bktr/bktr_reg.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h index 80b117aabc9d..9bffd97b26a4 100644 --- a/sys/dev/bktr/bktr_reg.h +++ b/sys/dev/bktr/bktr_reg.h @@ -390,6 +390,12 @@ struct bktr_i2c_softc { typedef struct bktr_clip bktr_clip_t; +/* + * NetBSD >= 1.3H uses vaddr_t instead of vm_offset_t + */ +#if defined(__NetBSD__) && __NetBSD_Version__ >= 103080000 +typedef vaddr_t vm_offset_t; +#endif /* * BrookTree 848 info structure, one per bt848 card installed. @@ -405,6 +411,7 @@ struct bktr_softc { #if defined(__NetBSD__) struct device bktr_dev; /* base device */ + bus_dma_tag_t dmat; /* DMA tag */ bus_space_tag_t memt; bus_space_handle_t memh; bus_size_t obmemsz; /* size of en card (bytes) */ @@ -414,8 +421,12 @@ struct bktr_softc { bus_dmamap_t dm_mem; bus_dmamap_t dm_vbidata; bus_dmamap_t dm_vbibuffer; +#if __NetBSD_Version__ >= 103080000 + paddr_t phys_base; /* Bt848 register physical address */ +#else vm_offset_t phys_base; /* Bt848 register physical address */ #endif +#endif #if defined(__OpenBSD__) struct device bktr_dev; /* base device */ |