mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

Fixed attach printfs for new format (thanks Chris)

Browse Source
This commit is contained in:
Paul Richards 1993-07-21 06:07:58 +00:00
parent d55523f96b
commit 31e73a990a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=175
1 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sys/i386/isa/if_is.c
View File

@ -206,10 +206,6 @@ int is_attach(isa_dev)
if_attach(ifp); if_attach(ifp);
#if NBPFILTER > 0
bpfattach(&is->bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
/* /*
* Search down the ifa address list looking for the AF_LINK type * Search down the ifa address list looking for the AF_LINK type
entry entry
@ -234,7 +230,12 @@ entry
bcopy(is->arpcom.ac_enaddr, LLADDR(sdl), ETHER_ADDR_LEN); bcopy(is->arpcom.ac_enaddr, LLADDR(sdl), ETHER_ADDR_LEN);
} }
printf (" ethernet address %s", ether_sprintf(is->arpcom.ac_enaddr)) ; printf ("is%d: address %s\n", unit,
ether_sprintf(is->arpcom.ac_enaddr)) ;
#if NBPFILTER > 0
bpfattach(&is->bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
} }
int int
@ -366,7 +367,7 @@ is_init(unit)
is_start(ifp); is_start(ifp);
} }
else else
printf("Isolink card failed to initialise\n"); printf("is%d: card failed to initialise\n", unit);
(void) splx(s); (void) splx(s);
} }
@ -518,29 +519,29 @@ isintr(unit)
while((isr=isrdcsr(unit,0))&INTR) { while((isr=isrdcsr(unit,0))&INTR) {
if (isr&ERR) { if (isr&ERR) {
if (isr&BABL){ if (isr&BABL){
printf("is%d:BABL\n",unit); printf("is%d: BABL\n",unit);
is->arpcom.ac_if.if_oerrors++; is->arpcom.ac_if.if_oerrors++;
} }
if (isr&CERR) { if (isr&CERR) {
printf("is%d:CERR\n",unit); printf("is%d: CERR\n",unit);
is->arpcom.ac_if.if_collisions++; is->arpcom.ac_if.if_collisions++;
} }
if (isr&MISS) { if (isr&MISS) {
printf("is%d:MISS\n",unit); printf("is%d: MISS\n",unit);
is->arpcom.ac_if.if_ierrors++; is->arpcom.ac_if.if_ierrors++;
} }
if (isr&MERR) if (isr&MERR)
printf("is%d:MERR\n",unit); printf("is%d: MERR\n",unit);
iswrcsr(unit,0,BABL|CERR|MISS|MERR|INEA); iswrcsr(unit,0,BABL|CERR|MISS|MERR|INEA);
} }
if (!(isr&RXON)) { if (!(isr&RXON)) {
printf("!(isr&RXON)\n"); printf("is%d: !(isr&RXON)\n", unit);
is->arpcom.ac_if.if_ierrors++; is->arpcom.ac_if.if_ierrors++;
is_reset(unit); is_reset(unit);
return(1); return(1);
} }
if (!(isr&TXON)) { if (!(isr&TXON)) {
printf("!(isr&TXON)\n"); printf("is%d: !(isr&TXON)\n", unit);
is->arpcom.ac_if.if_oerrors++; is->arpcom.ac_if.if_oerrors++;
is_reset(unit); is_reset(unit);
return(1); return(1);
@ -601,7 +602,7 @@ static inline void is_rint(int unit)
/* Out of sync with hardware, should never happen */ /* Out of sync with hardware, should never happen */
if (cdm->flags & OWN) { if (cdm->flags & OWN) {
printf("is%d error: out of sync\n",unit); printf("is%d: error: out of sync\n",unit);
iswrcsr(unit,0,RINT|INEA); iswrcsr(unit,0,RINT|INEA);
return; return;
} }
@ -612,13 +613,13 @@ static inline void is_rint(int unit)
iswrcsr(unit,0,RINT|INEA); iswrcsr(unit,0,RINT|INEA);
if (cdm->flags&ERR) { if (cdm->flags&ERR) {
if (cdm->flags&FRAM) if (cdm->flags&FRAM)
printf("is%d:FRAM\n",unit); printf("is%d: FRAM\n",unit);
if (cdm->flags&OFLO) if (cdm->flags&OFLO)
printf("is%d:OFLO\n",unit); printf("is%d: OFLO\n",unit);
if (cdm->flags&CRC) if (cdm->flags&CRC)
printf("is%d:CRC\n",unit); printf("is%d: CRC\n",unit);
if (cdm->flags&RBUFF) if (cdm->flags&RBUFF)
printf("is%d:RBUFF\n",unit); printf("is%d: RBUFF\n",unit);
}else }else
if (cdm->flags&(STP|ENP) != (STP|ENP)) { if (cdm->flags&(STP|ENP) != (STP|ENP)) {
do { do {
@ -628,7 +629,7 @@ static inline void is_rint(int unit)
NEXTRDS; NEXTRDS;
}while (!(cdm->flags&(OWN|ERR|STP|ENP))); }while (!(cdm->flags&(OWN|ERR|STP|ENP)));
is->last_rd = rmd; is->last_rd = rmd;
printf("is%d:Chained buffer\n",unit); printf("is%d: Chained buffer\n",unit);
if ((cdm->flags & (OWN|ERR|STP|ENP)) != ENP) { if ((cdm->flags & (OWN|ERR|STP|ENP)) != ENP) {
is_reset(unit); is_reset(unit);
return; return;
@ -692,6 +693,7 @@ isread(struct is_softc *is, unsigned char *buf, int len)
* information to be at the front, but we still have to drop * information to be at the front, but we still have to drop
* the type and length which are at the front of any trailer data. * the type and length which are at the front of any trailer data.
*/ */
is->arpcom.ac_if.if_ipackets++;
m = isget(buf, len, off, &is->arpcom.ac_if); m = isget(buf, len, off, &is->arpcom.ac_if);
if (m == 0) return; if (m == 0) return;
#if NBPFILTER > 0 #if NBPFILTER > 0
@ -926,15 +928,21 @@ recv_print(unit,no)
{ {
register struct is_softc *is=&is_softc[unit]; register struct is_softc *is=&is_softc[unit];
struct mds *rmd; struct mds *rmd;
int len,i; int len,i,printed=0;
rmd = (is->rd+no); rmd = (is->rd+no);
len = rmd->mcnt; len = rmd->mcnt;
printf("is%d: Receive buffer %d, len = %d\n",unit,no,len); printf("is%d: Receive buffer %d, len = %d\n",unit,no,len);
printf("is%d: Status %x\n",unit,isrdcsr(unit,0)); printf("is%d: Status %x\n",unit,isrdcsr(unit,0));
for (i=0; i<len; i++) for (i=0; i<len; i++) {
if (!printed) {
printed=1;
printf("is%d: data: ", unit);
}
printf("%x ",*(is->rbuf+(BUFSIZE*no)+i)); printf("%x ",*(is->rbuf+(BUFSIZE*no)+i));
printf("\n"); }
if (printed)
printf("\n");
} }
xmit_print(unit,no) xmit_print(unit,no)
@ -942,18 +950,24 @@ xmit_print(unit,no)
{ {
register struct is_softc *is=&is_softc[unit]; register struct is_softc *is=&is_softc[unit];
struct mds *rmd; struct mds *rmd;
int i; int i, printed=0;
u_short len; u_short len;
rmd = (is->td+no); rmd = (is->td+no);
len = -(rmd->bcnt); len = -(rmd->bcnt);
printf("is%d:Transmit buffer %d, len = %d\n",unit,no,len); printf("is%d: Transmit buffer %d, len = %d\n",unit,no,len);
printf("is%d:Status %x\n",unit,isrdcsr(unit,0)); printf("is%d: Status %x\n",unit,isrdcsr(unit,0));
printf("addr %x, flags %x, bcnt %x, mcnt %x\n", printf("is%d: addr %x, flags %x, bcnt %x, mcnt %x\n",
rmd->addr,rmd->flags,rmd->bcnt,rmd->mcnt); unit,rmd->addr,rmd->flags,rmd->bcnt,rmd->mcnt);
for (i=0; i<len; i++) for (i=0; i<len; i++) {
if (!printed) {
printed = 1;
printf("is%d: data: ", unit);
}
printf("%x ",*(is->tbuf+(BUFSIZE*no)+i)); printf("%x ",*(is->tbuf+(BUFSIZE*no)+i));
printf("\n"); }
if (printed)
printf("\n");
} }
#endif #endif