Changeset 243cb86 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-12T10:50:19Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8365533
Parents:
101ef25c (diff), ebb98c5 (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 from development + several changes to hid driver.

Changes to hid driver:

  • copied some code to usbkbd_get_descriptors() function
  • base structure for hid descriptor and report parser (files uspace/lib/usb/include/usb/classes/hidparser.h

and uspace/lib/usb/src/hidparser.c)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r101ef25c r243cb86  
    4949        app/trace \
    5050        app/top \
     51        app/usbinfo \
    5152        app/virtusbkbd \
    5253        app/netecho \
    … …  
    8788        srv/net/net \
    8889        drv/root \
     90        drv/rootvirt \
     91        drv/test1 \
     92        drv/test2 \
    8993        drv/vhc
    9094
    … …  
    110114
    111115ifeq ($(UARCH),amd64)
     116        DIRS += drv/rootpc
     117        DIRS += drv/pciintel
     118        DIRS += drv/isa
     119        DIRS += drv/ns8250
    112120endif
    113121
    114122ifeq ($(UARCH),ia32)
    115         DIRS += drv/rootia32
     123        DIRS += drv/rootpc
    116124        DIRS += drv/pciintel
    117125        DIRS += drv/isa
    118126        DIRS += drv/ns8250
    119127        DIRS += drv/uhci
     128        DIRS += drv/usbhub
    120129        DIRS += drv/usbkbd
    121130endif
Note: See TracChangeset for help on using the changeset viewer.