From owner-svn-src-user@FreeBSD.ORG Thu Mar 4 02:52:17 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4453B106566B; Thu, 4 Mar 2010 02:52:17 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 283C98FC08; Thu, 4 Mar 2010 02:52:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o242qHW4043265; Thu, 4 Mar 2010 02:52:17 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o242qHCC043262; Thu, 4 Mar 2010 02:52:17 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003040252.o242qHCC043262@svn.freebsd.org> From: Juli Mallett Date: Thu, 4 Mar 2010 02:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204684 - in user/jmallett/octeon: lib/libc/mips sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2010 02:52:17 -0000 Author: jmallett Date: Thu Mar 4 02:52:16 2010 New Revision: 204684 URL: http://svn.freebsd.org/changeset/base/204684 Log: Reduce gratuitous diffs with head. Modified: user/jmallett/octeon/lib/libc/mips/SYS.h user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Modified: user/jmallett/octeon/lib/libc/mips/SYS.h ============================================================================== --- user/jmallett/octeon/lib/libc/mips/SYS.h Thu Mar 4 02:32:45 2010 (r204683) +++ user/jmallett/octeon/lib/libc/mips/SYS.h Thu Mar 4 02:52:16 2010 (r204684) @@ -1,4 +1,5 @@ /* $NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 1996 Jonathan Stone @@ -66,8 +67,8 @@ */ #include -#include +#include /* * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Thu Mar 4 02:32:45 2010 (r204683) +++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Thu Mar 4 02:52:16 2010 (r204684) @@ -94,19 +94,19 @@ extern struct pcpu *cpuid_to_pcpu[]; static inline void oct_write64 (uint64_t csr_addr, uint64_t val64) { - volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *) csr_addr; *ptr = val64; } static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i) { - volatile int64_t *ptr = (volatile int64_t *)(intptr_t)csr_addr; + volatile int64_t *ptr = (volatile int64_t *) csr_addr; *ptr = val64i; } static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8) { - volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *) csr_addr; *ptr = (uint64_t) val8; } @@ -127,32 +127,32 @@ static inline void oct_write32 (uint64_t static inline uint8_t oct_read8 (uint64_t csr_addr) { - volatile uint8_t *ptr = (volatile uint8_t *)(intptr_t)csr_addr; + volatile uint8_t *ptr = (volatile uint8_t *) csr_addr; return (*ptr); } static inline uint8_t oct_read16 (uint64_t csr_addr) { - volatile uint16_t *ptr = (volatile uint16_t *)(intptr_t)csr_addr; + volatile uint16_t *ptr = (volatile uint16_t *) csr_addr; return (*ptr); } static inline uint32_t oct_read32 (uint64_t csr_addr) { - volatile uint32_t *ptr = (volatile uint32_t *)(intptr_t)csr_addr; + volatile uint32_t *ptr = (volatile uint32_t *) csr_addr; return (*ptr); } static inline uint64_t oct_read64 (uint64_t csr_addr) { - volatile uint64_t *ptr = (volatile uint64_t *)(intptr_t)csr_addr; + volatile uint64_t *ptr = (volatile uint64_t *) csr_addr; return (*ptr); } static inline int32_t oct_readint32 (uint64_t csr_addr) { - volatile int32_t *ptr = (volatile int32_t *)(intptr_t)csr_addr; + volatile int32_t *ptr = (volatile int32_t *) csr_addr; return (*ptr); }