Index: uspace/drv/bus/adb/cuda_adb/Makefile =================================================================== --- uspace/drv/bus/adb/cuda_adb/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2010 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 -BINARY = cuda_adb - -SOURCES = \ - cuda_adb.c \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/adb/cuda_adb/meson.build =================================================================== --- uspace/drv/bus/adb/cuda_adb/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/adb/cuda_adb/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,1 @@ +src = files('cuda_adb.c', 'main.c') Index: uspace/drv/bus/isa/Makefile =================================================================== --- uspace/drv/bus/isa/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2010 Lenka Trochtova -# Copyright (c) 2011 Jan Vesely -# 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 = isa - -SOURCES = \ - i8237.c \ - isa.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/isa/meson.build =================================================================== --- uspace/drv/bus/isa/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/isa/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,3 @@ +src = files('i8237.c', 'isa.c') + +install_data('ebus.dev', 'isa.dev', install_dir: 'drv' / 'isa') Index: uspace/drv/bus/pci/pciintel/Makefile =================================================================== --- uspace/drv/bus/pci/pciintel/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2010 Lenka Trochtova -# 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 = pciintel - -SOURCES = \ - ctl.c \ - pci.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/pci/pciintel/meson.build =================================================================== --- uspace/drv/bus/pci/pciintel/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/pci/pciintel/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,1 @@ +src = files('ctl.c', 'pci.c') Index: uspace/drv/bus/usb/ehci/Makefile =================================================================== --- uspace/drv/bus/usb/ehci/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2011 Jan Vesely -# 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 = usbhost usbvirt usb drv usbdev - -BINARY = ehci - -SOURCES = \ - ehci_batch.c \ - ehci_bus.c \ - ehci_rh.c \ - endpoint_list.c \ - hc.c \ - hw_struct/queue_head.c \ - hw_struct/transfer_descriptor.c \ - main.c \ - res.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/ehci/meson.build =================================================================== --- uspace/drv/bus/usb/ehci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/ehci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,12 @@ +deps = [ 'usbhost', 'usbvirt', 'usb', 'usbdev' ] +src = files( + 'ehci_batch.c', + 'ehci_bus.c', + 'ehci_rh.c', + 'endpoint_list.c', + 'hc.c', + 'hw_struct/queue_head.c', + 'hw_struct/transfer_descriptor.c', + 'main.c', + 'res.c', +) Index: uspace/drv/bus/usb/ohci/Makefile =================================================================== --- uspace/drv/bus/usb/ohci/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,45 +1,0 @@ -# -# Copyright (c) 2011 Jan Vesely -# 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 = usbhost usbvirt usb drv usbdev - -BINARY = ohci - -SOURCES = \ - endpoint_list.c \ - hc.c \ - main.c \ - ohci_batch.c \ - ohci_bus.c \ - ohci_rh.c \ - hw_struct/endpoint_descriptor.c \ - hw_struct/transfer_descriptor.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/ohci/meson.build =================================================================== --- uspace/drv/bus/usb/ohci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/ohci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,11 @@ +deps = [ 'usbhost', 'usbvirt', 'usb', 'usbdev' ] +src = files( + 'endpoint_list.c', + 'hc.c', + 'main.c', + 'ohci_batch.c', + 'ohci_bus.c', + 'ohci_rh.c', + 'hw_struct/endpoint_descriptor.c', + 'hw_struct/transfer_descriptor.c', +) Index: uspace/drv/bus/usb/uhci/Makefile =================================================================== --- uspace/drv/bus/usb/uhci/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2010 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 = usbhost usbvirt usb drv usbdev - -BINARY = uhci - -SOURCES = \ - hc.c \ - main.c \ - transfer_list.c \ - uhci_batch.c \ - uhci_rh.c \ - hw_struct/transfer_descriptor.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/uhci/meson.build =================================================================== --- uspace/drv/bus/usb/uhci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/uhci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,9 @@ +deps = [ 'usbhost', 'usbvirt', 'usb', 'usbdev' ] +src = files( + 'hc.c', + 'main.c', + 'transfer_list.c', + 'uhci_batch.c', + 'uhci_rh.c', + 'hw_struct/transfer_descriptor.c', +) Index: uspace/drv/bus/usb/usbdiag/Makefile =================================================================== --- uspace/drv/bus/usb/usbdiag/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,40 +1,0 @@ -# -# Copyright (c) 2017 Petr Manek -# 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 - -BINARY = usbdiag - -SOURCES = \ - device.c \ - tests.c \ - main.c \ - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbdiag/meson.build =================================================================== --- uspace/drv/bus/usb/usbdiag/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/usbdiag/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,6 @@ +deps = [ 'usbdev', 'usb' ] +src = files( + 'device.c', + 'tests.c', + 'main.c', +) Index: uspace/drv/bus/usb/usbflbk/Makefile =================================================================== --- uspace/drv/bus/usb/usbflbk/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,38 +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 - -BINARY = usbflbk - -SOURCES = \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbflbk/meson.build =================================================================== --- uspace/drv/bus/usb/usbflbk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/usbflbk/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'usbdev', 'usb' ] +src = files('main.c') Index: uspace/drv/bus/usb/usbhub/Makefile =================================================================== --- uspace/drv/bus/usb/usbhub/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2010 Vojtech Horky -# Copyright (c) 2011 Jan Vesely -# 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 - -BINARY = usbhub - -SOURCES = \ - main.c \ - usbhub.c \ - port.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbhub/meson.build =================================================================== --- uspace/drv/bus/usb/usbhub/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/usbhub/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,6 @@ +deps = [ 'usbdev', 'usb' ] +src = files( + 'main.c', + 'usbhub.c', + 'port.c', +) Index: uspace/drv/bus/usb/usbmid/Makefile =================================================================== --- uspace/drv/bus/usb/usbmid/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (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 - -BINARY = usbmid - -SOURCES = \ - dump.c \ - explore.c \ - main.c \ - usbmid.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbmid/meson.build =================================================================== --- uspace/drv/bus/usb/usbmid/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/usbmid/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,7 @@ +deps = [ 'usbdev', 'usb' ] +src = files( + 'dump.c', + 'explore.c', + 'main.c', + 'usbmid.c', +) Index: uspace/drv/bus/usb/vhc/Makefile =================================================================== --- uspace/drv/bus/usb/vhc/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,44 +1,0 @@ -# -# Copyright (c) 2010 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 usbhost usbvirt usb drv - -BINARY = vhc - -SOURCES = \ - hub/virthub.c \ - hub/hub.c \ - hub/virthubops.c \ - conndev.c \ - devconn.c \ - main.c \ - transfer.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/vhc/meson.build =================================================================== --- uspace/drv/bus/usb/vhc/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/vhc/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,10 @@ +deps = [ 'usbdev', 'usbhost', 'usbvirt', 'usb' ] +src = files( + 'hub/virthub.c', + 'hub/hub.c', + 'hub/virthubops.c', + 'conndev.c', + 'devconn.c', + 'main.c', + 'transfer.c', +) Index: uspace/drv/bus/usb/xhci/Makefile =================================================================== --- uspace/drv/bus/usb/xhci/Makefile (revision 1e8b633ea4fe33de942dfc3b6dfe8d63fa018b89) +++ (revision ) @@ -1,53 +1,0 @@ -# -# Copyright (c) 2017 Ondrej Hlavaty -# 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 = usbhost usbvirt usb drv - -BINARY = xhci - -SOURCES = \ - bus.c \ - commands.c \ - debug.c \ - device.c \ - endpoint.c \ - hc.c \ - isoch.c \ - main.c \ - rh.c \ - scratchpad.c \ - streams.c \ - transfers.c \ - trb_ring.c - -TEST_SOURCES = \ - test/reg-ops.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/xhci/meson.build =================================================================== --- uspace/drv/bus/usb/xhci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/bus/usb/xhci/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,20 @@ +deps = [ 'usbhost', 'usbvirt', 'usb' ] +src = files( + 'bus.c', + 'commands.c', + 'debug.c', + 'device.c', + 'endpoint.c', + 'hc.c', + 'isoch.c', + 'main.c', + 'rh.c', + 'scratchpad.c', + 'streams.c', + 'transfers.c', + 'trb_ring.c', +) + +test_src = files( + 'test/reg-ops.c', +)