talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sioprobe: Don't try to initialize disabled ports. In particular, 

attempting to initialize sio3 caused problems with ATI video boards,
which cleverly share the I/O space.

PR: kern/12295
This commit is contained in:
Greg Lehey 1999-06-19 08:14:56 +00:00
parent e214816bfc
commit 89bf63adaa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/sio/sio.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
* $Id: sio.c,v 1.247 1999/06/15 22:15:10 mckusick Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@ -69,6 +69,7 @@
#include <sys/sysctl.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/bus_private.h>
#include <sys/rman.h>
#ifdef DEVFS
#include <sys/devfsext.h>
@ -639,7 +640,8 @@ sioprobe(dev)
devclass_get_devices(sio_devclass, &devs, &count);
for (i = 0; i < count; i++) {
xdev = devs[i];
outb(isa_get_port(xdev) + com_mcr, 0);
if (xdev->flags & DF_ENABLED)
outb(isa_get_port(xdev) + com_mcr, 0);
}
free(devs, M_TEMP);
already_init = TRUE;

6
sys/isa/sio.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
* $Id: sio.c,v 1.247 1999/06/15 22:15:10 mckusick Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@ -69,6 +69,7 @@
#include <sys/sysctl.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/bus_private.h>
#include <sys/rman.h>
#ifdef DEVFS
#include <sys/devfsext.h>
@ -639,7 +640,8 @@ sioprobe(dev)
devclass_get_devices(sio_devclass, &devs, &count);
for (i = 0; i < count; i++) {
xdev = devs[i];
outb(isa_get_port(xdev) + com_mcr, 0);
if (xdev->flags & DF_ENABLED)
outb(isa_get_port(xdev) + com_mcr, 0);
}
free(devs, M_TEMP);
already_init = TRUE;