Index: uspace/drv/nic/ar9271/Makefile =================================================================== --- uspace/drv/nic/ar9271/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,44 +1,0 @@ -# -# Copyright (c) 2014 Jan Kolarik -# 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 nic ieee80211 crypto - -EXTRA_CFLAGS += -I. - -BINARY = ar9271 - -SOURCES = \ - ath_usb.c \ - hw.c \ - wmi.c \ - htc.c \ - ar9271.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/ar9271/meson.build =================================================================== --- uspace/drv/nic/ar9271/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/ar9271/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,10 @@ +deps = [ 'usbdev', 'usb', 'nic', 'ieee80211', 'crypto' ] +src = files( + 'ath_usb.c', + 'hw.c', + 'wmi.c', + 'htc.c', + 'ar9271.c', +) + +install_data('ar9271.fw', install_dir: 'drv' / 'ar9271') Index: uspace/drv/nic/e1k/Makefile =================================================================== --- uspace/drv/nic/e1k/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2011 Radim Vansa -# 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 nic -BINARY = e1k - -SOURCES = \ - e1k.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/e1k/meson.build =================================================================== --- uspace/drv/nic/e1k/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/e1k/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'nic' ] +src = files('e1k.c') Index: uspace/drv/nic/ne2k/Makefile =================================================================== --- uspace/drv/nic/ne2k/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2011 Radim Vansa -# 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 nic -BINARY = ne2k - -SOURCES = \ - dp8390.c \ - ne2k.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/ne2k/meson.build =================================================================== --- uspace/drv/nic/ne2k/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/ne2k/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'nic' ] +src = files('dp8390.c', 'ne2k.c') Index: uspace/drv/nic/rtl8139/Makefile =================================================================== --- uspace/drv/nic/rtl8139/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2011 Radim Vansa -# 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 nic -BINARY = rtl8139 - -SOURCES = \ - driver.c \ - general.c \ - defs.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/rtl8139/meson.build =================================================================== --- uspace/drv/nic/rtl8139/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/rtl8139/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,6 @@ +deps = [ 'nic' ] +src = files( + 'driver.c', + 'general.c', + 'defs.c', +) Index: uspace/drv/nic/rtl8169/Makefile =================================================================== --- uspace/drv/nic/rtl8169/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2011 Radim Vansa -# Copyright (c) 2014 Agnieszka Tabaka -# 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 nic -BINARY = rtl8169 - -SOURCES = \ - driver.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/rtl8169/meson.build =================================================================== --- uspace/drv/nic/rtl8169/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/rtl8169/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'nic' ] +src = files('driver.c') Index: uspace/drv/nic/virtio-net/Makefile =================================================================== --- uspace/drv/nic/virtio-net/Makefile (revision ab87db55cb5f202637cfdb407053e0d954a16e7d) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2018 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 nic virtio -BINARY = virtio-net - -SOURCES = \ - virtio-net.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/virtio-net/meson.build =================================================================== --- uspace/drv/nic/virtio-net/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) +++ uspace/drv/nic/virtio-net/meson.build (revision 5fd058627a2a82b1aeb8a700591a61bb67d8e212) @@ -0,0 +1,2 @@ +deps = [ 'nic', 'virtio' ] +src = files('virtio-net.c')