Changeset efedee77 in mainline for uspace/app


Ignore:
Timestamp:
2010-11-02T22:38:46Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af894a21
Parents:
aab02fb (diff), e06ef614 (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/app
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/init/init.c

    raab02fb refedee77  
    277277        srv_start("/srv/adb_ms");
    278278        srv_start("/srv/char_ms");
     279        srv_start("/srv/s3c24ts");
    279280       
    280281        spawn("/srv/fb");

  • uspace/app/netecho/Makefile

    raab02fb refedee77  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = netecho
    3434

  • uspace/app/netecho/netecho.c

    raab02fb refedee77  
    4141#include <task.h>
    4242#include <arg_parse.h>
    43 
    44 #include <in.h>
    45 #include <in6.h>
    46 #include <inet.h>
    47 #include <socket.h>
    48 #include <net_err.h>
    49 #include <socket_parse.h>
     43#include <err.h>
     44
     45#include <net/in.h>
     46#include <net/in6.h>
     47#include <net/inet.h>
     48#include <net/socket.h>
     49#include <net/socket_parse.h>
    5050
    5151#include "print_error.h"

  • uspace/app/netecho/print_error.c

    raab02fb refedee77  
    3636
    3737#include <stdio.h>
     38#include <errno.h>
    3839
    39 #include <icmp_codes.h>
    40 #include <socket_errno.h>
     40#include <net/icmp_codes.h>
    4141
    4242#include "print_error.h"

  • uspace/app/nettest1/Makefile

    raab02fb refedee77  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = nettest1
    3434

  • uspace/app/nettest1/nettest.c

    raab02fb refedee77  
    3636
    3737#include <stdio.h>
    38 
    39 #include <socket.h>
    40 #include <net_err.h>
     38#include <err.h>
     39
     40#include <net/socket.h>
    4141
    4242#include "nettest.h"

  • uspace/app/nettest1/nettest.h

    raab02fb refedee77  
    3838#define __NET_TEST__
    3939
    40 #include <socket.h>
     40#include <net/socket.h>
    4141
    4242/** Prints a mark.

  • uspace/app/nettest1/nettest1.c

    raab02fb refedee77  
    4141#include <time.h>
    4242#include <arg_parse.h>
    43 
    44 #include <in.h>
    45 #include <in6.h>
    46 #include <inet.h>
    47 #include <socket.h>
    48 #include <net_err.h>
    49 #include <socket_parse.h>
     43#include <err.h>
     44
     45#include <net/in.h>
     46#include <net/in6.h>
     47#include <net/inet.h>
     48#include <net/socket.h>
     49#include <net/socket_parse.h>
    5050
    5151#include "nettest.h"

  • uspace/app/nettest2/Makefile

    raab02fb refedee77  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = nettest2
    3434

  • uspace/app/nettest2/nettest2.c

    raab02fb refedee77  
    4141#include <time.h>
    4242#include <arg_parse.h>
    43 
    44 #include <in.h>
    45 #include <in6.h>
    46 #include <inet.h>
    47 #include <socket.h>
    48 #include <net_err.h>
    49 #include <socket_parse.h>
     43#include <err.h>
     44
     45#include <net/in.h>
     46#include <net/in6.h>
     47#include <net/inet.h>
     48#include <net/socket.h>
     49#include <net/socket_parse.h>
    5050
    5151#include "nettest.h"

  • uspace/app/ping/Makefile

    raab02fb refedee77  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = ping
    3434

  • uspace/app/ping/ping.c

    raab02fb refedee77  
    4242#include <ipc/services.h>
    4343#include <str_error.h>
     44#include <errno.h>
    4445#include <arg_parse.h>
    4546
    46 #include <icmp_api.h>
    47 #include <in.h>
    48 #include <in6.h>
    49 #include <inet.h>
    50 #include <ip_codes.h>
    51 #include <socket_errno.h>
    52 #include <socket_parse.h>
     47#include <net/icmp_api.h>
     48#include <net/in.h>
     49#include <net/in6.h>
     50#include <net/inet.h>
     51#include <net/socket_parse.h>
     52#include <net/ip_codes.h>
    5353
    5454#include "print_error.h"

  • uspace/app/trace/syscalls.c

    raab02fb refedee77  
    7373    [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
    7474    [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
    75     [SYS_PREEMPT_CONTROL] = { "preempt_control",        1,      V_ERRNO },
     75    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
    7676
    7777    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },
Note: See TracChangeset for help on using the changeset viewer.