Skip to content

Commit

Permalink
Keyboard funcionality added with caps and other keys
Browse files Browse the repository at this point in the history 
Refactored code
Created device folder for device drivers
  • Loading branch information
@Ryand1234
Ryand1234 committed May 18, 2024
1 parent 8990648 commit fa26e54
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 517 deletions.
6 changes: 5 additions & 1 deletion kernel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ LIBS:=$(LIBS) -nostdlib -lk -lgcc

ARCHDIR=arch/$(HOSTARCH)
MMUDIR=mmu
DEVICEDIR=arch/devices

include $(ARCHDIR)/make.config
include ${MMUDIR}/make.config
include ${DEVICEDIR}/make.config

CFLAGS:=$(CFLAGS) $(KERNEL_ARCH_CFLAGS)
CPPFLAGS:=$(CPPFLAGS) $(KERNEL_ARCH_CPPFLAGS)
Expand All @@ -32,7 +34,8 @@ LIBS:=$(LIBS) $(KERNEL_ARCH_LIBS)
KERNEL_OBJS=\
$(KERNEL_ARCH_OBJS) \
kernel/kernel.o \
${MMU_OBJS}
${MMU_OBJS} \
${KERNEL_DEVICE_OBJS}

OBJS=\
$(ARCHDIR)/crti.o \
Expand All @@ -41,6 +44,7 @@ $(KERNEL_OBJS) \
$(ARCHDIR)/crtend.o \
$(ARCHDIR)/crtn.o \
${MMU_OBJS} \
${KERNEL_DEVICE_OBJS} \

LINK_LIST=\
$(LDFLAGS) \
Expand Down
3 changes: 2 additions & 1 deletion kernel/arch/i386/make.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ KERNEL_ARCH_LIBS=
KERNEL_ARCH_OBJS=\
$(ARCHDIR)/boot.o \
$(ARCHDIR)/tty.o \
${ARCHDIR}/x86_int.o \
${ARCHDIR}/interrupts.o \
${ARCHDIR}/x86.o \
${ARCHDIR}/asm/interrupts.o \

262 changes: 20 additions & 242 deletions kernel/arch/i386/x86.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,27 @@ struct idtr kidtr;
struct idtdesc kidt[256];
uint8_t stack[STACKSIZE];

extern void gdt_flush();
extern void _asm_int_0();
extern void _asm_int_1();
extern void isr0();

