Deleted Added
sdiff udiff text old ( 141557 ) new ( 141586 )
full compact
if_ed_isa.c (141557) if_ed_isa.c (141586)
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 141557 2005-02-09 05:55:54Z imp $");
30__FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_isa.c 141586 2005-02-09 20:03:40Z imp $");
31
31
32#include "opt_ed.h"
33
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/socket.h>
35#include <sys/kernel.h>
36
37#include <sys/module.h>
38#include <sys/bus.h>
39#include <machine/bus.h>

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

84
85 /* Heuristic probes */
86
87 error = ed_probe_WD80x3(dev, 0, flags);
88 if (error == 0)
89 goto end;
90 ed_release_resources(dev);
91
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/socket.h>
37#include <sys/kernel.h>
38
39#include <sys/module.h>
40#include <sys/bus.h>
41#include <machine/bus.h>

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

86
87 /* Heuristic probes */
88
89 error = ed_probe_WD80x3(dev, 0, flags);
90 if (error == 0)
91 goto end;
92 ed_release_resources(dev);
93
94#ifdef ED_3C503
92 error = ed_probe_3Com(dev, 0, flags);
93 if (error == 0)
94 goto end;
95 ed_release_resources(dev);
95 error = ed_probe_3Com(dev, 0, flags);
96 if (error == 0)
97 goto end;
98 ed_release_resources(dev);
99#endif
96
100
101#ifdef ED_SIC
97 error = ed_probe_SIC(dev, 0, flags);
98 if (error == 0)
99 goto end;
100 ed_release_resources(dev);
102 error = ed_probe_SIC(dev, 0, flags);
103 if (error == 0)
104 goto end;
105 ed_release_resources(dev);
101
106#endif
102 error = ed_probe_Novell(dev, 0, flags);
103 if (error == 0)
104 goto end;
105 ed_release_resources(dev);
106
107 error = ed_probe_Novell(dev, 0, flags);
108 if (error == 0)
109 goto end;
110 ed_release_resources(dev);
111
112#ifdef ED_HPP
107 error = ed_probe_HP_pclanp(dev, 0, flags);
108 if (error == 0)
109 goto end;
110 ed_release_resources(dev);
113 error = ed_probe_HP_pclanp(dev, 0, flags);
114 if (error == 0)
115 goto end;
116 ed_release_resources(dev);
111
117#endif
112end:
113 if (error == 0)
114 error = ed_alloc_irq(dev, 0, 0);
115
116 ed_release_resources(dev);
117 return (error);
118}
119

--- 42 unchanged lines hidden --- 		118end:
119 if (error == 0)
120 error = ed_alloc_irq(dev, 0, 0);
121
122 ed_release_resources(dev);
123 return (error);
124}
125

--- 42 unchanged lines hidden ---