Deleted Added
full compact
kern_conf.c (48936) kern_conf.c (48948)
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.50 1999/07/19 09:37:59 phk Exp $
33 * $Id: kern_conf.c,v 1.51 1999/07/20 09:47:41 phk Exp $
34 */
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/systm.h>
39#include <sys/module.h>
40#include <sys/malloc.h>
41#include <sys/conf.h>

--- 195 unchanged lines hidden (view full) ---

237udev_t
238dev2udev(dev_t x)
239{
240 if (x == NODEV)
241 return NOUDEV;
242 return (x->si_udev);
243}
244
34 */
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/systm.h>
39#include <sys/module.h>
40#include <sys/malloc.h>
41#include <sys/conf.h>

--- 195 unchanged lines hidden (view full) ---

237udev_t
238dev2udev(dev_t x)
239{
240 if (x == NODEV)
241 return NOUDEV;
242 return (x->si_udev);
243}
244
245udev_t
246dev2budev(dev_t x)
247{
248 if (dumpdev == NODEV)
249 return NOUDEV;
250 else
251 return makeudev(devsw(x)->d_bmaj, minor(x));
252}
253
245dev_t
246udev2dev(udev_t x, int b)
247{
248 switch (b) {
249 case 0:
250 return makedev(umajor(x), uminor(x));
251 case 1:
252 return makebdev(umajor(x), uminor(x));

--- 24 unchanged lines hidden ---
254dev_t
255udev2dev(udev_t x, int b)
256{
257 switch (b) {
258 case 0:
259 return makedev(umajor(x), uminor(x));
260 case 1:
261 return makebdev(umajor(x), uminor(x));

--- 24 unchanged lines hidden ---