diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 14 | ||||
| -rw-r--r-- | sys/conf/NOTES | 35 | ||||
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.h | 53 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 14 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 35 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 35 |
7 files changed, 80 insertions, 108 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6e35515..ccbd054 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.169 1999/05/09 16:45:52 phk Exp $ +# $Id: GENERIC,v 1.170 1999/05/14 03:57:23 obrien Exp $ machine i386 cpu I386_CPU @@ -211,13 +211,9 @@ options SYSVSEM #controller ohci0 #controller usb0 # -# for the moment we have to specify the priorities of the device -# drivers explicitly by the ordering in the list below. This will -# be changed in the future. -# -#controller umass0 -#device ums0 +#device ugen0 +#device uhid0 #device ukbd0 #device ulpt0 -#device uhid0 -#device ugen0 +#controller umass0 +#device ums0 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3863d79..a0eb435 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.599 1999/05/18 12:55:11 roger Exp $ +# $Id: LINT,v 1.600 1999/05/20 10:08:37 hm Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2114,33 +2114,34 @@ controller ohci0 # General USB code (mandatory for USB) controller usb0 # -# for the moment we have to specify the priorities of the device -# drivers explicitly by the ordering in the list below. This will -# be changed in the future. -# -# USB Iomega Zip 100 Drive -controller umass0 -# USB mouse -device ums0 +# Generic USB device driver +device ugen0 +# Human Interface Device (anything with buttons and dials) +device uhid0 # USB keyboard device ukbd0 # USB printer device ulpt0 -# Human Interface Device (anything with buttons and dials) -device uhid0 -# Generic USB device driver -device ugen0 +# USB Iomega Zip 100 Drive +controller umass0 +# USB mouse +device ums0 +# + +# debugging options for the USB subsystem # options UHCI_DEBUG options OHCI_DEBUG options USB_DEBUG + +options UGEN_DEBUG +options UHID_DEBUG options UHUB_DEBUG -options UMS_DEBUG options UKBD_DEBUG -options UMASS_DEBUG -options UHID_DEBUG -options UGEN_DEBUG options ULPT_DEBUG +options UMASS_DEBUG +options UMS_DEBUG + # # Embedded system options: # diff --git a/sys/conf/files b/sys/conf/files index 70db9c6..f76e6f5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -705,8 +705,6 @@ dev/usb/usbdi_util.c optional usb device-driver dev/usb/usb_subr.c optional usb device-driver dev/usb/usb_quirks.c optional usb device-driver dev/usb/hid.c optional usb device-driver -# ordering in the list of drivers below is important and should -# be the inverse of the wanted one (MAKE_SET) dev/usb/ugen.c optional ugen device-driver dev/usb/uhid.c optional uhid device-driver dev/usb/ums.c optional ums device-driver diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 7a41f8b..9db866b 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -288,45 +288,24 @@ struct usb_attach_arg { #elif defined(__FreeBSD__) /* FreeBSD needs values less than zero */ -/* for the moment disabled -#define UMATCH_VENDOR_PRODUCT_REV -14 -#define UMATCH_VENDOR_PRODUCT -13 -#define UMATCH_VENDOR_DEVCLASS_DEVPROTO -12 -#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO -11 -#define UMATCH_DEVCLASS_DEVSUBCLASS -10 -#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE -9 -#define UMATCH_VENDOR_PRODUCT_CONF_IFACE -8 -#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO -7 -#define UMATCH_VENDOR_IFACESUBCLASS -6 -#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO -5 -#define UMATCH_IFACECLASS_IFACESUBCLASS -4 -#define UMATCH_IFACECLASS -3 -#define UMATCH_IFACECLASS_GENERIC -2 -#define UMATCH_GENERIC -1 -#define UMATCH_NONE ENXIO - -* For the moment we use Yes/No answers with appropriate -* sorting in the config file -*/ -#define UMATCH_VENDOR_PRODUCT_REV 0 -#define UMATCH_VENDOR_PRODUCT 0 -#define UMATCH_VENDOR_DEVCLASS_DEVPROTO 0 -#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO 0 -#define UMATCH_DEVCLASS_DEVSUBCLASS 0 -#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE 0 -#define UMATCH_VENDOR_PRODUCT_CONF_IFACE 0 -#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO 0 -#define UMATCH_VENDOR_IFACESUBCLASS 0 -#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO 0 -#define UMATCH_IFACECLASS_IFACESUBCLASS 0 -#define UMATCH_IFACECLASS 0 -#define UMATCH_IFACECLASS_GENERIC 0 -#define UMATCH_GENERIC 0 -#define UMATCH_NONE ENXIO - - +#define UMATCH_VENDOR_PRODUCT_REV (-10) +#define UMATCH_VENDOR_PRODUCT (-20) +#define UMATCH_VENDOR_DEVCLASS_DEVPROTO (-30) +#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO (-40) +#define UMATCH_DEVCLASS_DEVSUBCLASS (-50) +#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE (-60) +#define UMATCH_VENDOR_PRODUCT_CONF_IFACE (-70) +#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO (-80) +#define UMATCH_VENDOR_IFACESUBCLASS (-90) +#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO (-100) +#define UMATCH_IFACECLASS_IFACESUBCLASS (-110) +#define UMATCH_IFACECLASS (-120) +#define UMATCH_IFACECLASS_GENERIC (-130) +#define UMATCH_GENERIC (-140) +#define UMATCH_NONE (ENXIO) #endif + void usbd_devinfo __P((usbd_device_handle, int, char *)); struct usbd_quirks *usbd_get_quirks __P((usbd_device_handle)); void usbd_set_disco __P((usbd_pipe_handle, void (*)(void *), void *)); diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 6e35515..ccbd054 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.169 1999/05/09 16:45:52 phk Exp $ +# $Id: GENERIC,v 1.170 1999/05/14 03:57:23 obrien Exp $ machine i386 cpu I386_CPU @@ -211,13 +211,9 @@ options SYSVSEM #controller ohci0 #controller usb0 # -# for the moment we have to specify the priorities of the device -# drivers explicitly by the ordering in the list below. This will -# be changed in the future. -# -#controller umass0 -#device ums0 +#device ugen0 +#device uhid0 #device ukbd0 #device ulpt0 -#device uhid0 -#device ugen0 +#controller umass0 +#device ums0 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 3863d79..a0eb435 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.599 1999/05/18 12:55:11 roger Exp $ +# $Id: LINT,v 1.600 1999/05/20 10:08:37 hm Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2114,33 +2114,34 @@ controller ohci0 # General USB code (mandatory for USB) controller usb0 # -# for the moment we have to specify the priorities of the device -# drivers explicitly by the ordering in the list below. This will -# be changed in the future. -# -# USB Iomega Zip 100 Drive -controller umass0 -# USB mouse -device ums0 +# Generic USB device driver +device ugen0 +# Human Interface Device (anything with buttons and dials) +device uhid0 # USB keyboard device ukbd0 # USB printer device ulpt0 -# Human Interface Device (anything with buttons and dials) -device uhid0 -# Generic USB device driver -device ugen0 +# USB Iomega Zip 100 Drive +controller umass0 +# USB mouse +device ums0 +# + +# debugging options for the USB subsystem # options UHCI_DEBUG options OHCI_DEBUG options USB_DEBUG + +options UGEN_DEBUG +options UHID_DEBUG options UHUB_DEBUG -options UMS_DEBUG options UKBD_DEBUG -options UMASS_DEBUG -options UHID_DEBUG -options UGEN_DEBUG options ULPT_DEBUG +options UMASS_DEBUG +options UMS_DEBUG + # # Embedded system options: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 3863d79..a0eb435 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.599 1999/05/18 12:55:11 roger Exp $ +# $Id: LINT,v 1.600 1999/05/20 10:08:37 hm Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2114,33 +2114,34 @@ controller ohci0 # General USB code (mandatory for USB) controller usb0 # -# for the moment we have to specify the priorities of the device -# drivers explicitly by the ordering in the list below. This will -# be changed in the future. -# -# USB Iomega Zip 100 Drive -controller umass0 -# USB mouse -device ums0 +# Generic USB device driver +device ugen0 +# Human Interface Device (anything with buttons and dials) +device uhid0 # USB keyboard device ukbd0 # USB printer device ulpt0 -# Human Interface Device (anything with buttons and dials) -device uhid0 -# Generic USB device driver -device ugen0 +# USB Iomega Zip 100 Drive +controller umass0 +# USB mouse +device ums0 +# + +# debugging options for the USB subsystem # options UHCI_DEBUG options OHCI_DEBUG options USB_DEBUG + +options UGEN_DEBUG +options UHID_DEBUG options UHUB_DEBUG -options UMS_DEBUG options UKBD_DEBUG -options UMASS_DEBUG -options UHID_DEBUG -options UGEN_DEBUG options ULPT_DEBUG +options UMASS_DEBUG +options UMS_DEBUG + # # Embedded system options: # |
