Deleted Added
full compact
mly.c (130585) mly.c (143158)
1/*-
2 * Copyright (c) 2000, 2001 Michael Smith
3 * Copyright (c) 2000 BSDi
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:

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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 *
1/*-
2 * Copyright (c) 2000, 2001 Michael Smith
3 * Copyright (c) 2000 BSDi
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:

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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 * $FreeBSD: head/sys/dev/mly/mly.c 130585 2004-06-16 09:47:26Z phk $
27 * $FreeBSD: head/sys/dev/mly/mly.c 143158 2005-03-05 18:10:49Z imp $
28 */
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/conf.h>

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

193
194 for (m = mly_identifiers; m->vendor != 0; m++) {
195 if ((m->vendor == pci_get_vendor(dev)) &&
196 (m->device == pci_get_device(dev)) &&
197 ((m->subvendor == 0) || ((m->subvendor == pci_get_subvendor(dev)) &&
198 (m->subdevice == pci_get_subdevice(dev))))) {
199
200 device_set_desc(dev, m->desc);
28 */
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/conf.h>

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

193
194 for (m = mly_identifiers; m->vendor != 0; m++) {
195 if ((m->vendor == pci_get_vendor(dev)) &&
196 (m->device == pci_get_device(dev)) &&
197 ((m->subvendor == 0) || ((m->subvendor == pci_get_subvendor(dev)) &&
198 (m->subdevice == pci_get_subdevice(dev))))) {
199
200 device_set_desc(dev, m->desc);
201#ifdef MLY_MODULE
202 return(-5);
203#else
204 return(-10); /* allow room to be overridden */
205#endif
201 return(BUS_PROBE_DEFAULT); /* allow room to be overridden */
206 }
207 }
208 return(ENXIO);
209}
210
211/********************************************************************************
212 * Initialise the controller and softc
213 */

--- 2785 unchanged lines hidden ---
202 }
203 }
204 return(ENXIO);
205}
206
207/********************************************************************************
208 * Initialise the controller and softc
209 */

--- 2785 unchanged lines hidden ---