From nobody Wed Mar 1 11:41:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRXPk6tVHz3vlZP; Wed, 1 Mar 2023 11:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRXPk6Qbkz4VX0; Wed, 1 Mar 2023 11:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677670890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePIpyO1iPTZMD8IrhEO4J8ELx/97XPnYwoP/TEU2yqM=; b=K6ot/5fUJXlgnZMn2pJZRPGnT7OYuR3QPThmH48N9wM60lXRJztO0eoks3O5XkIUi0R4cw C45gahDCMi4xOpUmqcJbzaPXZ5TFyYgAwT1PkFiBLrdV8X0gs0/ttnQHaOvbW9vOBjYePv sskC4rDTtxBzuJRHH8b8jl2350IjQgMs3aWemjrnzSAQ4DUwwPNObfoL95BQgQ9iso4u3s bME4QoOoqZaERB8eEyuFc98IW/Vx5ImIS/AyFtK7WwxwGFL7GAWw5gxJs7ppMKHalMi8dM /rK1hF9JzcU6HW8xP7/nGFe0Dimvd3f14BKO2AAZCRpLr4Pj3kyazWlqyKxwpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677670890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePIpyO1iPTZMD8IrhEO4J8ELx/97XPnYwoP/TEU2yqM=; b=Yfd4MFTOtTneaBL2O3WkfZkVC7ofA1CxZ0A0VkC2e20R8qTIqrdUa8tZC4KbN65lx8eKid 3iItpWPldjntkz3dmTdhwu2889Wx4l2nyBRD9FlCzqUhNr1FNTzkoydIzeikMMef6wI2fi lttp5q/cBP1/10XjN6B+CbsMF2vUYVn5hWr1gFtNYnANpBfGMiWJRm4gWWCrL4w8alc629 EPDLikpDtKj3KF3J8bEbFr4GNNCkpdsP+oH3fOhsWA/eb4f8UbawBqolOyVux5iJbNewaa XEuv4sDXSxpPYJXMaTcWNMub4f3IliQSdShP8KmuraaBa8gy3jN187ccT/dW+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677670890; a=rsa-sha256; cv=none; b=l4pApgABMK7UfQvFTiHJ++ZXPZOBm2sYOa3Il5Ht093t7zgfHiKTo08yeNRtqGkf3LUCwM PYbTMU2qEgu9ka62ABJLj2zH1mXrToF89hPFJiBqWKH0AxquUgu821c9hpqUxFzC5iPNKz bSMzT+GdA11DUDC9XQ3T12C/bgpeMlmnYu3jV/ud51nHXmQS9TuJJsKytHprz7XGQHFVPI +AWklgPvTXPr3Kr/bTKLk4C1FeYwNDnWFhXtQfYJA+ESVgcVEpxlAVU2TpMbBNLKrIN/PC XpsyhBaP3mOhjSThWGHjFOGRnA07Sdjt22Jf0AewmivDA/BeCZcRMCEX9cR6kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRXPk5TlXzXg7; Wed, 1 Mar 2023 11:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321BfULf021579; Wed, 1 Mar 2023 11:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321BfU3P021578; Wed, 1 Mar 2023 11:41:30 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:41:30 GMT Message-Id: <202303011141.321BfU3P021578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 19fe14ec4c0c - main - fb: whack __mips__ leftovers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19fe14ec4c0cb6cbcf00090e93bf70d34261b15e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=19fe14ec4c0cb6cbcf00090e93bf70d34261b15e commit 19fe14ec4c0cb6cbcf00090e93bf70d34261b15e Author: Mateusz Guzik AuthorDate: 2023-03-01 11:40:38 +0000 Commit: Mateusz Guzik 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))