Deleted Added
full compact
if_ep_pccard.c (140522) if_ep_pccard.c (140523)
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 140522 2005-01-20 19:37:22Z imp $");
38__FBSDID("$FreeBSD: head/sys/dev/ep/if_ep_pccard.c 140523 2005-01-20 19:39:33Z imp $");
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

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

67 * Initialize the device - called from Slot manager.
68 */
69static int
70ep_pccard_probe(device_t dev)
71{
72 struct ep_softc *sc = device_get_softc(dev);
73 struct ep_board *epb = &sc->epb;
74 const char *desc;
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

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

67 * Initialize the device - called from Slot manager.
68 */
69static int
70ep_pccard_probe(device_t dev)
71{
72 struct ep_softc *sc = device_get_softc(dev);
73 struct ep_board *epb = &sc->epb;
74 const char *desc;
75 u_int16_t result;
75 uint16_t result;
76 int error;
77
78 error = ep_alloc(dev);
79 if (error)
80 return (error);
81
82 /*
83 * It appears that the eeprom comes in two sizes. There's

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

175 return (0);
176 }
177}
178
179static int
180ep_pccard_attach(device_t dev)
181{
182 struct ep_softc *sc = device_get_softc(dev);
76 int error;
77
78 error = ep_alloc(dev);
79 if (error)
80 return (error);
81
82 /*
83 * It appears that the eeprom comes in two sizes. There's

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

175 return (0);
176 }
177}
178
179static int
180ep_pccard_attach(device_t dev)
181{
182 struct ep_softc *sc = device_get_softc(dev);
183 u_int16_t result;
183 uint16_t result;
184 int error = 0;
185
186 if ((error = ep_alloc(dev))) {
187 device_printf(dev, "ep_alloc() failed! (%d)\n", error);
188 goto bad;
189 }
190 sc->epb.cmd_off = 0;
191

--- 120 unchanged lines hidden ---
184 int error = 0;
185
186 if ((error = ep_alloc(dev))) {
187 device_printf(dev, "ep_alloc() failed! (%d)\n", error);
188 goto bad;
189 }
190 sc->epb.cmd_off = 0;
191

--- 120 unchanged lines hidden ---