summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2011-12-07 03:58:10 +0000
committerWolfgang Denk <wd@denx.de>2011-12-07 21:32:19 +0100
commita45adde9f7939959c89b18aae6380e9c5121a1ba (patch)
treebcf4dd4e27709848d554e29ac3e431fa20993f80
parent1affd5c195bc57ef5155426c12f81ea3fc8a37d6 (diff)
downloadu-boot-imx-a45adde9f7939959c89b18aae6380e9c5121a1ba.zip
u-boot-imx-a45adde9f7939959c89b18aae6380e9c5121a1ba.tar.gz
u-boot-imx-a45adde9f7939959c89b18aae6380e9c5121a1ba.tar.bz2
video: cfb_console: fix build warnings
Fix: cfb_console.c:371: warning: 'cursor_state' defined but not used cfb_console.c:372: warning: 'old_col' defined but not used cfb_console.c:373: warning: 'old_row' defined but not used cfb_console.c:435: warning: 'video_invertchar' defined but not used Signed-off-by: Anatolij Gustschin <agust@denx.de> Tested-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--drivers/video/cfb_console.c38
1 files changed, 17 insertions, 21 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 9be6166..904caf7 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -368,9 +368,9 @@ static void *video_console_address; /* console buffer start address */
static int video_logo_height = VIDEO_LOGO_HEIGHT;
-static int cursor_state;
-static int old_col;
-static int old_row;
+static int __maybe_unused cursor_state;
+static int __maybe_unused old_col;
+static int __maybe_unused old_row;
static int console_col; /* cursor col */
static int console_row; /* cursor row */
@@ -430,23 +430,6 @@ static const int video_font_draw_table32[16][4] = {
{0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff}
};
-
-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;
- }
- }
-}
-
-
static void video_drawchars(int xx, int yy, unsigned char *s, int count)
{
u8 *cdat, *dest, *dest0;
@@ -627,7 +610,20 @@ static void video_set_cursor(void)
console_cursor(1);
}
-
+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;
+ }
+ }
+}
void console_cursor(int state)
{