From dea501712813ec561dec8cbabc376ea49e64a6df Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Fri, 25 Oct 2019 09:26:37 +0200
Subject: [PATCH] move gpio funtion out of inner

---
 05_safe_globals/README.md                     |   3 +-
 06_drivers_gpio_uart/README.md                |  54 ++++++++----------
 06_drivers_gpio_uart/kernel                   | Bin 83384 -> 83384 bytes
 06_drivers_gpio_uart/kernel8.img              | Bin 7920 -> 7920 bytes
 .../src/bsp/driver/bcm/bcm2xxx_gpio.rs        |  43 +++++++-------
 07_uart_chainloader/README.md                 |   3 +-
 07_uart_chainloader/kernel                    | Bin 85224 -> 85224 bytes
 07_uart_chainloader/kernel8.img               | Bin 8824 -> 8824 bytes
 .../src/bsp/driver/bcm/bcm2xxx_gpio.rs        |  43 +++++++-------
 08_timestamps/README.md                       |   3 +-
 08_timestamps/kernel                          | Bin 90936 -> 90936 bytes
 .../src/bsp/driver/bcm/bcm2xxx_gpio.rs        |  43 +++++++-------
 12 files changed, 91 insertions(+), 101 deletions(-)

diff --git a/05_safe_globals/README.md b/05_safe_globals/README.md
index 8b7034dd..9c68b70b 100644
--- a/05_safe_globals/README.md
+++ b/05_safe_globals/README.md
@@ -169,8 +169,7 @@ diff -uNr 04_zero_overhead_abstraction/src/bsp/rpi.rs 05_safe_globals/src/bsp/rp
 +            // Convert newline to carrige return + newline.
 +            if c == '
 ' {
-+                self.write_char('
-')
++                self.write_char('
')
              }
 +
 +            self.write_char(c);
diff --git a/06_drivers_gpio_uart/README.md b/06_drivers_gpio_uart/README.md
index b1676571..f8f39ed6 100644
--- a/06_drivers_gpio_uart/README.md
+++ b/06_drivers_gpio_uart/README.md
@@ -167,7 +167,7 @@ diff -uNr 05_safe_globals/src/arch.rs 06_drivers_gpio_uart/src/arch.rs
 diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs 06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs
 --- 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs
 +++ 06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,157 @@
 +// SPDX-License-Identifier: MIT
 +//
 +// Copyright (c) 2018-2019 Andre Richter <andre.o.richter@gmail.com>
@@ -271,26 +271,6 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs 06_drivers_gpio_uar
 +    fn ptr(&self) -> *const RegisterBlock {
 +        self.base_addr as *const _
 +    }
-+
-+    /// Map PL011 UART as standard output.
-+    ///
-+    /// TX to pin 14
-+    /// RX to pin 15
-+    pub fn map_pl011_uart(&mut self) {
-+        // Map to pins.
-+        self.GPFSEL1
-+            .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
-+
-+        // Enable pins 14 and 15.
-+        self.GPPUD.set(0);
-+        arch::spin_for_cycles(150);
-+
-+        self.GPPUDCLK0
-+            .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
-+        arch::spin_for_cycles(150);
-+
-+        self.GPPUDCLK0.set(0);
-+    }
 +}
 +
 +//--------------------------------------------------------------------------------------------------
@@ -310,10 +290,29 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_gpio.rs 06_drivers_gpio_uar
 +        }
 +    }
 +
-+    // Only visible to other BSP code.
++    /// Map PL011 UART as standard output.
++    ///
++    /// TX to pin 14
++    /// RX to pin 15
 +    pub fn map_pl011_uart(&self) {
 +        let mut r = &self.inner;
-+        r.lock(|inner| inner.map_pl011_uart());
++        r.lock(|inner| {
++            // Map to pins.
++            inner
++                .GPFSEL1
++                .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
++
++            // Enable pins 14 and 15.
++            inner.GPPUD.set(0);
++            arch::spin_for_cycles(150);
++
++            inner
++                .GPPUDCLK0
++                .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
++            arch::spin_for_cycles(150);
++
++            inner.GPPUDCLK0.set(0);
++        })
 +    }
 +}
 +
@@ -525,8 +524,7 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs 06_drivers_gp
 +            // Convert newline to carrige return + newline.
 +            if c == '
 ' {
