Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 23 Aug 2010 00:11:37 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r211668 - in user/nwhitehorn/ps3: dev/fb powerpc/ofw
Message-ID:  <201008230011.o7N0Bb5C020996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <dev/fb/fbreg.h>
- */
-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;
-}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008230011.o7N0Bb5C020996>