From: poeschel@lemonage.de
To: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>,
Willy Tarreau <willy@haproxy.com>,
Ksenija Stanojevic <ksenija.stanojevic@gmail.com>,
linux-kernel@vger.kernel.org (open list)
Cc: Lars Poeschel <poeschel@lemonage.de>
Subject: [PATCH v2 18/32] auxdisplay: Implement hd44780_common_cursor
Date: Mon, 21 Sep 2020 16:46:30 +0200 [thread overview]
Message-ID: <20200921144645.2061313-19-poeschel@lemonage.de> (raw)
In-Reply-To: <20200921144645.2061313-1-poeschel@lemonage.de>
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
next prev parent reply other threads:[~2020-09-21 14:48 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 8:24 [PATCH 1/3] auxdisplay: Make charlcd.[ch] more general Lars Poeschel
2019-10-16 8:26 ` [PATCH 2/3] auxdisplay: lcd2s DT binding doc Lars Poeschel
2019-10-29 1:24 ` Rob Herring
2019-10-16 8:27 ` [PATCH 3/3] auxdisplay: add a driver for lcd2s character display Lars Poeschel
2019-10-16 16:53 ` [PATCH 1/3] auxdisplay: Make charlcd.[ch] more general Miguel Ojeda
2019-10-17 8:07 ` Lars Poeschel
2019-10-17 11:26 ` Andy Shevchenko
2019-10-18 15:08 ` Miguel Ojeda
2019-10-18 15:33 ` Joe Perches
2019-10-18 21:55 ` Andi Kleen
2020-09-21 14:46 ` [PATCH v2 00/33] Make charlcd device independent poeschel
2020-09-21 14:46 ` [PATCH v2 01/32] auxdisplay: Use an enum for charlcd backlight on/off ops poeschel
2020-09-21 14:46 ` [PATCH v2 02/32] auxdisplay: Introduce hd44780_common.[ch] poeschel
2020-09-21 15:30 ` Randy Dunlap
2020-09-21 14:46 ` [PATCH v2 03/32] auxdisplay: Move hwidth and bwidth to struct hd44780_common poeschel
2020-09-21 14:46 ` [PATCH v2 04/32] auxdisplay: Move ifwidth " poeschel
2020-09-21 14:46 ` [PATCH v2 05/32] auxdisplay: Move write_data pointer to hd44780_common poeschel
2020-09-21 14:46 ` [PATCH v2 06/32] auxdisplay: Move write_cmd pointers to hd44780 drivers poeschel
2020-09-21 14:46 ` [PATCH v2 07/32] auxdisplay: Move addr out of charlcd_priv poeschel
2020-09-21 14:46 ` [PATCH v2 08/32] auxdisplay: hd44780_common_print poeschel
2020-09-21 14:46 ` [PATCH v2 09/32] auxdisplay: provide hd44780_common_gotoxy poeschel
2020-09-21 14:46 ` [PATCH v2 10/32] auxdisplay: add home to charlcd_ops poeschel
2020-09-21 14:46 ` [PATCH v2 11/32] auxdisplay: Move clear_display to hd44780_common poeschel
2020-09-21 14:46 ` [PATCH v2 12/32] auxdisplay: make charlcd_backlight visible " poeschel
2020-09-21 14:46 ` [PATCH v2 13/32] auxdisplay: Make use of enum for backlight on / off poeschel
2020-09-21 14:46 ` [PATCH v2 14/32] auxdisplay: Move init_display to hd44780_common poeschel
2020-09-21 14:46 ` [PATCH v2 15/32] auxdisplay: implement hd44780_common_shift_cursor poeschel
2020-09-21 14:46 ` [PATCH v2 16/32] auxdisplay: Implement hd44780_common_display_shift poeschel
2020-09-21 14:46 ` [PATCH v2 17/32] auxdisplay: Implement a hd44780_common_display poeschel
2020-09-21 14:46 ` poeschel [this message]
2020-09-21 14:46 ` [PATCH v2 19/32] auxdisplay: Implement hd44780_common_blink poeschel
2020-09-21 14:46 ` [PATCH v2 20/32] auxdisplay: cleanup unnecessary hd44780 code in charlcd poeschel
2020-09-21 14:46 ` [PATCH v2 21/32] auxdisplay: Implement hd44780_common_fontsize poeschel
2020-09-21 14:46 ` [PATCH v2 22/32] auxdisplay: Implement hd44780_common_lines poeschel
2020-09-21 14:46 ` [PATCH v2 23/32] auxdisplay: Remove unnecessary hd44780 from charlcd poeschel
2020-09-21 14:46 ` [PATCH v2 24/32] auxdisplay: Move char redefine code to hd44780_common poeschel
2020-09-21 14:46 ` [PATCH v2 25/32] auxdisplay: Call charlcd_backlight in place poeschel
2020-09-21 14:46 ` [PATCH v2 26/32] auxdisplay: Move clear_fast to hd44780 poeschel
2020-09-21 14:46 ` [PATCH v2 27/32] auxdisplay: remove naive display clear impl poeschel
2020-09-21 14:46 ` [PATCH v2 28/32] auxdisplay: hd44780: Remove clear_fast poeschel
2020-09-22 5:22 ` Willy Tarreau
2020-09-22 8:49 ` Lars Poeschel
2020-09-22 9:21 ` Willy Tarreau
2020-09-22 11:51 ` Lars Poeschel
2020-09-21 14:46 ` [PATCH v2 29/32] auxdisplay: charlcd: replace last device specific stuff poeschel
2020-09-21 14:46 ` [PATCH v2 30/32] auxdisplay: Change gotoxy calling interface poeschel
2020-09-21 14:46 ` [PATCH v2 31/32] auxdisplay: charlcd: Do not print chars at end of line poeschel
2020-09-22 5:27 ` Willy Tarreau
2020-09-22 9:44 ` Lars Poeschel
2020-09-22 10:04 ` Willy Tarreau
2020-09-22 10:20 ` Miguel Ojeda
2020-09-22 11:51 ` Lars Poeschel
2020-09-21 14:46 ` [PATCH v2 32/32] auxdisplay: lcd2s DT binding doc poeschel
2020-09-22 15:58 ` Rob Herring
2020-10-02 13:45 ` Lars Poeschel
2020-09-21 14:46 ` [PATCH v2 33/33] auxdisplay: add a driver for lcd2s character display poeschel
2020-09-21 15:33 ` Randy Dunlap
2020-10-02 12:42 ` Pavel Machek
2020-10-02 13:15 ` Lars Poeschel
2020-09-22 5:31 ` [PATCH v2 00/33] Make charlcd device independent Willy Tarreau
2020-09-22 10:23 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200921144645.2061313-19-poeschel@lemonage.de \
--to=poeschel@lemonage.de \
--cc=ksenija.stanojevic@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=willy@haproxy.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).