Changeset f9d0a86 in mainline for uspace/drv/block

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/block

Files:

• ahci/Makefile (modified) (1 diff)
• ata_bd/Makefile (modified) (1 diff)
• ddisk/Makefile (modified) (1 diff)
• usbmast/Makefile (added)
• usbmast/bo_trans.c (moved) (moved from uspace/drv/bus/usb/usbmast/bo_trans.c )
• usbmast/bo_trans.h (moved) (moved from uspace/drv/bus/usb/usbmast/bo_trans.h )
• usbmast/cmdw.c (moved) (moved from uspace/drv/bus/usb/usbmast/cmdw.c )
• usbmast/cmdw.h (moved) (moved from uspace/drv/bus/usb/usbmast/cmdw.h )
• usbmast/main.c (moved) (moved from uspace/drv/bus/usb/usbmast/main.c )
• usbmast/scsi_ms.c (moved) (moved from uspace/drv/bus/usb/usbmast/scsi_ms.c )
• usbmast/scsi_ms.h (moved) (moved from uspace/drv/bus/usb/usbmast/scsi_ms.h )
• usbmast/usbmast.h (moved) (moved from uspace/drv/bus/usb/usbmast/usbmast.h )
• usbmast/usbmast.ma (moved) (moved from uspace/drv/bus/usb/usbmast/usbmast.ma )

uspace/drv/block/ahci/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = ahci
 

uspace/drv/block/ata_bd/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
+LIBS = drv scsi
 BINARY = ata_bd
 

uspace/drv/block/ddisk/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
+LIBS = drv scsi
 BINARY = ddisk