aboutsummaryrefslogtreecommitdiff
path: root/src/hw
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-10-11 13:16:12 -0400
committerKevin O'Connor <kevin@koconnor.net>2014-10-15 12:10:52 -0400
commit341f8d98a087de01326634dd8a838381e7caa1c9 (patch)
tree475e024036dd267222c016ee3c9afba8e570a357 /src/hw
parent55215cd425d36b257104b9279541c886e7bab607 (diff)
downloadseabios-341f8d98a087de01326634dd8a838381e7caa1c9.zip
seabios-341f8d98a087de01326634dd8a838381e7caa1c9.tar.gz
seabios-341f8d98a087de01326634dd8a838381e7caa1c9.tar.bz2
Move a20 code from system.c and ps2port.h to x86.h
Although the a20 functionality was originally implemented in the ps2 controller, that is just a historical artifact. It's a core feature of modern x86 cpus and the code is better located in the x86.h header. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/hw')
-rw-r--r--src/hw/ps2port.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/hw/ps2port.h b/src/hw/ps2port.h
index 2e6f25a..566073a 100644
--- a/src/hw/ps2port.h
+++ b/src/hw/ps2port.h
@@ -2,13 +2,11 @@
#ifndef __PS2PORT_H
#define __PS2PORT_H
+#include "types.h" // u8
+
#define PORT_PS2_DATA 0x0060
#define PORT_PS2_CTRLB 0x0061
#define PORT_PS2_STATUS 0x0064
-#define PORT_A20 0x0092
-
-// PORT_A20 bitdefs
-#define A20_ENABLE_BIT 0x02
// Standard commands.
#define I8042_CMD_CTL_RCTR 0x0120
@@ -60,16 +58,10 @@
#define I8042_CTR_AUXDIS 0x20
#define I8042_CTR_XLATE 0x40
-#ifndef __ASSEMBLY__
-
-#include "types.h" // u8
-
-// functions
+// ps2port.c
void i8042_reboot(void);
int ps2_kbd_command(int command, u8 *param);
int ps2_mouse_command(int command, u8 *param);
void ps2port_setup(void);
-#endif // !__ASSEMBLY__
-
#endif // ps2port.h