Commit 40c2b72e authored by Lars Poeschel's avatar Lars Poeschel Committed by Miguel Ojeda
Browse files

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: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarLars Poeschel <poeschel@lemonage.de>
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 6e49eea3

drivers/auxdisplay/charlcd.c

+5 −5
Original line number Diff line number Diff line
@@ -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 */

drivers/auxdisplay/charlcd.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/auxdisplay/hd44780_common.c

+6 −9
Original line number Diff line number Diff line
@@ -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);

drivers/auxdisplay/hd44780_common.h

+1 −1
Original line number Diff line number Diff line
@@ -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);