git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: vfs_open: start opening iff there is a empty fd slot available.
[lunaix-os.git]
/
lunaix-os
/
includes
/
arch
/
x86
/
interrupts.h
diff --git
a/lunaix-os/includes/arch/x86/interrupts.h
b/lunaix-os/includes/arch/x86/interrupts.h
index b608cd6217a2f22d028746ac42ecaf0c2f637148..d25fbe3b68d9e931b7062d559b7f9cbf6ad411ed 100644
(file)
--- a/
lunaix-os/includes/arch/x86/interrupts.h
+++ b/
lunaix-os/includes/arch/x86/interrupts.h
@@
-1,7
+1,28
@@
#ifndef __LUNAIX_INTERRUPTS_H
#define __LUNAIX_INTERRUPTS_H
#ifndef __LUNAIX_INTERRUPTS_H
#define __LUNAIX_INTERRUPTS_H
-typedef struct {
+#include "vectors.h"
+
+#ifndef __ASM__
+#include <hal/cpu.h>
+typedef struct
+{
+ struct
+ {
+ reg32 eax;
+ reg32 ebx;
+ reg32 ecx;
+ reg32 edx;
+ reg32 edi;
+ reg32 ebp;
+ reg32 esi;
+ reg32 ds;
+ reg32 es;
+ reg32 fs;
+ reg32 gs;
+ reg32 esp;
+ } __attribute__((packed)) registers;
+
unsigned int vector;
unsigned int err_code;
unsigned int eip;
unsigned int vector;
unsigned int err_code;
unsigned int eip;
@@
-12,9
+33,11
@@
typedef struct {
} __attribute__((packed)) isr_param;
void
} __attribute__((packed)) isr_param;
void
-
_asm_isr0(
);
+
intr_handler(isr_param* param
);
void
void
-interrupt_handler(isr_param* param);
+intr_routine_init();
+
+#endif
#endif /* __LUNAIX_INTERRUPTS_H */
#endif /* __LUNAIX_INTERRUPTS_H */