2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2002-11-03 00:24:07 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2002 ELTEC Elektronik AG
|
|
|
|
* Frank Gottschling <fgottschling@eltec.de>
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* cfb_console.c
|
|
|
|
*
|
|
|
|
* Color Framebuffer Console driver for 8/15/16/24/32 bits per pixel.
|
|
|
|
*
|
|
|
|
* At the moment only the 8x16 font is tested and the font fore- and
|
|
|
|
* background color is limited to black/white/gray colors. The Linux
|
|
|
|
* logo can be placed in the upper left corner and additional board
|
2011-07-29 09:55:27 +00:00
|
|
|
* information strings (that normally goes to serial port) can be drawn.
|
2002-11-03 00:24:07 +00:00
|
|
|
*
|
2015-11-11 17:05:47 +00:00
|
|
|
* The console driver can use a keyboard interface for character input
|
|
|
|
* but this is deprecated. Only rk51 uses it.
|
|
|
|
*
|
|
|
|
* Character output goes to a memory-mapped video
|
2002-11-03 00:24:07 +00:00
|
|
|
* framebuffer with little or big-endian organisation.
|
|
|
|
* With environment setting 'console=serial' the console i/o can be
|
|
|
|
* forced to serial port.
|
2011-07-29 09:55:27 +00:00
|
|
|
*
|
|
|
|
* The driver uses graphic specific defines/parameters/functions:
|
|
|
|
*
|
|
|
|
* (for SMI LynxE graphic chip)
|
|
|
|
*
|
|
|
|
* VIDEO_FB_LITTLE_ENDIAN - framebuffer organisation default: big endian
|
|
|
|
* VIDEO_HW_RECTFILL - graphic driver supports hardware rectangle fill
|
|
|
|
* VIDEO_HW_BITBLT - graphic driver supports hardware bit blt
|
|
|
|
*
|
|
|
|
* Console Parameters are set by graphic drivers global struct:
|
|
|
|
*
|
|
|
|
* VIDEO_VISIBLE_COLS - x resolution
|
|
|
|
* VIDEO_VISIBLE_ROWS - y resolution
|
|
|
|
* VIDEO_PIXEL_SIZE - storage size in byte per pixel
|
|
|
|
* VIDEO_DATA_FORMAT - graphical data format GDF
|
|
|
|
* VIDEO_FB_ADRS - start of video memory
|
|
|
|
*
|
|
|
|
* VIDEO_KBD_INIT_FCT - init function for keyboard
|
|
|
|
* VIDEO_TSTC_FCT - keyboard_tstc function
|
|
|
|
* VIDEO_GETC_FCT - keyboard_getc function
|
|
|
|
*
|
2012-09-13 22:29:01 +00:00
|
|
|
* CONFIG_VIDEO_LOGO - display Linux Logo in upper left corner.
|
|
|
|
* Use CONFIG_SPLASH_SCREEN_ALIGN with
|
|
|
|
* environment variable "splashpos" to place
|
|
|
|
* the logo on other position. In this case
|
|
|
|
* no CONSOLE_EXTRA_INFO is possible.
|
2011-07-29 09:55:27 +00:00
|
|
|
* CONFIG_VIDEO_BMP_LOGO - use bmp_logo instead of linux_logo
|
|
|
|
* CONFIG_CONSOLE_EXTRA_INFO - display additional board information
|
|
|
|
* strings that normaly goes to serial
|
|
|
|
* port. This define requires a board
|
|
|
|
* specific function:
|
|
|
|
* video_drawstring (VIDEO_INFO_X,
|
|
|
|
* VIDEO_INFO_Y + i*VIDEO_FONT_HEIGHT,
|
|
|
|
* info);
|
|
|
|
* that fills a info buffer at i=row.
|
|
|
|
* s.a: board/eltec/bab7xx.
|
|
|
|
*
|
|
|
|
* CONFIG_VIDEO_SW_CURSOR: - Draws a cursor after the last
|
|
|
|
* character. No blinking is provided.
|
|
|
|
* Uses the macros CURSOR_SET and
|
|
|
|
* CURSOR_OFF.
|
|
|
|
*/
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
#include <common.h>
|
2020-05-10 17:40:03 +00:00
|
|
|
#include <command.h>
|
2019-11-14 19:57:37 +00:00
|
|
|
#include <cpu_func.h>
|
2019-08-01 15:46:52 +00:00
|
|
|
#include <env.h>
|
2015-03-02 19:40:50 +00:00
|
|
|
#include <fdtdec.h>
|
2019-08-01 15:46:36 +00:00
|
|
|
#include <gzip.h>
|
2020-05-10 17:40:05 +00:00
|
|
|
#include <log.h>
|
2011-07-18 18:24:04 +00:00
|
|
|
#include <version.h>
|
2002-12-03 21:28:10 +00:00
|
|
|
#include <malloc.h>
|
2016-10-18 02:12:54 +00:00
|
|
|
#include <video.h>
|
2020-10-31 03:38:53 +00:00
|
|
|
#include <asm/global_data.h>
|
2011-11-04 15:55:20 +00:00
|
|
|
#include <linux/compiler.h>
|
2002-12-03 21:28:10 +00:00
|
|
|
|
2016-10-18 02:12:47 +00:00
|
|
|
#if defined(CONFIG_VIDEO_MXS)
|
2013-04-28 09:20:03 +00:00
|
|
|
#define VIDEO_FB_16BPP_WORD_SWAP
|
|
|
|
#endif
|
|
|
|
|
video: Moving mx3fb.c to CONFIG_VIDEO
mx3fb.c was based on CONFIG_LCD and is moved by this patch to
CONFIG_VIDEO, which has greater freedom in selecting videomodes
even at runtime.
This renders the accumulating list of display defines
(CONFIG_DISPLAY_VBEST..., CONFIG_DISPLAY_C057...) obsolete as
these may be setup through env variables:
uboot> setenv mydisplay 'video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,
le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:100663296,vmode:0'
uboot> setenv videomode ${mydisplay}
This commit also fixes the board config files for qong and
imx31_phycore boards as needed. The videomode settings of
previously supported displays are added to CONFIG_EXTRA_ENV_SETTINGS
now. CONFIG_SYS_MALLOC_LEN for imx31_phycore board is increased
to make the frame buffer allocation working with the changed
driver.
Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
2011-10-12 23:16:29 +00:00
|
|
|
/*
|
|
|
|
* Defines for the i.MX31 driver (mx3fb.c)
|
|
|
|
*/
|
2012-05-31 07:23:56 +00:00
|
|
|
#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_IPUV3)
|
video: Moving mx3fb.c to CONFIG_VIDEO
mx3fb.c was based on CONFIG_LCD and is moved by this patch to
CONFIG_VIDEO, which has greater freedom in selecting videomodes
even at runtime.
This renders the accumulating list of display defines
(CONFIG_DISPLAY_VBEST..., CONFIG_DISPLAY_C057...) obsolete as
these may be setup through env variables:
uboot> setenv mydisplay 'video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,
le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:100663296,vmode:0'
uboot> setenv videomode ${mydisplay}
This commit also fixes the board config files for qong and
imx31_phycore boards as needed. The videomode settings of
previously supported displays are added to CONFIG_EXTRA_ENV_SETTINGS
now. CONFIG_SYS_MALLOC_LEN for imx31_phycore board is increased
to make the frame buffer allocation working with the changed
driver.
Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
2011-10-12 23:16:29 +00:00
|
|
|
#define VIDEO_FB_16BPP_WORD_SWAP
|
|
|
|
#endif
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
/*
|
|
|
|
* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc.
|
|
|
|
*/
|
2002-11-03 00:24:07 +00:00
|
|
|
#include <video_fb.h>
|
|
|
|
|
2013-06-17 18:31:29 +00:00
|
|
|
#include <splash.h>
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
/*
|
|
|
|
* some Macros
|
|
|
|
*/
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_VISIBLE_COLS (pGD->winSizeX)
|
|
|
|
#define VIDEO_VISIBLE_ROWS (pGD->winSizeY)
|
|
|
|
#define VIDEO_PIXEL_SIZE (pGD->gdfBytesPP)
|
|
|
|
#define VIDEO_DATA_FORMAT (pGD->gdfIndex)
|
|
|
|
#define VIDEO_FB_ADRS (pGD->frameAdrs)
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
/*
|
|
|
|
* Console device
|
|
|
|
*/
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
#include <version.h>
|
|
|
|
#include <linux/types.h>
|
2009-05-16 10:14:54 +00:00
|
|
|
#include <stdio_dev.h>
|
2002-11-03 00:24:07 +00:00
|
|
|
#include <video_font.h>
|
|
|
|
|
2007-07-10 16:13:21 +00:00
|
|
|
#if defined(CONFIG_CMD_DATE)
|
|
|
|
#include <rtc.h>
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
|
|
|
|
2007-07-09 22:30:01 +00:00
|
|
|
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
|
2004-03-14 16:51:43 +00:00
|
|
|
#include <watchdog.h>
|
|
|
|
#include <bmp_layout.h>
|
2013-07-01 22:04:05 +00:00
|
|
|
#include <splash.h>
|
2007-07-09 22:30:01 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2016-10-18 02:12:50 +00:00
|
|
|
#if !defined(CONFIG_VIDEO_SW_CURSOR)
|
2002-11-03 00:24:07 +00:00
|
|
|
/* no Cursor defined */
|
|
|
|
#define CURSOR_ON
|
|
|
|
#define CURSOR_OFF
|
|
|
|
#define CURSOR_SET
|
|
|
|
#endif
|
|
|
|
|
2015-10-19 03:17:18 +00:00
|
|
|
#if defined(CONFIG_VIDEO_SW_CURSOR)
|
2011-07-29 09:55:27 +00:00
|
|
|
void console_cursor(int state);
|
|
|
|
|
2010-08-27 20:45:47 +00:00
|
|
|
#define CURSOR_ON console_cursor(1)
|
|
|
|
#define CURSOR_OFF console_cursor(0)
|
2011-11-30 13:50:50 +00:00
|
|
|
#define CURSOR_SET video_set_cursor()
|
2015-10-19 03:17:18 +00:00
|
|
|
#endif /* CONFIG_VIDEO_SW_CURSOR */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_LOGO
|
2002-12-03 21:28:10 +00:00
|
|
|
#include <bmp_logo.h>
|
2011-10-20 23:04:20 +00:00
|
|
|
#include <bmp_logo_data.h>
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_LOGO_WIDTH BMP_LOGO_WIDTH
|
|
|
|
#define VIDEO_LOGO_HEIGHT BMP_LOGO_HEIGHT
|
|
|
|
#define VIDEO_LOGO_LUT_OFFSET BMP_LOGO_OFFSET
|
|
|
|
#define VIDEO_LOGO_COLORS BMP_LOGO_COLORS
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
#else /* CONFIG_VIDEO_BMP_LOGO */
|
2004-03-14 16:51:43 +00:00
|
|
|
#define LINUX_LOGO_WIDTH 80
|
|
|
|
#define LINUX_LOGO_HEIGHT 80
|
|
|
|
#define LINUX_LOGO_COLORS 214
|
|
|
|
#define LINUX_LOGO_LUT_OFFSET 0x20
|
2002-11-03 00:24:07 +00:00
|
|
|
#define __initdata
|
|
|
|
#include <linux_logo.h>
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_LOGO_WIDTH LINUX_LOGO_WIDTH
|
|
|
|
#define VIDEO_LOGO_HEIGHT LINUX_LOGO_HEIGHT
|
|
|
|
#define VIDEO_LOGO_LUT_OFFSET LINUX_LOGO_LUT_OFFSET
|
|
|
|
#define VIDEO_LOGO_COLORS LINUX_LOGO_COLORS
|
2011-07-29 09:55:27 +00:00
|
|
|
#endif /* CONFIG_VIDEO_BMP_LOGO */
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_INFO_X (VIDEO_LOGO_WIDTH)
|
|
|
|
#define VIDEO_INFO_Y (VIDEO_FONT_HEIGHT/2)
|
2011-07-29 09:55:27 +00:00
|
|
|
#else /* CONFIG_VIDEO_LOGO */
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_LOGO_WIDTH 0
|
|
|
|
#define VIDEO_LOGO_HEIGHT 0
|
2011-07-29 09:55:27 +00:00
|
|
|
#endif /* CONFIG_VIDEO_LOGO */
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
#define VIDEO_COLS VIDEO_VISIBLE_COLS
|
|
|
|
#define VIDEO_ROWS VIDEO_VISIBLE_ROWS
|
2015-08-04 10:15:39 +00:00
|
|
|
#ifndef VIDEO_LINE_LEN
|
|
|
|
#define VIDEO_LINE_LEN (VIDEO_COLS * VIDEO_PIXEL_SIZE)
|
|
|
|
#endif
|
|
|
|
#define VIDEO_SIZE (VIDEO_ROWS * VIDEO_LINE_LEN)
|
2004-03-14 16:51:43 +00:00
|
|
|
#define VIDEO_BURST_LEN (VIDEO_COLS/8)
|
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
2010-01-12 11:06:31 +00:00
|
|
|
#define CONSOLE_ROWS ((VIDEO_ROWS - video_logo_height) / VIDEO_FONT_HEIGHT)
|
2002-11-03 00:24:07 +00:00
|
|
|
#else
|
2004-03-14 16:51:43 +00:00
|
|
|
#define CONSOLE_ROWS (VIDEO_ROWS / VIDEO_FONT_HEIGHT)
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
#define CONSOLE_COLS (VIDEO_COLS / VIDEO_FONT_WIDTH)
|
|
|
|
#define CONSOLE_ROW_SIZE (VIDEO_FONT_HEIGHT * VIDEO_LINE_LEN)
|
|
|
|
#define CONSOLE_ROW_FIRST (video_console_address)
|
|
|
|
#define CONSOLE_ROW_SECOND (video_console_address + CONSOLE_ROW_SIZE)
|
|
|
|
#define CONSOLE_ROW_LAST (video_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE)
|
|
|
|
#define CONSOLE_SIZE (CONSOLE_ROW_SIZE * CONSOLE_ROWS)
|
2015-01-01 23:17:57 +00:00
|
|
|
|
|
|
|
/* By default we scroll by a single line */
|
|
|
|
#ifndef CONFIG_CONSOLE_SCROLL_LINES
|
|
|
|
#define CONFIG_CONSOLE_SCROLL_LINES 1
|
|
|
|
#endif
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
/* Macros */
|
2004-03-14 16:51:43 +00:00
|
|
|
#ifdef VIDEO_FB_LITTLE_ENDIAN
|
2011-07-29 09:55:27 +00:00
|
|
|
#define SWAP16(x) ((((x) & 0x00ff) << 8) | \
|
|
|
|
((x) >> 8) \
|
|
|
|
)
|
|
|
|
#define SWAP32(x) ((((x) & 0x000000ff) << 24) | \
|
|
|
|
(((x) & 0x0000ff00) << 8) | \
|
|
|
|
(((x) & 0x00ff0000) >> 8) | \
|
|
|
|
(((x) & 0xff000000) >> 24) \
|
|
|
|
)
|
|
|
|
#define SHORTSWAP32(x) ((((x) & 0x000000ff) << 8) | \
|
|
|
|
(((x) & 0x0000ff00) >> 8) | \
|
|
|
|
(((x) & 0x00ff0000) << 8) | \
|
|
|
|
(((x) & 0xff000000) >> 8) \
|
|
|
|
)
|
2002-11-03 00:24:07 +00:00
|
|
|
#else
|
2011-07-29 09:55:27 +00:00
|
|
|
#define SWAP16(x) (x)
|
|
|
|
#define SWAP32(x) (x)
|
2009-10-23 10:03:15 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_WORD_SWAP)
|
2011-07-29 09:55:27 +00:00
|
|
|
#define SHORTSWAP32(x) (((x) >> 16) | ((x) << 16))
|
2008-08-29 17:30:39 +00:00
|
|
|
#else
|
2011-07-29 09:55:27 +00:00
|
|
|
#define SHORTSWAP32(x) (x)
|
2008-01-11 13:30:01 +00:00
|
|
|
#endif
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
|
|
|
|
2012-06-05 07:19:18 +00:00
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2002-11-03 00:24:07 +00:00
|
|
|
/* Locals */
|
|
|
|
static GraphicDevice *pGD; /* Pointer to Graphic array */
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void *video_fb_address; /* frame buffer address */
|
2004-03-14 16:51:43 +00:00
|
|
|
static void *video_console_address; /* console buffer start address */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2010-01-12 11:06:31 +00:00
|
|
|
static int video_logo_height = VIDEO_LOGO_HEIGHT;
|
|
|
|
|
2011-12-07 03:58:10 +00:00
|
|
|
static int __maybe_unused cursor_state;
|
|
|
|
static int __maybe_unused old_col;
|
|
|
|
static int __maybe_unused old_row;
|
2011-11-30 13:50:50 +00:00
|
|
|
|
2011-07-30 12:48:09 +00:00
|
|
|
static int console_col; /* cursor col */
|
|
|
|
static int console_row; /* cursor row */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static u32 eorx, fgx, bgx; /* color pats */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2012-06-05 07:19:18 +00:00
|
|
|
static int cfb_do_flush_cache;
|
|
|
|
|
2012-10-19 13:30:09 +00:00
|
|
|
#ifdef CONFIG_CFB_CONSOLE_ANSI
|
|
|
|
static char ansi_buf[10];
|
|
|
|
static int ansi_buf_size;
|
|
|
|
static int ansi_colors_need_revert;
|
|
|
|
static int ansi_cursor_hidden;
|
|
|
|
#endif
|
|
|
|
|
2002-11-03 00:24:07 +00:00
|
|
|
static const int video_font_draw_table8[] = {
|
2011-07-29 09:55:27 +00:00
|
|
|
0x00000000, 0x000000ff, 0x0000ff00, 0x0000ffff,
|
|
|
|
0x00ff0000, 0x00ff00ff, 0x00ffff00, 0x00ffffff,
|
|
|
|
0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff,
|
|
|
|
0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff
|
|
|
|
};
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
static const int video_font_draw_table15[] = {
|
2011-07-29 09:55:27 +00:00
|
|
|
0x00000000, 0x00007fff, 0x7fff0000, 0x7fff7fff
|
|
|
|
};
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
static const int video_font_draw_table16[] = {
|
2011-07-29 09:55:27 +00:00
|
|
|
0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
|
|
|
|
};
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
static const int video_font_draw_table24[16][3] = {
|
2011-07-29 09:55:27 +00:00
|
|
|
{0x00000000, 0x00000000, 0x00000000},
|
|
|
|
{0x00000000, 0x00000000, 0x00ffffff},
|
|
|
|
{0x00000000, 0x0000ffff, 0xff000000},
|
|
|
|
{0x00000000, 0x0000ffff, 0xffffffff},
|
|
|
|
{0x000000ff, 0xffff0000, 0x00000000},
|
|
|
|
{0x000000ff, 0xffff0000, 0x00ffffff},
|
|
|
|
{0x000000ff, 0xffffffff, 0xff000000},
|
|
|
|
{0x000000ff, 0xffffffff, 0xffffffff},
|
|
|
|
{0xffffff00, 0x00000000, 0x00000000},
|
|
|
|
{0xffffff00, 0x00000000, 0x00ffffff},
|
|
|
|
{0xffffff00, 0x0000ffff, 0xff000000},
|
|
|
|
{0xffffff00, 0x0000ffff, 0xffffffff},
|
|
|
|
{0xffffffff, 0xffff0000, 0x00000000},
|
|
|
|
{0xffffffff, 0xffff0000, 0x00ffffff},
|
|
|
|
{0xffffffff, 0xffffffff, 0xff000000},
|
|
|
|
{0xffffffff, 0xffffffff, 0xffffffff}
|
|
|
|
};
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
static const int video_font_draw_table32[16][4] = {
|
2011-07-29 09:55:27 +00:00
|
|
|
{0x00000000, 0x00000000, 0x00000000, 0x00000000},
|
|
|
|
{0x00000000, 0x00000000, 0x00000000, 0x00ffffff},
|
|
|
|
{0x00000000, 0x00000000, 0x00ffffff, 0x00000000},
|
|
|
|
{0x00000000, 0x00000000, 0x00ffffff, 0x00ffffff},
|
|
|
|
{0x00000000, 0x00ffffff, 0x00000000, 0x00000000},
|
|
|
|
{0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff},
|
|
|
|
{0x00000000, 0x00ffffff, 0x00ffffff, 0x00000000},
|
|
|
|
{0x00000000, 0x00ffffff, 0x00ffffff, 0x00ffffff},
|
|
|
|
{0x00ffffff, 0x00000000, 0x00000000, 0x00000000},
|
|
|
|
{0x00ffffff, 0x00000000, 0x00000000, 0x00ffffff},
|
|
|
|
{0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000},
|
|
|
|
{0x00ffffff, 0x00000000, 0x00ffffff, 0x00ffffff},
|
|
|
|
{0x00ffffff, 0x00ffffff, 0x00000000, 0x00000000},
|
|
|
|
{0x00ffffff, 0x00ffffff, 0x00000000, 0x00ffffff},
|
|
|
|
{0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00000000},
|
|
|
|
{0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff}
|
|
|
|
};
|
|
|
|
|
2013-08-03 05:22:53 +00:00
|
|
|
/*
|
|
|
|
* Implement a weak default function for boards that optionally
|
|
|
|
* need to skip the cfb initialization.
|
|
|
|
*/
|
|
|
|
__weak int board_cfb_skip(void)
|
|
|
|
{
|
|
|
|
/* As default, don't skip cfb init */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void video_drawchars(int xx, int yy, unsigned char *s, int count)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 *cdat, *dest, *dest0;
|
|
|
|
int rows, offset, c;
|
|
|
|
|
|
|
|
offset = yy * VIDEO_LINE_LEN + xx * VIDEO_PIXEL_SIZE;
|
|
|
|
dest0 = video_fb_address + offset;
|
|
|
|
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
|
|
|
case GDF__8BIT_332RGB:
|
|
|
|
while (count--) {
|
|
|
|
c = *s;
|
|
|
|
cdat = video_fontdata + c * VIDEO_FONT_HEIGHT;
|
|
|
|
for (rows = VIDEO_FONT_HEIGHT, dest = dest0;
|
2011-07-29 09:55:27 +00:00
|
|
|
rows--; dest += VIDEO_LINE_LEN) {
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 bits = *cdat++;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[0] =
|
|
|
|
(video_font_draw_table8[bits >> 4] &
|
|
|
|
eorx) ^ bgx;
|
2013-07-30 21:37:59 +00:00
|
|
|
|
|
|
|
if (VIDEO_FONT_WIDTH == 4)
|
|
|
|
continue;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[1] =
|
|
|
|
(video_font_draw_table8[bits & 15] &
|
|
|
|
eorx) ^ bgx;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case GDF_15BIT_555RGB:
|
|
|
|
while (count--) {
|
|
|
|
c = *s;
|
|
|
|
cdat = video_fontdata + c * VIDEO_FONT_HEIGHT;
|
|
|
|
for (rows = VIDEO_FONT_HEIGHT, dest = dest0;
|
2011-07-29 09:55:27 +00:00
|
|
|
rows--; dest += VIDEO_LINE_LEN) {
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 bits = *cdat++;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[0] =
|
|
|
|
SHORTSWAP32((video_font_draw_table15
|
|
|
|
[bits >> 6] & eorx) ^
|
|
|
|
bgx);
|
|
|
|
((u32 *) dest)[1] =
|
|
|
|
SHORTSWAP32((video_font_draw_table15
|
|
|
|
[bits >> 4 & 3] & eorx) ^
|
|
|
|
bgx);
|
2013-07-30 21:37:59 +00:00
|
|
|
|
|
|
|
if (VIDEO_FONT_WIDTH == 4)
|
|
|
|
continue;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[2] =
|
|
|
|
SHORTSWAP32((video_font_draw_table15
|
|
|
|
[bits >> 2 & 3] & eorx) ^
|
|
|
|
bgx);
|
|
|
|
((u32 *) dest)[3] =
|
|
|
|
SHORTSWAP32((video_font_draw_table15
|
|
|
|
[bits & 3] & eorx) ^
|
|
|
|
bgx);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
while (count--) {
|
|
|
|
c = *s;
|
|
|
|
cdat = video_fontdata + c * VIDEO_FONT_HEIGHT;
|
|
|
|
for (rows = VIDEO_FONT_HEIGHT, dest = dest0;
|
2011-07-29 09:55:27 +00:00
|
|
|
rows--; dest += VIDEO_LINE_LEN) {
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 bits = *cdat++;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[0] =
|
|
|
|
SHORTSWAP32((video_font_draw_table16
|
|
|
|
[bits >> 6] & eorx) ^
|
|
|
|
bgx);
|
|
|
|
((u32 *) dest)[1] =
|
|
|
|
SHORTSWAP32((video_font_draw_table16
|
|
|
|
[bits >> 4 & 3] & eorx) ^
|
|
|
|
bgx);
|
2013-07-30 21:37:59 +00:00
|
|
|
|
|
|
|
if (VIDEO_FONT_WIDTH == 4)
|
|
|
|
continue;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[2] =
|
|
|
|
SHORTSWAP32((video_font_draw_table16
|
|
|
|
[bits >> 2 & 3] & eorx) ^
|
|
|
|
bgx);
|
|
|
|
((u32 *) dest)[3] =
|
|
|
|
SHORTSWAP32((video_font_draw_table16
|
|
|
|
[bits & 3] & eorx) ^
|
|
|
|
bgx);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
while (count--) {
|
|
|
|
c = *s;
|
|
|
|
cdat = video_fontdata + c * VIDEO_FONT_HEIGHT;
|
|
|
|
for (rows = VIDEO_FONT_HEIGHT, dest = dest0;
|
2011-07-29 09:55:27 +00:00
|
|
|
rows--; dest += VIDEO_LINE_LEN) {
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 bits = *cdat++;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[0] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits >> 4][0] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[1] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits >> 4][1] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[2] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits >> 4][2] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[3] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits >> 4][3] & eorx) ^ bgx);
|
2013-07-30 21:37:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
if (VIDEO_FONT_WIDTH == 4)
|
|
|
|
continue;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[4] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits & 15][0] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[5] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits & 15][1] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[6] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits & 15][2] & eorx) ^ bgx);
|
|
|
|
((u32 *) dest)[7] =
|
|
|
|
SWAP32((video_font_draw_table32
|
|
|
|
[bits & 15][3] & eorx) ^ bgx);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case GDF_24BIT_888RGB:
|
|
|
|
while (count--) {
|
|
|
|
c = *s;
|
|
|
|
cdat = video_fontdata + c * VIDEO_FONT_HEIGHT;
|
|
|
|
for (rows = VIDEO_FONT_HEIGHT, dest = dest0;
|
2011-07-29 09:55:27 +00:00
|
|
|
rows--; dest += VIDEO_LINE_LEN) {
|
2004-03-14 16:51:43 +00:00
|
|
|
u8 bits = *cdat++;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[0] =
|
|
|
|
(video_font_draw_table24[bits >> 4][0]
|
|
|
|
& eorx) ^ bgx;
|
|
|
|
((u32 *) dest)[1] =
|
|
|
|
(video_font_draw_table24[bits >> 4][1]
|
|
|
|
& eorx) ^ bgx;
|
|
|
|
((u32 *) dest)[2] =
|
|
|
|
(video_font_draw_table24[bits >> 4][2]
|
|
|
|
& eorx) ^ bgx;
|
2013-07-30 21:37:59 +00:00
|
|
|
|
|
|
|
if (VIDEO_FONT_WIDTH == 4)
|
|
|
|
continue;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
((u32 *) dest)[3] =
|
|
|
|
(video_font_draw_table24[bits & 15][0]
|
|
|
|
& eorx) ^ bgx;
|
|
|
|
((u32 *) dest)[4] =
|
|
|
|
(video_font_draw_table24[bits & 15][1]
|
|
|
|
& eorx) ^ bgx;
|
|
|
|
((u32 *) dest)[5] =
|
|
|
|
(video_font_draw_table24[bits & 15][2]
|
|
|
|
& eorx) ^ bgx;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
break;
|
2003-06-27 21:31:46 +00:00
|
|
|
}
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static inline void video_drawstring(int xx, int yy, unsigned char *s)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawchars(xx, yy, s, strlen((char *) s));
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void video_putchar(int xx, int yy, unsigned char c)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawchars(xx, yy + video_logo_height, &c, 1);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2015-10-19 03:17:18 +00:00
|
|
|
#if defined(CONFIG_VIDEO_SW_CURSOR)
|
2011-07-29 09:55:27 +00:00
|
|
|
static void video_set_cursor(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2011-11-30 13:50:50 +00:00
|
|
|
if (cursor_state)
|
|
|
|
console_cursor(0);
|
|
|
|
console_cursor(1);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
2011-07-29 09:55:27 +00:00
|
|
|
|
2011-12-07 03:58:10 +00:00
|
|
|
static void video_invertchar(int xx, int yy)
|
|
|
|
{
|
|
|
|
int firstx = xx * VIDEO_PIXEL_SIZE;
|
|
|
|
int lastx = (xx + VIDEO_FONT_WIDTH) * VIDEO_PIXEL_SIZE;
|
|
|
|
int firsty = yy * VIDEO_LINE_LEN;
|
|
|
|
int lasty = (yy + VIDEO_FONT_HEIGHT) * VIDEO_LINE_LEN;
|
|
|
|
int x, y;
|
|
|
|
for (y = firsty; y < lasty; y += VIDEO_LINE_LEN) {
|
|
|
|
for (x = firstx; x < lastx; x++) {
|
|
|
|
u8 *dest = (u8 *)(video_fb_address) + x + y;
|
|
|
|
*dest = ~*dest;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-11-30 13:50:50 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
void console_cursor(int state)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2011-11-30 13:50:50 +00:00
|
|
|
if (cursor_state != state) {
|
|
|
|
if (cursor_state) {
|
|
|
|
/* turn off the cursor */
|
|
|
|
video_invertchar(old_col * VIDEO_FONT_WIDTH,
|
|
|
|
old_row * VIDEO_FONT_HEIGHT +
|
|
|
|
video_logo_height);
|
|
|
|
} else {
|
|
|
|
/* turn off the cursor and record where it is */
|
|
|
|
video_invertchar(console_col * VIDEO_FONT_WIDTH,
|
|
|
|
console_row * VIDEO_FONT_HEIGHT +
|
|
|
|
video_logo_height);
|
|
|
|
old_col = console_col;
|
|
|
|
old_row = console_row;
|
|
|
|
}
|
|
|
|
cursor_state = state;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
2013-05-06 12:27:28 +00:00
|
|
|
if (cfb_do_flush_cache)
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef VIDEO_HW_RECTFILL
|
2011-07-29 09:55:27 +00:00
|
|
|
static void memsetl(int *p, int c, int v)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2004-03-14 16:51:43 +00:00
|
|
|
while (c--)
|
|
|
|
*(p++) = v;
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef VIDEO_HW_BITBLT
|
2011-07-29 09:55:27 +00:00
|
|
|
static void memcpyl(int *d, int *s, int c)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2004-03-14 16:51:43 +00:00
|
|
|
while (c--)
|
|
|
|
*(d++) = *(s++);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-04-28 07:26:44 +00:00
|
|
|
static void console_clear_line(int line, int begin, int end)
|
|
|
|
{
|
|
|
|
#ifdef VIDEO_HW_RECTFILL
|
|
|
|
video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */
|
|
|
|
VIDEO_FONT_WIDTH * begin, /* dest pos x */
|
|
|
|
video_logo_height +
|
|
|
|
VIDEO_FONT_HEIGHT * line, /* dest pos y */
|
|
|
|
VIDEO_FONT_WIDTH * (end - begin + 1), /* fr. width */
|
|
|
|
VIDEO_FONT_HEIGHT, /* frame height */
|
|
|
|
bgx /* fill color */
|
|
|
|
);
|
|
|
|
#else
|
|
|
|
if (begin == 0 && (end + 1) == CONSOLE_COLS) {
|
|
|
|
memsetl(CONSOLE_ROW_FIRST +
|
|
|
|
CONSOLE_ROW_SIZE * line, /* offset of row */
|
|
|
|
CONSOLE_ROW_SIZE >> 2, /* length of row */
|
|
|
|
bgx /* fill color */
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
void *offset;
|
|
|
|
int i, size;
|
|
|
|
|
|
|
|
offset = CONSOLE_ROW_FIRST +
|
|
|
|
CONSOLE_ROW_SIZE * line + /* offset of row */
|
|
|
|
VIDEO_FONT_WIDTH *
|
|
|
|
VIDEO_PIXEL_SIZE * begin; /* offset of col */
|
|
|
|
size = VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE * (end - begin + 1);
|
|
|
|
size >>= 2; /* length to end for memsetl() */
|
|
|
|
/* fill at col offset of i'th line using bgx as fill color */
|
|
|
|
for (i = 0; i < VIDEO_FONT_HEIGHT; i++)
|
|
|
|
memsetl(offset + i * VIDEO_LINE_LEN, size, bgx);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void console_scrollup(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2015-01-01 23:17:57 +00:00
|
|
|
const int rows = CONFIG_CONSOLE_SCROLL_LINES;
|
|
|
|
int i;
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
/* copy up rows ignoring the first one */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
#ifdef VIDEO_HW_BITBLT
|
2011-07-29 09:55:27 +00:00
|
|
|
video_hw_bitblt(VIDEO_PIXEL_SIZE, /* bytes per pixel */
|
|
|
|
0, /* source pos x */
|
|
|
|
video_logo_height +
|
2015-01-01 23:17:57 +00:00
|
|
|
VIDEO_FONT_HEIGHT * rows, /* source pos y */
|
2011-07-29 09:55:27 +00:00
|
|
|
0, /* dest pos x */
|
|
|
|
video_logo_height, /* dest pos y */
|
|
|
|
VIDEO_VISIBLE_COLS, /* frame width */
|
|
|
|
VIDEO_VISIBLE_ROWS
|
|
|
|
- video_logo_height
|
2015-01-01 23:17:57 +00:00
|
|
|
- VIDEO_FONT_HEIGHT * rows /* frame height */
|
2004-03-14 16:51:43 +00:00
|
|
|
);
|
2002-11-03 00:24:07 +00:00
|
|
|
#else
|
2015-01-01 23:17:57 +00:00
|
|
|
memcpyl(CONSOLE_ROW_FIRST, CONSOLE_ROW_FIRST + rows * CONSOLE_ROW_SIZE,
|
|
|
|
(CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows) >> 2);
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
/* clear the last one */
|
2015-01-01 23:17:57 +00:00
|
|
|
for (i = 1; i <= rows; i++)
|
|
|
|
console_clear_line(CONSOLE_ROWS - i, 0, CONSOLE_COLS - 1);
|
|
|
|
|
|
|
|
/* Decrement row number */
|
|
|
|
console_row -= rows;
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void console_back(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2010-08-27 20:45:47 +00:00
|
|
|
console_col--;
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
if (console_col < 0) {
|
|
|
|
console_col = CONSOLE_COLS - 1;
|
|
|
|
console_row--;
|
|
|
|
if (console_row < 0)
|
|
|
|
console_row = 0;
|
|
|
|
}
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2012-10-19 13:30:09 +00:00
|
|
|
#ifdef CONFIG_CFB_CONSOLE_ANSI
|
|
|
|
|
|
|
|
static void console_clear(void)
|
|
|
|
{
|
|
|
|
#ifdef VIDEO_HW_RECTFILL
|
|
|
|
video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */
|
|
|
|
0, /* dest pos x */
|
|
|
|
video_logo_height, /* dest pos y */
|
|
|
|
VIDEO_VISIBLE_COLS, /* frame width */
|
|
|
|
VIDEO_VISIBLE_ROWS, /* frame height */
|
|
|
|
bgx /* fill color */
|
|
|
|
);
|
|
|
|
#else
|
|
|
|
memsetl(CONSOLE_ROW_FIRST, CONSOLE_SIZE, bgx);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_fix(void)
|
|
|
|
{
|
|
|
|
if (console_row < 0)
|
|
|
|
console_row = 0;
|
|
|
|
if (console_row >= CONSOLE_ROWS)
|
|
|
|
console_row = CONSOLE_ROWS - 1;
|
|
|
|
if (console_col < 0)
|
|
|
|
console_col = 0;
|
|
|
|
if (console_col >= CONSOLE_COLS)
|
|
|
|
console_col = CONSOLE_COLS - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_up(int n)
|
|
|
|
{
|
|
|
|
console_row -= n;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_down(int n)
|
|
|
|
{
|
|
|
|
console_row += n;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_left(int n)
|
|
|
|
{
|
|
|
|
console_col -= n;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_right(int n)
|
|
|
|
{
|
|
|
|
console_col += n;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_cursor_set_position(int row, int col)
|
|
|
|
{
|
|
|
|
if (console_row != -1)
|
|
|
|
console_row = row;
|
|
|
|
if (console_col != -1)
|
|
|
|
console_col = col;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_previousline(int n)
|
|
|
|
{
|
|
|
|
/* FIXME: also scroll terminal ? */
|
|
|
|
console_row -= n;
|
|
|
|
console_cursor_fix();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_swap_colors(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2012-10-19 13:30:09 +00:00
|
|
|
eorx = fgx;
|
|
|
|
fgx = bgx;
|
|
|
|
bgx = eorx;
|
|
|
|
eorx = fgx ^ bgx;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int console_cursor_is_visible(void)
|
|
|
|
{
|
|
|
|
return !ansi_cursor_hidden;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int console_cursor_is_visible(void)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void console_newline(int n)
|
|
|
|
{
|
|
|
|
console_row += n;
|
2004-03-14 16:51:43 +00:00
|
|
|
console_col = 0;
|
|
|
|
|
|
|
|
/* Check if we need to scroll the terminal */
|
|
|
|
if (console_row >= CONSOLE_ROWS) {
|
|
|
|
/* Scroll everything up */
|
2011-07-29 09:55:27 +00:00
|
|
|
console_scrollup();
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void console_cr(void)
|
2008-01-11 01:39:47 +00:00
|
|
|
{
|
2010-08-27 20:45:47 +00:00
|
|
|
console_col = 0;
|
2008-01-11 01:39:47 +00:00
|
|
|
}
|
|
|
|
|
2012-10-19 13:30:09 +00:00
|
|
|
static void parse_putc(const char c)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2008-01-11 01:39:47 +00:00
|
|
|
static int nl = 1;
|
|
|
|
|
2012-10-19 13:30:09 +00:00
|
|
|
if (console_cursor_is_visible())
|
|
|
|
CURSOR_OFF;
|
2011-11-30 13:50:50 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
switch (c) {
|
2008-01-11 01:39:47 +00:00
|
|
|
case 13: /* back to first column */
|
2011-07-29 09:55:27 +00:00
|
|
|
console_cr();
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case '\n': /* next line */
|
2018-03-18 13:24:39 +00:00
|
|
|
if (console_col || nl)
|
2012-10-19 13:30:09 +00:00
|
|
|
console_newline(1);
|
2008-01-11 01:39:47 +00:00
|
|
|
nl = 1;
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 9: /* tab 8 */
|
2010-08-27 20:45:47 +00:00
|
|
|
console_col |= 0x0008;
|
2004-03-14 16:51:43 +00:00
|
|
|
console_col &= ~0x0007;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
if (console_col >= CONSOLE_COLS)
|
2012-10-19 13:30:09 +00:00
|
|
|
console_newline(1);
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case 8: /* backspace */
|
2011-07-29 09:55:27 +00:00
|
|
|
console_back();
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2012-04-28 07:26:47 +00:00
|
|
|
case 7: /* bell */
|
|
|
|
break; /* ignored */
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
default: /* draw the char */
|
2011-07-29 09:55:27 +00:00
|
|
|
video_putchar(console_col * VIDEO_FONT_WIDTH,
|
|
|
|
console_row * VIDEO_FONT_HEIGHT, c);
|
2004-03-14 16:51:43 +00:00
|
|
|
console_col++;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
/* check for newline */
|
2008-01-11 01:39:47 +00:00
|
|
|
if (console_col >= CONSOLE_COLS) {
|
2012-10-19 13:30:09 +00:00
|
|
|
console_newline(1);
|
2008-01-11 01:39:47 +00:00
|
|
|
nl = 0;
|
|
|
|
}
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
2012-10-19 13:30:09 +00:00
|
|
|
|
|
|
|
if (console_cursor_is_visible())
|
|
|
|
CURSOR_SET;
|
|
|
|
}
|
|
|
|
|
2016-10-18 02:12:54 +00:00
|
|
|
static void cfb_video_putc(struct stdio_dev *dev, const char c)
|
2012-10-19 13:30:09 +00:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_CFB_CONSOLE_ANSI
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (c == 27) {
|
|
|
|
for (i = 0; i < ansi_buf_size; ++i)
|
|
|
|
parse_putc(ansi_buf[i]);
|
|
|
|
ansi_buf[0] = 27;
|
|
|
|
ansi_buf_size = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ansi_buf_size > 0) {
|
|
|
|
/*
|
|
|
|
* 0 - ESC
|
|
|
|
* 1 - [
|
|
|
|
* 2 - num1
|
|
|
|
* 3 - ..
|
|
|
|
* 4 - ;
|
|
|
|
* 5 - num2
|
|
|
|
* 6 - ..
|
|
|
|
* - cchar
|
|
|
|
*/
|
|
|
|
int next = 0;
|
|
|
|
|
|
|
|
int flush = 0;
|
|
|
|
int fail = 0;
|
|
|
|
|
|
|
|
int num1 = 0;
|
|
|
|
int num2 = 0;
|
|
|
|
int cchar = 0;
|
|
|
|
|
|
|
|
ansi_buf[ansi_buf_size++] = c;
|
|
|
|
|
|
|
|
if (ansi_buf_size >= sizeof(ansi_buf))
|
|
|
|
fail = 1;
|
|
|
|
|
|
|
|
for (i = 0; i < ansi_buf_size; ++i) {
|
|
|
|
if (fail)
|
|
|
|
break;
|
|
|
|
|
|
|
|
switch (next) {
|
|
|
|
case 0:
|
|
|
|
if (ansi_buf[i] == 27)
|
|
|
|
next = 1;
|
|
|
|
else
|
|
|
|
fail = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
if (ansi_buf[i] == '[')
|
|
|
|
next = 2;
|
|
|
|
else
|
|
|
|
fail = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
if (ansi_buf[i] >= '0' && ansi_buf[i] <= '9') {
|
|
|
|
num1 = ansi_buf[i]-'0';
|
|
|
|
next = 3;
|
|
|
|
} else if (ansi_buf[i] != '?') {
|
|
|
|
--i;
|
|
|
|
num1 = 1;
|
|
|
|
next = 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
if (ansi_buf[i] >= '0' && ansi_buf[i] <= '9') {
|
|
|
|
num1 *= 10;
|
|
|
|
num1 += ansi_buf[i]-'0';
|
|
|
|
} else {
|
|
|
|
--i;
|
|
|
|
next = 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
if (ansi_buf[i] != ';') {
|
|
|
|
--i;
|
|
|
|
next = 7;
|
|
|
|
} else
|
|
|
|
next = 5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 5:
|
|
|
|
if (ansi_buf[i] >= '0' && ansi_buf[i] <= '9') {
|
|
|
|
num2 = ansi_buf[i]-'0';
|
|
|
|
next = 6;
|
|
|
|
} else
|
|
|
|
fail = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 6:
|
|
|
|
if (ansi_buf[i] >= '0' && ansi_buf[i] <= '9') {
|
|
|
|
num2 *= 10;
|
|
|
|
num2 += ansi_buf[i]-'0';
|
|
|
|
} else {
|
|
|
|
--i;
|
|
|
|
next = 7;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 7:
|
|
|
|
if ((ansi_buf[i] >= 'A' && ansi_buf[i] <= 'H')
|
|
|
|
|| ansi_buf[i] == 'J'
|
|
|
|
|| ansi_buf[i] == 'K'
|
|
|
|
|| ansi_buf[i] == 'h'
|
|
|
|
|| ansi_buf[i] == 'l'
|
|
|
|
|| ansi_buf[i] == 'm') {
|
|
|
|
cchar = ansi_buf[i];
|
|
|
|
flush = 1;
|
|
|
|
} else
|
|
|
|
fail = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fail) {
|
|
|
|
for (i = 0; i < ansi_buf_size; ++i)
|
|
|
|
parse_putc(ansi_buf[i]);
|
|
|
|
ansi_buf_size = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flush) {
|
|
|
|
if (!ansi_cursor_hidden)
|
|
|
|
CURSOR_OFF;
|
|
|
|
ansi_buf_size = 0;
|
|
|
|
switch (cchar) {
|
|
|
|
case 'A':
|
|
|
|
/* move cursor num1 rows up */
|
|
|
|
console_cursor_up(num1);
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
/* move cursor num1 rows down */
|
|
|
|
console_cursor_down(num1);
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
/* move cursor num1 columns forward */
|
|
|
|
console_cursor_right(num1);
|
|
|
|
break;
|
|
|
|
case 'D':
|
|
|
|
/* move cursor num1 columns back */
|
|
|
|
console_cursor_left(num1);
|
|
|
|
break;
|
|
|
|
case 'E':
|
|
|
|
/* move cursor num1 rows up at begin of row */
|
|
|
|
console_previousline(num1);
|
|
|
|
break;
|
|
|
|
case 'F':
|
|
|
|
/* move cursor num1 rows down at begin of row */
|
|
|
|
console_newline(num1);
|
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
/* move cursor to column num1 */
|
|
|
|
console_cursor_set_position(-1, num1-1);
|
|
|
|
break;
|
|
|
|
case 'H':
|
|
|
|
/* move cursor to row num1, column num2 */
|
|
|
|
console_cursor_set_position(num1-1, num2-1);
|
|
|
|
break;
|
|
|
|
case 'J':
|
|
|
|
/* clear console and move cursor to 0, 0 */
|
|
|
|
console_clear();
|
|
|
|
console_cursor_set_position(0, 0);
|
|
|
|
break;
|
|
|
|
case 'K':
|
|
|
|
/* clear line */
|
|
|
|
if (num1 == 0)
|
|
|
|
console_clear_line(console_row,
|
|
|
|
console_col,
|
|
|
|
CONSOLE_COLS-1);
|
|
|
|
else if (num1 == 1)
|
|
|
|
console_clear_line(console_row,
|
|
|
|
0, console_col);
|
|
|
|
else
|
|
|
|
console_clear_line(console_row,
|
|
|
|
0, CONSOLE_COLS-1);
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
ansi_cursor_hidden = 0;
|
|
|
|
break;
|
|
|
|
case 'l':
|
|
|
|
ansi_cursor_hidden = 1;
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
if (num1 == 0) { /* reset swapped colors */
|
|
|
|
if (ansi_colors_need_revert) {
|
|
|
|
console_swap_colors();
|
|
|
|
ansi_colors_need_revert = 0;
|
|
|
|
}
|
|
|
|
} else if (num1 == 7) { /* once swap colors */
|
|
|
|
if (!ansi_colors_need_revert) {
|
|
|
|
console_swap_colors();
|
|
|
|
ansi_colors_need_revert = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!ansi_cursor_hidden)
|
|
|
|
CURSOR_SET;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
parse_putc(c);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
parse_putc(c);
|
|
|
|
#endif
|
2013-05-06 12:27:28 +00:00
|
|
|
if (cfb_do_flush_cache)
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
2010-08-27 20:45:47 +00:00
|
|
|
}
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2016-10-18 02:12:54 +00:00
|
|
|
static void cfb_video_puts(struct stdio_dev *dev, const char *s)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2014-10-24 14:33:30 +00:00
|
|
|
int flush = cfb_do_flush_cache;
|
2011-07-29 09:55:27 +00:00
|
|
|
int count = strlen(s);
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2014-10-24 14:33:30 +00:00
|
|
|
/* temporarily disable cache flush */
|
|
|
|
cfb_do_flush_cache = 0;
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
while (count--)
|
2016-10-18 02:12:54 +00:00
|
|
|
cfb_video_putc(dev, *s++);
|
2014-10-24 14:33:30 +00:00
|
|
|
|
|
|
|
if (flush) {
|
|
|
|
cfb_do_flush_cache = flush;
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
|
|
|
}
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
|
2010-05-01 20:21:09 +00:00
|
|
|
/*
|
|
|
|
* Do not enforce drivers (or board code) to provide empty
|
|
|
|
* video_set_lut() if they do not support 8 bpp format.
|
|
|
|
* Implement weak default function instead.
|
|
|
|
*/
|
2014-10-08 20:57:30 +00:00
|
|
|
__weak void video_set_lut(unsigned int index, unsigned char r,
|
2011-07-29 09:55:27 +00:00
|
|
|
unsigned char g, unsigned char b)
|
2010-05-01 20:21:09 +00:00
|
|
|
{
|
|
|
|
}
|
2011-07-29 09:55:27 +00:00
|
|
|
|
2007-07-09 22:30:01 +00:00
|
|
|
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
#define FILL_8BIT_332RGB(r,g,b) { \
|
|
|
|
*fb = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6); \
|
|
|
|
fb ++; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define FILL_15BIT_555RGB(r,g,b) { \
|
2011-07-29 09:55:27 +00:00
|
|
|
*(unsigned short *)fb = \
|
|
|
|
SWAP16((unsigned short)(((r>>3)<<10) | \
|
|
|
|
((g>>3)<<5) | \
|
|
|
|
(b>>3))); \
|
2004-03-14 16:51:43 +00:00
|
|
|
fb += 2; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define FILL_16BIT_565RGB(r,g,b) { \
|
2011-07-29 09:55:27 +00:00
|
|
|
*(unsigned short *)fb = \
|
|
|
|
SWAP16((unsigned short)((((r)>>3)<<11)| \
|
|
|
|
(((g)>>2)<<5) | \
|
|
|
|
((b)>>3))); \
|
2004-03-14 16:51:43 +00:00
|
|
|
fb += 2; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define FILL_32BIT_X888RGB(r,g,b) { \
|
2017-03-06 01:13:38 +00:00
|
|
|
*(u32 *)fb = \
|
|
|
|
SWAP32((unsigned int)(((r<<16) | \
|
2011-07-29 09:55:27 +00:00
|
|
|
(g<<8) | \
|
|
|
|
b))); \
|
2004-03-14 16:51:43 +00:00
|
|
|
fb += 4; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef VIDEO_FB_LITTLE_ENDIAN
|
|
|
|
#define FILL_24BIT_888RGB(r,g,b) { \
|
|
|
|
fb[0] = b; \
|
|
|
|
fb[1] = g; \
|
|
|
|
fb[2] = r; \
|
|
|
|
fb += 3; \
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define FILL_24BIT_888RGB(r,g,b) { \
|
|
|
|
fb[0] = r; \
|
|
|
|
fb[1] = g; \
|
|
|
|
fb[2] = b; \
|
|
|
|
fb += 3; \
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-08-08 16:00:40 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
2011-07-29 09:55:27 +00:00
|
|
|
static inline void fill_555rgb_pswap(uchar *fb, int x, u8 r, u8 g, u8 b)
|
2008-08-08 16:00:40 +00:00
|
|
|
{
|
2011-07-29 09:55:27 +00:00
|
|
|
ushort *dst = (ushort *) fb;
|
|
|
|
ushort color = (ushort) (((r >> 3) << 10) |
|
|
|
|
((g >> 3) << 5) |
|
|
|
|
(b >> 3));
|
2008-08-08 16:00:40 +00:00
|
|
|
if (x & 1)
|
|
|
|
*(--dst) = color;
|
|
|
|
else
|
|
|
|
*(++dst) = color;
|
|
|
|
}
|
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2010-03-15 13:50:25 +00:00
|
|
|
/*
|
|
|
|
* RLE8 bitmap support
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_RLE8
|
|
|
|
/* Pre-calculated color table entry */
|
|
|
|
struct palette {
|
|
|
|
union {
|
2011-07-29 09:55:27 +00:00
|
|
|
unsigned short w; /* word */
|
|
|
|
unsigned int dw; /* double word */
|
|
|
|
} ce; /* color entry */
|
2010-03-15 13:50:25 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper to draw encoded/unencoded run.
|
|
|
|
*/
|
2011-07-29 09:55:27 +00:00
|
|
|
static void draw_bitmap(uchar **fb, uchar *bm, struct palette *p,
|
|
|
|
int cnt, int enc)
|
2010-03-15 13:50:25 +00:00
|
|
|
{
|
2011-07-29 09:55:27 +00:00
|
|
|
ulong addr = (ulong) *fb;
|
2010-03-15 13:50:25 +00:00
|
|
|
int *off;
|
|
|
|
int enc_off = 1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup offset of the color index in the bitmap.
|
|
|
|
* Color index of encoded run is at offset 1.
|
|
|
|
*/
|
|
|
|
off = enc ? &enc_off : &i;
|
|
|
|
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
|
|
|
for (i = 0; i < cnt; i++)
|
2011-07-29 09:55:27 +00:00
|
|
|
*(unsigned char *) addr++ = bm[*off];
|
2010-03-15 13:50:25 +00:00
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
/* differences handled while pre-calculating palette */
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2011-07-29 09:55:27 +00:00
|
|
|
*(unsigned short *) addr = p[bm[*off]].ce.w;
|
2010-03-15 13:50:25 +00:00
|
|
|
addr += 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2017-03-06 01:13:38 +00:00
|
|
|
*(u32 *) addr = p[bm[*off]].ce.dw;
|
2010-03-15 13:50:25 +00:00
|
|
|
addr += 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-07-29 09:55:27 +00:00
|
|
|
*fb = (uchar *) addr; /* return modified address */
|
2010-03-15 13:50:25 +00:00
|
|
|
}
|
|
|
|
|
2015-05-13 13:02:27 +00:00
|
|
|
static int display_rle8_bitmap(struct bmp_image *img, int xoff, int yoff,
|
2011-07-29 09:55:27 +00:00
|
|
|
int width, int height)
|
2010-03-15 13:50:25 +00:00
|
|
|
{
|
|
|
|
unsigned char *bm;
|
|
|
|
unsigned char *fbp;
|
|
|
|
unsigned int cnt, runlen;
|
|
|
|
int decode = 1;
|
|
|
|
int x, y, bpp, i, ncolors;
|
|
|
|
struct palette p[256];
|
2015-05-13 13:02:27 +00:00
|
|
|
struct bmp_color_table_entry cte;
|
2010-03-15 13:50:25 +00:00
|
|
|
int green_shift, red_off;
|
2015-08-04 10:15:39 +00:00
|
|
|
int limit = (VIDEO_LINE_LEN / VIDEO_PIXEL_SIZE) * VIDEO_ROWS;
|
2011-02-21 20:33:29 +00:00
|
|
|
int pixels = 0;
|
2010-03-15 13:50:25 +00:00
|
|
|
|
|
|
|
x = 0;
|
|
|
|
y = __le32_to_cpu(img->header.height) - 1;
|
|
|
|
ncolors = __le32_to_cpu(img->header.colors_used);
|
|
|
|
bpp = VIDEO_PIXEL_SIZE;
|
2011-07-29 09:55:27 +00:00
|
|
|
fbp = (unsigned char *) ((unsigned int) video_fb_address +
|
2015-08-04 10:15:39 +00:00
|
|
|
(y + yoff) * VIDEO_LINE_LEN +
|
|
|
|
xoff * bpp);
|
2010-03-15 13:50:25 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
bm = (uchar *) img + __le32_to_cpu(img->header.data_offset);
|
2010-03-15 13:50:25 +00:00
|
|
|
|
|
|
|
/* pre-calculate and setup palette */
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
|
|
|
for (i = 0; i < ncolors; i++) {
|
|
|
|
cte = img->color_table[i];
|
2011-07-29 09:55:27 +00:00
|
|
|
video_set_lut(i, cte.red, cte.green, cte.blue);
|
2010-03-15 13:50:25 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
if (VIDEO_DATA_FORMAT == GDF_15BIT_555RGB) {
|
|
|
|
green_shift = 3;
|
|
|
|
red_off = 10;
|
|
|
|
} else {
|
|
|
|
green_shift = 2;
|
|
|
|
red_off = 11;
|
|
|
|
}
|
|
|
|
for (i = 0; i < ncolors; i++) {
|
|
|
|
cte = img->color_table[i];
|
|
|
|
p[i].ce.w = SWAP16((unsigned short)
|
|
|
|
(((cte.red >> 3) << red_off) |
|
|
|
|
((cte.green >> green_shift) << 5) |
|
|
|
|
cte.blue >> 3));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
for (i = 0; i < ncolors; i++) {
|
|
|
|
cte = img->color_table[i];
|
2011-07-29 09:55:27 +00:00
|
|
|
p[i].ce.dw = SWAP32((cte.red << 16) |
|
|
|
|
(cte.green << 8) |
|
2010-03-15 13:50:25 +00:00
|
|
|
cte.blue);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf("RLE Bitmap unsupported in video mode 0x%x\n",
|
2011-07-29 09:55:27 +00:00
|
|
|
VIDEO_DATA_FORMAT);
|
2010-03-15 13:50:25 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (decode) {
|
|
|
|
switch (bm[0]) {
|
|
|
|
case 0:
|
|
|
|
switch (bm[1]) {
|
|
|
|
case 0:
|
|
|
|
/* scan line end marker */
|
|
|
|
bm += 2;
|
|
|
|
x = 0;
|
|
|
|
y--;
|
|
|
|
fbp = (unsigned char *)
|
2011-07-29 09:55:27 +00:00
|
|
|
((unsigned int) video_fb_address +
|
2015-08-04 10:15:39 +00:00
|
|
|
(y + yoff) * VIDEO_LINE_LEN +
|
|
|
|
xoff * bpp);
|
2010-03-15 13:50:25 +00:00
|
|
|
continue;
|
|
|
|
case 1:
|
|
|
|
/* end of bitmap data marker */
|
|
|
|
decode = 0;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* run offset marker */
|
|
|
|
x += bm[2];
|
|
|
|
y -= bm[3];
|
|
|
|
fbp = (unsigned char *)
|
2011-07-29 09:55:27 +00:00
|
|
|
((unsigned int) video_fb_address +
|
2015-08-04 10:15:39 +00:00
|
|
|
(y + yoff) * VIDEO_LINE_LEN +
|
|
|
|
xoff * bpp);
|
2010-03-15 13:50:25 +00:00
|
|
|
bm += 4;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* unencoded run */
|
|
|
|
cnt = bm[1];
|
|
|
|
runlen = cnt;
|
2011-02-21 20:33:29 +00:00
|
|
|
pixels += cnt;
|
|
|
|
if (pixels > limit)
|
|
|
|
goto error;
|
|
|
|
|
2010-03-15 13:50:25 +00:00
|
|
|
bm += 2;
|
|
|
|
if (y < height) {
|
|
|
|
if (x >= width) {
|
|
|
|
x += runlen;
|
|
|
|
goto next_run;
|
|
|
|
}
|
|
|
|
if (x + runlen > width)
|
|
|
|
cnt = width - x;
|
2011-07-29 09:55:27 +00:00
|
|
|
draw_bitmap(&fbp, bm, p, cnt, 0);
|
2010-03-15 13:50:25 +00:00
|
|
|
x += runlen;
|
|
|
|
}
|
|
|
|
next_run:
|
|
|
|
bm += runlen;
|
|
|
|
if (runlen & 1)
|
2011-07-29 09:55:27 +00:00
|
|
|
bm++; /* 0 padding if length is odd */
|
2010-03-15 13:50:25 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* encoded run */
|
2011-02-21 20:33:29 +00:00
|
|
|
cnt = bm[0];
|
|
|
|
runlen = cnt;
|
|
|
|
pixels += cnt;
|
|
|
|
if (pixels > limit)
|
|
|
|
goto error;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
if (y < height) { /* only draw into visible area */
|
2010-03-15 13:50:25 +00:00
|
|
|
if (x >= width) {
|
|
|
|
x += runlen;
|
|
|
|
bm += 2;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (x + runlen > width)
|
|
|
|
cnt = width - x;
|
2011-07-29 09:55:27 +00:00
|
|
|
draw_bitmap(&fbp, bm, p, cnt, 1);
|
2010-03-15 13:50:25 +00:00
|
|
|
x += runlen;
|
|
|
|
}
|
|
|
|
bm += 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2018-09-10 07:58:58 +00:00
|
|
|
|
|
|
|
if (cfb_do_flush_cache)
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
|
|
|
|
2010-03-15 13:50:25 +00:00
|
|
|
return 0;
|
2011-02-21 20:33:29 +00:00
|
|
|
error:
|
|
|
|
printf("Error: Too much encoded pixel data, validate your bitmap\n");
|
|
|
|
return -1;
|
2010-03-15 13:50:25 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
/*
|
|
|
|
* Display the BMP file located at address bmp_image.
|
|
|
|
*/
|
2011-07-29 09:55:27 +00:00
|
|
|
int video_display_bitmap(ulong bmp_image, int x, int y)
|
2004-03-14 16:51:43 +00:00
|
|
|
{
|
|
|
|
ushort xcount, ycount;
|
|
|
|
uchar *fb;
|
2015-05-13 13:02:27 +00:00
|
|
|
struct bmp_image *bmp = (struct bmp_image *)bmp_image;
|
2004-03-14 16:51:43 +00:00
|
|
|
uchar *bmap;
|
|
|
|
ushort padded_line;
|
|
|
|
unsigned long width, height, bpp;
|
|
|
|
unsigned colors;
|
|
|
|
unsigned long compression;
|
2015-05-13 13:02:27 +00:00
|
|
|
struct bmp_color_table_entry cte;
|
2011-07-29 09:55:27 +00:00
|
|
|
|
2005-09-22 07:04:17 +00:00
|
|
|
#ifdef CONFIG_VIDEO_BMP_GZIP
|
|
|
|
unsigned char *dst = NULL;
|
|
|
|
ulong len;
|
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
if (!((bmp->header.signature[0] == 'B') &&
|
|
|
|
(bmp->header.signature[1] == 'M'))) {
|
2005-09-22 07:04:17 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_GZIP
|
|
|
|
/*
|
|
|
|
* Could be a gzipped bmp image, try to decrompress...
|
|
|
|
*/
|
2008-10-16 13:01:15 +00:00
|
|
|
len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE;
|
|
|
|
dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE);
|
2005-10-08 08:19:07 +00:00
|
|
|
if (dst == NULL) {
|
|
|
|
printf("Error: malloc in gunzip failed!\n");
|
2011-07-29 09:55:27 +00:00
|
|
|
return 1;
|
2005-10-08 08:19:07 +00:00
|
|
|
}
|
2014-03-08 14:55:52 +00:00
|
|
|
/*
|
|
|
|
* NB: we need to force offset of +2
|
|
|
|
* See doc/README.displaying-bmps
|
|
|
|
*/
|
|
|
|
if (gunzip(dst+2, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE-2,
|
2011-07-29 09:55:27 +00:00
|
|
|
(uchar *) bmp_image,
|
|
|
|
&len) != 0) {
|
|
|
|
printf("Error: no valid bmp or bmp.gz image at %lx\n",
|
|
|
|
bmp_image);
|
2005-09-22 07:04:17 +00:00
|
|
|
free(dst);
|
|
|
|
return 1;
|
|
|
|
}
|
2008-10-16 13:01:15 +00:00
|
|
|
if (len == CONFIG_SYS_VIDEO_LOGO_MAX_SIZE) {
|
2011-07-29 09:55:27 +00:00
|
|
|
printf("Image could be truncated "
|
|
|
|
"(increase CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)!\n");
|
2005-10-08 08:19:07 +00:00
|
|
|
}
|
2005-09-22 07:04:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set addr to decompressed image
|
|
|
|
*/
|
2015-05-13 13:02:27 +00:00
|
|
|
bmp = (struct bmp_image *)(dst+2);
|
2005-09-22 07:04:17 +00:00
|
|
|
|
|
|
|
if (!((bmp->header.signature[0] == 'B') &&
|
|
|
|
(bmp->header.signature[1] == 'M'))) {
|
2011-07-29 09:55:27 +00:00
|
|
|
printf("Error: no valid bmp.gz image at %lx\n",
|
|
|
|
bmp_image);
|
2008-04-21 09:19:04 +00:00
|
|
|
free(dst);
|
2005-09-22 07:04:17 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#else
|
2011-07-29 09:55:27 +00:00
|
|
|
printf("Error: no valid bmp image at %lx\n", bmp_image);
|
2004-03-14 16:51:43 +00:00
|
|
|
return 1;
|
2005-09-22 07:04:17 +00:00
|
|
|
#endif /* CONFIG_VIDEO_BMP_GZIP */
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
width = le32_to_cpu(bmp->header.width);
|
|
|
|
height = le32_to_cpu(bmp->header.height);
|
|
|
|
bpp = le16_to_cpu(bmp->header.bit_count);
|
|
|
|
colors = le32_to_cpu(bmp->header.colors_used);
|
|
|
|
compression = le32_to_cpu(bmp->header.compression);
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2011-10-21 14:17:04 +00:00
|
|
|
debug("Display-bmp: %ld x %ld with %d colors\n",
|
2011-07-29 09:55:27 +00:00
|
|
|
width, height, colors);
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2010-03-15 13:50:25 +00:00
|
|
|
if (compression != BMP_BI_RGB
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_RLE8
|
|
|
|
&& compression != BMP_BI_RLE8
|
|
|
|
#endif
|
2011-07-29 09:55:27 +00:00
|
|
|
) {
|
|
|
|
printf("Error: compression type %ld not supported\n",
|
|
|
|
compression);
|
2008-04-21 09:19:04 +00:00
|
|
|
#ifdef CONFIG_VIDEO_BMP_GZIP
|
|
|
|
if (dst)
|
|
|
|
free(dst);
|
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
padded_line = (((width * bpp + 7) / 8) + 3) & ~0x3;
|
|
|
|
|
2009-07-09 14:07:30 +00:00
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
|
|
if (x == BMP_ALIGN_CENTER)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
x = max(0, (int)(VIDEO_VISIBLE_COLS - width) / 2);
|
2009-07-09 14:07:30 +00:00
|
|
|
else if (x < 0)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
x = max(0, (int)(VIDEO_VISIBLE_COLS - width + x + 1));
|
2009-07-09 14:07:30 +00:00
|
|
|
|
|
|
|
if (y == BMP_ALIGN_CENTER)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
y = max(0, (int)(VIDEO_VISIBLE_ROWS - height) / 2);
|
2009-07-09 14:07:30 +00:00
|
|
|
else if (y < 0)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
y = max(0, (int)(VIDEO_VISIBLE_ROWS - height + y + 1));
|
2009-07-09 14:07:30 +00:00
|
|
|
#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
|
|
|
|
|
2013-02-15 03:35:12 +00:00
|
|
|
/*
|
|
|
|
* Just ignore elements which are completely beyond screen
|
|
|
|
* dimensions.
|
|
|
|
*/
|
|
|
|
if ((x >= VIDEO_VISIBLE_COLS) || (y >= VIDEO_VISIBLE_ROWS))
|
|
|
|
return 0;
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
if ((x + width) > VIDEO_VISIBLE_COLS)
|
|
|
|
width = VIDEO_VISIBLE_COLS - x;
|
|
|
|
if ((y + height) > VIDEO_VISIBLE_ROWS)
|
|
|
|
height = VIDEO_VISIBLE_ROWS - y;
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
bmap = (uchar *) bmp + le32_to_cpu(bmp->header.data_offset);
|
2004-03-14 16:51:43 +00:00
|
|
|
fb = (uchar *) (video_fb_address +
|
2015-08-04 10:15:39 +00:00
|
|
|
((y + height - 1) * VIDEO_LINE_LEN) +
|
2004-03-14 16:51:43 +00:00
|
|
|
x * VIDEO_PIXEL_SIZE);
|
|
|
|
|
2010-03-15 13:50:25 +00:00
|
|
|
#ifdef CONFIG_VIDEO_BMP_RLE8
|
|
|
|
if (compression == BMP_BI_RLE8) {
|
2011-07-29 09:55:27 +00:00
|
|
|
return display_rle8_bitmap(bmp, x, y, width, height);
|
2010-03-15 13:50:25 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-08-23 21:58:00 +00:00
|
|
|
/* We handle only 4, 8, or 24 bpp bitmaps */
|
2011-07-29 09:55:27 +00:00
|
|
|
switch (le16_to_cpu(bmp->header.bit_count)) {
|
2010-08-23 21:58:00 +00:00
|
|
|
case 4:
|
|
|
|
padded_line -= width / 2;
|
|
|
|
ycount = height;
|
|
|
|
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2010-08-23 21:58:00 +00:00
|
|
|
/*
|
|
|
|
* Don't assume that 'width' is an
|
|
|
|
* even number
|
|
|
|
*/
|
|
|
|
for (xcount = 0; xcount < width; xcount++) {
|
|
|
|
uchar idx;
|
|
|
|
|
|
|
|
if (xcount & 1) {
|
|
|
|
idx = *bmap & 0xF;
|
|
|
|
bmap++;
|
|
|
|
} else
|
|
|
|
idx = *bmap >> 4;
|
|
|
|
cte = bmp->color_table[idx];
|
|
|
|
FILL_32BIT_X888RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
2011-07-29 09:55:27 +00:00
|
|
|
VIDEO_PIXEL_SIZE;
|
2010-08-23 21:58:00 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
puts("4bpp bitmap unsupported with current "
|
|
|
|
"video mode\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
case 8:
|
|
|
|
padded_line -= width;
|
|
|
|
if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
|
2010-06-19 18:41:56 +00:00
|
|
|
/* Copy colormap */
|
2004-03-14 16:51:43 +00:00
|
|
|
for (xcount = 0; xcount < colors; ++xcount) {
|
|
|
|
cte = bmp->color_table[xcount];
|
2011-07-29 09:55:27 +00:00
|
|
|
video_set_lut(xcount, cte.red, cte.green,
|
|
|
|
cte.blue);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ycount = height;
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
*fb++ = *bmap++;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF__8BIT_332RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
cte = bmp->color_table[*bmap++];
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_8BIT_332RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
|
|
|
while (ycount--) {
|
2008-08-08 16:00:40 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
|
|
|
int xpos = x;
|
|
|
|
#endif
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
cte = bmp->color_table[*bmap++];
|
2008-08-29 17:30:39 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
2011-07-29 09:55:27 +00:00
|
|
|
fill_555rgb_pswap(fb, xpos++, cte.red,
|
|
|
|
cte.green,
|
|
|
|
cte.blue);
|
2008-08-08 16:00:40 +00:00
|
|
|
fb += 2;
|
2008-08-29 17:30:39 +00:00
|
|
|
#else
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_15BIT_555RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
2008-08-08 16:00:40 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
cte = bmp->color_table[*bmap++];
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_16BIT_565RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
cte = bmp->color_table[*bmap++];
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_32BIT_X888RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_24BIT_888RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
|
|
|
cte = bmp->color_table[*bmap++];
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_24BIT_888RGB(cte.red, cte.green,
|
|
|
|
cte.blue);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
padded_line -= 3 * width;
|
|
|
|
ycount = height;
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_332RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_8BIT_332RGB(bmap[2], bmap[1],
|
|
|
|
bmap[0]);
|
2004-03-14 16:51:43 +00:00
|
|
|
bmap += 3;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
|
|
|
while (ycount--) {
|
2008-08-08 16:00:40 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
|
|
|
int xpos = x;
|
|
|
|
#endif
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
2008-08-29 17:30:39 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
2011-07-29 09:55:27 +00:00
|
|
|
fill_555rgb_pswap(fb, xpos++, bmap[2],
|
|
|
|
bmap[1], bmap[0]);
|
2008-08-08 16:00:40 +00:00
|
|
|
fb += 2;
|
2008-08-29 17:30:39 +00:00
|
|
|
#else
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_15BIT_555RGB(bmap[2], bmap[1],
|
|
|
|
bmap[0]);
|
2008-08-08 16:00:40 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
bmap += 3;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_16BIT_565RGB(bmap[2], bmap[1],
|
|
|
|
bmap[0]);
|
2004-03-14 16:51:43 +00:00
|
|
|
bmap += 3;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_32BIT_X888RGB(bmap[2], bmap[1],
|
|
|
|
bmap[0]);
|
2004-03-14 16:51:43 +00:00
|
|
|
bmap += 3;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GDF_24BIT_888RGB:
|
|
|
|
while (ycount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
WATCHDOG_RESET();
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = width;
|
|
|
|
while (xcount--) {
|
2011-07-29 09:55:27 +00:00
|
|
|
FILL_24BIT_888RGB(bmap[2], bmap[1],
|
|
|
|
bmap[0]);
|
2004-03-14 16:51:43 +00:00
|
|
|
bmap += 3;
|
|
|
|
}
|
|
|
|
bmap += padded_line;
|
2015-08-04 10:15:39 +00:00
|
|
|
fb -= VIDEO_LINE_LEN + width *
|
|
|
|
VIDEO_PIXEL_SIZE;
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2011-07-29 09:55:27 +00:00
|
|
|
printf("Error: 24 bits/pixel bitmap incompatible "
|
|
|
|
"with current video mode\n");
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2011-07-29 09:55:27 +00:00
|
|
|
printf("Error: %d bit/pixel bitmaps not supported by U-Boot\n",
|
|
|
|
le16_to_cpu(bmp->header.bit_count));
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-09-22 07:04:17 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_GZIP
|
|
|
|
if (dst) {
|
|
|
|
free(dst);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-05-06 12:27:28 +00:00
|
|
|
if (cfb_do_flush_cache)
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
2004-03-14 16:51:43 +00:00
|
|
|
return (0);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
2007-07-09 22:30:01 +00:00
|
|
|
#endif
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
2012-09-13 22:29:01 +00:00
|
|
|
static int video_logo_xpos;
|
|
|
|
static int video_logo_ypos;
|
|
|
|
|
2015-08-04 10:21:40 +00:00
|
|
|
static void plot_logo_or_black(void *screen, int x, int y, int black);
|
2012-09-13 22:29:02 +00:00
|
|
|
|
2015-08-04 10:21:40 +00:00
|
|
|
static void logo_plot(void *screen, int x, int y)
|
2012-09-13 22:29:02 +00:00
|
|
|
{
|
2015-08-04 10:21:40 +00:00
|
|
|
plot_logo_or_black(screen, x, y, 0);
|
2012-09-13 22:29:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void logo_black(void)
|
|
|
|
{
|
2015-08-04 10:21:40 +00:00
|
|
|
plot_logo_or_black(video_fb_address, video_logo_xpos, video_logo_ypos,
|
2012-09-13 22:29:02 +00:00
|
|
|
1);
|
|
|
|
}
|
|
|
|
|
2020-05-10 17:40:03 +00:00
|
|
|
static int do_clrlogo(struct cmd_tbl *cmdtp, int flag, int argc,
|
|
|
|
char *const argv[])
|
2012-09-13 22:29:02 +00:00
|
|
|
{
|
|
|
|
if (argc != 1)
|
|
|
|
return cmd_usage(cmdtp);
|
|
|
|
|
|
|
|
logo_black();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
clrlogo, 1, 0, do_clrlogo,
|
|
|
|
"fill the boot logo area with black",
|
|
|
|
" "
|
|
|
|
);
|
|
|
|
|
2015-08-04 10:21:40 +00:00
|
|
|
static void plot_logo_or_black(void *screen, int x, int y, int black)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2002-12-03 21:28:10 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
int xcount, i;
|
2015-08-04 10:15:39 +00:00
|
|
|
int skip = VIDEO_LINE_LEN - VIDEO_LOGO_WIDTH * VIDEO_PIXEL_SIZE;
|
2010-01-12 11:06:31 +00:00
|
|
|
int ycount = video_logo_height;
|
2004-03-14 16:51:43 +00:00
|
|
|
unsigned char r, g, b, *logo_red, *logo_blue, *logo_green;
|
|
|
|
unsigned char *source;
|
2012-09-13 22:29:01 +00:00
|
|
|
unsigned char *dest;
|
|
|
|
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
|
|
if (x == BMP_ALIGN_CENTER)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
x = max(0, (int)(VIDEO_VISIBLE_COLS - VIDEO_LOGO_WIDTH) / 2);
|
2012-09-13 22:29:01 +00:00
|
|
|
else if (x < 0)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
x = max(0, (int)(VIDEO_VISIBLE_COLS - VIDEO_LOGO_WIDTH + x + 1));
|
2012-09-13 22:29:01 +00:00
|
|
|
|
|
|
|
if (y == BMP_ALIGN_CENTER)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
y = max(0, (int)(VIDEO_VISIBLE_ROWS - VIDEO_LOGO_HEIGHT) / 2);
|
2012-09-13 22:29:01 +00:00
|
|
|
else if (y < 0)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
y = max(0, (int)(VIDEO_VISIBLE_ROWS - VIDEO_LOGO_HEIGHT + y + 1));
|
2012-09-13 22:29:01 +00:00
|
|
|
#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
|
|
|
|
|
2015-08-04 10:15:39 +00:00
|
|
|
dest = (unsigned char *)screen + y * VIDEO_LINE_LEN + x * VIDEO_PIXEL_SIZE;
|
2002-12-03 21:28:10 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_VIDEO_BMP_LOGO
|
2004-03-14 16:51:43 +00:00
|
|
|
source = bmp_logo_bitmap;
|
|
|
|
|
2010-06-19 18:41:56 +00:00
|
|
|
/* Allocate temporary space for computing colormap */
|
2011-07-29 09:55:27 +00:00
|
|
|
logo_red = malloc(BMP_LOGO_COLORS);
|
|
|
|
logo_green = malloc(BMP_LOGO_COLORS);
|
|
|
|
logo_blue = malloc(BMP_LOGO_COLORS);
|
2010-06-19 18:41:56 +00:00
|
|
|
/* Compute color map */
|
2004-03-14 16:51:43 +00:00
|
|
|
for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
|
|
|
|
logo_red[i] = (bmp_logo_palette[i] & 0x0f00) >> 4;
|
|
|
|
logo_green[i] = (bmp_logo_palette[i] & 0x00f0);
|
|
|
|
logo_blue[i] = (bmp_logo_palette[i] & 0x000f) << 4;
|
|
|
|
}
|
2002-12-03 21:28:10 +00:00
|
|
|
#else
|
2004-03-14 16:51:43 +00:00
|
|
|
source = linux_logo;
|
|
|
|
logo_red = linux_logo_red;
|
|
|
|
logo_green = linux_logo_green;
|
|
|
|
logo_blue = linux_logo_blue;
|
2002-12-03 21:28:10 +00:00
|
|
|
#endif
|
2003-06-27 21:31:46 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
|
|
|
|
for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
|
2011-07-29 09:55:27 +00:00
|
|
|
video_set_lut(i + VIDEO_LOGO_LUT_OFFSET,
|
|
|
|
logo_red[i], logo_green[i],
|
|
|
|
logo_blue[i]);
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
2003-06-27 21:31:46 +00:00
|
|
|
}
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
while (ycount--) {
|
2008-08-08 16:00:40 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
|
|
|
int xpos = x;
|
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
xcount = VIDEO_LOGO_WIDTH;
|
|
|
|
while (xcount--) {
|
2012-09-13 22:29:02 +00:00
|
|
|
if (black) {
|
|
|
|
r = 0x00;
|
|
|
|
g = 0x00;
|
|
|
|
b = 0x00;
|
|
|
|
} else {
|
|
|
|
r = logo_red[*source - VIDEO_LOGO_LUT_OFFSET];
|
|
|
|
g = logo_green[*source - VIDEO_LOGO_LUT_OFFSET];
|
|
|
|
b = logo_blue[*source - VIDEO_LOGO_LUT_OFFSET];
|
|
|
|
}
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
|
|
|
*dest = *source;
|
|
|
|
break;
|
|
|
|
case GDF__8BIT_332RGB:
|
2011-07-29 09:55:27 +00:00
|
|
|
*dest = ((r >> 5) << 5) |
|
|
|
|
((g >> 5) << 2) |
|
|
|
|
(b >> 6);
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
2008-08-29 17:30:39 +00:00
|
|
|
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
|
2011-07-29 09:55:27 +00:00
|
|
|
fill_555rgb_pswap(dest, xpos++, r, g, b);
|
2008-08-29 17:30:39 +00:00
|
|
|
#else
|
2004-03-14 16:51:43 +00:00
|
|
|
*(unsigned short *) dest =
|
2011-07-29 09:55:27 +00:00
|
|
|
SWAP16((unsigned short) (
|
|
|
|
((r >> 3) << 10) |
|
|
|
|
((g >> 3) << 5) |
|
|
|
|
(b >> 3)));
|
2008-01-11 13:30:01 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_16BIT_565RGB:
|
|
|
|
*(unsigned short *) dest =
|
2011-07-29 09:55:27 +00:00
|
|
|
SWAP16((unsigned short) (
|
|
|
|
((r >> 3) << 11) |
|
|
|
|
((g >> 2) << 5) |
|
|
|
|
(b >> 3)));
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
2017-03-06 01:13:38 +00:00
|
|
|
*(u32 *) dest =
|
|
|
|
SWAP32((u32) (
|
2011-07-29 09:55:27 +00:00
|
|
|
(r << 16) |
|
|
|
|
(g << 8) |
|
|
|
|
b));
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_24BIT_888RGB:
|
2002-11-03 00:24:07 +00:00
|
|
|
#ifdef VIDEO_FB_LITTLE_ENDIAN
|
2004-03-14 16:51:43 +00:00
|
|
|
dest[0] = b;
|
|
|
|
dest[1] = g;
|
|
|
|
dest[2] = r;
|
2002-11-03 00:24:07 +00:00
|
|
|
#else
|
2004-03-14 16:51:43 +00:00
|
|
|
dest[0] = r;
|
|
|
|
dest[1] = g;
|
|
|
|
dest[2] = b;
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
source++;
|
|
|
|
dest += VIDEO_PIXEL_SIZE;
|
|
|
|
}
|
|
|
|
dest += skip;
|
2003-06-27 21:31:46 +00:00
|
|
|
}
|
2002-12-03 21:28:10 +00:00
|
|
|
#ifdef CONFIG_VIDEO_BMP_LOGO
|
2011-07-29 09:55:27 +00:00
|
|
|
free(logo_red);
|
|
|
|
free(logo_green);
|
|
|
|
free(logo_blue);
|
2002-12-03 21:28:10 +00:00
|
|
|
#endif
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
static void *video_logo(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2004-03-14 16:51:43 +00:00
|
|
|
char info[128];
|
2011-11-04 15:55:20 +00:00
|
|
|
__maybe_unused int y_off = 0;
|
2012-09-13 22:29:01 +00:00
|
|
|
__maybe_unused ulong addr;
|
|
|
|
__maybe_unused char *s;
|
2016-11-30 13:30:59 +00:00
|
|
|
__maybe_unused int len, ret, space;
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2013-07-01 22:04:05 +00:00
|
|
|
splash_get_pos(&video_logo_xpos, &video_logo_ypos);
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2012-09-13 22:29:01 +00:00
|
|
|
#ifdef CONFIG_SPLASH_SCREEN
|
2017-08-03 18:22:12 +00:00
|
|
|
s = env_get("splashimage");
|
2012-09-13 22:29:01 +00:00
|
|
|
if (s != NULL) {
|
2016-11-30 13:30:59 +00:00
|
|
|
ret = splash_screen_prepare();
|
|
|
|
if (ret < 0)
|
|
|
|
return video_fb_address;
|
2021-07-24 15:03:29 +00:00
|
|
|
addr = hextoul(s, NULL);
|
2012-09-13 22:29:01 +00:00
|
|
|
|
|
|
|
if (video_display_bitmap(addr,
|
|
|
|
video_logo_xpos,
|
|
|
|
video_logo_ypos) == 0) {
|
2010-01-12 11:06:31 +00:00
|
|
|
video_logo_height = 0;
|
2004-03-14 16:51:43 +00:00
|
|
|
return ((void *) (video_fb_address));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SPLASH_SCREEN */
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2015-08-04 10:21:40 +00:00
|
|
|
logo_plot(video_fb_address, video_logo_xpos, video_logo_ypos);
|
2012-09-13 22:29:01 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
|
|
/*
|
|
|
|
* when using splashpos for video_logo, skip any info
|
|
|
|
* output on video console if the logo is not at 0,0
|
|
|
|
*/
|
|
|
|
if (video_logo_xpos || video_logo_ypos) {
|
|
|
|
/*
|
|
|
|
* video_logo_height is used in text and cursor offset
|
|
|
|
* calculations. Since the console is below the logo,
|
|
|
|
* we need to adjust the logo height
|
|
|
|
*/
|
|
|
|
if (video_logo_ypos == BMP_ALIGN_CENTER)
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
video_logo_height += max(0, (int)(VIDEO_VISIBLE_ROWS -
|
2012-09-13 22:29:01 +00:00
|
|
|
VIDEO_LOGO_HEIGHT) / 2);
|
|
|
|
else if (video_logo_ypos > 0)
|
|
|
|
video_logo_height += video_logo_ypos;
|
|
|
|
|
|
|
|
return video_fb_address + video_logo_height * VIDEO_LINE_LEN;
|
|
|
|
}
|
|
|
|
#endif
|
2013-08-03 05:22:53 +00:00
|
|
|
if (board_cfb_skip())
|
|
|
|
return 0;
|
2004-03-14 16:51:43 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
sprintf(info, " %s", version_string);
|
2009-04-23 10:35:22 +00:00
|
|
|
|
2016-05-24 21:59:59 +00:00
|
|
|
#ifndef CONFIG_HIDE_LOGO_VERSION
|
2018-01-02 07:25:37 +00:00
|
|
|
space = (VIDEO_COLS - VIDEO_INFO_X) / VIDEO_FONT_WIDTH;
|
2009-04-23 10:35:22 +00:00
|
|
|
len = strlen(info);
|
|
|
|
|
|
|
|
if (len > space) {
|
2018-01-02 07:25:37 +00:00
|
|
|
int xx = VIDEO_INFO_X, yy = VIDEO_INFO_Y;
|
|
|
|
uchar *p = (uchar *) info;
|
|
|
|
|
|
|
|
while (len) {
|
|
|
|
if (len > space) {
|
|
|
|
video_drawchars(xx, yy, p, space);
|
|
|
|
len -= space;
|
|
|
|
|
|
|
|
p = (uchar *)p + space;
|
|
|
|
|
|
|
|
if (!y_off) {
|
|
|
|
xx += VIDEO_FONT_WIDTH;
|
|
|
|
space--;
|
|
|
|
}
|
|
|
|
yy += VIDEO_FONT_HEIGHT;
|
|
|
|
|
|
|
|
y_off++;
|
|
|
|
} else {
|
|
|
|
video_drawchars(xx, yy, p, len);
|
|
|
|
len = 0;
|
|
|
|
}
|
|
|
|
}
|
2009-04-23 10:35:22 +00:00
|
|
|
} else
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawstring(VIDEO_INFO_X, VIDEO_INFO_Y, (uchar *) info);
|
2002-11-03 00:24:07 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_CONSOLE_EXTRA_INFO
|
2004-03-14 16:51:43 +00:00
|
|
|
{
|
2011-07-29 09:55:27 +00:00
|
|
|
int i, n =
|
|
|
|
((video_logo_height -
|
|
|
|
VIDEO_FONT_HEIGHT) / VIDEO_FONT_HEIGHT);
|
2004-03-14 16:51:43 +00:00
|
|
|
|
|
|
|
for (i = 1; i < n; i++) {
|
2011-07-29 09:55:27 +00:00
|
|
|
video_get_info_str(i, info);
|
2009-04-23 10:35:22 +00:00
|
|
|
if (!*info)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
len = strlen(info);
|
|
|
|
if (len > space) {
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawchars(VIDEO_INFO_X,
|
|
|
|
VIDEO_INFO_Y +
|
|
|
|
(i + y_off) *
|
|
|
|
VIDEO_FONT_HEIGHT,
|
|
|
|
(uchar *) info, space);
|
2009-04-23 10:35:22 +00:00
|
|
|
y_off++;
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawchars(VIDEO_INFO_X +
|
|
|
|
VIDEO_FONT_WIDTH,
|
|
|
|
VIDEO_INFO_Y +
|
|
|
|
(i + y_off) *
|
|
|
|
VIDEO_FONT_HEIGHT,
|
|
|
|
(uchar *) info + space,
|
|
|
|
len - space);
|
2009-04-23 10:35:22 +00:00
|
|
|
} else {
|
2011-07-29 09:55:27 +00:00
|
|
|
video_drawstring(VIDEO_INFO_X,
|
|
|
|
VIDEO_INFO_Y +
|
|
|
|
(i + y_off) *
|
|
|
|
VIDEO_FONT_HEIGHT,
|
|
|
|
(uchar *) info);
|
2009-04-23 10:35:22 +00:00
|
|
|
}
|
2004-03-14 16:51:43 +00:00
|
|
|
}
|
|
|
|
}
|
2016-05-24 21:59:59 +00:00
|
|
|
#endif
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
|
|
|
|
2010-01-12 11:06:31 +00:00
|
|
|
return (video_fb_address + video_logo_height * VIDEO_LINE_LEN);
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-06-05 07:19:18 +00:00
|
|
|
static int cfb_fb_is_in_dram(void)
|
|
|
|
{
|
2020-06-26 06:13:33 +00:00
|
|
|
struct bd_info *bd = gd->bd;
|
2012-06-05 07:19:18 +00:00
|
|
|
ulong start, end;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
|
|
|
|
start = bd->bi_dram[i].start;
|
|
|
|
end = bd->bi_dram[i].start + bd->bi_dram[i].size - 1;
|
|
|
|
if ((ulong)video_fb_address >= start &&
|
|
|
|
(ulong)video_fb_address < end)
|
|
|
|
return 1;
|
|
|
|
}
|
2020-08-12 11:32:41 +00:00
|
|
|
|
2012-06-05 07:19:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-22 09:06:06 +00:00
|
|
|
void video_clear(void)
|
|
|
|
{
|
|
|
|
if (!video_fb_address)
|
|
|
|
return;
|
|
|
|
#ifdef VIDEO_HW_RECTFILL
|
|
|
|
video_hw_rectfill(VIDEO_PIXEL_SIZE, /* bytes per pixel */
|
|
|
|
0, /* dest pos x */
|
|
|
|
0, /* dest pos y */
|
|
|
|
VIDEO_VISIBLE_COLS, /* frame width */
|
|
|
|
VIDEO_VISIBLE_ROWS, /* frame height */
|
|
|
|
bgx /* fill color */
|
|
|
|
);
|
|
|
|
#else
|
|
|
|
memsetl(video_fb_address,
|
|
|
|
(VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-10-18 02:12:54 +00:00
|
|
|
static int cfg_video_init(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2004-03-14 16:51:43 +00:00
|
|
|
unsigned char color8;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2011-07-30 12:48:09 +00:00
|
|
|
pGD = video_hw_init();
|
|
|
|
if (pGD == NULL)
|
2004-03-14 16:51:43 +00:00
|
|
|
return -1;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
video_fb_address = (void *) VIDEO_FB_ADRS;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2012-06-05 07:19:18 +00:00
|
|
|
cfb_do_flush_cache = cfb_fb_is_in_dram() && dcache_status();
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
/* Init drawing pats */
|
|
|
|
switch (VIDEO_DATA_FORMAT) {
|
|
|
|
case GDF__8BIT_INDEX:
|
2016-10-18 02:12:44 +00:00
|
|
|
video_set_lut(0x01, CONFIG_SYS_CONSOLE_FG_COL,
|
|
|
|
CONFIG_SYS_CONSOLE_FG_COL,
|
|
|
|
CONFIG_SYS_CONSOLE_FG_COL);
|
|
|
|
video_set_lut(0x00, CONFIG_SYS_CONSOLE_BG_COL,
|
|
|
|
CONFIG_SYS_CONSOLE_BG_COL,
|
|
|
|
CONFIG_SYS_CONSOLE_BG_COL);
|
2004-03-14 16:51:43 +00:00
|
|
|
fgx = 0x01010101;
|
|
|
|
bgx = 0x00000000;
|
|
|
|
break;
|
|
|
|
case GDF__8BIT_332RGB:
|
2016-10-18 02:12:44 +00:00
|
|
|
color8 = ((CONFIG_SYS_CONSOLE_FG_COL & 0xe0) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) & 0x1c) |
|
|
|
|
CONFIG_SYS_CONSOLE_FG_COL >> 6);
|
2011-07-29 09:55:27 +00:00
|
|
|
fgx = (color8 << 24) | (color8 << 16) | (color8 << 8) |
|
|
|
|
color8;
|
2016-10-18 02:12:44 +00:00
|
|
|
color8 = ((CONFIG_SYS_CONSOLE_BG_COL & 0xe0) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) & 0x1c) |
|
|
|
|
CONFIG_SYS_CONSOLE_BG_COL >> 6);
|
2011-07-29 09:55:27 +00:00
|
|
|
bgx = (color8 << 24) | (color8 << 16) | (color8 << 8) |
|
|
|
|
color8;
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_15BIT_555RGB:
|
2016-10-18 02:12:44 +00:00
|
|
|
fgx = (((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 26) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 21) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 16) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 10) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 5) |
|
|
|
|
(CONFIG_SYS_CONSOLE_FG_COL >> 3));
|
|
|
|
bgx = (((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 26) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 21) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 16) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 10) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 5) |
|
|
|
|
(CONFIG_SYS_CONSOLE_BG_COL >> 3));
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_16BIT_565RGB:
|
2016-10-18 02:12:44 +00:00
|
|
|
fgx = (((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 27) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 2) << 21) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 16) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 3) << 11) |
|
|
|
|
((CONFIG_SYS_CONSOLE_FG_COL >> 2) << 5) |
|
|
|
|
(CONFIG_SYS_CONSOLE_FG_COL >> 3));
|
|
|
|
bgx = (((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 27) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 2) << 21) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 16) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 3) << 11) |
|
|
|
|
((CONFIG_SYS_CONSOLE_BG_COL >> 2) << 5) |
|
|
|
|
(CONFIG_SYS_CONSOLE_BG_COL >> 3));
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_32BIT_X888RGB:
|
2016-10-18 02:12:44 +00:00
|
|
|
fgx = (CONFIG_SYS_CONSOLE_FG_COL << 16) |
|
|
|
|
(CONFIG_SYS_CONSOLE_FG_COL << 8) |
|
|
|
|
CONFIG_SYS_CONSOLE_FG_COL;
|
|
|
|
bgx = (CONFIG_SYS_CONSOLE_BG_COL << 16) |
|
|
|
|
(CONFIG_SYS_CONSOLE_BG_COL << 8) |
|
|
|
|
CONFIG_SYS_CONSOLE_BG_COL;
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
case GDF_24BIT_888RGB:
|
2016-10-18 02:12:44 +00:00
|
|
|
fgx = (CONFIG_SYS_CONSOLE_FG_COL << 24) |
|
|
|
|
(CONFIG_SYS_CONSOLE_FG_COL << 16) |
|
|
|
|
(CONFIG_SYS_CONSOLE_FG_COL << 8) |
|
|
|
|
CONFIG_SYS_CONSOLE_FG_COL;
|
|
|
|
bgx = (CONFIG_SYS_CONSOLE_BG_COL << 24) |
|
|
|
|
(CONFIG_SYS_CONSOLE_BG_COL << 16) |
|
|
|
|
(CONFIG_SYS_CONSOLE_BG_COL << 8) |
|
|
|
|
CONFIG_SYS_CONSOLE_BG_COL;
|
2004-03-14 16:51:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
eorx = fgx ^ bgx;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2017-08-03 16:47:01 +00:00
|
|
|
if (!CONFIG_IS_ENABLED(NO_FB_CLEAR))
|
|
|
|
video_clear();
|
2013-10-22 09:06:06 +00:00
|
|
|
|
2002-11-03 00:24:07 +00:00
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
2004-03-14 16:51:43 +00:00
|
|
|
/* Plot the logo and get start point of console */
|
2011-07-29 09:55:28 +00:00
|
|
|
debug("Video: Drawing the logo ...\n");
|
2011-07-29 09:55:27 +00:00
|
|
|
video_console_address = video_logo();
|
2002-11-03 00:24:07 +00:00
|
|
|
#else
|
2004-03-14 16:51:43 +00:00
|
|
|
video_console_address = video_fb_address;
|
2002-11-03 00:24:07 +00:00
|
|
|
#endif
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
/* Initialize the console */
|
|
|
|
console_col = 0;
|
|
|
|
console_row = 0;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2013-05-06 12:27:28 +00:00
|
|
|
if (cfb_do_flush_cache)
|
|
|
|
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
|
|
|
|
|
2004-03-14 16:51:43 +00:00
|
|
|
return 0;
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
|
|
|
|
2009-05-15 08:07:43 +00:00
|
|
|
/*
|
|
|
|
* Implement a weak default function for boards that optionally
|
|
|
|
* need to skip the video initialization.
|
|
|
|
*/
|
2014-10-08 20:57:30 +00:00
|
|
|
__weak int board_video_skip(void)
|
2009-05-15 08:07:43 +00:00
|
|
|
{
|
|
|
|
/* As default, don't skip test */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
int drv_video_init(void)
|
2002-11-03 00:24:07 +00:00
|
|
|
{
|
2009-05-16 10:14:54 +00:00
|
|
|
struct stdio_dev console_dev;
|
2015-03-02 19:40:50 +00:00
|
|
|
bool have_keyboard;
|
2015-08-24 08:00:07 +00:00
|
|
|
bool __maybe_unused keyboard_ok = false;
|
2002-11-03 00:24:07 +00:00
|
|
|
|
2009-05-15 08:07:43 +00:00
|
|
|
/* Check if video initialization should be skipped */
|
|
|
|
if (board_video_skip())
|
|
|
|
return 0;
|
|
|
|
|
2004-07-11 20:04:51 +00:00
|
|
|
/* Init video chip - returns with framebuffer cleared */
|
2016-10-18 02:12:54 +00:00
|
|
|
if (cfg_video_init() == -1)
|
2015-08-24 08:00:07 +00:00
|
|
|
return 0;
|
2004-07-11 20:04:51 +00:00
|
|
|
|
2013-08-03 05:22:53 +00:00
|
|
|
if (board_cfb_skip())
|
|
|
|
return 0;
|
|
|
|
|
2015-03-02 19:40:50 +00:00
|
|
|
#if defined(CONFIG_VGA_AS_SINGLE_DEVICE)
|
|
|
|
have_keyboard = false;
|
|
|
|
#elif defined(CONFIG_OF_CONTROL)
|
|
|
|
have_keyboard = !fdtdec_get_config_bool(gd->fdt_blob,
|
|
|
|
"u-boot,no-keyboard");
|
|
|
|
#else
|
|
|
|
have_keyboard = true;
|
|
|
|
#endif
|
|
|
|
if (have_keyboard) {
|
|
|
|
debug("KBD: Keyboard init ...\n");
|
2009-05-15 08:07:42 +00:00
|
|
|
#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
|
2015-08-24 08:00:07 +00:00
|
|
|
keyboard_ok = !(VIDEO_KBD_INIT_FCT == -1);
|
2009-05-15 08:07:42 +00:00
|
|
|
#endif
|
2015-03-02 19:40:50 +00:00
|
|
|
}
|
2009-05-15 08:07:42 +00:00
|
|
|
|
|
|
|
/* Init vga device */
|
2011-07-29 09:55:27 +00:00
|
|
|
memset(&console_dev, 0, sizeof(console_dev));
|
|
|
|
strcpy(console_dev.name, "vga");
|
2015-11-04 07:23:37 +00:00
|
|
|
console_dev.flags = DEV_FLAGS_OUTPUT;
|
2016-10-18 02:12:54 +00:00
|
|
|
console_dev.putc = cfb_video_putc; /* 'putc' function */
|
|
|
|
console_dev.puts = cfb_video_puts; /* 'puts' function */
|
2009-05-15 08:07:42 +00:00
|
|
|
|
|
|
|
#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
|
2015-08-24 08:00:07 +00:00
|
|
|
if (have_keyboard && keyboard_ok) {
|
2015-03-02 19:40:50 +00:00
|
|
|
/* Also init console device */
|
|
|
|
console_dev.flags |= DEV_FLAGS_INPUT;
|
|
|
|
console_dev.tstc = VIDEO_TSTC_FCT; /* 'tstc' function */
|
|
|
|
console_dev.getc = VIDEO_GETC_FCT; /* 'getc' function */
|
|
|
|
}
|
|
|
|
#endif
|
2009-05-15 08:07:42 +00:00
|
|
|
|
2011-07-29 09:55:27 +00:00
|
|
|
if (stdio_register(&console_dev) != 0)
|
2009-05-15 08:07:42 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Return success */
|
|
|
|
return 1;
|
2002-11-03 00:24:07 +00:00
|
|
|
}
|
2012-09-28 15:11:12 +00:00
|
|
|
|
|
|
|
void video_position_cursor(unsigned col, unsigned row)
|
|
|
|
{
|
|
|
|
console_col = min(col, CONSOLE_COLS - 1);
|
|
|
|
console_row = min(row, CONSOLE_ROWS - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int video_get_pixel_width(void)
|
|
|
|
{
|
|
|
|
return VIDEO_VISIBLE_COLS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int video_get_pixel_height(void)
|
|
|
|
{
|
|
|
|
return VIDEO_VISIBLE_ROWS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int video_get_screen_rows(void)
|
|
|
|
{
|
|
|
|
return CONSOLE_ROWS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int video_get_screen_columns(void)
|
|
|
|
{
|
|
|
|
return CONSOLE_COLS;
|
|
|
|
}
|