Deleted Added
full compact
if_sn_pccard.c (147256) if_sn_pccard.c (147580)
1/*-
2 * Copyright (c) 1999 M. Warner Losh <imp@village.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

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

25/*
26 * Modifications for Megahertz X-Jack Ethernet Card (XJ-10BT)
27 *
28 * Copyright (c) 1996 by Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
29 * BSD-nomads, Tokyo, Japan.
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999 M. Warner Losh <imp@village.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

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

25/*
26 * Modifications for Megahertz X-Jack Ethernet Card (XJ-10BT)
27 *
28 * Copyright (c) 1996 by Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
29 * BSD-nomads, Tokyo, Japan.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/sn/if_sn_pccard.c 147256 2005-06-10 16:49:24Z brooks $");
33__FBSDID("$FreeBSD: head/sys/dev/sn/if_sn_pccard.c 147580 2005-06-24 14:36:54Z imp $");
34
35#include <sys/param.h>
36#include <sys/bus.h>
37#include <sys/kernel.h>
38#include <sys/module.h>
39#include <sys/socket.h>
40#include <sys/systm.h>
41

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

48#include <dev/pccard/pccardvar.h>
49#include <dev/pccard/pccard_cis.h>
50#include <dev/sn/if_snvar.h>
51
52#include "card_if.h"
53#include "pccarddevs.h"
54
55static const struct pccard_product sn_pccard_products[] = {
34
35#include <sys/param.h>
36#include <sys/bus.h>
37#include <sys/kernel.h>
38#include <sys/module.h>
39#include <sys/socket.h>
40#include <sys/systm.h>
41

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

48#include <dev/pccard/pccardvar.h>
49#include <dev/pccard/pccard_cis.h>
50#include <dev/sn/if_snvar.h>
51
52#include "card_if.h"
53#include "pccarddevs.h"
54
55static const struct pccard_product sn_pccard_products[] = {
56 PCMCIA_CARD(DSPSI, XJACK, 0),
57 PCMCIA_CARD(NEWMEDIA, BASICS, 0),
56 PCMCIA_CARD(DSPSI, XJACK),
57 PCMCIA_CARD(NEWMEDIA, BASICS),
58#if 0
58#if 0
59 PCMCIA_CARD(SMC, 8020BT, 0),
59 PCMCIA_CARD(SMC, 8020BT),
60#endif
61 { NULL }
62};
63
64static int
65sn_pccard_match(device_t dev)
66{
67 const struct pccard_product *pp;

--- 113 unchanged lines hidden ---
60#endif
61 { NULL }
62};
63
64static int
65sn_pccard_match(device_t dev)
66{
67 const struct pccard_product *pp;

--- 113 unchanged lines hidden ---