Deleted Added
full compact
isa_common.c (62059) isa_common.c (62987)
1/*-
2 * Copyright (c) 1999 Doug Rabson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1999 Doug Rabson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/isa/isa_common.c 62059 2000-06-25 09:19:02Z dfr $
26 * $FreeBSD: head/sys/isa/isa_common.c 62987 2000-07-12 00:42:08Z jhb $
27 */
28/*
29 * Modifications for Intel architecture by Garrett A. Wollman.
30 * Copyright 1998 Massachusetts Institute of Technology
31 *
32 * Permission to use, copy, modify, and distribute this software and
33 * its documentation for any purpose and without fee is hereby
34 * granted, provided that both the above copyright notice and this

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

71#include <machine/resource.h>
72
73#include <isa/isavar.h>
74#include <isa/isa_common.h>
75#ifdef __alpha__ /* XXX workaround a stupid warning */
76#include <alpha/isa/isavar.h>
77#endif
78
27 */
28/*
29 * Modifications for Intel architecture by Garrett A. Wollman.
30 * Copyright 1998 Massachusetts Institute of Technology
31 *
32 * Permission to use, copy, modify, and distribute this software and
33 * its documentation for any purpose and without fee is hereby
34 * granted, provided that both the above copyright notice and this

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

71#include <machine/resource.h>
72
73#include <isa/isavar.h>
74#include <isa/isa_common.h>
75#ifdef __alpha__ /* XXX workaround a stupid warning */
76#include <alpha/isa/isavar.h>
77#endif
78
79static int isa_print_child(device_t bus, device_t dev);
80
79MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device");
80
81static devclass_t isa_devclass;
82static int isa_running;
83
84/*
85 * At 'probe' time, we add all the devices which we know about to the
86 * bus. The generic attach routine will probe and attach them if they

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

406 &config, 1);
407 return 1;
408 }
409 }
410
411 /*
412 * Disable the device.
413 */
81MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device");
82
83static devclass_t isa_devclass;
84static int isa_running;
85
86/*
87 * At 'probe' time, we add all the devices which we know about to the
88 * bus. The generic attach routine will probe and attach them if they

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

408 &config, 1);
409 return 1;
410 }
411 }
412
413 /*
414 * Disable the device.
415 */
414 if (device_get_desc(child))
415 device_printf(child, "<%s> can't assign resources\n",
416 device_get_desc(child));
417 else
418 device_printf(child, "can't assign resources\n");
416 bus_print_child_header(device_get_parent(child), child);
417 printf(" can't assign resources\n");
418 if (bootverbose)
419 isa_print_child(device_get_parent(child), child);
419 bzero(&config, sizeof config);
420 if (idev->id_config_cb)
421 idev->id_config_cb(idev->id_config_arg, &config, 0);
422 device_disable(child);
423
424 return 0;
425}
426

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

600 retval += bus_print_child_footer(bus, dev);
601
602 return (retval);
603}
604
605static void
606isa_probe_nomatch(device_t dev, device_t child)
607{
420 bzero(&config, sizeof config);
421 if (idev->id_config_cb)
422 idev->id_config_cb(idev->id_config_arg, &config, 0);
423 device_disable(child);
424
425 return 0;
426}
427

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

601 retval += bus_print_child_footer(bus, dev);
602
603 return (retval);
604}
605
606static void
607isa_probe_nomatch(device_t dev, device_t child)
608{
608 device_printf(dev, "<%s> found",
609 pnp_eisaformat(isa_get_logicalid(child)));
610 if (bootverbose)
609 if (bootverbose) {
610 bus_print_child_header(dev, child);
611 printf(" failed to probe");
611 isa_print_all_resources(child);
612 isa_print_all_resources(child);
612 printf("\n");
613 bus_print_child_footer(dev, child);
614 }
613
614 return;
615}
616
617static int
618isa_read_ivar(device_t bus, device_t dev, int index, uintptr_t * result)
619{
620 struct isa_device* idev = DEVTOISA(dev);

--- 423 unchanged lines hidden ---
615
616 return;
617}
618
619static int
620isa_read_ivar(device_t bus, device_t dev, int index, uintptr_t * result)
621{
622 struct isa_device* idev = DEVTOISA(dev);

--- 423 unchanged lines hidden ---