PERFORCE change 132647 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=132647

Change 132647 by hselasky at hselasky_laptop001 on 2008/01/06 22:17:48

	
	Revise the "Multi Frame Ethernet Header"
	to support fragments.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#8 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#8 (text+ko) ====

@@ -188,13 +188,18 @@
 #define	UCDC_MDM_PARITY_ERR		0x20
 #define	UCDC_MDM_OVERRUN_ERR		0x40
 
-/* Multi Frame Ethernet Header */
+/* 512x4 Multi Frame Ethernet Header */
 typedef struct {
-	uByte	bSig0[2];		/* "MF" */
-	uDWord	dwFramesAhead;
-	uDWord	dwFramesAheadInverse;
-} __packed usb_cdc_mf_eth_header_t;
-
-#define	CDC_MF_ETH_HEADER_SIZE 10	/* bytes */
+	uByte	bSig[2];		/* "FL" - Frag List */
+	uByte	bReserved[4];
+	uWord	wFragLength[511 * 4];
+#define	CDCE_512X4_FRAG_LENGTH_OFFSET 6	/* bytes */
+#define	CDCE_512X4_FRAG_LAST_MASK 0x8000
+#define	CDCE_512X4_FRAG_LENGTH_MASK 0x1FFF	/* bytes */
+#define	CDCE_512X4_FRAME_FRAG_MAX 4	/* fragments */
+#define	CDCE_512X4_FRAMES_MAX 511	/* frames */
+#define	CDCE_512X4_FRAGS_MAX (511 * 4)	/* fragments */
+	uWord	wPadding;		/* used to make transfer short */
+} __packed usb_cdc_mf_eth_512x4_header_t;
 
 #endif					/* _USB_CDC_H_ */