Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auxdisplay: Change gotoxy calling interface

Browse Source 
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>
This commit is contained in:
Lars Poeschel 2020-11-03 10:58:25 +01:00 committed by Miguel Ojeda
parent 6e49eea358
commit 40c2b72e4b
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/auxdisplay/charlcd.c
View File

@ -119,7 +119,7 @@ static void charlcd_print(struct charlcd *lcd, char c)
/* prevents the cursor from wrapping onto the next line */ /* prevents the cursor from wrapping onto the next line */
if (lcd->addr.x == lcd->width) 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) 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 */ /* restore cursor position */
lcd->addr.x = xs; lcd->addr.x = xs;
lcd->addr.y = ys; lcd->addr.y = ys;
lcd->ops->gotoxy(lcd); lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
processed = 1; processed = 1;
break; 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 the command is valid, move to the new address */
if (parse_xy(esc, &lcd->addr.x, &lcd->addr.y)) 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 */ /* Regardless of its validity, mark as processed */
processed = 1; processed = 1;
@ -407,12 +407,12 @@ static void charlcd_write_char(struct charlcd *lcd, char c)
lcd->addr.x = 0; lcd->addr.x = 0;
lcd->addr.y = (lcd->addr.y + 1) % lcd->height; lcd->addr.y = (lcd->addr.y + 1) % lcd->height;
lcd->ops->gotoxy(lcd); lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
break; break;
case '\r': case '\r':
/* go to the beginning of the same line */ /* go to the beginning of the same line */
lcd->addr.x = 0; lcd->addr.x = 0;
lcd->ops->gotoxy(lcd); lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
break; break;
case '\t': case '\t':
/* print a space instead of the tab */ /* print a space instead of the tab */

2
drivers/auxdisplay/charlcd.h
View File

@ -78,7 +78,7 @@ struct charlcd {
struct charlcd_ops { struct charlcd_ops {
void (*backlight)(struct charlcd *lcd, enum charlcd_onoff on); void (*backlight)(struct charlcd *lcd, enum charlcd_onoff on);
int (*print)(struct charlcd *lcd, int c); 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 (*home)(struct charlcd *lcd);
int (*clear_display)(struct charlcd *lcd); int (*clear_display)(struct charlcd *lcd);
int (*init_display)(struct charlcd *lcd); int (*init_display)(struct charlcd *lcd);

15
drivers/auxdisplay/hd44780_common.c
View File

@ -49,7 +49,7 @@ int hd44780_common_print(struct charlcd *lcd, int c)
} }
EXPORT_SYMBOL_GPL(hd44780_common_print); 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; struct hd44780_common *hdc = lcd->drvdata;
unsigned int addr; 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 * we force the cursor to stay at the end of the
* line if it wants to go farther * line if it wants to go farther
*/ */
addr = lcd->addr.x < hdc->bwidth ? lcd->addr.x & (hdc->hwidth - 1) addr = x < hdc->bwidth ? x & (hdc->hwidth - 1) : hdc->bwidth - 1;
: hdc->bwidth - 1; if (y & 1)
if (lcd->addr.y & 1)
addr += hdc->hwidth; addr += hdc->hwidth;
if (lcd->addr.y & 2) if (y & 2)
addr += hdc->bwidth; addr += hdc->bwidth;
hdc->write_cmd(hdc, LCD_CMD_SET_DDRAM_ADDR | addr); hdc->write_cmd(hdc, LCD_CMD_SET_DDRAM_ADDR | addr);
return 0; return 0;
@ -71,9 +70,7 @@ EXPORT_SYMBOL_GPL(hd44780_common_gotoxy);
int hd44780_common_home(struct charlcd *lcd) int hd44780_common_home(struct charlcd *lcd)
{ {
lcd->addr.x = 0; return hd44780_common_gotoxy(lcd, 0, 0);
lcd->addr.y = 0;
return hd44780_common_gotoxy(lcd);
} }
EXPORT_SYMBOL_GPL(hd44780_common_home); 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]); hdc->write_data(hdc, cgbytes[addr]);
/* ensures that we stop writing to CGRAM */ /* ensures that we stop writing to CGRAM */
lcd->ops->gotoxy(lcd); lcd->ops->gotoxy(lcd, lcd->addr.x, lcd->addr.y);
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(hd44780_common_redefine_char); EXPORT_SYMBOL_GPL(hd44780_common_redefine_char);

2
drivers/auxdisplay/hd44780_common.h
View File

@ -16,7 +16,7 @@ struct hd44780_common {
}; };
int hd44780_common_print(struct charlcd *lcd, int c); 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_home(struct charlcd *lcd);
int hd44780_common_clear_display(struct charlcd *lcd); int hd44780_common_clear_display(struct charlcd *lcd);
int hd44780_common_init_display(struct charlcd *lcd); int hd44780_common_init_display(struct charlcd *lcd);