Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Sep 2003 15:15:44 +0200
From:      Jiri Mikulas <konfer@mikulas.com>
To:        current@freebsd.org
Subject:   re,rl and BURN_BRIDGES
Message-ID:  <3F743C00.3000300@mikulas.com>

next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------040908090405000300070201
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hello
when i use BURN_BRIDGES in kernel config,
it seems that there is resubmited old part of code
in function suspend and resume - PCIR_MAPS symbol
i made diff for me  - see attachment
please could anybody submit corrected version into cvs tree?
i'm not maintainer ...
Thanks for help  :)
Jiri


--------------040908090405000300070201
Content-Type: text/plain;
 name="realtek.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="realtek.diff"

--- sys/pci/if_rl.c	Thu Sep 11 06:05:01 2003
+++ sys/pci/if_rl.c	Tue Sep 23 16:09:10 2003
@@ -1915,7 +1915,7 @@
 	rl_stop(sc);
 
 	for (i = 0; i < 5; i++)
-		sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4);
+		sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4);
 	sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4);
 	sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1);
 	sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1);
@@ -1944,7 +1944,7 @@
 
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
-		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
+		pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4);
 	pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4);
 	pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1);
 	pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1);
--- sys/dev/re/if_re.c	Sat Sep 20 23:18:27 2003
+++ sys/dev/re/if_re.c	Tue Sep 23 16:06:35 2003
@@ -2423,7 +2423,7 @@
 	re_stop(sc);
 
 	for (i = 0; i < 5; i++)
-		sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4);
+		sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4);
 	sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4);
 	sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1);
 	sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1);
@@ -2452,7 +2452,7 @@
 
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
-		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
+		pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4);
 	pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4);
 	pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1);
 	pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1);


--------------040908090405000300070201--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F743C00.3000300>