From owner-svn-src-all@FreeBSD.ORG Fri May 10 04:49:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5684BF5E; Fri, 10 May 2013 04:49:41 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4A4C0CCD; Fri, 10 May 2013 04:49:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4A4ne3G002720; Fri, 10 May 2013 04:49:40 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4A4nePn002719; Fri, 10 May 2013 04:49:40 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201305100449.r4A4nePn002719@svn.freebsd.org> From: Warner Losh Date: Fri, 10 May 2013 04:49:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250434 - head/sys/contrib/octeon-sdk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 04:49:41 -0000 Author: imp Date: Fri May 10 04:49:40 2013 New Revision: 250434 URL: http://svnweb.freebsd.org/changeset/base/250434 Log: As requested, move this back to opt-in and list my boards. Modified: head/sys/contrib/octeon-sdk/cvmx-rtc.h Modified: head/sys/contrib/octeon-sdk/cvmx-rtc.h ============================================================================== --- head/sys/contrib/octeon-sdk/cvmx-rtc.h Fri May 10 04:30:14 2013 (r250433) +++ head/sys/contrib/octeon-sdk/cvmx-rtc.h Fri May 10 04:49:40 2013 (r250434) @@ -87,9 +87,18 @@ static inline cvmx_rtc_options_t cvmx_rt supported = CVMX_RTC_READ | CVMX_RTC_WRITE | CVMX_RTC_TIME_EPOCH; break; - default: + case CVMX_BOARD_TYPE_EBH3000: + case CVMX_BOARD_TYPE_CN3010_EVB_HS5: + case CVMX_BOARD_TYPE_EBH5200: +#if defined(OCTEON_VENDOR_GEFES) + case CVMX_BOARD_TYPE_CUST_W63XX: +#endif supported = CVMX_RTC_READ | CVMX_RTC_WRITE | CVMX_RTC_TIME_CAL; break; + + default: + supported = 0; + break; } #ifdef CVMX_RTC_DEBUG @@ -117,9 +126,18 @@ static inline uint32_t cvmx_rtc_read(voi return cvmx_rtc_ds1374_read(); break; - default: + case CVMX_BOARD_TYPE_EBH3000: + case CVMX_BOARD_TYPE_CN3010_EVB_HS5: + case CVMX_BOARD_TYPE_EBH5200: +#if defined(OCTEON_VENDOR_GEFES) + case CVMX_BOARD_TYPE_CUST_W63XX: +#endif return cvmx_rtc_ds1337_read(); break; + + default: + return 0; + break; } } @@ -138,9 +156,18 @@ static inline uint32_t cvmx_rtc_write(ui return cvmx_rtc_ds1374_write(time); break; - default: + case CVMX_BOARD_TYPE_EBH3000: + case CVMX_BOARD_TYPE_CN3010_EVB_HS5: + case CVMX_BOARD_TYPE_EBH5200: +#if defined(OCTEON_VENDOR_GEFES) + case CVMX_BOARD_TYPE_CUST_W63XX: +#endif return cvmx_rtc_ds1337_write(time); break; + + default: + return 0; + break; } }