From 7f8960bb81214edc0a9de8cd3fe34b15cc133836 Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Sat, 22 Dec 2018 20:41:29 +0100
Subject: [PATCH] 09_delays: Fix delays in main

---
 09_delays/kernel8     | Bin 69088 -> 69056 bytes
 09_delays/kernel8.img | Bin 1625 -> 1595 bytes
 09_delays/src/main.rs |  10 +++++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/09_delays/kernel8 b/09_delays/kernel8
index afaec440cd830c9c172fa68593257a06bff9794e..23cce42ccba9546833e697f4cd21352ea2c50262 100755
GIT binary patch
delta 796
zcmZ8eOK1~O6utLNGM}cAv?fi1pH39aWT7Qd(HgLcF4Tokl86gM3{8<>s6p!@C^RW9
z1VK8G@D_nK7B}gxSg8u)hb*+af>{(?q**C0L_}~S<DFyzX)YY@%(>^CIrmMoVtZe)
zEoumQ@RSk}p<R)+%nKuyL@24CelY}Lt2xc|KZ$|bjsW`a2acLCFB2q!NU#%Z1cAT^
zNPya-atZ?{Pm{|sgWD;?AVXN3U%2tgUl`F3u|nK*{R~htd4GLGXZ8+PFTch8fwWgQ
z1uY4}Z@QwK#W@a!UlJ!bBMt6CJc?<47V+Gkj1AV?ZcVSgV&hK{kGZ}htjiZ4$G>6q
zu7>gxUPlZidfe}K-RDO26)RSbI5)*Qj)iz>b5xfB+-4fB6>01U?$wsCcU8`h4Qs7^
zjhUV#ZjVP{i8?XwXz2ni{nIeKxs5!-LBWSUT_MvT^+}X}d;~~#-uaRpuN_wJ%}n2!
zO{-cgepx*~btQO4y_(9*WoB=wA#28uh&aV>4x)`e6tRR=J|v;nw`Qk+JymW$GuY-a
z8ejU_H(s{JfBX377Joq8ZCA7SFn=cDI9>LZgku=xza$L!vTV2bUt5guiHBs0)*WA`
z|6<kv17OS?r)0c9UNxC4vwWMHFKY!l(b2*J9U2CNH1{j$CGmtps%T%lBw4yZfape1
xL4(ny6bEs9sA`#2?VV3o_y?jL-O~{f^`eKnoT$+%6Hc7O9M79=iNAJY;6G~o!-D_-

delta 816
zcmZ8eL1+_E5S{s(-E7)ajnr-z6*s*k5!$9zDO#~KD&j#1X^I4^B!pT*Q6VZ8Mcnjc
zJ!K)`BRP~7J?ya<Y2%?3QSc&IYEKHrT(wXU4}xW#O*YWx!`u1)&6_v#_pg;))sib8
zM9l~dc@h%TS7Isi%DR|9C}^O4wgh3lnr4ReMK-?+VEh?tGk-s7H!aIekO(5dMGy##
zfCMlt0scNMUdO<xv*a|-U^-=4aRkUenZ2>%|I}slFg<2Fe*`GlyuVX1nAqSx6f1aS
zsH_;apyr0b)uw1oF?w7LQH8ksZ{}ihb$D~!yO@<9zb?r;H#ds^uouhxIAUa9$OYxP
z`GsyHBJzibeX@yA4le9B_zL1c->xPPnoWLo8;j0#S>ifrx)Z3!3K5kn43D0kBGT^K
z>?qd`Zw7007GW^x?7KW{>>cU8(baXj`j%xW)60_#y@Hxk4G(#SD2|}~<1IkEapuoN
zyw)2IhqYUoboS2O$+Q+6ja|{sN5?~Fw5zGiz0B<?ZD6;6%MwQUIWJ0lLc#)F{Fj7^
z`d*Y9&*^-N^~hk0``xHq-fl_HJ87S^x9o+(54Z59!$*0}jr};om)v*^<9ywX0aa&v
zO?K*Hgs<Eu(`e1~1U-zs+86+1c6wCCOXM{tlcmlp6ja?A^khQ|vs82t5N0@fP$9AE
zAyu+vyf|4N00ENADGyqVeoD%V{l2neRu&trU-AW_+nd!1360z#zU{>zCb`;yBbet2
LJFN2O9T@lz=h)V8

diff --git a/09_delays/kernel8.img b/09_delays/kernel8.img
index 4547f6e3a44da42c9ba37db71bdfb8fc3f225b0b..2e2db8f029d8162815d2980e767e54a72fecfb85 100755
GIT binary patch
delta 407
zcmcb~vzupvjAIBR!xRMug)9G=nJ+#_W}5glm}})jW`>EMtGQSHujc?_b|7X0Vpbq#
z0b*t#W&&bHAZA$EGBHuz)B<S8d?tqM#Q*<+<}pmDZ;IQY*dR7hiK!t7Wavo-hAAL%
z#Uo-9nOGrWM<(u-QBM({2$Fxq&S10)rltTY#w};G6)48>!20TB0Y+WMl*x9CPJEdx
z3|qiPJrJL`h-Gpgqn^M^MusgM9vwk17#9?2FmiNHKEh}ijAU{t%;XY@iHo2vDgcU!
z09|Cv*bp@3l*B|11_lw3OEex?Uwz0dvg#4D@G6c<c_EEQ(pOUvt`HFw<zxyz0u<N}
z^lk&tyYK)17cbac$;87f$tXFI6KJF+khW*!czuY0Aq2voJdZV6S)n*JIX^E&LBlb~
bSHU?TRMSc!JTbE*GcR4i5GprWjm;PUxnPZH

