Changeset f9d0a86 in mainline for uspace/drv/bus


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/bus
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/adb/cuda_adb/Makefile

    r887c9de rf9d0a86  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = cuda_adb
    3332

  • uspace/drv/bus/isa/Makefile

    r887c9de rf9d0a86  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    32 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31LIBS = drv
    3332BINARY = isa
    3433

  • uspace/drv/bus/pci/pciintel/Makefile

    r887c9de rf9d0a86  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     30LIBS = drv
    3231BINARY = pciintel
    3332

  • uspace/drv/bus/usb/ehci/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = ehci

  • uspace/drv/bus/usb/ohci/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = ohci

  • uspace/drv/bus/usb/uhci/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv usbdev
    4332
    4433BINARY = uhci

  • uspace/drv/bus/usb/usbflbk/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a
    35 
    36 EXTRA_CFLAGS += \
    37         -I$(LIBUSB_PREFIX)/include \
    38         -I$(LIBUSBDEV_PREFIX)/include \
    39         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbdev usb drv
    4032
    4133BINARY = usbflbk

  • uspace/drv/bus/usb/usbhub/Makefile

    r887c9de rf9d0a86  
    3030USPACE_PREFIX = ../../../..
    3131
    32 LIBS = \
    33         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBDRV_PREFIX)/include
     32LIBS = usbdev usb drv
    4133
    4234BINARY = usbhub

  • uspace/drv/bus/usb/usbmid/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSB_PREFIX)/libusb.a \
    34         $(LIBDRV_PREFIX)/libdrv.a
    35 
    36 EXTRA_CFLAGS += \
    37         -I$(LIBUSB_PREFIX)/include \
    38         -I$(LIBUSBDEV_PREFIX)/include \
    39         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbdev usb drv
    4032
    4133BINARY = usbmid

  • uspace/drv/bus/usb/vhc/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBDEV_PREFIX)/libusbdev.a \
    33         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    34         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    35         $(LIBUSB_PREFIX)/libusb.a \
    36         $(LIBDRV_PREFIX)/libdrv.a
     31LIBS = usbdev usbhost usbvirt usb drv
    3732
    38 EXTRA_CFLAGS += \
    39         -I$(LIBUSBVIRT_PREFIX)/include \
    40         -I$(LIBUSBDEV_PREFIX)/include \
    41         -I$(LIBUSBHOST_PREFIX)/include \
    42         -I$(LIBUSB_PREFIX)/include \
    43         -I$(LIBDRV_PREFIX)/include
    4433BINARY = vhc
    4534

  • uspace/drv/bus/usb/xhci/Makefile

    r887c9de rf9d0a86  
    2929USPACE_PREFIX = ../../../..
    3030
    31 LIBS = \
    32         $(LIBUSBHOST_PREFIX)/libusbhost.a \
    33         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    34         $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBDRV_PREFIX)/libdrv.a
    36 
    37 EXTRA_CFLAGS += \
    38         -I$(LIBUSB_PREFIX)/include \
    39         -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHOST_PREFIX)/include \
    41         -I$(LIBUSBVIRT_PREFIX)/include \
    42         -I$(LIBDRV_PREFIX)/include
     31LIBS = usbhost usbvirt usb drv
    4332
    4433BINARY = xhci
Note: See TracChangeset for help on using the changeset viewer.