From 630769065d679339c94e7bda2cd1492fdef6208e Mon Sep 17 00:00:00 2001
From: pjht <terppa05@gmail.com>
Date: Sun, 5 May 2019 07:31:13 -0500
Subject: [PATCH] Fix more warnings

---
 cpu/i386/isr.c     |   2 +-
 cpu/i386/pmem.c    |   3 +--
 cpu/i386/tasking.c |   2 +-
 initrd/init        | Bin 17944 -> 17868 bytes
 prog/main.c        |   1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpu/i386/isr.c b/cpu/i386/isr.c
index af633c9..dece8d0 100644
--- a/cpu/i386/isr.c
+++ b/cpu/i386/isr.c
@@ -180,7 +180,7 @@ void isr_handler(registers_t r) {
       } else if (r.eax==5) {
         r.ebx=(uint32_t)tasking_get_errno_address();
       } else if (r.eax==6) {
-        r.ebx=tasking_get_msg((uint32_t*)r.ebx);
+        r.ebx=(uint32_t)tasking_get_msg((uint32_t*)r.ebx);
       } else if (r.eax==7) {
         tasking_send_msg(r.ebx,(void*)r.ecx,r.edx);
       }
diff --git a/cpu/i386/pmem.c b/cpu/i386/pmem.c
index fcaa123..f85f1e9 100644
--- a/cpu/i386/pmem.c
+++ b/cpu/i386/pmem.c
@@ -1,5 +1,6 @@
 #include <grub/multiboot2.h>
 #include "../halt.h"
+#include "../../drivers/vga.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <klog.h>
@@ -38,7 +39,6 @@ void pmem_init(struct multiboot_boot_header_tag* tags) {
         struct multiboot_mmap_entry* orig_ptr=(struct multiboot_mmap_entry*)(((char*)tag)+16);
         for (struct multiboot_mmap_entry* ptr=orig_ptr;(char*)ptr<((char*)orig_ptr)+tag->size;ptr++) {
           if (ptr->type!=MULTIBOOT_MEMORY_AVAILABLE) continue;
-          uint32_t size=ptr->len;
           uint32_t start=ptr->addr;
           if (start<0x100000) continue;
           uint32_t end=start+ptr->len-1;
@@ -51,7 +51,6 @@ void pmem_init(struct multiboot_boot_header_tag* tags) {
             clear_bmap_bit(i);
           }
         }
-        char str[256];
         break;
       }
     }
