Deleted Added
full compact
if_ep_pccard.c (140530) if_ep_pccard.c (147256)
1/*-
2 * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
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

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

30
31/*
32 * Pccard support for 3C589 by:
33 * HAMADA Naoki
34 * nao@tom-yam.or.jp
35 */
36
37#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
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

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

30
31/*
32 * Pccard support for 3C589 by:
33 * HAMADA Naoki
34 * nao@tom-yam.or.jp
35 */
36
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/sys/dev/ep/if_ep_pccard.c 140530 2005-01-20 20:36:59Z imp $");
38__FBSDID("$FreeBSD: head/sys/dev/ep/if_ep_pccard.c 147256 2005-06-10 16:49:24Z brooks $");
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/socket.h>
44#include <sys/module.h>
45#include <sys/bus.h>
46

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

115 }
116 }
117 device_set_desc(dev, desc);
118
119 /*
120 * Newer cards supported by this device need to have their
121 * MAC address set.
122 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/socket.h>
44#include <sys/module.h>
45#include <sys/bus.h>
46

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

115 }
116 }
117 device_set_desc(dev, desc);
118
119 /*
120 * Newer cards supported by this device need to have their
121 * MAC address set.
122 */
123 error = ep_get_macaddr(sc, (u_char *)&sc->arpcom.ac_enaddr);
123 error = ep_get_macaddr(sc, (u_char *)&IFP2ENADDR(sc->ifp));
124
125 ep_free(dev);
126 return (0);
127}
128
129static const char *
130ep_pccard_identify(u_short id)
131{

--- 179 unchanged lines hidden ---
124
125 ep_free(dev);
126 return (0);
127}
128
129static const char *
130ep_pccard_identify(u_short id)
131{

--- 179 unchanged lines hidden ---