diff options
Diffstat (limited to 'sys/dev/pci/if_wpivar.h')
| -rw-r--r-- | sys/dev/pci/if_wpivar.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/dev/pci/if_wpivar.h b/sys/dev/pci/if_wpivar.h index 29dd6ee84df..ebe83eb20c7 100644 --- a/sys/dev/pci/if_wpivar.h +++ b/sys/dev/pci/if_wpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpivar.h,v 1.1 2006/05/14 19:00:48 damien Exp $ */ +/* $OpenBSD: if_wpivar.h,v 1.2 2006/05/17 19:50:35 damien Exp $ */ /*- * Copyright (c) 2006 @@ -41,6 +41,14 @@ struct wpi_tx_radiotap_header { ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_CHANNEL)) +struct wpi_dma_info { + bus_dmamap_t map; + bus_dma_segment_t seg; + bus_addr_t paddr; + caddr_t vaddr; + bus_size_t size; +}; + struct wpi_tx_data { bus_dmamap_t map; struct mbuf *m; @@ -48,10 +56,8 @@ struct wpi_tx_data { }; struct wpi_tx_ring { - bus_dmamap_t map; - bus_dma_segment_t seg; - bus_dmamap_t cmd_map; - bus_dma_segment_t cmd_seg; + struct wpi_dma_info desc_dma; + struct wpi_dma_info cmd_dma; struct wpi_tx_desc *desc; struct wpi_tx_cmd *cmd; struct wpi_tx_data *data; @@ -67,8 +73,7 @@ struct wpi_rx_data { }; struct wpi_rx_ring { - bus_dmamap_t map; - bus_dma_segment_t seg; + struct wpi_dma_info desc_dma; uint32_t *desc; struct wpi_rx_data data[WPI_RX_RING_COUNT]; int cur; @@ -87,8 +92,7 @@ struct wpi_softc { bus_dma_tag_t sc_dmat; /* shared area */ - bus_dmamap_t shmap; - bus_dma_segment_t shseg; + struct wpi_dma_info shared_dma; struct wpi_shared *shared; struct wpi_tx_ring txq[4]; @@ -107,7 +111,6 @@ struct wpi_softc { uint16_t calib1[14]; uint16_t calib2[14]; - int authmode; int sc_tx_timer; void *powerhook; |