Changes in / [467bf40:6eb794a] in mainline


Ignore:
Files:
96 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r467bf40 r6eb794a  
    547547
    548548% Launch (devman) test drivers
    549 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
    550 
     549! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n)
     550

  • Makefile

    r467bf40 r6eb794a  
    9292        $(MAKE) -C uspace clean
    9393        $(MAKE) -C boot clean
    94 
    95 -include Makefile.local

  • boot/Makefile.common

    r467bf40 r6eb794a  
    9999        $(USPACE_PATH)/srv/taskmon/taskmon \
    100100        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
    101         $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
    102101        $(USPACE_PATH)/srv/net/netif/lo/lo \
    103102        $(USPACE_PATH)/srv/net/il/arp/arp \
    … …  
    144143        $(USPACE_PATH)/app/ping/ping \
    145144        $(USPACE_PATH)/app/stats/stats \
    146         $(USPACE_PATH)/app/sysinfo/sysinfo \
    147145        $(USPACE_PATH)/app/tasks/tasks \
    148146        $(USPACE_PATH)/app/top/top \
    149         $(USPACE_PATH)/app/usbinfo/usbinfo \
    150         $(USPACE_PATH)/app/virtusbkbd/vuk
     147        $(USPACE_PATH)/app/sysinfo/sysinfo
    151148
    152149ifneq ($(CONFIG_BAREBONE),y)

  • boot/arch/amd64/Makefile.inc

    r467bf40 r6eb794a  
    4040        pciintel \
    4141        isa \
    42         ns8250 \
    43         uhci \
    44         usbhub \
    45         usbkbd \
    46         vhc
     42        ns8250
    4743       
    4844RD_DRV_CFG += \

  • uspace/Makefile

    r467bf40 r6eb794a  
    4949        app/trace \
    5050        app/top \
    51         app/usbinfo \
    52         app/virtusbkbd \
    5351        app/netecho \
    5452        app/nettest1 \
    … …  
    118116        DIRS += drv/isa
    119117        DIRS += drv/ns8250
    120         DIRS += drv/uhci
    121         DIRS += drv/usbhub
    122         DIRS += drv/usbkbd
    123         DIRS += drv/vhc
    124118endif
    125119
    … …  
    129123        DIRS += drv/isa
    130124        DIRS += drv/ns8250
    131         DIRS += drv/uhci
    132         DIRS += drv/usbhub
    133         DIRS += drv/usbkbd
    134         DIRS += drv/vhc
    135125endif
    136126
    … …  
    158148        lib/packet \
    159149        lib/net
    160 
    161 ifeq ($(UARCH),amd64)
    162         LIBS += lib/usb
    163         LIBS += lib/usbvirt
    164 endif
    165 
    166 ifeq ($(UARCH),ia32)
    167         LIBS += lib/usb
    168         LIBS += lib/usbvirt
    169 endif
    170150
    171151LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    r467bf40 r6eb794a  
    8686LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    8787
    88 
    89 LIBUSB_PREFIX = $(LIB_PREFIX)/usb
    90 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
    9188LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    9289LIBPACKET_PREFIX = $(LIB_PREFIX)/packet

  • uspace/app/init/init.c

    r467bf40 r6eb794a  
    312312        getterm("term/vc5", "/app/bdsh", false);
    313313        getterm("term/vc6", "/app/klog", false);
    314         getterm("term/vc7", "/srv/devman", false);
    315314       
    316315        return 0;

  • uspace/app/tester/Makefile

    r467bf40 r6eb794a  
    3131BINARY = tester
    3232
    33 LIBS += $(LIBUSB_PREFIX)/libusb.a
    34 EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include
    35 
    3633SOURCES = \
    3734        tester.c \
    38         adt/usbaddrkeep.c \
    3935        thread/thread1.c \
    4036        print/print1.c \

  • uspace/app/tester/tester.c

    r467bf40 r6eb794a  
    6363#include "mm/malloc1.def"
    6464#include "hw/serial/serial1.def"
    65 #include "adt/usbaddrkeep.def"
    6665#include "hw/misc/virtchar1.def"
    6766        {NULL, NULL, NULL, false}

  • uspace/app/tester/tester.h

    r467bf40 r6eb794a  
    8080extern const char *test_malloc1(void);
    8181extern const char *test_serial1(void);
    82 extern const char *test_usbaddrkeep(void);
    8382extern const char *test_virtchar1(void);
    8483

  • uspace/doc/doxygroups.h

    r467bf40 r6eb794a  
    155155         * @endcond
    156156         */
    157 
     157       
    158158/**
    159159 * @defgroup emul Emulation Libraries
    … …  
    170170         * @ingroup emul
    171171         */
    172 
    173 /**
    174  * @defgroup usb USB
    175  * @ingroup uspace
    176  * @brief USB support for HelenOS.
    177  */
    178         /**
    179          * @defgroup libusb USB library
    180          * @ingroup usb
    181          * @brief Library for creating USB devices drivers.
    182          */

  • uspace/drv/root/root.c

    r467bf40 r6eb794a  
    8888
    8989        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
    90             VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE,
    91             NULL);
     90            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
    9291
    9392        return res;
    … …  
    137136
    138137        res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
    139             match_id, PLATFORM_DEVICE_MATCH_SCORE, NULL);
     138            match_id, PLATFORM_DEVICE_MATCH_SCORE);
    140139
    141140        return res;

  • uspace/drv/rootvirt/devices.def

    r467bf40 r6eb794a  
    2222},
    2323#endif
    24 /* Virtual USB host controller. */
    25 {
    26         .name = "usbhc",
    27         .match_id = "usb&hc=vhc"
    28 },

  • uspace/drv/rootvirt/rootvirt.c

    r467bf40 r6eb794a  
    8484
    8585        int rc = child_device_register_wrapper(parent, virt_dev->name,
    86             virt_dev->match_id, 10, NULL);
     86            virt_dev->match_id, 10);
    8787
    8888        if (rc == EOK) {

  • uspace/drv/test1/test1.c

    r467bf40 r6eb794a  
    6262
    6363        int rc = child_device_register_wrapper(parent, name,
    64             match_id, match_score, NULL);
     64            match_id, match_score);
    6565
    6666        if (rc == EOK) {

  • uspace/drv/test2/test2.c

    r467bf40 r6eb794a  
    6464
    6565        int rc = child_device_register_wrapper(parent, name,
    66             match_id, match_score, NULL);
     66            match_id, match_score);
    6767
    6868        if (rc == EOK) {

  • uspace/lib/c/generic/devman.c

    r467bf40 r6eb794a  
    230230       
    231231        if (flags & IPC_FLAG_BLOCKING) {
    232                 phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
     232                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
    233233                    DEVMAN_CONNECT_TO_DEVICE, handle);
    234234        } else {
    235                 phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
     235                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
    236236                    DEVMAN_CONNECT_TO_DEVICE, handle);
    237237        }

  • uspace/lib/c/include/ipc/dev_iface.h

    r467bf40 r6eb794a  
    3838        HW_RES_DEV_IFACE = 0,   
    3939        CHAR_DEV_IFACE,
    40 
    41         /** Interface provided by USB host controller. */
    42         USBHC_DEV_IFACE,
    43 
    4440        // TODO add more interfaces
    4541        DEV_IFACE_MAX
    … …  
    5450        DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
    5551
    56 /*
    57  * The first argument is actually method (as the "real" method is used
    58  * for indexing into interfaces.
    59  */
    60 
    61 #define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))
    62 #define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))
    63 #define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))
    64 #define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))
    65 
    6652
    6753#endif

  • uspace/lib/drv/Makefile

    r467bf40 r6eb794a  
    2929
    3030USPACE_PREFIX = ../..
    31 EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include
     31EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libdrv
    3333
    … …  
    3636        generic/dev_iface.c \
    3737        generic/remote_res.c \
    38         generic/remote_usbhc.c \
    3938        generic/remote_char.c
    4039

  • uspace/lib/drv/generic/dev_iface.c

    r467bf40 r6eb794a  
    3939#include "remote_res.h"
    4040#include "remote_char.h"
    41 #include "remote_usbhc.h"
    4241
    4342static iface_dipatch_table_t remote_ifaces = {
    4443        .ifaces = {
    4544                &remote_res_iface,
    46                 &remote_char_iface,
    47                 &remote_usbhc_iface
     45                &remote_char_iface
    4846        }
    4947};

  • uspace/lib/drv/generic/driver.c

    r467bf40 r6eb794a  
    390390 */
    391391int child_device_register_wrapper(device_t *parent, const char *child_name,
    392     const char *child_match_id, int child_match_score,
    393     devman_handle_t *child_handle)
     392    const char *child_match_id, int child_match_score)
    394393{
    395394        device_t *child = NULL;
    … …  
    419418                goto failure;
    420419
    421         if (child_handle != NULL) {
    422                 *child_handle = child->handle;
    423         }
    424420        return EOK;
    425421

  • uspace/lib/drv/include/driver.h

    r467bf40 r6eb794a  
    199199
    200200int child_device_register(device_t *, device_t *);
    201 int child_device_register_wrapper(device_t *, const char *, const char *, int,
    202     devman_handle_t *);
     201int child_device_register_wrapper(device_t *, const char *, const char *, int);
    203202
    204203

  • uspace/srv/devman/devman.c

    r467bf40 r6eb794a  
    133133        printf(NAME": the '%s' driver was added to the list of available "
    134134            "drivers.\n", drv->name);
    135 
    136         printf(NAME ": match ids:");
    137         link_t *cur;
    138         for (cur = drv->match_ids.ids.next; cur != &drv->match_ids.ids; cur = cur->next) {
    139                 match_id_t *match_id = list_get_instance(cur, match_id_t, link);
    140                 printf(" %d:%s", match_id->score, match_id->id);
    141         }
    142         printf("\n");
    143135}
    144136

  • uspace/srv/net/tl/udp/udp.c

    r467bf40 r6eb794a  
    711711        int socket_id;
    712712        size_t addrlen;
    713         size_t size = 0;
     713        size_t size;
    714714        ipc_call_t answer;
    715715        int answer_count;
Note: See TracChangeset for help on using the changeset viewer.