From 03035c98b4ba3297b837e96080e78e0aac1e86db Mon Sep 17 00:00:00 2001
From: Aleksa Vučković <aleksav013@gmail.com>
Date: Mon, 31 Jan 2022 11:16:38 +0100
Subject: Promene

---
 include/06.keyboard/deo1         |  3 ---
 include/06.keyboard/deo10        | 18 ------------------
 include/06.keyboard/deo11        |  5 -----
 include/06.keyboard/deo12        | 11 -----------
 include/06.keyboard/deo13        | 11 -----------
 include/06.keyboard/deo14        |  3 ---
 include/06.keyboard/deo15        |  3 ---
 include/06.keyboard/deo16        |  4 ----
 include/06.keyboard/deo17        |  8 --------
 include/06.keyboard/deo18        | 23 -----------------------
 include/06.keyboard/deo19        | 22 ----------------------
 include/06.keyboard/deo2         |  7 -------
 include/06.keyboard/deo20        |  7 -------
 include/06.keyboard/deo3         |  7 -------
 include/06.keyboard/deo4         |  6 ------
 include/06.keyboard/deo5         |  7 -------
 include/06.keyboard/deo6         |  5 -----
 include/06.keyboard/deo7         |  6 ------
 include/06.keyboard/deo8         |  3 ---
 include/06.keyboard/deo9         |  4 ----
 include/06.keyboard/keyboard.c   | 27 +++++----------------------
 include/06.keyboard/keyboard1.c  |  7 +++++++
 include/06.keyboard/keyboard10.c | 11 +++++++++++
 include/06.keyboard/keyboard11.c | 11 +++++++++++
 include/06.keyboard/keyboard12.c |  3 +++
 include/06.keyboard/keyboard13.c |  3 +++
 include/06.keyboard/keyboard14.c |  4 ++++
 include/06.keyboard/keyboard15.c |  8 ++++++++
 include/06.keyboard/keyboard16.c | 23 +++++++++++++++++++++++
 include/06.keyboard/keyboard17.c | 22 ++++++++++++++++++++++
 include/06.keyboard/keyboard18.c |  7 +++++++
 include/06.keyboard/keyboard2.c  |  5 +++++
 include/06.keyboard/keyboard3.c  |  3 +++
 include/06.keyboard/keyboard4.c  |  5 +++++
 include/06.keyboard/keyboard5.c  |  6 ++++++
 include/06.keyboard/keyboard6.c  |  3 +++
 include/06.keyboard/keyboard7.c  |  4 ++++
 include/06.keyboard/keyboard8.c  | 18 ++++++++++++++++++
 include/06.keyboard/keyboard9.c  |  5 +++++
 39 files changed, 153 insertions(+), 185 deletions(-)
 delete mode 100644 include/06.keyboard/deo1
 delete mode 100644 include/06.keyboard/deo10
 delete mode 100644 include/06.keyboard/deo11
 delete mode 100644 include/06.keyboard/deo12
 delete mode 100644 include/06.keyboard/deo13
 delete mode 100644 include/06.keyboard/deo14
 delete mode 100644 include/06.keyboard/deo15
 delete mode 100644 include/06.keyboard/deo16
 delete mode 100644 include/06.keyboard/deo17
 delete mode 100644 include/06.keyboard/deo18
 delete mode 100644 include/06.keyboard/deo19
 delete mode 100644 include/06.keyboard/deo2
 delete mode 100644 include/06.keyboard/deo20
 delete mode 100644 include/06.keyboard/deo3
 delete mode 100644 include/06.keyboard/deo4
 delete mode 100644 include/06.keyboard/deo5
 delete mode 100644 include/06.keyboard/deo6
 delete mode 100644 include/06.keyboard/deo7
 delete mode 100644 include/06.keyboard/deo8
 delete mode 100644 include/06.keyboard/deo9
 create mode 100644 include/06.keyboard/keyboard1.c
 create mode 100644 include/06.keyboard/keyboard10.c
 create mode 100644 include/06.keyboard/keyboard11.c
 create mode 100644 include/06.keyboard/keyboard12.c
 create mode 100644 include/06.keyboard/keyboard13.c
 create mode 100644 include/06.keyboard/keyboard14.c
 create mode 100644 include/06.keyboard/keyboard15.c
 create mode 100644 include/06.keyboard/keyboard16.c
 create mode 100644 include/06.keyboard/keyboard17.c
 create mode 100644 include/06.keyboard/keyboard18.c
 create mode 100644 include/06.keyboard/keyboard2.c
 create mode 100644 include/06.keyboard/keyboard3.c
 create mode 100644 include/06.keyboard/keyboard4.c
 create mode 100644 include/06.keyboard/keyboard5.c
 create mode 100644 include/06.keyboard/keyboard6.c
 create mode 100644 include/06.keyboard/keyboard7.c
 create mode 100644 include/06.keyboard/keyboard8.c
 create mode 100644 include/06.keyboard/keyboard9.c

