diff options
| author | Aleksa Vučković <aleksav013@gmail.com> | 2022-01-21 21:44:28 +0100 |
|---|---|---|
| committer | Aleksa Vučković <aleksav013@gmail.com> | 2022-01-21 23:24:55 +0100 |
| commit | a914c37365967afaf3148293a857c36af6f94ecb (patch) | |
| tree | b7086b0b0b6e4bf427210fcfd31c7745920a73a5 /src/include | |
| parent | ed84017353c6fc9421b223ff6ec62f8d881d8098 (diff) | |
Separating assembly, moving #defines to .h & cleaning Makefile
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/asm.h | 7 | ||||
| -rw-r--r-- | src/include/source/irq_handler.h | 6 | ||||
| -rw-r--r-- | src/include/source/keyboard.h | 6 | ||||
| -rw-r--r-- | src/include/source/keymap.h | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/include/asm.h b/src/include/asm.h index e57c35b..ee15f00 100644 --- a/src/include/asm.h +++ b/src/include/asm.h @@ -3,7 +3,14 @@ #include<types.h> +#define PIC1_COMMAND_PORT 0x20 +#define PIC1_DATA_PORT 0x21 +#define PIC2_COMMAND_PORT 0xA0 +#define PIC2_DATA_PORT 0xA1 + + extern uint8_t ioport_in(uint8_t port); extern void ioport_out(uint8_t port, int data); + #endif diff --git a/src/include/source/irq_handler.h b/src/include/source/irq_handler.h index 41b4f8c..a20ed70 100644 --- a/src/include/source/irq_handler.h +++ b/src/include/source/irq_handler.h @@ -1,6 +1,12 @@ #ifndef SOURCE_IRQ_HANDLER_H #define SOURCE_IRQ_HANDLER_H +#define INTERRUPT_GATE_32 0x8e + +#define KERNEL_CODE 0x08 +#define KERNEL_DATA 0x10 + + void irq0_handler(void); void irq1_handler(void); void irq2_handler(void); diff --git a/src/include/source/keyboard.h b/src/include/source/keyboard.h index 28fa104..a023e66 100644 --- a/src/include/source/keyboard.h +++ b/src/include/source/keyboard.h @@ -1,6 +1,12 @@ #ifndef SOURCE_KEYBOARD_H #define SOURCE_KEYBOARD_H +#define BUFFER_SIZE 200 +#define BUFFER_LOG 200 + +#define KEYBOARD_DATA_PORT 0x60 +#define KEYBOARD_STATUS_PORT 0x64 + void init_keyboard(void); void deletelast(void); void backspace(void); diff --git a/src/include/source/keymap.h b/src/include/source/keymap.h index 1c474ae..7d01291 100644 --- a/src/include/source/keymap.h +++ b/src/include/source/keymap.h @@ -3,6 +3,11 @@ #include<types.h> +#define lshift 0x2A +#define rshift 0x36 +#define lctrl 0x1D +#define rctrl 0x1D + void us_en(char keymap[]); void us_en_shift(char keymap[]); |