Changeset 0dc2fec in mainline for uspace


Ignore:
Timestamp:
2016-05-22T19:19:43Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b272c67a
Parents:
153c7a29 (diff), af2254ec (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:

Merge mainline changes

Location:
uspace
Files:
4 added
26 edited
3 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r153c7a29 r0dc2fec  
    143143        drv/char/pl050 \
    144144        drv/char/ps2mouse \
     145        drv/char/atkbd \
    145146        drv/char/xtkbd \
    146147        drv/test/test1 \
    … …  
    249250        lib/trackmod \
    250251        lib/uri \
    251         lib/urcu \
    252252        lib/usb \
    253253        lib/usbhost \
    … …  
    273273all: $(BUILDS) $(BUILDS_TESTS)
    274274
    275 $(BUILDS_TESTS): $(BUILDS)
     275$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
    276276        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
    277277

  • uspace/Makefile.common

    r153c7a29 r0dc2fec  
    160160LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
    161161
    162 LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
    163 
    164162AFLAGS = --fatal-warnings
    165163LFLAGS = --fatal-warnings
    … …  
    185183endif
    186184
    187 # Build static because liburcu is linked against libc which uses thread
    188 # local variables
    189 ifneq ($(findstring urcu, $(LIBS)),)
    190         STATIC_BUILD = y
    191 endif
    192 
    193185# Build static because libpcut is linked against libc which uses thread
    194186# local variables
    … …  
    306298JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    307299
    308 ifeq ($(FUTEX_UPGRADABLE),y)
    309         CFLAGS += -I$(LIBURCU_PREFIX)/
    310         LIBS += $(LIBURCU_PREFIX)/liburcu.a
    311 endif
    312 
    313300ifeq ($(COMPILER),gcc_cross)
    314301        CFLAGS += $(GCC_CFLAGS)
    … …  
    336323endif
    337324
     325
     326ifneq ($(MAKECMDGOALS),clean)
    338327-include $(DEPEND)
     328endif
    339329
    340330OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    … …  
    376366
    377367ifneq ($(LIBRARY),)
    378 %.a: $(OBJECTS)
     368$(LIBRARY).a: $(OBJECTS)
    379369        $(AR) rc $@ $(OBJECTS)
    380370endif
    381371
    382 ifneq ($(SLIBRARY),)
    383 %.la: $(LOBJECTS)
     372ifneq ($(LARCHIVE),)
     373$(LARCHIVE): $(LOBJECTS)
    384374        $(AR) rc $@ $(LOBJECTS)
    385375endif

  • uspace/app/barber/Makefile

    r153c7a29 r0dc2fec  
    8585include $(USPACE_PREFIX)/Makefile.common
    8686
    87 images.c images.h: $(IMAGES)
    88         $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^
     87image%.c image%.h: $(IMAGES)
     88        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES)

  • uspace/app/rcubench/Makefile

    r153c7a29 r0dc2fec  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    32 
    33 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    34        
    3531BINARY = rcubench
    3632

  • uspace/app/rcutest/Makefile

    r153c7a29 r0dc2fec  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    32 
    33 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    34        
    3531BINARY = rcutest
    3632

  • uspace/app/sbi/src/bigint.c

    r153c7a29 r0dc2fec  
    379379        printf("Convert bigint to string.\n");
    380380#endif
    381         assert(BIGINT_BASE >= 10);
     381        static_assert(BIGINT_BASE >= 10);
    382382
    383383        /* Compute number of characters. */

  • uspace/app/tetris/tetris.c

    r153c7a29 r0dc2fec  
    5151 */
    5252
    53 static const char copyright[] =
     53static volatile const char copyright[] =
    5454        "@(#) Copyright (c) 1992, 1993\n"
    5555        "\tThe Regents of the University of California.  All rights reserved.\n";

  • uspace/drv/bus/usb/ohci/hw_struct/hcca.h

    r153c7a29 r0dc2fec  
    6565static inline hcca_t * hcca_get(void)
    6666{
    67         assert(sizeof(hcca_t) == 256);
     67        static_assert(sizeof(hcca_t) == 256);
    6868        hcca_t *hcca = memalign(256, sizeof(hcca_t));
    6969        if (hcca)

  • uspace/drv/bus/usb/ohci/ohci_regs.h

    r153c7a29 r0dc2fec  
    180180/** Device removable mask */
    181181#define RHDB_DR_SHIFT   0
    182 #define RHDB_DR_MASK    0xffff
     182#define RHDB_DR_MASK    0xffffU
    183183/** Power control mask */
    184 #define RHDB_PCC_MASK (0xffff)
    185 #define RHDB_PCC_SHIFT 16
     184#define RHDB_PCC_MASK   0xffffU
     185#define RHDB_PCC_SHIFT  16
    186186
    187187        /** Root hub status register */

  • uspace/drv/bus/usb/uhci/uhci_batch.c

    r153c7a29 r0dc2fec  
    8787uhci_transfer_batch_t * uhci_transfer_batch_get(usb_transfer_batch_t *usb_batch)
    8888{
    89         assert((sizeof(td_t) % 16) == 0);
     89        static_assert((sizeof(td_t) % 16) == 0);
    9090#define CHECK_NULL_DISPOSE_RETURN(ptr, message...) \
    9191        if (ptr == NULL) { \

  • uspace/drv/char/atkbd/Makefile

    r153c7a29 r0dc2fec  
    11#
    2 # Copyright (c) 2012 Adam Hraska
     2# Copyright (c) 2011 Jan Vesely
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include
    34 
    35 LIBRARY = liburcu
     29USPACE_PREFIX = ../../..
     30LIBS = $(LIBDRV_PREFIX)/libdrv.a
     31EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     32BINARY = atkbd
    3633
    3734SOURCES = \
    38         rcu.c
     35        main.c \
     36        atkbd.c
    3937
    4038include $(USPACE_PREFIX)/Makefile.common

  • uspace/drv/char/pl050/pl050.c

    r153c7a29 r0dc2fec  
    323323
    324324        if (str_cmp(pl050->name, "kbd") == 0)
    325                 mname = "char/xtkbd";
     325                mname = "char/atkbd";
    326326        else
    327327                mname = "char/ps2mouse";

  • uspace/lib/c/Makefile

    r153c7a29 r0dc2fec  
    4646SLIBRARY = libc.so.0.0
    4747LSONAME = libc.so.0
    48 
    49 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    50 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    5148
    5249-include $(CONFIG_MAKEFILE)
    … …  
    150147        generic/vfs/vfs.c \
    151148        generic/vfs/canonify.c \
     149        generic/rcu.c \
    152150        generic/setjmp.c \
    153151        generic/stack.c \

  • uspace/lib/c/generic/double_to_str.c

    r153c7a29 r0dc2fec  
    505505{
    506506        /* The whole computation assumes 64bit significand. */
    507         assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
     507        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
    508508
    509509        if (ieee_val.is_special) {
    … …  
    753753{
    754754        /* The whole computation assumes 64bit significand. */
    755         assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
     755        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
    756756
    757757        if (ieee_val.is_special) {

  • uspace/lib/c/generic/fibril.c

    r153c7a29 r0dc2fec  
    114114        fibril->waits_for = NULL;
    115115
    116         futex_lock(&fibril_futex);
     116        /*
     117         * We are called before __tcb_set(), so we need to use
     118         * futex_down/up() instead of futex_lock/unlock() that
     119         * may attempt to access TLS.
     120         */
     121        futex_down(&fibril_futex);
    117122        list_append(&fibril->all_link, &fibril_list);
    118         futex_unlock(&fibril_futex);
     123        futex_up(&fibril_futex);
    119124       
    120125        return fibril;

  • uspace/lib/c/generic/ieee_double.c

    r153c7a29 r0dc2fec  
    4545        const int exponent_bias = 1075;
    4646
    47         assert(sizeof(val) == sizeof(uint64_t));
     47        static_assert(sizeof(val) == sizeof(uint64_t));
    4848
    4949        union {

  • uspace/lib/c/include/assert.h

    r153c7a29 r0dc2fec  
    3737#define LIBC_ASSERT_H_
    3838
     39#define static_assert(expr)     _Static_assert(expr, "")
     40
    3941/** Debugging assert macro
    4042 *

  • uspace/lib/ext4/Makefile

    r153c7a29 r0dc2fec  
    3030LIBRARY = libext4
    3131EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX)
    32 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCRYPTO_PREFIX)/libcrypto.a
    3332
    3433SOURCES = \

  • uspace/lib/nic/Makefile

    r153c7a29 r0dc2fec  
    3030LIBRARY = libnic
    3131EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3332
    3433SOURCES = \

  • uspace/lib/pcut/Makefile

    r153c7a29 r0dc2fec  
    66PCUT_TEST_PREFIX = test-libpcut-
    77
    8 EXTRA_OUTPUT = \
     8SELF_TESTS = \
    99        $(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
    1010        $(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
    … …  
    2525        $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX)
    2626
     27EXTRA_CLEAN = $(SELF_TESTS)
     28
    2729include helenos.mak
    2830
    … …  
    3133include helenos.test.mak
    3234
     35all-test: $(SELF_TESTS)
     36
    3337test-libpcut-%: $(OUTPUT)
    3438        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

  • uspace/lib/pcut/update-from-master.sh

    r153c7a29 r0dc2fec  
    5959PCUT_TEST_PREFIX = test-libpcut-
    6060
    61 EXTRA_OUTPUT = \
     61SELF_TESTS = \
    6262EOF_MAKEFILE_HEAD
    6363
    … …  
    6969cat >>Makefile <<'EOF_MAKEFILE_TAIL'
    7070
     71EXTRA_CLEAN = $(SELF_TESTS)
     72
    7173include helenos.mak
    7274
    … …  
    7577include helenos.test.mak
    7678
     79all-test: $(SELF_TESTS)
     80
    7781test-libpcut-%: $(OUTPUT)
    7882        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

  • uspace/lib/posix/source/fnmatch.c

    r153c7a29 r0dc2fec  
    640640        #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
    641641
    642         assert(FNM_PATHNAME == FNM_FILE_NAME);
     642        static_assert(FNM_PATHNAME == FNM_FILE_NAME);
    643643        match("", "", 0);
    644644        match("*", "hello", 0);

  • uspace/lib/usb/include/usb/usb.h

    r153c7a29 r0dc2fec  
    168168        ( \
    169169            _MAKE_PID_NIBBLE(tag, type) \
    170             | ((~_MAKE_PID_NIBBLE(tag, type)) << 4) \
     170            | (((~_MAKE_PID_NIBBLE(tag, type)) & 0xf) << 4) \
    171171        )
    172172        USB_PID_OUT = _MAKE_PID(0, 1),

  • uspace/lib/usbdev/include/usb/dev/request.h

    r153c7a29 r0dc2fec  
    109109} __attribute__ ((packed)) usb_device_request_setup_packet_t;
    110110
    111 int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
    112 
    113111int usb_control_request_set(usb_pipe_t *,
    114112    usb_request_type_t, usb_request_recipient_t, uint8_t,

  • uspace/lib/usbdev/src/pipesinit.c

    r153c7a29 r0dc2fec  
    340340{
    341341        assert(pipe);
    342         assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
     342        static_assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
    343343
    344344        if ((pipe->direction != USB_DIRECTION_BOTH) ||

  • uspace/lib/usbdev/src/request.c

    r153c7a29 r0dc2fec  
    3939
    4040#define MAX_DATA_LENGTH ((size_t)(0xFFFF))
     41
     42static_assert(sizeof(usb_device_request_setup_packet_t) == 8);
    4143
    4244/** Generic wrapper for SET requests using standard control request format.

  • uspace/srv/net/inetsrv/pdu.c

    r153c7a29 r0dc2fec  
    224224                return EINVAL;
    225225       
    226         assert(sizeof(ip6_header_t) % 8 == 0);
     226        static_assert(sizeof(ip6_header_t) % 8 == 0);
    227227        assert(hdr_size % 8 == 0);
    228228        assert(offs % FRAG_OFFS_UNIT == 0);
Note: See TracChangeset for help on using the changeset viewer.