Update kbd.{c,h}.

3ef765be · Silas Boyd-Wickizer · 04b24182 · 3ef765be · 3ef765be
--- a/kbd.c
+++ b/kbd.c
 #include "types.h"
 #include "x86.h"
-#include "defs.h"
+#include "kernel.h"
 #include "kbd.h"
 #include "param.h"

 int
 kbdgetc(void)
 {
-  static uint shift __attribute__ ((aligned (CACHELINE)));
-  static uchar *charcode[4] = {
+  static int shift __mpalign__;
+  static u8 *charcode[4] = {
    normalmap, shiftmap, ctlmap, ctlmap
  };
-  uint st, data, c;
+  u32 st, data, c;

  st = inb(KBSTATP);
  if((st & KBS_DIB) == 0)

--- a/kbd.h
+++ b/kbd.h
@@ -31,7 +31,7 @@
 // C('A') == Control-A
 #define C(x) (x - '@')

-static uchar shiftcode[256] =
+static u8 shiftcode[256] =
 {
  [0x1D] CTL,
  [0x2A] SHIFT,
@@ -41,14 +41,14 @@ static uchar shiftcode[256] =
  [0xB8] ALT
 };

-static uchar togglecode[256] =
+static u8 togglecode[256] =
 {
  [0x3A] CAPSLOCK,
  [0x45] NUMLOCK,
  [0x46] SCROLLLOCK
 };

-static uchar normalmap[256] =
+static u8 normalmap[256] =
 {
  NO,   0x1B, '1',  '2',  '3',  '4',  '5',  '6',  // 0x00
  '7',  '8',  '9',  '0',  '-',  '=',  '\b', '\t',
@@ -70,7 +70,7 @@ static uchar normalmap[256] =
  [0xD2] KEY_INS,   [0xD3] KEY_DEL
 };

-static uchar shiftmap[256] =
+static u8 shiftmap[256] =
 {
  NO,   033,  '!',  '@',  '#',  '$',  '%',  '^',  // 0x00
  '&',  '*',  '(',  ')',  '_',  '+',  '\b', '\t',
@@ -92,7 +92,7 @@ static uchar shiftmap[256] =
  [0xD2] KEY_INS,   [0xD3] KEY_DEL
 };

-static uchar ctlmap[256] =
+static u8 ctlmap[256] =
 {
  NO,      NO,      NO,      NO,      NO,      NO,      NO,      NO,
  NO,      NO,      NO,      NO,      NO,      NO,      NO,      NO,