Index: uspace/drv/block/ahci/Makefile =================================================================== --- uspace/drv/block/ahci/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2012 Petr Jerman -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = drv -BINARY = ahci - -SOURCES = \ - ahci.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/block/ahci/meson.build =================================================================== --- uspace/drv/block/ahci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/block/ahci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,1 @@ +src = files('ahci.c') Index: uspace/drv/block/ata_bd/Makefile =================================================================== --- uspace/drv/block/ata_bd/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2013 Jiri Svoboda -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = drv scsi -BINARY = ata_bd - -SOURCES = \ - ata_bd.c \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/block/ata_bd/meson.build =================================================================== --- uspace/drv/block/ata_bd/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/block/ata_bd/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'scsi' ] +src = files('ata_bd.c', 'main.c') Index: uspace/drv/block/ddisk/Makefile =================================================================== --- uspace/drv/block/ddisk/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2013 Jiri Svoboda -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = drv scsi -BINARY = ddisk - -SOURCES = \ - ddisk.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/block/ddisk/meson.build =================================================================== --- uspace/drv/block/ddisk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/block/ddisk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'scsi' ] +src = files('ddisk.c') Index: uspace/drv/block/usbmast/Makefile =================================================================== --- uspace/drv/block/usbmast/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2011 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. - -LIBS = usbdev usb drv scsi - -BINARY = usbmast - -SOURCES = \ - bo_trans.c \ - cmdw.c \ - main.c \ - scsi_ms.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/block/usbmast/meson.build =================================================================== --- uspace/drv/block/usbmast/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/block/usbmast/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,7 @@ +deps = [ 'usbdev', 'usb', 'scsi' ] +src = files( + 'bo_trans.c', + 'cmdw.c', + 'main.c', + 'scsi_ms.c', +) Index: uspace/drv/block/virtio-blk/Makefile =================================================================== --- uspace/drv/block/virtio-blk/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2019 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = drv scsi virtio -BINARY = virtio-blk - -SOURCES = \ - virtio-blk.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/block/virtio-blk/meson.build =================================================================== --- uspace/drv/block/virtio-blk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/block/virtio-blk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'scsi', 'virtio' ] +src = files('virtio-blk.c')