From 563c65de904740a76b75b22a570d4d2a7ef2e6d7 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Wed, 11 Aug 1999 22:33:57 +0000 Subject: [PATCH] Now that all chipsets support S/G DMA (which is required for ISA devices) we can enable the floppy disk --- sys/alpha/conf/GENERIC | 7 +++---- sys/alpha/conf/NOTES | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 64ebe533147..7c796f0f3d4 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.33 1999/08/08 19:28:56 phk Exp $ +# $Id: GENERIC,v 1.34 1999/08/10 17:15:11 wpaul Exp $ machine alpha cpu EV4 @@ -90,9 +90,8 @@ device cd0 # real time clock device mcclock0 at isa0 port 0x70 -# Not enabled since it only works on CIA chipsets -#controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -#disk fd0 at fdc0 drive 0 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 +disk fd0 at fdc0 drive 0 controller atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 64ebe533147..7c796f0f3d4 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.33 1999/08/08 19:28:56 phk Exp $ +# $Id: GENERIC,v 1.34 1999/08/10 17:15:11 wpaul Exp $ machine alpha cpu EV4 @@ -90,9 +90,8 @@ device cd0 # real time clock device mcclock0 at isa0 port 0x70 -# Not enabled since it only works on CIA chipsets -#controller fdc0 at isa? port IO_FD1 irq 6 drq 2 -#disk fd0 at fdc0 drive 0 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 +disk fd0 at fdc0 drive 0 controller atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1