Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always use PCMCIA_WIDTH_AUTO rather than PCMCIA_WIDTH_IO16. This spec is 

pretty clear on how this works.
This commit is contained in:
mycroft 2004-08-11 04:25:28 +00:00
parent 310c1dab88
commit 8f96fc7c75
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pcmcia/com_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_pcmcia.c,v 1.48 2004/08/10 19:23:21 mycroft Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.49 2004/08/11 04:25:28 mycroft Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.48 2004/08/10 19:23:21 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.49 2004/08/11 04:25:28 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -177,8 +177,6 @@ com_pcmcia_validate_config(cfe)
return (EINVAL);
/* Some cards have a memory space, but we don't use it. */
cfe->num_memspace = 0;
/* Some cards don't have IO8 in their CIS. */
cfe->flags |= PCMCIA_CFE_IO8;
return (0);
}

6
sys/dev/pcmcia/if_ne_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_pcmcia.c,v 1.132 2004/08/10 18:43:49 mycroft Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.133 2004/08/11 04:25:28 mycroft Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.132 2004/08/10 18:43:49 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.133 2004/08/11 04:25:28 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -537,8 +537,6 @@ ne_pcmcia_validate_config(cfe)
return (EINVAL);
/* Some cards have a memory space, but we don't use it. */
cfe->num_memspace = 0;
/* Some cards don't have IO8 in their CIS. */
cfe->flags |= PCMCIA_CFE_IO8;
return (0);
}

18
sys/dev/pcmcia/pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmcia.c,v 1.61 2004/08/11 00:32:44 mycroft Exp $ */
/* $NetBSD: pcmcia.c,v 1.62 2004/08/11 04:25:28 mycroft Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.61 2004/08/11 00:32:44 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.62 2004/08/11 04:25:28 mycroft Exp $");
#include "opt_pcmciaverbose.h"
@ -828,18 +828,10 @@ pcmcia_config_map(pf)
for (n = 0; n < cfe->num_iospace; n++) {
int width;
switch (cfe->flags & (PCMCIA_CFE_IO8|PCMCIA_CFE_IO16)) {
case PCMCIA_CFE_IO8:
width = PCMCIA_WIDTH_IO8;
break;
case PCMCIA_CFE_IO16:
width = PCMCIA_WIDTH_IO16;
break;
case PCMCIA_CFE_IO8|PCMCIA_CFE_IO16:
default:
if (cfe->flags & PCMCIA_CFE_IO16)
width = PCMCIA_WIDTH_AUTO;
break;
}
else
width = PCMCIA_WIDTH_IO8;
error = pcmcia_io_map(pf, width, &cfe->iospace[n].handle,
&cfe->iospace[n].window);
if (error)