summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/ncm.h
diff options
context:
space:
mode:
authorMichael Brown2015-02-12 16:17:21 +0100
committerMichael Brown2015-02-16 00:13:41 +0100
commit14fc311271d6893132cff8b440f9e527b376a89c (patch)
tree9f0b628f6f8e7da64182676ebac4b3cb22df75c2 /src/drivers/net/ncm.h
parent[ecm] Use generic refill framework for bulk IN and interrupt endpoints (diff)
downloadipxe-14fc311271d6893132cff8b440f9e527b376a89c.tar.gz
ipxe-14fc311271d6893132cff8b440f9e527b376a89c.tar.xz
ipxe-14fc311271d6893132cff8b440f9e527b376a89c.zip
[ncm] Use generic refill framework for bulk IN and interrupt endpoints
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/ncm.h')
-rw-r--r--src/drivers/net/ncm.h36
1 files changed, 10 insertions, 26 deletions
diff --git a/src/drivers/net/ncm.h b/src/drivers/net/ncm.h
index b76902b9..a551f0d2 100644
--- a/src/drivers/net/ncm.h
+++ b/src/drivers/net/ncm.h
@@ -139,26 +139,6 @@ struct ncm_ntb_header {
struct ncm_datagram_descriptor desc[2];
} __attribute__ (( packed ));
-/** A CDC-NCM receive ring */
-struct ncm_rx_ring {
- /** USB endpoint */
- struct usb_endpoint ep;
- /** I/O buffer size */
- size_t mtu;
- /** Recycled buffer list */
- struct list_head list;
-};
-
-/** A CDC-NCM transmit ring */
-struct ncm_tx_ring {
- /** USB endpoint */
- struct usb_endpoint ep;
- /** Transmitted packet sequence number */
- uint16_t sequence;
- /** Alignment padding required on transmitted packets */
- size_t padding;
-};
-
/** A CDC-NCM network device */
struct ncm_device {
/** USB device */
@@ -175,13 +155,17 @@ struct ncm_device {
/** Maximum supported NTB input size */
size_t mtu;
+ /** Transmitted packet sequence number */
+ uint16_t sequence;
+ /** Alignment padding required on transmitted packets */
+ size_t padding;
- /** Interrupt ring */
- struct ncm_rx_ring intr;
- /** Bulk IN ring */
- struct ncm_rx_ring in;
- /** Bulk OUT ring */
- struct ncm_tx_ring out;
+ /** Interrupt endpoint */
+ struct usb_endpoint intr;
+ /** Bulk IN endpoint */
+ struct usb_endpoint in;
+ /** Bulk OUT endpoint */
+ struct usb_endpoint out;
};
/** Bulk IN ring minimum buffer count