| Message ID | 20240118075756.10541-12-jirislaby@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | tty: vt: cleanup and documentation | expand |
On 18. 01. 24, 8:57, Jiri Slaby (SUSE) wrote: > Decrypt the constant values by proper enum names. This time in csi_J(). And there are more calls of csi_J(). All those should now use the enum constants. v2 will fix this. > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> > --- > drivers/tty/vt/vt.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c > index 66ebc90a9fe9..4f7831f81db6 100644 > --- a/drivers/tty/vt/vt.c > +++ b/drivers/tty/vt/vt.c > @@ -1498,13 +1498,20 @@ static inline void del(struct vc_data *vc) > /* ignored */ > } > > +enum { > + CSI_J_CURSOR_TO_END = 0, > + CSI_J_START_TO_CURSOR = 1, > + CSI_J_VISIBLE = 2, > + CSI_J_FULL = 3, > +}; > + > static void csi_J(struct vc_data *vc, int vpar) > { > unsigned int count; > unsigned short * start; > > switch (vpar) { > - case 0: /* erase from cursor to end of display */ > + case CSI_J_CURSOR_TO_END: > vc_uniscr_clear_line(vc, vc->state.x, > vc->vc_cols - vc->state.x); > vc_uniscr_clear_lines(vc, vc->state.y + 1, > @@ -1512,16 +1519,16 @@ static void csi_J(struct vc_data *vc, int vpar) > count = (vc->vc_scr_end - vc->vc_pos) >> 1; > start = (unsigned short *)vc->vc_pos; > break; > - case 1: /* erase from start to cursor */ > + case CSI_J_START_TO_CURSOR: > vc_uniscr_clear_line(vc, 0, vc->state.x + 1); > vc_uniscr_clear_lines(vc, 0, vc->state.y); > count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1; > start = (unsigned short *)vc->vc_origin; > break; > - case 3: /* include scrollback */ > + case CSI_J_FULL: > flush_scrollback(vc); > fallthrough; > - case 2: /* erase whole display */ > + case CSI_J_VISIBLE: > vc_uniscr_clear_lines(vc, 0, vc->vc_rows); > count = vc->vc_cols * vc->vc_rows; > start = (unsigned short *)vc->vc_origin;
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 66ebc90a9fe9..4f7831f81db6 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1498,13 +1498,20 @@ static inline void del(struct vc_data *vc) /* ignored */ } +enum { + CSI_J_CURSOR_TO_END = 0, + CSI_J_START_TO_CURSOR = 1, + CSI_J_VISIBLE = 2, + CSI_J_FULL = 3, +}; + static void csi_J(struct vc_data *vc, int vpar) { unsigned int count; unsigned short * start; switch (vpar) { - case 0: /* erase from cursor to end of display */ + case CSI_J_CURSOR_TO_END: vc_uniscr_clear_line(vc, vc->state.x, vc->vc_cols - vc->state.x); vc_uniscr_clear_lines(vc, vc->state.y + 1, @@ -1512,16 +1519,16 @@ static void csi_J(struct vc_data *vc, int vpar) count = (vc->vc_scr_end - vc->vc_pos) >> 1; start = (unsigned short *)vc->vc_pos; break; - case 1: /* erase from start to cursor */ + case CSI_J_START_TO_CURSOR: vc_uniscr_clear_line(vc, 0, vc->state.x + 1); vc_uniscr_clear_lines(vc, 0, vc->state.y); count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1; start = (unsigned short *)vc->vc_origin; break; - case 3: /* include scrollback */ + case CSI_J_FULL: flush_scrollback(vc); fallthrough; - case 2: /* erase whole display */ + case CSI_J_VISIBLE: vc_uniscr_clear_lines(vc, 0, vc->vc_rows); count = vc->vc_cols * vc->vc_rows; start = (unsigned short *)vc->vc_origin;
Decrypt the constant values by proper enum names. This time in csi_J(). Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> --- drivers/tty/vt/vt.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)