Deleted Added
full compact
ata-card.c (114947) ata-card.c (115756)
1/*-
2 * Copyright (c) 1998 - 2003 S�ren Schmidt <sos@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

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

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1998 - 2003 S�ren Schmidt <sos@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

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

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/dev/ata/ata-card.c 114947 2003-05-12 15:26:05Z phk $
28 * $FreeBSD: head/sys/dev/ata/ata-card.c 115756 2003-06-03 01:30:55Z imp $
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/bus.h>

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

45#include <dev/pccard/pccarddevs.h>
46
47static const struct pccard_product ata_pccard_products[] = {
48 /* NetBSD has a few others that need to migrate into pccarddevs */
49 /* XXX */
50 PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0),
51 PCMCIA_CARD(IODATA, CBIDE2, 0),
52 PCMCIA_CARD(OEM2, CDROM1, 0),
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/bus.h>

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

45#include <dev/pccard/pccarddevs.h>
46
47static const struct pccard_product ata_pccard_products[] = {
48 /* NetBSD has a few others that need to migrate into pccarddevs */
49 /* XXX */
50 PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0),
51 PCMCIA_CARD(IODATA, CBIDE2, 0),
52 PCMCIA_CARD(OEM2, CDROM1, 0),
53 PCMCIA_CARD(OEM2, IDE, 0),
53 PCMCIA_CARD(PANASONIC, KXLC005, 0),
54 PCMCIA_CARD(TEAC, IDECARDII, 0),
55 {NULL}
56};
57
58static int
59ata_pccard_match(device_t dev)
60{

--- 138 unchanged lines hidden ---
54 PCMCIA_CARD(PANASONIC, KXLC005, 0),
55 PCMCIA_CARD(TEAC, IDECARDII, 0),
56 {NULL}
57};
58
59static int
60ata_pccard_match(device_t dev)
61{

--- 138 unchanged lines hidden ---