-+                self.write_char('
-')
++                self.write_char('
')
 +            }
 +
 +            self.write_char(c);
@@ -626,8 +624,7 @@ diff -uNr 05_safe_globals/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs 06_drivers_gp
 +            let mut ret = inner.DR.get() as u8 as char;
 +
 +            // Convert carrige return to newline.
-+            if ret == '
-' {
++            if ret == '
' {
 +                ret = '
 '
 +            }
@@ -751,8 +748,7 @@ diff -uNr 05_safe_globals/src/bsp/rpi.rs 06_drivers_gpio_uart/src/bsp/rpi.rs
 -            // Convert newline to carrige return + newline.
 -            if c == '
 ' {
--                self.write_char('
-')
+-                self.write_char('
')
 -            }
 -
 -            self.write_char(c);
diff --git a/06_drivers_gpio_uart/kernel b/06_drivers_gpio_uart/kernel
index a30957c033abd6df2a8b8504f4beff8c6833d05c..7fdc4e818625f3e717c7d74c08c804ae4463d7a6 100755
GIT binary patch
delta 806
zcmZ8dF=$g!6ul?;AwN+}BMHCOLVjtQkfdruqlk(oAZRPpHsGKR8f^+ii8YGgl(Zcj
zI@k}9H@Ij!lng>Z<yR3&!46$&vj~DiDGm_?Ez}{4_2vKf5c-C9-#ho7bI-lYbFSq%
zSGj_hz_SG`dKw8MNHqV}VU7S>u2Z|SX#7o3>nBk~chVaVPd0nWh>hunm#8*8ecAwz
zn~PMvNagGgAGLT*EtX+3ZbWdMRozGhR^mo8>ZqzHXPYIZx;0D25ZiVmgpbUxLJJ2K
z3J|4RF|;Gqrnwf?6Gq*6<IAQq6mLf}r6LSGGBf*d2j(X)zWMx@^2I{_u0EA3Oy2I{
zj$W{LT?k#Pcd1;4=zw(-t&2bRYMl$CLzlC;2UEB5#o}XqbW$I*@sp~}vu`39y9M5_
zn(@P!@OWmNZGwaMYlNVo#&W&T4#~E*7}1#ZaL_ut-v=$TAzaAxJ?jA)aLYb+<~g_R
zaQw$N1mOwGM4)#HFH+^9Pzf-;aIJ?#y1mEt=@w!EIT~B(LzLZ&paZX2G7OE)hoP2!
z?=kn(VuR%9)|X!uf%osRam8nwmh~Ni@Lk}tUXHrPH>l9|t|()r2(Ds>eU0E3cFeUX
zmfXV=-1|WSHN7@Va$gC2ywgVHtbYXlVZV*1h4_fie18n*6(u}=G|3u+2;zhl%p)lj
fylgdt<L1ISC~zhRQta~?zM$2!sG3V@_+9@1RaT46

