leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: Move video_get_info_str() prototype to a header file

Browse Source 
This should be defined in a header file so that arguments are checked.
Move it to video.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-10-17 20:12:54 -06:00 committed by Tom Rini
parent fbda683292
commit 0a6eac842e
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/liebherr/lwmon5/lwmon5.c
View File

@ -13,6 +13,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <post.h> #include <post.h>
#include <flash.h> #include <flash.h>
#include <video.h>
#include <mtd/cfi_flash.h> #include <mtd/cfi_flash.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

1
board/mosaixtech/icon/icon.c
View File

@ -11,6 +11,7 @@
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <netdev.h> #include <netdev.h>
#include <video.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/ppc4xx-gpio.h> #include <asm/ppc4xx-gpio.h>

1
board/mpl/common/common_util.c
View File

@ -15,6 +15,7 @@
#include <pci.h> #include <pci.h>
#include <malloc.h> #include <malloc.h>
#include <bzlib.h> #include <bzlib.h>
#include <video.h>
#ifdef CONFIG_PIP405 #ifdef CONFIG_PIP405
#include "../pip405/pip405.h" #include "../pip405/pip405.h"

1
board/tqc/tqm5200/tqm5200.c
View File

@ -18,6 +18,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h> #include <libfdt.h>
#include <netdev.h> #include <netdev.h>
#include <video.h>
#ifdef CONFIG_VIDEO_SM501 #ifdef CONFIG_VIDEO_SM501
#include <sm501.h> #include <sm501.h>

25
drivers/video/cfb_console.c
View File

@ -69,6 +69,7 @@
#include <fdtdec.h> #include <fdtdec.h>
#include <version.h> #include <version.h>
#include <malloc.h> #include <malloc.h>
#include <video.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* /*
@ -235,16 +236,6 @@ void console_cursor(int state);
#endif #endif
#endif #endif
#ifdef CONFIG_CONSOLE_EXTRA_INFO
/*
* setup a board string: type, speed, etc.
*
* line_number: location to place info string beside logo
* info: buffer for info string
*/
extern void video_get_info_str(int line_number, char *info);
#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Locals */ /* Locals */
@ -823,7 +814,7 @@ static void parse_putc(const char c)
CURSOR_SET; CURSOR_SET;
} }
static void video_putc(struct stdio_dev *dev, const char c) static void cfb_video_putc(struct stdio_dev *dev, const char c)
{ {
#ifdef CONFIG_CFB_CONSOLE_ANSI #ifdef CONFIG_CFB_CONSOLE_ANSI
int i; int i;
@ -1037,7 +1028,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE); flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
} }
static void video_puts(struct stdio_dev *dev, const char *s) static void cfb_video_puts(struct stdio_dev *dev, const char *s)
{ {
int flush = cfb_do_flush_cache; int flush = cfb_do_flush_cache;
int count = strlen(s); int count = strlen(s);
@ -1046,7 +1037,7 @@ static void video_puts(struct stdio_dev *dev, const char *s)
cfb_do_flush_cache = 0; cfb_do_flush_cache = 0;
while (count--) while (count--)
video_putc(dev, *s++); cfb_video_putc(dev, *s++);
if (flush) { if (flush) {
cfb_do_flush_cache = flush; cfb_do_flush_cache = flush;
@ -2013,7 +2004,7 @@ void video_clear(void)
#endif #endif
} }
static int video_init(void) static int cfg_video_init(void)
{ {
unsigned char color8; unsigned char color8;
@ -2139,7 +2130,7 @@ int drv_video_init(void)
return 0; return 0;
/* Init video chip - returns with framebuffer cleared */ /* Init video chip - returns with framebuffer cleared */
if (video_init() == -1) if (cfg_video_init() == -1)
return 0; return 0;
if (board_cfb_skip()) if (board_cfb_skip())
@ -2164,8 +2155,8 @@ int drv_video_init(void)
memset(&console_dev, 0, sizeof(console_dev)); memset(&console_dev, 0, sizeof(console_dev));
strcpy(console_dev.name, "vga"); strcpy(console_dev.name, "vga");
console_dev.flags = DEV_FLAGS_OUTPUT; console_dev.flags = DEV_FLAGS_OUTPUT;
console_dev.putc = video_putc; /* 'putc' function */ console_dev.putc = cfb_video_putc; /* 'putc' function */
console_dev.puts = video_puts; /* 'puts' function */ console_dev.puts = cfb_video_puts; /* 'puts' function */
#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE) #if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
if (have_keyboard && keyboard_ok) { if (have_keyboard && keyboard_ok) {

11
include/video.h
View File

@ -245,6 +245,17 @@ int lg4573_spi_startup(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode); unsigned int max_hz, unsigned int spi_mode);
#endif #endif
/*
* video_get_info_str() - obtain a board string: type, speed, etc.
*
* This is called if CONFIG_CONSOLE_EXTRA_INFO is enabled.
*
* line_number: location to place info string beside logo
* info: buffer for info string (empty if nothing to display on this
* line)
*/
void video_get_info_str(int line_number, char *info);
#endif /* CONFIG_DM_VIDEO */ #endif /* CONFIG_DM_VIDEO */
#endif #endif