diff --git a/src/bare-metal/aps/examples/src/main.rs b/src/bare-metal/aps/examples/src/main.rs
index 5b84d5cb..4f8f8a8c 100644
--- a/src/bare-metal/aps/examples/src/main.rs
+++ b/src/bare-metal/aps/examples/src/main.rs
@@ -16,14 +16,22 @@
 #![no_std]
 
 mod exceptions;
-mod uart;
+mod pl011;
 
-use core::panic::PanicInfo;
+use crate::pl011::Uart;
+use core::{fmt::Write, panic::PanicInfo};
 use log::error;
 use psci::system_off;
 
+/// Base address of the primary PL011 UART.
+pub const PL011_BASE_ADDRESS: usize = 0x900_0000;
+
 #[no_mangle]
 extern "C" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {
+    // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,
+    // and nothing else accesses that address range.
+    let mut uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };
+    writeln!(uart, "main({:#x}, {:#x}, {:#x}, {:#x})", x0, x1, x2, x3).unwrap();
     system_off().unwrap();
 }
 
diff --git a/src/bare-metal/aps/examples/src/uart.rs b/src/bare-metal/aps/examples/src/pl011.rs
similarity index 59%
rename from src/bare-metal/aps/examples/src/uart.rs
rename to src/bare-metal/aps/examples/src/pl011.rs
index 3fcca7b4..485f5d95 100644
--- a/src/bare-metal/aps/examples/src/uart.rs
+++ b/src/bare-metal/aps/examples/src/pl011.rs
@@ -13,24 +13,25 @@
 // limitations under the License.
 
 // ANCHOR: Example
-use core::ptr::write_volatile;
+const FLAG_REGISTER_OFFSET: usize = 0x18;
+const FR_BUSY: u8 = 1 << 3;
+const FR_TXFF: u8 = 1 << 5;
 
-/// Minimal driver for an 8250 UART. This only implements enough to work with
-/// the emulated 8250 provided by crosvm, and won't work with real hardware.
+/// Minimal driver for a PL011 UART.
 #[derive(Debug)]
 pub struct Uart {
     base_address: *mut u8,
 }
 
 impl Uart {
-    /// Constructs a new instance of the UART driver for a device at the given
-    /// base address.
+    /// Constructs a new instance of the UART driver for a PL011 device at the
+    /// given base address.
     ///
     /// # Safety
     ///
-    /// The given base address must point to the 8 MMIO control registers of an
-    /// appropriate UART device, which must be mapped into the address space of
-    /// the process as device memory and not have any other aliases.
+    /// The given base address must point to the 8 MMIO control registers of a
+    /// PL011 device, which must be mapped into the address space of the process
+    /// as device memory and not have any other aliases.
     pub unsafe fn new(base_address: usize) -> Self {
         Self {
             base_address: base_address as *mut u8,
@@ -39,11 +40,24 @@ impl Uart {
 
     /// Writes a single byte to the UART.
     pub fn write_byte(&self, byte: u8) {
+        // Wait until there is room in the TX buffer.
+        while self.read_flag_register() & FR_TXFF != 0 {}
+
         // Safe because we know that the base address points to the control
-        // registers of a UART device which is appropriately mapped.
+        // registers of a PL011 device which is appropriately mapped.
         unsafe {
-            write_volatile(self.base_address, byte);
+            // Write to the TX buffer.
+            self.base_address.write_volatile(byte);
         }
+
+        // Wait until the UART is no longer busy.
+        while self.read_flag_register() & FR_BUSY != 0 {}
+    }
+
+    fn read_flag_register(&self) -> u8 {
+        // Safe because we know that the base address points to the control
+        // registers of a PL011 device which is appropriately mapped.
+        unsafe { self.base_address.add(FLAG_REGISTER_OFFSET).read_volatile() }
     }
 }
 // ANCHOR_END: Example
diff --git a/src/bare-metal/aps/uart.md b/src/bare-metal/aps/uart.md
index 0f721ec2..42121d2d 100644
--- a/src/bare-metal/aps/uart.md
+++ b/src/bare-metal/aps/uart.md
@@ -1,5 +1,5 @@
 # Let's write a UART driver
 
 ```rust,editable,compile_fail
-{{#include examples/src/uart.rs:Example}}
+{{#include examples/src/pl011.rs:Example}}
 ```
diff --git a/src/bare-metal/aps/uart/traits.md b/src/bare-metal/aps/uart/traits.md
index e9f3f6d2..efba0401 100644
--- a/src/bare-metal/aps/uart/traits.md
+++ b/src/bare-metal/aps/uart/traits.md
@@ -1,5 +1,5 @@
 # More traits
 
 ```rust,editable,compile_fail
-{{#include ../examples/src/uart.rs:Traits}}
+{{#include ../examples/src/pl011.rs:Traits}}
 ```