(limited to 'include/06.keyboard')

diff --git a/include/06.keyboard/deo1 b/include/06.keyboard/deo1
deleted file mode 100644
index 13fd550..0000000
--- a/include/06.keyboard/deo1
+++ /dev/null
@@ -1,3 +0,0 @@
-#include<types.h>
-#include<asm.h>
-#include<stdio.h>
diff --git a/include/06.keyboard/deo10 b/include/06.keyboard/deo10
deleted file mode 100644
index e5d558c..0000000
--- a/include/06.keyboard/deo10
+++ /dev/null
@@ -1,18 +0,0 @@
-void enter()
-{
-    printf("\n");
-    if(buffer_index>0)
-    {
-        tty(buffer[buffer_current]);
-        buffer_size[buffer_current]=buffer_index;
-        if(buffer_current==buffer_all) buffer_current=(++buffer_all);
-        else
-        {
-            for(size_t i=0;i<BUFFER_SIZE;i++) buffer[buffer_all][i]='\0';
-            buffer_current=buffer_all;
-        }
-        buffer_index=0;
-    }
-    prompt();
-    return;
-}
diff --git a/include/06.keyboard/deo11 b/include/06.keyboard/deo11
deleted file mode 100644
index 33bc64b..0000000
--- a/include/06.keyboard/deo11
+++ /dev/null
@@ -1,5 +0,0 @@
-void space()
-{
-    buffer[buffer_current][buffer_index++]=' ';
-    printf(" ");
-}
diff --git a/include/06.keyboard/deo12 b/include/06.keyboard/deo12
deleted file mode 100644
index b40c42b..0000000
--- a/include/06.keyboard/deo12
+++ /dev/null
@@ -1,11 +0,0 @@
-void keyup()
-{
-    if(buffer_current>0)
-    {
-        buffer_size[buffer_current]=buffer_index;
-        for(size_t i=0;i<buffer_index;i++) deletelast();
-        buffer_current--;
-        buffer_index=buffer_size[buffer_current];
-        printf("%s",buffer[buffer_current]);
-    }
-}
diff --git a/include/06.keyboard/deo13 b/include/06.keyboard/deo13
deleted file mode 100644
index 87b6e42..0000000
--- a/include/06.keyboard/deo13
+++ /dev/null
@@ -1,11 +0,0 @@
-void keydown()
-{
-    if(buffer_current<buffer_all)
-    {
-        buffer_size[buffer_current]=buffer_index;
-        for(size_t i=0;i<buffer_index;i++) deletelast();
-        buffer_current++;
-        buffer_index=buffer_size[buffer_current];
-        printf("%s",buffer[buffer_current]);
-    }
-}
diff --git a/include/06.keyboard/deo14 b/include/06.keyboard/deo14
deleted file mode 100644
index 15df074..0000000
--- a/include/06.keyboard/deo14
+++ /dev/null
@@ -1,3 +0,0 @@
-void keyleft()
-{
-}
diff --git a/include/06.keyboard/deo15 b/include/06.keyboard/deo15
deleted file mode 100644
index c7fca4c..0000000
--- a/include/06.keyboard/deo15
+++ /dev/null
@@ -1,3 +0,0 @@
-void keyright()
-{
-}
diff --git a/include/06.keyboard/deo16 b/include/06.keyboard/deo16
deleted file mode 100644
index a55e9c2..0000000
--- a/include/06.keyboard/deo16
+++ /dev/null
@@ -1,4 +0,0 @@
-void keyboard_handler()
-{
-    ioport_out(PIC1_COMMAND_PORT, 0x20);
-    uint8_t status = ioport_in(KEYBOARD_STATUS_PORT);
diff --git a/include/06.keyboard/deo17 b/include/06.keyboard/deo17
deleted file mode 100644
index ded0af2..0000000
--- a/include/06.keyboard/deo17
+++ /dev/null
@@ -1,8 +0,0 @@
-    if (status & 0x1)
-    {
-        uint8_t keycode = ioport_in(KEYBOARD_DATA_PORT);
-        if(keycode<0x80)
-        {
-            char c=charcode[keycode];
-            ispressed[keycode]=1;
-            // printf("%d ",&keycode);
diff --git a/include/06.keyboard/deo18 b/include/06.keyboard/deo18
deleted file mode 100644
index 04688a9..0000000
--- a/include/06.keyboard/deo18
+++ /dev/null
@@ -1,23 +0,0 @@
-            switch(keycode)
-            {
-                case 0x0E:
-                    backspace();
-                    break;
-                case 0x1C:
-                    enter();
-                    break;
-                case 0x39:
-                    space();
-                    break;
-                case 72:
-                    keyup();
-                    break;
-                case 80:
-                    keydown();
-                    break;
-                case 75:
-                    keyleft();
-                    break;
-                case 77:
-                    keyright();
-                    break;
diff --git a/include/06.keyboard/deo19 b/include/06.keyboard/deo19
deleted file mode 100644
index 359ba30..0000000
--- a/include/06.keyboard/deo19
+++ /dev/null
@@ -1,22 +0,0 @@
-                default:
-                    if(c!=' ')
-                    {
-                        if(ispressed[lctrl]||ispressed[rctrl])
-                        {
-                            if(c=='l')
-                            {
-                                clear();
-                                prompt();
-                                printf("%s",buffer[buffer_current]);
-                                return;
-                            }
-                        }
-                        if(ispressed[lshift]||ispressed[rshift])
-                        {
-                            c=shift_charcode[keycode];
-                        }
-                        buffer[buffer_current][buffer_index++]=c;
-                        printf("%c",c);
-                    }
-                    break;
-            }
diff --git a/include/06.keyboard/deo2 b/include/06.keyboard/deo2
deleted file mode 100644
index 50d7c07..0000000
--- a/include/06.keyboard/deo2
+++ /dev/null
@@ -1,7 +0,0 @@
-#define BUFFER_SIZE 200
-#define BUFFER_LOG 200
-char buffer[BUFFER_LOG][BUFFER_SIZE];
-size_t buffer_size[BUFFER_LOG];
-size_t buffer_current=0;
-size_t buffer_all=0;
-size_t buffer_index=0;
diff --git a/include/06.keyboard/deo20 b/include/06.keyboard/deo20
deleted file mode 100644
index d594130..0000000
--- a/include/06.keyboard/deo20
+++ /dev/null
@@ -1,7 +0,0 @@
-        }
-        else
-        {
-            ispressed[keycode-0x80]=0;
-        }
-    }
-}
diff --git a/include/06.keyboard/deo3 b/include/06.keyboard/deo3
deleted file mode 100644
index 239c874..0000000
--- a/include/06.keyboard/deo3
+++ /dev/null
@@ -1,7 +0,0 @@
-#define PIC1_COMMAND_PORT 0x20
-#define PIC1_DATA_PORT 0x21
-#define PIC2_COMMAND_PORT 0xA0
-#define PIC2_DATA_PORT 0xA1
-// IO Ports for Keyboard
-#define KEYBOARD_DATA_PORT 0x60
-#define KEYBOARD_STATUS_PORT 0x64
diff --git a/include/06.keyboard/deo4 b/include/06.keyboard/deo4
deleted file mode 100644
index 3322fd7..0000000
--- a/include/06.keyboard/deo4
+++ /dev/null
@@ -1,6 +0,0 @@
-void previous_field(void);
-void tty(char *buffer);
-void prompt(void);
-void clear();
-void us_en(char keymap[]);
-void us_en_shift(char keymap[]);
diff --git a/include/06.keyboard/deo5 b/include/06.keyboard/deo5
deleted file mode 100644
index 57028c5..0000000
--- a/include/06.keyboard/deo5
+++ /dev/null
@@ -1,7 +0,0 @@
-char charcode[256];
-char shift_charcode[256];
-bool ispressed[128];
-#define lshift 0x2A
-#define rshift 0x36
-#define lctrl 0x1D
-#define rctrl 0x1D
diff --git a/include/06.keyboard/deo6 b/include/06.keyboard/deo6
deleted file mode 100644
index 5c089ce..0000000
--- a/include/06.keyboard/deo6
+++ /dev/null
@@ -1,5 +0,0 @@
-void init_keyboard()
-{
-    us_en(charcode);
-    us_en_shift(shift_charcode);
-}
diff --git a/include/06.keyboard/deo7 b/include/06.keyboard/deo7
deleted file mode 100644
index 55e04b8..0000000
--- a/include/06.keyboard/deo7
+++ /dev/null
@@ -1,6 +0,0 @@
-void deletelast()
-{
-    previous_field();
-    printf(" ");
-    previous_field();
-}
diff --git a/include/06.keyboard/deo8 b/include/06.keyboard/deo8
deleted file mode 100644
index 95a5ac5..0000000
--- a/include/06.keyboard/deo8
+++ /dev/null
@@ -1,3 +0,0 @@
-void backspace()
-{
-    if(buffer_index<=0) return;
diff --git a/include/06.keyboard/deo9 b/include/06.keyboard/deo9
deleted file mode 100644
index bc07378..0000000
--- a/include/06.keyboard/deo9
+++ /dev/null
@@ -1,4 +0,0 @@
-    deletelast();
-    buffer[buffer_current][--buffer_index]='\0';
-    return;
-}
diff --git a/include/06.keyboard/keyboard.c b/include/06.keyboard/keyboard.c
index 2218f09..a95d399 100644
--- a/include/06.keyboard/keyboard.c
+++ b/include/06.keyboard/keyboard.c
@@ -1,37 +1,20 @@
+#include<source/keyboard.h>
 #include<types.h>
 #include<asm.h>
