Received: by mail.netbsd.org (Postfix, from userid 605) id D0FD214A12B; Sun, 12 Jan 2014 12:25:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8EDC114A129 for ; Sun, 12 Jan 2014 12:25:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id JuUv_k4KK-BY for ; Sun, 12 Jan 2014 12:25:03 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 7560F14A0CF for ; Sun, 12 Jan 2014 12:25:03 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 423B296; Sun, 12 Jan 2014 12:25:03 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sun, 12 Jan 2014 12:25:03 +0000 From: "Manuel Bouyer" Subject: CVS commit: [netbsd-6] src/sys/arch/luna68k/dev To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20140112122503.423B296@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Manuel Bouyer" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: bouyer Date: Sun Jan 12 12:25:03 UTC 2014 Modified Files: src/sys/arch/luna68k/dev [netbsd-6]: lunafb.c omrasops.c omrasopsvar.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1005): sys/arch/luna68k/dev/omrasops.c: revision 1.15 sys/arch/luna68k/dev/omrasops.c: revision 1.16 sys/arch/luna68k/dev/lunafb.c: revision 1.27 sys/arch/luna68k/dev/lunafb.c: revision 1.28 sys/arch/luna68k/dev/lunafb.c: revision 1.29 sys/arch/luna68k/dev/lunafb.c: revision 1.30 sys/arch/luna68k/dev/omrasopsvar.h: revision 1.2 sys/arch/luna68k/dev/omrasops.c: revision 1.14 Properly initialize the palette for while on black even on 1bpp framebuffer. Preparing for demonstration in Open Source Conference 2013 Kyoto. Fix off by one in copyrows() backward case. Make omrasops copycols() op work even if columns are not 32 bit aligned. This means command line editing works properly in any cases. The bitcopy strategies for 1bpp copycols() op are taken from recently fixed MI sys/dev/rasops/rasops_bitops.h. GETBITS() and PUTBITS() m68k asm macro are taken from hp300. Tested on both 1bpp (on LUNA-II) and 4bpp (on LUNA) framebuffers. Initialize capabilities in struct wsscreen_descr per omrasops settings. Now REVERSE characters are drawn properly. Add preleminary support of 4bpp LUNA framebuffer. Changes details: - prepare and switch 4bpp rasops functions that read/write all 4 planes and also handle both fg and bg colors - make 1bpp ops use first plane on write rather than common bitmap plane (which is prepared for multiple plane write with raster ops) - prepare 4bpp allocattr function to handle ANSI 16 color text - split omrasops_init() function for each bpp - move struct hwcmap from softc to hwdevconfig to sync palette values on initialization - allow mmap(2) against all available planes Now we can use ANSI 16 color text console and also can demonstrate mlterm-fb with color sixel graphics and wallpaper. XXX: Xserver needs much more work. Pull a fix of Bt458 (8bpp framebuffer) initialization from OpenBSD/luna88k. http://marc.info/?l=openbsd-cvs&m=138838884202196 > Correct initialization of Bt458, used in LUNA's 8bpp frame buffer. > > According to the manual, the address register does not automatically > increment when we access to the control registers. Also we disable > overlay planes, because we do not use them. To generate a diff of this commit: cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/sys/arch/luna68k/dev/lunafb.c cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/arch/luna68k/dev/omrasops.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/luna68k/dev/omrasopsvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.