aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gdbinit (renamed from 02-usart/.gdbinit)0
-rw-r--r--.ycm_extra_conf.py (renamed from 02-usart/.ycm_extra_conf.py)0
-rw-r--r--00-hello/Makefile17
-rw-r--r--00-hello/README19
-rw-r--r--00-hello/linker_script.ld14
-rw-r--r--00-hello/main.c354
-rw-r--r--01-system-clock/Makefile.preamble21
-rw-r--r--01-system-clock/README17
-rwxr-xr-x01-system-clock/genmake.pl70
-rw-r--r--01-system-clock/include/clock.h118
-rw-r--r--01-system-clock/include/common.h14
-rw-r--r--01-system-clock/include/flash.h20
-rw-r--r--01-system-clock/include/gpio.h120
-rw-r--r--01-system-clock/include/isr_vector.h20
-rw-r--r--01-system-clock/include/rcc.h81
-rw-r--r--01-system-clock/include/spin.h15
-rw-r--r--01-system-clock/linker/linker_script.ld36
-rw-r--r--01-system-clock/src/clock.c106
-rw-r--r--01-system-clock/src/delay.c9
-rw-r--r--01-system-clock/src/gpio.c37
-rw-r--r--01-system-clock/src/isr_vector.c165
-rw-r--r--01-system-clock/src/main.c36
-rw-r--r--01-system-clock/src/spin.c49
-rw-r--r--02-usart/include/kern/delay.h12
-rw-r--r--02-usart/src/kern/vector.c0
-rw-r--r--02.5-collatz/Makefile.preamble21
-rwxr-xr-x02.5-collatz/genmake.pl70
-rw-r--r--02.5-collatz/include/apb.h4
-rw-r--r--02.5-collatz/include/clock.h126
-rw-r--r--02.5-collatz/include/common.h30
-rw-r--r--02.5-collatz/include/delay.h12
-rw-r--r--02.5-collatz/include/flash.h20
-rw-r--r--02.5-collatz/include/gpio.h146
-rw-r--r--02.5-collatz/include/isr_vector.h20
-rw-r--r--02.5-collatz/include/rcc.h93
-rw-r--r--02.5-collatz/include/spin.h15
-rw-r--r--02.5-collatz/include/usart.h131
-rw-r--r--02.5-collatz/linker/linker_script.ld36
-rw-r--r--02.5-collatz/src/clock.c106
-rw-r--r--02.5-collatz/src/delay.c9
-rw-r--r--02.5-collatz/src/gpio.c52
-rw-r--r--02.5-collatz/src/isr_vector.c165
-rw-r--r--02.5-collatz/src/main.c93
-rw-r--r--02.5-collatz/src/spin.c49
-rw-r--r--02.5-collatz/src/usart.c80
-rw-r--r--02.5-collatz/src/vector.c0
-rw-r--r--03-refactor/Makefile.preamble21
-rwxr-xr-x03-refactor/genmake.pl70
-rw-r--r--03-refactor/include/apb.h4
-rw-r--r--03-refactor/include/clock.h112
-rw-r--r--03-refactor/include/common.h30
-rw-r--r--03-refactor/include/delay.h12
-rw-r--r--03-refactor/include/flash.h20
-rw-r--r--03-refactor/include/gpio.h146
-rw-r--r--03-refactor/include/isr_vector.h20
-rw-r--r--03-refactor/include/printf.h15
-rw-r--r--03-refactor/include/rcc.h181
-rw-r--r--03-refactor/include/spin.h15
-rw-r--r--03-refactor/include/usart.h219
-rw-r--r--03-refactor/linker/linker_script.ld36
-rw-r--r--03-refactor/src/clock.c131
-rw-r--r--03-refactor/src/delay.c9
-rw-r--r--03-refactor/src/gpio.c52
-rw-r--r--03-refactor/src/isr_vector.c275
-rw-r--r--03-refactor/src/main.c103
-rw-r--r--03-refactor/src/printf.c152
-rw-r--r--03-refactor/src/spin.c49
-rw-r--r--03-refactor/src/usart.c131
-rw-r--r--03-refactor/src/vector.c0
-rw-r--r--Makefile.preamble (renamed from 02-usart/Makefile.preamble)0
-rwxr-xr-xgenmake.pl (renamed from 02-usart/genmake.pl)0
-rw-r--r--include/arch/arm/arch.h (renamed from 02-usart/include/arch/arm/arch.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/apb.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/apb.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/clock.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/clock.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/dma.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/dma.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/flash.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/flash.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/gpio.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/gpio.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/irq.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/irq.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/isrs.inc (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/nvic.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/nvic.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/rcc.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/rcc.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/spi.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/spi.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/system.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/system.h)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc)0
-rw-r--r--include/arch/stm32l4xxx/peripherals/usart.h (renamed from 02-usart/include/arch/stm32l4xxx/peripherals/usart.h)0
-rw-r--r--include/arch/x86_64/arch.h (renamed from 02-usart/include/arch/x86_64/arch.h)0
-rw-r--r--include/kern/common.h (renamed from 02-usart/include/kern/common.h)0
-rw-r--r--include/kern/delay.h (renamed from 01-system-clock/include/delay.h)0
-rw-r--r--include/kern/dma/dma_manager.h (renamed from 02-usart/include/kern/dma/dma_manager.h)0
-rw-r--r--include/kern/gpio/gpio_manager.h (renamed from 02-usart/include/kern/gpio/gpio_manager.h)0
-rw-r--r--include/kern/gpio/sysled.h (renamed from 02-usart/include/kern/gpio/sysled.h)0
-rw-r--r--include/kern/init.h (renamed from 02-usart/include/kern/init.h)0
-rw-r--r--include/kern/lib.h (renamed from 02-usart/include/kern/lib.h)0
-rw-r--r--include/kern/log.h (renamed from 02-usart/include/kern/log.h)0
-rw-r--r--include/kern/mem.h (renamed from 02-usart/include/kern/mem.h)0
-rw-r--r--include/kern/string.h (renamed from 02-usart/include/kern/string.h)0
-rw-r--r--linker/linker_script.ld (renamed from 02-usart/linker/linker_script.ld)0
-rw-r--r--src/arch/stm32l4xxx/peripherals/clock.c (renamed from 02-usart/src/arch/stm32l4xxx/peripherals/clock.c)0
-rw-r--r--src/arch/stm32l4xxx/peripherals/irq.c (renamed from 02-usart/src/arch/stm32l4xxx/peripherals/irq.c)0
-rw-r--r--src/arch/stm32l4xxx/peripherals/usart.c (renamed from 02-usart/src/arch/stm32l4xxx/peripherals/usart.c)0
-rw-r--r--src/kern/delay.c (renamed from 02-usart/src/kern/delay.c)0
-rw-r--r--src/kern/dma/dma_manager.c (renamed from 02-usart/src/kern/dma/dma_manager.c)0
-rw-r--r--src/kern/gpio/gpio_manager.c (renamed from 02-usart/src/kern/gpio/gpio_manager.c)0
-rw-r--r--src/kern/gpio/sysled.c (renamed from 02-usart/src/kern/gpio/sysled.c)0
-rw-r--r--src/kern/init.c (renamed from 02-usart/src/kern/init.c)0
-rw-r--r--src/kern/lib.c (renamed from 02-usart/src/kern/lib.c)0
-rw-r--r--src/kern/log.c (renamed from 02-usart/src/kern/log.c)0
-rw-r--r--src/kern/main.c (renamed from 02-usart/src/kern/main.c)0
-rw-r--r--src/kern/mem.c (renamed from 02-usart/src/kern/mem.c)0
-rw-r--r--src/kern/stdlibrepl.c (renamed from 02-usart/src/kern/stdlibrepl.c)0
-rw-r--r--src/kern/string.c (renamed from 02-usart/src/kern/string.c)0
-rw-r--r--src/kern/vector.c (renamed from 01-system-clock/src/vector.c)0
-rw-r--r--test_harness/Makefile (renamed from 02-usart/test_harness/Makefile)0
-rw-r--r--test_harness/fake_env.c (renamed from 02-usart/test_harness/fake_env.c)0
-rw-r--r--test_harness/fake_env.h (renamed from 02-usart/test_harness/fake_env.h)0
-rw-r--r--test_harness/test_harness.c (renamed from 02-usart/test_harness/test_harness.c)0
-rw-r--r--test_harness/test_harness.h (renamed from 02-usart/test_harness/test_harness.h)0
-rw-r--r--tests/metatest.c (renamed from 02-usart/tests/metatest.c)0
-rw-r--r--tests/test_dma.c (renamed from 02-usart/tests/test_dma.c)0
-rw-r--r--tests/test_gpio.c (renamed from 02-usart/tests/test_gpio.c)0
-rw-r--r--tests/test_irq.c (renamed from 02-usart/tests/test_irq.c)0
-rw-r--r--tests/test_lib.c (renamed from 02-usart/tests/test_lib.c)0
-rw-r--r--tests/test_memory.c (renamed from 02-usart/tests/test_memory.c)0
-rw-r--r--tests/test_spi.c (renamed from 02-usart/tests/test_spi.c)0
-rw-r--r--tests/test_usart.c (renamed from 02-usart/tests/test_usart.c)0
126 files changed, 0 insertions, 4431 deletions
diff --git a/02-usart/.gdbinit b/.gdbinit
index 87932b3..87932b3 100644
--- a/02-usart/.gdbinit
+++ b/.gdbinit
diff --git a/02-usart/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 8203412..8203412 100644
--- a/02-usart/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
diff --git a/00-hello/Makefile b/00-hello/Makefile
deleted file mode 100644
index 9c62c90..0000000
--- a/00-hello/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-OPT?=-O3
-all: main.bin
-
-main.s: main.c
- arm-unknown-eabi-gcc $(OPT) -S main.c -mcpu=cortex-m4 -mthumb -g
-
-main.elf: main.c
- arm-unknown-eabi-gcc $(OPT) main.c -mcpu=cortex-m4 -mthumb -g -lgcc -T linker_script.ld -Xlinker --cref -Xlinker -Map -Xlinker main.map -nostartfiles -o main.elf
-
-main.bin: main.elf
- arm-unknown-eabi-objcopy -O binary main.elf main.bin
-
-flash: main.bin
- st-flash write main.bin 0x8000000
-
-clean:
- rm -f *.elf *.bin
diff --git a/00-hello/README b/00-hello/README
deleted file mode 100644
index b9d0788..0000000
--- a/00-hello/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Welcome to Level 1
-------------------
-
-This is a VERY simple program for the STM32L432 Nucleo-32 board. It simply
-iterates turning on the status led (LD3) and the pin D6.
-
-There is NO clock setting or anything, everything is the default bootup.
-
-There is a single source file, main.c, which defines all the code needed.
-
-There is a linker script which sets up the binary format properly ready to
-be flashed.
-
-This code can be flashed with
-
- $ make flash
-
-this requires the program `st-flash` which is a part of the stlink programmer,
-which can be found at https://github.com/texane/stlink.git.
diff --git a/00-hello/linker_script.ld b/00-hello/linker_script.ld
deleted file mode 100644
index fe0c14b..0000000
--- a/00-hello/linker_script.ld
+++ /dev/null
@@ -1,14 +0,0 @@
-MEMORY
-{
- flash : org = 0x08000000, len = 256k
-}
-
-SECTIONS
-{
- /* This is where the code goes. */
- . = ORIGIN(flash);
- .text : {
- *(.vectors); /* All .vector sections go here. */
- *(.text); /* All .text sections go here. */
- } >flash
-}
diff --git a/00-hello/main.c b/00-hello/main.c
deleted file mode 100644
index fe2b9d5..0000000
--- a/00-hello/main.c
+++ /dev/null
@@ -1,354 +0,0 @@
-#define __IO volatile
-
-#include <stdint.h>
-#define RCC_BASE_2 0x40021000
-
-int main();
-void spin();
-
-/*
- * Interrupt service routine handlers.
- */
-const void* vectors[] __attribute__((section(".vectors"))) = {
- (void*)0x2000c000, /* Top of stack at top of sram1. 48k */
- main, /* Reset handler */
- spin, /* NMI */
- spin, /* Hard Fault */
- spin, /* MemManage */
- spin, /* BusFault */
- spin, /* UsageFault */
- spin, /* Reserved */
- spin, /* Reserved */
- spin, /* Reserved */
- spin, /* Reserved */
- spin, /* SVCall */
- spin, /* Debug */
- spin, /* Reserved */
- spin, /* PendSV */
- spin, /* SysTick */
-
- /* External interrupt handlers follow */
- spin, /* 0 WWDG */
- spin, /* 1 PVD */
- spin, /* 2 TAMP_SAMP */
- spin, /* 3 RTC_WKUP */
- spin, /* 4 FLASH */
- spin, /* 5 RCC */
- spin, /* 6 EXTI0 */
- spin, /* 7 EXTI1 */
- spin, /* 8 EXTI2 */
- spin, /* 9 EXTI3 */
- spin, /* 10 EXTI4 */
- spin, /* 11 DMA_CH1 */
- spin, /* 12 DMA_CH2 */
- spin, /* 13 DMA_CH3 */
- spin, /* 14 DMA_CH4 */
- spin, /* 15 DMA_CH5 */
- spin, /* 16 DMA_CH6 */
- spin, /* 17 DMA_CH7 */
- spin, /* 18 ADC1 */
- spin, /* 19 CAN_TX */
- spin, /* 20 CAN_RX0 */
- spin, /* 21 CAN_RX1 */
- spin, /* 22 CAN_SCE */
- spin, /* 23 EXTI9_5 */
- spin, /* 24 TIM1_BRK/TIM15 */
- spin, /* 25 TIM1_UP/TIM16 */
- spin, /* 26 TIM1_TRG_COM */
- spin, /* 27 TIM1_CC */
- spin, /* 28 TIM2 */
- spin, /* 29 Reserved */
- spin, /* 30 Reserved */
- spin, /* 31 I2C1_EV */
- spin, /* 32 I2C1_ER */
- spin, /* 33 I2C2_EV */
- spin, /* 34 I2C2_ER */
- spin, /* 35 SPI1 */
- spin, /* 36 SPI2 */
- spin, /* 37 USART1 */
- spin, /* 38 USART2 */
- spin, /* 39 USART3 */
- spin, /* 40 EXTI15_10 */
- spin, /* 41 RTCAlarm */
- spin, /* 42 Reserved */
- spin, /* 43 Reserved */
- spin, /* 44 Reserved */
- spin, /* 45 Reserved */
- spin, /* 46 Reserved */
- spin, /* 47 Reserved */
- spin, /* 48 Reserved */
- spin, /* 49 SDMMC1 */
- spin, /* 50 Reserved */
- spin, /* 51 SPI3 */
- spin, /* 52 Reserved */
- spin, /* 53 Reserved */
- spin, /* 54 TIM6_DACUNDER */
- spin, /* 55 TIM7 */
- spin, /* 56 DMA2_CH1 */
- spin, /* 57 DMA2_CH2 */
- spin, /* 58 DMA2_CH3 */
- spin, /* 59 DMA2_CH4 */
- spin, /* 60 DMA2_CH5 */
- spin, /* 61 Reserved */
- spin, /* 62 Reserved */
- spin, /* 63 Reserved*/
- spin, /* 64 COMP */
- spin, /* 65 LPTIM1 */
- spin, /* 66 LPTIM2 */
- spin, /* 67 USB_FS */
- spin, /* 68 DMA_CH6 */
- spin, /* 69 DMA_CH7 */
- spin, /* 70 LPUART1 */
- spin, /* 71 QUADSPI */
- spin, /* 72 I2C3_EV */
- spin, /* 73 I2C3_ER */
- spin, /* 74 SAI1 */
- spin, /* 75 Reserved */
- spin, /* 76 SWPMI1 */
- spin, /* 77 TSC */
- spin, /* 78 Reserved */
- spin, /* 79 AES */
- spin, /* 80 RNG */
- spin, /* 81 FPU */
- spin /* 82 CRS */
-};
-
-typedef struct {
- __IO uint32_t value;
-} rcc_reg_t;
-
-#define RCC_AHB2ENR (*((__IO rcc_reg_t*)(RCC_BASE_2 + 0x4c)))
-
-typedef enum {
- GPIO_PORT_A = 0,
- GPIO_PORT_B = 1,
- GPIO_PORT_C = 2,
- GPIO_PORT_D = 3
-} gpio_port_number_t;
-
-void enable_gpio(gpio_port_number_t port)
-{
- RCC_AHB2ENR.value |= 1 << port;
-}
-
-typedef 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
-} pin_t;
-
-typedef enum {
- MODE_INPUT = 0,
- MODE_OUTPUT = 1,
- MODE_ALTERNATE = 2,
- MODE_ANALOG = 3
-} pin_mode_t;
-
-/* GPIO port speed. */
-typedef enum {
- SPEED_2MHZ = 0,
- SPEED_10MHZ = 1,
- SPEED_50MHZ = 3,
-} speed_t;
-
-/*
- * Mode register. Input, output, alternate functiont or analog.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) mode_reg_t;
-
-/*
- * Type register. Push/pull or open drain.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) type_reg_t;
-
-/*
- * Speed register. Allows low, meduim, fast or high speed.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) speed_reg_t;
-
-/*
- * Pull up/pull down register. Allows pull up, pull down, or no pull up or
- * pull down.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) pull_reg_t;
-
-/*
- * Stores the data for reading from the outside.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) input_data_reg_t;
-
-/*
- * Stores the data for writing to the outside.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) output_data_reg_t;
-
-/*
- * Writing a 1 to a bit in this register allows the user to set or reset a bit
- * in the output data register.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) bit_set_reset_reg_t;
-
-/*
- * Lock register. Allows the user to lock a pin so that its value cannot be
- * changed.
- */
-typedef struct {
- __IO uint32_t value;
-} __attribute__((packed)) lock_reg_t;
-
-/*
- * Alternate function.
- */
-typedef struct {
- __IO uint32_t value_high;
- __IO uint32_t value_low;
-} __attribute__((packed)) alt_function_reg_t;
-
-/* Structure defining the layout of a GPIO port on the STM32L432. */
-typedef struct {
- __IO mode_reg_t mode; /* Mode register */
- __IO pull_reg_t pupd; /* Pull up/pull down/none register */
- __IO speed_reg_t speed; /* Speed register */
- __IO type_reg_t type; /* Type register */
- __IO input_data_reg_t input; /* Input data register */
- __IO output_data_reg_t output; /* Output data register */
- __IO bit_set_reset_reg_t bsr; /* Bit set/reset register */
- __IO lock_reg_t lock; /* Lock register */
- __IO alt_function_reg_t altfn; /* Alternate function registers */
-} __attribute__((packed)) gpio_port_t;
-
-/*
- * Defines for GPIO memory mapped addresses.
- */
-#define GPIO_A (*((__IO gpio_port_t*)0x48000000))
-#define GPIO_B (*((__IO gpio_port_t*)0x48000400))
-#define GPIO_C (*((__IO gpio_port_t*)0x48000800))
-
-/*
- * Delays for `delay` iterations.
- */
-void delay(uint32_t delay)
-{
- while (delay--) {
- // Empty volatile assembly to keep the optimizer from getting
- // rid of this loop entirely.
- asm volatile("");
- }
-}
-
-/*
- * Sets the mode of a pin on a gpio port.
- *
- * gpio_port: the gpio port.
- * pin: the number of the port;
- * pin_mode: the mode of the pin. See pin_mode_t enum.
- */
-void set_gpio_pin_mode(
- __IO gpio_port_t* gpio_port, uint32_t pin, pin_mode_t pin_mode)
-{
- gpio_port->mode.value &= ~(0x03 << pin * 2);
- gpio_port->mode.value |= pin_mode << pin * 2;
-}
-
-/*
- * Sets the value on an output GPIO pin.
- *
- * gpio_port: The gpio port.
- * pin: the number of the pin to enable. Values 0-15
- * val: 0 to set the gpio pin to low, non-zero to set to high.
- */
-void set_gpio_pin(__IO gpio_port_t* gpio_port, uint32_t pin, int val)
-{
- if (val) {
- gpio_port->output.value |= 1 << pin;
- } else {
- gpio_port->output.value &= ~(1 << pin);
- }
-}
-
-/* Main function. This gets executed from the interrupt vector defined above. */
-int main()
-{
- /* Enable the GPIO port B. */
- enable_gpio(GPIO_PORT_B);
-
- /* Set pin 3 and pin 1 of GPIO_B to be an output pin. */
- set_gpio_pin_mode(&GPIO_B, /* pin = */ 3, MODE_OUTPUT);
- set_gpio_pin_mode(&GPIO_B, /* pin = */ 1, MODE_OUTPUT);
-
- while (1) {
- /* Set the GPIO pin to high. */
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 1);
- set_gpio_pin(&GPIO_B, /* pin = */ 1, 0);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
-
- /* Set the GPIO pin to low. */
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 0);
- set_gpio_pin(&GPIO_B, /* pin = */ 1, 1);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- delay(65535);
- }
-}
-
-/*
- * Does nothing ... forever.
- */
-void spin()
-{
- for (;;) {
- /* Flash in a distinct pattern to know that something went wrong. */
-
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 0);
- delay(100000);
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 1);
- delay(100000);
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 0);
- delay(100000);
- set_gpio_pin(&GPIO_B, /* pin = */ 3, 1);
- delay(500000);
- }
-}
diff --git a/01-system-clock/Makefile.preamble b/01-system-clock/Makefile.preamble
deleted file mode 100644
index 3c8a61b..0000000
--- a/01-system-clock/Makefile.preamble
+++ /dev/null
@@ -1,21 +0,0 @@
-OPT?=-O
-PREFIX?=arm-unknown-eabi-
-CC=$(PREFIX)gcc
-LD=$(PREFIX)ld
-CFLAGS?=$(OPT) -mcpu=cortex-m4 -mthumb -g -lgcc -static -nostartfiles -Iinclude
-LD_FLAGS?=-T linker/linker_script.ld -nostdlib --cref -Map linker/main.map -static
-
-
-all: _$(PREFIX)_obs/main.elf
-
-_$(PREFIX)_obs/main.bin: _$(PREFIX)_obs/main.elf
- $(PREFIX)objcopy -O binary _$(PREFIX)_obs/main.elf _$(PREFIX)_obs/main.bin
-
-flash: _$(PREFIX)_obs/main.bin
- st-flash write _$(PREFIX)_obs/main.bin 0x8000000
-
-clean:
- rm -rf _*_obs
-
-genmake:
- ./genmake.pl > Makefile
diff --git a/01-system-clock/README b/01-system-clock/README
deleted file mode 100644
index fb9b5df..0000000
--- a/01-system-clock/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This is much more complex than the simple hello script, but most is boiler plate
-designed to make future debugging easier. The first addition is a genmake
-system where a Makefile may be generated with the command
-`./genmake.pl > Makefile` and subsequently with `make genmake`. This will add
-build rules for each `c` file.
-
-There are some added features as well:
-
-* This code loads values properly from the data and bss segments into memory so
- global variables and global constants may be used.
-
-* This code can properly set the system clock, and does get a full 80MHz out
- of it.
-
-* This code has a `spin()` function that flashes a "morse code" translation
- of a binary error code. (1's are dashes, 0's are dots). Gives minimal feedback
- until such a time where USART is implemented.
diff --git a/01-system-clock/genmake.pl b/01-system-clock/genmake.pl
deleted file mode 100755
index 341db3d..0000000
--- a/01-system-clock/genmake.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-# This script is designed to introspect C files and generate a makefile to use.
-
-sub header_deps {
- my $file = @_[0];
- my @headers;
-
- if (open(my $fh, '<:encoding(UTF-8)', $file)) {
- print STDERR "\x1b[35m[Trace] - Reading file $file\x1b[00m\n";
- push(@headers, $file);
-
- while (<$fh>) {
- /#include\s+"(.*)"\s*$/ && push(@headers, header_deps("include/$1"));
- }
- }
-
- return @headers;
-}
-
-my @files = glob('src/*.c');
-my @obj_files;
-
-open(my $fh, '<:encoding(UTF-8)', "Makefile.preamble")
- or die "Missing Makefile.preamble";
-
-while (<$fh>) {
- print "$_";
-}
-
-# Emit a rule that will rerun genmake if the c files do not match.
-my $idempotency_cmd =
- "ls src/*.c include/*.h| sha1sum | awk '{print \$1}'";
-
-my $idempotency_cmd_make =
- "ls src/*.c include/*.h | sha1sum | awk '{print \$\$1}'";
-
-print "IDEMPOTENCY_HASH=" . `$idempotency_cmd` . "\n";
-
-my $arch_obs_dir = "_\$(PREFIX)_obs";
-print "CHEAT_PRE_MAKE := \$(shell mkdir -p $arch_obs_dir)\n";
-
-foreach $file (@files) {
- my $c_file = $file;
- (my $file_no_ext = $file) =~ s/src\/(.*)\.c$/\1/g;
-
- my $obj_file = "$arch_obs_dir/${file_no_ext}.o";
- my $s_file = "${file_no_ext}.s";
-
- push(@obj_files, $obj_file);
- my @deps = header_deps($c_file);
-
- my $deps_as_join = join(" ", @deps);
-
- # Emit the rule to make the object file.
- print "$obj_file: $deps_as_join\n\t";
- print '$(CC) -c ' . $c_file . ' -o ' . $obj_file . ' $(CFLAGS)' . "\n\n";
-
- # Emit the rule to make the assembly file.
- print "$s_file: $deps_as_join\n\t";
- print '$(CC) -S ' . $c_file . ' -o ' . $s_file . ' $(CFLAGS)' . "\n\n";
-}
-
-my $obj_files_deps = join(' ', @obj_files);
-print "FORCE:\n\t\n\n";
-print "$arch_obs_dir/main.elf: FORCE $obj_files_deps linker/linker_script.ld\n\t";
-print "([ \"\$\$($idempotency_cmd_make)\" != \"\$(IDEMPOTENCY_HASH)\" ] "
- . "&& ./genmake.pl > Makefile && make main.elf ) "
- . "|| "
- . "\$(LD) -o $arch_obs_dir/main.elf \$(LD_FLAGS) $obj_files_deps\n\n";
diff --git a/01-system-clock/include/clock.h b/01-system-clock/include/clock.h
deleted file mode 100644
index de4fb96..0000000
--- a/01-system-clock/include/clock.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef CLOCK_H__
-#define 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)
-
-/*
- * 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 /* CLOCK_H__ */
diff --git a/01-system-clock/include/common.h b/01-system-clock/include/common.h
deleted file mode 100644
index 6fc701c..0000000
--- a/01-system-clock/include/common.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef COMMON__H
-#define COMMON__H
-
-/* Define __IO to be volatile if it's not already. */
-#ifndef __IO
-#define __IO volatile
-#endif
-
-#define bool int
-
-#define PACKED __attribute__((packed))
-#define BIT(n) (1 << (n))
-
-#endif /* COMMON_H */
diff --git a/01-system-clock/include/flash.h b/01-system-clock/include/flash.h
deleted file mode 100644
index a163a25..0000000
--- a/01-system-clock/include/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/01-system-clock/include/gpio.h b/01-system-clock/include/gpio.h
deleted file mode 100644
index a8f06e2..0000000
--- a/01-system-clock/include/gpio.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef GPIO_H__
-#define GPIO_H__
-
-#include "common.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 {
- __IO uint32_t mode_r; /* Mode register */
- __IO uint32_t pupd_r; /* Pull up/pull down/none register */
- __IO uint32_t speed_r; /* Speed register */
- __IO uint32_t type_r; /* Type register */
- __IO uint32_t input_r; /* Input data register */
- __IO uint32_t output_r; /* Output data register */
- __IO uint32_t bsr_r; /* Bit set/reset register */
- __IO uint32_t lock_r; /* Lock register */
- __IO uint32_t altfn_r; /* Alternate function register */
-} 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;
-
-/*
- * 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);
-
-#endif /* GPIO_H__ */
diff --git a/01-system-clock/include/isr_vector.h b/01-system-clock/include/isr_vector.h
deleted file mode 100644
index 3e55f52..0000000
--- a/01-system-clock/include/isr_vector.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef h__ISR_VECTOR_H__
-#define h__ISR_VECTOR_H__
-
-/*
- * Include file for interrupt service routines.
- */
-
-/*
- * The interrupt service routines. These link in the function `main` as the
- * main function.
- */
-extern const void* isr_vector[];
-
-/*
- * 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();
-
-#endif /* h___ISR_VECTOR_H__ */
diff --git a/01-system-clock/include/rcc.h b/01-system-clock/include/rcc.h
deleted file mode 100644
index 4eeb26b..0000000
--- a/01-system-clock/include/rcc.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef H__RCC_
-#define H__RCC_
-
-#include "common.h"
-
-#define RCC_BASE ((uint32_t)0x40021000)
-
-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. */
-
- __IO uint32_t abp1rst1_r; /* APB Peripheral reset register 1. 0x38 */
- __IO uint32_t abp1rst2_r; /* APB Peripheral reset register 2. 0x3C */
- __IO uint32_t abp2rst_r; /* APB Peripheral reset register. 0x40 */
-
- __IO uint32_t reserved_4; /* Not used. offset 0x44. */
-
- __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. */
-
- /* TODO add the rest starting at offset 0x68. */
-
-} PACKED rcc_t;
-
-#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/01-system-clock/include/spin.h b/01-system-clock/include/spin.h
deleted file mode 100644
index a23d25b..0000000
--- a/01-system-clock/include/spin.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef H__SPIN_
-#define H__SPIN_
-
-#include <stdint.h>
-
-/*
- * Flash a code on the status LED.
- *
- * The flash codes a binary from MSB to LSB. A long flash is a 1, a short flash
- * is a 0. Each independent flashing is succeced by a break of 4 times that
- * of a long flash.
- */
-void spin(uint32_t base_delay, uint8_t code);
-
-#endif /* H__SPIN_ */
diff --git a/01-system-clock/linker/linker_script.ld b/01-system-clock/linker/linker_script.ld
deleted file mode 100644
index 348d03b..0000000
--- a/01-system-clock/linker/linker_script.ld
+++ /dev/null
@@ -1,36 +0,0 @@
-MEMORY
-{
- flash : org = 0x08000000, len = 256k
- sram1 : org = 0x20000000, len = 48k
- sram2 : org = 0x10000000, len = 16k
-}
-
-SECTIONS
-{
- /* This is where the code goes. */
- . = ORIGIN(flash);
- .text : {
- *(.vectors); /* All .vector sections go here. */
- *(.text); /* All .text sections go here. */
- } >flash
-
- .data : {
- /* Data segment as defined in the flash. */
- INIT_DATA_VALUES = LOADADDR(.data);
-
- /* Data segment where it will be in memory. */
- DATA_SEGMENT_START = .;
- *(.data);
- DATA_SEGMENT_STOP = .;
-
- /* Align by 4 so we can optimize the copier to use uint32's. */
- . = ALIGN(0x04);
- } >sram1 AT>flash
-
- BSS_START = .;
- .bss : {
- *(.bss);
- . = ALIGN(0x04);
- } > sram1
- BSS_END = .;
-}
diff --git a/01-system-clock/src/clock.c b/01-system-clock/src/clock.c
deleted file mode 100644
index 75bac97..0000000
--- a/01-system-clock/src/clock.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This file sets the system clock to its full glory of 80Mhz
- */
-
-#include "clock.h"
-#include <stdint.h>
-#include "flash.h"
-#include "gpio.h"
-#include "spin.h"
-
-#define TIMEOUT 10000
-
-int pll_off()
-{
- uint32_t c;
-
- RCC.c_r &= ~BIT(24); /* Turn off pll. */
- for (c = 0; c < TIMEOUT && RCC.c_r & BIT(25); ++c)
- ; /* Wait for OFF. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-int pll_on()
-{
- uint32_t c;
-
- RCC.c_r |= BIT(24); /* Turn on PLL. */
- for (c = 0; c < TIMEOUT && !(RCC.c_r & BIT(25)); ++c)
- ; /* Wait for RDY. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-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 */)
-{
- if (RCC.c_r & BIT(25)) {
- /* PLL must be off to configure it. */
- return E_NOT_OFF;
- }
-
- /* Make sure inputs are valid. */
- if (pllp_div_factor == 1 || pllp_div_factor > 31) {
- return E_BADPLLP_DIV;
- }
- if (plln < 8 || plln > 86) {
- return E_BADPLLN;
- }
-
- RCC.pllcfg_r = (pllp_div_factor << 27) | (pllr << 24) | (pllq << 20) |
- (pllp << 16) | (plln << 8) | (pllm << 4) | (pllsrc << 0);
-
- return 0;
-}
-
-int set_system_clock_MHz(uint8_t mhz)
-{
- /* Set the source of the system colck to MSI temporarily. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_MSI);
-
- if (mhz <= 8 || mhz > 80) {
- return E_BAD_ARG;
- }
-
- pll_off();
-
- configure_pll(
- 0 /* pllp_div_factor */, PLL_DIVISOR_4 /* pllr: VCO / 4 = mhz MHz. */,
- PLL_DIVISOR_4 /* pllq: VCO / 4 = mhz MHz */, PLLP_DIVISOR_7 /* pllp */,
-
- /* The following set the frequency of VCO to (mhz*4)MHz: mhz * 1 * 4MHz.
- */
- mhz /* plln | mhz */, PLLM_DIVISOR_1 /* pllm | 01 */,
- PLL_SRC_MSI /* pll src | 04 Mhz */);
-
- pll_on();
-
- /* Configure the flash to have 4 wait states. This is required at
- * 80 MHz. */
- FLASH.ac_r &= ~0x07;
- FLASH.ac_r |= 0x04;
-
- /* Set the source of the system colck to PLL. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_PLL);
- return 0;
-}
-
-int set_system_clock_src(system_clock_src_t src)
-{
- uint8_t value = RCC.cfg_r & ~0x03;
- RCC.cfg_r = value | src;
-}
diff --git a/01-system-clock/src/delay.c b/01-system-clock/src/delay.c
deleted file mode 100644
index 2a16d47..0000000
--- a/01-system-clock/src/delay.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "delay.h"
-
-void delay(uint32_t delay)
-{
- while (delay--) {
- /* needed to keep the compiler from optimizing away the loop. */
- asm volatile("");
- }
-}
diff --git a/01-system-clock/src/gpio.c b/01-system-clock/src/gpio.c
deleted file mode 100644
index 2404398..0000000
--- a/01-system-clock/src/gpio.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "gpio.h"
-#include "rcc.h"
-
-/*
- * Sets the mode of a pin on a gpio por.
- */
-void set_gpio_pin_mode(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin, gpio_pin_mode_t mode)
-{
- /* Each pin has a 2-bit mode provided at bits pin#*2 and pin#*2+1 */
- gpio_port->mode_r &= ~(0x03 << pin * 2);
- gpio_port->mode_r |= mode << pin * 2;
-}
-
-gpio_output_pin_t set_gpio_pin_output(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin)
-{
- set_gpio_pin_mode(gpio_port, pin, MODE_OUTPUT);
-
- return (gpio_output_pin_t){.gpio_port = gpio_port, .pin = pin};
-}
-
-void set_gpio_output_pin(gpio_output_pin_t pin, bool onoff)
-{
- if (onoff) {
- pin.gpio_port->output_r |= 1 << pin.pin;
- } else {
- pin.gpio_port->output_r &= ~(1 << pin.pin);
- }
-}
-
-#define GPIO_PORTS_BASE_ADDR ((uint32_t)0x48000000)
-__IO gpio_port_t* enable_gpio(gpio_port_number_t gpio_port_number)
-{
- RCC.ahb2en_r |= 1 << gpio_port_number; /* Enable the GPIO port. */
- return (__IO gpio_port_t*)(GPIO_PORTS_BASE_ADDR + (gpio_port_number * 0x400));
-}
diff --git a/01-system-clock/src/isr_vector.c b/01-system-clock/src/isr_vector.c
deleted file mode 100644
index 674a6bb..0000000
--- a/01-system-clock/src/isr_vector.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "isr_vector.h"
-#include "delay.h"
-#include "gpio.h"
-
-/* Forward-declare the main function. This is implemented in main.c. */
-void main();
-
-/* These are defined in the linker script. */
-extern uint32_t INIT_DATA_VALUES;
-extern uint32_t DATA_SEGMENT_START;
-extern uint32_t DATA_SEGMENT_STOP;
-extern uint32_t BSS_START;
-extern uint32_t BSS_END;
-
-/*
- * Runs before main. Initializes the data and bss segments by loading them
- * into memory.
- */
-void init()
-{
- uint32_t* src;
- uint32_t* dest;
-
- src = &INIT_DATA_VALUES;
- dest = &DATA_SEGMENT_START;
-
- /* Copy the values from flash into the data segment. */
- while (dest != &DATA_SEGMENT_STOP) {
- *(dest++) = *(src++);
- }
-
- /* Everything in the BSS segment is set to zero. */
- dest = &BSS_START;
- while (dest != &BSS_END) {
- *(dest++) = 0;
- }
-
- /* Jump to main. */
- main();
-}
-
-const void* vectors[] __attribute__((section(".vectors"))) = {
- (void*)0x2000c000, /* Top of stack at top of sram1. 48k */
- init, /* Reset handler */
- unhandled_isr, /* NMI */
- unhandled_isr, /* Hard Fault */
- unhandled_isr, /* MemManage */
- unhandled_isr, /* BusFault */
- unhandled_isr, /* UsageFault */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* SVCall */
- unhandled_isr, /* Debug */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* PendSV */
- unhandled_isr, /* SysTick */
-
- /* External interrupt handlers follow */
- unhandled_isr, /* 0 WWDG */
- unhandled_isr, /* 1 PVD */
- unhandled_isr, /* 2 TAMP_SAMP */
- unhandled_isr, /* 3 RTC_WKUP */
- unhandled_isr, /* 4 FLASH */
- unhandled_isr, /* 5 RCC */
- unhandled_isr, /* 6 EXTI0 */
- unhandled_isr, /* 7 EXTI1 */
- unhandled_isr, /* 8 EXTI2 */
- unhandled_isr, /* 9 EXTI3 */
- unhandled_isr, /* 10 EXTI4 */
- unhandled_isr, /* 11 DMA_CH1 */
- unhandled_isr, /* 12 DMA_CH2 */
- unhandled_isr, /* 13 DMA_CH3 */
- unhandled_isr, /* 14 DMA_CH4 */
- unhandled_isr, /* 15 DMA_CH5 */
- unhandled_isr, /* 16 DMA_CH6 */
- unhandled_isr, /* 17 DMA_CH7 */
- unhandled_isr, /* 18 ADC1 */
- unhandled_isr, /* 19 CAN_TX */
- unhandled_isr, /* 20 CAN_RX0 */
- unhandled_isr, /* 21 CAN_RX1 */
- unhandled_isr, /* 22 CAN_SCE */
- unhandled_isr, /* 23 EXTI9_5 */
- unhandled_isr, /* 24 TIM1_BRK/TIM15 */
- unhandled_isr, /* 25 TIM1_UP/TIM16 */
- unhandled_isr, /* 26 TIM1_TRG_COM */
- unhandled_isr, /* 27 TIM1_CC */
- unhandled_isr, /* 28 TIM2 */
- unhandled_isr, /* 29 Reserved */
- unhandled_isr, /* 30 Reserved */
- unhandled_isr, /* 31 I2C1_EV */
- unhandled_isr, /* 32 I2C1_ER */
- unhandled_isr, /* 33 I2C2_EV */
- unhandled_isr, /* 34 I2C2_ER */
- unhandled_isr, /* 35 SPI1 */
- unhandled_isr, /* 36 SPI2 */
- unhandled_isr, /* 37 USART1 */
- unhandled_isr, /* 38 USART2 */
- unhandled_isr, /* 39 USART3 */
- unhandled_isr, /* 40 EXTI15_10 */
- unhandled_isr, /* 41 RTCAlarm */
- unhandled_isr, /* 42 Reserved */
- unhandled_isr, /* 43 Reserved */
- unhandled_isr, /* 44 Reserved */
- unhandled_isr, /* 45 Reserved */
- unhandled_isr, /* 46 Reserved */
- unhandled_isr, /* 47 Reserved */
- unhandled_isr, /* 48 Reserved */
- unhandled_isr, /* 49 SDMMC1 */
- unhandled_isr, /* 50 Reserved */
- unhandled_isr, /* 51 SPI3 */
- unhandled_isr, /* 52 Reserved */
- unhandled_isr, /* 53 Reserved */
- unhandled_isr, /* 54 TIM6_DACUNDER */
- unhandled_isr, /* 55 TIM7 */
- unhandled_isr, /* 56 DMA2_CH1 */
- unhandled_isr, /* 57 DMA2_CH2 */
- unhandled_isr, /* 58 DMA2_CH3 */
- unhandled_isr, /* 59 DMA2_CH4 */
- unhandled_isr, /* 60 DMA2_CH5 */
- unhandled_isr, /* 61 Reserved */
- unhandled_isr, /* 62 Reserved */
- unhandled_isr, /* 63 Reserved*/
- unhandled_isr, /* 64 COMP */
- unhandled_isr, /* 65 LPTIM1 */
- unhandled_isr, /* 66 LPTIM2 */
- unhandled_isr, /* 67 USB_FS */
- unhandled_isr, /* 68 DMA_CH6 */
- unhandled_isr, /* 69 DMA_CH7 */
- unhandled_isr, /* 70 LPUART1 */
- unhandled_isr, /* 71 QUADSPI */
- unhandled_isr, /* 72 I2C3_EV */
- unhandled_isr, /* 73 I2C3_ER */
- unhandled_isr, /* 74 SAI1 */
- unhandled_isr, /* 75 Reserved */
- unhandled_isr, /* 76 SWPMI1 */
- unhandled_isr, /* 77 TSC */
- unhandled_isr, /* 78 Reserved */
- unhandled_isr, /* 79 AES */
- unhandled_isr, /* 80 RNG */
- unhandled_isr, /* 81 FPU */
- unhandled_isr /* 82 CRS */
-};
-
-/*
- * Does nothing ... forever.
- */
-void unhandled_isr()
-{
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
- for (;;) {
- /* Flash in a distinct pattern to know that something went wrong. */
-
- pin_off(pin3);
- delay(100000);
- pin_on(pin3);
- delay(100000);
- pin_off(pin3);
- delay(100000);
- pin_on(pin3);
- delay(500000);
- }
-}
diff --git a/01-system-clock/src/main.c b/01-system-clock/src/main.c
deleted file mode 100644
index 7912bf2..0000000
--- a/01-system-clock/src/main.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "clock.h"
-#include "delay.h"
-#include "gpio.h"
-#include "spin.h"
-
-volatile uint32_t delay_amt = 20000000 / 4;
-
-/* Main function. This gets executed from the interrupt vector defined above. */
-int main()
-{
- /* Enable the GPIO port B. */
-
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
- gpio_output_pin_t pin1 = set_gpio_pin_output(port_b, PIN_1);
-
- /* Enable a higher clock frequency. */
- set_system_clock_MHz(80);
-
- uint32_t count = 0;
- while (1) {
- /* Set the GPIO pin to high. */
- pin_off(pin1);
- pin_off(pin3);
- delay(delay_amt);
-
- /* Set the GPIO pin to low. */
- if (count % 4 == 0) {
- pin_on(pin1);
- }
- pin_on(pin3);
- delay(delay_amt);
-
- ++count;
- }
-}
diff --git a/01-system-clock/src/spin.c b/01-system-clock/src/spin.c
deleted file mode 100644
index fbd16b6..0000000
--- a/01-system-clock/src/spin.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "spin.h"
-#include "delay.h"
-#include "gpio.h"
-
-#define SHORT_DELAY 200000
-#define LONG_DELAY (SHORT_DELAY * 2)
-
-static void flash_bit(
- uint32_t base, gpio_output_pin_t out_pin,
- uint8_t bit /* 0 => 0, non-zero => 1 */)
-{
- pin_on(out_pin);
- if (bit) {
- delay(base * 2);
- } else {
- delay(base);
- }
- pin_off(out_pin);
- delay(base);
-}
-
-void spin(uint32_t base, uint8_t c)
-{
- uint8_t code;
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
-
- for (;;) {
- code = c;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- delay(base * 4);
- }
-}
diff --git a/02-usart/include/kern/delay.h b/02-usart/include/kern/delay.h
deleted file mode 100644
index 65a26d6..0000000
--- a/02-usart/include/kern/delay.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef H__DELAY__
-#define H__DELAY__
-
-#include <stdint.h>
-
-/*
- * Loops and count-downs the delay, the time this takes depends on the speed
- * of the clock.
- */
-void delay(uint32_t delay);
-
-#endif /* H__DELAY__ */
diff --git a/02-usart/src/kern/vector.c b/02-usart/src/kern/vector.c
deleted file mode 100644
index e69de29..0000000
--- a/02-usart/src/kern/vector.c
+++ /dev/null
diff --git a/02.5-collatz/Makefile.preamble b/02.5-collatz/Makefile.preamble
deleted file mode 100644
index 3c8a61b..0000000
--- a/02.5-collatz/Makefile.preamble
+++ /dev/null
@@ -1,21 +0,0 @@
-OPT?=-O
-PREFIX?=arm-unknown-eabi-
-CC=$(PREFIX)gcc
-LD=$(PREFIX)ld
-CFLAGS?=$(OPT) -mcpu=cortex-m4 -mthumb -g -lgcc -static -nostartfiles -Iinclude
-LD_FLAGS?=-T linker/linker_script.ld -nostdlib --cref -Map linker/main.map -static
-
-
-all: _$(PREFIX)_obs/main.elf
-
-_$(PREFIX)_obs/main.bin: _$(PREFIX)_obs/main.elf
- $(PREFIX)objcopy -O binary _$(PREFIX)_obs/main.elf _$(PREFIX)_obs/main.bin
-
-flash: _$(PREFIX)_obs/main.bin
- st-flash write _$(PREFIX)_obs/main.bin 0x8000000
-
-clean:
- rm -rf _*_obs
-
-genmake:
- ./genmake.pl > Makefile
diff --git a/02.5-collatz/genmake.pl b/02.5-collatz/genmake.pl
deleted file mode 100755
index 341db3d..0000000
--- a/02.5-collatz/genmake.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-# This script is designed to introspect C files and generate a makefile to use.
-
-sub header_deps {
- my $file = @_[0];
- my @headers;
-
- if (open(my $fh, '<:encoding(UTF-8)', $file)) {
- print STDERR "\x1b[35m[Trace] - Reading file $file\x1b[00m\n";
- push(@headers, $file);
-
- while (<$fh>) {
- /#include\s+"(.*)"\s*$/ && push(@headers, header_deps("include/$1"));
- }
- }
-
- return @headers;
-}
-
-my @files = glob('src/*.c');
-my @obj_files;
-
-open(my $fh, '<:encoding(UTF-8)', "Makefile.preamble")
- or die "Missing Makefile.preamble";
-
-while (<$fh>) {
- print "$_";
-}
-
-# Emit a rule that will rerun genmake if the c files do not match.
-my $idempotency_cmd =
- "ls src/*.c include/*.h| sha1sum | awk '{print \$1}'";
-
-my $idempotency_cmd_make =
- "ls src/*.c include/*.h | sha1sum | awk '{print \$\$1}'";
-
-print "IDEMPOTENCY_HASH=" . `$idempotency_cmd` . "\n";
-
-my $arch_obs_dir = "_\$(PREFIX)_obs";
-print "CHEAT_PRE_MAKE := \$(shell mkdir -p $arch_obs_dir)\n";
-
-foreach $file (@files) {
- my $c_file = $file;
- (my $file_no_ext = $file) =~ s/src\/(.*)\.c$/\1/g;
-
- my $obj_file = "$arch_obs_dir/${file_no_ext}.o";
- my $s_file = "${file_no_ext}.s";
-
- push(@obj_files, $obj_file);
- my @deps = header_deps($c_file);
-
- my $deps_as_join = join(" ", @deps);
-
- # Emit the rule to make the object file.
- print "$obj_file: $deps_as_join\n\t";
- print '$(CC) -c ' . $c_file . ' -o ' . $obj_file . ' $(CFLAGS)' . "\n\n";
-
- # Emit the rule to make the assembly file.
- print "$s_file: $deps_as_join\n\t";
- print '$(CC) -S ' . $c_file . ' -o ' . $s_file . ' $(CFLAGS)' . "\n\n";
-}
-
-my $obj_files_deps = join(' ', @obj_files);
-print "FORCE:\n\t\n\n";
-print "$arch_obs_dir/main.elf: FORCE $obj_files_deps linker/linker_script.ld\n\t";
-print "([ \"\$\$($idempotency_cmd_make)\" != \"\$(IDEMPOTENCY_HASH)\" ] "
- . "&& ./genmake.pl > Makefile && make main.elf ) "
- . "|| "
- . "\$(LD) -o $arch_obs_dir/main.elf \$(LD_FLAGS) $obj_files_deps\n\n";
diff --git a/02.5-collatz/include/apb.h b/02.5-collatz/include/apb.h
deleted file mode 100644
index 11fa7ab..0000000
--- a/02.5-collatz/include/apb.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef H__APB_
-#define H__APB_
-
-#endif /* H__APB_ */
diff --git a/02.5-collatz/include/clock.h b/02.5-collatz/include/clock.h
deleted file mode 100644
index 46ac6f2..0000000
--- a/02.5-collatz/include/clock.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef CLOCK_H__
-#define 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 /* CLOCK_H__ */
diff --git a/02.5-collatz/include/common.h b/02.5-collatz/include/common.h
deleted file mode 100644
index 9d5c7cd..0000000
--- a/02.5-collatz/include/common.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COMMON__H
-#define COMMON__H
-
-#include <stdint.h>
-
-/* Define __IO to be volatile if it's not already. */
-#ifndef __IO
-#define __IO volatile
-#endif
-
-#define bool int
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-#define PACKED __attribute__((packed))
-#define BIT(n) (1 << (n))
-
-#define RESERVED_CONCAT_IMPL(x, y) x ## y
-#define RESERVED_MACRO_CONCAT(x, y) RESERVED_CONCAT_IMPL(x, y)
-#define RESERVED(n) \
- bits_t RESERVED_MACRO_CONCAT(_r, __COUNTER__) :n
-
-#define RESERVE(type) \
- __IO type RESERVED_MACRO_CONCAT(_r, __COUNTER__)
-
-typedef uint32_t bits_t;
-
-#endif /* COMMON_H */
diff --git a/02.5-collatz/include/delay.h b/02.5-collatz/include/delay.h
deleted file mode 100644
index 65a26d6..0000000
--- a/02.5-collatz/include/delay.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef H__DELAY__
-#define H__DELAY__
-
-#include <stdint.h>
-
-/*
- * Loops and count-downs the delay, the time this takes depends on the speed
- * of the clock.
- */
-void delay(uint32_t delay);
-
-#endif /* H__DELAY__ */
diff --git a/02.5-collatz/include/flash.h b/02.5-collatz/include/flash.h
deleted file mode 100644
index a163a25..0000000
--- a/02.5-collatz/include/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.5-collatz/include/gpio.h b/02.5-collatz/include/gpio.h
deleted file mode 100644
index 62169c6..0000000
--- a/02.5-collatz/include/gpio.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef GPIO_H__
-#define 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 {
- __IO uint32_t mode_r; /* Mode register */
- __IO uint32_t otype_r;
- __IO uint32_t ospeed_r;
- __IO uint32_t pupd_r;
- __IO uint32_t id_r;
- __IO uint32_t output_r;
- __IO uint32_t bsr_r;
- __IO uint32_t lck_r;
- __IO uint32_t af_rl;
- __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 /* GPIO_H__ */
diff --git a/02.5-collatz/include/isr_vector.h b/02.5-collatz/include/isr_vector.h
deleted file mode 100644
index 3e55f52..0000000
--- a/02.5-collatz/include/isr_vector.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef h__ISR_VECTOR_H__
-#define h__ISR_VECTOR_H__
-
-/*
- * Include file for interrupt service routines.
- */
-
-/*
- * The interrupt service routines. These link in the function `main` as the
- * main function.
- */
-extern const void* isr_vector[];
-
-/*
- * 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();
-
-#endif /* h___ISR_VECTOR_H__ */
diff --git a/02.5-collatz/include/rcc.h b/02.5-collatz/include/rcc.h
deleted file mode 100644
index 7ed4dee..0000000
--- a/02.5-collatz/include/rcc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef H__RCC_
-#define H__RCC_
-
-#include "common.h"
-#include <stdint.h>
-
-#define RCC_BASE ((uint32_t)0x40021000)
-
-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. */
-
- __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. */
-
- __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;
-
-#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.5-collatz/include/spin.h b/02.5-collatz/include/spin.h
deleted file mode 100644
index a23d25b..0000000
--- a/02.5-collatz/include/spin.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef H__SPIN_
-#define H__SPIN_
-
-#include <stdint.h>
-
-/*
- * Flash a code on the status LED.
- *
- * The flash codes a binary from MSB to LSB. A long flash is a 1, a short flash
- * is a 0. Each independent flashing is succeced by a break of 4 times that
- * of a long flash.
- */
-void spin(uint32_t base_delay, uint8_t code);
-
-#endif /* H__SPIN_ */
diff --git a/02.5-collatz/include/usart.h b/02.5-collatz/include/usart.h
deleted file mode 100644
index 257aab6..0000000
--- a/02.5-collatz/include/usart.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef H__USART_
-#define H__USART_
-
-#include "common.h"
-#include "rcc.h"
-
-#include <stdint.h>
-
-/*
- * Possibel 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. */
- union {
- uint32_t c_r1;
- struct {
- bits_t ue:1; /* UART enable */
- bits_t uesm:1; /* UART enabled in stop mode. */
- bits_t re:1; /* reciever enabled. */
- bits_t te:1; /* transmitter enabled. */
- bits_t idleie:1; /* Idle interrupt enabled. */
- bits_t rxneie:1; /* RXNEIE RXNE interrupt enable. */
- bits_t tcie:1;
- bits_t txeie:1;
- bits_t peie:1;
- bits_t ps:1;
- bits_t pce:1;
- bits_t wake:1;
- bits_t m0:1;
- bits_t mme:1;
- bits_t cmie:1;
- bits_t over8:1;
- bits_t dedt:4;
- bits_t deat:4;
- bits_t rtoie:1;
- bits_t eobie:1;
- bits_t m1:1;
- bits_t reserved:3;
- } PACKED c1_bf;
- };
- uint32_t c_r2;
- uint32_t c_r3;
-
- /* USART baud rate register. */
- uint32_t br_r;
- uint32_t gtp_r;
- uint32_t rto_r;
- uint32_t rq_r;
- uint32_t is_r;
- uint32_t ic_r;
- uint32_t rd_r;
- uint32_t td_r;
-} usart_t;
-
-#define USART1 (* (__IO usart_t*) 0x40013800)
-#define USART2 (* (__IO usart_t*) 0x40004400)
-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);
-
-/*
- * Send a byte on the usart, This command blocks until the data
- * is fully sent.
- */
-void usart_transmit_byte(__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(
- __IO usart_t* usart, const uint8_t* bytes, uint32_t n);
-
-void usart_transmit_str(__IO usart_t* usart, const char* str);
-
-
-#endif /* H__USART_ */
diff --git a/02.5-collatz/linker/linker_script.ld b/02.5-collatz/linker/linker_script.ld
deleted file mode 100644
index 348d03b..0000000
--- a/02.5-collatz/linker/linker_script.ld
+++ /dev/null
@@ -1,36 +0,0 @@
-MEMORY
-{
- flash : org = 0x08000000, len = 256k
- sram1 : org = 0x20000000, len = 48k
- sram2 : org = 0x10000000, len = 16k
-}
-
-SECTIONS
-{
- /* This is where the code goes. */
- . = ORIGIN(flash);
- .text : {
- *(.vectors); /* All .vector sections go here. */
- *(.text); /* All .text sections go here. */
- } >flash
-
- .data : {
- /* Data segment as defined in the flash. */
- INIT_DATA_VALUES = LOADADDR(.data);
-
- /* Data segment where it will be in memory. */
- DATA_SEGMENT_START = .;
- *(.data);
- DATA_SEGMENT_STOP = .;
-
- /* Align by 4 so we can optimize the copier to use uint32's. */
- . = ALIGN(0x04);
- } >sram1 AT>flash
-
- BSS_START = .;
- .bss : {
- *(.bss);
- . = ALIGN(0x04);
- } > sram1
- BSS_END = .;
-}
diff --git a/02.5-collatz/src/clock.c b/02.5-collatz/src/clock.c
deleted file mode 100644
index 75bac97..0000000
--- a/02.5-collatz/src/clock.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This file sets the system clock to its full glory of 80Mhz
- */
-
-#include "clock.h"
-#include <stdint.h>
-#include "flash.h"
-#include "gpio.h"
-#include "spin.h"
-
-#define TIMEOUT 10000
-
-int pll_off()
-{
- uint32_t c;
-
- RCC.c_r &= ~BIT(24); /* Turn off pll. */
- for (c = 0; c < TIMEOUT && RCC.c_r & BIT(25); ++c)
- ; /* Wait for OFF. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-int pll_on()
-{
- uint32_t c;
-
- RCC.c_r |= BIT(24); /* Turn on PLL. */
- for (c = 0; c < TIMEOUT && !(RCC.c_r & BIT(25)); ++c)
- ; /* Wait for RDY. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-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 */)
-{
- if (RCC.c_r & BIT(25)) {
- /* PLL must be off to configure it. */
- return E_NOT_OFF;
- }
-
- /* Make sure inputs are valid. */
- if (pllp_div_factor == 1 || pllp_div_factor > 31) {
- return E_BADPLLP_DIV;
- }
- if (plln < 8 || plln > 86) {
- return E_BADPLLN;
- }
-
- RCC.pllcfg_r = (pllp_div_factor << 27) | (pllr << 24) | (pllq << 20) |
- (pllp << 16) | (plln << 8) | (pllm << 4) | (pllsrc << 0);
-
- return 0;
-}
-
-int set_system_clock_MHz(uint8_t mhz)
-{
- /* Set the source of the system colck to MSI temporarily. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_MSI);
-
- if (mhz <= 8 || mhz > 80) {
- return E_BAD_ARG;
- }
-
- pll_off();
-
- configure_pll(
- 0 /* pllp_div_factor */, PLL_DIVISOR_4 /* pllr: VCO / 4 = mhz MHz. */,
- PLL_DIVISOR_4 /* pllq: VCO / 4 = mhz MHz */, PLLP_DIVISOR_7 /* pllp */,
-
- /* The following set the frequency of VCO to (mhz*4)MHz: mhz * 1 * 4MHz.
- */
- mhz /* plln | mhz */, PLLM_DIVISOR_1 /* pllm | 01 */,
- PLL_SRC_MSI /* pll src | 04 Mhz */);
-
- pll_on();
-
- /* Configure the flash to have 4 wait states. This is required at
- * 80 MHz. */
- FLASH.ac_r &= ~0x07;
- FLASH.ac_r |= 0x04;
-
- /* Set the source of the system colck to PLL. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_PLL);
- return 0;
-}
-
-int set_system_clock_src(system_clock_src_t src)
-{
- uint8_t value = RCC.cfg_r & ~0x03;
- RCC.cfg_r = value | src;
-}
diff --git a/02.5-collatz/src/delay.c b/02.5-collatz/src/delay.c
deleted file mode 100644
index 2a16d47..0000000
--- a/02.5-collatz/src/delay.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "delay.h"
-
-void delay(uint32_t delay)
-{
- while (delay--) {
- /* needed to keep the compiler from optimizing away the loop. */
- asm volatile("");
- }
-}
diff --git a/02.5-collatz/src/gpio.c b/02.5-collatz/src/gpio.c
deleted file mode 100644
index 02933b7..0000000
--- a/02.5-collatz/src/gpio.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "gpio.h"
-#include "rcc.h"
-
-/*
- * Sets the mode of a pin on a gpio por.
- */
-void set_gpio_pin_mode(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin, gpio_pin_mode_t mode)
-{
- /* Each pin has a 2-bit mode provided at bits pin#*2 and pin#*2+1 */
- gpio_port->mode_r &= ~(0x03 << pin * 2);
- gpio_port->mode_r |= mode << pin * 2;
-}
-
-gpio_output_pin_t set_gpio_pin_output(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin)
-{
- set_gpio_pin_mode(gpio_port, pin, MODE_OUTPUT);
-
- return (gpio_output_pin_t){.gpio_port = gpio_port, .pin = pin};
-}
-
-void set_gpio_output_pin(gpio_output_pin_t pin, bool onoff)
-{
- if (onoff) {
- pin.gpio_port->output_r |= 1 << pin.pin;
- } else {
- pin.gpio_port->output_r &= ~(1 << pin.pin);
- }
-}
-
-void set_gpio_alternate_function(
- __IO gpio_port_t* port, gpio_pin_t gpio_pin, alternate_function_t afn)
-{
- __IO uint32_t* reg;
- if (gpio_pin < 8) {
- reg = &(port->af_rl);
- } else {
- reg = &(port->af_rh);
- gpio_pin -= 8;
- }
-
- uint32_t tmp = *reg & (~0x0f << gpio_pin * 4);
- *reg = tmp | (afn << gpio_pin * 4);
-}
-
-#define GPIO_PORTS_BASE_ADDR ((uint8_t*)0x48000000)
-__IO gpio_port_t* enable_gpio(gpio_port_number_t gpio_port_number)
-{
- RCC.ahb2en_r |= 1 << gpio_port_number; /* Enable the GPIO port. */
- return (__IO gpio_port_t*)(GPIO_PORTS_BASE_ADDR + (gpio_port_number * 0x400));
-}
diff --git a/02.5-collatz/src/isr_vector.c b/02.5-collatz/src/isr_vector.c
deleted file mode 100644
index ab38dc2..0000000
--- a/02.5-collatz/src/isr_vector.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "isr_vector.h"
-#include "delay.h"
-#include "gpio.h"
-
-/* Forward-declare the main function. This is implemented in main.c. */
-void main();
-
-/* These are defined in the linker script. */
-extern uint32_t INIT_DATA_VALUES;
-extern uint32_t DATA_SEGMENT_START;
-extern uint32_t DATA_SEGMENT_STOP;
-extern uint32_t BSS_START;
-extern uint32_t BSS_END;
-
-/*
- * Runs before main. Initializes the data and bss segments by loading them
- * into memory.
- */
-void init()
-{
- uint32_t* src;
- uint32_t* dest;
-
- src = &INIT_DATA_VALUES;
- dest = &DATA_SEGMENT_START;
-
- /* Copy the values from flash into the data segment. */
- while (dest != &DATA_SEGMENT_STOP) {
- *(dest++) = *(src++);
- }
-
- /* Everything in the BSS segment is set to zero. */
- dest = &BSS_START;
- while (dest != &BSS_END) {
- *(dest++) = 0;
- }
-
- /* Jump to main. */
- main();
-}
-
-const void* vectors[] __attribute__((section(".vectors"))) = {
- (void*)0x2000c000, /* Top of stack at top of sram1. 48k */
- init, /* Reset handler */
- unhandled_isr, /* NMI */
- unhandled_isr, /* Hard Fault */
- unhandled_isr, /* MemManage */
- unhandled_isr, /* BusFault */
- unhandled_isr, /* UsageFault */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* SVCall */
- unhandled_isr, /* Debug */
- unhandled_isr, /* Reserved */
- unhandled_isr, /* PendSV */
- unhandled_isr, /* SysTick */
-
- /* External interrupt handlers follow */
- unhandled_isr, /* 0 WWDG */
- unhandled_isr, /* 1 PVD */
- unhandled_isr, /* 2 TAMP_SAMP */
- unhandled_isr, /* 3 RTC_WKUP */
- unhandled_isr, /* 4 FLASH */
- unhandled_isr, /* 5 RCC */
- unhandled_isr, /* 6 EXTI0 */
- unhandled_isr, /* 7 EXTI1 */
- unhandled_isr, /* 8 EXTI2 */
- unhandled_isr, /* 9 EXTI3 */
- unhandled_isr, /* 10 EXTI4 */
- unhandled_isr, /* 11 DMA_CH1 */
- unhandled_isr, /* 12 DMA_CH2 */
- unhandled_isr, /* 13 DMA_CH3 */
- unhandled_isr, /* 14 DMA_CH4 */
- unhandled_isr, /* 15 DMA_CH5 */
- unhandled_isr, /* 16 DMA_CH6 */
- unhandled_isr, /* 17 DMA_CH7 */
- unhandled_isr, /* 18 ADC1 */
- unhandled_isr, /* 19 CAN_TX */
- unhandled_isr, /* 20 CAN_RX0 */
- unhandled_isr, /* 21 CAN_RX1 */
- unhandled_isr, /* 22 CAN_SCE */
- unhandled_isr, /* 23 EXTI9_5 */
- unhandled_isr, /* 24 TIM1_BRK/TIM15 */
- unhandled_isr, /* 25 TIM1_UP/TIM16 */
- unhandled_isr, /* 26 TIM1_TRG_COM */
- unhandled_isr, /* 27 TIM1_CC */
- unhandled_isr, /* 28 TIM2 */
- unhandled_isr, /* 29 Reserved */
- unhandled_isr, /* 30 Reserved */
- unhandled_isr, /* 31 I2C1_EV */
- unhandled_isr, /* 32 I2C1_ER */
- unhandled_isr, /* 33 I2C2_EV */
- unhandled_isr, /* 34 I2C2_ER */
- unhandled_isr, /* 35 SPI1 */
- unhandled_isr, /* 36 SPI2 */
- unhandled_isr, /* 37 USART1 */
- unhandled_isr, /* 38 USART2 */
- unhandled_isr, /* 39 USART3 */
- unhandled_isr, /* 40 EXTI15_10 */
- unhandled_isr, /* 41 RTCAlarm */
- unhandled_isr, /* 42 Reserved */
- unhandled_isr, /* 43 Reserved */
- unhandled_isr, /* 44 Reserved */
- unhandled_isr, /* 45 Reserved */
- unhandled_isr, /* 46 Reserved */
- unhandled_isr, /* 47 Reserved */
- unhandled_isr, /* 48 Reserved */
- unhandled_isr, /* 49 SDMMC1 */
- unhandled_isr, /* 50 Reserved */
- unhandled_isr, /* 51 SPI3 */
- unhandled_isr, /* 52 Reserved */
- unhandled_isr, /* 53 Reserved */
- unhandled_isr, /* 54 TIM6_DACUNDER */
- unhandled_isr, /* 55 TIM7 */
- unhandled_isr, /* 56 DMA2_CH1 */
- unhandled_isr, /* 57 DMA2_CH2 */
- unhandled_isr, /* 58 DMA2_CH3 */
- unhandled_isr, /* 59 DMA2_CH4 */
- unhandled_isr, /* 60 DMA2_CH5 */
- unhandled_isr, /* 61 Reserved */
- unhandled_isr, /* 62 Reserved */
- unhandled_isr, /* 63 Reserved*/
- unhandled_isr, /* 64 COMP */
- unhandled_isr, /* 65 LPTIM1 */
- unhandled_isr, /* 66 LPTIM2 */
- unhandled_isr, /* 67 USB_FS */
- unhandled_isr, /* 68 DMA_CH6 */
- unhandled_isr, /* 69 DMA_CH7 */
- unhandled_isr, /* 70 LPUART1 */
- unhandled_isr, /* 71 QUADSPI */
- unhandled_isr, /* 72 I2C3_EV */
- unhandled_isr, /* 73 I2C3_ER */
- unhandled_isr, /* 74 SAI1 */
- unhandled_isr, /* 75 Reserved */
- unhandled_isr, /* 76 SWPMI1 */
- unhandled_isr, /* 77 TSC */
- unhandled_isr, /* 78 Reserved */
- unhandled_isr, /* 79 AES */
- unhandled_isr, /* 80 RNG */
- unhandled_isr, /* 81 FPU */
- unhandled_isr /* 82 CRS */
-};
-
-/*
- * Does nothing ... forever.
- */
-void unhandled_isr()
-{
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
- for (;;) {
- /* Flash in a distinct pattern to know that something went wrong. */
-
- pin_off(pin3);
- delay(1000000);
- pin_on(pin3);
- delay(1000000);
- pin_off(pin3);
- delay(1000000);
- pin_on(pin3);
- delay(5000000);
- }
-}
diff --git a/02.5-collatz/src/main.c b/02.5-collatz/src/main.c
deleted file mode 100644
index 5af52ed..0000000
--- a/02.5-collatz/src/main.c
+++ /dev/null
@@ -1,93 +0,0 @@
-
-#include "clock.h"
-#include "delay.h"
-#include "gpio.h"
-#include "spin.h"
-#include "usart.h"
-
-volatile uint32_t delay_amt = 20000000 / 4;
-
-int enable_usart2(uint32_t baud_rate)
-{
- __IO gpio_port_t* port_a = enable_gpio(GPIO_PORT_A);
- enable_hsi(&RCC, true);
-
- // Turn on the clock for the USART2 peripheral
- set_usart2_clock_src(&RCC, USART_CLK_SRC_HSI16);
- set_usart2_clock_enabled(&RCC, true);
-
- // Configure the I/O pins. Will use PA2 as TX and PA15 as RX so setup for
- // alternate function
- set_gpio_pin_mode(port_a, PIN_2, MODE_ALTERNATE);
- set_gpio_pin_mode(port_a, PIN_15, MODE_ALTERNATE);
- set_gpio_alternate_function(port_a, PIN_2, AFN_7);
- set_gpio_alternate_function(port_a, PIN_15, AFN_3);
-
- // De-assert reset of USART2
- RCC.apb1rst1_r &= ~BIT(17);
-
- // Configure the USART
- // disable USART first to allow setting of other control bits
- // This also disables parity checking and enables 16 times oversampling
-
- USART2.c_r1 = 0;
- USART2.c_r2 = 0;
- USART2.c_r3 = 0;
-
- usart_set_divisor(&USART2, 16000000 / baud_rate);
- usart_set_enabled(&USART2, USART_ENABLE_TX | USART_ENABLE_RX);
-}
-
-int enable_usart1(uint32_t baud_rate)
-{
- /* Enable the GPIO bus. */
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
-
- /* Enable the USART clock. */
- RCC.apb2en_r |= BIT(14);
-
- /* == Configure the IO Pins. == */
-
- /* GPIO D5 (Port B pin 6) is USART1 Tx,
- * GPIO D6 (Port B pin 7) is USART1 Rx. */
- set_gpio_pin_mode(port_b, PIN_6, MODE_ALTERNATE);
- set_gpio_pin_mode(port_b, PIN_7, MODE_ALTERNATE);
-
- /* Set the GPIO pins to use the USART alternate function. */
- set_gpio_alternate_function(port_b, PIN_6, AFN_7);
- set_gpio_alternate_function(port_b, PIN_7, AFN_7);
-
- RCC.apb2rst_r &= ~BIT(14); /* De-assert reset of USART1 */
-
- uint32_t baud_rate_div = 80000000 / baud_rate;
- USART1.c_r1 = 0;
- USART1.c_r2 = 0;
- USART1.c_r3 = 0;
- USART1.br_r = baud_rate_div;
-
- USART1.c_r1 |= BIT(3) | BIT(2);
- USART1.c_r1 |= BIT(0);
-
- /* Enable the transmitter and the receiver. */
- usart_set_enabled(&USART1, USART_ENABLE_TX);
- asm volatile(" cpsie i ");
-}
-
-/* Main function. This gets executed from the interrupt vector defined above. */
-int main()
-{
- /* Enable the GPIO port B. */
-
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
- gpio_output_pin_t pin1 = set_gpio_pin_output(port_b, PIN_1);
-
- /* Enable a higher clock frequency. */
- set_system_clock_MHz(80);
-
- enable_usart2(115200);
-
- pin_on(pin3);
- usart_transmit_str(&USART2, "Hello, World\n");
- for(;;);
-}
diff --git a/02.5-collatz/src/spin.c b/02.5-collatz/src/spin.c
deleted file mode 100644
index fbd16b6..0000000
--- a/02.5-collatz/src/spin.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "spin.h"
-#include "delay.h"
-#include "gpio.h"
-
-#define SHORT_DELAY 200000
-#define LONG_DELAY (SHORT_DELAY * 2)
-
-static void flash_bit(
- uint32_t base, gpio_output_pin_t out_pin,
- uint8_t bit /* 0 => 0, non-zero => 1 */)
-{
- pin_on(out_pin);
- if (bit) {
- delay(base * 2);
- } else {
- delay(base);
- }
- pin_off(out_pin);
- delay(base);
-}
-
-void spin(uint32_t base, uint8_t c)
-{
- uint8_t code;
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
-
- for (;;) {
- code = c;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- delay(base * 4);
- }
-}
diff --git a/02.5-collatz/src/usart.c b/02.5-collatz/src/usart.c
deleted file mode 100644
index eddfbe7..0000000
--- a/02.5-collatz/src/usart.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "usart.h"
-#include "delay.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)
-{
- uint32_t c_r1 = usart->c_r1;
-
- if (!enabled) {
- usart->c1_bf.ue = 0;
- } else {
- /* Set the rx enabled. */
- usart->c1_bf.re = !!(enabled & USART_ENABLE_RX);
- usart->c1_bf.te = !!(enabled & USART_ENABLE_TX);
- usart->c1_bf.ue = 1;
- }
-}
-
-void usart_transmit_byte(__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(__IO usart_t* usart, const uint8_t* bytes, uint32_t n)
-{
- while (n --) {
- usart_transmit_byte(usart, *(bytes ++));
- }
-}
-
-void usart_transmit_str(__IO usart_t* usart, const char* str)
-{
- while (*str) {
- if (*str == '\n') {
- usart_transmit_byte(usart, '\r');
- }
- usart_transmit_byte(usart, *(str ++));
- }
-}
diff --git a/02.5-collatz/src/vector.c b/02.5-collatz/src/vector.c
deleted file mode 100644
index e69de29..0000000
--- a/02.5-collatz/src/vector.c
+++ /dev/null
diff --git a/03-refactor/Makefile.preamble b/03-refactor/Makefile.preamble
deleted file mode 100644
index 3c8a61b..0000000
--- a/03-refactor/Makefile.preamble
+++ /dev/null
@@ -1,21 +0,0 @@
-OPT?=-O
-PREFIX?=arm-unknown-eabi-
-CC=$(PREFIX)gcc
-LD=$(PREFIX)ld
-CFLAGS?=$(OPT) -mcpu=cortex-m4 -mthumb -g -lgcc -static -nostartfiles -Iinclude
-LD_FLAGS?=-T linker/linker_script.ld -nostdlib --cref -Map linker/main.map -static
-
-
-all: _$(PREFIX)_obs/main.elf
-
-_$(PREFIX)_obs/main.bin: _$(PREFIX)_obs/main.elf
- $(PREFIX)objcopy -O binary _$(PREFIX)_obs/main.elf _$(PREFIX)_obs/main.bin
-
-flash: _$(PREFIX)_obs/main.bin
- st-flash write _$(PREFIX)_obs/main.bin 0x8000000
-
-clean:
- rm -rf _*_obs
-
-genmake:
- ./genmake.pl > Makefile
diff --git a/03-refactor/genmake.pl b/03-refactor/genmake.pl
deleted file mode 100755
index 341db3d..0000000
--- a/03-refactor/genmake.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-# This script is designed to introspect C files and generate a makefile to use.
-
-sub header_deps {
- my $file = @_[0];
- my @headers;
-
- if (open(my $fh, '<:encoding(UTF-8)', $file)) {
- print STDERR "\x1b[35m[Trace] - Reading file $file\x1b[00m\n";
- push(@headers, $file);
-
- while (<$fh>) {
- /#include\s+"(.*)"\s*$/ && push(@headers, header_deps("include/$1"));
- }
- }
-
- return @headers;
-}
-
-my @files = glob('src/*.c');
-my @obj_files;
-
-open(my $fh, '<:encoding(UTF-8)', "Makefile.preamble")
- or die "Missing Makefile.preamble";
-
-while (<$fh>) {
- print "$_";
-}
-
-# Emit a rule that will rerun genmake if the c files do not match.
-my $idempotency_cmd =
- "ls src/*.c include/*.h| sha1sum | awk '{print \$1}'";
-
-my $idempotency_cmd_make =
- "ls src/*.c include/*.h | sha1sum | awk '{print \$\$1}'";
-
-print "IDEMPOTENCY_HASH=" . `$idempotency_cmd` . "\n";
-
-my $arch_obs_dir = "_\$(PREFIX)_obs";
-print "CHEAT_PRE_MAKE := \$(shell mkdir -p $arch_obs_dir)\n";
-
-foreach $file (@files) {
- my $c_file = $file;
- (my $file_no_ext = $file) =~ s/src\/(.*)\.c$/\1/g;
-
- my $obj_file = "$arch_obs_dir/${file_no_ext}.o";
- my $s_file = "${file_no_ext}.s";
-
- push(@obj_files, $obj_file);
- my @deps = header_deps($c_file);
-
- my $deps_as_join = join(" ", @deps);
-
- # Emit the rule to make the object file.
- print "$obj_file: $deps_as_join\n\t";
- print '$(CC) -c ' . $c_file . ' -o ' . $obj_file . ' $(CFLAGS)' . "\n\n";
-
- # Emit the rule to make the assembly file.
- print "$s_file: $deps_as_join\n\t";
- print '$(CC) -S ' . $c_file . ' -o ' . $s_file . ' $(CFLAGS)' . "\n\n";
-}
-
-my $obj_files_deps = join(' ', @obj_files);
-print "FORCE:\n\t\n\n";
-print "$arch_obs_dir/main.elf: FORCE $obj_files_deps linker/linker_script.ld\n\t";
-print "([ \"\$\$($idempotency_cmd_make)\" != \"\$(IDEMPOTENCY_HASH)\" ] "
- . "&& ./genmake.pl > Makefile && make main.elf ) "
- . "|| "
- . "\$(LD) -o $arch_obs_dir/main.elf \$(LD_FLAGS) $obj_files_deps\n\n";
diff --git a/03-refactor/include/apb.h b/03-refactor/include/apb.h
deleted file mode 100644
index 11fa7ab..0000000
--- a/03-refactor/include/apb.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef H__APB_
-#define H__APB_
-
-#endif /* H__APB_ */
diff --git a/03-refactor/include/clock.h b/03-refactor/include/clock.h
deleted file mode 100644
index 30c1302..0000000
--- a/03-refactor/include/clock.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef CLOCK_H__
-#define 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;
-
-/* 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)
-
-int enable_hsi(__IO rcc_t* rcc, bool enable);
-
-/*
- * 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 /* CLOCK_H__ */
diff --git a/03-refactor/include/common.h b/03-refactor/include/common.h
deleted file mode 100644
index 9d5c7cd..0000000
--- a/03-refactor/include/common.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COMMON__H
-#define COMMON__H
-
-#include <stdint.h>
-
-/* Define __IO to be volatile if it's not already. */
-#ifndef __IO
-#define __IO volatile
-#endif
-
-#define bool int
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-#define PACKED __attribute__((packed))
-#define BIT(n) (1 << (n))
-
-#define RESERVED_CONCAT_IMPL(x, y) x ## y
-#define RESERVED_MACRO_CONCAT(x, y) RESERVED_CONCAT_IMPL(x, y)
-#define RESERVED(n) \
- bits_t RESERVED_MACRO_CONCAT(_r, __COUNTER__) :n
-
-#define RESERVE(type) \
- __IO type RESERVED_MACRO_CONCAT(_r, __COUNTER__)
-
-typedef uint32_t bits_t;
-
-#endif /* COMMON_H */
diff --git a/03-refactor/include/delay.h b/03-refactor/include/delay.h
deleted file mode 100644
index 65a26d6..0000000
--- a/03-refactor/include/delay.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef H__DELAY__
-#define H__DELAY__
-
-#include <stdint.h>
-
-/*
- * Loops and count-downs the delay, the time this takes depends on the speed
- * of the clock.
- */
-void delay(uint32_t delay);
-
-#endif /* H__DELAY__ */
diff --git a/03-refactor/include/flash.h b/03-refactor/include/flash.h
deleted file mode 100644
index a163a25..0000000
--- a/03-refactor/include/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/03-refactor/include/gpio.h b/03-refactor/include/gpio.h
deleted file mode 100644
index 62169c6..0000000
--- a/03-refactor/include/gpio.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef GPIO_H__
-#define 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 {
- __IO uint32_t mode_r; /* Mode register */
- __IO uint32_t otype_r;
- __IO uint32_t ospeed_r;
- __IO uint32_t pupd_r;
- __IO uint32_t id_r;
- __IO uint32_t output_r;
- __IO uint32_t bsr_r;
- __IO uint32_t lck_r;
- __IO uint32_t af_rl;
- __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 /* GPIO_H__ */
diff --git a/03-refactor/include/isr_vector.h b/03-refactor/include/isr_vector.h
deleted file mode 100644
index 3e55f52..0000000
--- a/03-refactor/include/isr_vector.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef h__ISR_VECTOR_H__
-#define h__ISR_VECTOR_H__
-
-/*
- * Include file for interrupt service routines.
- */
-
-/*
- * The interrupt service routines. These link in the function `main` as the
- * main function.
- */
-extern const void* isr_vector[];
-
-/*
- * 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();
-
-#endif /* h___ISR_VECTOR_H__ */
diff --git a/03-refactor/include/printf.h b/03-refactor/include/printf.h
deleted file mode 100644
index ec3eec0..0000000
--- a/03-refactor/include/printf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef PRINTF_H_
-#define PRINTF_H_
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-typedef void(*printf_callback_t)(volatile void*, char);
-
-void printf_format(
- const char* fmt,
- printf_callback_t callback,
- volatile void* callback_closure,
- va_list lst);
-
-#endif /* PRINTF_H_ */
diff --git a/03-refactor/include/rcc.h b/03-refactor/include/rcc.h
deleted file mode 100644
index 3c55e67..0000000
--- a/03-refactor/include/rcc.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef H__RCC_
-#define H__RCC_
-
-#include "common.h"
-#include <stdint.h>
-
-#define RCC_BASE ((uint32_t)0x40021000)
-
-typedef enum {
- SYS_CLK_SW_MSI,
- SYS_CLK_SW_HSI,
- SYS_CLK_SW_HSE,
- SYS_CLK_SW_PLL,
-} sys_clk_sw_t;
-
-typedef enum {
- PLL_SRC_NONE,
- PLL_SRC_MSI,
- PLL_SRC_HSI,
- PLL_SRC_HSE
-} pll_src_t;
-
-typedef struct {
- /* Clock control register. Offset 0x00. */
- union RCC_CR {
- __IO uint32_t r; /* 32 bit register. */
-
- /* Bit field for the c_r */
- struct {
- bits_t msion:1; /* Turn on teh MSI. */
- bits_t msirdy:1; /* Is the MSI ready? */
- bits_t msipllen:1; /* Enabled/disable the PLL part of MSI. */
- bits_t msirgsel:1; /* MSI clock range selection. */
- bits_t msirange:4; /* MSI range. */
-
- bits_t hsion:1; /* Enable the HSI16 clock. */
- bits_t hsikeron:1; /* Force the HSI16 ON even in stop modes. */
- bits_t hsirdy:1; /* Is the hsi ready? */
- bits_t hsiasfs:1; /* HSI automatic start from STOP. */
- RESERVED(4);
-
- bits_t hseon:1; /* Enable the HSE. */
- bits_t hserdy:1; /* Is the HSE ready? */
- bits_t hsebyp:1; /* Use an external HSE. */
- bits_t csson:1; /* Clock security system enabled. */
- RESERVED(4);
-
- bits_t pllon:1; /* Enable the main PLL. */
- bits_t pllrdy:1; /* Is the PLL ready? */
- bits_t pllsai1on:1; /* Enable the SAI1 PLL. */
- bits_t pllsai1rdy:1; /* Enable the SAI1 PLL. */
- RESERVED(4);
- } PACKED;
- } __IO c;
-
- /* Internal clock sources calibration register (RCC_ICSCR) Offset 0x04. */
- union RCC_ICSCR {
- __IO uint32_t r; /* 32 bit register. */
-
- /* Bit field for icsc_r. */
- struct {
- bits_t msical:8;
- bits_t msitrim:8;
- bits_t hsical:8;
- bits_t hsitrim:5;
-
- RESERVED(3);
- } PACKED;
- } __IO icscr;
-
-
- /* Clock configuration register. */
- union RCC_CFGR {
- __IO uint32_t r;
-
- /* Bitfields for cfg_r. */
- struct {
- sys_clk_sw_t sw:2; /* System clock switch. @see sys_clk_sw_t enum. */
- sys_clk_sw_t sws:2; /* System clock switch status. */
-
- bits_t hpre:4; /* AHB prescaler. */
- bits_t ppre:3; /* APB low-speed prescaller. */
-
- RESERVED(1);
-
- bits_t stopwuck:1; /* Wakeup from Stop and CSS backup clock selection. */
- bits_t mcosel:4; /* Microcontroller clock output. */
- bits_t mcopre:3; /* MCO prescaller. */
-
- RESERVED(1);
- } PACKED __IO;
- } __IO cfg;
-
- /* PLL Configuration register. Offset 0x0c */
- union RCC_PLLCFGR {
- __IO uint32_t r;
-
- /* Bitfields for pllcfg_r */
- struct {
- pll_src_t pllsrc:2; /* PLL input source clock. */
-
- RESERVED(2);
-
- bits_t pllm:3; /* Divisions factor for the main PLL and audio PLL */
-
- RESERVED(1);
-
- bits_t plln:7; /* main PLL multiplication factor for VCO, must be
- * on interval [8, 86] inclusive */
- RESERVED(1);
-
- bits_t pllpen:1; /* Main PLL PLLSAI1CLK output enable. */
- bits_t pllp:1; /* Main division factor for PLLP.
- * 0 = 7, 1 = 17 */
- RESERVED(2);
-
- bits_t pllqen:1; /* Main PLL PLL48M1CLK output enabled. */
- bits_t pllq:2; /* PLLQ division factor. in 2^x. */
-
- RESERVED(1);
-
- bits_t pllren:1; /* PLL PLLCLK enabled. */
- bits_t pllr:2; ; /* main pll divion factor. 2^x. */
-
- bits_t pllpdiv:5; /* PLLP division factor. 0 to be handled by PLLP. */
-
- } PACKED __IO;
- } __IO pllcfg;
-
- __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. */
-
- __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. */
-
- __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;
-
-#define RCC (*(__IO rcc_t*)RCC_BASE)
-
-#endif
diff --git a/03-refactor/include/spin.h b/03-refactor/include/spin.h
deleted file mode 100644
index a23d25b..0000000
--- a/03-refactor/include/spin.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef H__SPIN_
-#define H__SPIN_
-
-#include <stdint.h>
-
-/*
- * Flash a code on the status LED.
- *
- * The flash codes a binary from MSB to LSB. A long flash is a 1, a short flash
- * is a 0. Each independent flashing is succeced by a break of 4 times that
- * of a long flash.
- */
-void spin(uint32_t base_delay, uint8_t code);
-
-#endif /* H__SPIN_ */
diff --git a/03-refactor/include/usart.h b/03-refactor/include/usart.h
deleted file mode 100644
index 265ac2d..0000000
--- a/03-refactor/include/usart.h
+++ /dev/null
@@ -1,219 +0,0 @@
-#ifndef H__USART_
-#define H__USART_
-
-#include "common.h"
-#include "rcc.h"
-
-#include <stdint.h>
-
-/*
- * Possibel 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 conttrol register 1. */
- union USART_CR1 {
- __IO uint32_t r;
- struct {
- bits_t ue:1; /* UART enable */
- bits_t uesm:1; /* UART enabled in stop mode. */
- bits_t re:1; /* reciever enabled. */
- bits_t te:1; /* transmitter enabled. */
- bits_t idleie:1; /* Idle interrupt enabled. */
- bits_t rxneie:1; /* RXNEIE RXNE interrupt enable. */
- bits_t tcie:1;
- bits_t txeie:1;
-
- bits_t peie:1;
- bits_t ps:1;
- bits_t pce:1;
- bits_t wake:1;
- bits_t m0:1;
- bits_t mme:1;
- bits_t cmie:1;
- bits_t over8:1;
-
- bits_t dedt:5;
- bits_t deat:5;
-
- bits_t rtoie:1;
- bits_t eobie:1;
- bits_t m1:1;
- bits_t reserved:3;
- } PACKED;
- } __IO c1;
-
- /* USART control register 2. */
- union USART_CR2 {
- __IO uint32_t r;
-
- struct {
- RESERVED(4);
- bits_t addm7:1;
- bits_t lbdl:1;
- bits_t lbdie:1;
- RESERVED(1);
-
- bits_t lbcl:1;
- bits_t cpha:1;
- bits_t cpol:1;
- bits_t clken:1;
- bits_t stop:2;
- bits_t linen:1;
- bits_t swap:1;
-
- bits_t rxinv:1;
- bits_t txinv:1;
- bits_t datainv:1;
- bits_t msbfirst:1;
- bits_t abren:1;
- bits_t abrmod:2;
- bits_t rtoen:1;
-
- bits_t add:8;
- } PACKED;
- } __IO c2;
-
- union USART_CR3 {
- __IO uint32_t r;
-
- struct {
- bits_t eie:1;
- bits_t iren:1;
- bits_t irlp:1;
- bits_t hdsel:1;
- bits_t nack:1;
- bits_t scen:1;
- bits_t dmar:1;
- bits_t dmat:1;
-
- bits_t rtse:1;
- bits_t ctse:1;
- bits_t ctsie:1;
- bits_t onebit:1;
- bits_t ovrdis:1;
- bits_t ddre:1;
- bits_t dem:1;
- bits_t dep:1;
-
- RESERVED(1);
- bits_t scarcnt:3;
- bits_t wus:2;
- bits_t wufie:1;
- bits_t ucesm:1;
-
- bits_t tcbgtie:1;
- RESERVED(7);
- } PACKED;
- } __IO c3;
-
- /* USART baud rate register. */
- union USART_BRR {
- __IO uint32_t r;
-
- struct {
- uint16_t v;
- RESERVED(16);
- } PACKED;
-
- /* Structure to use when OVER8 is set in the control register
- * USART_C1. */
- struct {
- bits_t low:3;
-
- RESERVED(1);
-
- bits_t high:12;
-
- RESERVED(16);
- } PACKED over8;
- } __IO br;
-
- uint32_t gtp_r;
- uint32_t rto_r;
- uint32_t rq_r;
- uint32_t is_r;
- uint32_t ic_r;
- uint32_t rd_r;
- uint32_t td_r;
-} usart_t;
-
-#define USART1 (* (__IO usart_t*) 0x40013800)
-#define USART2 (* (__IO usart_t*) 0x40004400)
-typedef enum {
- OVERSAMPLE_8,
- OVERSAMPLE_16
-} oversampling_mode_t;
-
-static inline void usart_set_divisor(
- __IO usart_t* usart,
- uint16_t usartdiv)
-{
- if (usart->c1.r & (1 << 15)) {
- /* OVER8 is set. */
- usart->br.over8.high = (usartdiv & ~7);
- usart->br.over8.low = ((usartdiv & 7) >> 1);
- } else {
- /* OVER8 is not set. */
- usart->br.v = usartdiv;
- }
-}
-
-static inline void usart_set_oversampling_mode(
- __IO usart_t* usart,
- oversampling_mode_t mode)
-{
- usart->c1.over8 = mode == OVERSAMPLE_8;
-}
-
-typedef enum {
- USART_PARITY_DISABLED = 0,
- USART_PARITY_ODD = 1,
- USART_PARITY_EVEN = 2,
-} 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);
-
-/*
- * Send a byte on the usart, This command blocks until the data
- * is fully sent.
- */
-void usart_transmit_byte(__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(
- __IO usart_t* usart, const uint8_t* bytes, uint32_t n);
-
-void usart_transmit_str(__IO usart_t* usart, const char* str);
-
-void usart_printf(__IO usart_t* usart, const char* fmt, ...);
-
-/* Returns non-zero if usart2 is enabled. */
-int is_usart2_enabled();
-
-/* Enable the second USART. */
-int enable_usart2(uint32_t baud);
-
-
-#endif /* H__USART_ */
diff --git a/03-refactor/linker/linker_script.ld b/03-refactor/linker/linker_script.ld
deleted file mode 100644
index 348d03b..0000000
--- a/03-refactor/linker/linker_script.ld
+++ /dev/null
@@ -1,36 +0,0 @@
-MEMORY
-{
- flash : org = 0x08000000, len = 256k
- sram1 : org = 0x20000000, len = 48k
- sram2 : org = 0x10000000, len = 16k
-}
-
-SECTIONS
-{
- /* This is where the code goes. */
- . = ORIGIN(flash);
- .text : {
- *(.vectors); /* All .vector sections go here. */
- *(.text); /* All .text sections go here. */
- } >flash
-
- .data : {
- /* Data segment as defined in the flash. */
- INIT_DATA_VALUES = LOADADDR(.data);
-
- /* Data segment where it will be in memory. */
- DATA_SEGMENT_START = .;
- *(.data);
- DATA_SEGMENT_STOP = .;
-
- /* Align by 4 so we can optimize the copier to use uint32's. */
- . = ALIGN(0x04);
- } >sram1 AT>flash
-
- BSS_START = .;
- .bss : {
- *(.bss);
- . = ALIGN(0x04);
- } > sram1
- BSS_END = .;
-}
diff --git a/03-refactor/src/clock.c b/03-refactor/src/clock.c
deleted file mode 100644
index 7256500..0000000
--- a/03-refactor/src/clock.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * This file sets the system clock to its full glory of 80Mhz
- */
-
-#include "clock.h"
-#include <stdint.h>
-#include "flash.h"
-#include "gpio.h"
-#include "spin.h"
-
-#define TIMEOUT 10000
-
-int pll_off()
-{
- uint32_t c;
-
- RCC.c.pllon = false;
- for (c = 0; c < TIMEOUT && RCC.c.pllrdy; ++c)
- ; /* Wait for OFF. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-int pll_on()
-{
- uint32_t c;
-
- RCC.c.pllon = true;
- for (c = 0; c < TIMEOUT && !RCC.c.pllrdy; ++c)
- ; /* Wait for RDY. */
-
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
-
- return 0;
-}
-
-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 */)
-{
- if (RCC.c.pllrdy) {
- /* PLL must be off to configure it. */
- return E_NOT_OFF;
- }
-
- /* Make sure inputs are valid. */
- if (pllp_div_factor == 1 || pllp_div_factor > 31) {
- return E_BADPLLP_DIV;
- }
- if (plln < 8 || plln > 86) {
- return E_BADPLLN;
- }
-
- union RCC_PLLCFGR tmp;
-
- tmp.pllpdiv = pllp_div_factor;
- tmp.pllr = pllr >> 1;
- tmp.pllren = pllr & 1;
- tmp.pllp = pllp >> 1;
- tmp.pllpen = pllp & 1;
- tmp.pllq = pllq >> 1;
- tmp.pllqen = pllq & 1;
- tmp.plln = plln;
- tmp.pllm = pllm;
-
- tmp.pllsrc = pllsrc;
-
- RCC.pllcfg = tmp;
-
- return 0;
-}
-
-int set_system_clock_MHz(uint8_t mhz)
-{
- /* Set the source of the system colck to MSI temporarily. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_MSI);
-
- if (mhz <= 8 || mhz > 80) {
- return E_BAD_ARG;
- }
-
- pll_off();
-
- configure_pll(
- 0,
- PLL_DIVISOR_4,
- PLL_DIVISOR_4,
- PLLP_DIVISOR_7,
- mhz,
- PLLM_DIVISOR_1,
- PLL_SRC_MSI);
-
- pll_on();
-
- /* Configure the flash to have 4 wait states. This is required at
- * 80 MHz. */
- FLASH.ac_r &= ~0x07;
- FLASH.ac_r |= 0x04;
-
- /* Set the source of the system colck to PLL. */
- set_system_clock_src(SYSTEM_CLOCK_SRC_PLL);
- return 0;
-}
-
-int set_system_clock_src(system_clock_src_t src)
-{
- uint8_t value = RCC.cfg.r & ~0x03;
- RCC.cfg.r = value | src;
-}
-
-int enable_hsi(__IO rcc_t* rcc, bool enable)
-{
- uint32_t c;
- rcc->c.hsion = !!enable;
- for(c = 0; c < TIMEOUT && !rcc->c.hsirdy; ++ c)
- ;
- if (c == TIMEOUT) {
- return E_TIMEOUT;
- }
- return 0;
-}
diff --git a/03-refactor/src/delay.c b/03-refactor/src/delay.c
deleted file mode 100644
index 2a16d47..0000000
--- a/03-refactor/src/delay.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "delay.h"
-
-void delay(uint32_t delay)
-{
- while (delay--) {
- /* needed to keep the compiler from optimizing away the loop. */
- asm volatile("");
- }
-}
diff --git a/03-refactor/src/gpio.c b/03-refactor/src/gpio.c
deleted file mode 100644
index 02933b7..0000000
--- a/03-refactor/src/gpio.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "gpio.h"
-#include "rcc.h"
-
-/*
- * Sets the mode of a pin on a gpio por.
- */
-void set_gpio_pin_mode(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin, gpio_pin_mode_t mode)
-{
- /* Each pin has a 2-bit mode provided at bits pin#*2 and pin#*2+1 */
- gpio_port->mode_r &= ~(0x03 << pin * 2);
- gpio_port->mode_r |= mode << pin * 2;
-}
-
-gpio_output_pin_t set_gpio_pin_output(
- __IO gpio_port_t* gpio_port, gpio_pin_t pin)
-{
- set_gpio_pin_mode(gpio_port, pin, MODE_OUTPUT);
-
- return (gpio_output_pin_t){.gpio_port = gpio_port, .pin = pin};
-}
-
-void set_gpio_output_pin(gpio_output_pin_t pin, bool onoff)
-{
- if (onoff) {
- pin.gpio_port->output_r |= 1 << pin.pin;
- } else {
- pin.gpio_port->output_r &= ~(1 << pin.pin);
- }
-}
-
-void set_gpio_alternate_function(
- __IO gpio_port_t* port, gpio_pin_t gpio_pin, alternate_function_t afn)
-{
- __IO uint32_t* reg;
- if (gpio_pin < 8) {
- reg = &(port->af_rl);
- } else {
- reg = &(port->af_rh);
- gpio_pin -= 8;
- }
-
- uint32_t tmp = *reg & (~0x0f << gpio_pin * 4);
- *reg = tmp | (afn << gpio_pin * 4);
-}
-
-#define GPIO_PORTS_BASE_ADDR ((uint8_t*)0x48000000)
-__IO gpio_port_t* enable_gpio(gpio_port_number_t gpio_port_number)
-{
- RCC.ahb2en_r |= 1 << gpio_port_number; /* Enable the GPIO port. */
- return (__IO gpio_port_t*)(GPIO_PORTS_BASE_ADDR + (gpio_port_number * 0x400));
-}
diff --git a/03-refactor/src/isr_vector.c b/03-refactor/src/isr_vector.c
deleted file mode 100644
index f757ebe..0000000
--- a/03-refactor/src/isr_vector.c
+++ /dev/null
@@ -1,275 +0,0 @@
-#include "isr_vector.h"
-#include "delay.h"
-#include "gpio.h"
-#include "usart.h"
-
-/* Forward-declare the main function. This is implemented in main.c. */
-void main();
-
-/* These are defined in the linker script. */
-extern uint32_t INIT_DATA_VALUES;
-extern uint32_t DATA_SEGMENT_START;
-extern uint32_t DATA_SEGMENT_STOP;
-extern uint32_t BSS_START;
-extern uint32_t BSS_END;
-
-/*
- * Runs before main. Initializes the data and bss segments by loading them
- * into memory.
- */
-void init()
-{
- uint32_t* src;
- uint32_t* dest;
-
- src = &INIT_DATA_VALUES;
- dest = &DATA_SEGMENT_START;
-
- /* Copy the values from flash into the data segment. */
- while (dest != &DATA_SEGMENT_STOP) {
- *(dest++) = *(src++);
- }
-
- /* Everything in the BSS segment is set to zero. */
- dest = &BSS_START;
- while (dest != &BSS_END) {
- *(dest++) = 0;
- }
-
- /* Jump to main. */
- main();
-}
-
-#define DEF_HANDLER(n) \
- void unhandled_isr_ ## n() { \
- unhandled_isr(n); \
- }
-
-DEF_HANDLER(1)
-DEF_HANDLER(2)
-DEF_HANDLER(3)
-DEF_HANDLER(4)
-DEF_HANDLER(5)
-DEF_HANDLER(6)
-DEF_HANDLER(7)
-DEF_HANDLER(8)
-DEF_HANDLER(9)
-DEF_HANDLER(10)
-DEF_HANDLER(11)
-DEF_HANDLER(12)
-DEF_HANDLER(13)
-DEF_HANDLER(14)
-DEF_HANDLER(15)
-DEF_HANDLER(16)
-DEF_HANDLER(17)
-DEF_HANDLER(18)
-DEF_HANDLER(19)
-DEF_HANDLER(20)
-DEF_HANDLER(21)
-DEF_HANDLER(22)
-DEF_HANDLER(23)
-DEF_HANDLER(24)
-DEF_HANDLER(25)
-DEF_HANDLER(26)
-DEF_HANDLER(27)
-DEF_HANDLER(28)
-DEF_HANDLER(29)
-DEF_HANDLER(30)
-DEF_HANDLER(31)
-DEF_HANDLER(32)
-DEF_HANDLER(33)
-DEF_HANDLER(34)
-DEF_HANDLER(35)
-DEF_HANDLER(36)
-DEF_HANDLER(37)
-DEF_HANDLER(38)
-DEF_HANDLER(39)
-DEF_HANDLER(40)
-DEF_HANDLER(41)
-DEF_HANDLER(42)
-DEF_HANDLER(43)
-DEF_HANDLER(44)
-DEF_HANDLER(45)
-DEF_HANDLER(46)
-DEF_HANDLER(47)
-DEF_HANDLER(48)
-DEF_HANDLER(49)
-DEF_HANDLER(50)
-DEF_HANDLER(51)
-DEF_HANDLER(52)
-DEF_HANDLER(53)
-DEF_HANDLER(54)
-DEF_HANDLER(55)
-DEF_HANDLER(56)
-DEF_HANDLER(57)
-DEF_HANDLER(58)
-DEF_HANDLER(59)
-DEF_HANDLER(60)
-DEF_HANDLER(61)
-DEF_HANDLER(62)
-DEF_HANDLER(63)
-DEF_HANDLER(64)
-DEF_HANDLER(65)
-DEF_HANDLER(66)
-DEF_HANDLER(67)
-DEF_HANDLER(68)
-DEF_HANDLER(69)
-DEF_HANDLER(70)
-DEF_HANDLER(71)
-DEF_HANDLER(72)
-DEF_HANDLER(73)
-DEF_HANDLER(74)
-DEF_HANDLER(75)
-DEF_HANDLER(76)
-DEF_HANDLER(77)
-DEF_HANDLER(78)
-DEF_HANDLER(79)
-DEF_HANDLER(80)
-DEF_HANDLER(81)
-DEF_HANDLER(82)
-DEF_HANDLER(83)
-DEF_HANDLER(84)
-DEF_HANDLER(85)
-DEF_HANDLER(86)
-DEF_HANDLER(87)
-DEF_HANDLER(88)
-DEF_HANDLER(89)
-DEF_HANDLER(90)
-DEF_HANDLER(91)
-DEF_HANDLER(92)
-DEF_HANDLER(93)
-DEF_HANDLER(94)
-DEF_HANDLER(95)
-DEF_HANDLER(96)
-DEF_HANDLER(97)
-
-const void* vectors[] __attribute__((section(".vectors"))) = {
- (void*)0x2000c000, /* Top of stack at top of sram1. 48k */
- init, /* Reset handler */
- unhandled_isr_1, /* NMI */
- unhandled_isr_2, /* Hard Fault */
- unhandled_isr_3, /* MemManage */
- unhandled_isr_4, /* BusFault */
- unhandled_isr_5, /* UsageFault */
- unhandled_isr_6, /* Reserved */
- unhandled_isr_7, /* Reserved */
- unhandled_isr_8, /* Reserved */
- unhandled_isr_9, /* Reserved */
- unhandled_isr_10, /* SVCall */
- unhandled_isr_11, /* Debug */
- unhandled_isr_12, /* Reserved */
- unhandled_isr_13, /* PendSV */
- unhandled_isr_14, /* SysTick */
-
- /* External interrupt handlers follow */
- unhandled_isr_15, /* 0 WWDG */
- unhandled_isr_16, /* 1 PVD */
- unhandled_isr_17, /* 2 TAMP_SAMP */
- unhandled_isr_18, /* 3 RTC_WKUP */
- unhandled_isr_19, /* 4 FLASH */
- unhandled_isr_20, /* 5 RCC */
- unhandled_isr_21, /* 6 EXTI0 */
- unhandled_isr_22, /* 7 EXTI1 */
- unhandled_isr_23, /* 8 EXTI2 */
- unhandled_isr_24, /* 9 EXTI3 */
- unhandled_isr_25, /* 10 EXTI4 */
- unhandled_isr_26, /* 11 DMA_CH1 */
- unhandled_isr_27, /* 12 DMA_CH2 */
- unhandled_isr_28, /* 13 DMA_CH3 */
- unhandled_isr_29, /* 14 DMA_CH4 */
- unhandled_isr_30, /* 15 DMA_CH5 */
- unhandled_isr_31, /* 16 DMA_CH6 */
- unhandled_isr_32, /* 17 DMA_CH7 */
- unhandled_isr_33, /* 18 ADC1 */
- unhandled_isr_34, /* 19 CAN_TX */
- unhandled_isr_35, /* 20 CAN_RX0 */
- unhandled_isr_36, /* 21 CAN_RX1 */
- unhandled_isr_37, /* 22 CAN_SCE */
- unhandled_isr_38, /* 23 EXTI9_5 */
- unhandled_isr_39, /* 24 TIM1_BRK/TIM15 */
- unhandled_isr_40, /* 25 TIM1_UP/TIM16 */
- unhandled_isr_41, /* 26 TIM1_TRG_COM */
- unhandled_isr_42, /* 27 TIM1_CC */
- unhandled_isr_43, /* 28 TIM2 */
- unhandled_isr_44, /* 29 Reserved */
- unhandled_isr_45, /* 30 Reserved */
- unhandled_isr_46, /* 31 I2C1_EV */
- unhandled_isr_47, /* 32 I2C1_ER */
- unhandled_isr_48, /* 33 I2C2_EV */
- unhandled_isr_49, /* 34 I2C2_ER */
- unhandled_isr_50, /* 35 SPI1 */
- unhandled_isr_51, /* 36 SPI2 */
- unhandled_isr_52, /* 37 USART1 */
- unhandled_isr_53, /* 38 USART2 */
- unhandled_isr_54, /* 39 USART3 */
- unhandled_isr_55, /* 40 EXTI15_10 */
- unhandled_isr_56, /* 41 RTCAlarm */
- unhandled_isr_57, /* 42 Reserved */
- unhandled_isr_58, /* 43 Reserved */
- unhandled_isr_59, /* 44 Reserved */
- unhandled_isr_60, /* 45 Reserved */
- unhandled_isr_61, /* 46 Reserved */
- unhandled_isr_62, /* 47 Reserved */
- unhandled_isr_63, /* 48 Reserved */
- unhandled_isr_64, /* 49 SDMMC1 */
- unhandled_isr_65, /* 50 Reserved */
- unhandled_isr_66, /* 51 SPI3 */
- unhandled_isr_67, /* 52 Reserved */
- unhandled_isr_68, /* 53 Reserved */
- unhandled_isr_69, /* 54 TIM6_DACUNDER */
- unhandled_isr_70, /* 55 TIM7 */
- unhandled_isr_71, /* 56 DMA2_CH1 */
- unhandled_isr_72, /* 57 DMA2_CH2 */
- unhandled_isr_73, /* 58 DMA2_CH3 */
- unhandled_isr_74, /* 59 DMA2_CH4 */
- unhandled_isr_75, /* 60 DMA2_CH5 */
- unhandled_isr_76, /* 61 Reserved */
- unhandled_isr_77, /* 62 Reserved */
- unhandled_isr_78, /* 63 Reserved*/
- unhandled_isr_79, /* 64 COMP */
- unhandled_isr_80, /* 65 LPTIM1 */
- unhandled_isr_81, /* 66 LPTIM2 */
- unhandled_isr_82, /* 67 USB_FS */
- unhandled_isr_83, /* 68 DMA_CH6 */
- unhandled_isr_84, /* 69 DMA_CH7 */
- unhandled_isr_85, /* 70 LPUART1 */
- unhandled_isr_86, /* 71 QUADSPI */
- unhandled_isr_87, /* 72 I2C3_EV */
- unhandled_isr_88, /* 73 I2C3_ER */
- unhandled_isr_89, /* 74 SAI1 */
- unhandled_isr_90, /* 75 Reserved */
- unhandled_isr_91, /* 76 SWPMI1 */
- unhandled_isr_92, /* 77 TSC */
- unhandled_isr_93, /* 78 Reserved */
- unhandled_isr_94, /* 79 AES */
- unhandled_isr_95, /* 80 RNG */
- unhandled_isr_96, /* 81 FPU */
- unhandled_isr_97 /* 82 CRS */
-};
-
-
-/*
- * Does nothing ... forever.
- */
-void unhandled_isr(int isr)
-{
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
-
- if (is_usart2_enabled()) {
- usart_printf(&USART2, "** Unhandled ISR Vector [%d]\r\n", isr);
- }
-
- for (;;) {
- /* Flash in a distinct pattern to know that something went wrong. */
-
- pin_off(pin3);
- delay(1000000);
- pin_on(pin3);
- delay(1000000);
- pin_off(pin3);
- delay(1000000);
- pin_on(pin3);
- delay(5000000);
- }
-}
diff --git a/03-refactor/src/main.c b/03-refactor/src/main.c
deleted file mode 100644
index 97449b2..0000000
--- a/03-refactor/src/main.c
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#include "clock.h"
-#include "delay.h"
-#include "gpio.h"
-#include "spin.h"
-#include "usart.h"
-#include "sio.h"
-
-void unhandled_isr_2();
-void init();
-
-int in_the_data;
-volatile uint32_t delay_amt = 20000000 / 4;
-
-int enable_usart1(uint32_t baud_rate)
-{
- /* Enable the GPIO bus. */
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
-
- /* Enable the USART clock. */
- RCC.apb2en_r |= BIT(14);
-
- /* == Configure the IO Pins. == */
-
- /* GPIO D5 (Port B pin 6) is USART1 Tx,
- * GPIO D6 (Port B pin 7) is USART1 Rx. */
- set_gpio_pin_mode(port_b, PIN_6, MODE_ALTERNATE);
- set_gpio_pin_mode(port_b, PIN_7, MODE_ALTERNATE);
-
- /* Set the GPIO pins to use the USART alternate function. */
- set_gpio_alternate_function(port_b, PIN_6, AFN_7);
- set_gpio_alternate_function(port_b, PIN_7, AFN_7);
-
- RCC.apb2rst_r &= ~BIT(14); /* De-assert reset of USART1 */
-
- uint32_t baud_rate_div = 80000000 / baud_rate;
- USART1.c1.r = 0;
- USART1.c2.r = 0;
- USART1.c3.r = 0;
- USART1.br.v = baud_rate_div;
-
- USART1.c1.r |= BIT(3) | BIT(2);
- USART1.c1.r |= BIT(0);
-
- /* Enable the transmitter and the receiver. */
- usart_set_enabled(&USART1, USART_ENABLE_TX);
- asm volatile(" cpsie i ");
-}
-
-void dwn() {
- int val = 19;
-
- while (val > 1) {
- usart_printf(&USART2, "Value: %2d\r\n", val);
- if ((val & 1) == 0) {
- val /= 2;
- } else {
- val = val * 3 + 1;
- }
- }
- usart_printf(&USART2, "Value: %2d\r\n", val);
-}
-
-/* Main function. This gets executed from the interrupt vector defined above. */
-int main()
-{
- /* Enable the GPIO port B. */
- // __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- // gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
- // gpio_output_pin_t pin1 = set_gpio_pin_output(port_b, PIN_1);
-
- /* Enable a higher clock frequency. */
- set_system_clock_MHz(80);
-
- enable_usart2(115200);
- int on_the_stack;
-
- USART2.c1.tcie = 1;
- USART2.c1.txeie = 1;
-
- // pin_on(pin3);
- if (is_usart2_enabled()) {
- dwn();
- usart_printf(&USART2, "Hello, %d!\r\n", -15);
- usart_printf(&USART2, "Hello, %022x\r\n", 0xeadbeef);
- usart_printf(&USART2, "on_the_stack: %08X\r\n", (unsigned) &on_the_stack);
-
- int i;
-
- printf("isr-2: %08x\r\n", (unsigned int)(void *) unhandled_isr_2);
- printf("init: %08x\r\n", (unsigned int)(void *) init);
- for (i = 0; i < 20; ++ i) {
- printf("isr %d: %08x\r\n", i, *(unsigned int*)(0x08000000 + i * 4));
- }
- }
-
- // usart_printf(&USART2, "that_thing: %d\n", *(unsigned*)(0x0));
- // for(;;);
-}
-
-void do_thing(void(*fn)()) {
- fn();
-}
diff --git a/03-refactor/src/printf.c b/03-refactor/src/printf.c
deleted file mode 100644
index fa7f519..0000000
--- a/03-refactor/src/printf.c
+++ /dev/null
@@ -1,152 +0,0 @@
-#include "printf.h"
-
-enum PRINTF_TYPE {
- PRINTF_TYPE_STRING = 0,
- PRINTF_TYPE_INT = 1,
- PRINTF_TYPE_PERCENT = 2,
- PRINTF_TYPE_UNKNOWN = 999
-};
-
-static enum PRINTF_TYPE get_printf_type(const char* cur)
-{
- while (*cur >= 0x30 && *cur < 0x3a) ++ cur;
-
- if (*cur == 's') {
- return PRINTF_TYPE_STRING;
- } else if (*cur == 'd' || *cur == 'x' || *cur == 'X' || *cur == 'u') {
- return PRINTF_TYPE_INT;
- }
-
- return PRINTF_TYPE_UNKNOWN;
-}
-
-static const char* printf_handle_string(
- const char* fmt,
- const char* next,
- printf_callback_t callback,
- volatile void* closure)
-{
- const char* cur = next;
- for (; *cur != 0; ++ cur) {
- callback(closure, *cur);
- }
-
- return fmt;
-}
-
-static char printf_toupper(char ch)
-{
- if (ch <= 0x7a && ch > 0x60) {
- return ch - 0x20;
- }
- return ch;
-}
-
-static const char* parse_fmt(
- const char* fmt,
- int* out_padding,
- char* out_pad_char)
-{
- if (*fmt == '0') {
- *out_pad_char = '0';
- ++ fmt;
- } else {
- *out_pad_char = ' ';
- }
- int padding = 0;
- while (*fmt < 0x3a && *fmt >= 0x30) {
- padding *= 10;
- padding += (*fmt ++) - 0x30;
- }
-
- *out_padding = padding;
- return fmt;
-}
-
-static const char* mapping = "0123456789abcdef";
-static const char* printf_handle_int(
- const char* fmt, unsigned int next, printf_callback_t callback, volatile void* closure)
-{
- int base = 10;
- char chars[32];
- int pos = 31;
- int upper = 0;
- char pad_char;
- int padding;
- int is_unsigned = 0;
-
- fmt = parse_fmt(fmt, &padding, &pad_char);
-
- if (*fmt == 'x' || *fmt == 'X') {
- base = 16;
- is_unsigned = 1;
- } else if (*fmt == 'u') {
- is_unsigned = 1;
- }
-
- upper = *fmt == 'X';
-
- int next_i = (int) next;
- if (next_i < 0 && !is_unsigned) {
- callback(closure, '-');
- next_i *= -1;
- next = (unsigned) next_i;
- }
-
- if (next == 0) {
- callback(closure, '0');
- } else {
- while (next > 0) {
- char next_ch = mapping[next % base];
- if (upper) next_ch = printf_toupper(next_ch);
- chars[pos --] = next_ch;
- padding --;
- next /= base;
- }
-
- while ((padding--) > 0) {
- chars[pos --] = pad_char;
- }
-
- for (++ pos; pos < 32; ++ pos) {
- callback(closure, chars[pos]);
- }
- }
-
- return fmt;
-}
-
-void printf_format(
- const char* fmt,
- printf_callback_t callback,
- volatile void* closure,
- va_list ap)
-{
- const char* cur = fmt;
-
- const char* next_string;
- int next_int;
-
- for (; *cur != 0; ++ cur) {
- if (*cur == '%') {
- // Handle the formatting here.
- ++ cur;
- enum PRINTF_TYPE printf_type = get_printf_type(cur);
-
- switch (printf_type) {
- case PRINTF_TYPE_PERCENT:
- callback(closure, '%');
- break;
- case PRINTF_TYPE_STRING:
- next_string = va_arg(ap, const char*);
- cur = printf_handle_string(cur, next_string, callback, closure);
- break;
- case PRINTF_TYPE_INT:
- next_int = va_arg(ap, int);
- cur = printf_handle_int(cur, next_int, callback, closure);
- }
- } else {
- callback(closure, *cur);
- }
- }
-}
diff --git a/03-refactor/src/spin.c b/03-refactor/src/spin.c
deleted file mode 100644
index fbd16b6..0000000
--- a/03-refactor/src/spin.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "spin.h"
-#include "delay.h"
-#include "gpio.h"
-
-#define SHORT_DELAY 200000
-#define LONG_DELAY (SHORT_DELAY * 2)
-
-static void flash_bit(
- uint32_t base, gpio_output_pin_t out_pin,
- uint8_t bit /* 0 => 0, non-zero => 1 */)
-{
- pin_on(out_pin);
- if (bit) {
- delay(base * 2);
- } else {
- delay(base);
- }
- pin_off(out_pin);
- delay(base);
-}
-
-void spin(uint32_t base, uint8_t c)
-{
- uint8_t code;
- __IO gpio_port_t* port_b = enable_gpio(GPIO_PORT_B);
- gpio_output_pin_t pin3 = set_gpio_pin_output(port_b, PIN_3);
-
- for (;;) {
- code = c;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
- code <<= 1;
- flash_bit(base, pin3, code & 0x80);
-
- delay(base * 4);
- }
-}
diff --git a/03-refactor/src/usart.c b/03-refactor/src/usart.c
deleted file mode 100644
index 76e93f1..0000000
--- a/03-refactor/src/usart.c
+++ /dev/null
@@ -1,131 +0,0 @@
-#include "usart.h"
-#include "delay.h"
-#include "printf.h"
-#include "gpio.h"
-#include "clock.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)
-{
- usart->c1.pce = !!parity;
- usart->c1.ps = parity & 1;
-}
-
-void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled)
-{
- if (!enabled) {
- usart->c1.ue = 0;
- } else {
- /* Set the rx enabled. */
- union USART_CR1 tmp = usart->c1;
-
- tmp.re = !!(enabled & USART_ENABLE_RX);
- tmp.te = !!(enabled & USART_ENABLE_TX);
- tmp.ue = 1;
-
- usart->c1 = tmp;
- }
-}
-
-void usart_transmit_byte(__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(__IO usart_t* usart, const uint8_t* bytes, uint32_t n)
-{
- while (n --) {
- usart_transmit_byte(usart, *(bytes ++));
- }
-}
-
-void usart_transmit_str(__IO usart_t* usart, const char* str)
-{
- while (*str) {
- if (*str == '\n') {
- usart_transmit_byte(usart, '\r');
- }
- usart_transmit_byte(usart, *(str ++));
- }
-}
-
-void usart_printf(__IO usart_t* usart, const char* fmt, ...)
-{
- printf_callback_t callback = (printf_callback_t) usart_transmit_byte;
- volatile void* closure = usart;
- va_list ap;
- va_start(ap, fmt);
- printf_format(fmt, callback, closure, ap);
- va_end(ap);
-}
-
-int usart2_enabled = 0;
-int is_usart2_enabled() {
- return usart2_enabled;
-}
-
-int enable_usart2(uint32_t baud_rate)
-{
- __IO gpio_port_t* port_a = enable_gpio(GPIO_PORT_A);
- enable_hsi(&RCC, true);
-
- // Turn on the clock for the USART2 peripheral
- set_usart2_clock_src(&RCC, USART_CLK_SRC_HSI16);
- set_usart2_clock_enabled(&RCC, true);
-
- // Configure the I/O pins. Will use PA2 as TX and PA15 as RX so setup for
- // alternate function
- set_gpio_pin_mode(port_a, PIN_2, MODE_ALTERNATE);
- set_gpio_pin_mode(port_a, PIN_15, MODE_ALTERNATE);
- set_gpio_alternate_function(port_a, PIN_2, AFN_7);
- set_gpio_alternate_function(port_a, PIN_15, AFN_3);
-
- // De-assert reset of USART2
- RCC.apb1rst1_r &= ~BIT(17);
-
- // Configure the USART
- // disable USART first to allow setting of other control bits
- // This also disables parity checking and enables 16 times oversampling
-
- USART2.c1.r = 0;
- USART2.c2.r = 0;
- USART2.c3.r = 0;
-
- usart_set_divisor(&USART2, 16000000 / baud_rate);
- usart_set_enabled(&USART2, USART_ENABLE_TX | USART_ENABLE_RX);
-
- usart2_enabled = 1;
-}
diff --git a/03-refactor/src/vector.c b/03-refactor/src/vector.c
deleted file mode 100644
index e69de29..0000000
--- a/03-refactor/src/vector.c
+++ /dev/null
diff --git a/02-usart/Makefile.preamble b/Makefile.preamble
index f6e1370..f6e1370 100644
--- a/02-usart/Makefile.preamble
+++ b/Makefile.preamble
diff --git a/02-usart/genmake.pl b/genmake.pl
index c4165a6..c4165a6 100755
--- a/02-usart/genmake.pl
+++ b/genmake.pl
diff --git a/02-usart/include/arch/arm/arch.h b/include/arch/arm/arch.h
index 22d0987..22d0987 100644
--- a/02-usart/include/arch/arm/arch.h
+++ b/include/arch/arm/arch.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/apb.h b/include/arch/stm32l4xxx/peripherals/apb.h
index 11fa7ab..11fa7ab 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/apb.h
+++ b/include/arch/stm32l4xxx/peripherals/apb.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/clock.h b/include/arch/stm32l4xxx/peripherals/clock.h
index 6f628fd..6f628fd 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/clock.h
+++ b/include/arch/stm32l4xxx/peripherals/clock.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/dma.h b/include/arch/stm32l4xxx/peripherals/dma.h
index f62a92b..f62a92b 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/dma.h
+++ b/include/arch/stm32l4xxx/peripherals/dma.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/flash.h b/include/arch/stm32l4xxx/peripherals/flash.h
index 28a3d6c..28a3d6c 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/flash.h
+++ b/include/arch/stm32l4xxx/peripherals/flash.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/gpio.h b/include/arch/stm32l4xxx/peripherals/gpio.h
index 944d725..944d725 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/gpio.h
+++ b/include/arch/stm32l4xxx/peripherals/gpio.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/irq.h b/include/arch/stm32l4xxx/peripherals/irq.h
index 52878ca..52878ca 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/irq.h
+++ b/include/arch/stm32l4xxx/peripherals/irq.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc b/include/arch/stm32l4xxx/peripherals/isrs.inc
index 0682238..0682238 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc
+++ b/include/arch/stm32l4xxx/peripherals/isrs.inc
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/nvic.h b/include/arch/stm32l4xxx/peripherals/nvic.h
index 1645a2d..1645a2d 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/nvic.h
+++ b/include/arch/stm32l4xxx/peripherals/nvic.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/rcc.h b/include/arch/stm32l4xxx/peripherals/rcc.h
index de7b568..de7b568 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/rcc.h
+++ b/include/arch/stm32l4xxx/peripherals/rcc.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/spi.h b/include/arch/stm32l4xxx/peripherals/spi.h
index a39a0bb..a39a0bb 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/spi.h
+++ b/include/arch/stm32l4xxx/peripherals/spi.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/system.h b/include/arch/stm32l4xxx/peripherals/system.h
index b6ff0a6..b6ff0a6 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/system.h
+++ b/include/arch/stm32l4xxx/peripherals/system.h
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc b/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc
index 66d347c..66d347c 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc
+++ b/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc b/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc
index 21c7234..21c7234 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc
+++ b/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc
diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/usart.h b/include/arch/stm32l4xxx/peripherals/usart.h
index a1542f4..a1542f4 100644
--- a/02-usart/include/arch/stm32l4xxx/peripherals/usart.h
+++ b/include/arch/stm32l4xxx/peripherals/usart.h
diff --git a/02-usart/include/arch/x86_64/arch.h b/include/arch/x86_64/arch.h
index c17721d..c17721d 100644
--- a/02-usart/include/arch/x86_64/arch.h
+++ b/include/arch/x86_64/arch.h
diff --git a/02-usart/include/kern/common.h b/include/kern/common.h
index 653279e..653279e 100644
--- a/02-usart/include/kern/common.h
+++ b/include/kern/common.h
diff --git a/01-system-clock/include/delay.h b/include/kern/delay.h
index 65a26d6..65a26d6 100644
--- a/01-system-clock/include/delay.h
+++ b/include/kern/delay.h
diff --git a/02-usart/include/kern/dma/dma_manager.h b/include/kern/dma/dma_manager.h
index 0d17bd5..0d17bd5 100644
--- a/02-usart/include/kern/dma/dma_manager.h
+++ b/include/kern/dma/dma_manager.h
diff --git a/02-usart/include/kern/gpio/gpio_manager.h b/include/kern/gpio/gpio_manager.h
index 922a423..922a423 100644
--- a/02-usart/include/kern/gpio/gpio_manager.h
+++ b/include/kern/gpio/gpio_manager.h
diff --git a/02-usart/include/kern/gpio/sysled.h b/include/kern/gpio/sysled.h
index b2c9056..b2c9056 100644
--- a/02-usart/include/kern/gpio/sysled.h
+++ b/include/kern/gpio/sysled.h
diff --git a/02-usart/include/kern/init.h b/include/kern/init.h
index 737b85f..737b85f 100644
--- a/02-usart/include/kern/init.h
+++ b/include/kern/init.h
diff --git a/02-usart/include/kern/lib.h b/include/kern/lib.h
index be0e8e9..be0e8e9 100644
--- a/02-usart/include/kern/lib.h
+++ b/include/kern/lib.h
diff --git a/02-usart/include/kern/log.h b/include/kern/log.h
index 5e49def..5e49def 100644
--- a/02-usart/include/kern/log.h
+++ b/include/kern/log.h
diff --git a/02-usart/include/kern/mem.h b/include/kern/mem.h
index c0999f5..c0999f5 100644
--- a/02-usart/include/kern/mem.h
+++ b/include/kern/mem.h
diff --git a/02-usart/include/kern/string.h b/include/kern/string.h
index 3c9f0b4..3c9f0b4 100644
--- a/02-usart/include/kern/string.h
+++ b/include/kern/string.h
diff --git a/02-usart/linker/linker_script.ld b/linker/linker_script.ld
index 9a9f5b3..9a9f5b3 100644
--- a/02-usart/linker/linker_script.ld
+++ b/linker/linker_script.ld
diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/clock.c b/src/arch/stm32l4xxx/peripherals/clock.c
index 9051572..9051572 100644
--- a/02-usart/src/arch/stm32l4xxx/peripherals/clock.c
+++ b/src/arch/stm32l4xxx/peripherals/clock.c
diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/irq.c b/src/arch/stm32l4xxx/peripherals/irq.c
index 364b9a7..364b9a7 100644
--- a/02-usart/src/arch/stm32l4xxx/peripherals/irq.c
+++ b/src/arch/stm32l4xxx/peripherals/irq.c
diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/usart.c b/src/arch/stm32l4xxx/peripherals/usart.c
index 7309b48..7309b48 100644
--- a/02-usart/src/arch/stm32l4xxx/peripherals/usart.c
+++ b/src/arch/stm32l4xxx/peripherals/usart.c
diff --git a/02-usart/src/kern/delay.c b/src/kern/delay.c
index 28ef710..28ef710 100644
--- a/02-usart/src/kern/delay.c
+++ b/src/kern/delay.c
diff --git a/02-usart/src/kern/dma/dma_manager.c b/src/kern/dma/dma_manager.c
index 00e9f3d..00e9f3d 100644
--- a/02-usart/src/kern/dma/dma_manager.c
+++ b/src/kern/dma/dma_manager.c
diff --git a/02-usart/src/kern/gpio/gpio_manager.c b/src/kern/gpio/gpio_manager.c
index 82dd0ba..82dd0ba 100644
--- a/02-usart/src/kern/gpio/gpio_manager.c
+++ b/src/kern/gpio/gpio_manager.c
diff --git a/02-usart/src/kern/gpio/sysled.c b/src/kern/gpio/sysled.c
index a728da3..a728da3 100644
--- a/02-usart/src/kern/gpio/sysled.c
+++ b/src/kern/gpio/sysled.c
diff --git a/02-usart/src/kern/init.c b/src/kern/init.c
index 2531ca9..2531ca9 100644
--- a/02-usart/src/kern/init.c
+++ b/src/kern/init.c
diff --git a/02-usart/src/kern/lib.c b/src/kern/lib.c
index 88188cc..88188cc 100644
--- a/02-usart/src/kern/lib.c
+++ b/src/kern/lib.c
diff --git a/02-usart/src/kern/log.c b/src/kern/log.c
index a217183..a217183 100644
--- a/02-usart/src/kern/log.c
+++ b/src/kern/log.c
diff --git a/02-usart/src/kern/main.c b/src/kern/main.c
index ebb2164..ebb2164 100644
--- a/02-usart/src/kern/main.c
+++ b/src/kern/main.c
diff --git a/02-usart/src/kern/mem.c b/src/kern/mem.c
index 5234fff..5234fff 100644
--- a/02-usart/src/kern/mem.c
+++ b/src/kern/mem.c
diff --git a/02-usart/src/kern/stdlibrepl.c b/src/kern/stdlibrepl.c
index 2d9d839..2d9d839 100644
--- a/02-usart/src/kern/stdlibrepl.c
+++ b/src/kern/stdlibrepl.c
diff --git a/02-usart/src/kern/string.c b/src/kern/string.c
index 4afa228..4afa228 100644
--- a/02-usart/src/kern/string.c
+++ b/src/kern/string.c
diff --git a/01-system-clock/src/vector.c b/src/kern/vector.c
index e69de29..e69de29 100644
--- a/01-system-clock/src/vector.c
+++ b/src/kern/vector.c
diff --git a/02-usart/test_harness/Makefile b/test_harness/Makefile
index 443292b..443292b 100644
--- a/02-usart/test_harness/Makefile
+++ b/test_harness/Makefile
diff --git a/02-usart/test_harness/fake_env.c b/test_harness/fake_env.c
index 6a32c99..6a32c99 100644
--- a/02-usart/test_harness/fake_env.c
+++ b/test_harness/fake_env.c
diff --git a/02-usart/test_harness/fake_env.h b/test_harness/fake_env.h
index 34056f4..34056f4 100644
--- a/02-usart/test_harness/fake_env.h
+++ b/test_harness/fake_env.h
diff --git a/02-usart/test_harness/test_harness.c b/test_harness/test_harness.c
index bf9249c..bf9249c 100644
--- a/02-usart/test_harness/test_harness.c
+++ b/test_harness/test_harness.c
diff --git a/02-usart/test_harness/test_harness.h b/test_harness/test_harness.h
index 698e2da..698e2da 100644
--- a/02-usart/test_harness/test_harness.h
+++ b/test_harness/test_harness.h
diff --git a/02-usart/tests/metatest.c b/tests/metatest.c
index 1024156..1024156 100644
--- a/02-usart/tests/metatest.c
+++ b/tests/metatest.c
diff --git a/02-usart/tests/test_dma.c b/tests/test_dma.c
index 50cdb5b..50cdb5b 100644
--- a/02-usart/tests/test_dma.c
+++ b/tests/test_dma.c
diff --git a/02-usart/tests/test_gpio.c b/tests/test_gpio.c
index bcb953c..bcb953c 100644
--- a/02-usart/tests/test_gpio.c
+++ b/tests/test_gpio.c
diff --git a/02-usart/tests/test_irq.c b/tests/test_irq.c
index 3c4ee9c..3c4ee9c 100644
--- a/02-usart/tests/test_irq.c
+++ b/tests/test_irq.c
diff --git a/02-usart/tests/test_lib.c b/tests/test_lib.c
index 33076c2..33076c2 100644
--- a/02-usart/tests/test_lib.c
+++ b/tests/test_lib.c
diff --git a/02-usart/tests/test_memory.c b/tests/test_memory.c
index 04e9289..04e9289 100644
--- a/02-usart/tests/test_memory.c
+++ b/tests/test_memory.c
diff --git a/02-usart/tests/test_spi.c b/tests/test_spi.c
index cc25d6e..cc25d6e 100644
--- a/02-usart/tests/test_spi.c
+++ b/tests/test_spi.c
diff --git a/02-usart/tests/test_usart.c b/tests/test_usart.c
index b19d687..b19d687 100644
--- a/02-usart/tests/test_usart.c
+++ b/tests/test_usart.c