Changeset f9d0a86 in mainline for uspace/drv/hid/usbhid


Ignore:
Timestamp:
2017-11-14T12:24:42Z (8 years ago)
Author:
Aearsis <Hlavaty.Ondrej@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6cad776
Parents:
887c9de (diff), d2d142a (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.
git-author:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)
git-committer:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)
Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

Location:
uspace/drv/hid/usbhid
Files:
23 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/hid/usbhid/Makefile

    r887c9de rf9d0a86  
    2727#
    2828
    29 USPACE_PREFIX = ../../../..
     29USPACE_PREFIX = ../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHID_PREFIX)/libusbhid.a \
    33         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = usbhid usbdev usb drv
    3632
    37 EXTRA_CFLAGS += \
    38         -I. \
    39         -I$(LIBUSB_PREFIX)/include \
    40         -I$(LIBUSBDEV_PREFIX)/include \
    41         -I$(LIBUSBHID_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     33EXTRA_CFLAGS += -I.
    4334
    4435BINARY = usbhid
Note: See TracChangeset for help on using the changeset viewer.