Deleted Added
full compact
if_ed_isa.c (154391) if_ed_isa.c (154924)
1/*-
2 * Copyright (c) 1995, David Greenman
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

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

22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1995, David Greenman
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

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

22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_isa.c 154391 2006-01-15 04:10:47Z imp $");
30__FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_isa.c 154924 2006-01-27 19:10:13Z imp $");
31
32#include "opt_ed.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/socket.h>
37#include <sys/kernel.h>
38

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

77
78 err = ed_probe_Novell(dev, 0, flags);
79 if (err)
80 return err;
81 ed_Novell_read_mac(sc);
82 /*
83 * Final sanity check for Gateway Ethernet cards before
84 * believing that they really are Gateway AT.
31
32#include "opt_ed.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/socket.h>
37#include <sys/kernel.h>
38

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

77
78 err = ed_probe_Novell(dev, 0, flags);
79 if (err)
80 return err;
81 ed_Novell_read_mac(sc);
82 /*
83 * Final sanity check for Gateway Ethernet cards before
84 * believing that they really are Gateway AT.
85 * XXX I think this is stale.
85 */
86 if ((ED_FLAGS_GETTYPE(flags) == ED_FLAGS_GWETHER) &&
87 (sc->enaddr[2] == 0x86)) {
88 sc->type_str = "Gateway AT";
89 }
90
91 return (0);
92}

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

170
171 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
172 edintr, sc, &sc->irq_handle);
173 if (error) {
174 ed_release_resources(dev);
175 return (error);
176 }
177
86 */
87 if ((ED_FLAGS_GETTYPE(flags) == ED_FLAGS_GWETHER) &&
88 (sc->enaddr[2] == 0x86)) {
89 sc->type_str = "Gateway AT";
90 }
91
92 return (0);
93}

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

171
172 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
173 edintr, sc, &sc->irq_handle);
174 if (error) {
175 ed_release_resources(dev);
176 return (error);
177 }
178
178#ifdef ED_HPP
179 if (sc->vendor == ED_VENDOR_HP && sc->type == ED_TYPE_HP_PCLANPLUS)
180 sc->readmem = ed_hpp_readmem;
181#endif
182 return ed_attach(dev);
183}
184
185static device_method_t ed_isa_methods[] = {
186 /* Device interface */
187 DEVMETHOD(device_probe, ed_isa_probe),
188 DEVMETHOD(device_attach, ed_isa_attach),
189 DEVMETHOD(device_detach, ed_detach),

--- 13 unchanged lines hidden ---
179 return ed_attach(dev);
180}
181
182static device_method_t ed_isa_methods[] = {
183 /* Device interface */
184 DEVMETHOD(device_probe, ed_isa_probe),
185 DEVMETHOD(device_attach, ed_isa_attach),
186 DEVMETHOD(device_detach, ed_detach),

--- 13 unchanged lines hidden ---