From owner-freebsd-current@FreeBSD.ORG Fri Sep 26 06:17:08 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5CA916A4BF for ; Fri, 26 Sep 2003 06:17:08 -0700 (PDT) Received: from s1.vhost.cz (s1.vhost.cz [195.39.16.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2479344025 for ; Fri, 26 Sep 2003 06:17:07 -0700 (PDT) (envelope-from konfer@mikulas.com) Received: (qmail 21258 invoked by uid 89); 26 Sep 2003 15:17:05 +0200 Received: from unknown (HELO mikulas.com) (jiri@mikulas.com@195.122.204.155) by s1.vhost.cz with AES256-SHA encrypted SMTP; 26 Sep 2003 15:17:05 +0200 Message-ID: <3F743C00.3000300@mikulas.com> Date: Fri, 26 Sep 2003 15:15:44 +0200 From: Jiri Mikulas User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; cs-CZ; rv:1.4) Gecko/20030710 X-Accept-Language: cs MIME-Version: 1.0 To: current@freebsd.org Content-Type: multipart/mixed; boundary="------------040908090405000300070201" Subject: re,rl and BURN_BRIDGES X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2003 13:17:09 -0000 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--