X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FInput%2FKeyboard%2Flayout_kbdus.h;h=ece413f7d6727e184eaaee0a0c2d3bdb939a006d;hb=34dd97af59a64afda861ce636b272c7b90531f97;hp=0809407edd8e2a800a2266dfca5283fc842c6d17;hpb=f48e29379bd57e2d361cbc65477be120da47e874;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Input/Keyboard/layout_kbdus.h b/KernelLand/Modules/Input/Keyboard/layout_kbdus.h
index 0809407e..ece413f7 100644
--- a/KernelLand/Modules/Input/Keyboard/layout_kbdus.h
+++ b/KernelLand/Modules/Input/Keyboard/layout_kbdus.h
@@ -1,4 +1,12 @@
-
+/*
+ * Acess2 Keyboard Driver
+ * - By John Hodge (thePowersGang)
+ *
+ * layout_kbdus.h
+ * - US Keyboard Layout
+ *
+ * TODO: Support Num-Lock
+ */
 #ifndef _KEYMAP__LAYOUT_KBDUS_H_
 #define _KEYMAP__LAYOUT_KBDUS_H_
 
@@ -6,7 +14,7 @@
 
 // - Base (NO PREFIX)
 tKeymapLayer	gpKBDUS1 = {
-	KEYSYM_SLASH+1,
+	KEYSYM_KPENTER+1,
 	{
 	 0, 0, 0, 0,
 	'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
@@ -14,14 +22,17 @@ tKeymapLayer	gpKBDUS1 = {
 	'1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
 	'\n', '\x1b', '\b', '\t', ' ', '-', '=', '[', ']', '\\', '#', ';',
 	'\'', '`', ',', '.', '/',
-//	KEY_CAPSLOCK,
-//	KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6,
-//	KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12,
-//	0, KEY_SCROLLLOCK, KEY_PAUSE, KEY_INS, KEY_HOME, KEY_PGUP, KEY_PGDOWN,
-//	KEY_RIGHT, KEY_LEFT, KEY_UP, KEY_DOWN,
-//	KEY_NUMLOCK, KEY_KPSLASH, KEY_KPSTAR, KEY_KPMINUS,
-//	KEY_KPPLUS, KEY_KPENTER,
-//	KEY_KPEND, KEY_KPDOWN, KEY_KPLEFT,
+	0,	// Capslock
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	// F1 -> F12
+	0, 0, 0,	// PrintScrn, ScrollLock, Pause
+	0, 0, 0, '\x7f', 0, 0, // Insert, Home, PgUp, Delete, End, PgDn
+	0, 0, 0, 0,	// Right, Left, Up, Down
+	// - Keypad
+	0, '/', '*', '-', '+', '\n',	// NumLock, Keypad /, *, -, +, Enter
+//	KEYSYM_KPEND, KEYSYM_KPDOWN, KEYSYM_KPPGDN,
+//	KEYSYM_KPLEFT, KEYSYM_KP5, KEY_KPRIGHT,
+//	KEYSYM_KPHOME, KEYSYM_KPUP, KEYSYM_KPPGUP,
+//	KEYSYM_PKINS, KEYSYM_KPDEL
 	}
 };
 tKeymapLayer	gpKBDUS1s = {
@@ -38,8 +49,7 @@ tKeymapLayer	gpKBDUS1s = {
 
 tKeymap	gKeymap_KBDUS = {
 	"en-us",
-	2,
-	{&gpKBDUS1, &gpKBDUS1s}
+	2, {&gpKBDUS1, &gpKBDUS1s}
 };
 
 #endif