Deleted Added
sdiff udiff text old ( 53450 ) new ( 64777 )
full compact
if_ed_pci.c (53450) if_ed_pci.c (64777)
1/*
2 *
3 * Copyright (c) 1996 Stefan Esser <se@freebsd.org>
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:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice immediately at the beginning of the file, without modification,
11 * this list of conditions, and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. Absolutely no warranty of function or purpose is made by the author
16 * Stefan Esser.
17 * 4. Modifications may be freely made to this file if the above conditions
18 * are met.
19 *
1/*
2 *
3 * Copyright (c) 1996 Stefan Esser <se@freebsd.org>
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:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice immediately at the beginning of the file, without modification,
11 * this list of conditions, and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. Absolutely no warranty of function or purpose is made by the author
16 * Stefan Esser.
17 * 4. Modifications may be freely made to this file if the above conditions
18 * are met.
19 *
20 * $FreeBSD: head/sys/dev/ed/if_ed_pci.c 53450 1999-11-20 09:28:01Z mdodd $
20 * $FreeBSD: head/sys/dev/ed/if_ed_pci.c 64777 2000-08-17 12:15:45Z nyan $
21 */
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>

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

75 } else {
76 return ENXIO;
77 }
78}
79
80static int
81ed_pci_attach(device_t dev)
82{
21 */
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>

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

75 } else {
76 return ENXIO;
77 }
78}
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;
83 struct ed_softc *sc = device_get_softc(dev);
84 int flags = 0;
85 int error;
86
86
87 error = ed_probe_Novell_generic(dev, PCIR_MAPS, flags);
87 error = ed_probe_Novell(dev, PCIR_MAPS, 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 ---