Changes in / [fe2333d:c01f8e6] in mainline


Ignore:
Files:
2 added
87 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rfe2333d rc01f8e6  
    8383        $(MAKE) -C uspace clean
    8484        $(MAKE) -C boot clean
    85 
    86 -include Makefile.local

  • boot/Makefile.common

    rfe2333d rc01f8e6  
    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 \
    … …  
    113112        rootvirt \
    114113        test1 \
    115         test2 \
    116         vhc
     114        test2
    117115
    118116RD_DRV_CFG =
    … …  
    146144        $(USPACE_PATH)/app/stats/stats \
    147145        $(USPACE_PATH)/app/tasks/tasks \
    148         $(USPACE_PATH)/app/top/top \
    149         $(USPACE_PATH)/app/usbinfo/usbinfo \
    150         $(USPACE_PATH)/app/virtusbkbd/vuk
     146        $(USPACE_PATH)/app/top/top
    151147
    152148ifneq ($(CONFIG_BAREBONE),y)

  • boot/arch/amd64/Makefile.inc

    rfe2333d rc01f8e6  
    4040        pciintel \
    4141        isa \
    42         ns8250 \
    43         uhci \
    44         usbhub \
    45         usbkbd
     42        ns8250
    4643       
    4744RD_DRV_CFG += \

  • kernel/generic/include/ipc/ipc.h

    rfe2333d rc01f8e6  
    4545/** Maximum active async calls per thread */
    4646#ifdef CONFIG_DEBUG
    47         #define IPC_MAX_ASYNC_CALLS  16
     47        #define IPC_MAX_ASYNC_CALLS  4
    4848#else
    4949        #define IPC_MAX_ASYNC_CALLS  4000

  • uspace/Makefile

    rfe2333d rc01f8e6  
    4949        app/trace \
    5050        app/top \
    51         app/usbinfo \
    52         app/virtusbkbd \
    5351        app/netecho \
    5452        app/nettest1 \
    … …  
    9088        drv/rootvirt \
    9189        drv/test1 \
    92         drv/test2 \
    93         drv/vhc
     90        drv/test2
    9491
    9592## Networking
    … …  
    125122        DIRS += drv/isa
    126123        DIRS += drv/ns8250
    127         DIRS += drv/uhci
    128         DIRS += drv/usbhub
    129         DIRS += drv/usbkbd
    130124endif
    131125
    … …  
    153147        lib/packet \
    154148        lib/net
    155 
    156 ifeq ($(UARCH),amd64)
    157         LIBS += lib/usb
    158         LIBS += lib/usbvirt
    159 endif
    160 
    161 ifeq ($(UARCH),ia32)
    162         LIBS += lib/usb
    163         LIBS += lib/usbvirt
    164 endif
    165149
    166150LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    6565#include "mm/malloc1.def"
    6666#include "hw/serial/serial1.def"
    67 #include "adt/usbaddrkeep.def"
    6867        {NULL, NULL, NULL, false}
    6968};

  • uspace/app/tester/tester.h

    rfe2333d rc01f8e6  
    8282extern const char *test_malloc1(void);
    8383extern const char *test_serial1(void);
    84 extern const char *test_usbaddrkeep(void);
    8584
    8685extern test_t tests[];

  • uspace/doc/doxygroups.h

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    109109}
    110110
    111 /** Create virtual USB host controller device.
    112  * Note that the virtual HC is actually device and driver in one
    113  * task.
    114  *
    115  * @param parent Parent device.
    116  * @return Error code.
    117  */
    118 static int add_virtual_usb_host_controller(device_t *parent)
    119 {
    120         printf(NAME ": adding virtual host contoller.\n");
    121 
    122         int rc;
    123         device_t *vhc = NULL;
    124         match_id_t *match_id = NULL;
    125 
    126         vhc = create_device();
    127         if (vhc == NULL) {
    128                 rc = ENOMEM;
    129                 goto failure;
    130         }
    131 
    132         vhc->name = "vhc";
    133         printf(NAME ": the new device's name is %s.\n", vhc->name);
    134 
    135         /* Initialize match id list. */
    136         match_id = create_match_id();
    137         if (match_id == NULL) {
    138                 rc = ENOMEM;
    139                 goto failure;
    140         }
    141 
    142         match_id->id = "usb&hc=vhc";
    143         match_id->score = 100;
    144         add_match_id(&vhc->match_ids, match_id);
    145 
    146         /* Register child device. */
    147         rc = child_device_register(vhc, parent);
    148         if (rc != EOK)
    149                 goto failure;
    150 
    151         return EOK;
    152 
    153 failure:
    154         if (match_id != NULL)
    155                 match_id->id = NULL;
    156 
    157         if (vhc != NULL) {
    158                 vhc->name = NULL;
    159                 delete_device(vhc);
    160         }
    161 
    162         return rc;
    163 }
    164 
    165111/** Get the root device.
    166112 *
    … …  
    185131                printf(NAME ": failed to add child device for platform.\n");
    186132       
    187         /* Register virtual USB host controller. */
    188         int rc = add_virtual_usb_host_controller(dev);
    189         if (EOK != rc) {
    190                 printf(NAME ": failed to add child device - virtual USB HC.\n");
    191         }
    192 
    193133        return res;
    194134}

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

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    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

    rfe2333d rc01f8e6  
    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/srv/devman/devman.c

    rfe2333d rc01f8e6  
    117117        printf(NAME": the '%s' driver was added to the list of available "
    118118            "drivers.\n", drv->name);
    119 
    120         printf(NAME ": match ids:");
    121         link_t *cur;
    122         for (cur = drv->match_ids.ids.next; cur != &drv->match_ids.ids; cur = cur->next) {
    123                 match_id_t *match_id = list_get_instance(cur, match_id_t, link);
    124                 printf(" %d:%s", match_id->score, match_id->id);
    125         }
    126         printf("\n");
    127119}
    128120

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

    rfe2333d rc01f8e6  
    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.