Adds support for an usb keyboard to kw. devkbin.c is pc/devkbin.c, i do not see how to indicate removal with patch. kbd.c is a stripped-down version of pc/kbd.c, it might make more sense to pull together the common pieces of */kbd.c and put it in port. (I'd be willing to do this instead, though I can only test pc and kw.) Notes: Wed Aug 25 22:39:28 EDT 2010 geoff There's not much point to adding keyboard or mouse support until we've got video working or nearly working, and only the not-yet-available guruplug display and openrd have a video controller. Reference: /n/sources/patch/saved/kw-kbd Date: Wed Aug 25 20:56:05 CES 2010 Signed-off-by: 9@trstn.net Reviewed-by: geoff --- /sys/src/9/port/devkbin.c Thu Jan 1 00:00:00 1970 +++ /sys/src/9/port/devkbin.c Wed Aug 25 20:48:42 2010 @@ -0,0 +1,120 @@ +/* + * keyboard scan code input from outside the kernel. + * to avoid duplication of keyboard map processing for usb. + */ + +#include "u.h" +#include "../port/lib.h" +#include "mem.h" +#include "dat.h" +#include "fns.h" +#include "../port/error.h" + +extern void kbdputsc(int, int); + +enum { + Qdir, + Qkbd, +}; + +Dirtab kbintab[] = { + ".", {Qdir, 0, QTDIR}, 0, 0555, + "kbin", {Qkbd, 0}, 0, 0200, +}; + +Lock kbinlck; +int kbinbusy; + +static Chan * +kbinattach(char *spec) +{ + return devattach(L'Ι', spec); +} + +static Walkqid* +kbinwalk(Chan *c, Chan *nc, char **name, int nname) +{ + return devwalk(c, nc, name, nname, kbintab, nelem(kbintab), devgen); +} + +static int +kbinstat(Chan *c, uchar *dp, int n) +{ + return devstat(c, dp, n, kbintab, nelem(kbintab), devgen); +} + +static Chan* +kbinopen(Chan *c, int omode) +{ + if(!iseve()) + error(Eperm); + if(c->qid.path == Qkbd){ + lock(&kbinlck); + if(kbinbusy){ + unlock(&kbinlck); + error(Einuse); + } + kbinbusy++; + unlock(&kbinlck); + } + return devopen(c, omode, kbintab, nelem(kbintab), devgen); +} + +static void +kbinclose(Chan *c) +{ + if(c->aux){ + free(c->aux); + c->aux = nil; + } + if(c->qid.path == Qkbd) + kbinbusy = 0; +} + +static long +kbinread(Chan *c, void *a, long n, vlong ) +{ + if(c->qid.type == QTDIR) + return devdirread(c, a, n, kbintab, nelem(kbintab), devgen); + return 0; +} + +static long +kbinwrite(Chan *c, void *a, long n, vlong) +{ + int i; + uchar *p = a; + + if(c->qid.type == QTDIR) + error(Eisdir); + switch((int)c->qid.path){ + case Qkbd: + for(i = 0; i < n; i++) + kbdputsc(*p++, 1); /* external source */ + break; + default: + error(Egreg); + } + return n; +} + +Dev kbindevtab = { + L'Ι', + "kbin", + + devreset, + devinit, + devshutdown, + kbinattach, + kbinwalk, + kbinstat, + kbinopen, + devcreate, + kbinclose, + kbinread, + devbread, + kbinwrite, + devbwrite, + devremove, + devwstat, +}; --- /sys/src/9/kw/kbd.c Thu Jan 1 00:00:00 1970 +++ /sys/src/9/kw/kbd.c Wed Aug 25 20:48:42 2010 @@ -0,0 +1,385 @@ +/* + * keyboard processing + */ +#include "u.h" +#include "../port/lib.h" +#include "mem.h" +#include "dat.h" +#include "fns.h" +#include "../port/error.h" + +enum { + Spec= 0xF800, /* Unicode private space */ + PF= Spec|0x20, /* num pad function key */ + View= Spec|0x00, /* view (shift window up) */ + KF= 0xF000, /* function key (begin Unicode private space) */ + Shift= Spec|0x60, + Break= Spec|0x61, + Ctrl= Spec|0x62, + Latin= Spec|0x63, + Caps= Spec|0x64, + Num= Spec|0x65, + Middle= Spec|0x66, + Altgr= Spec|0x67, + Kmouse= Spec|0x100, + No= 0x00, /* peter */ + + Home= KF|13, + Up= KF|14, + Pgup= KF|15, + Print= KF|16, + Left= KF|17, + Right= KF|18, + End= KF|24, + Down= View, + Pgdown= KF|19, + Ins= KF|20, + Del= 0x7F, + Scroll= KF|21, + + Nscan= 128, +}; + +/* + * The codes at 0x79 and 0x7b are produced by the PFU Happy Hacking keyboard. + * A 'standard' keyboard doesn't produce anything above 0x58. + */ +Rune kbtab[Nscan] = +{ +[0x00] No, 0x1b, '1', '2', '3', '4', '5', '6', +[0x08] '7', '8', '9', '0', '-', '=', '\b', '\t', +[0x10] 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', +[0x18] 'o', 'p', '[', ']', '\n', Ctrl, 'a', 's', +[0x20] 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', +[0x28] '\'', '`', Shift, '\\', 'z', 'x', 'c', 'v', +[0x30] 'b', 'n', 'm', ',', '.', '/', Shift, '*', +[0x38] Latin, ' ', Ctrl, KF|1, KF|2, KF|3, KF|4, KF|5, +[0x40] KF|6, KF|7, KF|8, KF|9, KF|10, Num, Scroll, '7', +[0x48] '8', '9', '-', '4', '5', '6', '+', '1', +[0x50] '2', '3', '0', '.', No, No, No, KF|11, +[0x58] KF|12, No, No, No, No, No, No, No, +[0x60] No, No, No, No, No, No, No, No, +[0x68] No, No, No, No, No, No, No, No, +[0x70] No, No, No, No, No, No, No, No, +[0x78] No, View, No, Up, No, No, No, No, +}; + +Rune kbtabshift[Nscan] = +{ +[0x00] No, 0x1b, '!', '@', '#', '$', '%', '^', +[0x08] '&', '*', '(', ')', '_', '+', '\b', '\t', +[0x10] 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', +[0x18] 'O', 'P', '{', '}', '\n', Ctrl, 'A', 'S', +[0x20] 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', +[0x28] '"', '~', Shift, '|', 'Z', 'X', 'C', 'V', +[0x30] 'B', 'N', 'M', '<', '>', '?', Shift, '*', +[0x38] Latin, ' ', Ctrl, KF|1, KF|2, KF|3, KF|4, KF|5, +[0x40] KF|6, KF|7, KF|8, KF|9, KF|10, Num, Scroll, '7', +[0x48] '8', '9', '-', '4', '5', '6', '+', '1', +[0x50] '2', '3', '0', '.', No, No, No, KF|11, +[0x58] KF|12, No, No, No, No, No, No, No, +[0x60] No, No, No, No, No, No, No, No, +[0x68] No, No, No, No, No, No, No, No, +[0x70] No, No, No, No, No, No, No, No, +[0x78] No, Up, No, Up, No, No, No, No, +}; + +Rune kbtabesc1[Nscan] = +{ +[0x00] No, No, No, No, No, No, No, No, +[0x08] No, No, No, No, No, No, No, No, +[0x10] No, No, No, No, No, No, No, No, +[0x18] No, No, No, No, '\n', Ctrl, No, No, +[0x20] No, No, No, No, No, No, No, No, +[0x28] No, No, Shift, No, No, No, No, No, +[0x30] No, No, No, No, No, '/', No, Print, +[0x38] Altgr, No, No, No, No, No, No, No, +[0x40] No, No, No, No, No, No, Break, Home, +[0x48] Up, Pgup, No, Left, No, Right, No, End, +[0x50] Down, Pgdown, Ins, Del, No, No, No, No, +[0x58] No, No, No, No, No, No, No, No, +[0x60] No, No, No, No, No, No, No, No, +[0x68] No, No, No, No, No, No, No, No, +[0x70] No, No, No, No, No, No, No, No, +[0x78] No, Up, No, No, No, No, No, No, +}; + +Rune kbtabaltgr[Nscan] = +{ +[0x00] No, No, No, No, No, No, No, No, +[0x08] No, No, No, No, No, No, No, No, +[0x10] No, No, No, No, No, No, No, No, +[0x18] No, No, No, No, '\n', Ctrl, No, No, +[0x20] No, No, No, No, No, No, No, No, +[0x28] No, No, Shift, No, No, No, No, No, +[0x30] No, No, No, No, No, '/', No, Print, +[0x38] Altgr, No, No, No, No, No, No, No, +[0x40] No, No, No, No, No, No, Break, Home, +[0x48] Up, Pgup, No, Left, No, Right, No, End, +[0x50] Down, Pgdown, Ins, Del, No, No, No, No, +[0x58] No, No, No, No, No, No, No, No, +[0x60] No, No, No, No, No, No, No, No, +[0x68] No, No, No, No, No, No, No, No, +[0x70] No, No, No, No, No, No, No, No, +[0x78] No, Up, No, No, No, No, No, No, +}; + +Rune kbtabctrl[Nscan] = +{ +[0x00] No, '', '', '', '', '', '', '', +[0x08] '', '', '', '', ' ', '', '\b', '\t', +[0x10] '', '', '', '', '', '', '', '\t', +[0x18] '', '', '', '', '\n', Ctrl, '', '', +[0x20] '', '', '', '\b', '\n', ' ', ' ', '', +[0x28] '', No, Shift, '', '', '', '', '', +[0x30] '', '', ' ', ' ', '', '', Shift, '\n', +[0x38] Latin, No, Ctrl, '', '', '', '', '', +[0x40] '', '', ' ', ' ', '', '', '', '', +[0x48] '', '', ' ', '', '', '', ' ', '', +[0x50] '', '', '', '', No, No, No, '', +[0x58] ' ', No, No, No, No, No, No, No, +[0x60] No, No, No, No, No, No, No, No, +[0x68] No, No, No, No, No, No, No, No, +[0x70] No, No, No, No, No, No, No, No, +[0x78] No, '', No, '\b', No, No, No, No, +}; + +int mouseshifted; +void (*kbdmouse)(int); + +typedef struct Kbscan Kbscan; +struct Kbscan { + int esc1; + int esc2; + int alt; + int altgr; + int caps; + int ctl; + int num; + int shift; + int collecting; + int nk; + Rune kc[5]; + int buttons; +}; + +Kbscan kbscan; /* scan code state */ + +static int kdebug; + +/* + * Scan code processing + */ +void +kbdputsc(int c, int /* external */) +{ + int i, keyup; + + if(kdebug) + print("sc %x ms %d\n", c, mouseshifted); + /* + * e0's is the first of a 2 character sequence, e1 the first + * of a 3 character sequence (on the safari) + */ + if(c == 0xe0){ + kbscan.esc1 = 1; + return; + } else if(c == 0xe1){ + kbscan.esc2 = 2; + return; + } + + keyup = c & 0x80; + c &= 0x7f; + if(c > sizeof kbtab){ + c |= keyup; + if(c != 0xFF) /* these come fairly often: CAPSLOCK U Y */ + print("unknown key %ux\n", c); + return; + } + + if(kbscan.esc1){ + c = kbtabesc1[c]; + kbscan.esc1 = 0; + } else if(kbscan.esc2){ + kbscan.esc2--; + return; + } else if(kbscan.shift) + c = kbtabshift[c]; + else if(kbscan.altgr) + c = kbtabaltgr[c]; + else if(kbscan.ctl) + c = kbtabctrl[c]; + else + c = kbtab[c]; + + if(kbscan.caps && c<='z' && c>='a') + c += 'A' - 'a'; + + /* + * keyup only important for shifts + */ + if(keyup){ + switch(c){ + case Latin: + kbscan.alt = 0; + break; + case Shift: + kbscan.shift = 0; + mouseshifted = 0; + if(kdebug) + print("shiftclr\n"); + break; + case Ctrl: + kbscan.ctl = 0; + break; + case Altgr: + kbscan.altgr = 0; + break; + case Kmouse|1: + case Kmouse|2: + case Kmouse|3: + case Kmouse|4: + case Kmouse|5: + kbscan.buttons &= ~(1<<(c-Kmouse-1)); + if(kbdmouse) + kbdmouse(kbscan.buttons); + break; + } + return; + } + + /* + * normal character + */ + if(!(c & (Spec|KF))){ + if(kbscan.ctl) + if(kbscan.alt && c == Del) + exit(0); + if(!kbscan.collecting){ + kbdputc(kbdq, c); + return; + } + kbscan.kc[kbscan.nk++] = c; + c = latin1(kbscan.kc, kbscan.nk); + if(c < -1) /* need more keystrokes */ + return; + if(c != -1) /* valid sequence */ + kbdputc(kbdq, c); + else /* dump characters */ + for(i=0; i= Nscan) + error(Ebadarg); + switch(m) { + default: + error(Ebadarg); + case 0: + kbtab[scanc] = r; + break; + case 1: + kbtabshift[scanc] = r; + break; + case 2: + kbtabesc1[scanc] = r; + break; + case 3: + kbtabaltgr[scanc] = r; + break; + case 4: + kbtabctrl[scanc] = r; + break; + } +} + +int +kbdgetmap(uint offset, int *t, int *sc, Rune *r) +{ + if ((int)offset < 0) + error(Ebadarg); + *t = offset/Nscan; + *sc = offset%Nscan; + switch(*t) { + default: + return 0; + case 0: + *r = kbtab[*sc]; + return 1; + case 1: + *r = kbtabshift[*sc]; + return 1; + case 2: + *r = kbtabesc1[*sc]; + return 1; + case 3: + *r = kbtabaltgr[*sc]; + return 1; + case 4: + *r = kbtabctrl[*sc]; + return 1; + } +} --- /sys/src/9/kw/plug Wed Aug 25 20:48:43 2010 +++ /sys/src/9/kw/plug Wed Aug 25 20:48:43 2010 @@ -27,7 +27,7 @@ ## mouse mouse ## vga # kbmap -## kbin +# kbin kbd uart usb