- 28 Jan, 2024 40 commits
-
-
Jiri Slaby (SUSE) authored
There are still members of struct consw which are not documented yet. Fix that up, so we can generate kernel-doc for that struct. Signed-off-by:
"Jiri Slaby (SUSE)" <jirislaby@kernel.org> Tested-by: Helge Deller <deller@gmx.de> # parisc STI console Link: https://lore.kernel.org/r/20240122110401.7289-46-jirislaby@kernel.orgSigned-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Jiri Slaby (SUSE) authored
consw::con_flush_scrollback() is unused since commit 973c096f (vgacon: remove software scrollback support). Drop it. Signed-off-by:
-
Jiri Slaby (SUSE) authored
After the previous patch, nobody sets that hook. So drop it completely. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Again, fbcon_getxy() is the same as the default implementation since the softscroll removal in commit 50145474 (fbcon: remove soft scrollback code). Drop that. Signed-off-by:
-
Jiri Slaby (SUSE) authored
* parameter offset: it is expected to be non-negative, so switch to unsigned * return type: switch from ushort to explicit u16. This is expected on most places. And fix the remaining two places too. Signed-off-by:
-
Jiri Slaby (SUSE) authored
After the previous patch, nobody sets that hook. So drop it completely. Signed-off-by:
-
Jiri Slaby (SUSE) authored
fbcon_screen_pos() performs the same as the default implementation. The only difference in the default implementation is that is considers both vc->vc_origin and vc->vc_visible_origin. But given fbcon's softscroll code was already removed in commit 50145474 (fbcon: remove soft scrollback code), both are always the same. So remove fbcon_screen_pos() too. Signed-off-by:
-
Jiri Slaby (SUSE) authored
The return value of consw::con_set_origin() is only true/false, meaining if vc->vc_origin is set to vc->vc_screenbuf or not. So switch the type and returned values accordingly. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
It's a name after all and that is not supposed to be changed. So make it const to make this obvious. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Provided the font parameter of consw::con_font_set() is not supposed to be changed, make it const. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Both the mode_switch parameter and the return value (a redraw needed) are true/false. So switch them to bool, so that users won't return -Eerrors or anything else. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Use the new enum for VESA constants. This improves type checking in consw::con_blank(). Signed-off-by:
-
Jiri Slaby (SUSE) authored
There are VESA blanking constants defined in vesa.h. So use them in the console code instead of constant values. Signed-off-by:
-
Jiri Slaby (SUSE) authored
There are currently two places with VESA blanking constants definitions: fb.h and console.h. Extract/unify the two to a separate header (vesa.h). Given the fb's is in an uapi header, create the common header in uapi too. Note that instead of macros, an enum (vesa_blank_mode) is created. But the macros are kept too (they now expand to the enum constants), just in case someone in userspace performs some #ifdeffery. Signed-off-by:
-
Jiri Slaby (SUSE) authored
-1 is the same as VESA_VSYNC_SUSPEND in all con_blank() implementations. So we can remove this special case from vgacon now too. Despite con_blank() of fbcon looks complicated, the "if (!fbcon_is_inactive(vc, info))" branch is not taken as we set "ops->graphics = 1;" few lines above. So what matters there (as in all other blank implementations except vgacon) is if 'blank' is zero or not. Signed-off-by:
-
Jiri Slaby (SUSE) authored
The non-zero (true) return value from consw::con_switch() means a redraw is needed. So make this return type a bool explicitly instead of int. The latter might imply that -Eerrors are expected. They are not. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
There is no difference between CM_MOVE and CM_DRAW. Either of them enables the cursor. CM_ERASE then disables cursor. So get rid of all of them and use simple "bool enable". Note that this propagates down to the fbcon code. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
There is a switch decicing if cursor should be drawn or not. The whole switch can be simplified to one line. Do this cleanup as a preparatory work for the next patch. There, all the CM_* constants are removed. Signed-off-by:
-
Jiri Slaby (SUSE) authored
This is only a preparation for the following cleanup patch to make it easier. Provided CM_ERASE is the only different, use 'if' instead of 'switch+case' in all those. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Similar to con_putc() in the previous patch: * make the pointer to charattr a pointer to u16, and * make x, y, and count unsigned as they are strictly non-negative. And again, document that hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Make parameters of consw::con_putc() saner: * x and y are unsigned now, as they cannot be negative, and * ca is made u16, as it is composed of two 8bit values (character and attribute). See the con_putcs() hook, u16/ushort is worked on there. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
All these consw::con_putc() implementations do the same as consw::con_putcs() (only for one charattr) or even call consw::con_putcs() on their own. Drop them, as thanks to the new con_putc() helper in the previous patch, the console code performs this already -- exactly if consw::con_putc() is missing (NULL). Signed-off-by:
-
Jiri Slaby (SUSE) authored
And let it call consw::con_putc() if it exists, otherwise consw::con_putcs(). This is similar to tty_put_char(). It supports dropping unneeded duplication of code like sticon_putc() is (see the next patch). Signed-off-by:
-
Jiri Slaby (SUSE) authored
'count' in consw::con_clear() is guaranteed to be positive. csi_X() (the only caller) takes the minimum of the vc parameter (which is at least 1) and count of characters till the end of the line. The latter is computed as a subtraction of vc->vc_cols (count) and vc->state.x (offset). So for the worst case, full line, it is 1. Therefore, there is no point in checking zero or negative values (width is now unsigned anyway). Signed-off-by:
-
Jiri Slaby (SUSE) authored
In consw::con_clear(): * Height is always 1, so drop it. * Offsets and width are always unsigned values, so re-type them as such. This needs a new __fbcon_clear() in the fbcon code to still handle height which might not be 1 when called internally. Note that tests for negative count/width are left in place -- they are taken care of in the next patches. And document the hook. Signed-off-by:
-
Jiri Slaby (SUSE) authored
The 'init' parameter of consw::con_init() is true for the first call of the hook on a particular console. So make the parameter a bool. And document the hook. Signed-off-by:
Geert Uytterhoeven <geert+renesas@glider.be> Cc: Helge Deller <deller@gmx.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linux-parisc@vger.kernel.org Tested-by: Helge Deller <deller@gmx.de> # parisc STI console Link: https://lore.kernel.org/r/20240122110401.7289-21-jirislaby@kernel.orgSigned-off-by:
-
Jiri Slaby (SUSE) authored
The return value of con_debug_enter() and con_debug_leave() is ignored on many fronts. So just don't propagate errors (the current implementations return 0 anyway) and make the return type a void. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Remove unneeded 'extern' keyword from function prototypes in selection.h. This makes it more readable as no more wrapping is needed on many places. Signed-off-by:
-
Jiri Slaby (SUSE) authored
I didn't find definitions for ascii in the kernel yet, so define it for non-printable characters used here. Note we use ' ' instead of 32 on one line too. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Push cases one level left, according to coding style. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Decrypt the constant values by proper enum names. This time in csi_K(). Signed-off-by:
-
Jiri Slaby (SUSE) authored
Fetch the value directly in the helpers instead. Signed-off-by:
-
Jiri Slaby (SUSE) authored
The count to process is supposed to be between 1 and vc->vc_cols - vc->state.x (or rows and .y). clamp() can be used exactly for this, instead of ifs and min(). Signed-off-by:
-
Jiri Slaby (SUSE) authored
Push cases one level left, according to coding style. And reorder local variables. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Decrypt the constant values by proper enum names. This time in csi_J(). Signed-off-by:
-
Jiri Slaby (SUSE) authored
Replacing the default case with the iffery by case ranges makes the code more understandable at last. Signed-off-by:
-
Jiri Slaby (SUSE) authored
It's always confusing to read all those case 0:, case 1: etc. in csi_* handlers. Define enum entries for all those constants in CSI+m and use them in csi_m(). Signed-off-by:
-
Jiri Slaby (SUSE) authored
It's only an aid to people reading the header and/or calling vc_is_sel(). vc is only tested there, so having it const makes sense. Signed-off-by:
-
Jiri Slaby (SUSE) authored
It is pretty unfortunate to set vc_data::vc_resize_user in two callers of vc_do_resize(). vc_resize_user is immediately reset there (while remembering it). So instead of this back and forth, pass 'from_user' as a parameter. Notes on 'int user': * The name changes from 'user' to 'from_user' on some places to be consistent. * The type is bool now as 'int user' might evoke user's uid or whatever. Provided vc_resize() is called on many places and they need not to care about this parameter, its prototype is kept unchanged. Instead, it is now an inline calling a new __vc_resize() which implements the above. This patch makes the situation much more obvious. Signed-off-by:
-
Jiri Slaby (SUSE) authored
Avoid costly user copies under the console lock. So push the lock down from tioclinux() to sel_loadlut() and set_vesa_blanking(). It is now obvious what is actually protected. Signed-off-by:
-
