summaryrefslogtreecommitdiff
path: root/sys/dev/ic/dcreg.h
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2001-12-06 16:51:31 +0000
committerJason Wright <jason@cvs.openbsd.org>2001-12-06 16:51:31 +0000
commitdf49006d1f9f20471eea2fc71c32daf9056cee0a (patch)
treedafeca5f34a69e6b9897081c52b005c6e73d189f /sys/dev/ic/dcreg.h
parent28ae66b9a2e7158c31273f41ec6ac2ea2eca46cd (diff)
move rx handling over to bus_dma... that just leaves one vtophys() in tx.
Diffstat (limited to 'sys/dev/ic/dcreg.h')
-rw-r--r--sys/dev/ic/dcreg.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h
index 4b1fba86a14..80751f45de5 100644
--- a/sys/dev/ic/dcreg.h
+++ b/sys/dev/ic/dcreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcreg.h,v 1.16 2001/12/06 06:25:17 jason Exp $ */
+/* $OpenBSD: dcreg.h,v 1.17 2001/12/06 16:51:30 jason Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -460,8 +460,14 @@ struct dc_list_data {
u_int8_t dc_pad[DC_MIN_FRAMELEN];
};
+/* software descriptor */
+struct dc_swdesc {
+ bus_dmamap_t sd_map;
+ struct mbuf * sd_mbuf;
+};
+
struct dc_chain_data {
- struct mbuf *dc_rx_chain[DC_RX_LIST_CNT];
+ struct dc_swdesc dc_rx_chain[DC_RX_LIST_CNT];
struct mbuf *dc_tx_chain[DC_TX_LIST_CNT];
int dc_tx_prod;
int dc_tx_cons;
@@ -669,14 +675,6 @@ struct dc_mii_frame {
/* End of PNIC specific registers */
-/* software descriptor */
-struct dc_swdesc {
- bus_dmamap_t sd_map;
- struct mbuf * sd_mbuf;
- struct dc_swdesc * sd_next;
-};
-
-
struct dc_softc {
struct device sc_dev;
void *sc_ih;
@@ -715,8 +713,7 @@ struct dc_softc {
bus_dma_segment_t sc_listseg[1];
int sc_listnseg;
caddr_t sc_listkva;
- struct dc_swdesc sc_txsd[DC_TX_LIST_CNT];
- struct dc_swdesc sc_rxsd[DC_RX_LIST_CNT];
+ bus_dmamap_t sc_rx_sparemap;
};
#define DC_TX_POLL 0x00000001