summaryrefslogtreecommitdiff
path: root/sys/src/9/pc64
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2015-08-05 09:22:07 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2015-08-05 09:22:07 +0200
commitf7514acc95ee1b7515936a9a7bfd48f72d21025b (patch)
tree074d1d0720342881256eb9d51dfd73bc66cb5f35 /sys/src/9/pc64
parent145624eec22577ec6a61cb3c469da48061d6f447 (diff)
devkbd: disable mosue/keyboard on shutdown, disable ps2 mouse on init, remove kbdenable()/kbdinit()
on vmware, loading a new kernel sometimes reboots when wiggling the mouse. disabling keyboard and mouse on shutdown fixes the issue. make sure ps2 mouse is disabled on init, will get re-enabled in i8042auxenable(). keyboard isnt special anymore, we can just use the devreset entry point in the device to do the keyboard initialization, so kbdinit()/kbdenable() are not needed anymore.
Diffstat (limited to 'sys/src/9/pc64')
-rw-r--r--sys/src/9/pc64/fns.h2
-rw-r--r--sys/src/9/pc64/main.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/src/9/pc64/fns.h b/sys/src/9/pc64/fns.h
index 46922f53d..5cbef27aa 100644
--- a/sys/src/9/pc64/fns.h
+++ b/sys/src/9/pc64/fns.h
@@ -87,8 +87,6 @@ int ioreserve(int, int, int, char*);
int iprint(char*, ...);
int isaconfig(char*, int, ISAConf*);
void* kaddr(uintptr);
-void kbdenable(void);
-void kbdinit(void);
KMap* kmap(Page*);
void kunmap(KMap*);
#define kmapinval()
diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c
index 5dcf3da48..8695b6ea3 100644
--- a/sys/src/9/pc64/main.c
+++ b/sys/src/9/pc64/main.c
@@ -486,7 +486,6 @@ main()
screeninit();
print("\nPlan 9\n");
trapinit0();
- kbdinit();
i8253init();
cpuidentify();
meminit();
@@ -504,7 +503,6 @@ main()
arch->intrinit();
timersinit();
mathinit();
- kbdenable();
if(arch->clockenable)
arch->clockenable();
procinit0();