aboutsummaryrefslogtreecommitdiff
path: root/02-usart/include/core
diff options
context:
space:
mode:
Diffstat (limited to '02-usart/include/core')
-rw-r--r--02-usart/include/core/apb.h4
-rw-r--r--02-usart/include/core/clock.h126
-rw-r--r--02-usart/include/core/dma.h149
-rw-r--r--02-usart/include/core/flash.h20
-rw-r--r--02-usart/include/core/gpio.h326
-rw-r--r--02-usart/include/core/irq.h89
-rw-r--r--02-usart/include/core/isrs.inc112
-rw-r--r--02-usart/include/core/nvic.h46
-rw-r--r--02-usart/include/core/rcc.h124
-rw-r--r--02-usart/include/core/spi.h102
-rw-r--r--02-usart/include/core/system.h76
-rw-r--r--02-usart/include/core/usart.h201
12 files changed, 0 insertions, 1375 deletions
diff --git a/02-usart/include/core/apb.h b/02-usart/include/core/apb.h
deleted file mode 100644
index 11fa7ab..0000000
--- a/02-usart/include/core/apb.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef H__APB_
-#define H__APB_
-
-#endif /* H__APB_ */
diff --git a/02-usart/include/core/clock.h b/02-usart/include/core/clock.h
deleted file mode 100644
index c3c58d7..0000000
--- a/02-usart/include/core/clock.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef CORE_CLOCK_H__
-#define CORE_CLOCK_H__
-
-#include <stdint.h>
-#include "rcc.h"
-
-#define PERIPH_BASE ((uint32_t)0x40000000)
-#define AHBPERIPH_BASE (PERIPH_BASE + 0x00020000)
-#define FLASH_R_BASE (AHBPERIPH_BASE + 0x00003C00)
-#define PWR_BASE (PERIPH_BASE + 0x7000)
-#define PWR_CSR_VOSF ((uint16_t)0x0010) /*!< Voltage Scaling select flag */
-
-#ifndef __IO
-#define __IO volatile
-#endif
-
-typedef struct {
- __IO uint32_t cr;
- __IO uint32_t csr;
-} pwr_t;
-
-// typedef struct {
-// __IO uint32_t acr;
-// __IO uint32_t pecr;
-// __IO uint32_t pdkeyr;
-// __IO uint32_t pekeyr;
-// __IO uint32_t prgkeyr;
-// __IO uint32_t optkeyr;
-// __IO uint32_t sr;
-// __IO uint32_t obr;
-// __IO uint32_t wrpr;
-// } flash_t;
-
-// #define FLASH (*(flash_t*) (FLASH_R_BASE))
-#define PWR (*(pwr_t*)(PWR_BASE))
-
-/* Valid values for the PLLR/PLLQ bits of the PLLCFG register. */
-typedef enum {
- PLL_DIVISOR_2 = 1,
- PLL_DIVISOR_4 = 3,
- PLL_DIVISOR_6 = 5,
- PLL_DIVISOR_8 = 7,
- PLL_DIVISOR_OFF = 0,
-} pll_divisor_t;
-
-/* Valid values for the PLLP bits off the PLLCFG register. */
-typedef enum {
- PLLP_DIVISOR_7 = 1,
- PLLP_DIVISOR_17 = 3,
- PLLP_DIVISOR_OFF = 0,
-} pllp_divisor_t;
-
-/* Valid values for the PLLM bits of the PLLCFG register. */
-typedef enum {
- PLLM_DIVISOR_1 = 0,
- PLLM_DIVISOR_2 = 1,
- PLLM_DIVISOR_3 = 2,
- PLLM_DIVISOR_4 = 3,
- PLLM_DIVISOR_5 = 4,
- PLLM_DIVISOR_6 = 5,
- PLLM_DIVISOR_7 = 6,
- PLLM_DIVISOR_8 = 7,
-} pllm_divisor_t;
-
-/* Possible sources for the input clock. */
-typedef enum {
- PLL_SRC_NONE = 0,
- PLL_SRC_MSI = 1,
- PLL_SRC_HSI = 2,
- PLL_SRC_HSE = 3,
-} pll_src_t;
-
-/* Valid sources for the system clock. */
-typedef enum {
- SYSTEM_CLOCK_SRC_MSI = 0,
- SYSTEM_CLOCK_SRC_HSI = 1,
- SYSTEM_CLOCK_SRC_HSE = 2,
- SYSTEM_CLOCK_SRC_PLL = 3,
-} system_clock_src_t;
-
-#define E_BADPLLN (-2)
-#define E_BADPLLP_DIV (-1)
-#define E_TIMEOUT (-3)
-#define E_NOT_OFF (-4)
-#define E_BAD_ARG (-5)
-
-#define enable_hsi(rcc, enabled) do { \
- if (enabled) { \
- (rcc)->c_r |= BIT(8); \
- } else { \
- (rcc)->c_r &= ~BIT(8); \
- } \
-} while(0)
-
-/*
- * Sets the system clock to a full 80Mhz.
- */
-int set_system_clock_MHz(uint8_t mhz);
-
-/*
- * Set the PLL on.
- */
-int pll_on();
-
-/*
- * Set the PLL off.
- */
-int pll_off();
-
-/*
- * Sets the source of the system clock.
- */
-int set_system_clock_src(system_clock_src_t src);
-
-/*
- * Configure the PLL.
- */
-int configure_pll(
- uint8_t pllp_div_factor, pll_divisor_t pllr, /* System clock divisor. */
- pll_divisor_t pllq, /* Divison factor for PLL48M1CLK. */
- pllp_divisor_t pllp, /* Divison factor for PLLSAI2CLK. */
- uint8_t plln, /* PLL numerator. */
- pllm_divisor_t pllm, /* PLL denominator. */
- pll_src_t pllsrc /* PLL source */);
-
-#endif /* CORE_CLOCK_H__ */
diff --git a/02-usart/include/core/dma.h b/02-usart/include/core/dma.h
deleted file mode 100644
index 8e4896d..0000000
--- a/02-usart/include/core/dma.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef CORE_DMA_H_
-#define CORE_DMA_H_
-
-/*
- * Header file for definining the DMA (Direct Memory Access).
- *
- * A DMA is used to perform data transfers between segments of memory
- * or between memory and peripherals.
- *
- * There are 2 DMA's on the chip. Each with 7 channels.
- */
-
-#include "common.h"
-#include <arch.h>
-#include <stdint.h>
-
-#define DMA1 (* (dma_t*) DMA1_BASE)
-#define DMA2 (* (dma_t*) DMA2_BASE)
-
-typedef enum {
- DMA_SIZE_8_BITS = 0,
- DMA_SIZE_16_BITS = 1,
- DMA_SIZE_32_BITS = 2,
-} dma_size_t;
-
-typedef enum {
- DMA_PRIORITY_LEVEL_LOW = 0,
- DMA_PRIORITY_LEVEL_MEDIUM = 1,
- DMA_PRIORITY_LEVEL_HIGH = 2,
- DMA_PRIORITY_LEVEL_VERY_HIGH = 3
-} dma_priority_level_t;
-
-typedef enum {
- READ_FROM_PERIPHERAL = 0,
- READ_FROM_MEMORY = 1,
-} dma_dir_t;
-
-typedef struct {
-
-#define dma_cc_en (1 << 0) // channel enable
-#define dma_cc_tcie (1 << 1) // transfer complete interrupt enable
-#define dma_cc_htie (1 << 2) // half transfer interrupt enable
-#define dma_cc_teie (1 << 3) // transfer error interrupt enable
-#define dma_cc_dir (1 << 4) // data transfer direction
-#define dma_cc_circ (1 << 5) // circular mode
-#define dma_cc_pinc (1 << 6) // peripheral increment mode
-#define dma_cc_minc (1 << 7) // memory increment mode
-#define dma_cc_psize (3 << 8) // Peripheral size
-#define dma_cc_msize (3 << 10) // Memory size
-#define dma_cc_pl (3 << 12) // Priority level
-#define dma_cc_mem2mem (1 << 14) // Memory to memory mode
-
- __IO uint32_t cc_r;
-
- /* Number of data to transfer. Can only store a short. */
- __IO uint32_t cndt_r;
-
- /* DMA channel peripheral address register.
- * Defines a memory address if mem2mem is set. */
- __IO uint32_t cpa_r;
-
- /* DMA channel memory address register.
- * Defines another perpipheral address if peripheral-periphal mode is set. */
- __IO uint32_t cma_r;
-
- __IO uint32_t reserved;
-} dma_channel_config_t;
-
-typedef struct {
- // DMA Interrupt status register.
-#define dma_gif1 (1 << 0) // global interrupt flag for channel 1
-#define dma_tcif1 (1 << 1) // transfer complete (TC) flag for channel 1
-#define dma_htif1 (1 << 2) // half transfer (HT) flag for channel 1
-#define dma_teif1 (1 << 3) // transfer error (TE) flag for channel 1
-#define dma_gif2 (1 << 4) // global interrupt flag for channel 2
-#define dma_tcif2 (1 << 5) // transfer complete (TC) flag for channel 2
-#define dma_htif2 (1 << 6) // half transfer (HT) flag for channel 2
-#define dma_teif2 (1 << 7) // transfer error (TE) flag for channel 2
-#define dma_gif3 (1 << 8) // global interrupt flag for channel 3
-#define dma_tcif3 (1 << 9) // transfer complete (TC) flag for channel 3
-#define dma_htif3 (1 << 10) // half transfer (HT) flag for channel 3
-#define dma_teif3 (1 << 11) // transfer error (TE) flag for channel 3
-#define dma_gif4 (1 << 12) // global interrupt flag for channel 4
-#define dma_tcif4 (1 << 13) // transfer complete (TC) flag for channel 4
-#define dma_htif4 (1 << 14) // half transfer (HT) flag for channel 4
-#define dma_teif4 (1 << 15) // transfer error (TE) flag for channel 4
-#define dma_gif5 (1 << 16) // global interrupt flag for channel 5
-#define dma_tcif5 (1 << 17) // transfer complete (TC) flag for channel 5
-#define dma_htif5 (1 << 18) // half transfer (HT) flag for channel 5
-#define dma_teif5 (1 << 19) // transfer error (TE) flag for channel 5
-#define dma_gif6 (1 << 20) // global interrupt flag for channel 6
-#define dma_tcif6 (1 << 21) // transfer complete (TC) flag for channel 6
-#define dma_htif6 (1 << 22) // half transfer (HT) flag for channel 6
-#define dma_teif6 (1 << 23) // transfer error (TE) flag for channel 6
-#define dma_gif7 (1 << 24) // global interrupt flag for channel 7
-#define dma_tcif7 (1 << 25) // transfer complete (TC) flag for channel 7
-#define dma_htif7 (1 << 26) // half transfer (HT) flag for channel 7
-#define dma_teif7 (1 << 27) // transfer error (TE) flag for channel 7
- __IO uint32_t is_r;
-
- // DMA Interrupt flag clear register
-#define dma_cgif1 (1 << 0) // global interrupt flag clear for channel 1
-#define dma_ctcif1 (1 << 1) // transfer complete flag clear for channel 1
-#define dma_chtif1 (1 << 2) // half transfer flag clear for channel 1
-#define dma_cteif1 (1 << 3) // transfer error flag clear for channel 1
-#define dma_cgif2 (1 << 4) // global interrupt flag clear for channel 2
-#define dma_ctcif2 (1 << 5) // transfer complete flag clear for channel 2
-#define dma_chtif2 (1 << 6) // half transfer flag clear for channel 2
-#define dma_cteif2 (1 << 7) // transfer error flag clear for channel 2
-#define dma_cgif3 (1 << 8) // global interrupt flag clear for channel 3
-#define dma_ctcif3 (1 << 9) // transfer complete flag clear for channel 3
-#define dma_chtif3 (1 << 10) // half transfer flag clear for channel 3
-#define dma_cteif3 (1 << 11) // transfer error flag clear for channel 3
-#define dma_cgif4 (1 << 12) // global interrupt flag clear for channel 4
-#define dma_ctcif4 (1 << 13) // transfer complete flag clear for channel 4
-#define dma_chtif4 (1 << 14) // half transfer flag clear for channel 4
-#define dma_cteif4 (1 << 15) // transfer error flag clear for channel 4
-#define dma_cgif5 (1 << 16) // global interrupt flag clear for channel 5
-#define dma_ctcif5 (1 << 17) // transfer complete flag clear for channel 5
-#define dma_chtif5 (1 << 18) // half transfer flag clear for channel 5
-#define dma_cteif5 (1 << 19) // transfer error flag clear for channel 5
-#define dma_cgif6 (1 << 20) // global interrupt flag clear for channel 6
-#define dma_ctcif6 (1 << 21) // transfer complete flag clear for channel 6
-#define dma_chtif6 (1 << 22) // half transfer flag clear for channel 6
-#define dma_cteif6 (1 << 23) // transfer error flag clear for channel 6
-#define dma_cgif7 (1 << 24) // global interrupt flag clear for channel 7
-#define dma_ctcif7 (1 << 25) // transfer complete flag clear for channel 7
-#define dma_chtif7 (1 << 26) // half transfer flag clear for channel 7
-#define dma_cteif7 (1 << 27) // transfer error flag clear for channel 7
- __IO uint32_t ifc_r;
-
- dma_channel_config_t channel_config[7];
-
- __IO uint32_t reserved[5];
-
- /* DMA channel selection register. */
-#define dma_c1s (0xF << 0) // DMA channel 1 selection.
-#define dma_c2s (0xF << 4) // DMA channel 2 selection.
-#define dma_c3s (0xF << 8) // DMA channel 3 selection.
-#define dma_c4s (0xF << 12) // DMA channel 4 selection.
-#define dma_c5s (0xF << 16) // DMA channel 5 selection.
-#define dma_c6s (0xF << 20) // DMA channel 6 selection.
-#define dma_c7s (0xF << 24) // DMA channel 7 selection.
- __IO uint32_t csel_r;
-} dma_t;
-
-static_assert(offsetof(dma_t, csel_r) == 0xA8, "Offset check failed.");
-
-#endif /* CORE_DMA_H_ */
diff --git a/02-usart/include/core/flash.h b/02-usart/include/core/flash.h
deleted file mode 100644
index a163a25..0000000
--- a/02-usart/include/core/flash.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef H__FLASH_
-#define H__FLASH_
-
-#include "common.h"
-
-/*
- * Header file for dealing with flash.
- */
-
-#define FLASH_BASE 0x40022000
-
-typedef struct {
- __IO uint32_t ac_r; /* Flash access control register. */
-
- /* TODO fill out the rest. */
-} PACKED flash_t;
-
-#define FLASH (*(__IO flash_t*)FLASH_BASE)
-
-#endif /* H__FLASH_ */
diff --git a/02-usart/include/core/gpio.h b/02-usart/include/core/gpio.h
deleted file mode 100644
index 54963b1..0000000
--- a/02-usart/include/core/gpio.h
+++ /dev/null
@@ -1,326 +0,0 @@
-#ifndef CORE_GPIO_H__
-#define CORE_GPIO_H__
-
-#include "common.h"
-#include "rcc.h"
-
-#include <stdint.h>
-
-/*
- * Possible GPIO ports.
- */
-typedef enum {
- GPIO_PORT_A = 0,
- GPIO_PORT_B = 1,
- GPIO_PORT_C = 2,
- GPIO_PORT_D = 3
-} gpio_port_number_t;
-
-/*
- * Structure defining the layout of the layout of the GPIO registers on the
- * stm32l432 development board.
- */
-typedef struct GPIO_PORT_STR {
- /* Mode of each GPIO pin for this GPIO port. */
-#define gpio_mode0 (3 << 0)
-#define gpio_mode1 (3 << 2)
-#define gpio_mode2 (3 << 4)
-#define gpio_mode3 (3 << 6)
-#define gpio_mode4 (3 << 8)
-#define gpio_mode5 (3 << 10)
-#define gpio_mode6 (3 << 12)
-#define gpio_mode7 (3 << 14)
-#define gpio_mode8 (3 << 16)
-#define gpio_mode9 (3 << 18)
-#define gpio_mode10 (3 << 20)
-#define gpio_mode11 (3 << 22)
-#define gpio_mode12 (3 << 24)
-#define gpio_mode13 (3 << 26)
-#define gpio_mode14 (3 << 28)
-#define gpio_mode15 (3 << 30)
- __IO uint32_t mode_r; /* Mode register */
-
- /* Output type for each gpio pin in this port. */
-#define gpio_otype0 (1 << 0)
-#define gpio_otype1 (1 << 1)
-#define gpio_otype2 (1 << 2)
-#define gpio_otype3 (1 << 3)
-#define gpio_otype4 (1 << 4)
-#define gpio_otype5 (1 << 5)
-#define gpio_otype6 (1 << 6)
-#define gpio_otype7 (1 << 7)
-#define gpio_otype8 (1 << 8)
-#define gpio_otype9 (1 << 9)
-#define gpio_otype10 (1 << 10)
-#define gpio_otype11 (1 << 11)
-#define gpio_otype12 (1 << 12)
-#define gpio_otype13 (1 << 13)
-#define gpio_otype14 (1 << 14)
-#define gpio_otype15 (1 << 15)
- __IO uint32_t otype_r;
-
- /* GPIO port output speed. */
-#define gpio_ospeed0 (3 << 0)
-#define gpio_ospeed1 (3 << 2)
-#define gpio_ospeed2 (3 << 4)
-#define gpio_ospeed3 (3 << 6)
-#define gpio_ospeed4 (3 << 8)
-#define gpio_ospeed5 (3 << 10)
-#define gpio_ospeed6 (3 << 12)
-#define gpio_ospeed7 (3 << 14)
-#define gpio_ospeed8 (3 << 16)
-#define gpio_ospeed9 (3 << 18)
-#define gpio_ospeed10 (3 << 20)
-#define gpio_ospeed11 (3 << 22)
-#define gpio_ospeed12 (3 << 24)
-#define gpio_ospeed13 (3 << 26)
-#define gpio_ospeed14 (3 << 28)
-#define gpio_ospeed15 (3 << 30)
- __IO uint32_t ospeed_r;
-
- /* GPIO port pull-up/pull-down register */
-#define gpio_pupd0 (3 << 0)
-#define gpio_pupd1 (3 << 2)
-#define gpio_pupd2 (3 << 4)
-#define gpio_pupd3 (3 << 6)
-#define gpio_pupd4 (3 << 8)
-#define gpio_pupd5 (3 << 10)
-#define gpio_pupd6 (3 << 12)
-#define gpio_pupd7 (3 << 14)
-#define gpio_pupd8 (3 << 16)
-#define gpio_pupd9 (3 << 18)
-#define gpio_pupd10 (3 << 20)
-#define gpio_pupd11 (3 << 22)
-#define gpio_pupd12 (3 << 24)
-#define gpio_pupd13 (3 << 26)
-#define gpio_pupd14 (3 << 28)
-#define gpio_pupd15 (3 << 30)
- __IO uint32_t pupd_r;
-
- /* GPIO port input data register. */
-#define gpio_idr0 (1 << 0)
-#define gpio_idr1 (1 << 1)
-#define gpio_idr2 (1 << 2)
-#define gpio_idr3 (1 << 3)
-#define gpio_idr4 (1 << 4)
-#define gpio_idr5 (1 << 5)
-#define gpio_idr6 (1 << 6)
-#define gpio_idr7 (1 << 7)
-#define gpio_idr8 (1 << 8)
-#define gpio_idr9 (1 << 9)
-#define gpio_idr10 (1 << 10)
-#define gpio_idr11 (1 << 11)
-#define gpio_idr12 (1 << 12)
-#define gpio_idr13 (1 << 13)
-#define gpio_idr14 (1 << 14)
-#define gpio_idr15 (1 << 15)
- __IO uint32_t id_r;
-
- /* GPIO port output data register. */
-#define gpio_odr0 (1 << 0)
-#define gpio_odr1 (1 << 1)
-#define gpio_odr2 (1 << 2)
-#define gpio_odr3 (1 << 3)
-#define gpio_odr4 (1 << 4)
-#define gpio_odr5 (1 << 5)
-#define gpio_odr6 (1 << 6)
-#define gpio_odr7 (1 << 7)
-#define gpio_odr8 (1 << 8)
-#define gpio_odr9 (1 << 9)
-#define gpio_odr10 (1 << 10)
-#define gpio_odr11 (1 << 11)
-#define gpio_odr12 (1 << 12)
-#define gpio_odr13 (1 << 13)
-#define gpio_odr14 (1 << 14)
-#define gpio_odr15 (1 << 15)
- __IO uint32_t output_r;
-
- /* GPIO port bit set/reset register. */
-#define gpio_bs0 (1 << 0)
-#define gpio_bs1 (1 << 1)
-#define gpio_bs2 (1 << 2)
-#define gpio_bs3 (1 << 3)
-#define gpio_bs4 (1 << 4)
-#define gpio_bs5 (1 << 5)
-#define gpio_bs6 (1 << 6)
-#define gpio_bs7 (1 << 7)
-#define gpio_bs8 (1 << 8)
-#define gpio_bs9 (1 << 9)
-#define gpio_bs10 (1 << 10)
-#define gpio_bs11 (1 << 11)
-#define gpio_bs12 (1 << 12)
-#define gpio_bs13 (1 << 13)
-#define gpio_bs14 (1 << 14)
-#define gpio_bs15 (1 << 15)
-#define gpio_br0 (1 << 16)
-#define gpio_br1 (1 << 17)
-#define gpio_br2 (1 << 18)
-#define gpio_br3 (1 << 19)
-#define gpio_br4 (1 << 20)
-#define gpio_br5 (1 << 21)
-#define gpio_br6 (1 << 22)
-#define gpio_br7 (1 << 23)
-#define gpio_br8 (1 << 24)
-#define gpio_br9 (1 << 25)
-#define gpio_br10 (1 << 26)
-#define gpio_br11 (1 << 27)
-#define gpio_br12 (1 << 28)
-#define gpio_br13 (1 << 29)
-#define gpio_br14 (1 << 30)
-#define gpio_br15 (1 << 31)
- __IO uint32_t bsr_r;
-
- /* GPIO port configuration lock register. */
-#define gpio_lck0 (1 << 0)
-#define gpio_lck1 (1 << 1)
-#define gpio_lck2 (1 << 2)
-#define gpio_lck3 (1 << 3)
-#define gpio_lck4 (1 << 4)
-#define gpio_lck5 (1 << 5)
-#define gpio_lck6 (1 << 6)
-#define gpio_lck7 (1 << 7)
-#define gpio_lck8 (1 << 8)
-#define gpio_lck9 (1 << 9)
-#define gpio_lck10 (1 << 10)
-#define gpio_lck11 (1 << 11)
-#define gpio_lck12 (1 << 12)
-#define gpio_lck13 (1 << 13)
-#define gpio_lck14 (1 << 14)
-#define gpio_lck15 (1 << 15)
-#define gpio_lckk (1 << 16)
- __IO uint32_t lck_r;
-
- /* Alternate function low-register. */
-#define gpio_afsel0 (0xF << 0)
-#define gpio_afsel1 (0xF << 4)
-#define gpio_afsel2 (0xF << 8)
-#define gpio_afsel3 (0xF << 12)
-#define gpio_afsel4 (0xF << 16)
-#define gpio_afsel5 (0xF << 20)
-#define gpio_afsel6 (0xF << 24)
-#define gpio_afsel7 (0xF << 28)
- __IO uint32_t af_rl;
-
- /* Alternate function high-register. */
-#define gpio_afsel8 (0xF << 0)
-#define gpio_afsel9 (0xF << 4)
-#define gpio_afsel10 (0xF << 8)
-#define gpio_afsel11 (0xF << 12)
-#define gpio_afsel12 (0xF << 16)
-#define gpio_afsel13 (0xF << 20)
-#define gpio_afsel14 (0xF << 24)
-#define gpio_afsel15 (0xF << 28)
- __IO uint32_t af_rh;
-} PACKED gpio_port_t;
-
-/*
- * Enum defining the PINs in a GPIO port. Each port has 16 pins to use in
- * the stm32l432.
- */
-typedef enum GPIO_PIN_ENUM {
- PIN_0 = 0,
- PIN_1 = 1,
- PIN_2 = 2,
- PIN_3 = 3,
- PIN_4 = 4,
- PIN_5 = 5,
- PIN_6 = 6,
- PIN_7 = 7,
- PIN_8 = 8,
- PIN_9 = 9,
- PIN_10 = 10,
- PIN_11 = 11,
- PIN_12 = 12,
- PIN_13 = 13,
- PIN_14 = 14,
- PIN_15 = 15
-} gpio_pin_t;
-
-/* Alternate function number. */
-typedef enum {
- AFN_0 = 0,
- AFN_1 = 1,
- AFN_2 = 2,
- AFN_3 = 3,
- AFN_4 = 4,
- AFN_5 = 5,
- AFN_6 = 6,
- AFN_7 = 7,
- AFN_8 = 8,
- AFN_9 = 9,
- AFN_10 = 10,
- AFN_11 = 11,
- AFN_12 = 12,
- AFN_13 = 13,
- AFN_14 = 14,
- AFN_15 = 15
-} alternate_function_t;
-
-/*
- * Enum defining the pin modes that are possible.
- */
-typedef enum {
- MODE_INPUT = 0,
- MODE_OUTPUT = 1,
- MODE_ALTERNATE = 2,
- MODE_ANALOG = 3
-} gpio_pin_mode_t;
-
-/*
- * Enum defining the pin speeds that are possible.
- */
-typedef enum {
- SPEED_2MHZ = 0,
- SPEED_10MHZ = 1,
- SPEED_50MHZ = 3,
-} speed_t;
-
-/*
- * Structure defining an OUTPUT pin. Structurally equivalent to the input pin,
- * but can be used in a slightly type-safe manner.
- */
-typedef struct {
- __IO gpio_port_t* gpio_port;
- gpio_pin_t pin;
-} gpio_output_pin_t;
-
-/*
- * Sets the mode on a GPIO pin.
- *
- * gpio_port: the gpio port to use.
- * pin: the pin number to set.
- * pin_mode: the mode to set the pin to.
- */
-void set_gpio_pin_mode(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin, gpio_pin_mode_t pin_mode);
-
-/*
- * Sets the given GPIO pin to be an output pin. Returns an output_pin struct
- * corresponding to
- */
-gpio_output_pin_t set_gpio_pin_output(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin);
-
-/*
- * Sets an output pin on or off.
- *
- * pin: the pin to toggle.
- * onoff: 0 for off, non-zero of on.
- */
-void set_gpio_output_pin(gpio_output_pin_t pin, bool onoff);
-
-#define pin_on(p) set_gpio_output_pin(p, 1)
-
-#define pin_off(p) set_gpio_output_pin(p, 0)
-
-/*
- * Enables a GPIO port and returns a reference to the register definition
- * of that GPIO port.
- */
-__IO gpio_port_t* enable_gpio(gpio_port_number_t number);
-
-/* Sets the alternate function for a GPIO pin. */
-void set_gpio_alternate_function(
- __IO gpio_port_t* port, gpio_pin_t gpio_pin, alternate_function_t afn);
-
-#endif /* CORE_GPIO_H__ */
diff --git a/02-usart/include/core/irq.h b/02-usart/include/core/irq.h
deleted file mode 100644
index f2fe8d9..0000000
--- a/02-usart/include/core/irq.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef CORE_IRQ_H__
-#define CORE_IRQ_H__
-
-#include <stdint.h>
-
-/*
- * Include file for interrupt service routines.
- */
-
-typedef enum {
-#define IRQ_RESERVED(n)
-#define IRQ(name_, uname, num) \
- IRQ_##uname = num,
-#include "core/isrs.inc"
-#undef IRQ
-#undef IRQ_RESERVED
-} interrupt_t;
-
-/* Defines a set of interrupts so they may be enabled all at once. */
-typedef struct {
- uint32_t sysirqs; /* System iterrupts. */
- uint32_t irqs[8];
-} interrupt_set_t;
-
-inline static void interrupt_set_add(
- interrupt_set_t* interrupt_set, interrupt_t interrupt)
-{
- if (interrupt < 16) {
- interrupt_set->sysirqs |= 1 << interrupt;
- return;
- }
-
- interrupt -= 16;
- int loc = interrupt / 32;
- int off = interrupt % 32;
-
- interrupt_set->irqs[loc] |= 1 << off;
-}
-
-inline static void interrupt_set_remove(
- interrupt_set_t* interrupt_set, interrupt_t interrupt)
-{
- if (interrupt < 16) {
- interrupt_set->sysirqs &= ~(1 << interrupt);
- return;
- }
-
- interrupt -= 16;
- int loc = interrupt / 32;
- int off = interrupt % 32;
-
- interrupt_set->irqs[loc] &= ~(1 << off);
-}
-
-/*
- * The interrupt service routines. These link in the function `main` as the
- * main function.
- */
-extern const void* vectors[];
-
-/*
- * Defines an error state. This loops forever and defines a distinct flashing
- * pattern to let the user know an unhandled ISR happened.
- */
-void unhandled_isr(uint8_t val);
-
-#define enable_interrupt(val) \
- {interrupt_set_t itrset = { 0 }; \
- interrupt_set_add(&itrset, val); \
- enable_interrupts(&itrset);}
-
-#define disable_interrupt(val) \
- {interrupt_set_t itrset = { 0 }; \
- interrupt_set_add(&itrset, val); \
- disable_interrupts(&itrset);}
-
-/*
- * Enables the provided interrupt. Note that if the interrupt is one of the
- * system interrupts (first 16) this function has no effect because those
- * interrupts are always enabled.
- */
-void enable_interrupts(interrupt_set_t* interrupts);
-
-/*
- * Enables the provided interrupt
- */
-void disable_interrupts(interrupt_set_t* interrupts);
-
-#endif /* CORE_IRQ_H_ */
diff --git a/02-usart/include/core/isrs.inc b/02-usart/include/core/isrs.inc
deleted file mode 100644
index 0682238..0000000
--- a/02-usart/include/core/isrs.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * The following is a list of interrupts listed in a way
- * that makes it easy to macro-process them by defining
- * macro definitions for IRQ and IRQ_RESERVED alike followed
- * by including this file.
- */
-IRQ(on_reset, RESET, 1)
-IRQ(on_nmi, NMI, 2)
-IRQ(on_hard_fault, HARD_FAULT, 3)
-IRQ(on_mem_manage, MEM_MANAGE, 4)
-IRQ(on_bus_fault, BUS_FAULT, 5)
-IRQ(on_usage_fault, USAGE_FAULT, 6)
-IRQ_RESERVED(7)
-IRQ_RESERVED(8)
-IRQ_RESERVED(9)
-IRQ_RESERVED(10)
-IRQ(on_svc, SVC, 11)
-IRQ(on_debug_mon, DEBUG_MON, 12)
-IRQ_RESERVED(13)
-IRQ(on_pendsv, PENDSV, 14)
-IRQ(on_systick, SYSTICK, 15)
-IRQ(on_wwdg_irq, WWDG_IRQ, 16)
-IRQ(on_pvd_irq, PVD_IRQ, 17)
-IRQ(on_tamper_stamp_irq, TAMPER_STAMP_IRQ, 18)
-IRQ(on_rtc_wkup_irq, RTC_WKUP_IRQ, 19)
-IRQ(on_flash_irq, FLASH_IRQ, 20)
-IRQ(on_rcc_irq, RCC_IRQ, 21)
-IRQ(on_exti0_irq, EXTI0_IRQ, 22)
-IRQ(on_exti1_irq, EXTI1_IRQ, 23)
-IRQ(on_exti2_irq, EXTI2_IRQ, 24)
-IRQ(on_exti3_irq, EXTI3_IRQ, 25)
-IRQ(on_exti4_irq, EXTI4_IRQ, 26)
-IRQ(on_dma1_channel1_irq, DMA1_CHANNEL1_IRQ, 27)
-IRQ(on_dma1_channel2_irq, DMA1_CHANNEL2_IRQ, 28)
-IRQ(on_dma1_channel3_irq, DMA1_CHANNEL3_IRQ, 29)
-IRQ(on_dma1_channel4_irq, DMA1_CHANNEL4_IRQ, 30)
-IRQ(on_dma1_channel5_irq, DMA1_CHANNEL5_IRQ, 31)
-IRQ(on_dma1_channel6_irq, DMA1_CHANNEL6_IRQ, 32)
-IRQ(on_dma1_channel7_irq, DMA1_CHANNEL7_IRQ, 33)
-IRQ(on_adc1_irq, ADC1_IRQ, 34)
-IRQ(on_can1_tx, CAN1_TX, 35)
-IRQ(on_can1_rx0, CAN1_RX0, 36)
-IRQ(on_can1_rx1, CAN1_RX1, 37)
-IRQ(on_can1_sce, CAN1_SCE, 38)
-IRQ(on_exti9_5, EXTI9_5, 39)
-IRQ(on_tim1_brk, TIM1_BRK, 40)
-IRQ(on_tim1_up, TIM1_UP, 41)
-IRQ(on_tim1_trg_com, TIM1_TRG_COM, 42)
-IRQ(on_tim1_cc, TIM1_CC, 43)
-IRQ(on_tim2, TIM2, 44)
-IRQ(on_tim3, TIM3, 45)
-IRQ(on_tim4, TIM4, 46)
-IRQ(on_i2c1_ev, I2C1_EV, 47)
-IRQ(on_i2c1_er, I2C1_ER, 48)
-IRQ(on_i2c2_ev, I2C2_EV, 49)
-IRQ(on_i2c2_er, I2C2_ER, 50)
-IRQ(on_spi1, SPI1, 51)
-IRQ(on_spi2, SPI2, 52)
-IRQ(on_usart1, USART1, 53)
-IRQ(on_usart2, USART2, 54)
-IRQ(on_usart3, USART3, 55)
-IRQ(on_exti15_10, EXTI15_10, 56)
-IRQ(on_rtc_alarm, RTC_ALARM, 57)
-IRQ(on_dfsdm1_flt3, DFSDM1_FLT3, 58)
-IRQ(on_tim8_brk, TIM8_BRK, 59)
-IRQ(on_tim8_up, TIM8_UP, 60)
-IRQ(on_tim8_trg_com, TIM8_TRG_COM, 61)
-IRQ(on_tim8_cc, TIM8_CC, 62)
-IRQ(on_adc3, ADC3, 63)
-IRQ(on_fmc, FMC, 64)
-IRQ(on_sdmmc1, SDMMC1, 65)
-IRQ(on_tim5, TIM5, 66)
-IRQ(on_spi3, SPI3, 67)
-IRQ(on_uart4, UART4, 68)
-IRQ(on_uart5, UART5, 69)
-IRQ(on_tim6_dacunder, TIM6_DACUNDER, 70)
-IRQ(on_tim7, TIM7, 71)
-IRQ(on_dma2_channel1, DMA2_CHANNEL1_IRQ, 72)
-IRQ(on_dma2_channel2, DMA2_CHANNEL2_IRQ, 73)
-IRQ(on_dma2_channel3, DMA2_CHANNEL3_IRQ, 74)
-IRQ(on_dma2_channel4, DMA2_CHANNEL4_IRQ, 75)
-IRQ(on_dma2_channel5, DMA2_CHANNEL5_IRQ, 76)
-IRQ(on_dfsdm1_flt0, DFSDM1_FLT0, 77)
-IRQ(on_dfsdm1_flt1, DFSDM1_FLT1, 78)
-IRQ(on_dfsdm1_flt2, DFSDM1_FLT2, 79)
-IRQ(on_comp, COMP, 80)
-IRQ(on_lptim1, LPTIM1, 81)
-IRQ(on_lptim2, LPTIM2, 82)
-IRQ(on_otg_fs, OTG_FS, 83)
-IRQ(on_dma2_channel6, DMA2_CHANNEL6, 84)
-IRQ(on_dma2_channel7, DMA2_CHANNEL7, 85)
-IRQ(on_lpuart1, LPUART1, 86)
-IRQ(on_quadspi, QUADSPI, 87)
-IRQ(on_i2c3_ev, I2C3_EV, 88)
-IRQ(on_i2c3_er, I2C3_ER, 89)
-IRQ(on_sai1, SAI1, 90)
-IRQ(on_sai2, SAI2, 91)
-IRQ(on_swpmi1, SWPMI1, 92)
-IRQ(on_tsc, TSC, 93)
-IRQ(on_lcd, LCD, 94)
-IRQ(on_aes, AES, 95)
-IRQ(on_rng, RNG, 96)
-IRQ(on_fpu, FPU, 97)
-IRQ(on_hash, HASH, 98)
-IRQ(on_i2c4_ev, I2C4_EV, 99)
-IRQ(on_i2c4_er, I2C4_ER, 100)
-IRQ(on_dcmi, DCMI, 101)
-IRQ(on_can2_tx, CAN2_TX, 102)
-IRQ(on_can2_rx0, CAN2_RX0, 103)
-IRQ(on_can2_rx1, CAN2_RX1, 104)
-IRQ(on_can2_sce, CAN2_SCE, 105)
-IRQ(on_dma2d, DMA2D, 106)
diff --git a/02-usart/include/core/nvic.h b/02-usart/include/core/nvic.h
deleted file mode 100644
index c761574..0000000
--- a/02-usart/include/core/nvic.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef NVIC_H_
-#define NVIC_H_
-
-#include "arch.h"
-#include "common.h"
-
-typedef __IO struct {
-#define nvic_intlinesnum (0x0F << 0)
- uint32_t ict_r; /* Interrupt control type register. */
-
- uint8_t reserved0[0xF8];
-
- uint32_t ise_r[8];
-
- uint8_t reserved1[0x60];
-
- uint32_t ice_r[8];
-
- uint8_t reserved2[0x60];
-
- uint32_t isp_r[8];
-
- uint8_t reserved3[0x60];
-
- uint32_t icp_r[8];
-
- uint8_t reserved4[0x60];
-
- uint32_t iab_r[8];
-
- uint8_t reserved5[0xE0];
-
- uint32_t ip_r[60];
-} nvic_t;
-
-static_assert(offsetof(nvic_t, ise_r) == 0x00FC, "Offset check failed");
-static_assert(offsetof(nvic_t, ice_r) == 0x017C, "Offset check failed");
-static_assert(offsetof(nvic_t, isp_r) == 0x01FC, "Offset check failed");
-static_assert(offsetof(nvic_t, icp_r) == 0x027C, "Offset check failed");
-static_assert(offsetof(nvic_t, iab_r) == 0x02FC, "Offset check failed");
-static_assert(offsetof(nvic_t, ip_r) == 0x03FC, "Offset check failed");
-
-#define NVIC (* (nvic_t*) NVIC_BASE)
-
-
-#endif /* NVIC_H_ */
diff --git a/02-usart/include/core/rcc.h b/02-usart/include/core/rcc.h
deleted file mode 100644
index 45f64b5..0000000
--- a/02-usart/include/core/rcc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef H__RCC_
-#define H__RCC_
-
-#include "arch.h"
-#include "common.h"
-#include <stdint.h>
-
-typedef struct {
- __IO uint32_t c_r; /* Clock control register. 0x00 */
- __IO uint32_t icsc_r; /* Internal clock srcs calibration register. 0x04 */
- __IO uint32_t cfg_r; /* clock confguration register. 0x08 */
- __IO uint32_t pllcfg_r; /* PLL Configuration register. 0x0c */
- __IO uint32_t pllsai1cfg_r; /* PLLSAI1 configuration register. 0x10 */
-
- __IO uint32_t reserved_1; /* Not used. offset 0x14. */
-
- __IO uint32_t cie_r; /* Clock interrupt enable register. 0x18 */
- __IO uint32_t cif_r; /* Clock interrupt flag regiseter. 0x1c */
- __IO uint32_t cic_r; /* Clock interrupt clear register. 0x20 */
-
- __IO uint32_t reserved_2; /* Not used. offset 0x24. */
-
- __IO uint32_t ahb1rst_r; /* AHB Peripheral 1 reset register. 0x28 */
- __IO uint32_t ahb2rst_r; /* AHB Peripheral 2 reset register. 0x2c */
- __IO uint32_t ahb3rst_r; /* AHB Peripheral 3 reset register. 0x30 */
-
- __IO uint32_t reserved_3; /* Not used. offset 0x34. */
-
-#define rcc_lptim1rst (1 << 31) // Low Power Timer 1 reset
-#define rcc_opamprst (1 << 30) // OPAMP interface reset
-#define rcc_dac1rst (1 << 29) // DAC1 interface reset
-#define rcc_pwrrst (1 << 28) // Power interface reset
-#define rcc_can2rst (1 << 26) // CAN2 reset (this bit is reserved for STM32L47x/L48x devices)
-#define rcc_can1rst (1 << 25) // CAN1 reset
-#define rcc_crsrst (1 << 24) // CRS reset (this bit is reserved for STM32L47x/L48x devices)
-#define rcc_i2c3rst (1 << 23) // I2C3 reset
-#define rcc_i2c2rst (1 << 22) // I2C2 reset
-#define rcc_i2c1rst (1 << 21) // I2C1 reset
-#define rcc_uart5rst (1 << 20) // UART5 reset
-#define rcc_uart4rst (1 << 19) // UART4 reset
-#define rcc_usart3rst (1 << 18) // USART3 reset
-#define rcc_usart2rst (1 << 17) // USART2 reset
-#define rcc_reserved (1 << 16) // must be kept at reset value.
-#define rcc_spi3rst (1 << 15) // SPI3 reset
-#define rcc_spi2rst (1 << 14) // SPI2 reset
-#define rcc_lcdrst (1 << 9) // interface reset (this bit is reserved for STM32L471/L4x5 devices)
-#define rcc_tim7rst (1 << 5) // timer reset
-#define rcc_tim6rst (1 << 4) // timer reset
-#define rcc_tim5rst (1 << 3) // timer reset
-#define rcc_tim4rst (1 << 2) // timer reset
-#define rcc_tim3rst (1 << 1) // timer reset
-#define rcc_tim2rst (1 << 0) // timer reset
- __IO uint32_t apb1rst1_r; /* APB Peripheral reset register 1. 0x38 */
- __IO uint32_t apb1rst2_r; /* APB Peripheral reset register 2. 0x3C */
- __IO uint32_t apb2rst_r; /* APB Peripheral reset register. 0x40 */
-
- __IO uint32_t reserved_4; /* Not used. offset 0x44. */
-
-#define rcc_dma1en (1 << 0) /* DMA1 clock enable. */
-#define rcc_dma2en (1 << 1) /* DMA2 clock enable. */
-#define rcc_flashen (1 << 8) /* Flash memory interface clock enable. */
-#define rcc_crcen (1 << 12) /* CRC clock enable. */
-#define rcc_tscen (1 << 16) /* Touch sensing controller clock enable. */
-#define rcc_dmad2en (1 << 17) /* DMA2D clock enabled. */
- __IO uint32_t ahb1en_r; /* AHB1 Peripheral enable register. 0x48 */
- __IO uint32_t ahb2en_r; /* AHB2 Peripheral enable register. 0x4C */
- __IO uint32_t ahb3en_r; /* AHB3 Peripheral enable register. 0x50 */
-
- __IO uint32_t reserved_5; /* Not used. offset 0x54. */
-
- __IO uint32_t apb1en1_r; /* APB1 Peripheral enable register 1. 0x58 */
- __IO uint32_t apb1en2_r; /* APB1 Peripheral enable register 2. 0x5C */
- __IO uint32_t apb2en_r; /* APB2 Peripheral enable register. 0x60 */
-
- __IO uint32_t reserved_6; /* Not used. offset 0x64. */
-
- __IO uint32_t ahb1smen_r; /* 0x68 */
- __IO uint32_t ahb2smen_r; /* 0x6c */
- __IO uint32_t ahb3smen_r; /* 0x70 */
-
- __IO uint32_t reserved_7;
-
- __IO uint32_t apb1smen_r1; /* 0x78 */
- __IO uint32_t apb1smen_r2; /* 0x7c */
- __IO uint32_t apb2smen_r; /* 0x80 */
-
- __IO uint32_t reserved_8;
-
- __IO uint32_t ccip_r; /* 0x88 */
-} PACKED rcc_t;
-
-static_assert(offsetof(rcc_t, ccip_r) == 0x88, "Offset check failed.");
-
-#define RCC (*(__IO rcc_t*)RCC_BASE)
-
-/* Macros to operate on the RCC registers. */
-
-/* Sets the HSE. rcc is the RCC to use, e is zero for off, non-zero for on. */
-#define set_hse(rcc, e) \
- do { \
- if (e) { \
- (rcc).c_r |= 1 << 16; \
- } else { \
- (rcc).c_r &= ~(1 << 16); \
- } \
- } while (0)
-
-/* Sets the HSI. rcc is the RCC to use, e is zero for off, non-zero for on. */
-#define set_hsi(rcc, e) \
- do { \
- if (e) { \
- (rcc).c_r |= 1 << 8; \
- } else { \
- (rcc).c_r &= ~(1 << 8); \
- } \
- } while (0)
-
-/* Checks to see if the hse is ready. */
-#define hse_ready(rcc) ((rcc).c_r & (1 << 17))
-
-/* Checks to see if the hse is ready. */
-#define hsi_ready(rcc) ((rcc).c_r & (1 << 10))
-
-#endif
diff --git a/02-usart/include/core/spi.h b/02-usart/include/core/spi.h
deleted file mode 100644
index 77cd61e..0000000
--- a/02-usart/include/core/spi.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef CORE_SPI_H_
-#define CORE_SPI_H_
-
-#include "common.h"
-#include "arch.h"
-
-#define SPI1 (*((spi_t*)(SPI1_BASE)))
-#define SPI3 (*((spi_t*)(SPI3_BASE)))
-
-typedef enum {
- SPI_BAUD_FPCLK_DIV_2 = 0,
- SPI_BAUD_FPCLK_DIV_4 = 1,
- SPI_BAUD_FPCLK_DIV_8 = 2,
- SPI_BAUD_FPCLK_DIV_16 = 3,
- SPI_BAUD_FPCLK_DIV_32 = 4,
- SPI_BAUD_FPCLK_DIV_64 = 5,
- SPI_BAUD_FPCLK_DIV_128 = 6,
- SPI_BAUD_FPCLK_DIV_256 = 7,
-} spi_baud_rate_t;
-
-typedef enum {
- SPI_DATA_SIZE_NOT_USED_0 = 0,
- SPI_DATA_SIZE_NOT_USED_1 = 1,
- SPI_DATA_SIZE_NOT_USED_2 = 2,
- SPI_DATA_SIZE_4_BITS = 3,
- SPI_DATA_SIZE_5_BITS = 4,
- SPI_DATA_SIZE_6_BITS = 5,
- SPI_DATA_SIZE_7_BITS = 6,
- SPI_DATA_SIZE_8_BITS = 7,
- SPI_DATA_SIZE_9_BITS = 8,
- SPI_DATA_SIZE_10_BITS = 9,
- SPI_DATA_SIZE_11_BITS = 10,
- SPI_DATA_SIZE_12_BITS = 11,
- SPI_DATA_SIZE_13_BITS = 12,
- SPI_DATA_SIZE_14_BITS = 13,
- SPI_DATA_SIZE_15_BITS = 14,
- SPI_DATA_SIZE_16_BITS = 15,
-} spi_data_size_t;
-
-typedef __IO struct {
- /* spi control register. */
-#define spi_bidimode (1 << 15) /* Bidirectional data mode enable. */
-#define spi_bidioe (1 << 14) /* Output enable in bidirectional mode */
-#define spi_crcen (1 << 13) /* Hardware CRC calculation enable */
-#define spi_crcnext (1 << 12) /* Transmit CRC next */
-#define spi_crcl (1 << 11) /* CRC length */
-#define spi_rxonly (1 << 10) /* Receive only mode enabled. */
-#define spi_ssm (1 << 9) /* Software slave management */
-#define spi_ssi (1 << 8) /* Internal slave select */
-#define spi_lsbfirst (1 << 7) /* Frame format */
-#define spi_spe (1 << 6) /* SPI enable */
-#define spi_br (7 << 3) /* SPI enable */
-#define spi_mstr (1 << 2) /* Master selection */
-#define spi_cpol (1 << 1) /* Clock polarity */
-#define spi_cpha (1 << 0) /* Clock phase */
- uint32_t c_r1;
-
- /* spi control register #2 */
-#define spi_ldma_tx (1 << 14) /* Last DMA transfer for transmission */
-#define spi_ldma_rx (1 << 13) /* Last DMA transfer for reception */
-#define spi_frxth (1 << 12) /* FIFO reception threshold */
-#define spi_ds (0xF << 8) /* Data size */
-#define spi_txeie (1 << 7) /* Tx buffer empty interrupt enable */
-#define spi_rxneie (1 << 6) /* RX buffer not empty interrupt enable */
-#define spi_errie (1 << 5) /* Error interrupt enable */
-#define spi_frf (1 << 4) /* Frame format */
-#define spi_nssp (1 << 3) /*: NSS pulse management */
-#define spi_ssoe (1 << 2) /* SS output enable */
-#define spi_txdmaen (1 << 1) /* Tx buffer DMA enable */
-#define spi_rxdmaen (1 << 0) /* Rx buffer DMA enable */
- uint32_t c_r2;
-
- /* spi status register. */
-#define spi_ftlvl (3 << 11) /* Transmisison level */
-#define spi_frlvl (3 << 9) /* Reception level */
-#define spi_fre (1 << 8) /* Frame format error */
-#define spi_bsy (1 << 7) /* Busy flag */
-#define spi_ovr (1 << 6) /* Overrun flag */
-#define spi_modf (1 << 5) /* Mode fault */
-#define spi_crcerr (1 << 4) /* CRC error flag */
-#define spi_txe (1 << 1) /* Transmit buffer empty */
-#define spi_rxne (1 << 0) /* Receive buffer not empty */
- uint32_t s_r;
-
- /* spi data register. Really only the least-significant 16 bits are used.
- * reading from this register reads from the Rx FIFO while writing to it
- * writes to the Tx FIFO. */
- __IO uint32_t d_r;
-
- /* spi CRC polynomial register. */
- uint32_t crcp_r;
-
- /* spi rx CRC register. */
- uint32_t rxcrc_r;
-
- /* spi tx CRC register. */
- uint32_t txcrc_r;
-} spi_t;
-
-static_assert(offsetof(spi_t, txcrc_r) == 0x18, "Offset check failed.");
-
-#endif /* CORE_SPI_H_ */
diff --git a/02-usart/include/core/system.h b/02-usart/include/core/system.h
deleted file mode 100644
index a636729..0000000
--- a/02-usart/include/core/system.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef CORE_SYSTEM_H_
-#define CORE_SYSTEM_H_
-
-#include <stdint.h>
-#include "common.h"
-
-typedef __IO struct {
- uint32_t actl_r; /* Auxiliary Control Register, ACTLR on page 4-5 */
-
- uint32_t reserved0;
-
-#define scb_enable (1 << 0)
-#define scb_tickint (1 << 1)
-#define scb_clksource (1 << 2)
-#define scb_countflag (1 << 16)
- uint32_t stcs_r; /* SysTick Control and Status Register */
-
- uint32_t strv_r; /* SysTick Reload Value Register */
- uint32_t stcv_r; /* SysTick Current Value Register */
- uint32_t stc_r; /* SysTick Calibration Value Register */
-
- uint8_t reserved1[3296];
-
- uint32_t cpuid; /* CPUID Base Register, CPUID on page 4-5 */
- uint32_t ics_r; /* RO 0x00000000 Interrupt Control and State Register */
- uint32_t vto_r; /* Vector Table Offset Register */
- uint32_t airc_r; /* Application Interrupt and Reset Control Register */
- uint32_t sc_r; /* System Control Register */
- uint32_t cc_r; /* Configuration and Control Register. */
- uint32_t shp_r1; /* System Handler Priority Register 1 */
- uint32_t shp_r2; /* System Handler Priority Register 2 */
- uint32_t shp_r3; /* System Handler Priority Register 3 */
- uint32_t shcs_r; /* System Handler Control and State Register */
- uint32_t cfs_r; /* Configurable Fault Status Registers */
- uint32_t hfs_r; /* HardFault Status register */
- uint32_t dfs_r; /* Debug Fault Status Register */
- uint32_t mmfa_r; /* MemManage Address Registerb */
- uint32_t bfa_r; /* BusFault Address Registerb */
- uint32_t afs_r; /* Auxiliary Fault Status Register, AFSR on page 4-6 */
- uint32_t id_pf_r0; /* Processor Feature Register 0 */
- uint32_t id_pf_r1; /* Processor Feature Register 1 */
- uint32_t id_df_r0; /* Debug Features Register 0 */
- uint32_t id_af_r0; /* Auxiliary Features Register 0 */
- uint32_t id_mmf_r0; /* Memory Model Feature Register 0 */
- uint32_t id_mmf_r1; /* 0x00000000 Memory Model Feature Register 1 */
- uint32_t id_mmf_r2; /* Memory Model Feature Register 2 */
- uint32_t id_mmf_r3; /* Memory Model Feature Register 3 */
- uint32_t id_isa_r0; /* Instruction Set Attributes Register 0 */
- uint32_t id_isa_r1; /* Instruction Set Attributes Register 1 */
- uint32_t id_isa_r2; /* Instruction Set Attributes Register 2 */
- uint32_t id_isa_r3; /* Instruction Set Attributes Register 3 */
- uint32_t id_isa_r4; /* Instruction Set Attributes Register 4 */
-
- uint8_t reserved2[20];
-
- uint32_t cpac_r; /* Coprocessor Access Control Register */
-
- uint8_t reserved3[372];
-
- uint32_t sti_r; /* Software Triggered Interrupt Register */
-} system_control_block_t;
-
-#define ARM_SYSCFG_BASE 0xE000E008
-#define CHECK_OFFSET(member, expected) \
- static_assert(ARM_SYSCFG_BASE + offsetof(system_control_block_t, member) == expected, \
- "Offset check failed")
-
-CHECK_OFFSET(stcs_r, 0xE000E010);
-CHECK_OFFSET(cpuid, 0xE000ED00);
-CHECK_OFFSET(cpac_r, 0xE000ED88);
-CHECK_OFFSET(id_mmf_r3, 0xE000ED5C);
-CHECK_OFFSET(sti_r, 0xE000EF00);
-
-#define SCB (*(system_control_block_t*)SYSTEM_CONFIG_BLOCK_BASE)
-
-#endif
diff --git a/02-usart/include/core/usart.h b/02-usart/include/core/usart.h
deleted file mode 100644
index 8d841df..0000000
--- a/02-usart/include/core/usart.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef H__USART_
-#define H__USART_
-
-#include <arch.h>
-#include <stdint.h>
-
-#include "common.h"
-#include "rcc.h"
-#include <assert.h>
-
-#define USART1 (* (usart_t*) USART1_BASE)
-#define USART2 (* (usart_t*) USART2_BASE)
-
-/*
- * Possible USART clock sources.
- */
-typedef enum {
- USART_CLK_SRC_PLK = 0, /* Clock derived from the SysClk. */
- USART_CLK_SRC_SYSCLK = 1, /* System clock. */
- USART_CLK_SRC_HSI16 = 2, /* 16MHz oscillator. */
- USART_CLK_SRC_LSE = 3 /* Low power 32kHz clock. */
-} usart_clk_src_t;
-
-typedef struct {
- /* USART configuration registers 0x04 - 0x0c. */
-#define usart_ue (1 << 0) /* UART enable */
-#define usart_uesm (1 << 1) /* UART enabled in stop mode. */
-#define usart_re (1 << 2) /* reciever enabled. */
-#define usart_te (1 << 3) /* transmitter enabled. */
-#define usart_idleie (1 << 4) /* Idle interrupt enabled. */
-#define usart_rxneie (1 << 5) /* RXNEIE RXNE interrupt enable. */
-#define usart_tcie (1 << 6)
-#define usart_txeie (1 << 7)
-#define usart_peie (1 << 8)
-#define usart_ps (1 << 9)
-#define usart_pce (1 << 10)
-#define usart_wake (1 << 11)
-#define usart_m0 (1 << 12)
-#define usart_mme (1 << 13)
-#define usart_cmie (1 << 14)
-#define usart_over8 (1 << 15)
-#define usart_dedt (0xF << 16)
-#define usart_deat (0xF << 21)
-#define usart_rtoie (1 << 26)
-#define usart_eobie (1 << 27)
-#define usart_m1 (1 << 28)
- __IO uint32_t c_r1;
- __IO uint32_t c_r2;
-
-
-#define usart_eie (1 << 0) // Error interrupt enable.
-#define usart_iren (1 << 1) // IrDA mode enabled
-#define usart_irlp (1 << 2) // IrDA low power
-#define usart_hdsel (1 << 3) // Half duplex selection
-#define usart_nack (1 << 4) // Smartcard NACK enable
-#define usart_scen (1 << 5) // Smartocard mode enable
-#define usart_dmar (1 << 6) // DMA enable reciever
-#define usart_dmat (1 << 7) // DMA enable transmitter
-#define usart_rtse (1 << 8) // RTS enable
-#define usart_ctse (1 << 9) // CTS enable
-#define usart_ctsie (1 << 10) // CTS interrupt enable
-#define usart_onebit (1 << 11) // One sample bit method enable
-#define usart_ovrdis (1 << 12) // Overrun disable
-#define usart_ddre (1 << 13) // DMA Disable on reception error
-#define usart_dem (1 << 14) // Driver enable mode
-#define usart_dep (1 << 15) // Driver enable polarity selection
-#define usart_scarcnt0 (1 << 17)
-#define usart_scarcnt1 (1 << 18)
-#define usart_scarcnt2 (1 << 19)
-#define usart_wus0 (1 << 20) // Wakeup from STOP mode interrept flag selection
-#define usart_wus1 (1 << 21) // Wakeup from STOP mode interrept flag selection
-#define usart_wufie (1 << 22) // Wakeup from STOP mode interrup enable
-#define usart_ucesm (1 << 23) // USART clock enable in STOP mode.
-#define usart_tcbgtie (1 << 24) // Transmission complete before guard time interrupt
- __IO uint32_t c_r3;
-
- /* USART baud rate register. */
- uint32_t br_r;
- uint32_t gtp_r;
- uint32_t rto_r;
- uint32_t rq_r;
-
- /* USART ISR register. Offset = 0x1c*/
-#define usart_pe (1 << 0) // Parity error
-#define usart_fe (1 << 1) // Framing error
-#define usart_nf (1 << 2) // START bit noise detection flag.
-#define usart_ore (1 << 3) // Overrun error
-#define usart_dlie (1 << 4) // Idle line detected
-#define usart_rxne (1 << 5) // Read data register not empty
-#define usart_tc (1 << 6) // Transmission complete
-#define usart_txe (1 << 7) // Transmit data register empty
-#define usart_lbdf (1 << 8) // LIN break detection flag
-#define usart_ctsif (1 << 9) // CTS interrupt flag
-#define usart_cts (1 << 10) // CTS flag.
-#define usart_rtof (1 << 11) // Receiever timeout
-#define usart_eobf (1 << 12) // End of block flag
-#define usart_abre (1 << 14) // Auto baud rate error
-#define usart_abrf (1 << 15) // Auto baud rate flag
-#define usart_busy (1 << 16) // Busy flag
-#define usart_cmf (1 << 17) // Character match flag
-#define usart_sbkf (1 << 18) // send break flag
-#define usart_rwu (1 << 19) // receiver wakeup frlom mute mode.
-#define usart_wuf (1 << 20) // Wakeup from stop mode flag
-#define usart_teack (1 << 21) // Transmit enable acknowledge flag.
-#define usart_reack (1 << 22) // Receieve enable acknowledge flag.
-#define usart_tcbgt (1 << 25) // Transmission completer before guard time completion.
- __IO uint32_t is_r; /* Interrupt service register. */
-
-#define usart_pecf (1 << 0) // Parity error clear flag
-#define usart_fecf (1 << 1) // Framing error clear flag
-#define usart_ncf (1 << 2) // Noise detected clear flag
-#define usart_orecf (1 << 3) // Overrun error clear flag
-#define usart_idlecf (1 << 4) // Idle line detected clear flag
-#define usart_tccf (1 << 6) // Transmission complete clear flag
-#define usart_tcbgtcf (1 << 7) // Transmission completed before guard time clear flag
-#define usart_lbdcf (1 << 8) // LIN break detection clear flag
-#define usart_ctscf (1 << 9) // CTS clear flag
-#define usart_rtocf (1 << 11) // Receiver timeout clear flag
-#define usart_eobcf (1 << 12) // End of block clear flag
-#define usart_cmcf (1 << 17) // Character match clear flag
-#define usart_wucf (1 << 20) // Wakeup from Stop mode clear flag.
- __IO uint32_t ic_r;
- uint32_t rd_r;
- uint32_t td_r;
-} usart_t;
-
-static_assert(offsetof(usart_t, ic_r) == 0x20, "Offset assertion failed.");
-static_assert(offsetof(usart_t, rd_r) == 0x24, "Offset assertion failed.");
-
-typedef enum {
- OVERSAMPLE_8,
- OVERSAMPLE_16
-} oversampling_mode_t;
-
-static inline void usart_set_divisor(
- __IO usart_t* usart,
- uint32_t usartdiv)
-{
- if (usart->c_r1 & (1 << 15)) {
- /* OVER8 is set. */
- usart->br_r =
- (usartdiv & ~7) |
- ((usartdiv & 7) >> 1);
- } else {
- /* OVER8 is not set. */
- usart->br_r = usartdiv;
- }
-}
-
-static inline void usart_set_oversampling_mode(
- __IO usart_t* usart,
- oversampling_mode_t mode)
-{
- if (mode == OVERSAMPLE_8) {
- usart->c_r1 |= 1 << 15;
- } else {
- usart->c_r1 &= ~(1 << 15);
- }
-}
-
-typedef enum {
- USART_PARITY_DISABLED = 0,
- USART_PARITY_EVEN = 2 << 9,
- USART_PARITY_ODD = 3 << 9,
-} usart_parity_t;
-
-typedef enum {
- USART_ENABLE_TX = 0x02,
- USART_ENABLE_RX = 0x01,
- USART_ENABLE_DISABLED = 0x00,
-} usart_enable_t;
-
-void usart_set_parity(__IO usart_t* usart, usart_parity_t parity);
-
-void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled);
-
-void usart_enable_dma(__IO usart_t* usart, usart_enable_t enabled);
-
-/*
- * Send a byte on the usart, This command blocks until the data
- * is fully sent.
- */
-void usart_transmit_byte_sync(__IO usart_t* usart, uint8_t byte);
-
-void set_usart1_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src);
-
-void set_usart1_clock_enabled(__IO rcc_t* rcc, bool enable);
-
-void set_usart2_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src);
-
-void set_usart2_clock_enabled(__IO rcc_t* rcc, bool enable);
-
-void usart_transmit_bytes_sync(
- __IO usart_t* usart, const uint8_t* bytes, uint32_t n);
-
-void usart_transmit_str_sync(__IO usart_t* usart, const char* str);
-
-void usart_printf(__IO usart_t* usart, const char* fmt, ...);
-
-
-#endif /* H__USART_ */