From ea62d4fdec1c9fe4d18017a9c448584963a610fb Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 23 May 2019 15:50:53 +0200
Subject: [PATCH] uart: make baudrate configurable, run at 115,200 baud

---
 src/main.rs     |  9 +++++----
 src/uart/mod.rs | 12 ++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 6f9055f..af43d9b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -50,10 +50,11 @@ unsafe fn boot_core0() -> ! {
 }
 
 fn main() {
-    let mut uart = Uart::uart1();
-    writeln!(uart, "Hello World\r").unwrap();
-    for i in 0.. {
-      writeln!(uart, "i={}\r", i).unwrap();
+    let mut uart = Uart::uart1(115_200);
+    loop {
+        for i in 0.. {
+            writeln!(uart, "i={}\r", i);
+        }
     }
 
     let eth = eth::Eth::gem0();
diff --git a/src/uart/mod.rs b/src/uart/mod.rs
index cfc0a98..93f0d9e 100644
--- a/src/uart/mod.rs
+++ b/src/uart/mod.rs
@@ -8,12 +8,16 @@ use crate::regs::*;
 mod regs;
 mod baud_rate_gen;
 
+/// Determined through experimentation. Actually supposed to be
+/// 1 GHz (IO PLL) / 0x14 (slcr.UART_CLK_CTRL[DIVISOR]) = 50 MHz.
+const UART_REF_CLK: u32 = 45_000_000;
+
 pub struct Uart {
     regs: &'static mut regs::RegisterBlock,
 }
 
 impl Uart {
-    pub fn uart1() -> Self {
+    pub fn uart1(baudrate: u32) -> Self {
         super::slcr::with_slcr(|| {
             let uart_rst_ctrl = super::slcr::UartRstCtrl::new();
             uart_rst_ctrl.reset_uart1();
@@ -36,7 +40,7 @@ impl Uart {
         let self_ = Uart {
             regs: regs::RegisterBlock::uart1(),
         };
-        self_.configure();
+        self_.configure(baudrate);
         self_
     }
 
@@ -49,7 +53,7 @@ impl Uart {
         );
     }
 
-    pub fn configure(&self) {
+    pub fn configure(&self, baudrate: u32) {
         // Configure UART character frame
         // * Disable clock-divider
         // * 8-bit
@@ -67,7 +71,7 @@ impl Uart {
         self.disable_rx();
         self.disable_tx();
 
-        baud_rate_gen::configure(&self.regs, 50_000_000, 9_600);
+        baud_rate_gen::configure(&self.regs, UART_REF_CLK, baudrate);
 
         // Enable controller
         self.reset_rx();