Changeset 369a5f8 in mainline for uspace/lib/c


Ignore:
Timestamp:
2010-04-20T15:01:43Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9efff92
Parents:
9f1362d4
Message:

add STYLE_SELECTED and STYLE_INVERTED into serial output driver
move screenbuffer.{c|h} into libc, make it slightly more generic
collateral changes

Location:
uspace/lib/c
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r9f1362d4 r369a5f8  
    7979        generic/io/printf_core.c \
    8080        generic/io/console.c \
     81        generic/io/screenbuffer.c \
    8182        generic/malloc.c \
    8283        generic/sysinfo.c \

  • uspace/lib/c/generic/io/asprintf.c

    r9f1362d4 r369a5f8  
    6161int asprintf(char **strp, const char *fmt, ...)
    6262{
    63         struct printf_spec ps = {
     63        printf_spec_t ps = {
    6464                asprintf_str_write,
    6565                asprintf_wstr_write,

  • uspace/lib/c/generic/io/screenbuffer.c

    r9f1362d4 r369a5f8  
    3434
    3535#include <io/style.h>
     36#include <io/screenbuffer.h>
    3637#include <malloc.h>
    3738#include <unistd.h>
    38 #include "screenbuffer.h"
    3939
    4040/** Store one character to screenbuffer.

  • uspace/lib/c/generic/io/vprintf.c

    r9f1362d4 r369a5f8  
    7676int vfprintf(FILE *stream, const char *fmt, va_list ap)
    7777{
    78         struct printf_spec ps = {
     78        printf_spec_t ps = {
    7979                vprintf_str_write,
    8080                vprintf_wstr_write,

  • uspace/lib/c/include/io/color.h

    r9f1362d4 r369a5f8  
    3636#define LIBC_IO_COLOR_H_
    3737
    38 enum console_color {
     38typedef enum {
    3939        COLOR_BLACK   = 0,
    4040        COLOR_BLUE    = 1,
    … …  
    4848        CATTR_BRIGHT  = 8,
    4949        CATTR_BLINK   = 8
    50 };
     50} console_color_t;
    5151
    5252#endif

  • uspace/lib/c/include/io/console.h

    r9f1362d4 r369a5f8  
    4444} console_ev_type_t;
    4545
    46 enum {
     46typedef enum {
    4747        CONSOLE_CCAP_NONE = 0,
    4848        CONSOLE_CCAP_STYLE,
    4949        CONSOLE_CCAP_INDEXED,
    5050        CONSOLE_CCAP_RGB
    51 };
     51} console_caps_t;
    5252
    5353/** Console event structure. */

  • uspace/lib/c/include/io/keycode.h

    r9f1362d4 r369a5f8  
    5151 * they really are organized here by position, rather than by label.
    5252 */
    53 enum keycode {
     53typedef enum {
    5454
    5555        /* Main block row 1 */
    … …  
    199199} keycode_t;
    200200
    201 enum keymod {
     201typedef enum {
    202202        KM_LSHIFT      = 0x001,
    203203        KM_RSHIFT      = 0x002,

  • uspace/lib/c/include/io/klog.h

    r9f1362d4 r369a5f8  
    3333 */
    3434
    35 #ifndef LIBC_STREAM_H_
    36 #define LIBC_STREAM_H_
     35#ifndef LIBC_IO_KLOG_H_
     36#define LIBC_IO_KLOG_H_
    3737
    3838#include <sys/types.h>
    3939
    40 extern size_t klog_write(const void *buf, size_t size);
     40extern size_t klog_write(const void *, size_t);
    4141extern void klog_update(void);
    4242

  • uspace/lib/c/include/io/printf_core.h

    r9f1362d4 r369a5f8  
    4040
    4141/** Structure for specifying output methods for different printf clones. */
    42 typedef struct printf_spec {
     42typedef struct {
    4343        /* String output function, returns number of printed characters or EOF */
    4444        int (*str_write)(const char *, size_t, void *);
    … …  
    5151} printf_spec_t;
    5252
    53 int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
     53extern int printf_core(const char *, printf_spec_t *, va_list);
    5454
    5555#endif

  • uspace/lib/c/include/io/screenbuffer.h

    r9f1362d4 r369a5f8  
    3333 */
    3434
    35 #ifndef SCREENBUFFER_H__
    36 #define SCREENBUFFER_H__
     35#ifndef LIBC_SCREENBUFFER_H__
     36#define LIBC_SCREENBUFFER_H__
    3737
    3838#include <stdint.h>
    … …  
    4141#include <bool.h>
    4242
    43 #define DEFAULT_FOREGROUND  0x000000  /**< default console foreground color */
    44 #define DEFAULT_BACKGROUND  0xf0f0f0  /**< default console background color */
     43typedef enum {
     44        at_style,
     45        at_idx,
     46        at_rgb
     47} attr_type_t;
    4548
    4649typedef struct {
    … …  
    5962} attr_rgb_t;
    6063
     64typedef union {
     65        attr_style_t s;
     66        attr_idx_t i;
     67        attr_rgb_t r;
     68} attr_val_t;
     69
    6170typedef struct {
    62         enum {
    63                 at_style,
    64                 at_idx,
    65                 at_rgb
    66         } t;
    67         union {
    68                 attr_style_t s;
    69                 attr_idx_t i;
    70                 attr_rgb_t r;
    71         } a;
     71        attr_type_t t;
     72        attr_val_t a;
    7273} attrs_t;
    7374
    … …  
    121122 *
    122123 */
    123 static inline int attrs_same(attrs_t a1, attrs_t a2)
     124static inline bool attrs_same(attrs_t a1, attrs_t a2)
    124125{
    125126        if (a1.t != a2.t)
    126                 return 0;
     127                return false;
    127128       
    128129        switch (a1.t) {
    … …  
    138139        }
    139140       
    140         return 0;
     141        return false;
    141142}
    142143

  • uspace/lib/c/include/io/style.h

    r9f1362d4 r369a5f8  
    3636#define LIBC_IO_STYLE_H_
    3737
    38 enum console_style {
     38typedef enum {
    3939        STYLE_NORMAL   = 0,
    4040        STYLE_EMPHASIS = 1,
    4141        STYLE_INVERTED = 2,
    4242        STYLE_SELECTED = 3
    43 };
     43} console_style_t;
    4444
    4545#endif
Note: See TracChangeset for help on using the changeset viewer.