delta 748
zcmZ8eO=uHQ5T0*0VRxgLQX<<#AuIW#X{Bm{)Qhets1>vZJoF@~My%8rqZdz&_SlOH
zk>}Arl*EfcWrKL|ApYE1Ey03^CI`t$ukFE~m)-X+eTR87-^@2N-+S$)V0$T8tK$)h
z_aEbl(H(Pk65V?<>z)C6!2?9}@($GsRLeT=)eD_<HJ%;Z{}!?GcZ@cF64fo0UK^a$
zPmnX(VpAI8D6*>>(m2l?4f#kn>+~~9Lr1O9UkEgMi{u<*YrHPm9`MOp)suFkr=q#8
z>dmfdG{XUk5ZRjvP{hsaNW!(ZVIJ;>5PpQCC#FxGJzc7nOY>HxSf0DMC&U-!=P7H&
z5HEa=>0Y?QvqT*cL&SyR&B|=4TD@&e&sjO5N!_paEs?zUX})J`Zgv+g8^$@WfkF=%
z7iZ4Myl6{x&jHzjC-L2U5k&#X`XP~cA#hnQ=iX)elQ4}3>Yz^Hs#fAK(PqU2%%~J6
zo6DU#tjkG<z6-4~ecf|FC%5c$E$r_k@nzOXArl=DPa)~I1bv*{NWmPHY5qCh`6U#L
zZ+XF2td+t9tE6!S8*D9&-`H@!Wbj;@n&g9r3Dghya;4}6fnOT&5jo<Mz~626aa)YG
rhTOLkI38eMbBN#|`;$Y=-J3@_#8!{s8~b<^d3X6R0&t(%7!Lji_pF2-

diff --git a/06_drivers_gpio_uart/kernel8.img b/06_drivers_gpio_uart/kernel8.img
index 646f4d6498c0c03cb5bb8c11a87d5ce86393d1fa..dd0d3ae507ebfab36759c441b678a6fd721bba38 100755
GIT binary patch
delta 298
zcmexh`@wd?LPo}kixzWU)Sf8Hz%XGe(`G-$N32%=n;9?u(`NYjhJj&<0yD!FPN3Wi
zWrm5GfeI737#KEqHCj((1kw){GpzJrXb5`A&+rqdW`m~V<R*4C#^}i_*-b<aYE68h
z&a{$)u_5S1J<G~R%?uMgCx2v@XWTbgkV9NWl!ZZrfx+RYCL@Su*w6?xhv9(s!~@Ln
z*B&s-Yk}y^CLAh^jAff0xw9EJAK|*gFX)|Gl$V;LP>`6HnXCwO%7V!|rR1XyNO1s-
zU|`?_lMD>!pnRYk!N5Jh(?2M&xF9LDsHjpQAXC8@B5uI}(FY+J7+|yvR9uH+vzGKR
FW&lNtPBs7l

delta 288
zcmexh`@wd?LdL|2ixzV})Sf8Hz%XHJ(q=!#N32E+3=A6@85)8Z8nh-JV2;1`fLUG(
zME`GQy!cO>;pa03hA9fn3|lyXdR{0qOw`;s*^6DCF>!JhyBcHY<caJiA`i7DzEEdc
z$-&qV^rD_+<)dbXiO!R6vdgRN0O@5=xWb|0u<{Wz<EjVD9IGBObFSiNVGv<paQLar
z$RM)WghPdKvjcYy<K`n=clagU13dk`Q;YIaa}){^^D>haxqvPNf+dqTO34SEkm3OI
z_`oCs!!;<M5y}rrEG|e&Eh?&12*^}0W?-=3fT)L%3=A;ZfE~heVBf4IeT*3Z0@+NN

diff --git a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs
index dfbcc58f..a9ceda61 100644
--- a/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs
+++ b/06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_gpio.rs
@@ -101,26 +101,6 @@ impl GPIOInner {
     fn ptr(&self) -> *const RegisterBlock {
         self.base_addr as *const _
     }
-
-    /// Map PL011 UART as standard output.
-    ///
-    /// TX to pin 14
-    /// RX to pin 15
-    pub fn map_pl011_uart(&mut self) {
-        // Map to pins.
-        self.GPFSEL1
-            .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
-
-        // Enable pins 14 and 15.
-        self.GPPUD.set(0);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0
-            .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0.set(0);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -140,10 +120,29 @@ impl GPIO {
         }
     }
 
-    // Only visible to other BSP code.
+    /// Map PL011 UART as standard output.
+    ///
+    /// TX to pin 14
+    /// RX to pin 15
     pub fn map_pl011_uart(&self) {
         let mut r = &self.inner;
-        r.lock(|inner| inner.map_pl011_uart());
+        r.lock(|inner| {
+            // Map to pins.
+            inner
+                .GPFSEL1
+                .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
+
+            // Enable pins 14 and 15.
+            inner.GPPUD.set(0);
+            arch::spin_for_cycles(150);
+
+            inner
+                .GPPUDCLK0
+                .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
+            arch::spin_for_cycles(150);
+
+            inner.GPPUDCLK0.set(0);
+        })
     }
 }
 
diff --git a/07_uart_chainloader/README.md b/07_uart_chainloader/README.md
index 02a1a315..6ceac950 100644
--- a/07_uart_chainloader/README.md
+++ b/07_uart_chainloader/README.md
@@ -189,8 +189,7 @@ diff -uNr 06_drivers_gpio_uart/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs 07_uart_
 +    }
 
 -            // Convert carrige return to newline.
