Revision 48
Fixes
| lab3/kbc.c | ||
|---|---|---|
| 1 |
#include <lcom/lcf.h> |
|
| 2 |
|
|
| 3 |
#include "kbc.h" |
|
| 4 |
#include "kbc_func.h" |
|
| 5 |
|
|
| 6 |
int (subscribe_kbc_interrupt)(uint8_t interrupt_bit, int *interrupt_id) {
|
|
| 7 |
if (interrupt_id == NULL) return 1; |
|
| 8 |
*interrupt_id = interrupt_bit; |
|
| 9 |
return (sys_irqsetpolicy(KBC_IRQ, IRQ_REENABLE | IRQ_EXCLUSIVE, interrupt_id)); |
|
| 10 |
} |
|
| 11 |
|
|
| 12 |
int (unsubscribe_kbc_interrupt)(int *interrupt_id) {
|
|
| 13 |
if (interrupt_id == NULL) return 1; |
|
| 14 |
return sys_irqrmpolicy(interrupt_id); |
|
| 15 |
} |
|
| 16 |
|
|
| 17 |
uint8_t scancode[2]; |
|
| 18 |
int two_byte_scancode = 0; |
|
| 19 |
int got_error = 0; |
|
| 20 |
|
|
| 21 |
void (kbc_ih)(void) {
|
|
| 22 |
uint8_t status = 0; |
|
| 23 |
got_error = 0; |
|
| 24 |
|
|
| 25 |
if (util_sys_inb(STATUS_REG, &status)) {
|
|
| 26 |
got_error = 1; |
|
| 27 |
return; |
|
| 28 |
} |
|
| 29 |
|
|
| 30 |
if (status & (TIME_OUT_REC | PARITY_ERROR)) {
|
|
| 31 |
got_error = 1; |
|
| 32 |
return; |
|
| 33 |
} |
|
| 34 |
|
|
| 35 |
uint8_t byte = 0; |
|
| 36 |
|
|
| 37 |
if (util_sys_inb(OUTPUT_BUF, &byte)) {
|
|
| 38 |
got_error = 1; |
|
| 39 |
return; |
|
| 40 |
} |
|
| 41 |
|
|
| 42 |
if (two_byte_scancode) {
|
|
| 43 |
scancode[1] = byte; |
|
| 44 |
two_byte_scancode = 0; |
|
| 45 |
} else {
|
|
| 46 |
scancode[0] = byte; |
|
| 47 |
two_byte_scancode = (byte == TWO_BYTE_CODE); |
|
| 48 |
} |
|
| 49 |
|
|
| 50 |
} |
|
| 51 |
|
|
| 52 |
int (kbd_poll)(uint8_t bytes[], uint8_t *size){
|
|
| 53 |
if(bytes == NULL || size == NULL) return 1; |
|
| 54 |
uint8_t c; |
|
| 55 |
if(kbc_read_byte(&c)) return 1; |
|
| 56 |
if(c == TWO_BYTE_CODE){
|
|
| 57 |
if(kbc_read_byte(&bytes[1])) return 1; |
|
| 58 |
bytes[0] = c; |
|
| 59 |
*size = 2; |
|
| 60 |
}else{
|
|
| 61 |
bytes[1] = 0; |
|
| 62 |
bytes[0] = c; |
|
| 63 |
*size = 1; |
|
| 64 |
} |
|
| 65 |
return 0; |
|
| 66 |
} |
|
| 67 |
|
|
| 68 |
int (kbc_read_cmd)(uint8_t *cmd){
|
|
| 69 |
if(kbc_issue_cmd(READ_KBC_CMD)) return 1; |
|
| 70 |
if(kbc_read_byte(cmd)) return 1; |
|
| 71 |
return 0; |
|
| 72 |
} |
|
| 73 |
|
|
| 74 |
int (kbc_change_cmd)(uint8_t cmd){
|
|
| 75 |
if(kbc_issue_cmd(WRITE_KBC_CMD)) return 1; |
|
| 76 |
if(sys_outb(KBC_CMD_ARG, cmd)) return 1; |
|
| 77 |
return 0; |
|
| 78 |
} |
|
| 79 |
|
|
| 80 |
int (kbc_restore_kbd)(){
|
|
| 81 |
uint8_t cmd = 0; |
|
| 82 |
if(kbc_read_cmd(&cmd)) return 1; |
|
| 83 |
cmd = (cmd | INT_KBD) & (~DIS_KBD); |
|
| 84 |
if(kbc_change_cmd(cmd)) return 1; |
|
| 85 |
return 0; |
|
| 86 |
} |
|
| 87 |
|
|
| 88 |
int (kbc_issue_cmd)(uint8_t cmd){
|
|
| 89 |
uint8_t stat; |
|
| 90 |
for(int i = 0; i < KBC_NUM_TRIES; ++i){
|
|
| 91 |
if(util_sys_inb(STATUS_REG, &stat)) return 1; |
|
| 92 |
if((stat&IN_BUF_FULL) == 0){
|
|
| 93 |
if(sys_outb(KBC_CMD, cmd)) return 1; |
|
| 94 |
return 0; |
|
| 95 |
} |
|
| 96 |
tickdelay(micros_to_ticks(DELAY)); |
|
| 97 |
} |
|
| 98 |
return 1; |
|
| 99 |
} |
|
| 100 |
|
|
| 101 |
int (kbc_read_byte)(uint8_t *byte){
|
|
| 102 |
uint8_t stat; |
|
| 103 |
while(true){
|
|
| 104 |
if(util_sys_inb(STATUS_REG, &stat)) return 1; |
|
| 105 |
if((stat&OUT_BUF_FUL) && (stat&AUX_MOUSE)==0){
|
|
| 106 |
if(stat & (PARITY_ERROR | TIME_OUT_REC)) return 1; |
|
| 107 |
if(util_sys_inb(OUTPUT_BUF, byte)) return 1; |
|
| 108 |
else return 0; |
|
| 109 |
} |
|
| 110 |
tickdelay(micros_to_ticks(DELAY)); |
|
| 111 |
} |
|
| 112 |
} |
|
| 113 | 0 | |
| lab3/kbc_func.c | ||
|---|---|---|
| 15 | 15 |
} |
| 16 | 16 |
|
| 17 | 17 |
uint8_t scancode[2]; |
| 18 |
int two_byte_scancode = 0; |
|
| 19 | 18 |
int got_error = 0; |
| 19 |
int done = 0; |
|
| 20 |
int sz = 1; |
|
| 20 | 21 |
|
| 21 | 22 |
void (kbc_ih)(void) {
|
| 22 | 23 |
uint8_t status = 0; |
| ... | ... | |
| 39 | 40 |
return; |
| 40 | 41 |
} |
| 41 | 42 |
|
| 42 |
if (two_byte_scancode) {
|
|
| 43 |
if (sz == 2 && done == 0) {
|
|
| 43 | 44 |
scancode[1] = byte; |
| 44 |
two_byte_scancode = 0;
|
|
| 45 |
done = 1;
|
|
| 45 | 46 |
} else {
|
| 46 | 47 |
scancode[0] = byte; |
| 47 |
two_byte_scancode = (byte == TWO_BYTE_CODE); |
|
| 48 |
if (byte == TWO_BYTE_CODE) {
|
|
| 49 |
sz = 2; |
|
| 50 |
done = 0; |
|
| 51 |
} else {
|
|
| 52 |
sz = 1; |
|
| 53 |
done = 1; |
|
| 54 |
} |
|
| 48 | 55 |
} |
| 49 | 56 |
|
| 50 | 57 |
} |
| lab3/lab3.c | ||
|---|---|---|
| 33 | 33 |
} |
| 34 | 34 |
|
| 35 | 35 |
extern uint8_t scancode[2]; |
| 36 |
extern int two_byte_scancode; |
|
| 36 |
extern int sz; |
|
| 37 |
extern int done; |
|
| 37 | 38 |
extern int got_error; |
| 38 | 39 |
extern uint32_t sys_inb_counter; |
| 39 | 40 |
|
| ... | ... | |
| 59 | 60 |
case HARDWARE: /* hardware interrupt notification */ |
| 60 | 61 |
if (msg.m_notify.interrupts & kbc_irq) { /* subscribed interrupt */
|
| 61 | 62 |
kbc_ih(); |
| 62 |
if (!(two_byte_scancode || got_error)) { /* finished processing a scancode */
|
|
| 63 |
if (scancode[0] == TWO_BYTE_CODE) kbd_print_scancode(!(scancode[1] & BREAK_CODE_BIT), 2, scancode); |
|
| 64 |
else kbd_print_scancode(!(scancode[0] & BREAK_CODE_BIT), 1, scancode); |
|
| 65 |
} else { break; }
|
|
| 63 |
if(done) |
|
| 64 |
kbd_print_scancode(!(scancode[sz-1] & BREAK_CODE_BIT), sz, scancode); |
|
| 65 |
|
|
| 66 | 66 |
if (scancode[0] == ESC_BREAK_CODE) good = 0; |
| 67 | 67 |
} |
| 68 | 68 |
break; |
| ... | ... | |
| 134 | 134 |
} |
| 135 | 135 |
if (msg.m_notify.interrupts & kbc_irq) { /// subscribed interrupt
|
| 136 | 136 |
kbc_ih(); |
| 137 |
if (!(two_byte_scancode || got_error)) { /// finished processing a scancode
|
|
| 138 |
if (scancode[0] == TWO_BYTE_CODE) kbd_print_scancode(!(scancode[1] & BREAK_CODE_BIT), 2, scancode); |
|
| 139 |
else kbd_print_scancode(!(scancode[0] & BREAK_CODE_BIT), 1, scancode); |
|
| 137 |
if(done) {
|
|
| 138 |
kbd_print_scancode(!(scancode[sz-1] & BREAK_CODE_BIT), sz, scancode); |
|
| 140 | 139 |
time = 0; |
| 141 | 140 |
no_interrupts = 0; |
| 142 | 141 |
if (scancode[0] == ESC_BREAK_CODE) good = 0; |
Also available in: Unified diff