Module Name: src
Committed By: jakllsch
Date: Mon Apr 24 13:05:26 UTC 2017
Modified Files:
src/sys/dev/ic [jdolecek-ncq]: siisatareg.h
Log Message:
Merge HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.42.1 src/sys/dev/ic/siisatareg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/siisatareg.h
diff -u src/sys/dev/ic/siisatareg.h:1.7 src/sys/dev/ic/siisatareg.h:1.7.42.1
--- src/sys/dev/ic/siisatareg.h:1.7 Wed Nov 2 16:03:01 2011
+++ src/sys/dev/ic/siisatareg.h Mon Apr 24 13:05:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: siisatareg.h,v 1.7 2011/11/02 16:03:01 jakllsch Exp $ */
+/* $NetBSD: siisatareg.h,v 1.7.42.1 2017/04/24 13:05:26 jakllsch Exp $ */
/*
* Copyright (c) 2007, 2008, 2009, 2010, 2011 Jonathan A. Kollasch.
@@ -141,7 +141,7 @@ struct siisata_prb {
#define GR_GC_DEVSEL __BIT(19)
#define GR_GC_STOP __BIT(18)
#define GR_GC_TRDY __BIT(17)
-#define GR_GC_M66EN __BIT(16)
+#define GR_GC_M66EN __BIT(16)
#define GR_GC_PXIE_MASK __BITS(SIISATA_MAX_PORTS - 1, 0)
#define GR_GC_PXIE(n) __SHIFTIN(__BIT(n), GR_GC_PXIE_MASK)
@@ -247,6 +247,8 @@ struct siisata_prb {
#define PR_PC_PMP_ENABLE __BIT(13)
#define PR_PC_AIA __BIT(14)
#define PR_PC_LED_ON __BIT(15)
+#define PR_PS_ACTIVE_SLOT_MASK __BITS(20,16)
+#define PR_PS_ACTIVE_SLOT(x) __SHIFTOUT((x), PR_PS_ACTIVE_SLOT_MASK)
#define PR_PC_OOB_BYPASS __BIT(25)
#define PR_PS_PORT_READY __BIT(31)
