Deleted Added
full compact
if_fe_pccard.c (147256) if_fe_pccard.c (147580)
1/*-
2 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
3 *
4 * This software may be used, modified, copied, distributed, and sold, in
5 * both source and binary form provided that the above copyright, these
6 * terms and the following disclaimer are retained. The name of the author
7 * and/or the contributor may not be used to endorse or promote products
8 * derived from this software without specific prior written permission.

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

17 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20 * SUCH DAMAGE.
21 *
22 */
23
24#include <sys/cdefs.h>
1/*-
2 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
3 *
4 * This software may be used, modified, copied, distributed, and sold, in
5 * both source and binary form provided that the above copyright, these
6 * terms and the following disclaimer are retained. The name of the author
7 * and/or the contributor may not be used to endorse or promote products
8 * derived from this software without specific prior written permission.

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

17 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20 * SUCH DAMAGE.
21 *
22 */
23
24#include <sys/cdefs.h>
25__FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_pccard.c 147256 2005-06-10 16:49:24Z brooks $");
25__FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_pccard.c 147580 2005-06-24 14:36:54Z imp $");
26
27#include <sys/param.h>
28#include <sys/kernel.h>
29#include <sys/socket.h>
30#include <sys/systm.h>
31#include <sys/module.h>
32
33#include <sys/bus.h>

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

62static int fe_pccard_match(device_t);
63
64static const struct fe_pccard_product {
65 struct pccard_product mpp_product;
66 int mpp_flags;
67#define MPP_MBH10302 1
68} fe_pccard_products[] = {
69 /* These need to be first */
26
27#include <sys/param.h>
28#include <sys/kernel.h>
29#include <sys/socket.h>
30#include <sys/systm.h>
31#include <sys/module.h>
32
33#include <sys/bus.h>

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

62static int fe_pccard_match(device_t);
63
64static const struct fe_pccard_product {
65 struct pccard_product mpp_product;
66 int mpp_flags;
67#define MPP_MBH10302 1
68} fe_pccard_products[] = {
69 /* These need to be first */
70 { PCMCIA_CARD(FUJITSU2, FMV_J181, 0), MPP_MBH10302 },
71 { PCMCIA_CARD(FUJITSU2, FMV_J182, 0), 0 },
72 { PCMCIA_CARD(FUJITSU2, FMV_J182A, 0), 0 },
73 { PCMCIA_CARD(FUJITSU2, ITCFJ182A, 0), 0 },
70 { PCMCIA_CARD(FUJITSU2, FMV_J181), MPP_MBH10302 },
71 { PCMCIA_CARD(FUJITSU2, FMV_J182), 0 },
72 { PCMCIA_CARD(FUJITSU2, FMV_J182A), 0 },
73 { PCMCIA_CARD(FUJITSU2, ITCFJ182A), 0 },
74 /* These need to be second */
74 /* These need to be second */
75 { PCMCIA_CARD(TDK, LAK_CD021BX, 0), 0 },
76 { PCMCIA_CARD(TDK, LAK_CF010, 0), 0 },
75 { PCMCIA_CARD(TDK, LAK_CD021BX), 0 },
76 { PCMCIA_CARD(TDK, LAK_CF010), 0 },
77#if 0 /* XXX 86960-based? */
77#if 0 /* XXX 86960-based? */
78 { PCMCIA_CARD(TDK, LAK_DFL9610, 1), 0 },
78 { PCMCIA_CARD(TDK, LAK_DFL9610), 0 },
79#endif
79#endif
80 { PCMCIA_CARD(CONTEC, CNETPC, 0), 0 },
81 { PCMCIA_CARD(FUJITSU, LA501, 0), 0 },
82 { PCMCIA_CARD(FUJITSU, LA10S, 0), 0 },
83 { PCMCIA_CARD(FUJITSU, NE200T, 0), MPP_MBH10302 },/* Sold by Eagle */
84 { PCMCIA_CARD(RATOC, REX_R280, 0), 0 },
80 { PCMCIA_CARD(CONTEC, CNETPC), 0 },
81 { PCMCIA_CARD(FUJITSU, LA501), 0 },
82 { PCMCIA_CARD(FUJITSU, LA10S), 0 },
83 { PCMCIA_CARD(FUJITSU, NE200T), MPP_MBH10302 },/* Sold by Eagle */
84 { PCMCIA_CARD(RATOC, REX_R280), 0 },
85 { { NULL } }
86};
87
88static int
89fe_pccard_match(device_t dev)
90{
91 const struct pccard_product *pp;
92 int error;

--- 218 unchanged lines hidden ---
85 { { NULL } }
86};
87
88static int
89fe_pccard_match(device_t dev)
90{
91 const struct pccard_product *pp;
92 int error;

--- 218 unchanged lines hidden ---