Changes in / [3da12d74:b40bfac] in mainline


Ignore:
Files:
54 added
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r3da12d74 rb40bfac  
    7979        $(MAKE) -C uspace clean
    8080        $(MAKE) -C boot clean
     81
     82-include Makefile.local
  • boot/Makefile.common

    r3da12d74 rb40bfac  
    9999        $(USPACE_PATH)/srv/taskmon/taskmon \
    100100        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
     101        $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
    101102        $(USPACE_PATH)/srv/net/netif/lo/lo \
    102103        $(USPACE_PATH)/srv/net/il/arp/arp \
     
    140141        $(USPACE_PATH)/app/ping/ping \
    141142        $(USPACE_PATH)/app/stats/stats \
     143        $(USPACE_PATH)/app/usb/usb \
     144        $(USPACE_PATH)/app/virtusbkbd/vuk \
    142145        $(USPACE_PATH)/app/tasks/tasks \
    143146        $(USPACE_PATH)/app/top/top
  • uspace/Makefile

    r3da12d74 rb40bfac  
    5050        app/trace \
    5151        app/top \
     52        app/usb \
     53        app/virtusbkbd \
    5254        app/netstart \
    5355        app/netecho \
     
    7981        srv/hw/char/s3c24xx_uart \
    8082        srv/hw/netif/dp8390 \
     83        srv/hw/bus/usb/hcd/virtual \
    8184        srv/net/cfg \
    8285        srv/net/netif/lo \
     
    143146        lib/net
    144147
     148ifeq ($(UARCH),amd64)
     149        LIBS += lib/usb
     150        LIBS += lib/usbvirt
     151endif
     152
     153ifeq ($(UARCH),ia32)
     154        LIBS += lib/usb
     155        LIBS += lib/usbvirt
     156endif
     157
    145158LIBC_BUILD = $(addsuffix .build,$(LIBC))
    146159LIBS_BUILD = $(addsuffix .build,$(LIBS))
  • uspace/Makefile.common

    r3da12d74 rb40bfac  
    8686LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    8787
     88
     89LIBUSB_PREFIX = $(LIB_PREFIX)/usb
     90LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
    8891LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    8992LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
  • uspace/doc/doxygroups.h

    r3da12d74 rb40bfac  
    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         */
Note: See TracChangeset for help on using the changeset viewer.