From owner-svn-src-user@FreeBSD.ORG Tue Oct 22 14:39:33 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3987A895; Tue, 22 Oct 2013 14:39:33 +0000 (UTC) (envelope-from ray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 17E982F7F; Tue, 22 Oct 2013 14:39:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MEdWeb046971; Tue, 22 Oct 2013 14:39:32 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MEdW9o046969; Tue, 22 Oct 2013 14:39:32 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201310221439.r9MEdW9o046969@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 22 Oct 2013 14:39:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256904 - user/ed/newcons/sys/dev/vt/hw/fb X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 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: Tue, 22 Oct 2013 14:39:33 -0000 Author: ray Date: Tue Oct 22 14:39:32 2013 New Revision: 256904 URL: http://svnweb.freebsd.org/changeset/base/256904 Log: Add VT(9) driver for generic framebuffer. Sponsored by: The FreeBSD Foundation Added: user/ed/newcons/sys/dev/vt/hw/fb/ user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c (contents, props changed) user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.h (contents, props changed) Added: user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.c Tue Oct 22 14:39:32 2013 (r256904) @@ -0,0 +1,217 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Aleksandr Rybalko under sponsorship from the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +static vd_init_t vt_fb_init; +static vd_blank_t vt_fb_blank; +static vd_bitbltchr_t vt_fb_bitbltchr; +static vd_postswitch_t vt_fb_postswitch; + +static struct vt_driver vt_fb_driver = { + .vd_init = vt_fb_init, + .vd_blank = vt_fb_blank, + .vd_bitbltchr = vt_fb_bitbltchr, + .vd_postswitch = vt_fb_postswitch, + .vd_priority = VD_PRIORITY_GENERIC+10, +}; + +static void +vt_fb_blank(struct vt_device *vd, term_color_t color) +{ + struct fb_info *info; + uint32_t c; + u_int o; + + info = vd->vd_softc; + c = info->fb_cmap[color]; + switch (FBTYPE_GET_BYTESPP(info)) { + case 1: + for (o = 0; o < info->fb_stride; o++) + info->wr1(info, o, c); + break; + case 2: + for (o = 0; o < info->fb_stride; o += 2) + info->wr2(info, o, c); + break; + case 3: + /* line 0 */ + for (o = 0; o < info->fb_stride; o += 3) { + info->wr1(info, o, (c >> 16) & 0xff); + info->wr1(info, o + 1, (c >> 8) & 0xff); + info->wr1(info, o + 2, c & 0xff); + } + break; + case 4: + for (o = 0; o < info->fb_stride; o += 4) + info->wr4(info, o, c); + break; + default: + /* panic? */ + return; + } + /* Copy line0 to all other lines. */ + /* XXX will copy with borders. */ + for (o = 1; o < info->fb_height; o++) { + memmove((void *)(info->fb_vbase + o * info->fb_stride), + (void *)info->fb_vbase, info->fb_stride); + } +} + +static void +vt_fb_bitbltchr(struct vt_device *vd, const uint8_t *src, + vt_axis_t top, vt_axis_t left, unsigned int width, unsigned int height, + term_color_t fg, term_color_t bg) +{ + struct fb_info *info; + uint32_t fgc, bgc, cc, o; + int c, l, bpp; + u_long line; + uint8_t b; + + b = 0; + info = vd->vd_softc; + bpp = FBTYPE_GET_BYTESPP(info); + fgc = info->fb_cmap[fg]; + bgc = info->fb_cmap[bg]; + + line = (info->fb_stride * top) + (left * bpp); + for (l = 0; l < height; l++) { + for (c = 0; c < width; c++) { + if (c % 8 == 0) + b = *src++; + else + b <<= 1; + o = line + (c * bpp); + cc = b & 0x80 ? fgc : bgc; + + switch(bpp) { + case 1: + info->wr1(info, o, cc); + break; + case 2: + info->wr2(info, o, cc); + break; + case 3: + /* Packed mode, so unaligned. Byte access. */ + info->wr1(info, o, (cc >> 16) & 0xff); + info->wr1(info, o + 1, (cc >> 8) & 0xff); + info->wr1(info, o + 2, cc & 0xff); + break; + case 4: + info->wr4(info, o, cc); + break; + default: + /* panic? */ + break; + } + } + line += info->fb_stride; + } +} + +static void +vt_fb_postswitch(struct vt_device *vd) +{ + struct fb_info *info; + + info = vd->vd_softc; + + if (info->enter != NULL) + info->enter(info->fb_priv); +} + +static int +vt_fb_init_cmap(uint32_t *cmap, int depth) +{ + + switch (depth) { + case 8: + return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + 0x7, 5, 0x7, 2, 0x3, 0)); + case 15: + return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + 0x1f, 10, 0x1f, 5, 0x1f, 0)); + case 16: + return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + 0x1f, 11, 0x3f, 5, 0x1f, 0)); + case 24: + case 32: /* Ignore alpha. */ + return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + 0xff, 0, 0xff, 8, 0xff, 16)); + default: + return (1); + } +} + +static int +vt_fb_init(struct vt_device *vd) +{ + struct fb_info *info; + int err; + + info = vd->vd_softc; + vd->vd_height = info->fb_height; + vd->vd_width = info->fb_width; + + if (info->fb_cmsize <= 0) { + err = vt_fb_init_cmap(info->fb_cmap, FBTYPE_GET_BPP(info)); + if (err) + return (CN_DEAD); + info->fb_cmsize = 16; + } + + /* Clear the screen. */ + vt_fb_blank(vd, TC_BLACK); + + /* Wakeup screen. KMS need this. */ + vt_fb_postswitch(vd); + + return (CN_INTERNAL); +} + +int +vt_fb_attach(struct fb_info *info) +{ + + vt_allocate(&vt_fb_driver, info); + return (0); +} Added: user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ed/newcons/sys/dev/vt/hw/fb/vt_fb.h Tue Oct 22 14:39:32 2013 (r256904) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Aleksandr Rybalko under sponsorship from the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _DEV_VT_HW_FB_VT_FB_H_ +#define _DEV_VT_HW_FB_VT_FB_H_ +/* Generic framebuffer interface call vt_fb_attach to init VT(9) */ +int vt_fb_attach(struct fb_info *info); + +#endif /* _DEV_VT_HW_FB_VT_FB_H_ */