Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/if_atureg.h,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/if_atureg.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.6.14.1 retrieving revision 1.7 diff -u -p -r1.6.14.1 -r1.7 --- src/sys/dev/usb/if_atureg.h 2007/06/13 04:13:00 1.6.14.1 +++ src/sys/dev/usb/if_atureg.h 2009/09/04 17:53:58 1.7 @@ -1,4 +1,4 @@ -/* $NetBSD: if_atureg.h,v 1.6.14.1 2007/06/13 04:13:00 itohy Exp $ */ +/* $NetBSD: if_atureg.h,v 1.7 2009/09/04 17:53:58 dyoung Exp $ */ /* $OpenBSD: if_atureg.h,v 1.21 2004/12/23 13:19:38 dlg Exp $ */ /* * Copyright (c) 2003 @@ -101,11 +101,25 @@ struct atu_type { u_int16_t atu_quirk; }; +struct atu_softc; + +struct atu_chain { + struct atu_softc *atu_sc; + usbd_xfer_handle atu_xfer; + char *atu_buf; + struct mbuf *atu_mbuf; + u_int8_t atu_idx; + u_int16_t atu_length; + int atu_in_xfer; + SLIST_ENTRY(atu_chain) atu_list; +}; + struct atu_cdata { - struct ue_chain atu_tx_chain[ATU_TX_LIST_CNT]; - struct ue_chain atu_rx_chain[ATU_RX_LIST_CNT]; + struct atu_chain atu_tx_chain[ATU_TX_LIST_CNT]; + struct atu_chain atu_rx_chain[ATU_RX_LIST_CNT]; - struct ue_list_head atu_tx_free; + SLIST_HEAD(atu_list_head, atu_chain) atu_rx_free; + struct atu_list_head atu_tx_free; u_int8_t atu_tx_inuse; u_int8_t atu_tx_last_idx; @@ -115,7 +129,7 @@ struct atu_cdata { #define ATU_AVG_TIME 20 struct atu_softc { - USBBASEDEVICE atu_dev; + device_t atu_dev; struct ethercom sc_ec; struct ieee80211com sc_ic; int (*sc_newstate)(struct ieee80211com *,