Messages in this thread Patch in this message | | | From | poeschel@lemonage ... | Subject | [PATCH v2 18/32] auxdisplay: Implement hd44780_common_cursor | Date | Mon, 21 Sep 2020 16:46:30 +0200 |
| |
From: Lars Poeschel <poeschel@lemonage.de>
Implement a hd44780_common_cursor function to turn the cursor on and off. The hd44780 drivers can use this function and charlcd calls it through its ops function pointer.
Signed-off-by: Lars Poeschel <poeschel@lemonage.de> --- drivers/auxdisplay/charlcd.c | 6 ++++++ drivers/auxdisplay/charlcd.h | 2 ++ drivers/auxdisplay/hd44780.c | 2 ++ drivers/auxdisplay/hd44780_common.c | 14 ++++++++++++++ drivers/auxdisplay/hd44780_common.h | 1 + drivers/auxdisplay/panel.c | 3 +++ 6 files changed, 28 insertions(+)
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c index 9bd3c0f2c470..a2f0becb1a9f 100644 --- a/drivers/auxdisplay/charlcd.c +++ b/drivers/auxdisplay/charlcd.c @@ -246,10 +246,16 @@ static inline int handle_lcd_special_code(struct charlcd *lcd) break; case 'C': /* Cursor ON */ priv->flags |= LCD_FLAG_C; + if (priv->flags != oldflags) + lcd->ops->cursor(lcd, CHARLCD_ON); + processed = 1; break; case 'c': /* Cursor OFF */ priv->flags &= ~LCD_FLAG_C; + if (priv->flags != oldflags) + lcd->ops->cursor(lcd, CHARLCD_OFF); + processed = 1; break; case 'B': /* Blink ON */ diff --git a/drivers/auxdisplay/charlcd.h b/drivers/auxdisplay/charlcd.h index ec739a25195e..5aab359ebd91 100644 --- a/drivers/auxdisplay/charlcd.h +++ b/drivers/auxdisplay/charlcd.h @@ -61,6 +61,7 @@ struct charlcd { * @shift_cursor: Shift cursor left or right one position. * @shift_display: Shift whole display content left or right. * @display: Turn display on or off. + * @cursor: Turn cursor on or off. */ struct charlcd_ops { void (*clear_fast)(struct charlcd *lcd); @@ -73,6 +74,7 @@ struct charlcd_ops { int (*shift_cursor)(struct charlcd *lcd, enum charlcd_shift_dir dir); int (*shift_display)(struct charlcd *lcd, enum charlcd_shift_dir dir); int (*display)(struct charlcd *lcd, enum charlcd_onoff on); + int (*cursor)(struct charlcd *lcd, enum charlcd_onoff on); }; void charlcd_backlight(struct charlcd *lcd, enum charlcd_onoff on); diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c index 0f76b812fa20..d5ce3955b577 100644 --- a/drivers/auxdisplay/hd44780.c +++ b/drivers/auxdisplay/hd44780.c @@ -134,6 +134,7 @@ static const struct charlcd_ops hd44780_ops_gpio8 = { .shift_cursor = hd44780_common_shift_cursor, .shift_display = hd44780_common_shift_display, .display = hd44780_common_display, + .cursor = hd44780_common_cursor, }; /* Send a command to the LCD panel in 4 bit GPIO mode */ @@ -185,6 +186,7 @@ static const struct charlcd_ops hd44780_ops_gpio4 = { .shift_cursor = hd44780_common_shift_cursor, .shift_display = hd44780_common_shift_display, .display = hd44780_common_display, + .cursor = hd44780_common_cursor, }; static int hd44780_probe(struct platform_device *pdev) diff --git a/drivers/auxdisplay/hd44780_common.c b/drivers/auxdisplay/hd44780_common.c index d375a621c52d..af68eb5f3422 100644 --- a/drivers/auxdisplay/hd44780_common.c +++ b/drivers/auxdisplay/hd44780_common.c @@ -221,6 +221,20 @@ int hd44780_common_display(struct charlcd *lcd, enum charlcd_onoff on) } EXPORT_SYMBOL_GPL(hd44780_common_display); +int hd44780_common_cursor(struct charlcd *lcd, enum charlcd_onoff on) +{ + struct hd44780_common *hdc = lcd->drvdata; + + if (on == CHARLCD_ON) + hdc->hd44780_common_flags |= LCD_FLAG_C; + else + hdc->hd44780_common_flags &= ~LCD_FLAG_C; + + hd44780_common_set_mode(hdc); + return 0; +} +EXPORT_SYMBOL_GPL(hd44780_common_cursor); + struct hd44780_common *hd44780_common_alloc(void) { struct hd44780_common *hd; diff --git a/drivers/auxdisplay/hd44780_common.h b/drivers/auxdisplay/hd44780_common.h index 1550fa77b956..7327a9b2e997 100644 --- a/drivers/auxdisplay/hd44780_common.h +++ b/drivers/auxdisplay/hd44780_common.h @@ -25,5 +25,6 @@ int hd44780_common_shift_cursor(struct charlcd *lcd, int hd44780_common_shift_display(struct charlcd *lcd, enum charlcd_shift_dir dir); int hd44780_common_display(struct charlcd *lcd, enum charlcd_onoff on); +int hd44780_common_cursor(struct charlcd *lcd, enum charlcd_onoff on); struct hd44780_common *hd44780_common_alloc(void); diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c index 9cb895c74cfb..26fbf91c1501 100644 --- a/drivers/auxdisplay/panel.c +++ b/drivers/auxdisplay/panel.c @@ -882,6 +882,7 @@ static const struct charlcd_ops charlcd_serial_ops = { .shift_cursor = hd44780_common_shift_cursor, .shift_display = hd44780_common_shift_display, .display = hd44780_common_display, + .cursor = hd44780_common_cursor, }; static const struct charlcd_ops charlcd_parallel_ops = { @@ -894,6 +895,7 @@ static const struct charlcd_ops charlcd_parallel_ops = { .shift_cursor = hd44780_common_shift_cursor, .shift_display = hd44780_common_shift_display, .display = hd44780_common_display, + .cursor = hd44780_common_cursor, }; static const struct charlcd_ops charlcd_tilcd_ops = { @@ -906,6 +908,7 @@ static const struct charlcd_ops charlcd_tilcd_ops = { .shift_cursor = hd44780_common_shift_cursor, .shift_display = hd44780_common_shift_display, .display = hd44780_common_display, + .cursor = hd44780_common_cursor, }; /* initialize the LCD driver */ -- 2.28.0
| |