Skip to contentSkip to conversation

video: cfb_console: fix build warnings

PATCH New Anatolij Gustschin 2 participants 4 messages Dec 7, 2011 Framebuffer layer

lore
Share & tools
lore

Anatolij Gustschin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
I forgot to run MAKEALL for both, arm and powerpc for last CFB patch, sorry.

 drivers/video/cfb_console.c |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)
drivers/video/cfb_console.c +17 -21
index 9be6166..904caf7 100644
@@ -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)
 {
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 video: cfb_console: fix build warnings

Dear Anatolij Gustschin,

Quoted 6 lines · In message <[email protected]> you wrote:

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

Quoted 7 lines
Signed-off-by Anatolij Gustschin <[email protected]>

---
I forgot to run MAKEALL for both, arm and powerpc for last CFB patch, sorry.

 drivers/video/cfb_console.c |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

Indeed, this fixes the build warnings. Thanks.

Tested-by Wolfgang Denk <[email protected]>

[If it's OK with you, I will pull this direcxtly.]

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I can't understand it. I can't even understand  the  people  who  can
understand it.                    - Queen Juliana of the Netherlands.
author
#2 lore raw

PATCH 1/1 video: cfb_console: fix build warnings

Hello Wolfgang,

On Wed, 07 Dec 2011 21:32:33 +0100
Wolfgang Denk <[email protected]> wrote:
...

Quoted 8 lines
Quoted 2 lines
 drivers/video/cfb_console.c |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

Indeed, this fixes the build warnings. Thanks.

Tested-by Wolfgang Denk <[email protected]>

[If it's OK with you, I will pull this direcxtly.]

Yes, it is OK.

Thanks,
Anatolij

Applied
#3 lore raw

PATCH 1/1 video: cfb_console: fix build warnings

In reply to Anatolij Gustschin

Dear Anatolij Gustschin,

Quoted 6 lines · In message <[email protected]> you wrote:

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

Quoted 7 lines
Signed-off-by Anatolij Gustschin <[email protected]>

---
I forgot to run MAKEALL for both, arm and powerpc for last CFB patch, sorry.

 drivers/video/cfb_console.c |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 8 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Many companies that have made themselves dependent on [the  equipment
of  a  certain  major  manufacturer] (and in doing so have sold their
soul to the devil) will collapse under the sheer weight  of  the  un-
mastered complexity of their data processing systems.
          -- Edsger W. Dijkstra, SIGPLAN Notices, Volume 17, Number 5