Date: Thu, 4 Mar 2010 02:52:17 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204684 - in user/jmallett/octeon: lib/libc/mips sys/mips/cavium Message-ID: <201003040252.o242qHCC043262@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/syscall.h> -#include <machine/asm.h> +#include <machine/asm.h> /* * 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003040252.o242qHCC043262>