PERFORCE change 105350 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Aug 30 19:41:45 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=105350
Change 105350 by hselasky at hselasky_mini_itx on 2006/08/30 19:41:34
Remove "usb_ethersubr.[ch]", hence these routines
are not used any more. Fix compilation of the "usb"
module. Update "conf/files".
Affected files ...
.. //depot/projects/usb/src/sys/conf/files#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.c#5 delete
.. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.h#4 delete
.. //depot/projects/usb/src/sys/modules/usb/Makefile#2 edit
Differences ...
==== //depot/projects/usb/src/sys/conf/files#6 (text+ko) ====
@@ -985,7 +985,6 @@
dev/usb/usb_requests.c optional usb
dev/usb/usb_subr.c optional usb
dev/usb/usb_transfer.c optional usb
-dev/usb/usb_ethersubr.c optional usb
dev/usb/usb_if.m optional usb
dev/usb/usb_quirks.c optional usb
dev/usb/usb_hid.c optional usb
@@ -994,8 +993,6 @@
dev/usb/ulpt.c optional ulpt
dev/usb/ums.c optional ums
dev/usb/ukbd.c optional ukbd
-#
-# USB support (not merged)
dev/usb/if_aue.c optional aue
dev/usb/if_axe.c optional axe
dev/usb/if_cdce.c optional cdce
@@ -1004,6 +1001,9 @@
dev/usb/if_ural.c optional ural
dev/usb/if_rue.c optional rue
dev/usb/if_udav.c optional udav
+dev/usb/ufm.c optional ufm
+#
+# USB support (not merged)
dev/usb/sl811hs.c optional slhci
dev/usb/slhci_pccard.c optional slhci pccard
dev/usb/ubsa.c optional ubsa ucom
@@ -1012,7 +1012,6 @@
dev/usb/ucycom.c optional ucycom ucom
dev/usb/udbp.c optional udbp
dev/usb/ufoma.c optional ufoma ucom
-dev/usb/ufm.c optional ufm
dev/usb/uftdi.c optional uftdi ucom
dev/usb/uhid.c optional uhid
dev/usb/umass.c optional umass
==== //depot/projects/usb/src/sys/modules/usb/Makefile#2 (text+ko) ====
@@ -5,23 +5,21 @@
.PATH: $S/dev/usb $S/pci
KMOD= usb
-SRCS= bus_if.h device_if.h usb_if.h usb_if.c \
+SRCS= bus_if.h device_if.h usb_if.h usb_if.c vnode_if.h \
opt_usb.h \
- hid.c hid.h usbhid.h \
uhub.c \
- usb.c usb.h \
- usb_mem.c usb_mem.h \
- usb_port.h \
+ usbdevs.h usbdevs_data.h \
+ usb.c usb.h usb_port.h \
+ usb_cdev.c \
+ usb_hid.c usb_hid.h \
usb_quirks.c usb_quirks.h \
- usb_subr.c \
- usbdevs.h usbdevs_data.h \
- usbdi.c usbdi.h usbdivar.h \
- usbdi_util.c usbdi_util.h \
- usb_ethersubr.c usbdevs.h
+ usb_requests.c \
+ usb_subr.c usb_subr.h \
+ usb_transfer.c \
-SRCS+= uhci_pci.c uhci.c uhcireg.h uhcivar.h
-SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
-SRCS+= ehci_pci.c ehci.c ehcireg.h ehcivar.h
+SRCS+= uhci_pci.c uhci.c uhci.h
+SRCS+= ohci_pci.c ohci.c ohci.h
+SRCS+= ehci_pci.c ehci.c ehci.h
SRCS+= opt_bus.h pci_if.h
.include <bsd.kmod.mk>
More information about the p4-projects
mailing list