Module Name: src
Committed By: macallan
Date: Tue Feb 18 12:32:13 UTC 2014
Modified Files:
src/sys/dev/pci: ahc_pci.c
Log Message:
if MMIO is allowed and available, prefer it over PIO
now my ADPT,2930CU works again
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/ahc_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ahc_pci.c
diff -u src/sys/dev/pci/ahc_pci.c:1.68 src/sys/dev/pci/ahc_pci.c:1.69
--- src/sys/dev/pci/ahc_pci.c:1.68 Thu Nov 26 15:17:08 2009
+++ src/sys/dev/pci/ahc_pci.c Tue Feb 18 12:32:12 2014
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.68 2009/11/26 15:17:08 njoly Exp $
+ * $Id: ahc_pci.c,v 1.69 2014/02/18 12:32:12 macallan Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.68 2009/11/26 15:17:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.69 2014/02/18 12:32:12 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -833,20 +833,22 @@ ahc_pci_attach(device_t parent, device_t
ioh_valid = (pci_mapreg_map(pa, AHC_PCI_IOADDR,
PCI_MAPREG_TYPE_IO, 0, &iot,
&ioh, NULL, NULL) == 0);
+
#if 0
printf("%s: bus info: memt 0x%lx, memh 0x%lx, iot 0x%lx, ioh 0x%lx\n",
ahc_name(ahc), (u_long)memt, (u_long)memh, (u_long)iot,
(u_long)ioh);
#endif
- if (ioh_valid) {
- st = iot;
- sh = ioh;
#ifdef AHC_ALLOW_MEMIO
- } else if (memh_valid) {
+ if (memh_valid) {
st = memt;
sh = memh;
+ } else
#endif
+ if (ioh_valid) {
+ st = iot;
+ sh = ioh;
} else {
printf(": unable to map registers\n");
return;