delta 427
zcmdnZbCYL+jB6w#!xRMug)9G=nJ+#_W}5i_Hpj|`%nTF126L_aT+O}m|9^HMW&>hY
zAZ7t#W*}w)Vn!flSoxos;b+IhSankyph5GQ7_t-p{|{kgV3<(f6t_e1g4jeQriLJp
z!Dks5rhvp1MZ_mEu|mX7Ox!7BzD0Z@Nd6H!gV8>ingik!l~^EZb^^spcXbAFJg~kR
z%Co45qju|Tj=yP_C;ri8+%j2<(TPu!g<%WWWEY8vPOOuw81*<-GBRw@Sjazd@(xBr
zJtPatVHUiRn79b)up*$C2+(21j156koFpfUGs#+}1I0iV!Yt!>Bz;xm5s=TyV59+M
zi*Ygq9|5Yn5A<{c(9>`K{}<2RoXW(*EZHbIkrQa5CXlvg<am9EfguFKpWMY7t!rRl
pppcuHT$Ep&nyjGV804$q91yB$r4XK&S(2HTu3(6)U@`}rF#wASp4I>W

diff --git a/09_delays/src/main.rs b/09_delays/src/main.rs
index 027c72a0..d9ce934e 100644
--- a/09_delays/src/main.rs
+++ b/09_delays/src/main.rs
@@ -52,20 +52,20 @@ fn kernel_entry() -> ! {
     delays::wait_cycles(1_000_000);
     uart.puts("OK\n");
 
-    uart.puts("Waiting 1000 microsec (ARM CPU): ");
-    delays::wait_msec(1000);
+    uart.puts("Waiting 1 second (ARM CPU): ");
+    delays::wait_msec(1_000_000);
     uart.puts("OK\n");
 
     let t = delays::SysTmr::new();
     if t.get_system_timer() != 0 {
-        uart.puts("Waiting 1000 microsec (BCM System Timer): ");
-        t.wait_msec_st(1000);
+        uart.puts("Waiting 1 second (BCM System Timer): ");
+        t.wait_msec_st(1_000_000);
         uart.puts("OK\n");
     }
 
     uart.puts("Looping forever now!\n");
     loop {
-        delays::wait_msec(1000);
+        delays::wait_msec(1_000_000);
         uart.puts("Tick: 1s\n");
     }
 }