Deleted Added
sdiff udiff text old ( 63090 ) new ( 65794 )
full compact
if_ep_pccard.c (63090) if_ep_pccard.c (65794)
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 63090 2000-07-13 22:54:34Z archie $
30 * $FreeBSD: head/sys/dev/ep/if_ep_pccard.c 65794 2000-09-13 03:57:37Z imp $
31 */
32
33/*
34 * Pccard support for 3C589 by:
35 * HAMADA Naoki
36 * nao@tom-yam.or.jp
37 */
38

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

83 * to do this. jyoung@accessus.net 09/11/1999
84 */
85
86 epb->cmd_off = 0;
87 epb->prod_id = get_e(sc, EEPROM_PROD_ID);
88 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
89 if (bootverbose)
90 device_printf(dev, "Pass 1 of 2 detection "
31 */
32
33/*
34 * Pccard support for 3C589 by:
35 * HAMADA Naoki
36 * nao@tom-yam.or.jp
37 */
38

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

83 * to do this. jyoung@accessus.net 09/11/1999
84 */
85
86 epb->cmd_off = 0;
87 epb->prod_id = get_e(sc, EEPROM_PROD_ID);
88 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
89 if (bootverbose)
90 device_printf(dev, "Pass 1 of 2 detection "
91 "failed (nonfatal)\n");
91 "failed (nonfatal) id 0x%x\n", epb->prod_id);
92 epb->cmd_off = 2;
93 epb->prod_id = get_e(sc, EEPROM_PROD_ID);
94 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
95 device_printf(dev, "Unit failed to come ready or "
96 "product ID unknown! (id 0x%x)\n", epb->prod_id);
97 ep_free(dev);
98 return (ENXIO);
99 }

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

122 return ("3Com 3C574B, Megahertz 3CCFE574BT or "
123 "Fast Etherlink 3C574-TX");
124 case 0x2b57: /* 3CXSH572BT */
125 return ("3Com OfficeConnect 572BT");
126 case 0x9058: /* 3C589 */
127 return ("3Com Etherlink III 3C589");
128 case 0x2056: /* 3C562/3C563 */
129 return ("3Com 3C562D/3C563D");
92 epb->cmd_off = 2;
93 epb->prod_id = get_e(sc, EEPROM_PROD_ID);
94 if ((desc = ep_pccard_identify(epb->prod_id)) == NULL) {
95 device_printf(dev, "Unit failed to come ready or "
96 "product ID unknown! (id 0x%x)\n", epb->prod_id);
97 ep_free(dev);
98 return (ENXIO);
99 }

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

122 return ("3Com 3C574B, Megahertz 3CCFE574BT or "
123 "Fast Etherlink 3C574-TX");
124 case 0x2b57: /* 3CXSH572BT */
125 return ("3Com OfficeConnect 572BT");
126 case 0x9058: /* 3C589 */
127 return ("3Com Etherlink III 3C589");
128 case 0x2056: /* 3C562/3C563 */
129 return ("3Com 3C562D/3C563D");
130 case 0x0010: /* 3C1 */
131 return ("3Com Megahertz C1");
130 }
131 return (NULL);
132}
133
134static int
135ep_pccard_card_attach(struct ep_board *epb)
136{
137 /* Determine device type and associated MII capabilities */
138 switch (epb->prod_id) {
139 case 0x6055: /* 3C556 */
140 case 0x2b57: /* 3C572BT */
141 case 0x4057: /* 3C574 */
142 case 0x4b57: /* 3C574B */
132 }
133 return (NULL);
134}
135
136static int
137ep_pccard_card_attach(struct ep_board *epb)
138{
139 /* Determine device type and associated MII capabilities */
140 switch (epb->prod_id) {
141 case 0x6055: /* 3C556 */
142 case 0x2b57: /* 3C572BT */
143 case 0x4057: /* 3C574 */
144 case 0x4b57: /* 3C574B */
145 case 0x0010: /* 3C1 */
143 epb->mii_trans = 1;
144 return (1);
145 case 0x2056: /* 3C562D/3C563D */
146 case 0x9058: /* 3C589 */
147 epb->mii_trans = 0;
148 return (1);
149 }
150 return (0);

--- 105 unchanged lines hidden --- 		146 epb->mii_trans = 1;
147 return (1);
148 case 0x2056: /* 3C562D/3C563D */
149 case 0x9058: /* 3C589 */
150 epb->mii_trans = 0;
151 return (1);
152 }
153 return (0);

--- 105 unchanged lines hidden ---