git: 19fe14ec4c0c - main - fb: whack __mips__ leftovers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Mar 2023 11:41:30 UTC
The branch main has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=19fe14ec4c0cb6cbcf00090e93bf70d34261b15e
commit 19fe14ec4c0cb6cbcf00090e93bf70d34261b15e
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2023-03-01 11:40:38 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-03-01 11:40:38 +0000
fb: whack __mips__ leftovers
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/dev/fb/fbreg.h | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 944243d4e687..928672eee21f 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -67,16 +67,8 @@ 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);
-#elif defined(__mips__) || defined(__arm__)
+#elif defined(__arm__)
-/*
- * Use amd64/i386-like settings under the assumption that MIPS-based display
- * drivers will have to add a level of indirection between a syscons-managed
- * frame buffer and the actual video hardware. We are forced to do this
- * because syscons doesn't carry around required busspace handles and tags to
- * use here. This is only really a problem for true VGA devices hooked up to
- * MIPS, as others will be performing a translation anyway.
- */
#define bcopy_io(s, d, c) memcpy((void *)(d), (void *)(s), (c))
#define bcopy_toio(s, d, c) memcpy((void *)(d), (void *)(s), (c))
#define bcopy_fromio(s, d, c) memcpy((void *)(d), (void *)(s), (c))
@@ -90,10 +82,8 @@ fillw(int val, uint16_t *buf, size_t size)
}
#define fillw_io(p, d, c) fillw((p), (void *)(d), (c))
-#if defined(__arm__)
#define readw(a) (*(uint16_t*)(a))
#define writew(a, v) (*(uint16_t*)(a) = (v))
-#endif
#else /* !__i386__ && !__amd64__ && !__powerpc__ */
#define bcopy_io(s, d, c) memcpy_io((d), (s), (c))