From 9f28e53c71d28d04e2775c59944d2887a99f1e86 Mon Sep 17 00:00:00 2001
From: Josh Rahm <joshuarahm@gmail.com>
Date: Sun, 22 Nov 2020 01:06:30 -0700
Subject: Large reorganization.

What was in core/ is now moved to arch/stm34l4xxx/peripherals.  This new
directory is *supposed to* to contain raw header files defining just the
pertinent register structures for the various peripherals.  Peripheral
management belongs somewhere in the new `kern/..` directories. This is
not completely the case at the moment, so more refactoring needs to be
done.

What was sitting in the root has now been moved into the kern/
directory. The kern/ directory is to contain everything else
other than raw device register definitions. The root of the kern/
tree is reserved for standard library-esque headers.

The kern/<peripheral> directory contains management systems for that
peripheral. (At the moment DMA is the only peripheral with a decent
management system.) Preferably these peripheral systems should only
include their correlating header in arch/stm34l4xxx/peripherals, and
use other management systems for handling other peripherals rather
than manipulating their raw registers directly. (Though this ideal
will require much more critical mass of management systems.)
---
 02-usart/src/core/usart.c | 147 ----------------------------------------------
 1 file changed, 147 deletions(-)
 delete mode 100644 02-usart/src/core/usart.c

(limited to '02-usart/src/core/usart.c')

diff --git a/02-usart/src/core/usart.c b/02-usart/src/core/usart.c
deleted file mode 100644
index 19d982e..0000000
--- a/02-usart/src/core/usart.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "core/usart.h"
-#include "delay.h"
-#include "lib.h"
-#include <stdarg.h>
-
-void set_usart1_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src)
-{
-  rcc->ccip_r = (rcc->ccip_r & (~0x03)) | usart_clk_src;
-}
-
-void set_usart2_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src)
-{
-  rcc->ccip_r = (rcc->ccip_r & ~(0x03 << 2)) | (usart_clk_src << 2);
-}
-
-void set_usart2_clock_enabled(__IO rcc_t* rcc, bool enable)
-{
-  if (enable) {
-    rcc->apb1en1_r |= BIT(17);
-  } else {
-    rcc->apb1en1_r &= ~BIT(17);
-  }
-}
-
-void set_usart1_clock_enabled(__IO rcc_t* rcc, bool enable)
-{
-  if (enable) {
-    rcc->apb2en_r |= BIT(14);
-  } else {
-    rcc->apb2en_r &= ~BIT(14);
-  }
-}
-
-void usart_set_parity(__IO usart_t* usart, usart_parity_t parity)
-{
-  uint32_t c_r1 = usart->c_r1;
-  c_r1 &= ~(0x3 << 9);
-  c_r1 |= parity;
-  usart->c_r1 = c_r1;
-}
-
-void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled)
-{
-  if (!enabled) {
-    regset(usart->c_r1, usart_ue, 0);
-  } else {
-    /* Set the rx enabled. */
-    regset(usart->c_r1, usart_re, !!(enabled & USART_ENABLE_RX));
-    regset(usart->c_r1, usart_te, !!(enabled & USART_ENABLE_TX));
-    regset(usart->c_r1, usart_ue, 1);
-  }
-}
-
-void usart_transmit_byte_sync(__IO usart_t* usart, uint8_t byte)
-{
-  usart->td_r = byte;
-  /* Per the manual, when bit 7 of the IS register is set, then the usart
-   * data has been sent to the shift register.
-   *
-   * This bit is cleared by writing to the TD register. */
-  while (!(usart->is_r & BIT(7)))
-    ;
-}
-
-void usart_transmit_bytes_sync(__IO usart_t* usart, const uint8_t* bytes, uint32_t n)
-{
-  while (n --) {
-    usart_transmit_byte_sync(usart, *(bytes ++));
-  }
-}
-
-void usart_transmit_str_sync(__IO usart_t* usart, const char* str)
-{
-  while (*str) {
-    if (*str == '\n') {
-      usart_transmit_byte_sync(usart, '\r');
-    }
-    usart_transmit_byte_sync(usart, *(str ++));
-  }
-}
-
-void usart_enable_dma(__IO usart_t* usart, usart_enable_t enabled)
-{
-  switch(enabled) {
-    case USART_ENABLE_DISABLED:
-      regset(usart->c_r3, usart_dmar, 0);
-      regset(usart->c_r3, usart_dmat, 0);
-      break;
-
-    case USART_ENABLE_TX:
-      regset(usart->c_r3, usart_dmat, 1);
-      break;
-
-    case USART_ENABLE_RX:
-      regset(usart->c_r3, usart_dmar, 1);
-      break;
-  };
-}
-
-void usart_printf(__IO usart_t* usart, const char* fmt, ...)
-{
-  va_list l;
-  union {
-    void* ptr;
-    char* str;
-    int i;
-  } b;
-  char buf[128];
-
-  va_start(l, fmt);
-
-  while (*fmt != 0) {
-    if (*fmt == '%') {
-      switch (*(++fmt)) {
-        case 0:
-          goto end;
-        case '%':
-          usart_transmit_byte_sync(usart, '%');
-          break;
-        case 'p':
-          b.ptr = va_arg(l, void*);
-          hexify(ptr2reg(b.ptr), buf);
-          usart_transmit_str_sync(usart, "0x");
-          usart_transmit_str_sync(usart, buf);
-          break;
-        case 'd':
-        case 'i':
-          b.i = va_arg(l, int);
-          decimalify(b.i, buf);
-          usart_transmit_str_sync(usart, buf);
-          break;
-        case 's':
-          b.str = va_arg(l, char*);
-          usart_transmit_str_sync(usart, b.str);
-      }
-      ++ fmt;
-    } else {
-      if (*fmt == '\n') {
-        usart_transmit_byte_sync(usart, '\r');
-      }
-      usart_transmit_byte_sync(usart, *(fmt ++));
-    }
-  }
-
-end:
-  va_end(l);
-}
-- 
cgit