From owner-p4-projects@FreeBSD.ORG  Sun Jan  6 22:17:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D58C16A420; Sun,  6 Jan 2008 22:17:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0305F16A419
	for <perforce@FreeBSD.org>; Sun,  6 Jan 2008 22:17:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 056D813C46A
	for <perforce@FreeBSD.org>; Sun,  6 Jan 2008 22:17:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MHnxw082954
	for <perforce@FreeBSD.org>; Sun, 6 Jan 2008 22:17:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MHnuN082951
	for perforce@freebsd.org; Sun, 6 Jan 2008 22:17:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 6 Jan 2008 22:17:49 GMT
Message-Id: <200801062217.m06MHnuN082951@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 132647 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jan 2008 22:17:50 -0000

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

Change 132647 by hselasky@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_ */