Changeset 357d9dd in mainline


Ignore:
Timestamp:
2024-10-01T10:39:09Z (10 days ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
d31c3ea
Parents:
89e5c0c7
git-author:
Jiri Svoboda <jiri@…> (2024-09-30 18:39:04)
git-committer:
Jiri Svoboda <jiri@…> (2024-10-01 10:39:09)
Message:

The 'state' in vt100_state_t is unnecessary

Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/vt/include/vt/vt100.h

    r89e5c0c7 r357d9dd  
    8989        vt100_control_puts_t control_puts;
    9090        vt100_flush_t flush;
    91 } vt100_state_t;
     91} vt100_t;
    9292
    9393extern sgr_color_index_t color_map[];
    9494
    95 extern vt100_state_t *vt100_state_create(void *, sysarg_t, sysarg_t,
     95extern vt100_t *vt100_create(void *, sysarg_t, sysarg_t,
    9696    vt100_putuchar_t, vt100_control_puts_t, vt100_flush_t);
    97 extern void vt100_state_destroy(vt100_state_t *);
     97extern void vt100_destroy(vt100_t *);
    9898
    99 extern errno_t vt100_yield(vt100_state_t *);
    100 extern errno_t vt100_claim(vt100_state_t *);
    101 extern void vt100_get_dimensions(vt100_state_t *, sysarg_t *, sysarg_t *);
     99extern errno_t vt100_yield(vt100_t *);
     100extern errno_t vt100_claim(vt100_t *);
     101extern void vt100_get_dimensions(vt100_t *, sysarg_t *, sysarg_t *);
    102102
    103 extern void vt100_cls(vt100_state_t *);
    104 extern void vt100_set_pos(vt100_state_t *, sysarg_t, sysarg_t);
    105 extern void vt100_goto(vt100_state_t *, sysarg_t, sysarg_t);
    106 extern void vt100_set_sgr(vt100_state_t *, char_attrs_t);
    107 extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
    108 extern void vt100_cursor_visibility(vt100_state_t *, bool);
    109 extern void vt100_putuchar(vt100_state_t *, char32_t);
    110 extern void vt100_flush(vt100_state_t *);
     103extern void vt100_cls(vt100_t *);
     104extern void vt100_set_pos(vt100_t *, sysarg_t, sysarg_t);
     105extern void vt100_goto(vt100_t *, sysarg_t, sysarg_t);
     106extern void vt100_set_sgr(vt100_t *, char_attrs_t);
     107extern void vt100_set_attr(vt100_t *, char_attrs_t);
     108extern void vt100_cursor_visibility(vt100_t *, bool);
     109extern void vt100_putuchar(vt100_t *, char32_t);
     110extern void vt100_flush(vt100_t *);
    111111
    112112#endif

  • uspace/lib/vt/src/vt100.c

    r89e5c0c7 r357d9dd  
    4949};
    5050
    51 void vt100_cls(vt100_state_t *state)
     51void vt100_cls(vt100_t *state)
    5252{
    5353        state->control_puts(state->arg, "\033[2J");
    … …  
    5555
    5656/** ECMA-48 Set Graphics Rendition. */
    57 static void vt100_sgr(vt100_state_t *state, unsigned int mode)
     57static void vt100_sgr(vt100_t *state, unsigned int mode)
    5858{
    5959        char control[MAX_CONTROL];
    … …  
    6464
    6565/** Set Graphics Rendition with 5 arguments. */
    66 static void vt100_sgr5(vt100_state_t *state, unsigned a1, unsigned a2,
     66static void vt100_sgr5(vt100_t *state, unsigned a1, unsigned a2,
    6767    unsigned a3, unsigned a4, unsigned a5)
    6868{
    … …  
    7474}
    7575
    76 void vt100_set_pos(vt100_state_t *state, sysarg_t col, sysarg_t row)
     76void vt100_set_pos(vt100_t *state, sysarg_t col, sysarg_t row)
    7777{
    7878        char control[MAX_CONTROL];
    … …  
    8383}
    8484
    85 void vt100_set_sgr(vt100_state_t *state, char_attrs_t attrs)
     85void vt100_set_sgr(vt100_t *state, char_attrs_t attrs)
    8686{
    8787        unsigned color;
    … …  
    147147}
    148148
    149 vt100_state_t *vt100_state_create(void *arg, sysarg_t cols, sysarg_t rows,
     149vt100_t *vt100_create(void *arg, sysarg_t cols, sysarg_t rows,
    150150    vt100_putuchar_t putuchar_fn, vt100_control_puts_t control_puts_fn,
    151151    vt100_flush_t flush_fn)
    152152{
    153         vt100_state_t *state = malloc(sizeof(vt100_state_t));
     153        vt100_t *state = malloc(sizeof(vt100_t));
    154154        if (state == NULL)
    155155                return NULL;
    … …  
    172172}
    173173
    174 void vt100_state_destroy(vt100_state_t *state)
     174void vt100_destroy(vt100_t *state)
    175175{
    176176        free(state);
    177177}
    178178
    179 void vt100_get_dimensions(vt100_state_t *state, sysarg_t *cols,
     179void vt100_get_dimensions(vt100_t *state, sysarg_t *cols,
    180180    sysarg_t *rows)
    181181{
    … …  
    184184}
    185185
    186 errno_t vt100_yield(vt100_state_t *state)
     186errno_t vt100_yield(vt100_t *state)
    187187{
    188188        return EOK;
    189189}
    190190
    191 errno_t vt100_claim(vt100_state_t *state)
     191errno_t vt100_claim(vt100_t *state)
    192192{
    193193        return EOK;
    194194}
    195195
    196 void vt100_goto(vt100_state_t *state, sysarg_t col, sysarg_t row)
     196void vt100_goto(vt100_t *state, sysarg_t col, sysarg_t row)
    197197{
    198198        if ((col >= state->cols) || (row >= state->rows))
    … …  
    206206}
    207207
    208 void vt100_set_attr(vt100_state_t *state, char_attrs_t attrs)
     208void vt100_set_attr(vt100_t *state, char_attrs_t attrs)
    209209{
    210210        if (!attrs_same(state->cur_attrs, attrs)) {
    … …  
    214214}
    215215
    216 void vt100_cursor_visibility(vt100_state_t *state, bool visible)
     216void vt100_cursor_visibility(vt100_t *state, bool visible)
    217217{
    218218        if (visible)
    … …  
    222222}
    223223
    224 void vt100_putuchar(vt100_state_t *state, char32_t ch)
     224void vt100_putuchar(vt100_t *state, char32_t ch)
    225225{
    226226        state->putuchar(state->arg, ch == 0 ? ' ' : ch);
    … …  
    233233}
    234234
    235 void vt100_flush(vt100_state_t *state)
     235void vt100_flush(vt100_t *state)
    236236{
    237237        state->flush(state->arg);

  • uspace/srv/hid/output/ctl/serial.c

    r89e5c0c7 r357d9dd  
    5353 *
    5454 */
    55 static void draw_char(vt100_state_t *state, charfield_t *field,
     55static void draw_char(vt100_t *state, charfield_t *field,
    5656    sysarg_t col, sysarg_t row)
    5757{
    … …  
    6363static errno_t serial_yield(outdev_t *dev)
    6464{
    65         vt100_state_t *state = (vt100_state_t *) dev->data;
     65        vt100_t *state = (vt100_t *) dev->data;
    6666
    6767        return vt100_yield(state);
    … …  
    7070static errno_t serial_claim(outdev_t *dev)
    7171{
    72         vt100_state_t *state = (vt100_state_t *) dev->data;
     72        vt100_t *state = (vt100_t *) dev->data;
    7373
    7474        return vt100_claim(state);
    … …  
    7878    sysarg_t *rows)
    7979{
    80         vt100_state_t *state = (vt100_state_t *) dev->data;
     80        vt100_t *state = (vt100_t *) dev->data;
    8181
    8282        vt100_get_dimensions(state, cols, rows);
    … …  
    9292    sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible)
    9393{
    94         vt100_state_t *state = (vt100_state_t *) dev->data;
     94        vt100_t *state = (vt100_t *) dev->data;
    9595
    9696        vt100_goto(state, col, row);
    … …  
    100100static void serial_char_update(outdev_t *dev, sysarg_t col, sysarg_t row)
    101101{
    102         vt100_state_t *state = (vt100_state_t *) dev->data;
     102        vt100_t *state = (vt100_t *) dev->data;
    103103        charfield_t *field =
    104104            chargrid_charfield_at(dev->backbuf, col, row);
    … …  
    109109static void serial_flush(outdev_t *dev)
    110110{
    111         vt100_state_t *state = (vt100_state_t *) dev->data;
     111        vt100_t *state = (vt100_t *) dev->data;
    112112
    113113        vt100_flush(state);
    … …  
    128128{
    129129        char_attrs_t attrs;
    130         vt100_state_t *state =
    131             vt100_state_create(NULL, SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
     130        vt100_t *vt100 =
     131            vt100_create(NULL, SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
    132132            control_puts_fn, flush_fn);
    133         if (state == NULL)
     133        if (vt100 == NULL)
    134134                return ENOMEM;
    135         state->enable_rgb = true;
     135        vt100->enable_rgb = true;
    136136
    137         vt100_cursor_visibility(state, false);
     137        vt100_cursor_visibility(vt100, false);
    138138        attrs.type = CHAR_ATTR_STYLE;
    139139        attrs.val.style = STYLE_NORMAL;
    140         vt100_set_attr(state, attrs);
    141         vt100_cls(state);
     140        vt100_set_attr(vt100, attrs);
     141        vt100_cls(vt100);
    142142
    143         outdev_t *dev = outdev_register(&serial_ops, state);
     143        outdev_t *dev = outdev_register(&serial_ops, vt100);
    144144        if (dev == NULL) {
    145                 vt100_state_destroy(state);
     145                vt100_destroy(vt100);
    146146                return ENOMEM;
    147147        }

  • uspace/srv/hid/remcons/remcons.c

    r89e5c0c7 r357d9dd  
    568568        remcons->curs_visible = true;
    569569
    570         remcons->vt = vt100_state_create((void *)remcons, 80, 25,
     570        remcons->vt = vt100_create((void *)remcons, 80, 25,
    571571            remcons_vt_putchar, remcons_vt_cputs, remcons_vt_flush);
    572572        assert(remcons->vt != NULL); // XXX

  • uspace/srv/hid/remcons/remcons.h

    r89e5c0c7 r357d9dd  
    4747typedef struct {
    4848        telnet_user_t *user;    /**< telnet user */
    49         vt100_state_t *vt;      /**< virtual terminal driver */
     49        vt100_t *vt;            /**< virtual terminal driver */
    5050        bool enable_ctl;        /**< enable escape control sequences */
    5151        bool enable_rgb;        /**< enable RGB color setting */
Note: See TracChangeset for help on using the changeset viewer.