void read_gdtr(uint32_t* tgdtr) {
asm("sgdt %0" : "=m" (*tgdtr));
void load_idt(struct idtr *idtr) {
asm volatile("lidt %0" : : "m" (*idtr));
}

void load_gdt(struct gdtr *gdtr) {
asm volatile("lgdt %0" : : "m" (*gdtr));
void outb(uint32_t ad, uint8_t v)
{
asm volatile("outb %%al, %%dx" :: "d" (ad), "a" (v));
}

void load_idt(struct idtr *idtr) {
asm volatile("lidt %0" : : "m" (*idtr));
uint8_t inb(uint32_t ad)
{
uint8_t v;
asm volatile("inb %%dx, %%al" : "=a" (v) : "d" (ad));
return v;
}

//extern void gdt_flush();

void gdt_init(void) {

create_gdt_descriptor(0x0, 0x0, 0x0, 0x0, &kgdt[0]);
Expand Down Expand Up @@ -50,37 +56,15 @@ void create_gdt_descriptor(uint32_t base, uint32_t limit, uint8_t access, uint8_
return;
}

void create_idt_descriptor(uint16_t select, uint32_t offset, uint8_t type, struct idtdesc * desc) {
//printf("select: %d, offset: %d, type: %d\n", select, offset, type);
desc->offset0_15 = (offset & 0xFFFF);
desc->select = select;
desc->access_gran = type;
desc->alwaysZero = 0;
desc->offset16_31 = (offset & 0xFFFF0000) >> 16;
void create_idt_descriptor(uint16_t select, uint32_t offset, uint8_t type, uint8_t num) {
kidt[num].offset0_15 = (offset & 0xFFFF);
kidt[num].select = select;
kidt[num].access_gran = type;
kidt[num].alwaysZero = 0;
kidt[num].offset16_31 = (offset & 0xFFFF0000) >> 16;
return;
}

extern void _asm_int_0();
extern void _asm_int_1();
extern void isr0();

void outb(uint32_t ad, uint8_t v)
{
asm volatile("outb %%al, %%dx" :: "d" (ad), "a" (v));
}

uint8_t inb(uint32_t ad)
{
uint8_t v;
asm volatile("inb %%dx, %%al" : "=a" (v) : "d" (ad));
printf("IN: %d\n", v);
return v;
}
void isr_default_int(int id)
{
printf("default int %d", id);
asm volatile("hlt");
}

void init_pic(void)
{
Expand Down Expand Up @@ -112,210 +96,4 @@ void init_idt(void) {
printf("IDT initialized\n");
}

void *irq_routines[16] ={
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};

void fault_handler(struct regs *r)
{
printf("ERROR everywhere\n");
if (r->int_no < 32)
{
printf("ERROR here\n");
asm("hlt");
} else {
printf("ERROR there\n");
asm("hlt");
}
}

void setup_isr(void) {
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[0]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[1]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[2]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[3]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[4]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[5]);
create_idt_descriptor(0x08, (uint32_t)isr0, INTGATE, &kidt[6]);
}

extern void irq0();
extern void irq1();
extern void irq2();
extern void irq3();
extern void irq4();
extern void irq5();
extern void irq6();
extern void irq7();
extern void irq8();
extern void irq9();
extern void irq10();
extern void irq11();
extern void irq12();
extern void irq13();
extern void irq14();
extern void irq15();
void irq_install_handler(int irq, void (*handler)(struct regs *r)){
printf("INSTALL %d\n", irq);
irq_routines[irq] = handler;
}
void irq_uninstall_handler(int irq){
irq_routines[irq] = 0;
}

void irq_install(){
create_idt_descriptor(0x08, (unsigned)irq0, INTGATE, &kidt[32]);
create_idt_descriptor(0x08, (unsigned)irq1, INTGATE, &kidt[33]);
create_idt_descriptor(0x08, (unsigned)irq2, INTGATE, &kidt[34]);
create_idt_descriptor(0x08, (unsigned)irq3, INTGATE, &kidt[35]);
create_idt_descriptor(0x08, (unsigned)irq4, INTGATE, &kidt[36]);
create_idt_descriptor(0x08, (unsigned)irq5, INTGATE, &kidt[37]);
create_idt_descriptor(0x08, (unsigned)irq6, INTGATE, &kidt[38]);
create_idt_descriptor(0x08, (unsigned)irq7, INTGATE, &kidt[39]);
create_idt_descriptor(0x08, (unsigned)irq8, INTGATE, &kidt[40]);
create_idt_descriptor(0x08, (unsigned)irq9, INTGATE, &kidt[41]);
create_idt_descriptor(0x08, (unsigned)irq10, INTGATE, &kidt[42]);
create_idt_descriptor(0x08, (unsigned)irq11, INTGATE, &kidt[43]);
create_idt_descriptor(0x08, (unsigned)irq12, INTGATE, &kidt[44]);
create_idt_descriptor(0x08, (unsigned)irq13, INTGATE, &kidt[45]);
create_idt_descriptor(0x08, (unsigned)irq14, INTGATE, &kidt[46]);
create_idt_descriptor(0x08, (unsigned)irq15, INTGATE, &kidt[47]);
}

void irq_handler(struct regs *r){
void (*handler)(struct regs *r);

handler = irq_routines[r->int_no - 32];
if (handler)
{
handler(r);
}

// * If the IDT entry that was invoked was greater than 40
// * (meaning IRQ8 - 15), then we need to send an EOI to
// * the slave controller
if (r->int_no >= 40)
{
outb(0xA0, 0x20);
}

// * In either case, we need to send an EOI to the master
// * interrupt controller too
outb(0x20, 0x20);
}

int shift = 0;
unsigned char kbdus[256] = {
0, 27, '1', '2', '3', '4', '5', '6', '7', '8', /* 9 */
'9', '0', '-', '=', '\b', /* Backspace */
'\t', /* Tab */
'q', 'w', 'e', 'r', /* 19 */
't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', /* Enter key */
0, /* 29 - Control */
'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', /* 39 */
'\'', '`', 0, /* Left shift */
'\\', 'z', 'x', 'c', 'v', 'b', 'n', /* 49 */
'm', ',', '.', '/', 0, /* Right shift */
'*',
0, /* Alt */
' ', /* Space bar */
0, /* Caps lock */
0, /* 59 - F1 key ... > */
0, 0, 0, 0, 0, 0, 0, 0,
0, /* < ... F10 */
0, /* 69 - Num lock*/
0, /* Scroll Lock */
0, /* Home key */
0, /* Up Arrow */
0, /* Page Up */
'-',
0, /* Left Arrow */
0,
0, /* Right Arrow */
'+',
0, /* 79 - End key*/
0, /* Down Arrow */
0, /* Page Down */
0, /* Insert Key */
0, /* Delete Key */
0, 0, 0,
0, /* F11 Key */
0, /* F12 Key */
0,
0, 27, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',
'\b', '\t',
'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
0,
'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',
'\"', '~', 0, '|',
'Z', 'X', 'C', 'V', 'B', 'N', 'M',
'<', '>', '?', 0, '*',
0, /* Alt */
' ', /* Space bar */
0, /* Caps lock */
0, /* 59 - F1 key ... > */
0, 0, 0, 0, 0, 0, 0, 0,
0, /* < ... F10 */
0, /* 69 - Num lock*/
0, /* Scroll Lock */
0, /* Home key */
0, /* Up Arrow */
0, /* Page Up */
'-',
0, /* Left Arrow */
0,
0, /* Right Arrow */
'+',
0, /* 79 - End key*/
0, /* Down Arrow */
0, /* Page Down */
0, /* Insert Key */
0, /* Delete Key */
0, 0, 0,
0, /* F11 Key */
0, /* F12 Key */
0

};

void pause(){
int i = 0;
while(i < 100000000){
i++;
}
while(inb(0x60) & 0x80){

};
}
void keyboard_handler(struct regs *r){
unsigned char scancode;
printf("KEYBOARDd\n");
scancode = inb(0x60);

if (scancode & 0x80)
{
if(scancode == 0xAA)
shift = 0;
}
else
{
if(scancode == 0x2a){shift = 1;return;}
// if(scancode == 0x1c){shell_enterpressed();return;}
/* if(scancode == 0x0e){
if(shell_can_backspace()){
printchar(kbdus[scancode]);
}
shell_backspace();
return;
}*/
if(shift){
printf("%c",kbdus[scancode+90]);
// shell_addchar(kbdus[scancode+90]);
}else{
printf("%c",kbdus[scancode]);
// shell_addchar(kbdus[scancode]);
}
}
}

Loading

0 comments on commit fa26e54

Please sign in to comment.