--            if ret == '
-' {
+-            if ret == '
' {
 -                ret = '
 '
 +    fn clear(&self) {
diff --git a/07_uart_chainloader/kernel b/07_uart_chainloader/kernel
index 202ca3d96d2bc8eeec4e6955c67841be9a02f8b5..0297e9fbd5b899501151cfd07509ac7ed44f7380 100755
GIT binary patch
delta 2995
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
D{X%-z

delta 2949
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
E1GUqD1^@s6

diff --git a/07_uart_chainloader/kernel8.img b/07_uart_chainloader/kernel8.img
index 0e51f15c7b029c0f8db97ac7aeed26b64d9e76ff..bfe918924653bea94541453db22c0e37f7835bb3 100755
GIT binary patch
delta 1168
zcmZ`&TSydP6h8m_GwaM+p|Q(qE{>~FyI#7Om+V1jvyzN5H-j)p?Mj!2UIO3TutMy`
zpMRx%2$Fi)g_gn~_NDtv5TRf`6>J;PRul#iPNdWMcXmso24>EGzH`3wpWDoBo7*<x
zEjcDZqzuZYtyXDD1DJH;8we__eOzIUrAi;3f~>nu>a1cnn#daV+OHf|n6H;RNh|5)
zdq`vETgq>eVm#f?=)=+~ULX}0j@B}aH`0z|f^m_xMe0DWVJXK-O3O){f01<juArX!
zxMAwVNSK!8(aY$|A=K4kBjI){`+g9JJdogY(6YJ&eh$JRH-W@ZoOe@QFm3G*<9(LV
z3(zH^iKv2k5}BIKj8k#*3#w~~+jjnaiB>8Lk7l_9^X`@p)}Y@#2QZP94B%RvWl^EL
zZxrv;X)a5ik{brr0Ym`HhhBxb(5#Z{As{U?qV0&^ro#5Tmh~y&(2=Brr3Qhm$c{zW
z&ttl9p_V<QJu^wFR|=VXRpeflv7D%3Rw_o~l-sqbQh~&?mEn*Rv7S*ll?W*CRpj{y
zJ14+=xEc};yT)LNO+}lIST49l$&|R@4TYGBn~<cyBu6;3P(h>n6^MwLCf@>XLmo?^
z?I`y-yakIZL2!oecD!{j`-gi8-<~%?rn#B-iHz}gs!kYJG=uc>9olhng5T0MC^bPd
zu#u;<#+pFT%r(s#BvT7jV7|h}mQlEidpnY@02Uap68kpU-p3C)J^ntGeOwQwH9(^x
z!{iadK2%6iKeqEjE8tm<idOI9*PKNISf0J2=!ix^O6P+q%2$0VORtrpDhY?u12(A%
z=a`(g>i##sxJV7>tFAVpDN15Vs>a?>EvCre0x-;C0xr>J5nudv)oMLf+7vWfi2CU<
z?yCSZ`bC%%*b|&xaNfEif^vWUQ*vqIbN<}|xoz*x4nFSPI`Q6nQs!rUMS-)5)r@HY
zhR!@W*_FkQX5|@v$LA^ZYPNTERzByQJ`bPusg-q(f5)lIv+>PY`%eciFK;kroi?1k
U6|kF`=i6`Gw)dCY^1xs67uh>_;s5{u

delta 1181
zcmZ`&TSydP6h8l4c4v3Xv|P+woL%kWda1l)l&&dQW*O@~hy@x#WYJ^L+pdUUX5i1i
zQoR`#v^_+i5es2y^$?UOl+Z&kDxqcty_6H=bpD-LFAx1NbN=(4^PM@jS*>5KAM|8h
z6(H&b?+2q!m~jA1JMr;P$h6UCqm|k69Ns2qTZ2$sNJpy3LHapQo|malV@^^>G<Jqm
zCf?cXKFP$}ctY<N_OMhTGp)CTV!XjdBomB_tRq4*di4uQmL_Z`<Lrl^;yXpmC?5~#
zDhb4O!^lv*;>SMJmCQig?Uq~q5Qx4I;7YAwggAZ;B0)ESc;7f{6IISMwGGCi#pnPC
z@n}3MXLcdeVKN_!{L53K>OkDIvtL`ZY>9hROIetAn{=)S{hrx?@~k9)^vzlBPLo=O
z@SCcb%#zJZ72yhiC}8=Z$<%{pg$xIQ)Xeg>BmP9>w&x}Ef*c8UcG&5B56~2AEHB0O
zSq1HUG)hse?k}#@YlyNki6wC?q4&Zn$6jG$9<CX;d0fu3xZ&xW64o0J==pLWe%YN~
znlD5A?aoNhiCFs(#Qie-<aJD70FJrfPLSJA-Q8+a(551m3~q>Ih9@^C!XpJYMH7Jv
zwn%U-SB#yOA<Ad2Ew}*J1*<~ic}8rW)Xk+LIK_%=3vOxMf5Uwj+h-po@7O2%3Zd+c
zqLLfzixME0*nY=F(#~!<4$I}(lPWgps0=?1=$pIRjYEckQp%InL^YpFqle6_6@Wg4
z6Y+{Lh8-MS$_480F64_k-H1gbk{*HB3FI&D06o#=IfZ^b1iBFxW4sovlhEZ{A(qE|
z>HzOjjCDAru46df4gt#Bv6}{N8}E)Eop^W5KLE){;DMH0pmV!&PoYZ(gqT7i!KJVi
z<Kr*DIND#M?0@Sq%-%aQw*3|%9RTM=Af4s8UX$qPch^`dd*C@PHJm-!Ji6%Vk~|^V
zsKz+!2lGgrR>WD8&*LAo959*0Ny@!WlUQcS0Y-fpX-6F<+GNRZEbdeDLpBpla+5M-
ZH}O`>?y)l=r^4HsW5JdLF!k$}{tve-hfe?i

diff --git a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs
index dfbcc58f..a9ceda61 100644
--- a/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs
+++ b/07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_gpio.rs
@@ -101,26 +101,6 @@ impl GPIOInner {
     fn ptr(&self) -> *const RegisterBlock {
         self.base_addr as *const _
     }
-
-    /// Map PL011 UART as standard output.
-    ///
-    /// TX to pin 14
-    /// RX to pin 15
-    pub fn map_pl011_uart(&mut self) {
-        // Map to pins.
-        self.GPFSEL1
-            .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
-
-        // Enable pins 14 and 15.
-        self.GPPUD.set(0);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0
-            .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0.set(0);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -140,10 +120,29 @@ impl GPIO {
         }
     }
 
-    // Only visible to other BSP code.
+    /// Map PL011 UART as standard output.
+    ///
+    /// TX to pin 14
+    /// RX to pin 15
     pub fn map_pl011_uart(&self) {
         let mut r = &self.inner;
-        r.lock(|inner| inner.map_pl011_uart());
+        r.lock(|inner| {
+            // Map to pins.
+            inner
+                .GPFSEL1
+                .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
+
+            // Enable pins 14 and 15.
+            inner.GPPUD.set(0);
+            arch::spin_for_cycles(150);
+
+            inner
+                .GPPUDCLK0
+                .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
+            arch::spin_for_cycles(150);
+
+            inner.GPPUDCLK0.set(0);
+        })
     }
 }
 
diff --git a/08_timestamps/README.md b/08_timestamps/README.md
index 0f77b008..760071bc 100644
--- a/08_timestamps/README.md
+++ b/08_timestamps/README.md
@@ -237,8 +237,7 @@ diff -uNr 07_uart_chainloader/src/bsp/driver/bcm/bcm2xxx_pl011_uart.rs 08_timest
 +            let mut ret = inner.DR.get() as u8 as char;
 +
 +            // Convert carrige return to newline.
-+            if ret == '
-' {
++            if ret == '
' {
 +                ret = '
 '
 +            }
diff --git a/08_timestamps/kernel b/08_timestamps/kernel
index 95064d3b306b8c602d5f25e3b6099c3469525a39..3bfb485adb3cd89f64e2bb3e468e140095015b4d 100755
GIT binary patch
delta 556
zcmXYtJuE{}7>3V#L;OZtN_!VgL#UsmZky_@l=L>l^|KJcCS5RCNC$%iqe(h_CecVV
z79kNwOu8@_urUcSkQmy<U~+EHIm?%u_j#Z5oqK&(eSKHGbBS9MT~svT!!mz0@do{@
zfiX=33)R#z=lp1u!OrM;NMI%YJ%knDgl3ZP>0gbELDQHWmUKwMte19^SV9xMCsEKN
zO_DlLRG*@<JU@&85az`ZYy)d#rG)g*C0BTINvT`mCatGXz&Ys_!kDGJfT?6*fL<*4
z$+lp_ML7#T&x7bVub6X7MJ?%R5WeXmEiTBk$bA;0GF5(d%-_?90|wVeQ3HJP;20h?
z^ip|T)UsYFoo<u0EM#$mf;RSXN*A_x^8$G$#E-h+Jrj=Oii}C|nWBs{CM!dq_b}GX
zz_vQ1$*(r}qnx00t69dYDi-%v&K?z=_(R2v$#$oT+o|lt_X2n1{Q(&#t7QJmgH!ly
o@EXxbBp!{$5@sYZ7#%cBBc9;?1uWI`%?yrEci*an<mra*A5=AFg#Z8m

delta 555
zcmXYtJuHJ!7=`coLW<HqKlKe#4WbR9rL?5z*AOihiN6hlkeHfEED~%sOs~aIiRdCC
zA-6VNI#@88q#;2fkq!o%`}N+tytz5gIq$hQSE$StD)(-1A3+D@BXDDlzeMl~{nE;q
zrh)k^Rm?o!T6wTbdL9<o5C0m*I&e<2QMmPwTE?JhEYT}zpM;s8_M=!v9TlUv(1SKf
zohYhHQE8qTfd}Z}`BCfwn`Fd9=&4;+c(Th-hr+{@is1rRq#Nj^tbqh<R5IXpJ_y7t
zJ?D^)Dl!Zayg?a}M=J&b)EdVTKIu9x7Od3EK1=-)SNZIW7vl&60j`h30=#kW1Rgc`
zsWd5U=?1xFrb*hiAdM;VCUA%>T_?nw7s#0uA9ct5Ni*Y?f>Yu;MyuvXmWMv?WX#3D
zcG_f8vuf~1$AZ#hE-7y)S?n#J1In9nQOS%+ce|2XsAS3oft%so9w|pFr2fmj(|EVm
m4}|&$Lcu^d7#SKAbEq#6=K3O*YxwpmGN>*zsyuRb!u<~#5oOH)

