Sync with driver release 1.74

This commit is contained in:
Roger Hardiman 1999-09-17 17:06:36 +00:00
parent eeeeec707a
commit 1ea586719f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=51351
2 changed files with 22 additions and 0 deletions

View File

@ -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 */

View File

@ -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 */