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

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/35fe924d49eb
changeset: 440:35fe924d49eb
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Tue Mar 20 01:09:25 2012 +0200
description:
DSR PHYs attach fine

diffstat:

 head/sys/contrib/octeon-sdk/cvmx-access-native.h |   4 ++--
 head/sys/contrib/octeon-sdk/cvmx-helper-board.c  |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r d8e61dcd88f8 -r 35fe924d49eb head/sys/contrib/octeon-sdk/cvmx-access-native.h
--- a/head/sys/contrib/octeon-sdk/cvmx-access-native.h	Tue Mar 20 01:02:45 2012 +0200
+++ b/head/sys/contrib/octeon-sdk/cvmx-access-native.h	Tue Mar 20 01:09:25 2012 +0200
@@ -456,14 +456,14 @@
         uint32_t tmp;                                                   \
                                                                         \
         asm volatile (                                                  \
-            ".set push\n"                                             \
+            ".set push\n"                                           	\
             ".set mips64\n"                                             \
             "dsll   %[val], %[csrh], 32\n"                              \
             "dsll   %[tmp], %[csrl], 32\n"                              \
             "dsrl   %[tmp], %[tmp], 32\n"                               \
             "or     %[val], %[val], %[tmp]\n"                           \
             LT "    %[val], 0(%[val])\n"                                \
-            ".set pop\n"                                             \
+            ".set pop\n"						\
             : [val] "=&r" (val), [tmp] "=&r" (tmp)                      \
             : [csrh] "r" (csr_addrh), [csrl] "r" (csr_addrl)            \
         );                                                              \
diff -r d8e61dcd88f8 -r 35fe924d49eb head/sys/contrib/octeon-sdk/cvmx-helper-board.c
--- a/head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Tue Mar 20 01:02:45 2012 +0200
+++ b/head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Tue Mar 20 01:09:25 2012 +0200
@@ -431,15 +431,15 @@
 	case CVMX_BOARD_TYPE_CUST_DLINK_DSR500N:
 	case CVMX_BOARD_TYPE_CUST_DLINK_DSR1000:
 	case CVMX_BOARD_TYPE_CUST_DLINK_DSR1000N:
-//            if (ipd_port == 0 || ipd_port == 1) //BCM53115 in RGMII 0,1
-//            {
+            if (ipd_port == 0 || ipd_port == 1) //BCM53115 in RGMII 0,1
+            {
                 result.s.link_up = 1;
                 result.s.full_duplex = 1;
                 result.s.speed = 1000;
                 return result;
-//            }
-//            else /* The other port uses a broadcom PHY (B5081) */
-//                is_broadcom_phy = 1;
+            }
+            else /* The other port uses a broadcom PHY (B5081) */
+                is_broadcom_phy = 1;
 	    break;
 #if defined(OCTEON_VENDOR_LANNER)
 	case CVMX_BOARD_TYPE_CUST_LANNER_MR730: