[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Fri Sep 7 09:55:47 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/1ca6f0830304
changeset: 535:1ca6f0830304
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Fri Sep 07 12:57:57 2012 +0300
description:
update to r240194.

diffstat:

 head/sys/dev/usb/controller/dwc_otgreg.h |  26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r acc2717aee61 -r 1ca6f0830304 head/sys/dev/usb/controller/dwc_otgreg.h

--- a/head/sys/dev/usb/controller/dwc_otgreg.h	Wed Sep 05 02:21:23 2012 +0300
+++ b/head/sys/dev/usb/controller/dwc_otgreg.h	Fri Sep 07 12:57:57 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/dev/usb/controller/dwc_otgreg.h 239909 2012-08-30 16:19:05Z hselasky $ */
+/* $FreeBSD: head/sys/dev/usb/controller/dwc_otgreg.h 240074 2012-09-03 15:22:02Z hselasky $ */
 
 /*-
  * Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
@@ -451,10 +451,21 @@
 #define	DIEPTXFN_INEPNTXFSTADDR_SHIFT	0
 #define	DIEPTXFN_INEPNTXFSTADDR_MASK	0x0000ffff
 
+#define	HCFG_MODECHANGERDY		(1<<31)
+#define	HCFG_PERSCHEDENABLE		(1<<26)
+#define	HCFG_FLENTRIES_SHIFT		24
+#define	HCFG_FLENTRIES_MASK		0x03000000
+#define	HCFG_FLENTRIES_8		(0)
+#define	HCFG_FLENTRIES_16		(1)
+#define	HCFG_FLENTRIES_32		(2)
+#define	HCFG_FLENTRIES_64		(3)
+#define	HCFG_MULTISEGDMA		(1<<23)
+#define	HCFG_32KHZSUSPEND		(1<<7)
 #define	HCFG_FSLSSUPP			(1<<2)
 #define	HCFG_FSLSPCLKSEL_SHIFT		0
 #define	HCFG_FSLSPCLKSEL_MASK		0x00000003
 
+#define	HFIR_RELOADCTRL			(1<<16)
 #define	HFIR_FRINT_SHIFT		0
 #define	HFIR_FRINT_MASK			0x0000ffff
 
@@ -463,8 +474,15 @@
 #define	HFNUM_FRNUM_SHIFT		0
 #define	HFNUM_FRNUM_MASK		0x0000ffff
 
-#define	HPTXSTS_PTXQTOP_SHIFT		24
-#define	HPTXSTS_PTXQTOP_MASK		0xff000000
+#define	HPTXSTS_ODD			(1<<31)
+#define	HPTXSTS_CHAN_SHIFT		27
+#define	HPTXSTS_CHAN_MASK		0x78000000
+#define	HPTXSTS_TOKEN_SHIFT		25
+#define	HPTXSTS_TOKEN_MASK		0x06000000
+#define	HPTXSTS_TOKEN_ZL		0
+#define	HPTXSTS_TOKEN_PING		1
+#define	HPTXSTS_TOKEN_DISABLE		2
+#define	HPTXSTS_TERMINATE		(1<<24)
 #define	HPTXSTS_PTXQSPCAVAIL_SHIFT	16
 #define	HPTXSTS_PTXQSPCAVAIL_MASK	0x00ff0000
 #define	HPTXSTS_PTXFSPCAVAIL_SHIFT	0
@@ -517,7 +535,7 @@
 #define	HCCHAR_MPS_MASK			0x000007ff
 
 #define	HCSPLT_SPLTENA			(1<<31)
-#define	HCSPLT_COMPSPLT		(1<<16)
+#define	HCSPLT_COMPSPLT			(1<<16)
 #define	HCSPLT_XACTPOS_SHIFT		14
 #define	HCSPLT_XACTPOS_MASK		0x0000c000
 #define	HCSPLT_HUBADDR_SHIFT		7
