Attachment 14095 Details for Bug 26547 – file.diff

[patch] file.diff

file.diff (text/plain), 1.58 KB, created by Doug Ambrisko on 2001-04-14 00:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Ambrisko

Created: 2001-04-14 00:00:13 UTC

Size: 1.58 KB

patch

obsolete

>Index: if_lnc.c
>===================================================================
>RCS file: /cvs/freebsd/src/sys/i386/isa/Attic/if_lnc.c,v
>retrieving revision 1.68.2.4
>diff -c -r1.68.2.4 if_lnc.c
>*** if_lnc.c	2001/01/08 15:37:59	1.68.2.4
>--- if_lnc.c	2001/04/13 22:48:06
>***************
>*** 887,892 ****
>--- 887,899 ----
>  	printf("Vendor Specific Word = %x\n", vsw);
>  #endif
>  
>+ 	sc->nic.mem_mode=0;
>+ 	sc->recv_ring = (struct host_ring_entry *)isa_dev->id_maddr;
>+         if(sc->recv_ring){
>+ 	       isa_dev->id_msize=0x10000;
>+ 	       sc->nic.mem_mode=SHMEM;
>+ 	}
>+ 
>  	nports = bicc_probe(sc, iobase);
>  	if (nports == 0)
>  		nports = ne2100_probe(sc, iobase);
>***************
>*** 990,996 ****
>  	sc->nic.ic = pcnet_probe(sc);
>  	if ((sc->nic.ic > 0) && (sc->nic.ic < PCnet_PCI)) {
>  		sc->nic.ident = NE2100;
>! 		sc->nic.mem_mode = DMA_FIXED;
>  
>  		/* XXX - For now just use the defines */
>  		sc->nrdre = NRDRE;
>--- 997,1004 ----
>  	sc->nic.ic = pcnet_probe(sc);
>  	if ((sc->nic.ic > 0) && (sc->nic.ic < PCnet_PCI)) {
>  		sc->nic.ident = NE2100;
>! 		if(sc->nic.mem_mode != SHMEM)
>! 		         sc->nic.mem_mode = DMA_FIXED;
>  
>  		/* XXX - For now just use the defines */
>  		sc->nrdre = NRDRE;
>***************
>*** 1357,1363 ****
>  	sc->trans_next = 0;
>  
>  	if (sc->nic.mem_mode == SHMEM)
>! 		lnc_mem = (char *) sc->nic.iobase;
>  	else
>  		lnc_mem = (char *) (sc->trans_ring + NDESC(sc->ntdre));
>  
>--- 1365,1371 ----
>  	sc->trans_next = 0;
>  
>  	if (sc->nic.mem_mode == SHMEM)
>! 		lnc_mem = (char *) (sc->trans_ring + NDESC(sc->ntdre));
>  	else
>  		lnc_mem = (char *) (sc->trans_ring + NDESC(sc->ntdre));

Actions: View | Diff

Attachments on bug 26547: 14095