Changeset ed88c8e in mainline for uspace/srv/hid/output/proto


Ignore:
Timestamp:
2018-05-29T13:25:07Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fc0b2a8
Parents:
a57fa32
git-author:
Jiri Svoboda <jiri@…> (2018-05-28 17:24:17)
git-committer:
Jiri Svoboda <jiri@…> (2018-05-29 13:25:07)
Message:

fputc, putchar vs. fputwc, putwchar.

Location:
uspace/srv/hid/output/proto
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/output/proto/vt100.c

    ra57fa32 red88c8e  
    139139
    140140vt100_state_t *vt100_state_create(sysarg_t cols, sysarg_t rows,
    141     vt100_putchar_t putchar_fn, vt100_control_puts_t control_puts_fn,
     141    vt100_putwchar_t putwchar_fn, vt100_control_puts_t control_puts_fn,
    142142    vt100_flush_t flush_fn)
    143143{
    … …  
    146146                return NULL;
    147147
    148         state->putchar = putchar_fn;
     148        state->putwchar = putwchar_fn;
    149149        state->control_puts = control_puts_fn;
    150150        state->flush = flush_fn;
    … …  
    219219}
    220220
    221 void vt100_putchar(vt100_state_t *state, wchar_t ch)
    222 {
    223         state->putchar(ch == 0 ? ' ' : ch);
     221void vt100_putwchar(vt100_state_t *state, wchar_t ch)
     222{
     223        state->putwchar(ch == 0 ? ' ' : ch);
    224224        state->cur_col++;
    225225

  • uspace/srv/hid/output/proto/vt100.h

    ra57fa32 red88c8e  
    3535#include <io/charfield.h>
    3636
    37 typedef void (*vt100_putchar_t)(wchar_t ch);
     37typedef void (*vt100_putwchar_t)(wchar_t ch);
    3838typedef void (*vt100_control_puts_t)(const char *str);
    3939typedef void (*vt100_flush_t)(void);
    … …  
    4747        char_attrs_t cur_attrs;
    4848
    49         vt100_putchar_t putchar;
     49        vt100_putwchar_t putwchar;
    5050        vt100_control_puts_t control_puts;
    5151        vt100_flush_t flush;
    5252} vt100_state_t;
    5353
    54 extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putchar_t,
     54extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putwchar_t,
    5555    vt100_control_puts_t, vt100_flush_t);
    5656extern void vt100_state_destroy(vt100_state_t *);
    … …  
    6363extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
    6464extern void vt100_cursor_visibility(vt100_state_t *, bool);
    65 extern void vt100_putchar(vt100_state_t *, wchar_t);
     65extern void vt100_putwchar(vt100_state_t *, wchar_t);
    6666extern void vt100_flush(vt100_state_t *);
    6767
Note: See TracChangeset for help on using the changeset viewer.