Deleted Added
full compact
if_ed_pci.c (119418) if_ed_pci.c (119690)
1/*-
2 * Copyright (c) 1996 Stefan Esser <se@freebsd.org>
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

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

13 * documentation and/or other materials provided with the distribution.
14 * 3. Absolutely no warranty of function or purpose is made by the author
15 * Stefan Esser.
16 * 4. Modifications may be freely made to this file if the above conditions
17 * are met.
18 */
19
20#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1996 Stefan Esser <se@freebsd.org>
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

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

13 * documentation and/or other materials provided with the distribution.
14 * 3. Absolutely no warranty of function or purpose is made by the author
15 * Stefan Esser.
16 * 4. Modifications may be freely made to this file if the above conditions
17 * are met.
18 */
19
20#include <sys/cdefs.h>
21__FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_pci.c 119418 2003-08-24 17:55:58Z obrien $");
21__FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_pci.c 119690 2003-09-02 17:30:40Z jhb $");
22
23#include <sys/param.h>
24#include <sys/systm.h>
25#include <sys/socket.h>
26#include <sys/kernel.h>
27
28#include <sys/module.h>
29#include <sys/bus.h>

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

79
80static int
81ed_pci_attach(device_t dev)
82{
83 struct ed_softc *sc = device_get_softc(dev);
84 int flags = 0;
85 int error;
86
22
23#include <sys/param.h>
24#include <sys/systm.h>
25#include <sys/socket.h>
26#include <sys/kernel.h>
27
28#include <sys/module.h>
29#include <sys/bus.h>

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

79
80static int
81ed_pci_attach(device_t dev)
82{
83 struct ed_softc *sc = device_get_softc(dev);
84 int flags = 0;
85 int error;
86
87 error = ed_probe_Novell(dev, PCIR_MAPS, flags);
87 error = ed_probe_Novell(dev, PCIR_BAR(0), flags);
88 if (error)
89 return (error);
90
91 error = ed_alloc_irq(dev, 0, RF_SHAREABLE);
92 if (error) {
93 ed_release_resources(dev);
94 return (error);
95 }

--- 30 unchanged lines hidden ---
88 if (error)
89 return (error);
90
91 error = ed_alloc_irq(dev, 0, RF_SHAREABLE);
92 if (error) {
93 ed_release_resources(dev);
94 return (error);
95 }

--- 30 unchanged lines hidden ---