diff --git a/cpu/i386/tasking.c b/cpu/i386/tasking.c
index e25aafe..6e4f034 100644
--- a/cpu/i386/tasking.c
+++ b/cpu/i386/tasking.c
@@ -86,7 +86,7 @@ void tasking_send_msg(uint32_t pid,void* msg,uint32_t size) {
       void* phys_addr=virt_to_phys(msg);
       load_address_space(task->regs.cr3);
       uint32_t page=find_free_pages((size/4096)+1);
-      map_pages(page<<12,phys_addr,(size/4096)+1,1,0);
+      map_pages((void*)(page<<12),phys_addr,(size/4096)+1,1,0);
       if (task->msg_store==NULL) {
         task->msg_store=malloc(sizeof(void*)*256);
         task->sender_store=malloc(sizeof(uint32_t)*256);
diff --git a/initrd/init b/initrd/init
index bcc980ce3517f19e6fe0adbd5cd9068f67b5417f..05d1fc245c565bf382872dd9d9f893b6fcba1e98 100755
GIT binary patch
delta 1439
zcmah|Ylw_d7(VCw&iBokvopK1t=YM*owb*dMXs^yvdHX@by<qSVy!R@wQ0=S{bk&W
zbzAFDeoPX=`XlCtTK<u!bxDbcA}J~5l1m})dyZj8Vrt&o^E~f)&*eM1j}Gjm2O~6d
zp&~gX{gDvD;7`cQt&I1nNSiP?gA5osyk{HZ0rNLO<L|8;es(A0XLKt?(s+l+;mzHQ
z&j5Drr|@|sUX&yB9ANxV4h63p4DsafiXO)62jTA^*6T6qgV^;zwt7pK-G<O$j!WQ7
zW+mEF#NgIVEV|eybROo`lq=|{y%3#Yy-*o%R+(cjIQ9mNIUz6-OWbi$-th*#PgUYd
zB5ohU#OX@P@7}7kWsQe)D;(nr@HFG(=xonbBy}t&<Q~O=_e1(~;IU9ZZtm!BAv1p<
zW~u$?9hi+EFh=|5DV`eD?7-64z$#Jz-cWO!Z{$E}G#v+omf2l!Z+JX3a}BJ$T2;#y
zVT<0BJyfN&ag{RSD8}3;Fkb<}5O|vT238Aw5iMN9Taf5?X<>?3m6(^<(?L|OL@UQZ
zMXO5kmn*5&O*Rro9je>{^9U%1D&>Y>LU;ahg)S}JOe|C0^?BE+%{cSBJ4eifE=KQ0
z;+&7&O(*7f#CkJ&B(pqkBdkD+Iti(SH_pg(kp8@-lX8x~Y?yi;dADKE!H)$FeUE<{
zeJXGG8`HNzO++7jJ5=;TY>0<oO|cZeCUFF;CEh{B79$~ch+Sa0=mP5$VX#6R2DCt|
zhu9^aLF^V=z!r*YV2g;^4UT!u>#&R|fMh-NwcxJx6PNn~L73!hVDZ#80I9oVBJeG<
z>lEYeuMpDt_Hy`K=YoW03MV3Gf}P&M_!Cu`0)?UmL)HanMUNv`WuM#5_<aS&5$wYz
zRpEYIvzL(KVtFFiK%3?B;B49`qoD?RP{u<QHa=ccNKYhG_Looa_fwbGLmw!~UJj2k
z>1p|@e6VuNKb1Ja9~Y5riKH2&@^RHN<13Mqsu$1=a(DIcn*ZM+c9RGEmGVpVXL+dB
zE9Z`=&Mt|*wP<O!X;ipCc22I(_D>#1J)7fgt)0n4YHjPLR5H;Xm#^zuI2IG_iBvXL
zf8NNxpIX6<&mLJC8)n67-~!~dSS4+eZLug_AiKdHmKS1C<HHR3C{{y*k~aE&08lgD
Aj{pDw

delta 1514
zcmah|U1(HC6rQ;=_wMZ6yZPy6vv+s1&Bko9;@aR(S`w2OZ4*neX<DmLqA@DQxP}Ia
z>(7I*Mg?0GV>;LdnhIiRV-czDL!qrNRSFhGtSzX}>XYO_@COT)V(mF|UGwu`@5A}~
z&UfaVduA>jq@#!Ekp!JMQ#DwYE2o5Tg5RAzT%6RFCn`W0<gQV`hljX`u*n1u4_XC$
zd_Naod!=-ehaZ&%yz^r&mY6g69ppf9Az}D17oSYx#4Au=QoyT*xmYv>f9ZMaoQ5Ip
zOsJkvdDks44et966ys)QAWIBk-o&881yGC<9zc&;@1ZixzqBVhwdXqsia!Ox>LYV8
zBz$L4ao>;XN+=q-r(;e(C~h4?$M5v3e?!R}Hy47t2YzEWXgcN>sLYb{n6!P3EQ7<T
zpJ9>(rcIoSm>_k;2J=@v(Dz_H8)!KMuvTF;m%*OVH#haXFku=%whkCZo!g-k^+;?O
zL-Ql+Fl6ZQ*i&_?Je3;)fX1y|uvh$jbnF61YqyTZS7Q1|)@smhx=*{D_|oWyCHmb!
zjDe<OPe6LaaKa;Q6x%V;bv$C0m@ViBt;Im9)TFfwAmXut(~k?Ly&_wQ?|oziB>D+p
zzO0%3&xwKQ#}zpqaR)Ku>f3N=lOD!Dy}EzSQmA5#Y$g89Se^ON$6xFX<F&*prwzhw
zkF=AJYIp;jU=Po>bWWw+_$+;kCbxk{(5ZI{e)<--h2B%+?y}qju!%egZ;Q&`z&7MV
zkW6mC*CvmFG^GR5lFLB)<PnfU4uSN`*FZ{n8uD$q4QxmL19m`;f-I7Mf-ENN1SlS2
zKf^IB2}$Pl@M>(ydjjgiNEABxD6*<~3xG5bd=>Idw(CnS0_7Na$65o=`E8)ku_Ap<
z>#f{AF8<JwCP*p1MpPvFdP?8wr1i~SE`HZwAA;wh9!*x@T{cDtDNU=r(N_9_`YGB*
zJC!fiO3$e`V^tPjUY1n%D`W8&K2h~m>=BLTKd*R&(QE2r<y7Xp7c#Mf8H>m_C32kB
zsUMPEMu4ht&AW6|ZLXPJ`~N${YHGl(RyS%M&yjVsHNuJ(*-dt%{Z_C!LW8gr7jm2#
zh`KtvC2yx5m^74sGPlAm+0nPYXXjuh+uO4(JD3^hQ*J|(z+h$|lg+PaSV+~Uja~V_
z8&4bg@#cgu+*0*R+bpxUmXHPNL0dKbOoiH0^b6Gj^0w-2PZ>*=s>AKI=B76Y8B)jF
Gg8u<1)8m=|

diff --git a/prog/main.c b/prog/main.c
index 6dfd150..16bbfbc 100644
--- a/prog/main.c
+++ b/prog/main.c
@@ -1,4 +1,5 @@
 #include "../libc/string.h"
+#include "vga.h"
 #include <grub/text_fb_info.h>
 
 int main() {