Changeset d5a89a3 in mainline for boot


Ignore:
Timestamp:
2019-02-11T22:31:04Z (7 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merging with upstream/master

Location:
boot
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    re3272101 rd5a89a3  
    103103
    104104%.gz: %
    105         gzip -n -k -f $<
     105        gzip -n -k -9 -f $<
    106106
    107107$(COMPS).tar: $(COMPONENTS)

  • boot/Makefile.common

    re3272101 rd5a89a3  
    9494        devman \
    9595        fs/locfs \
    96         hid/compositor \
    9796        klog
     97
     98ifeq ($(CONFIG_FB), y)
     99        RD_SRVS_ESSENTIAL += \
     100                hid/compositor
     101endif
    98102
    99103RD_SRVS_NON_ESSENTIAL = \
    … …  
    141145        nic/ar9271 \
    142146        nic/virtio-net \
    143         block/ahci
     147        block/ahci \
     148        block/virtio-blk
    144149
    145150RD_DRV_CFG =
    … …  
    162167endif
    163168
    164 RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm
     169RD_APPS_ESSENTIAL = \
     170        bdsh \
     171        getterm \
     172        kio
     173
     174ifeq ($(CONFIG_FB), y)
     175        RD_APPS_ESSENTIAL += \
     176                vlaunch \
     177                vterm
     178endif
    165179
    166180RD_APPS_NON_ESSENTIAL = \
    … …  
    168182        bithenge \
    169183        blkdump \
    170         bnchmark \
    171184        contacts \
    172185        corecfg \
    … …  
    179192        fdisk \
    180193        gunzip \
     194        hbench \
    181195        inet \
    182196        kill \
    … …  
    192206        mkmfs \
    193207        nic \
    194         perf \
    195208        sbi \
    196209        sportdmp \

  • boot/generic/include/byteorder.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_BYTEORDER_H_
    36 #define LIBC_BYTEORDER_H_
     35#ifndef _LIBC_BYTEORDER_H_
     36#define _LIBC_BYTEORDER_H_
    3737
    3838#include <stdint.h>

  • boot/generic/include/errno.h

    re3272101 rd5a89a3  
    4040#define EOVERFLOW  -16  /* The result does not fit its size. */
    4141
     42typedef int errno_t;
     43
    4244#endif
    4345

  • boot/generic/include/str.h

    re3272101 rd5a89a3  
    11/*
    2  * Copyright (c) 2010 Martin Decky
     2 * Copyright (c) 2001-2004 Jakub Jermar
     3 * Copyright (c) 2005 Martin Decky
     4 * Copyright (c) 2011 Oleg Romanenko
    35 * All rights reserved.
    46 *
    … …  
    3335#define BOOT_STR_H_
    3436
     37#include <errno.h>
    3538#include <stdbool.h>
    3639#include <stddef.h>
    3740
    38 /**< Common Unicode characters */
    39 #define U_SPECIAL  '?'
     41/* Common Unicode characters */
     42#define U_SPECIAL      '?'
    4043
    41 /**< No size limit constant */
     44/** No size limit constant */
    4245#define STR_NO_LIMIT  ((size_t) -1)
    4346
    44 extern wchar_t str_decode(const char *, size_t *, size_t);
    45 extern int chr_encode(wchar_t, char *, size_t *, size_t);
     47extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
     48extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
    4649
    47 extern size_t str_size(const char *);
    48 extern size_t str_lsize(const char *, size_t);
    49 extern size_t str_length(const char *);
     50extern size_t str_size(const char *str);
     51extern size_t str_lsize(const char *str, size_t max_len);
     52extern size_t str_length(const char *str);
    5053
    51 extern bool ascii_check(wchar_t);
    52 extern bool chr_check(wchar_t);
     54extern bool ascii_check(wchar_t ch);
     55extern bool chr_check(wchar_t ch);
    5356
    54 extern int str_cmp(const char *, const char *);
    55 extern void str_cpy(char *, size_t, const char *);
     57extern int str_cmp(const char *s1, const char *s2);
     58extern void str_cpy(char *dest, size_t size, const char *src);
    5659
    5760#endif

  • boot/generic/src/str.c

    re3272101 rd5a89a3  
    11/*
    22 * Copyright (c) 2001-2004 Jakub Jermar
     3 * Copyright (c) 2005 Martin Decky
     4 * Copyright (c) 2008 Jiri Svoboda
     5 * Copyright (c) 2011 Martin Sucha
     6 * Copyright (c) 2011 Oleg Romanenko
    37 * All rights reserved.
    48 *
    … …  
    98102 */
    99103
     104#include <str.h>
     105
    100106#include <errno.h>
    101107#include <stdbool.h>
    102108#include <stddef.h>
    103109#include <stdint.h>
    104 #include <str.h>
    105110
    106111/** Check the condition if wchar_t is signed */
    … …  
    208213 *         code was invalid.
    209214 */
    210 int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
     215errno_t chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
    211216{
    212217        if (*offset >= size)
    … …  
    392397                        return 1;
    393398
    394                 if ((c1 == 0) || (c2 == 0))
     399                if (c1 == 0 || c2 == 0)
    395400                        break;
    396401        }
Note: See TracChangeset for help on using the changeset viewer.