From owner-svn-src-user@FreeBSD.ORG Mon Aug 23 00:11:38 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 CE2A6106576C; Mon, 23 Aug 2010 00:11:38 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D59198FC0C; Mon, 23 Aug 2010 00:11:37 +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 o7N0Bb4G020999; Mon, 23 Aug 2010 00:11:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7N0Bb5C020996; Mon, 23 Aug 2010 00:11:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201008230011.o7N0Bb5C020996@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 23 Aug 2010 00:11:37 +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: r211668 - in user/nwhitehorn/ps3: dev/fb powerpc/ofw 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: Mon, 23 Aug 2010 00:11:39 -0000 Author: nwhitehorn Date: Mon Aug 23 00:11:37 2010 New Revision: 211668 URL: http://svn.freebsd.org/changeset/base/211668 Log: Remove some unnecessary indirection that breaks when ofwfb is not in the kernel. Modified: user/nwhitehorn/ps3/dev/fb/fbreg.h user/nwhitehorn/ps3/powerpc/ofw/ofw_syscons.c Modified: user/nwhitehorn/ps3/dev/fb/fbreg.h ============================================================================== --- user/nwhitehorn/ps3/dev/fb/fbreg.h Mon Aug 23 00:10:43 2010 (r211667) +++ user/nwhitehorn/ps3/dev/fb/fbreg.h Mon Aug 23 00:11:37 2010 (r211668) @@ -70,19 +70,19 @@ fillw(int val, uint16_t *buf, size_t siz } #elif defined(__powerpc__) -#define bcopy_io(s, d, c) ofwfb_bcopy((void *)(s), (void *)(d), (c)) -#define bcopy_toio(s, d, c) ofwfb_bcopy((void *)(s), (void *)(d), (c)) -#define bcopy_fromio(s, d, c) ofwfb_bcopy((void *)(s), (void *)(d), (c)) -#define bzero_io(d, c) ofwfb_bzero((void *)(d), (c)) -#define fillw(p, d, c) ofwfb_fillw((p), (void *)(d), (c)) -#define fillw_io(p, d, c) ofwfb_fillw((p), (void *)(d), (c)) -#define readw(a) ofwfb_readw((u_int16_t *)(a)) -#define writew(a, v) ofwfb_writew((u_int16_t *)(a), (v)) -void ofwfb_bcopy(const void *s, void *d, size_t c); -void ofwfb_bzero(void *d, size_t c); -void ofwfb_fillw(int pat, void *base, size_t cnt); -u_int16_t ofwfb_readw(u_int16_t *addr); -void ofwfb_writew(u_int16_t *addr, u_int16_t val); +#define bcopy_io(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bcopy_toio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bcopy_fromio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bzero_io(d, c) bzero((void *)(d), (c)) +#define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) +#define readw(a) (*(u_int16_t *)(a)) +#define writew(a, v) (*(u_int16_t *)(a) = (v)) +static __inline void +fillw(int val, uint16_t *buf, size_t size) +{ + while (size--) + *buf++ = val; +} #else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */ #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) Modified: user/nwhitehorn/ps3/powerpc/ofw/ofw_syscons.c ============================================================================== --- user/nwhitehorn/ps3/powerpc/ofw/ofw_syscons.c Mon Aug 23 00:10:43 2010 (r211667) +++ user/nwhitehorn/ps3/powerpc/ofw/ofw_syscons.c Mon Aug 23 00:11:37 2010 (r211668) @@ -991,38 +991,3 @@ dummy_kbd_configure(int flags) } KEYBOARD_DRIVER(dummy, dummysw, dummy_kbd_configure); -/* - * Utility routines from - */ -void -ofwfb_bcopy(const void *s, void *d, size_t c) -{ - bcopy(s, d, c); -} - -void -ofwfb_bzero(void *d, size_t c) -{ - bzero(d, c); -} - -void -ofwfb_fillw(int pat, void *base, size_t cnt) -{ - u_int16_t *bptr = base; - - while (cnt--) - *bptr++ = pat; -} - -u_int16_t -ofwfb_readw(u_int16_t *addr) -{ - return (*addr); -} - -void -ofwfb_writew(u_int16_t *addr, u_int16_t val) -{ - *addr = val; -}