diff options
| -rw-r--r-- | etc/MAKEDEV | 12 | ||||
| -rw-r--r-- | etc/etc.i386/MAKEDEV | 12 | ||||
| -rw-r--r-- | sys/conf/majors | 3 | ||||
| -rw-r--r-- | sys/dev/usb/ums.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.c | 4 | ||||
| -rw-r--r-- | sys/i386/conf/majors.i386 | 3 |
6 files changed, 30 insertions, 8 deletions
diff --git a/etc/MAKEDEV b/etc/MAKEDEV index 1585b67..4f445d1 100644 --- a/etc/MAKEDEV +++ b/etc/MAKEDEV @@ -113,7 +113,7 @@ # pci PCI configuration-space access from user mode # ipl ipfilter control devices (ipl, ipnat, ipstate, ipauth) # -# $Id: MAKEDEV,v 1.177 1998/11/12 22:45:24 nsouch Exp $ +# $Id: MAKEDEV,v 1.178 1998/11/12 22:48:16 nsouch Exp $ # PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH @@ -753,6 +753,16 @@ ppi*) mknod ppi$unit c 82 $unit ;; +usb*) + unit=`expr $i : 'usb\(.*\)'` + mknod usb$unit c 108 $unit + ;; + +ums*) + unit=`expr $i : 'ums\(.*\)'` + mknod ums$unit c 111 $unit + ;; + lpt*) unit=`expr $i : 'lpt\(.*\)'` mknod lpt$unit c 16 $unit diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV index 1585b67..4f445d1 100644 --- a/etc/etc.i386/MAKEDEV +++ b/etc/etc.i386/MAKEDEV @@ -113,7 +113,7 @@ # pci PCI configuration-space access from user mode # ipl ipfilter control devices (ipl, ipnat, ipstate, ipauth) # -# $Id: MAKEDEV,v 1.177 1998/11/12 22:45:24 nsouch Exp $ +# $Id: MAKEDEV,v 1.178 1998/11/12 22:48:16 nsouch Exp $ # PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH @@ -753,6 +753,16 @@ ppi*) mknod ppi$unit c 82 $unit ;; +usb*) + unit=`expr $i : 'usb\(.*\)'` + mknod usb$unit c 108 $unit + ;; + +ums*) + unit=`expr $i : 'ums\(.*\)'` + mknod ums$unit c 111 $unit + ;; + lpt*) unit=`expr $i : 'lpt\(.*\)'` mknod lpt$unit c 16 $unit diff --git a/sys/conf/majors b/sys/conf/majors index 8ee7e7d..c2e0b46 100644 --- a/sys/conf/majors +++ b/sys/conf/majors @@ -1,4 +1,4 @@ -$Id: majors.i386,v 1.57 1998/12/27 14:00:10 sos Exp $ +$Id: majors.i386,v 1.58 1998/12/29 00:04:48 jkh Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -155,5 +155,6 @@ chrdev name comments 108 usb Universal Serial Bus (nick.hibma@jrc.it) 109 id Intelligent Disk [Array] (md@doc.ic.ac.uk) 110 ses SCSI Environmental Services driver (mjacob@feral.com) +111 ums USB Mouse (nick.hibma@jrc.it) 200 ?? entries from 200-255 are reserved for local use 255 ?? entries from 200-255 are reserved for local use diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 0824d40..19aee47 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,5 +1,5 @@ /* $NetBSD: ums.c,v 1.8 1998/08/01 20:11:39 augustss Exp $ */ -/* FreeBSD $Id$ */ +/* FreeBSD $Id: ums.c,v 1.3 1998/12/14 09:32:24 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -158,7 +158,7 @@ static d_read_t ums_read; static d_ioctl_t ums_ioctl; static d_poll_t ums_poll; -#define UMS_CDEV_MAJOR 138 /* XXX NWH should be requested */ +#define UMS_CDEV_MAJOR 111 static struct cdevsw ums_cdevsw = { ums_open, ums_close, ums_read, nowrite, diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 5285c62..f91893a 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,5 +1,5 @@ /* $NetBSD: usbdi.c,v 1.9 1998/08/02 22:30:53 augustss Exp $ */ -/* FreeBSD $Id$ */ +/* FreeBSD $Id: usbdi.c,v 1.3 1998/12/14 09:32:24 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ void usbd_do_request_async_cb static SIMPLEQ_HEAD(, usbd_request) usbd_free_requests; #if defined(__FreeBSD__) -#define USB_CDEV_MAJOR 79 +#define USB_CDEV_MAJOR 110 extern struct cdevsw usb_cdevsw; #endif diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386 index 8ee7e7d..c2e0b46 100644 --- a/sys/i386/conf/majors.i386 +++ b/sys/i386/conf/majors.i386 @@ -1,4 +1,4 @@ -$Id: majors.i386,v 1.57 1998/12/27 14:00:10 sos Exp $ +$Id: majors.i386,v 1.58 1998/12/29 00:04:48 jkh Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -155,5 +155,6 @@ chrdev name comments 108 usb Universal Serial Bus (nick.hibma@jrc.it) 109 id Intelligent Disk [Array] (md@doc.ic.ac.uk) 110 ses SCSI Environmental Services driver (mjacob@feral.com) +111 ums USB Mouse (nick.hibma@jrc.it) 200 ?? entries from 200-255 are reserved for local use 255 ?? entries from 200-255 are reserved for local use |
