Module Name: src
Committed By: kiyohara
Date: Sat Jan 7 14:32:33 UTC 2017
Modified Files:
src/sys/dev/marvell: gtidmacreg.h
Log Message:
Fix macro MVXORE_CHAN2BASE(). The XORE has 2 channels per port.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/gtidmacreg.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/marvell/gtidmacreg.h
diff -u src/sys/dev/marvell/gtidmacreg.h:1.3 src/sys/dev/marvell/gtidmacreg.h:1.4
--- src/sys/dev/marvell/gtidmacreg.h:1.3 Mon Jul 23 06:09:47 2012
+++ src/sys/dev/marvell/gtidmacreg.h Sat Jan 7 14:32:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidmacreg.h,v 1.3 2012/07/23 06:09:47 kiyohara Exp $ */
+/* $NetBSD: gtidmacreg.h,v 1.4 2017/01/07 14:32:32 kiyohara Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -51,7 +51,7 @@
#define MVXORE_PORT2BASE(sc, p) \
(((sc)->sc_gtidmac_nchan == 0 && (p) == 0) ? -0x100 : 0x000)
#define MVXORE_CHAN2BASE(sc, c) \
- (MVXORE_PORT2BASE(sc, (c) & 0x4) + (((c) & 0x3) << 2))
+ (MVXORE_PORT2BASE(sc, (c) & 0xe) + (((c) & 0x1) << 2))
/* IDMA Descriptor Register Map */