Promene

13 files changed, 2 insertions, 53 deletions

diff --git a/include/01.pocetak/boot.s b/include/01.pocetak/boot.s
index 907cd3c..f65cc72 100644
--- a/include/01.pocetak/boot.s
+++ b/include/01.pocetak/boot.s
@@ -10,35 +10,6 @@
 .long FLAGS
 .long CHECKSUM
 
-.global _start
-.global load_gdt
-.global load_idt
-.global enable_interrupts
-.global ioport_in
-.global ioport_out
-
-load_gdt:
-    movl 4(%esp), %edx
-    lgdt (%edx)
-    ret
-
-load_idt:
-    movl 4(%esp), %edx
-    lidt (%edx)
-    sti
-    ret
-
-ioport_in:
-    movl 4(%esp),%edx
-    in %dx,%al
-    ret
-
-ioport_out:
-    movl 4(%esp),%edx
-    movl 8(%esp),%eax
-    outb %al,%dx
-    ret
-
 .set CODE_SEGMENT, 0x08
 .set DATA_SEGMENT, 0x10
 
@@ -49,6 +20,7 @@ stack_bottom:
 stack_top:
 
 .section .text
+.global _start
 .type _start, @function
 _start:
     call init_gdt_table
diff --git a/include/01.pocetak/deo1 b/include/01.pocetak/boot1.s
index 0e1bfbe..0e1bfbe 100644
--- a/include/01.pocetak/deo1
+++ b/include/01.pocetak/boot1.s
diff --git a/include/01.pocetak/deo2 b/include/01.pocetak/boot2.s
index cd7b353..cd7b353 100644
--- a/include/01.pocetak/deo2
+++ b/include/01.pocetak/boot2.s
diff --git a/include/01.pocetak/deo8 b/include/01.pocetak/boot3.s
index cd3f772..cd3f772 100644
--- a/include/01.pocetak/deo8
+++ b/include/01.pocetak/boot3.s
diff --git a/include/01.pocetak/deo9 b/include/01.pocetak/boot4.s
index a9280a6..a9280a6 100644
--- a/include/01.pocetak/deo9
+++ b/include/01.pocetak/boot4.s
diff --git a/include/01.pocetak/deo10 b/include/01.pocetak/boot5.s
index 3cd7ea1..2fe5ffc 100644
--- a/include/01.pocetak/deo10
+++ b/include/01.pocetak/boot5.s
@@ -1,4 +1,5 @@
 .section .text
+.global _start
 .type _start, @function
 _start:
     call init_gdt_table
diff --git a/include/01.pocetak/deo11 b/include/01.pocetak/boot6.s
index bd0f1da..bd0f1da 100644
--- a/include/01.pocetak/deo11
+++ b/include/01.pocetak/boot6.s
diff --git a/include/01.pocetak/deo12 b/include/01.pocetak/boot7.s
index d1d8388..d1d8388 100644
--- a/include/01.pocetak/deo12
+++ b/include/01.pocetak/boot7.s
diff --git a/include/01.pocetak/deo3 b/include/01.pocetak/deo3
deleted file mode 100644
index 44fcb34..0000000
--- a/include/01.pocetak/deo3
+++ /dev/null
@@ -1,6 +0,0 @@
-.global _start
-.global load_gdt
-.global load_idt
-.global enable_interrupts
-.global ioport_in
-.global ioport_out
diff --git a/include/01.pocetak/deo4 b/include/01.pocetak/deo4
deleted file mode 100644
index 975ee19..0000000
--- a/include/01.pocetak/deo4
+++ /dev/null
@@ -1,4 +0,0 @@
-load_gdt:
-    movl 4(%esp), %edx
-    lgdt (%edx)
-    ret
diff --git a/include/01.pocetak/deo5 b/include/01.pocetak/deo5
deleted file mode 100644
index 6f095e9..0000000
--- a/include/01.pocetak/deo5
+++ /dev/null
@@ -1,5 +0,0 @@
-load_idt:
-    movl 4(%esp), %edx
-    lidt (%edx)
-    sti
-    ret
diff --git a/include/01.pocetak/deo6 b/include/01.pocetak/deo6
deleted file mode 100644
index 3f23d36..0000000
--- a/include/01.pocetak/deo6
+++ /dev/null
@@ -1,4 +0,0 @@
-ioport_in:
-    movl 4(%esp),%edx
-    in %dx,%al
-    ret
diff --git a/include/01.pocetak/deo7 b/include/01.pocetak/deo7
deleted file mode 100644
index f441d17..0000000
--- a/include/01.pocetak/deo7
+++ /dev/null
@@ -1,5 +0,0 @@
-ioport_out:
-    movl 4(%esp),%edx
-    movl 8(%esp),%eax
-    outb %al,%dx
-    ret