mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-18 10:35:55 +00:00
Synchronize with sys/i386/isa/syscons.c revision 1.209.
This commit is contained in:
parent
2f1dba3bff
commit
4af17b77ec
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=24803
@ -25,7 +25,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.32 1997/03/29 02:46:28 kato Exp $
|
||||
* $Id: syscons.c,v 1.33 1997/04/04 15:23:55 kato Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -434,14 +434,10 @@ scprobe(struct isa_device *dev)
|
||||
c |= KBD_OVERRIDE_KBD_LOCK;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* enable the keyboard port, but disable the keyboard intr.
|
||||
* the aux port (mouse port) is disabled too.
|
||||
*/
|
||||
/* enable the keyboard port, but disable the keyboard intr. */
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
KBD_KBD_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* there is very little we can do...
|
||||
*/
|
||||
@ -513,8 +509,8 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
/* enable the keyboard port and intr. */
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK,
|
||||
(c & (KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK))
|
||||
KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK,
|
||||
(c & (KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK))
|
||||
| KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* This is serious; we are left with the disabled keyboard intr.
|
||||
|
Loading…
Reference in New Issue
Block a user