| kern_conf.c (48557) | kern_conf.c (48859) |
|---|---|
| 1/*- 2 * Parts Copyright (c) 1995 Terrence R. Lambert 3 * Copyright (c) 1995 Julian R. Elischer 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 16 unchanged lines hidden (view full) --- 25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * | 1/*- 2 * Parts Copyright (c) 1995 Terrence R. Lambert 3 * Copyright (c) 1995 Julian R. Elischer 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 16 unchanged lines hidden (view full) --- 25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * |
| 33 * $Id: kern_conf.c,v 1.46 1999/07/03 08:22:30 phk Exp $ | 33 * $Id: kern_conf.c,v 1.47 1999/07/04 14:58:38 phk Exp $ |
| 34 */ 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/module.h> 39#include <sys/conf.h> 40#include <sys/vnode.h> 41 --- 178 unchanged lines hidden (view full) --- 220#else 221 return ((dev_t)(uintptr_t) ((x << 8) | y)); 222#endif 223} 224 225udev_t 226dev2udev(dev_t x) 227{ | 34 */ 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/module.h> 39#include <sys/conf.h> 40#include <sys/vnode.h> 41 --- 178 unchanged lines hidden (view full) --- 220#else 221 return ((dev_t)(uintptr_t) ((x << 8) | y)); 222#endif 223} 224 225udev_t 226dev2udev(dev_t x) 227{ |
| 228 return umakedev(major(x), minor(x)); | 228 return makeudev(major(x), minor(x)); |
| 229} 230 231dev_t 232udev2dev(udev_t x, int b) 233{ 234 return makedev(umajor(x), uminor(x)); 235} 236 --- 5 unchanged lines hidden (view full) --- 242 243int 244umajor(udev_t dev) 245{ 246 return((dev & 0xff00) >> 8); 247} 248 249udev_t | 229} 230 231dev_t 232udev2dev(udev_t x, int b) 233{ 234 return makedev(umajor(x), uminor(x)); 235} 236 --- 5 unchanged lines hidden (view full) --- 242 243int 244umajor(udev_t dev) 245{ 246 return((dev & 0xff00) >> 8); 247} 248 249udev_t |
| 250umakedev(int x, int y) | 250makeudev(int x, int y) |
| 251{ 252 return ((x << 8) | y); 253} 254 | 251{ 252 return ((x << 8) | y); 253} 254 |