-#include<stdio.h>
+#include<source/stdio.h>
+#include<source/keymap.h>
+#include<source/vga.h>
+#include<source/tty.h>
 
-#define BUFFER_SIZE 200
-#define BUFFER_LOG 200
 char buffer[BUFFER_LOG][BUFFER_SIZE];
 size_t buffer_size[BUFFER_LOG];
 size_t buffer_current=0;
 size_t buffer_all=0;
 size_t buffer_index=0;
 
-#define PIC1_COMMAND_PORT 0x20
-#define PIC1_DATA_PORT 0x21
-#define PIC2_COMMAND_PORT 0xA0
-#define PIC2_DATA_PORT 0xA1
-// IO Ports for Keyboard
-#define KEYBOARD_DATA_PORT 0x60
-#define KEYBOARD_STATUS_PORT 0x64
-
-void previous_field(void);
-void tty(char *buffer);
-void prompt(void);
-void clear();
-void us_en(char keymap[]);
-void us_en_shift(char keymap[]);
-
 char charcode[256];
 char shift_charcode[256];
 bool ispressed[128];
-#define lshift 0x2A
-#define rshift 0x36
-#define lctrl 0x1D
-#define rctrl 0x1D
 
 void init_keyboard()
 {
diff --git a/include/06.keyboard/keyboard1.c b/include/06.keyboard/keyboard1.c
new file mode 100644
index 0000000..7576f1e
--- /dev/null
+++ b/include/06.keyboard/keyboard1.c
@@ -0,0 +1,7 @@
+#include<source/keyboard.h>
+#include<types.h>
+#include<asm.h>
+#include<source/stdio.h>
+#include<source/keymap.h>
+#include<source/vga.h>
+#include<source/tty.h>
diff --git a/include/06.keyboard/keyboard10.c b/include/06.keyboard/keyboard10.c
new file mode 100644
index 0000000..b40c42b
--- /dev/null
+++ b/include/06.keyboard/keyboard10.c
@@ -0,0 +1,11 @@
+void keyup()
+{
+    if(buffer_current>0)
+    {
+        buffer_size[buffer_current]=buffer_index;
+        for(size_t i=0;i<buffer_index;i++) deletelast();
+        buffer_current--;
+        buffer_index=buffer_size[buffer_current];
+        printf("%s",buffer[buffer_current]);
+    }
+}
diff --git a/include/06.keyboard/keyboard11.c b/include/06.keyboard/keyboard11.c
new file mode 100644
index 0000000..87b6e42
--- /dev/null
+++ b/include/06.keyboard/keyboard11.c
@@ -0,0 +1,11 @@
+void keydown()
+{
+    if(buffer_current<buffer_all)
+    {
+        buffer_size[buffer_current]=buffer_index;
+        for(size_t i=0;i<buffer_index;i++) deletelast();
+        buffer_current++;
+        buffer_index=buffer_size[buffer_current];
+        printf("%s",buffer[buffer_current]);
+    }
+}
diff --git a/include/06.keyboard/keyboard12.c b/include/06.keyboard/keyboard12.c
new file mode 100644
index 0000000..15df074
--- /dev/null
+++ b/include/06.keyboard/keyboard12.c
@@ -0,0 +1,3 @@
+void keyleft()
+{
+}
diff --git a/include/06.keyboard/keyboard13.c b/include/06.keyboard/keyboard13.c
new file mode 100644
index 0000000..c7fca4c
--- /dev/null
+++ b/include/06.keyboard/keyboard13.c
@@ -0,0 +1,3 @@
+void keyright()
+{
+}
diff --git a/include/06.keyboard/keyboard14.c b/include/06.keyboard/keyboard14.c
new file mode 100644
index 0000000..a55e9c2
--- /dev/null
+++ b/include/06.keyboard/keyboard14.c
@@ -0,0 +1,4 @@
+void keyboard_handler()
+{
+    ioport_out(PIC1_COMMAND_PORT, 0x20);
+    uint8_t status = ioport_in(KEYBOARD_STATUS_PORT);
diff --git a/include/06.keyboard/keyboard15.c b/include/06.keyboard/keyboard15.c
new file mode 100644
index 0000000..ded0af2
--- /dev/null
+++ b/include/06.keyboard/keyboard15.c
@@ -0,0 +1,8 @@
+    if (status & 0x1)
+    {
+        uint8_t keycode = ioport_in(KEYBOARD_DATA_PORT);
+        if(keycode<0x80)
+        {
+            char c=charcode[keycode];
+            ispressed[keycode]=1;
+            // printf("%d ",&keycode);
diff --git a/include/06.keyboard/keyboard16.c b/include/06.keyboard/keyboard16.c
new file mode 100644
index 0000000..04688a9
--- /dev/null
+++ b/include/06.keyboard/keyboard16.c
@@ -0,0 +1,23 @@
+            switch(keycode)
+            {
+                case 0x0E:
+                    backspace();
+                    break;
+                case 0x1C:
+                    enter();
+                    break;
+                case 0x39:
+                    space();
+                    break;
+                case 72:
+                    keyup();
+                    break;
+                case 80:
+                    keydown();
+                    break;
+                case 75:
+                    keyleft();
+                    break;
+                case 77:
+                    keyright();
+                    break;
diff --git a/include/06.keyboard/keyboard17.c b/include/06.keyboard/keyboard17.c
new file mode 100644
index 0000000..359ba30
--- /dev/null
+++ b/include/06.keyboard/keyboard17.c
@@ -0,0 +1,22 @@
+                default:
+                    if(c!=' ')
+                    {
+                        if(ispressed[lctrl]||ispressed[rctrl])
+                        {
+                            if(c=='l')
+                            {
+                                clear();
+                                prompt();
+                                printf("%s",buffer[buffer_current]);
+                                return;
+                            }
+                        }
+                        if(ispressed[lshift]||ispressed[rshift])
+                        {
+                            c=shift_charcode[keycode];
+                        }
+                        buffer[buffer_current][buffer_index++]=c;
+                        printf("%c",c);
+                    }
+                    break;
+            }
diff --git a/include/06.keyboard/keyboard18.c b/include/06.keyboard/keyboard18.c
new file mode 100644
index 0000000..d594130
--- /dev/null
+++ b/include/06.keyboard/keyboard18.c
@@ -0,0 +1,7 @@
+        }
+        else
+        {
+            ispressed[keycode-0x80]=0;
+        }
+    }
+}
diff --git a/include/06.keyboard/keyboard2.c b/include/06.keyboard/keyboard2.c
new file mode 100644
index 0000000..6361589
--- /dev/null
+++ b/include/06.keyboard/keyboard2.c
@@ -0,0 +1,5 @@
+char buffer[BUFFER_LOG][BUFFER_SIZE];
+size_t buffer_size[BUFFER_LOG];
+size_t buffer_current=0;
+size_t buffer_all=0;
+size_t buffer_index=0;
diff --git a/include/06.keyboard/keyboard3.c b/include/06.keyboard/keyboard3.c
new file mode 100644
index 0000000..f42433e
--- /dev/null
+++ b/include/06.keyboard/keyboard3.c
@@ -0,0 +1,3 @@
+char charcode[256];
+char shift_charcode[256];
+bool ispressed[128];
diff --git a/include/06.keyboard/keyboard4.c b/include/06.keyboard/keyboard4.c
new file mode 100644
index 0000000..5c089ce
--- /dev/null
+++ b/include/06.keyboard/keyboard4.c
@@ -0,0 +1,5 @@
+void init_keyboard()
+{
+    us_en(charcode);
+    us_en_shift(shift_charcode);
+}
diff --git a/include/06.keyboard/keyboard5.c b/include/06.keyboard/keyboard5.c
new file mode 100644
index 0000000..55e04b8
--- /dev/null
+++ b/include/06.keyboard/keyboard5.c
@@ -0,0 +1,6 @@
+void deletelast()
+{
+    previous_field();
+    printf(" ");
+    previous_field();
+}
diff --git a/include/06.keyboard/keyboard6.c b/include/06.keyboard/keyboard6.c
new file mode 100644
index 0000000..95a5ac5
--- /dev/null
+++ b/include/06.keyboard/keyboard6.c
@@ -0,0 +1,3 @@
+void backspace()
+{
+    if(buffer_index<=0) return;
diff --git a/include/06.keyboard/keyboard7.c b/include/06.keyboard/keyboard7.c
new file mode 100644
index 0000000..bc07378
--- /dev/null
+++ b/include/06.keyboard/keyboard7.c
@@ -0,0 +1,4 @@
+    deletelast();
+    buffer[buffer_current][--buffer_index]='\0';
+    return;
+}
diff --git a/include/06.keyboard/keyboard8.c b/include/06.keyboard/keyboard8.c
new file mode 100644
index 0000000..e5d558c
--- /dev/null
+++ b/include/06.keyboard/keyboard8.c
@@ -0,0 +1,18 @@
+void enter()
+{
+    printf("\n");
+    if(buffer_index>0)
+    {
+        tty(buffer[buffer_current]);
+        buffer_size[buffer_current]=buffer_index;
+        if(buffer_current==buffer_all) buffer_current=(++buffer_all);
+        else
+        {
+            for(size_t i=0;i<BUFFER_SIZE;i++) buffer[buffer_all][i]='\0';
+            buffer_current=buffer_all;
+        }
+        buffer_index=0;
+    }
+    prompt();
+    return;
+}
diff --git a/include/06.keyboard/keyboard9.c b/include/06.keyboard/keyboard9.c
new file mode 100644
index 0000000..33bc64b
--- /dev/null
+++ b/include/06.keyboard/keyboard9.c
@@ -0,0 +1,5 @@
+void space()
+{
+    buffer[buffer_current][buffer_index++]=' ';
+    printf(" ");
+}
-- 
cgit v1.2.3