* [U-Boot] [PATCH] video: cfb_console: fix build warnings
@ 2011-12-07 13:58 Anatolij Gustschin
2011-12-07 20:32 ` Wolfgang Denk
2011-12-07 20:41 ` Wolfgang Denk
0 siblings, 2 replies; 4+ messages in thread
From: Anatolij Gustschin @ 2011-12-07 13:58 UTC (permalink / raw)
To: u-boot
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>
---
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(-)
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)
{
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] video: cfb_console: fix build warnings
2011-12-07 13:58 [U-Boot] [PATCH] video: cfb_console: fix build warnings Anatolij Gustschin
@ 2011-12-07 20:32 ` Wolfgang Denk
2011-12-07 20:37 ` Anatolij Gustschin
2011-12-07 20:41 ` Wolfgang Denk
1 sibling, 1 reply; 4+ messages in thread
From: Wolfgang Denk @ 2011-12-07 20:32 UTC (permalink / raw)
To: u-boot
Dear Anatolij Gustschin,
In message <1323266290-31142-1-git-send-email-agust@denx.de> 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
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> 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 <wd@denx.de>
[If it's OK with you, I will pull this direcxtly.]
Best regards,
Wolfgang Denk
--
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] video: cfb_console: fix build warnings
2011-12-07 20:32 ` Wolfgang Denk
@ 2011-12-07 20:37 ` Anatolij Gustschin
0 siblings, 0 replies; 4+ messages in thread
From: Anatolij Gustschin @ 2011-12-07 20:37 UTC (permalink / raw)
To: u-boot
Hello Wolfgang,
On Wed, 07 Dec 2011 21:32:33 +0100
Wolfgang Denk <wd@denx.de> wrote:
...
> > drivers/video/cfb_console.c | 38 +++++++++++++++++---------------------
> > 1 files changed, 17 insertions(+), 21 deletions(-)
>
> Indeed, this fixes the build warnings. Thanks.
>
> Tested-by: Wolfgang Denk <wd@denx.de>
>
> [If it's OK with you, I will pull this direcxtly.]
Yes, it is OK.
Thanks,
Anatolij
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] video: cfb_console: fix build warnings
2011-12-07 13:58 [U-Boot] [PATCH] video: cfb_console: fix build warnings Anatolij Gustschin
2011-12-07 20:32 ` Wolfgang Denk
@ 2011-12-07 20:41 ` Wolfgang Denk
1 sibling, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2011-12-07 20:41 UTC (permalink / raw)
To: u-boot
Dear Anatolij Gustschin,
In message <1323266290-31142-1-git-send-email-agust@denx.de> 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
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> 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
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-07 20:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-07 13:58 [U-Boot] [PATCH] video: cfb_console: fix build warnings Anatolij Gustschin
2011-12-07 20:32 ` Wolfgang Denk
2011-12-07 20:37 ` Anatolij Gustschin
2011-12-07 20:41 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.