diff options
author | gibbs <gibbs@FreeBSD.org> | 1996-02-28 17:19:04 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1996-02-28 17:19:04 +0000 |
commit | b41fe501d795b54c049e23e7d759d90c55642f3f (patch) | |
tree | de86a525c64e3739b71c9ec2117c96a8dc723199 /sys/dev/ep | |
parent | d14fef7819780ab2e4c4f11966e4aa5326b4b22a (diff) | |
download | FreeBSD-src-b41fe501d795b54c049e23e7d759d90c55642f3f.zip FreeBSD-src-b41fe501d795b54c049e23e7d759d90c55642f3f.tar.gz |
Fix media type determination.
Diffstat (limited to 'sys/dev/ep')
-rw-r--r-- | sys/dev/ep/if_ep.c | 9 | ||||
-rw-r--r-- | sys/dev/ep/if_ep_eisa.c | 5 | ||||
-rw-r--r-- | sys/dev/ep/if_epreg.h | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 3cf10c2..4ee4b83 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.41 1996/02/13 15:55:33 gibbs Exp $ + * $Id: if_ep.c,v 1.42 1996/02/26 01:05:34 gibbs Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -425,8 +425,6 @@ ep_isa_attach(is) u_short config; int irq; - printf("ep%d: ", sc->unit); - sc->ep_connectors = 0; config = inw(IS_BASE + EP_W0_CONFIG_CTRL); if (config & IS_AUI) { @@ -440,7 +438,7 @@ ep_isa_attach(is) } if (!(sc->ep_connectors & 7)) printf("no connectors!"); - sc->ep_connector = inw(BASE + EP_W0_ADDRESS_CFG); + sc->ep_connector = inw(BASE + EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; /* * Write IRQ value to board */ @@ -451,7 +449,6 @@ ep_isa_attach(is) return 0; } - printf(" irq %d\n",irq); GO_WINDOW(0); if(irq == 9) irq = 2; @@ -489,7 +486,7 @@ ep_attach(sc) printf("bnc"); } - printf("[*%s*]", ep_conn_type[sc->ep_connector >> ACF_CONNECTOR_BITS]); + printf("[*%s*]", ep_conn_type[sc->ep_connector]); /* * Setup the station address diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c index cb0ea7d..bd1955f 100644 --- a/sys/dev/ep/if_ep_eisa.c +++ b/sys/dev/ep/if_ep_eisa.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id$ + * $Id: 3c5x9.c,v 1.1 1996/02/26 01:01:37 gibbs Exp $ */ #include "eisa.h" @@ -271,7 +271,8 @@ ep_eisa_attach(e_dev) /* * Set the eisa config selected media type */ - sc->ep_connector = inw(eisa_ioport->addr + EISA_BPROM_MEDIA_CONF); + sc->ep_connector = inw(eisa_ioport->addr + EISA_BPROM_MEDIA_CONF) + >> ACF_CONNECTOR_BITS; if(eisa_reg_intr(e_dev, irq, ep_intr, (void *)sc, &net_imask, /*shared ==*/level_intr)) { diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h index 869ae54..aaa8ce5 100644 --- a/sys/dev/ep/if_epreg.h +++ b/sys/dev/ep/if_epreg.h @@ -31,7 +31,7 @@ */ /* - * $Id: if_epreg.h,v 1.11 1996/02/06 18:50:42 wollman Exp $ + * $Id: if_epreg.h,v 1.12 1996/02/26 01:05:36 gibbs Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -62,7 +62,7 @@ struct ep_softc { short rx_avg_pkt; short cur_len; u_short ep_connectors; /* Connectors on this card. */ - u_short ep_connector; /* Configured connector. */ + u_char ep_connector; /* Configured connector. */ int stat; /* some flags */ #define F_RX_FIRST 0x1 #define F_WAIT_TRAIL 0x2 |