Deleted Added
full compact
ata-card.c (145713) ata-card.c (147580)
1/*-
2 * Copyright (c) 1998 - 2005 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

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

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
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2005 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

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

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
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 145713 2005-04-30 16:22:07Z sos $");
30__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 147580 2005-06-24 14:36:54Z imp $");
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/bus.h>
38#include <sys/malloc.h>

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

47#include <dev/pccard/pccard_cis.h>
48#include <dev/pccard/pccardreg.h>
49#include <dev/pccard/pccardvar.h>
50#include <ata_if.h>
51
52#include "pccarddevs.h"
53
54static const struct pccard_product ata_pccard_products[] = {
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/bus.h>
38#include <sys/malloc.h>

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

47#include <dev/pccard/pccard_cis.h>
48#include <dev/pccard/pccardreg.h>
49#include <dev/pccard/pccardvar.h>
50#include <ata_if.h>
51
52#include "pccarddevs.h"
53
54static const struct pccard_product ata_pccard_products[] = {
55 PCMCIA_CARD(FREECOM, PCCARDIDE, 0),
56 PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0),
57 PCMCIA_CARD(IODATA3, CBIDE2, 0),
58 PCMCIA_CARD(OEM2, CDROM1, 0),
59 PCMCIA_CARD(OEM2, IDE, 0),
60 PCMCIA_CARD(PANASONIC, KXLC005, 0),
61 PCMCIA_CARD(TEAC, IDECARDII, 0),
55 PCMCIA_CARD(FREECOM, PCCARDIDE),
56 PCMCIA_CARD(EXP, EXPMULTIMEDIA),
57 PCMCIA_CARD(IODATA3, CBIDE2),
58 PCMCIA_CARD(OEM2, CDROM1),
59 PCMCIA_CARD(OEM2, IDE),
60 PCMCIA_CARD(PANASONIC, KXLC005),
61 PCMCIA_CARD(TEAC, IDECARDII),
62 {NULL}
63};
64
65static int
66ata_pccard_match(device_t dev)
67{
68 const struct pccard_product *pp;
69 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;

--- 107 unchanged lines hidden ---
62 {NULL}
63};
64
65static int
66ata_pccard_match(device_t dev)
67{
68 const struct pccard_product *pp;
69 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;

--- 107 unchanged lines hidden ---