diff --git a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs
index dfbcc58f..a9ceda61 100644
--- a/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs
+++ b/08_timestamps/src/bsp/driver/bcm/bcm2xxx_gpio.rs
@@ -101,26 +101,6 @@ impl GPIOInner {
     fn ptr(&self) -> *const RegisterBlock {
         self.base_addr as *const _
     }
-
-    /// Map PL011 UART as standard output.
-    ///
-    /// TX to pin 14
-    /// RX to pin 15
-    pub fn map_pl011_uart(&mut self) {
-        // Map to pins.
-        self.GPFSEL1
-            .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
-
-        // Enable pins 14 and 15.
-        self.GPPUD.set(0);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0
-            .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
-        arch::spin_for_cycles(150);
-
-        self.GPPUDCLK0.set(0);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -140,10 +120,29 @@ impl GPIO {
         }
     }
 
-    // Only visible to other BSP code.
+    /// Map PL011 UART as standard output.
+    ///
+    /// TX to pin 14
+    /// RX to pin 15
     pub fn map_pl011_uart(&self) {
         let mut r = &self.inner;
-        r.lock(|inner| inner.map_pl011_uart());
+        r.lock(|inner| {
+            // Map to pins.
+            inner
+                .GPFSEL1
+                .modify(GPFSEL1::FSEL14::AltFunc0 + GPFSEL1::FSEL15::AltFunc0);
+
+            // Enable pins 14 and 15.
+            inner.GPPUD.set(0);
+            arch::spin_for_cycles(150);
+
+            inner
+                .GPPUDCLK0
+                .write(GPPUDCLK0::PUDCLK14::AssertClock + GPPUDCLK0::PUDCLK15::AssertClock);
+            arch::spin_for_cycles(150);
+
+            inner.GPPUDCLK0.set(0);
+        })
     }
 }