auxdisplay: Change gotoxy calling interface

Change the calling interface for gotoxy from supplying the x and y
coordinates in the charlcd struct to explicitly supplying x and y in
the function arguments. This is more intuitive and allows for moving
the cursor to positions independent from the position saved in the
charlcd struct.

Reviewed-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 59f21401d6a9682da1057de0e5f77e49226aac3b..ef10b5ca0e16607012967e9e913bb53e69fcdb2a 100644 (file)
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -119,7 +119,7 @@ static void charlcd_print(struct charlcd *lcd, char c)
 
        /* prevents the cursor from wrapping onto the next line */
        if (lcd->addr.x == lcd->width)
-               lcd->ops->gotoxy(lcd);
+               lcd->ops->gotoxy(lcd, lcd->addr.x - 1, lcd->addr.y);
 }
 
 static void charlcd_clear_display(struct charlcd *lcd)
@@ -325,7 +325,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
                /* restore cursor position */
                lcd->addr.x = xs;
                lcd->addr.y = ys;
-               lcd->ops->gotoxy(lcd);
+               lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
                processed = 1;
                break;
        }
@@ -349,7 +349,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
 
                /* If the command is valid, move to the new address */
                if (parse_xy(esc, &lcd->addr.x, &lcd->addr.y))
-                       lcd->ops->gotoxy(lcd);
+                       lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
 
                /* Regardless of its validity, mark as processed */
                processed = 1;
@@ -407,12 +407,12 @@ static void charlcd_write_char(struct charlcd *lcd, char c)
 
                        lcd->addr.x = 0;
                        lcd->addr.y = (lcd->addr.y + 1) % lcd->height;
-                       lcd->ops->gotoxy(lcd);
+                       lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
                        break;
                case '\r':
                        /* go to the beginning of the same line */
                        lcd->addr.x = 0;
-                       lcd->ops->gotoxy(lcd);
+                       lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
                        break;
                case '\t':
                        /* print a space instead of the tab */

diff --git a/drivers/auxdisplay/charlcd.h b/drivers/auxdisplay/charlcd.h
index e7e9b12b1e995d4f815cf95136a51bdd2f3b6681..eed80063a6d20d0bf67a4ac88daf107ccb4b462e 100644 (file)
--- a/drivers/auxdisplay/charlcd.h
+++ b/drivers/auxdisplay/charlcd.h
@@ -78,7 +78,7 @@ struct charlcd {
 struct charlcd_ops {
        void (*backlight)(struct charlcd *lcd, enum charlcd_onoff on);
        int (*print)(struct charlcd *lcd, int c);
-       int (*gotoxy)(struct charlcd *lcd);
+       int (*gotoxy)(struct charlcd *lcd, unsigned int x, unsigned int y);
        int (*home)(struct charlcd *lcd);
        int (*clear_display)(struct charlcd *lcd);
        int (*init_display)(struct charlcd *lcd);

diff --git a/drivers/auxdisplay/hd44780_common.c b/drivers/auxdisplay/hd44780_common.c
index bd93a4d3367e83a8657b0ea64a233b8b2c2d3af2..3934c2eebf33d312ff9b23af754b66358f7f879e 100644 (file)
--- a/drivers/auxdisplay/hd44780_common.c
+++ b/drivers/auxdisplay/hd44780_common.c
@@ -49,7 +49,7 @@ int hd44780_common_print(struct charlcd *lcd, int c)
 }
 EXPORT_SYMBOL_GPL(hd44780_common_print);
 
-int hd44780_common_gotoxy(struct charlcd *lcd)
+int hd44780_common_gotoxy(struct charlcd *lcd, unsigned int x, unsigned int y)
 {
        struct hd44780_common *hdc = lcd->drvdata;
        unsigned int addr;
@@ -58,11 +58,10 @@ int hd44780_common_gotoxy(struct charlcd *lcd)
         * we force the cursor to stay at the end of the
         * line if it wants to go farther
         */
-       addr = lcd->addr.x < hdc->bwidth ? lcd->addr.x & (hdc->hwidth - 1)
-                                         : hdc->bwidth - 1;
-       if (lcd->addr.y & 1)
+       addr = x < hdc->bwidth ? x & (hdc->hwidth - 1) : hdc->bwidth - 1;
+       if (y & 1)
                addr += hdc->hwidth;
-       if (lcd->addr.y & 2)
+       if (y & 2)
                addr += hdc->bwidth;
        hdc->write_cmd(hdc, LCD_CMD_SET_DDRAM_ADDR | addr);
        return 0;
@@ -71,9 +70,7 @@ EXPORT_SYMBOL_GPL(hd44780_common_gotoxy);
 
 int hd44780_common_home(struct charlcd *lcd)
 {
-       lcd->addr.x = 0;
-       lcd->addr.y = 0;
-       return hd44780_common_gotoxy(lcd);
+       return hd44780_common_gotoxy(lcd, 0, 0);
 }
 EXPORT_SYMBOL_GPL(hd44780_common_home);
 
@@ -341,7 +338,7 @@ int hd44780_common_redefine_char(struct charlcd *lcd, char *esc)
                hdc->write_data(hdc, cgbytes[addr]);
 
        /* ensures that we stop writing to CGRAM */
-       lcd->ops->gotoxy(lcd);
+       lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
        return 1;
 }
 EXPORT_SYMBOL_GPL(hd44780_common_redefine_char);

diff --git a/drivers/auxdisplay/hd44780_common.h b/drivers/auxdisplay/hd44780_common.h
index bc817d1610d4c5b4eed838fbdcf679adce8219d9..a16aa8c29c992048fb1103b6e55e1248b13b965a 100644 (file)
--- a/drivers/auxdisplay/hd44780_common.h
+++ b/drivers/auxdisplay/hd44780_common.h
@@ -16,7 +16,7 @@ struct hd44780_common {
 };
 
 int hd44780_common_print(struct charlcd *lcd, int c);
-int hd44780_common_gotoxy(struct charlcd *lcd);
+int hd44780_common_gotoxy(struct charlcd *lcd, unsigned int x, unsigned int y);
 int hd44780_common_home(struct charlcd *lcd);
 int hd44780_common_clear_display(struct charlcd *lcd);
 int hd44780_common_init_display(struct charlcd *lcd);