Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Oct 2008 17:01:16 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 151902 for review
Message-ID:  <200810251701.m9PH1GKQ089938@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151902

Change 151902 by hselasky@hselasky_laptop001 on 2008/10/25 17:01:03

	
	Add missing copyrights and fragment
	USB modules into smaller parts.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#18 edit
.. //depot/projects/usb/src/sys/modules/usb2/Makefile#3 edit
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#7 edit
.. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#7 edit
.. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#5 edit
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#5 edit
.. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#4 edit
.. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#5 edit
.. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#1 add
.. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#1 add

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#8 (text+ko) ====

@@ -365,6 +365,7 @@
 DRIVER_MODULE(ng_ubt, ushub, ubt_driver, ubt_devclass, ubt_modevent, 0);
 MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION);
 MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
+MODULE_DEPEND(ng_ubt, usb2_bluetooth, 1, 1, 1);
 MODULE_DEPEND(ng_ubt, usb2_core, 1, 1, 1);
 
 /****************************************************************************

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#7 (text+ko) ====

@@ -169,8 +169,8 @@
 	.size = sizeof(struct ubtbcmfw_softc),
 };
 
-DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass,
-    NULL, 0);
+DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0);
+MODULE_DEPEND(ubtbcmfw, usb2_bluetooth, 1, 1, 1);
 MODULE_DEPEND(ubtbcmfw, usb2_core, 1, 1, 1);
 
 /*

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#12 (text+ko) ====

@@ -494,3 +494,5 @@
 
 DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0);
 DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(ehci, usb2_controller, 1, 1, 1);
+MODULE_DEPEND(ehci, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#6 (text+ko) ====

@@ -252,3 +252,5 @@
 static devclass_t musbotg_devclass;
 
 DRIVER_MODULE(musbotg, atmelarm, musbotg_driver, musbotg_devclass, 0, 0);
+MODULE_DEPEND(musbotg, usb2_controller, 1, 1, 1);
+MODULE_DEPEND(musbotg, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#9 (text) ====

@@ -228,3 +228,5 @@
 static devclass_t ohci_devclass;
 
 DRIVER_MODULE(ohci, atmelarm, ohci_driver, ohci_devclass, 0, 0);
+MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1);
+MODULE_DEPEND(ohci, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#10 (text+ko) ====

@@ -388,3 +388,5 @@
 
 DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0);
 DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0);
+MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1);
+MODULE_DEPEND(ohci, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#11 (text+ko) ====

@@ -449,3 +449,5 @@
 
 DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0);
 DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0);
+MODULE_DEPEND(uhci, usb2_controller, 1, 1, 1);
+MODULE_DEPEND(uhci, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 (text+ko) ====

@@ -75,6 +75,7 @@
 static devclass_t uss820dci_devclass;
 
 DRIVER_MODULE(uss820, atmelarm, uss820dci_driver, uss820dci_devclass, 0, 0);
+MODULE_DEPEND(uss820, usb2_controller, 1, 1, 1);
 MODULE_DEPEND(uss820, usb2_core, 1, 1, 1);
 
 static const char *const uss820_desc = "USS820 USB Device Controller";

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#10 (text+ko) ====

@@ -89,6 +89,7 @@
 #include <dev/usb2/ethernet/usb2_ethernet.h>
 #include <dev/usb2/ethernet/if_aue2_reg.h>
 
+MODULE_DEPEND(aue, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(aue, usb2_core, 1, 1, 1);
 MODULE_DEPEND(aue, ether, 1, 1, 1);
 MODULE_DEPEND(aue, miibus, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#10 (text+ko) ====

@@ -103,6 +103,7 @@
 #include <dev/usb2/ethernet/usb2_ethernet.h>
 #include <dev/usb2/ethernet/if_axe2_reg.h>
 
+MODULE_DEPEND(axe, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(axe, usb2_core, 1, 1, 1);
 MODULE_DEPEND(axe, ether, 1, 1, 1);
 MODULE_DEPEND(axe, miibus, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#10 (text+ko) ====

@@ -184,6 +184,7 @@
 
 DRIVER_MODULE(cdce, ushub, cdce_driver, cdce_devclass, NULL, 0);
 MODULE_VERSION(cdce, 1);
+MODULE_DEPEND(cdce, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(cdce, usb2_core, 1, 1, 1);
 MODULE_DEPEND(cdce, ether, 1, 1, 1);
 

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#10 (text+ko) ====

@@ -196,6 +196,7 @@
 static devclass_t cue_devclass;
 
 DRIVER_MODULE(cue, ushub, cue_driver, cue_devclass, NULL, 0);
+MODULE_DEPEND(cue, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(cue, usb2_core, 1, 1, 1);
 MODULE_DEPEND(cue, ether, 1, 1, 1);
 

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#10 (text+ko) ====

@@ -237,6 +237,7 @@
 static devclass_t kue_devclass;
 
 DRIVER_MODULE(kue, ushub, kue_driver, kue_devclass, NULL, 0);
+MODULE_DEPEND(kue, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(kue, usb2_core, 1, 1, 1);
 MODULE_DEPEND(kue, ether, 1, 1, 1);
 

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#10 (text+ko) ====

@@ -249,6 +249,7 @@
 
 DRIVER_MODULE(rue, ushub, rue_driver, rue_devclass, NULL, 0);
 DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(rue, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(rue, usb2_core, 1, 1, 1);
 MODULE_DEPEND(rue, ether, 1, 1, 1);
 MODULE_DEPEND(rue, miibus, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#10 (text+ko) ====

@@ -209,6 +209,7 @@
 
 DRIVER_MODULE(udav, ushub, udav_driver, udav_devclass, NULL, 0);
 DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(udav, usb2_ethernet, 1, 1, 1);
 MODULE_DEPEND(udav, usb2_core, 1, 1, 1);
 MODULE_DEPEND(udav, ether, 1, 1, 1);
 MODULE_DEPEND(udav, miibus, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#8 (text+ko) ====

@@ -195,6 +195,7 @@
 };
 
 DRIVER_MODULE(uscanner, ushub, uscanner_driver, uscanner_devclass, NULL, 0);
+MODULE_DEPEND(uscanner, usb2_image, 1, 1, 1);
 MODULE_DEPEND(uscanner, usb2_core, 1, 1, 1);
 
 /*

==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#9 (text+ko) ====

@@ -818,4 +818,5 @@
 };
 
 DRIVER_MODULE(uhid, ushub, uhid_driver, uhid_devclass, NULL, 0);
+MODULE_DEPEND(uhid, usb2_input, 1, 1, 1);
 MODULE_DEPEND(uhid, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#9 (text+ko) ====

@@ -1499,4 +1499,5 @@
 };
 
 DRIVER_MODULE(ukbd, ushub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
+MODULE_DEPEND(ukbd, usb2_input, 1, 1, 1);
 MODULE_DEPEND(ukbd, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#9 (text+ko) ====

@@ -907,4 +907,5 @@
 };
 
 DRIVER_MODULE(ums, ushub, ums_driver, ums_devclass, NULL, 0);
+MODULE_DEPEND(ums, usb2_input, 1, 1, 1);
 MODULE_DEPEND(ums, usb2_core, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#8 (text+ko) ====

@@ -248,6 +248,7 @@
 
 DRIVER_MODULE(udbp, ushub, udbp_driver, udbp_devclass, udbp_modload, 0);
 MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
+MODULE_DEPEND(udbp, usb2_misc, 1, 1, 1);
 MODULE_DEPEND(udbp, usb2_core, 1, 1, 1);
 
 static int

==== //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#5 (text+ko) ====

@@ -104,8 +104,9 @@
 	.size = sizeof(struct ufm_softc),
 };
 
+MODULE_DEPEND(ufm, usb2_misc, 1, 1, 1);
+DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0);
 MODULE_DEPEND(ufm, usb2_core, 1, 1, 1);
-DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0);
 
 static int
 ufm_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#5 (text+ko) ====

@@ -59,6 +59,7 @@
 
 #include <dev/if_ndis/if_ndisvar.h>
 
+MODULE_DEPEND(ndis, usb2_ndis, 1, 1, 1);
 MODULE_DEPEND(ndis, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
 MODULE_DEPEND(ndis, if_ndis, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#7 (text+ko) ====

@@ -172,6 +172,7 @@
 };
 
 DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0);
+MODULE_DEPEND(uark, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uark, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#10 (text+ko) ====

@@ -311,6 +311,7 @@
 };
 
 DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0);
+MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#7 (text+ko) ====

@@ -225,6 +225,7 @@
 };
 
 DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0);
+MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubser, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#8 (text+ko) ====

@@ -1033,5 +1033,6 @@
 static devclass_t uchcom_devclass;
 
 DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0);
+MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);

==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#8 (text+ko) ====

@@ -171,6 +171,7 @@
 };
 
 DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0);
+MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#10 (text+ko) ====

@@ -333,6 +333,7 @@
 };
 
 DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0);
+MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#8 (text+ko) ====

@@ -220,6 +220,7 @@
 };
 
 DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0);
+MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#11 (text+ko) ====

@@ -170,6 +170,7 @@
 };
 
 DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0);
+MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#9 (text+ko) ====

@@ -1092,6 +1092,7 @@
 };
 
 DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0);
+MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#8 (text+ko) ====

@@ -795,3 +795,4 @@
 
 DRIVER_MODULE(ulpt, ushub, ulpt_driver, ulpt_devclass, NULL, 0);
 MODULE_DEPEND(ulpt, usb2_core, 1, 1, 1);
+MODULE_DEPEND(ulpt, usb2_serial, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#7 (text+ko) ====

@@ -235,6 +235,7 @@
 };
 
 DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0);
+MODULE_DEPEND(umct, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umct, usb2_core, 1, 1, 1);
 MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#10 (text+ko) ====

@@ -276,6 +276,7 @@
 };
 
 DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0);
+MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umodem, usb2_core, 1, 1, 1);
 MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(umodem, UMODEM_MODVER);

==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#8 (text+ko) ====

@@ -294,6 +294,7 @@
 };
 
 DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0);
+MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1);
 MODULE_DEPEND(umoscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#9 (text+ko) ====

@@ -329,6 +329,7 @@
 };
 
 DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0);
+MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uplcom, UPLCOM_MODVER);

==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#8 (text+ko) ====

@@ -254,6 +254,7 @@
 };
 
 DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0);
+MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 

==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#8 (text+ko) ====

@@ -281,6 +281,7 @@
 };
 
 DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0);
+MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uvscom, UVSCOM_MODVER);

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#14 (text+ko) ====

@@ -3780,6 +3780,7 @@
 }
 
 DRIVER_MODULE(uaudio, ushub, uaudio_driver, uaudio_devclass, NULL, 0);
+MODULE_DEPEND(uaudio, usb2_sound, 1, 1, 1);
 MODULE_DEPEND(uaudio, usb2_core, 1, 1, 1);
 MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(uaudio, 1);

==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#8 (text) ====

@@ -272,6 +272,7 @@
 };
 
 DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0);
+MODULE_DEPEND(atausb, usb2_storage, 1, 1, 1);
 MODULE_DEPEND(atausb, usb2_core, 1, 1, 1);
 MODULE_VERSION(atausb, 1);
 

==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#13 (text+ko) ====

@@ -1263,6 +1263,7 @@
 };
 
 DRIVER_MODULE(umass, ushub, umass_driver, umass_devclass, umass_driver_loaded, 0);
+MODULE_DEPEND(umass, usb2_storage, 1, 1, 1);
 MODULE_DEPEND(umass, usb2_core, 1, 1, 1);
 MODULE_DEPEND(umass, cam, 1, 1, 1);
 

==== //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#8 (text+ko) ====

@@ -185,6 +185,7 @@
 };
 
 DRIVER_MODULE(urio, ushub, urio_driver, urio_devclass, NULL, 0);
+MODULE_DEPEND(urio, usb2_storage, 1, 1, 1);
 MODULE_DEPEND(urio, usb2_core, 1, 1, 1);
 
 static int

==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#11 (text+ko) ====

@@ -231,6 +231,7 @@
 
 DRIVER_MODULE(ustorage_fs, ushub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0);
 MODULE_VERSION(ustorage_fs, 0);
+MODULE_DEPEND(ustorage_fs, usb2_storage, 1, 1, 1);
 MODULE_DEPEND(ustorage_fs, usb2_core, 1, 1, 1);
 
 struct usb2_config ustorage_fs_bbb_config[USTORAGE_FS_T_BBB_MAX] = {

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#17 (text+ko) ====

@@ -415,6 +415,7 @@
 };
 
 DRIVER_MODULE(rum, ushub, rum_driver, rum_devclass, NULL, 0);
+MODULE_DEPEND(rum, usb2_wlan, 1, 1, 1);
 MODULE_DEPEND(rum, usb2_core, 1, 1, 1);
 MODULE_DEPEND(rum, wlan, 1, 1, 1);
 MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#17 (text+ko) ====

@@ -406,6 +406,7 @@
 };
 
 DRIVER_MODULE(ural, ushub, ural_driver, ural_devclass, NULL, 0);
+MODULE_DEPEND(ural, usb2_wlan, 1, 1, 1);
 MODULE_DEPEND(ural, usb2_core, 1, 1, 1);
 MODULE_DEPEND(ural, wlan, 1, 1, 1);
 MODULE_DEPEND(ural, wlan_amrr, 1, 1, 1);

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#18 (text+ko) ====

@@ -304,6 +304,7 @@
 };
 
 DRIVER_MODULE(zyd, ushub, zyd_driver, zyd_devclass, NULL, 0);
+MODULE_DEPEND(zyd, usb2_wlan, 1, 1, 1);
 MODULE_DEPEND(zyd, usb2_core, 1, 1, 1);
 MODULE_DEPEND(zyd, wlan, 1, 1, 1);
 MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1);

==== //depot/projects/usb/src/sys/modules/usb2/Makefile#3 (text+ko) ====

@@ -1,22 +1,89 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
-
 SUBDIR =
 SUBDIR += bluetooth
+SUBDIR += bluetooth_ng
+SUBDIR += bluetooth_fw
 SUBDIR += controller
+SUBDIR += controller_at91dci
+SUBDIR += controller_ehci
+SUBDIR += controller_musb
+SUBDIR += controller_ohci
+SUBDIR += controller_uhci
+SUBDIR += controller_uss820dci
 SUBDIR += core
 SUBDIR += ethernet
+SUBDIR += ethernet_aue
+SUBDIR += ethernet_axe
+SUBDIR += ethernet_cdce
+SUBDIR += ethernet_cue
+SUBDIR += ethernet_dav
+SUBDIR += ethernet_kue
+SUBDIR += ethernet_rue
 SUBDIR += image
 SUBDIR += input
+SUBDIR += input_hid
+SUBDIR += input_kbd
+SUBDIR += input_ms
 SUBDIR += misc
+SUBDIR += misc_dbp
+SUBDIR += misc_fm
 SUBDIR += ndis
 SUBDIR += quirk
+SUBDIR += scanner
 SUBDIR += serial
+SUBDIR += serial_ark
+SUBDIR += serial_bsa
+SUBDIR += serial_bser
+SUBDIR += serial_chcom
+SUBDIR += serial_cycom
+SUBDIR += serial_foma
+SUBDIR += serial_ftdi
+SUBDIR += serial_gensa
+SUBDIR += serial_ipaq
+SUBDIR += serial_lpt
+SUBDIR += serial_mct
+SUBDIR += serial_modem
+SUBDIR += serial_moscom
+SUBDIR += serial_plcom
+SUBDIR += serial_visor
+SUBDIR += serial_vscom
 SUBDIR += sound
 SUBDIR += storage
+SUBDIR += storage_ata
+SUBDIR += storage_fs
+SUBDIR += storage_mass
+SUBDIR += storage_rio
 SUBDIR += template
 SUBDIR += wlan
+SUBDIR += wlan_ral
+SUBDIR += wlan_rum
+SUBDIR += wlan_zyd
 
 .include <bsd.subdir.mk>
+

==== //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#4 (text+ko) ====

@@ -10,9 +10,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
 SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
-
 SRCS+= usb2_bluetooth.c
-SRCS+= ng_ubt2.c
-SRCS+= ubtbcmfw2.c
 
 .include <bsd.kmod.mk>

==== //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#7 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 
@@ -10,28 +33,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h 
 SRCS+= opt_usb.h pci_if.h opt_bus.h card_if.h
-
-#
-# The "usb2_controller.c" file must be first to 
-# resolve a "MODULE_DRIVER()" race.
-#
-
 SRCS+= usb2_controller.c
 
-.if defined(HAS_ATMELARM)
-SRCS+= at91dci_atmelarm.c
-SRCS+= ohci2_atmelarm.c
-SRCS+= uss820dci_atmelarm.c
-.endif
-
-SRCS+= at91dci.c
-SRCS+= ehci2.c
-SRCS+= ehci2_pci.c
-SRCS+= musb2_otg.c
-SRCS+= ohci2.c
-SRCS+= ohci2_pci.c
-SRCS+= uhci2.c
-SRCS+= uhci2_pci.c
-SRCS+= uss820dci.c
-
 .include <bsd.kmod.mk>

==== //depot/projects/usb/src/sys/modules/usb2/core/Makefile#7 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 

==== //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#5 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 
@@ -10,14 +33,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
 SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h
-SRCS+= if_aue2.c
-SRCS+= if_axe2.c
-SRCS+= if_cdce2.c
-SRCS+= if_cue2.c
-SRCS+= if_kue2.c
-SRCS+= if_rue2.c
-SRCS+= if_udav2.c
 SRCS+= usb2_ethernet.c
 
 .include <bsd.kmod.mk>
-

==== //depot/projects/usb/src/sys/modules/usb2/image/Makefile#4 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 
@@ -10,8 +33,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
 SRCS+= opt_usb.h opt_bus.h 
-
 SRCS+= usb2_image.c
-SRCS+= uscanner2.c
 
 .include <bsd.kmod.mk>

==== //depot/projects/usb/src/sys/modules/usb2/input/Makefile#5 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 
@@ -10,10 +33,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
 SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h
-SRCS+= uhid2.c
-SRCS+= ukbd2.c
-SRCS+= ums2.c
 SRCS+= usb2_input.c
 
 .include <bsd.kmod.mk>
-

==== //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#4 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
 
 S=     ${.CURDIR}/../../..
 
@@ -10,9 +33,6 @@
 SRCS= 
 SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h
 SRCS+= opt_usb.h opt_bus.h opt_netgraph.h
-
 SRCS+= usb2_misc.c
-SRCS+= ufm2.c
-SRCS+= udbp2.c
 
 .include <bsd.kmod.mk>

==== //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#4 (text+ko) ====

@@ -1,6 +1,29 @@
 #
 # $FreeBSD$
 #
+# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810251701.m9PH1GKQ089938>