diff options
| author | des <des@FreeBSD.org> | 2009-09-25 22:45:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-09-25 22:45:59 +0000 |
| commit | bf5117185e83a178d672946c3f7053d0ef92be27 (patch) | |
| tree | 394fcfe01b613c0b5b5edbfc414a17c73481ad5d /sys/dev/de/if_devar.h | |
| parent | b79ff8160af6fa640e29ce784e59acd49cd1e7fc (diff) | |
| parent | 5c2742e3dae3ef549329b770ec44b16ca930dc1f (diff) | |
| download | FreeBSD-src-bf5117185e83a178d672946c3f7053d0ef92be27.zip FreeBSD-src-bf5117185e83a178d672946c3f7053d0ef92be27.tar.gz | |
Sync with head
Diffstat (limited to 'sys/dev/de/if_devar.h')
| -rw-r--r-- | sys/dev/de/if_devar.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h index 3fd3410..b4feebc 100644 --- a/sys/dev/de/if_devar.h +++ b/sys/dev/de/if_devar.h @@ -104,7 +104,7 @@ typedef struct { tulip_descinfo_t *ri_descinfo; bus_dma_tag_t ri_ring_tag; bus_dmamap_t ri_ring_map; - uint32_t ri_dma_addr; + bus_addr_t ri_dma_addr; bus_dma_tag_t ri_data_tag; bus_dmamap_t *ri_data_maps; } tulip_ringinfo_t; @@ -134,11 +134,7 @@ typedef struct { * architecture which can't handle unaligned accesses) because with * 100Mb/s cards the copying is just too much of a hit. */ -#if !defined(__i386__) -#define TULIP_COPY_RXDATA 1 -#endif -#define TULIP_DATA_PER_DESC 2032 #define TULIP_TXTIMER 4 #define TULIP_RXDESCS 48 #define TULIP_TXDESCS 128 @@ -560,7 +556,7 @@ struct tulip_softc { */ bus_dma_tag_t tulip_setup_tag; bus_dmamap_t tulip_setup_map; - uint32_t tulip_setup_dma_addr; + bus_addr_t tulip_setup_dma_addr; u_int32_t *tulip_setupbuf; u_int32_t tulip_setupdata[192 / sizeof(u_int32_t)]; char tulip_boardid[24]; |
