From ccd9c75f8e186b4e4e94868548eb5bf072aa63d6 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <turner@atlantissrv.com>
Date: Thu, 14 Sep 2023 10:49:49 -0400
Subject: [PATCH] Finished 02_driver: Moved X to VGA Location.

---
 Part2/.DS_Store                    | Bin 8196 -> 8196 bytes
 Part2/A4/.DS_Store                 | Bin 8196 -> 8196 bytes
 Part2/A4/02_driver/.DS_Store       | Bin 6148 -> 6148 bytes
 Part2/A4/02_driver/kernel/kernel.c |   8 ++++----
 Part2/A4/06_irq/.DS_Store          | Bin 6148 -> 6148 bytes
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Part2/.DS_Store b/Part2/.DS_Store
index 54fa1b0e9b44988abf11fc2810c508d91e7e596e..9863d6d182d5c3e27e1754ce2ad634220122d3e2 100644
GIT binary patch
delta 18
ZcmZp1XmQxESAfxQ@&!Tr&3^^h`2j@a2EhOT

delta 16
XcmZp1XmQxES77paL5IzM1=#rkJmCh9

diff --git a/Part2/A4/.DS_Store b/Part2/A4/.DS_Store
index c6284231f5080dd518f8dbd787dd754e4d506b79..b903815059af6224b63c968fdc6a826d3a5a8d54 100644
GIT binary patch
delta 29
jcmZp1XmQx^MR4*t0h!GLLMxa+jL8B*Dw}_Z@NfeFuTTnx

delta 25
dcmZp1XmQx^MR4*YVTa8oLM=>S#t#u5ZUBau34;It

diff --git a/Part2/A4/02_driver/.DS_Store b/Part2/A4/02_driver/.DS_Store
index 3fb9b9fbdca50c789f01b89c09ad7b20e6e60f88..807eff96b239e8e2d710108f40b9b22abdb34855 100644
GIT binary patch
delta 109
zcmZoMXfc=|#>B!ku~2NHo+2a1#(>?7iw`g}F>*}iVTzn=&cr`?9#bo$;bawNdueut
z6ow*(OolRsR3Kek7F?8<lb@H)z`($`If-dA(`I%Keh#2vn>R9lXP(S2;>f|sz`z8Q
LX4o7dvW6J|1}_?C

delta 67
zcmZoMXfc=|#>B)qu~2NHo+2aL#(>?7jBJy6SRyxvvu<G8*zk#IGdl-A2T;joL5}at
Vlles)IT(O|k%56_bA-qmW&mBO5I+C_

diff --git a/Part2/A4/02_driver/kernel/kernel.c b/Part2/A4/02_driver/kernel/kernel.c
index 050e51c..fc85bf5 100755
--- a/Part2/A4/02_driver/kernel/kernel.c
+++ b/Part2/A4/02_driver/kernel/kernel.c
@@ -9,11 +9,11 @@ void _start() {
     position = position << 8; /* high byte */
 
     port_byte_out(0x3d4, 15); /* requesting low byte */
-    position += port_byte_in(0x3d5);
+    position += port_byte_in(0x3d5) + 250;
 
     /* VGA 'cells' consist of the character and its control data
      * e.g. 'white on black background', 'red text on white bg', etc */
-    int offset_from_vga = position * 2.3;
+    int offset_from_vga = position * 2;
 
     /* Now you can examine both variables using gdb, since we still
      * don't know how to print strings on screen. Run 'make debug' and
@@ -27,6 +27,6 @@ void _start() {
     /* Let's write on the current cursor position, we already know how
      * to do that */
     char *vga = (char *) 0xb8000;
-    vga[offset_from_vga+10] = 'X';
-    vga[offset_from_vga+11] = 0x0f; /* White text on black background */
+    vga[offset_from_vga] = 'X';
+    vga[offset_from_vga+1] = 0x0f; /* White text on black background */
 }
diff --git a/Part2/A4/06_irq/.DS_Store b/Part2/A4/06_irq/.DS_Store
index b23acb68bff1d4d9bbaa514ce012e9241fbbb795..ef1b06b3b3d30f8e1ec1d61fa482c34cfb19a212 100644
GIT binary patch
delta 184
zcmZoMXfc=|#>B!ku~2NHo}wrl0|Nsi1A_oVaY0f}eiD$kEvaBLBhzwbZjcl+Lo!1F
zL+NB0##Tnd$%`26RiPqf!9{sF`FZIO?F{S;DGWsnnG9tNsX)3Ip<WtI23g-`9!7Ph
i&Fmcf96<K~?flL>nP0?G0O%Yb0uxLidUJ%x8fE}e3MF6w

delta 96
zcmZoMXfc=|#>B`mu~2NHo}wrd0|Nsi1A_nqLn=c~Qh9MfQcix-#KPs14MbQrKW0^7
s+N{9A&N8v#>}GZjeh#3%&4L`?nJ4p$SOT?xwSr6l8NsqSLSzjy09&^d?f?J)