Deleted Added
full compact
if_ep_pccard.c (55702) if_ep_pccard.c (56017)
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

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

22 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 *
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

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

22 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 *
30 * $FreeBSD: head/sys/dev/ep/if_ep_pccard.c 55702 2000-01-10 02:32:43Z imp $
30 * $FreeBSD: head/sys/dev/ep/if_ep_pccard.c 56017 2000-01-15 05:21:43Z mdodd $
31 */
32
33/*
34 * Pccard support for 3C589 by:
35 * HAMADA Naoki
36 * nao@tom-yam.or.jp
37 */
38

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

93 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
94 device_printf(dev, "Unit failed to come ready or "
95 "product ID unknown! (id 0x%x)\n", epb->prod_id);
96 ep_free(dev);
97 return (ENXIO);
98 }
99 }
100 device_set_desc(dev, desc);
31 */
32
33/*
34 * Pccard support for 3C589 by:
35 * HAMADA Naoki
36 * nao@tom-yam.or.jp
37 */
38

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

93 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
94 device_printf(dev, "Unit failed to come ready or "
95 "product ID unknown! (id 0x%x)\n", epb->prod_id);
96 ep_free(dev);
97 return (ENXIO);
98 }
99 }
100 device_set_desc(dev, desc);
101
102 /*
103 * For some reason the 3c574 needs this.
104 */
105 ep_get_macaddr(sc, (u_char *)&sc->arpcom.ac_enaddr);
106
101 ep_free(dev);
102 return (0);
103}
104
105static const char *
106ep_pccard_identify(u_short id)
107{
108 /* Determine device type and associated MII capabilities */

--- 141 unchanged lines hidden ---
107 ep_free(dev);
108 return (0);
109}
110
111static const char *
112ep_pccard_identify(u_short id)
113{
114 /* Determine device type and associated MII capabilities */

--- 141 unchanged lines hidden ---