Deleted Added
full compact
if_fe_pccard.c (150396) if_fe_pccard.c (150458)
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 150396 2005-09-20 19:54:11Z imp $");
25__FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_pccard.c 150458 2005-09-22 05:52: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>

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

49
50#include <dev/pccard/pccardvar.h>
51#include <dev/pccard/pccard_cis.h>
52
53#include "card_if.h"
54#include "pccarddevs.h"
55
56/*
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>

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

49
50#include <dev/pccard/pccardvar.h>
51#include <dev/pccard/pccard_cis.h>
52
53#include "card_if.h"
54#include "pccarddevs.h"
55
56/*
57 * PC-Card (PCMCIA) specific code.
57 * PC Card (PCMCIA) specific code.
58 */
59static int fe_pccard_probe(device_t);
60static int fe_pccard_attach(device_t);
61static int fe_pccard_detach(device_t);
62
63static const struct fe_pccard_product {
64 struct pccard_product mpp_product;
65 int mpp_flags;

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

250
251/*
252 * Probe and initialization for TDK/CONTEC PCMCIA Ethernet interface.
253 * by MASUI Kenji <masui@cs.titech.ac.jp>
254 *
255 * (Contec uses TDK Ethenet chip -- hosokawa)
256 *
257 * This version of fe_probe_tdk has been rewrote to handle
58 */
59static int fe_pccard_probe(device_t);
60static int fe_pccard_attach(device_t);
61static int fe_pccard_detach(device_t);
62
63static const struct fe_pccard_product {
64 struct pccard_product mpp_product;
65 int mpp_flags;

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

250
251/*
252 * Probe and initialization for TDK/CONTEC PCMCIA Ethernet interface.
253 * by MASUI Kenji <masui@cs.titech.ac.jp>
254 *
255 * (Contec uses TDK Ethenet chip -- hosokawa)
256 *
257 * This version of fe_probe_tdk has been rewrote to handle
258 * *generic* PC card implementation of Fujitsu MB8696x family. The
258 * *generic* PC Card implementation of Fujitsu MB8696x family. The
259 * name _tdk is just for a historical reason. :-)
260 */
261static int
262fe_probe_tdk (device_t dev, const struct fe_pccard_product *pp)
263{
264 struct fe_softc *sc = device_get_softc(dev);
265
266 static struct fe_simple_probe_struct probe_table [] = {

--- 31 unchanged lines hidden ---
259 * name _tdk is just for a historical reason. :-)
260 */
261static int
262fe_probe_tdk (device_t dev, const struct fe_pccard_product *pp)
263{
264 struct fe_softc *sc = device_get_softc(dev);
265
266 static struct fe_simple_probe_struct probe_table [] = {

--- 31 unchanged lines hidden ---