diff options
Diffstat (limited to '02-usart')
59 files changed, 0 insertions, 5109 deletions
diff --git a/02-usart/.gdbinit b/02-usart/.gdbinit deleted file mode 100644 index 87932b3..0000000 --- a/02-usart/.gdbinit +++ /dev/null @@ -1 +0,0 @@ -set follow-fork-mode child diff --git a/02-usart/.ycm_extra_conf.py b/02-usart/.ycm_extra_conf.py deleted file mode 100644 index 8203412..0000000 --- a/02-usart/.ycm_extra_conf.py +++ /dev/null @@ -1,21 +0,0 @@ -import os -import ycm_core - -flags = [ - '-Wall', - '-DFOR_TESTING', - '-Iinclude', - '-Iinclude/arch/arm', - '-Itest_harness/', - '-DARCH_STMT32L4', - '-DDRY_RUN', - # -Iinclude/arch/arm -Itest_harness/ -DARCH_STM32L4 -DDRY_RUN -Wall -DFOR_TESTINGk - ] - -SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', ] - -def FlagsForFile( filename, **kwargs ): - return { - 'flags': flags, - 'do_cache': True - } diff --git a/02-usart/Makefile.preamble b/02-usart/Makefile.preamble deleted file mode 100644 index f6e1370..0000000 --- a/02-usart/Makefile.preamble +++ /dev/null @@ -1,25 +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 -Iinclude/arch/arm -LD_FLAGS?=-T linker/linker_script.ld -nostdlib --cref -Map linker/main.map -static - -TEST_PREFIX=x86_64-pc-linux-gnu- -TEST_CFLAGS=-Iinclude -Iinclude/arch/x86_64 -Itest_harness -g3 -ggdb -DFOR_TESTING -Wall - -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 - rm -rf tests/build - rm -rf test_harness/*.a test_harness/*.o - -genmake: - ./genmake.pl > Makefile diff --git a/02-usart/genmake.pl b/02-usart/genmake.pl deleted file mode 100755 index c4165a6..0000000 --- a/02-usart/genmake.pl +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/perl - -use File::Basename; -use File::Find; -use Digest::SHA qw(sha1_hex); - -# 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; -find(sub { - push @files, "$File::Find::name" if $_ =~ /.*\.c/ - }, "src/"); - -my @test_files; -find(sub { - push @test_files, "$File::Find::name" if $_ =~ /.*\.c/ - }, "tests/"); - -my @header_files; -find(sub { - push @header_files, "$File::Find::name" if $_ =~ /.*\.h/; - }, "include/" ); - -my $idempotency_hash=sha1_hex("@files @test_files @header_files"); - -if ("$ARGV[0]" eq "hash") { - print "$idempotency_hash\n"; - exit 0 -} - -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_make = - "/usr/bin/perl ./genmake.pl hash"; - -print "IDEMPOTENCY_HASH=$idempotency_hash\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 "\@mkdir -p " . dirname($obj_file) . "\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 "\@mkdir -p " . dirname($obj_file) . "\n\t"; - print '$(CC) -S ' . $c_file . ' -o ' . $s_file . ' $(CFLAGS)' . "\n\n"; -} - -my $obj_files_deps = join(' ', @obj_files); - -my @tests_tgts; -foreach $file (@test_files) { - my $c_file = $file; - - my($basename, $directories, $suffix) = fileparse($file, qr/\.[^.]*/); - - my $outdir = $directories . "build/"; - my $outbinary = $outdir . $basename; - - my @deps = header_deps($c_file); - my $deps_as_join = join(" ", @deps); - - push (@test_tgts, "${outbinary}"); - print "${outbinary}: $deps_as_join $obj_files_deps test_harness/test_harness.a\n\t"; - print "mkdir -p " . dirname($outbinary) . "\n\t"; - print '$(CC) $(CFLAGS) -o' . ${outbinary} . ' ' . $c_file . ' ' . $obj_files_deps . " test_harness/test_harness.a\n\n"; - - print "$directories$basename:\n\t"; - print 'mkdir -p ' . $outdir . "\n\t"; - print 'PREFIX=$(TEST_PREFIX) CFLAGS="$(TEST_CFLAGS)" $(MAKE) ' . $outbinary . "\n\t"; - print $outbinary . "\n\n"; -} - -print "test_harness/test_harness.a: test_harness/test_harness.h test_harness/test_harness.c\n\t"; -print 'cd test_harness; $(MAKE) test_harness.a; cd ..' . "\n\n"; - -print "tests_: " . join(" ", @test_tgts) . "\n\t"; -print "" . join("\n\t", @test_tgts) . "\n\n"; - -print ".PHONY: tests\n"; -print "tests:\n\t"; -print 'PREFIX=$(TEST_PREFIX) CFLAGS="$(TEST_CFLAGS)" $(MAKE) tests_' . "\n\n"; - -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 $arch_obs_dir/main.elf ) " - . "|| " - . "\$(LD) -o $arch_obs_dir/main.elf \$(LD_FLAGS) $obj_files_deps\n\n"; diff --git a/02-usart/include/arch/arm/arch.h b/02-usart/include/arch/arm/arch.h deleted file mode 100644 index 22d0987..0000000 --- a/02-usart/include/arch/arm/arch.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef ARCH_H_ -#define ARCH_H_ - -#ifndef ARCH_STM32L4 -#define ARCH_STM32L4 -#endif - -#define CORTEX_M4 - -#define enable_all_interrupts() \ - asm volatile(" cpsie i ") - - -#define DMA1_BASE (0x40020000) -#define DMA2_BASE (0x40020400) - -#define USART1_BASE (0x40013800) -#define USART2_BASE (0x40004400) - -#define GPIOA_BASE (0x48000000) -#define GPIOB_BASE (0x48000400) -#define GPIOC_BASE (0x48000800) -#define GPIOH_BASE (0x48001C00) - -#define SRAM1_BASE (0x20000000) -#define SRAM2_BASE (0x2000C000) - -#define SYSTEM_CONFIG_BLOCK_BASE (0xE000E008) -#define NVIC_BASE (0xE000E004) -#define RCC_BASE (0x40021000) - -#define SPI1_BASE (0x40013000) -#define SPI3_BASE (0x40003C00) - -#include <stdint.h> -#ifndef DRY_RUN -_Static_assert(sizeof(void*) == sizeof(uint32_t), "Pointers must be 32 bits"); -#endif - -extern uint32_t DATA_SEGMENT_START; -extern uint32_t DATA_SEGMENT_STOP; - -#endif /* ARCH_H_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/apb.h b/02-usart/include/arch/stm32l4xxx/peripherals/apb.h deleted file mode 100644 index 11fa7ab..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/apb.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef H__APB_ -#define H__APB_ - -#endif /* H__APB_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/clock.h b/02-usart/include/arch/stm32l4xxx/peripherals/clock.h deleted file mode 100644 index 6f628fd..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/clock.h +++ /dev/null @@ -1,128 +0,0 @@ -#ifndef CORE_CLOCK_H__ -#define CORE_CLOCK_H__ - -#include <stdint.h> -#include "arch/stm32l4xxx/peripherals/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 */); - -uint8_t get_clock_mhz(); - -#endif /* CORE_CLOCK_H__ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/dma.h b/02-usart/include/arch/stm32l4xxx/peripherals/dma.h deleted file mode 100644 index f62a92b..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/dma.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef CORE_DMA_H_ -#define CORE_DMA_H_ - -/* - * Header file for definining the DMA (Direct Memory Access). - * - * A DMA is used to perform data transfers between segments of memory - * or between memory and peripherals. - * - * There are 2 DMA's on the chip. Each with 7 channels. - */ - -#include "kern/common.h" -#include <arch.h> -#include <stdint.h> - -#define DMA1 (* (dma_t*) DMA1_BASE) -#define DMA2 (* (dma_t*) DMA2_BASE) - -typedef enum { - DMA_SIZE_8_BITS = 0, - DMA_SIZE_16_BITS = 1, - DMA_SIZE_32_BITS = 2, -} dma_size_t; - -typedef enum { - DMA_PRIORITY_LEVEL_LOW = 0, - DMA_PRIORITY_LEVEL_MEDIUM = 1, - DMA_PRIORITY_LEVEL_HIGH = 2, - DMA_PRIORITY_LEVEL_VERY_HIGH = 3 -} dma_priority_level_t; - -typedef enum { - READ_FROM_PERIPHERAL = 0, - READ_FROM_MEMORY = 1, -} dma_dir_t; - -typedef struct { - -#define dma_cc_en (1 << 0) // channel enable -#define dma_cc_tcie (1 << 1) // transfer complete interrupt enable -#define dma_cc_htie (1 << 2) // half transfer interrupt enable -#define dma_cc_teie (1 << 3) // transfer error interrupt enable -#define dma_cc_dir (1 << 4) // data transfer direction -#define dma_cc_circ (1 << 5) // circular mode -#define dma_cc_pinc (1 << 6) // peripheral increment mode -#define dma_cc_minc (1 << 7) // memory increment mode -#define dma_cc_psize (3 << 8) // Peripheral size -#define dma_cc_msize (3 << 10) // Memory size -#define dma_cc_pl (3 << 12) // Priority level -#define dma_cc_mem2mem (1 << 14) // Memory to memory mode - - __IO uint32_t cc_r; - - /* Number of data to transfer. Can only store a short. */ - __IO uint32_t cndt_r; - - /* DMA channel peripheral address register. - * Defines a memory address if mem2mem is set. */ - __IO uint32_t cpa_r; - - /* DMA channel memory address register. - * Defines another perpipheral address if peripheral-periphal mode is set. */ - __IO uint32_t cma_r; - - __IO uint32_t reserved; -} dma_channel_config_t; - -typedef struct { - // DMA Interrupt status register. -#define dma_gif1 (1 << 0) // global interrupt flag for channel 1 -#define dma_tcif1 (1 << 1) // transfer complete (TC) flag for channel 1 -#define dma_htif1 (1 << 2) // half transfer (HT) flag for channel 1 -#define dma_teif1 (1 << 3) // transfer error (TE) flag for channel 1 -#define dma_gif2 (1 << 4) // global interrupt flag for channel 2 -#define dma_tcif2 (1 << 5) // transfer complete (TC) flag for channel 2 -#define dma_htif2 (1 << 6) // half transfer (HT) flag for channel 2 -#define dma_teif2 (1 << 7) // transfer error (TE) flag for channel 2 -#define dma_gif3 (1 << 8) // global interrupt flag for channel 3 -#define dma_tcif3 (1 << 9) // transfer complete (TC) flag for channel 3 -#define dma_htif3 (1 << 10) // half transfer (HT) flag for channel 3 -#define dma_teif3 (1 << 11) // transfer error (TE) flag for channel 3 -#define dma_gif4 (1 << 12) // global interrupt flag for channel 4 -#define dma_tcif4 (1 << 13) // transfer complete (TC) flag for channel 4 -#define dma_htif4 (1 << 14) // half transfer (HT) flag for channel 4 -#define dma_teif4 (1 << 15) // transfer error (TE) flag for channel 4 -#define dma_gif5 (1 << 16) // global interrupt flag for channel 5 -#define dma_tcif5 (1 << 17) // transfer complete (TC) flag for channel 5 -#define dma_htif5 (1 << 18) // half transfer (HT) flag for channel 5 -#define dma_teif5 (1 << 19) // transfer error (TE) flag for channel 5 -#define dma_gif6 (1 << 20) // global interrupt flag for channel 6 -#define dma_tcif6 (1 << 21) // transfer complete (TC) flag for channel 6 -#define dma_htif6 (1 << 22) // half transfer (HT) flag for channel 6 -#define dma_teif6 (1 << 23) // transfer error (TE) flag for channel 6 -#define dma_gif7 (1 << 24) // global interrupt flag for channel 7 -#define dma_tcif7 (1 << 25) // transfer complete (TC) flag for channel 7 -#define dma_htif7 (1 << 26) // half transfer (HT) flag for channel 7 -#define dma_teif7 (1 << 27) // transfer error (TE) flag for channel 7 - __IO uint32_t is_r; - - // DMA Interrupt flag clear register -#define dma_cgif1 (1 << 0) // global interrupt flag clear for channel 1 -#define dma_ctcif1 (1 << 1) // transfer complete flag clear for channel 1 -#define dma_chtif1 (1 << 2) // half transfer flag clear for channel 1 -#define dma_cteif1 (1 << 3) // transfer error flag clear for channel 1 -#define dma_cgif2 (1 << 4) // global interrupt flag clear for channel 2 -#define dma_ctcif2 (1 << 5) // transfer complete flag clear for channel 2 -#define dma_chtif2 (1 << 6) // half transfer flag clear for channel 2 -#define dma_cteif2 (1 << 7) // transfer error flag clear for channel 2 -#define dma_cgif3 (1 << 8) // global interrupt flag clear for channel 3 -#define dma_ctcif3 (1 << 9) // transfer complete flag clear for channel 3 -#define dma_chtif3 (1 << 10) // half transfer flag clear for channel 3 -#define dma_cteif3 (1 << 11) // transfer error flag clear for channel 3 -#define dma_cgif4 (1 << 12) // global interrupt flag clear for channel 4 -#define dma_ctcif4 (1 << 13) // transfer complete flag clear for channel 4 -#define dma_chtif4 (1 << 14) // half transfer flag clear for channel 4 -#define dma_cteif4 (1 << 15) // transfer error flag clear for channel 4 -#define dma_cgif5 (1 << 16) // global interrupt flag clear for channel 5 -#define dma_ctcif5 (1 << 17) // transfer complete flag clear for channel 5 -#define dma_chtif5 (1 << 18) // half transfer flag clear for channel 5 -#define dma_cteif5 (1 << 19) // transfer error flag clear for channel 5 -#define dma_cgif6 (1 << 20) // global interrupt flag clear for channel 6 -#define dma_ctcif6 (1 << 21) // transfer complete flag clear for channel 6 -#define dma_chtif6 (1 << 22) // half transfer flag clear for channel 6 -#define dma_cteif6 (1 << 23) // transfer error flag clear for channel 6 -#define dma_cgif7 (1 << 24) // global interrupt flag clear for channel 7 -#define dma_ctcif7 (1 << 25) // transfer complete flag clear for channel 7 -#define dma_chtif7 (1 << 26) // half transfer flag clear for channel 7 -#define dma_cteif7 (1 << 27) // transfer error flag clear for channel 7 - __IO uint32_t ifc_r; - - dma_channel_config_t channel_config[7]; - - __IO uint32_t reserved[5]; - - /* DMA channel selection register. */ -#define dma_c1s (0xF << 0) // DMA channel 1 selection. -#define dma_c2s (0xF << 4) // DMA channel 2 selection. -#define dma_c3s (0xF << 8) // DMA channel 3 selection. -#define dma_c4s (0xF << 12) // DMA channel 4 selection. -#define dma_c5s (0xF << 16) // DMA channel 5 selection. -#define dma_c6s (0xF << 20) // DMA channel 6 selection. -#define dma_c7s (0xF << 24) // DMA channel 7 selection. - __IO uint32_t csel_r; -} dma_t; - -static_assert(offsetof(dma_t, csel_r) == 0xA8, "Offset check failed."); - -#endif /* CORE_DMA_H_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/flash.h b/02-usart/include/arch/stm32l4xxx/peripherals/flash.h deleted file mode 100644 index 28a3d6c..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/flash.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef H__FLASH_ -#define H__FLASH_ - -#include "kern/common.h" - -/* - * Header file for dealing with flash. - */ - -#define FLASH_BASE 0x40022000 - -typedef struct { - __IO uint32_t ac_r; /* Flash access control register. */ - - /* TODO fill out the rest. */ -} PACKED flash_t; - -#define FLASH (*(__IO flash_t*)FLASH_BASE) - -#endif /* H__FLASH_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/gpio.h b/02-usart/include/arch/stm32l4xxx/peripherals/gpio.h deleted file mode 100644 index 944d725..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/gpio.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef CORE_GPIO_H__ -#define CORE_GPIO_H__ - -#include "kern/common.h" -#include "arch/stm32l4xxx/peripherals/rcc.h" - -#include <stdint.h> - -/* - * Structure defining the layout of the layout of the GPIO registers on the - * stm32l432 development board. - */ -typedef struct GPIO_PORT_STR { - /* Mode of each GPIO pin for this GPIO port. */ -#define gpio_mode_n(off) (3 << ((off) * 2)) - __IO uint32_t mode_r; /* Mode register */ - - /* Output type for each gpio pin in this port. */ -#define gpio_otype_n(off) (1 << (off)) - __IO uint32_t otype_r; - - /* GPIO port output speed. */ -#define gpio_ospeed_n(off) (3 << ((off) * 2)) - __IO uint32_t ospeed_r; - - /* GPIO port pull-up/pull-down register */ -#define gpio_pupd_n(off) (3 << ((off) * 2)) - __IO uint32_t pupd_r; - - /* GPIO port input data register. */ -#define gpio_idr_n(off) (1 << (off)) - __IO uint32_t id_r; - - /* GPIO port output data register. */ -#define gpio_odr_n(off) (1 << (off)) - __IO uint32_t od_r; - - /* GPIO port bit set/reset register. */ -#define gpio_bs_n(off) (1 << (off)) -#define gpio_br_n(off) (1 << (off)) - __IO uint32_t bsr_r; - - /* GPIO port configuration lock register. */ -#define gpio_lck_n(off) (1 << (off)) -#define gpio_lckk (1 << 16) - __IO uint32_t lck_r; - - /* Alternate function low-register. */ -#define gpio_afsel_n(off) (0xf << ((off) * 4)) - __IO uint32_t af_rl; - /* Alternate function high-register. */ - __IO uint32_t af_rh; - - /* GPIO port bit register. */ -#define gpio_br_n(off) (1 << (off)) - __IO uint32_t br_r; - - /* Analog switch control register. */ -#define gpio_asc_n(off) (1 << (off)) - __IO uint32_t asc_r; -} PACKED gpio_port_config_t; - -static_assert( - offsetof(gpio_port_config_t, asc_r) == 0x2C, "Offset check failed"); - -#endif diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/irq.h b/02-usart/include/arch/stm32l4xxx/peripherals/irq.h deleted file mode 100644 index 52878ca..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/irq.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef CORE_IRQ_H__ -#define CORE_IRQ_H__ - -#include <stdint.h> - -/* - * Include file for interrupt service routines. - */ - -typedef enum { -#define IRQ_RESERVED(n) -#define IRQ(name_, uname, num) \ - IRQ_##uname = num, -#include "arch/stm32l4xxx/peripherals//isrs.inc" -#undef IRQ -#undef IRQ_RESERVED -} interrupt_t; - -/* Defines a set of interrupts so they may be enabled all at once. */ -typedef struct { - uint32_t sysirqs; /* System iterrupts. */ - uint32_t irqs[8]; -} interrupt_set_t; - -inline static void interrupt_set_add( - interrupt_set_t* interrupt_set, interrupt_t interrupt) -{ - if (interrupt < 16) { - interrupt_set->sysirqs |= 1 << interrupt; - return; - } - - interrupt -= 16; - int loc = interrupt / 32; - int off = interrupt % 32; - - interrupt_set->irqs[loc] |= 1 << off; -} - -inline static void interrupt_set_remove( - interrupt_set_t* interrupt_set, interrupt_t interrupt) -{ - if (interrupt < 16) { - interrupt_set->sysirqs &= ~(1 << interrupt); - return; - } - - interrupt -= 16; - int loc = interrupt / 32; - int off = interrupt % 32; - - interrupt_set->irqs[loc] &= ~(1 << off); -} - -/* - * The interrupt service routines. These link in the function `main` as the - * main function. - */ -extern const void* vectors[]; - -/* - * Defines an error state. This loops forever and defines a distinct flashing - * pattern to let the user know an unhandled ISR happened. - */ -void unhandled_isr(uint8_t val); - -#define enable_interrupt(val) \ - {interrupt_set_t itrset = { 0 }; \ - interrupt_set_add(&itrset, val); \ - enable_interrupts(&itrset);} - -#define disable_interrupt(val) \ - {interrupt_set_t itrset = { 0 }; \ - interrupt_set_add(&itrset, val); \ - disable_interrupts(&itrset);} - -/* - * Enables the provided interrupt. Note that if the interrupt is one of the - * system interrupts (first 16) this function has no effect because those - * interrupts are always enabled. - */ -void enable_interrupts(interrupt_set_t* interrupts); - -/* - * Enables the provided interrupt - */ -void disable_interrupts(interrupt_set_t* interrupts); - -#endif /* CORE_IRQ_H_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc b/02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc deleted file mode 100644 index 0682238..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/isrs.inc +++ /dev/null @@ -1,112 +0,0 @@ -/* - * The following is a list of interrupts listed in a way - * that makes it easy to macro-process them by defining - * macro definitions for IRQ and IRQ_RESERVED alike followed - * by including this file. - */ -IRQ(on_reset, RESET, 1) -IRQ(on_nmi, NMI, 2) -IRQ(on_hard_fault, HARD_FAULT, 3) -IRQ(on_mem_manage, MEM_MANAGE, 4) -IRQ(on_bus_fault, BUS_FAULT, 5) -IRQ(on_usage_fault, USAGE_FAULT, 6) -IRQ_RESERVED(7) -IRQ_RESERVED(8) -IRQ_RESERVED(9) -IRQ_RESERVED(10) -IRQ(on_svc, SVC, 11) -IRQ(on_debug_mon, DEBUG_MON, 12) -IRQ_RESERVED(13) -IRQ(on_pendsv, PENDSV, 14) -IRQ(on_systick, SYSTICK, 15) -IRQ(on_wwdg_irq, WWDG_IRQ, 16) -IRQ(on_pvd_irq, PVD_IRQ, 17) -IRQ(on_tamper_stamp_irq, TAMPER_STAMP_IRQ, 18) -IRQ(on_rtc_wkup_irq, RTC_WKUP_IRQ, 19) -IRQ(on_flash_irq, FLASH_IRQ, 20) -IRQ(on_rcc_irq, RCC_IRQ, 21) -IRQ(on_exti0_irq, EXTI0_IRQ, 22) -IRQ(on_exti1_irq, EXTI1_IRQ, 23) -IRQ(on_exti2_irq, EXTI2_IRQ, 24) -IRQ(on_exti3_irq, EXTI3_IRQ, 25) -IRQ(on_exti4_irq, EXTI4_IRQ, 26) -IRQ(on_dma1_channel1_irq, DMA1_CHANNEL1_IRQ, 27) -IRQ(on_dma1_channel2_irq, DMA1_CHANNEL2_IRQ, 28) -IRQ(on_dma1_channel3_irq, DMA1_CHANNEL3_IRQ, 29) -IRQ(on_dma1_channel4_irq, DMA1_CHANNEL4_IRQ, 30) -IRQ(on_dma1_channel5_irq, DMA1_CHANNEL5_IRQ, 31) -IRQ(on_dma1_channel6_irq, DMA1_CHANNEL6_IRQ, 32) -IRQ(on_dma1_channel7_irq, DMA1_CHANNEL7_IRQ, 33) -IRQ(on_adc1_irq, ADC1_IRQ, 34) -IRQ(on_can1_tx, CAN1_TX, 35) -IRQ(on_can1_rx0, CAN1_RX0, 36) -IRQ(on_can1_rx1, CAN1_RX1, 37) -IRQ(on_can1_sce, CAN1_SCE, 38) -IRQ(on_exti9_5, EXTI9_5, 39) -IRQ(on_tim1_brk, TIM1_BRK, 40) -IRQ(on_tim1_up, TIM1_UP, 41) -IRQ(on_tim1_trg_com, TIM1_TRG_COM, 42) -IRQ(on_tim1_cc, TIM1_CC, 43) -IRQ(on_tim2, TIM2, 44) -IRQ(on_tim3, TIM3, 45) -IRQ(on_tim4, TIM4, 46) -IRQ(on_i2c1_ev, I2C1_EV, 47) -IRQ(on_i2c1_er, I2C1_ER, 48) -IRQ(on_i2c2_ev, I2C2_EV, 49) -IRQ(on_i2c2_er, I2C2_ER, 50) -IRQ(on_spi1, SPI1, 51) -IRQ(on_spi2, SPI2, 52) -IRQ(on_usart1, USART1, 53) -IRQ(on_usart2, USART2, 54) -IRQ(on_usart3, USART3, 55) -IRQ(on_exti15_10, EXTI15_10, 56) -IRQ(on_rtc_alarm, RTC_ALARM, 57) -IRQ(on_dfsdm1_flt3, DFSDM1_FLT3, 58) -IRQ(on_tim8_brk, TIM8_BRK, 59) -IRQ(on_tim8_up, TIM8_UP, 60) -IRQ(on_tim8_trg_com, TIM8_TRG_COM, 61) -IRQ(on_tim8_cc, TIM8_CC, 62) -IRQ(on_adc3, ADC3, 63) -IRQ(on_fmc, FMC, 64) -IRQ(on_sdmmc1, SDMMC1, 65) -IRQ(on_tim5, TIM5, 66) -IRQ(on_spi3, SPI3, 67) -IRQ(on_uart4, UART4, 68) -IRQ(on_uart5, UART5, 69) -IRQ(on_tim6_dacunder, TIM6_DACUNDER, 70) -IRQ(on_tim7, TIM7, 71) -IRQ(on_dma2_channel1, DMA2_CHANNEL1_IRQ, 72) -IRQ(on_dma2_channel2, DMA2_CHANNEL2_IRQ, 73) -IRQ(on_dma2_channel3, DMA2_CHANNEL3_IRQ, 74) -IRQ(on_dma2_channel4, DMA2_CHANNEL4_IRQ, 75) -IRQ(on_dma2_channel5, DMA2_CHANNEL5_IRQ, 76) -IRQ(on_dfsdm1_flt0, DFSDM1_FLT0, 77) -IRQ(on_dfsdm1_flt1, DFSDM1_FLT1, 78) -IRQ(on_dfsdm1_flt2, DFSDM1_FLT2, 79) -IRQ(on_comp, COMP, 80) -IRQ(on_lptim1, LPTIM1, 81) -IRQ(on_lptim2, LPTIM2, 82) -IRQ(on_otg_fs, OTG_FS, 83) -IRQ(on_dma2_channel6, DMA2_CHANNEL6, 84) -IRQ(on_dma2_channel7, DMA2_CHANNEL7, 85) -IRQ(on_lpuart1, LPUART1, 86) -IRQ(on_quadspi, QUADSPI, 87) -IRQ(on_i2c3_ev, I2C3_EV, 88) -IRQ(on_i2c3_er, I2C3_ER, 89) -IRQ(on_sai1, SAI1, 90) -IRQ(on_sai2, SAI2, 91) -IRQ(on_swpmi1, SWPMI1, 92) -IRQ(on_tsc, TSC, 93) -IRQ(on_lcd, LCD, 94) -IRQ(on_aes, AES, 95) -IRQ(on_rng, RNG, 96) -IRQ(on_fpu, FPU, 97) -IRQ(on_hash, HASH, 98) -IRQ(on_i2c4_ev, I2C4_EV, 99) -IRQ(on_i2c4_er, I2C4_ER, 100) -IRQ(on_dcmi, DCMI, 101) -IRQ(on_can2_tx, CAN2_TX, 102) -IRQ(on_can2_rx0, CAN2_RX0, 103) -IRQ(on_can2_rx1, CAN2_RX1, 104) -IRQ(on_can2_sce, CAN2_SCE, 105) -IRQ(on_dma2d, DMA2D, 106) diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/nvic.h b/02-usart/include/arch/stm32l4xxx/peripherals/nvic.h deleted file mode 100644 index 1645a2d..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/nvic.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef NVIC_H_ -#define NVIC_H_ - -#include "arch.h" -#include "kern/common.h" - -typedef __IO struct { -#define nvic_intlinesnum (0x0F << 0) - uint32_t ict_r; /* Interrupt control type register. */ - - uint8_t reserved0[0xF8]; - - uint32_t ise_r[8]; - - uint8_t reserved1[0x60]; - - uint32_t ice_r[8]; - - uint8_t reserved2[0x60]; - - uint32_t isp_r[8]; - - uint8_t reserved3[0x60]; - - uint32_t icp_r[8]; - - uint8_t reserved4[0x60]; - - uint32_t iab_r[8]; - - uint8_t reserved5[0xE0]; - - uint32_t ip_r[60]; -} nvic_t; - -static_assert(offsetof(nvic_t, ise_r) == 0x00FC, "Offset check failed"); -static_assert(offsetof(nvic_t, ice_r) == 0x017C, "Offset check failed"); -static_assert(offsetof(nvic_t, isp_r) == 0x01FC, "Offset check failed"); -static_assert(offsetof(nvic_t, icp_r) == 0x027C, "Offset check failed"); -static_assert(offsetof(nvic_t, iab_r) == 0x02FC, "Offset check failed"); -static_assert(offsetof(nvic_t, ip_r) == 0x03FC, "Offset check failed"); - -#define NVIC (* (nvic_t*) NVIC_BASE) - - -#endif /* NVIC_H_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/rcc.h b/02-usart/include/arch/stm32l4xxx/peripherals/rcc.h deleted file mode 100644 index de7b568..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/rcc.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef H__RCC_ -#define H__RCC_ - -#include "arch.h" -#include "kern/common.h" -#include <stdint.h> - -typedef struct { - __IO uint32_t c_r; /* Clock control register. 0x00 */ - __IO uint32_t icsc_r; /* Internal clock srcs calibration register. 0x04 */ - __IO uint32_t cfg_r; /* clock confguration register. 0x08 */ - __IO uint32_t pllcfg_r; /* PLL Configuration register. 0x0c */ - __IO uint32_t pllsai1cfg_r; /* PLLSAI1 configuration register. 0x10 */ - - __IO uint32_t reserved_1; /* Not used. offset 0x14. */ - - __IO uint32_t cie_r; /* Clock interrupt enable register. 0x18 */ - __IO uint32_t cif_r; /* Clock interrupt flag regiseter. 0x1c */ - __IO uint32_t cic_r; /* Clock interrupt clear register. 0x20 */ - - __IO uint32_t reserved_2; /* Not used. offset 0x24. */ - - __IO uint32_t ahb1rst_r; /* AHB Peripheral 1 reset register. 0x28 */ - __IO uint32_t ahb2rst_r; /* AHB Peripheral 2 reset register. 0x2c */ - __IO uint32_t ahb3rst_r; /* AHB Peripheral 3 reset register. 0x30 */ - - __IO uint32_t reserved_3; /* Not used. offset 0x34. */ - -#define rcc_lptim1rst (1 << 31) // Low Power Timer 1 reset -#define rcc_opamprst (1 << 30) // OPAMP interface reset -#define rcc_dac1rst (1 << 29) // DAC1 interface reset -#define rcc_pwrrst (1 << 28) // Power interface reset -#define rcc_can2rst (1 << 26) // CAN2 reset (this bit is reserved for STM32L47x/L48x devices) -#define rcc_can1rst (1 << 25) // CAN1 reset -#define rcc_crsrst (1 << 24) // CRS reset (this bit is reserved for STM32L47x/L48x devices) -#define rcc_i2c3rst (1 << 23) // I2C3 reset -#define rcc_i2c2rst (1 << 22) // I2C2 reset -#define rcc_i2c1rst (1 << 21) // I2C1 reset -#define rcc_uart5rst (1 << 20) // UART5 reset -#define rcc_uart4rst (1 << 19) // UART4 reset -#define rcc_usart3rst (1 << 18) // USART3 reset -#define rcc_usart2rst (1 << 17) // USART2 reset -#define rcc_reserved (1 << 16) // must be kept at reset value. -#define rcc_spi3rst (1 << 15) // SPI3 reset -#define rcc_spi2rst (1 << 14) // SPI2 reset -#define rcc_lcdrst (1 << 9) // interface reset (this bit is reserved for STM32L471/L4x5 devices) -#define rcc_tim7rst (1 << 5) // timer reset -#define rcc_tim6rst (1 << 4) // timer reset -#define rcc_tim5rst (1 << 3) // timer reset -#define rcc_tim4rst (1 << 2) // timer reset -#define rcc_tim3rst (1 << 1) // timer reset -#define rcc_tim2rst (1 << 0) // timer reset - __IO uint32_t apb1rst1_r; /* APB Peripheral reset register 1. 0x38 */ - __IO uint32_t apb1rst2_r; /* APB Peripheral reset register 2. 0x3C */ - __IO uint32_t apb2rst_r; /* APB Peripheral reset register. 0x40 */ - - __IO uint32_t reserved_4; /* Not used. offset 0x44. */ - -#define rcc_dma1en (1 << 0) /* DMA1 clock enable. */ -#define rcc_dma2en (1 << 1) /* DMA2 clock enable. */ -#define rcc_flashen (1 << 8) /* Flash memory interface clock enable. */ -#define rcc_crcen (1 << 12) /* CRC clock enable. */ -#define rcc_tscen (1 << 16) /* Touch sensing controller clock enable. */ -#define rcc_dmad2en (1 << 17) /* DMA2D clock enabled. */ - __IO uint32_t ahb1en_r; /* AHB1 Peripheral enable register. 0x48 */ - -#define rcc_gpioen(port) (1 << (port)) -#define rcc_otgfsen (1 << 12) -#define rcc_adcen (1 << 13) -#define rcc_dcmien (1 << 14) -#define rcc_assen (1 << 16) -#define rcc_hashen (1 << 17) -#define rcc_rngen (1 << 18) - __IO uint32_t ahb2en_r; /* AHB2 Peripheral enable register. 0x4C */ - __IO uint32_t ahb3en_r; /* AHB3 Peripheral enable register. 0x50 */ - - __IO uint32_t reserved_5; /* Not used. offset 0x54. */ - - __IO uint32_t apb1en1_r; /* APB1 Peripheral enable register 1. 0x58 */ - __IO uint32_t apb1en2_r; /* APB1 Peripheral enable register 2. 0x5C */ - __IO uint32_t apb2en_r; /* APB2 Peripheral enable register. 0x60 */ - - __IO uint32_t reserved_6; /* Not used. offset 0x64. */ - - __IO uint32_t ahb1smen_r; /* 0x68 */ - __IO uint32_t ahb2smen_r; /* 0x6c */ - __IO uint32_t ahb3smen_r; /* 0x70 */ - - __IO uint32_t reserved_7; - - __IO uint32_t apb1smen_r1; /* 0x78 */ - __IO uint32_t apb1smen_r2; /* 0x7c */ - __IO uint32_t apb2smen_r; /* 0x80 */ - - __IO uint32_t reserved_8; - - __IO uint32_t ccip_r; /* 0x88 */ -} PACKED rcc_t; - -static_assert(offsetof(rcc_t, ccip_r) == 0x88, "Offset check failed."); - -#define RCC (*(__IO rcc_t*)RCC_BASE) - -/* Macros to operate on the RCC registers. */ - -/* Sets the HSE. rcc is the RCC to use, e is zero for off, non-zero for on. */ -#define set_hse(rcc, e) \ - do { \ - if (e) { \ - (rcc).c_r |= 1 << 16; \ - } else { \ - (rcc).c_r &= ~(1 << 16); \ - } \ - } while (0) - -/* Sets the HSI. rcc is the RCC to use, e is zero for off, non-zero for on. */ -#define set_hsi(rcc, e) \ - do { \ - if (e) { \ - (rcc).c_r |= 1 << 8; \ - } else { \ - (rcc).c_r &= ~(1 << 8); \ - } \ - } while (0) - -/* Checks to see if the hse is ready. */ -#define hse_ready(rcc) ((rcc).c_r & (1 << 17)) - -/* Checks to see if the hse is ready. */ -#define hsi_ready(rcc) ((rcc).c_r & (1 << 10)) - -#endif diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/spi.h b/02-usart/include/arch/stm32l4xxx/peripherals/spi.h deleted file mode 100644 index a39a0bb..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/spi.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef CORE_SPI_H_ -#define CORE_SPI_H_ - -#include "kern/common.h" -#include "arch.h" - -#define SPI1 (*((spi_t*)(SPI1_BASE))) -#define SPI3 (*((spi_t*)(SPI3_BASE))) - -typedef enum { - SPI_BAUD_FPCLK_DIV_2 = 0, - SPI_BAUD_FPCLK_DIV_4 = 1, - SPI_BAUD_FPCLK_DIV_8 = 2, - SPI_BAUD_FPCLK_DIV_16 = 3, - SPI_BAUD_FPCLK_DIV_32 = 4, - SPI_BAUD_FPCLK_DIV_64 = 5, - SPI_BAUD_FPCLK_DIV_128 = 6, - SPI_BAUD_FPCLK_DIV_256 = 7, -} spi_baud_rate_t; - -typedef enum { - SPI_DATA_SIZE_NOT_USED_0 = 0, - SPI_DATA_SIZE_NOT_USED_1 = 1, - SPI_DATA_SIZE_NOT_USED_2 = 2, - SPI_DATA_SIZE_4_BITS = 3, - SPI_DATA_SIZE_5_BITS = 4, - SPI_DATA_SIZE_6_BITS = 5, - SPI_DATA_SIZE_7_BITS = 6, - SPI_DATA_SIZE_8_BITS = 7, - SPI_DATA_SIZE_9_BITS = 8, - SPI_DATA_SIZE_10_BITS = 9, - SPI_DATA_SIZE_11_BITS = 10, - SPI_DATA_SIZE_12_BITS = 11, - SPI_DATA_SIZE_13_BITS = 12, - SPI_DATA_SIZE_14_BITS = 13, - SPI_DATA_SIZE_15_BITS = 14, - SPI_DATA_SIZE_16_BITS = 15, -} spi_data_size_t; - -typedef __IO struct { - /* spi control register. */ -#define spi_bidimode (1 << 15) /* Bidirectional data mode enable. */ -#define spi_bidioe (1 << 14) /* Output enable in bidirectional mode */ -#define spi_crcen (1 << 13) /* Hardware CRC calculation enable */ -#define spi_crcnext (1 << 12) /* Transmit CRC next */ -#define spi_crcl (1 << 11) /* CRC length */ -#define spi_rxonly (1 << 10) /* Receive only mode enabled. */ -#define spi_ssm (1 << 9) /* Software slave management */ -#define spi_ssi (1 << 8) /* Internal slave select */ -#define spi_lsbfirst (1 << 7) /* Frame format */ -#define spi_spe (1 << 6) /* SPI enable */ -#define spi_br (7 << 3) /* SPI enable */ -#define spi_mstr (1 << 2) /* Master selection */ -#define spi_cpol (1 << 1) /* Clock polarity */ -#define spi_cpha (1 << 0) /* Clock phase */ - uint32_t c_r1; - - /* spi control register #2 */ -#define spi_ldma_tx (1 << 14) /* Last DMA transfer for transmission */ -#define spi_ldma_rx (1 << 13) /* Last DMA transfer for reception */ -#define spi_frxth (1 << 12) /* FIFO reception threshold */ -#define spi_ds (0xF << 8) /* Data size */ -#define spi_txeie (1 << 7) /* Tx buffer empty interrupt enable */ -#define spi_rxneie (1 << 6) /* RX buffer not empty interrupt enable */ -#define spi_errie (1 << 5) /* Error interrupt enable */ -#define spi_frf (1 << 4) /* Frame format */ -#define spi_nssp (1 << 3) /*: NSS pulse management */ -#define spi_ssoe (1 << 2) /* SS output enable */ -#define spi_txdmaen (1 << 1) /* Tx buffer DMA enable */ -#define spi_rxdmaen (1 << 0) /* Rx buffer DMA enable */ - uint32_t c_r2; - - /* spi status register. */ -#define spi_ftlvl (3 << 11) /* Transmisison level */ -#define spi_frlvl (3 << 9) /* Reception level */ -#define spi_fre (1 << 8) /* Frame format error */ -#define spi_bsy (1 << 7) /* Busy flag */ -#define spi_ovr (1 << 6) /* Overrun flag */ -#define spi_modf (1 << 5) /* Mode fault */ -#define spi_crcerr (1 << 4) /* CRC error flag */ -#define spi_txe (1 << 1) /* Transmit buffer empty */ -#define spi_rxne (1 << 0) /* Receive buffer not empty */ - uint32_t s_r; - - /* spi data register. Really only the least-significant 16 bits are used. - * reading from this register reads from the Rx FIFO while writing to it - * writes to the Tx FIFO. */ - __IO uint32_t d_r; - - /* spi CRC polynomial register. */ - uint32_t crcp_r; - - /* spi rx CRC register. */ - uint32_t rxcrc_r; - - /* spi tx CRC register. */ - uint32_t txcrc_r; -} spi_t; - -static_assert(offsetof(spi_t, txcrc_r) == 0x18, "Offset check failed."); - -#endif /* CORE_SPI_H_ */ diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/system.h b/02-usart/include/arch/stm32l4xxx/peripherals/system.h deleted file mode 100644 index b6ff0a6..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/system.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef CORE_SYSTEM_H_ -#define CORE_SYSTEM_H_ - -#include <stdint.h> -#include "kern/common.h" - -typedef __IO struct { - uint32_t actl_r; /* Auxiliary Control Register, ACTLR on page 4-5 */ - - uint32_t reserved0; - -#define scb_enable (1 << 0) -#define scb_tickint (1 << 1) -#define scb_clksource (1 << 2) -#define scb_countflag (1 << 16) - uint32_t stcs_r; /* SysTick Control and Status Register */ - - uint32_t strv_r; /* SysTick Reload Value Register */ - uint32_t stcv_r; /* SysTick Current Value Register */ - uint32_t stc_r; /* SysTick Calibration Value Register */ - - uint8_t reserved1[3296]; - - uint32_t cpuid; /* CPUID Base Register, CPUID on page 4-5 */ - uint32_t ics_r; /* RO 0x00000000 Interrupt Control and State Register */ - uint32_t vto_r; /* Vector Table Offset Register */ - uint32_t airc_r; /* Application Interrupt and Reset Control Register */ - uint32_t sc_r; /* System Control Register */ - uint32_t cc_r; /* Configuration and Control Register. */ - uint32_t shp_r1; /* System Handler Priority Register 1 */ - uint32_t shp_r2; /* System Handler Priority Register 2 */ - uint32_t shp_r3; /* System Handler Priority Register 3 */ - uint32_t shcs_r; /* System Handler Control and State Register */ - uint32_t cfs_r; /* Configurable Fault Status Registers */ - uint32_t hfs_r; /* HardFault Status register */ - uint32_t dfs_r; /* Debug Fault Status Register */ - uint32_t mmfa_r; /* MemManage Address Registerb */ - uint32_t bfa_r; /* BusFault Address Registerb */ - uint32_t afs_r; /* Auxiliary Fault Status Register, AFSR on page 4-6 */ - uint32_t id_pf_r0; /* Processor Feature Register 0 */ - uint32_t id_pf_r1; /* Processor Feature Register 1 */ - uint32_t id_df_r0; /* Debug Features Register 0 */ - uint32_t id_af_r0; /* Auxiliary Features Register 0 */ - uint32_t id_mmf_r0; /* Memory Model Feature Register 0 */ - uint32_t id_mmf_r1; /* 0x00000000 Memory Model Feature Register 1 */ - uint32_t id_mmf_r2; /* Memory Model Feature Register 2 */ - uint32_t id_mmf_r3; /* Memory Model Feature Register 3 */ - uint32_t id_isa_r0; /* Instruction Set Attributes Register 0 */ - uint32_t id_isa_r1; /* Instruction Set Attributes Register 1 */ - uint32_t id_isa_r2; /* Instruction Set Attributes Register 2 */ - uint32_t id_isa_r3; /* Instruction Set Attributes Register 3 */ - uint32_t id_isa_r4; /* Instruction Set Attributes Register 4 */ - - uint8_t reserved2[20]; - - uint32_t cpac_r; /* Coprocessor Access Control Register */ - - uint8_t reserved3[372]; - - uint32_t sti_r; /* Software Triggered Interrupt Register */ -} system_control_block_t; - -#define ARM_SYSCFG_BASE 0xE000E008 -#define CHECK_OFFSET(member, expected) \ - static_assert(ARM_SYSCFG_BASE + offsetof(system_control_block_t, member) == expected, \ - "Offset check failed") - -CHECK_OFFSET(stcs_r, 0xE000E010); -CHECK_OFFSET(cpuid, 0xE000ED00); -CHECK_OFFSET(cpac_r, 0xE000ED88); -CHECK_OFFSET(id_mmf_r3, 0xE000ED5C); -CHECK_OFFSET(sti_r, 0xE000EF00); - -#define SCB (*(system_control_block_t*)SYSTEM_CONFIG_BLOCK_BASE) - -#endif diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc b/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc deleted file mode 100644 index 66d347c..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc +++ /dev/null @@ -1,100 +0,0 @@ -AFN(CAN1_RX, 9, PA11) -AFN(CAN1_TX, 9, PA12) -AFN(COMP1_OUT, 12, PA0, 12, PB0, 6, PA11, 6, PA6) -AFN(COMP2_OUT, 12, PA2, 12, PA7, 12, PB5) -AFN(I2C1_SCL, 4, PA9, 4, PB6) -AFN(I2C1_SDA, 4, PA10, 4, PB7) -AFN(I2C1_SMBA, 4, PA14, 4, PA1, 4, PB5) -AFN(I2C3_SCL, 4, PA7) -AFN(I2C3_SDA, 4, PB4) -AFN(IR_OUT, 1, PA13) -AFN(JTCK_SWCLK, 0, PA14) -AFN(JTDI, 0, PA15) -AFN(JTDO_TRACESWO, 0, PB3) -AFN(JTMS_SWDIO, 0, PA13) -AFN(LPTIM1_ETR, 1, PB6) -AFN(LPTIM1_IN1, 1, PB5) -AFN(LPTIM1_IN2, 1, PB7) -AFN(LPTIM1_OUT, 1, PA14) -AFN(LPTIM2_ETR, 14, PA5) -AFN(LPTIM2_IN1, 14, PB1) -AFN(LPTIM2_OUT, 14, PA4, 14, PA8) -AFN(LPUART1_CTS, 8, PA6) -AFN(LPUART1_RTS_DE, 8, PB1) -AFN(LPUART1_RX, 8, PA3) -AFN(LPUART1_TX, 8, PA2) -AFN(MCO, 0, PA8) -AFN(NJTRST, 0, PB4) -AFN(QUADSPI_BK1_IO0, 10, PB1) -AFN(QUADSPI_BK1_IO1, 10, PB0) -AFN(QUADSPI_BK1_IO2, 10, PA7) -AFN(QUADSPI_BK1_IO3, 10, PA6) -AFN(QUADSPI_BK1_NCS, 10, PA2) -AFN(QUADSPI_CLK, 10, PA3) -AFN(SAI1_EXTCLK, 13, PA0, 13, PB0) -AFN(SAI1_FS_A, 13, PA9) -AFN(SAI1_FS_B, 13, PA14, 13, PA4, 13, PB6) -AFN(SAI1_MCLK_A, 13, PA3) -AFN(SAI1_MCLK_B, 13, PB4) -AFN(SAI1_SCK_A, 13, PA8) -AFN(SAI1_SCK_B, 13, PB3) -AFN(SAI1_SD_A, 13, PA10) -AFN(SAI1_SD_B, 13, PA13, 13, PB5) -AFN(SPI1_MISO, 5, PA11, 5, PA6, 5, PB4) -AFN(SPI1_MOSI, 5, PA12, 5, PA7, 5, PB5) -AFN(SPI1_NSS, 5, PA15, 5, PA4, 5, PB0) -AFN(SPI1_SCK, 5, PA1, 5, PA5, 5, PB3) -AFN(SPI3_MISO, 6, PB4) -AFN(SPI3_MOSI, 6, PB5) -AFN(SPI3_NSS, 6, PA15, 6, PA4) -AFN(SPI3_SCK, 6, PB3) -AFN(SWPMI1_IO, 12, PA8) -AFN(SWPMI1_RX, 12, PA14) -AFN(SWPMI1_SUSPEND, 12, PA15) -AFN(SWPMI1_TX, 12, PA13) -AFN(TIM15_BKIN, 14, PA9) -AFN(TIM15_CH1, 14, PA2) -AFN(TIM15_CH1N, 14, PA1) -AFN(TIM15_CH2, 14, PA3) -AFN(TIM16_BKIN, 14, PB5) -AFN(TIM16_CH1, 14, PA6) -AFN(TIM16_CH1N, 14, PB6) -AFN(TIM1_BKIN, 1, PA6) -AFN(TIM1_BKIN2, 2, PA11) -AFN(TIM1_BKIN2_COMP1, 12, PA11) -AFN(TIM1_BKIN_COMP2, 12, PA6) -AFN(TIM1_CH1, 1, PA8) -AFN(TIM1_CH1N, 1, PA7) -AFN(TIM1_CH2, 1, PA9) -AFN(TIM1_CH2N, 1, PB0) -AFN(TIM1_CH3, 1, PA10) -AFN(TIM1_CH3N, 1, PB1) -AFN(TIM1_CH4, 1, PA11) -AFN(TIM1_ETR, 1, PA12) -AFN(TIM2_CH1, 1, PA0, 1, PA15, 1, PA5) -AFN(TIM2_CH2, 1, PA1, 1, PB3) -AFN(TIM2_CH3, 1, PA2) -AFN(TIM2_CH4, 1, PA3) -AFN(TIM2_ETR, 14, PA0, 2, PA15, 2, PA5) -AFN(TSC_G2_IO1, 9, PB4) -AFN(TSC_G2_IO2, 9, PB5) -AFN(TSC_G2_IO3, 9, PB6) -AFN(TSC_G2_IO4, 9, PB7) -AFN(TSC_G3_IO1, 9, PA15) -AFN(USART1_CK, 7, PA8, 7, PB5) -AFN(USART1_CTS, 7, PA11, 7, PB4) -AFN(USART1_RTS_DE, 7, PA12, 7, PB3) -AFN(USART1_RX, 7, PA10, 7, PB7) -AFN(USART1_TX, 7, PA9, 7, PB6) -AFN(USART2_CK, 7, PA4) -AFN(USART2_CTS, 7, PA0) -AFN(USART2_RTS_DE, 7, PA1) -AFN(USART2_RX, 3, PA15, 7, PA3) -AFN(USART2_TX, 7, PA2) -AFN(USART3_CK, 7, PB0) -AFN(USART3_CTS, 7, PA6) -AFN(USART3_RTS_DE, 7, PA15, 7, PB1) -AFN(USB_CRS_SYNC, 10, PA10) -AFN(USB_DM, 10, PA11) -AFN(USB_DP, 10, PA12) -AFN(USB_NOE, 10, PA13) diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc b/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc deleted file mode 100644 index 21c7234..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc +++ /dev/null @@ -1,26 +0,0 @@ -PORT(A, 0) -PORT(A, 1) -PORT(A, 2) -PORT(A, 3) -PORT(A, 4) -PORT(A, 5) -PORT(A, 6) -PORT(A, 7) -PORT(A, 8) -PORT(A, 9) -PORT(A, 10) -PORT(A, 11) -PORT(A, 12) -PORT(A, 13) -PORT(A, 14) -PORT(A, 15) -PORT(B, 0) -PORT(B, 1) -PORT(B, 3) -PORT(B, 4) -PORT(B, 5) -PORT(B, 6) -PORT(B, 7) -PORT(C, 14) -PORT(C, 15) -PORT(H, 3) diff --git a/02-usart/include/arch/stm32l4xxx/peripherals/usart.h b/02-usart/include/arch/stm32l4xxx/peripherals/usart.h deleted file mode 100644 index a1542f4..0000000 --- a/02-usart/include/arch/stm32l4xxx/peripherals/usart.h +++ /dev/null @@ -1,204 +0,0 @@ -#ifndef H__USART_ -#define H__USART_ - -#include <arch.h> -#include <stdint.h> -#include <stdarg.h> - -#include "kern/common.h" -#include "arch/stm32l4xxx/peripherals/rcc.h" -#include <assert.h> - -#define USART1 (* (usart_t*) USART1_BASE) -#define USART2 (* (usart_t*) USART2_BASE) - -/* - * Possible USART clock sources. - */ -typedef enum { - USART_CLK_SRC_PLK = 0, /* Clock derived from the SysClk. */ - USART_CLK_SRC_SYSCLK = 1, /* System clock. */ - USART_CLK_SRC_HSI16 = 2, /* 16MHz oscillator. */ - USART_CLK_SRC_LSE = 3 /* Low power 32kHz clock. */ -} usart_clk_src_t; - -typedef struct { - /* USART configuration registers 0x04 - 0x0c. */ -#define usart_ue (1 << 0) /* UART enable */ -#define usart_uesm (1 << 1) /* UART enabled in stop mode. */ -#define usart_re (1 << 2) /* reciever enabled. */ -#define usart_te (1 << 3) /* transmitter enabled. */ -#define usart_idleie (1 << 4) /* Idle interrupt enabled. */ -#define usart_rxneie (1 << 5) /* RXNEIE RXNE interrupt enable. */ -#define usart_tcie (1 << 6) -#define usart_txeie (1 << 7) -#define usart_peie (1 << 8) -#define usart_ps (1 << 9) -#define usart_pce (1 << 10) -#define usart_wake (1 << 11) -#define usart_m0 (1 << 12) -#define usart_mme (1 << 13) -#define usart_cmie (1 << 14) -#define usart_over8 (1 << 15) -#define usart_dedt (0xF << 16) -#define usart_deat (0xF << 21) -#define usart_rtoie (1 << 26) -#define usart_eobie (1 << 27) -#define usart_m1 (1 << 28) - __IO uint32_t c_r1; - __IO uint32_t c_r2; - - -#define usart_eie (1 << 0) // Error interrupt enable. -#define usart_iren (1 << 1) // IrDA mode enabled -#define usart_irlp (1 << 2) // IrDA low power -#define usart_hdsel (1 << 3) // Half duplex selection -#define usart_nack (1 << 4) // Smartcard NACK enable -#define usart_scen (1 << 5) // Smartocard mode enable -#define usart_dmar (1 << 6) // DMA enable reciever -#define usart_dmat (1 << 7) // DMA enable transmitter -#define usart_rtse (1 << 8) // RTS enable -#define usart_ctse (1 << 9) // CTS enable -#define usart_ctsie (1 << 10) // CTS interrupt enable -#define usart_onebit (1 << 11) // One sample bit method enable -#define usart_ovrdis (1 << 12) // Overrun disable -#define usart_ddre (1 << 13) // DMA Disable on reception error -#define usart_dem (1 << 14) // Driver enable mode -#define usart_dep (1 << 15) // Driver enable polarity selection -#define usart_scarcnt0 (1 << 17) -#define usart_scarcnt1 (1 << 18) -#define usart_scarcnt2 (1 << 19) -#define usart_wus0 (1 << 20) // Wakeup from STOP mode interrept flag selection -#define usart_wus1 (1 << 21) // Wakeup from STOP mode interrept flag selection -#define usart_wufie (1 << 22) // Wakeup from STOP mode interrup enable -#define usart_ucesm (1 << 23) // USART clock enable in STOP mode. -#define usart_tcbgtie (1 << 24) // Transmission complete before guard time interrupt - __IO uint32_t c_r3; - - /* USART baud rate register. */ - uint32_t br_r; - uint32_t gtp_r; - uint32_t rto_r; - uint32_t rq_r; - - /* USART ISR register. Offset = 0x1c*/ -#define usart_pe (1 << 0) // Parity error -#define usart_fe (1 << 1) // Framing error -#define usart_nf (1 << 2) // START bit noise detection flag. -#define usart_ore (1 << 3) // Overrun error -#define usart_dlie (1 << 4) // Idle line detected -#define usart_rxne (1 << 5) // Read data register not empty -#define usart_tc (1 << 6) // Transmission complete -#define usart_txe (1 << 7) // Transmit data register empty -#define usart_lbdf (1 << 8) // LIN break detection flag -#define usart_ctsif (1 << 9) // CTS interrupt flag -#define usart_cts (1 << 10) // CTS flag. -#define usart_rtof (1 << 11) // Receiever timeout -#define usart_eobf (1 << 12) // End of block flag -#define usart_abre (1 << 14) // Auto baud rate error -#define usart_abrf (1 << 15) // Auto baud rate flag -#define usart_busy (1 << 16) // Busy flag -#define usart_cmf (1 << 17) // Character match flag -#define usart_sbkf (1 << 18) // send break flag -#define usart_rwu (1 << 19) // receiver wakeup frlom mute mode. -#define usart_wuf (1 << 20) // Wakeup from stop mode flag -#define usart_teack (1 << 21) // Transmit enable acknowledge flag. -#define usart_reack (1 << 22) // Receieve enable acknowledge flag. -#define usart_tcbgt (1 << 25) // Transmission completer before guard time completion. - __IO uint32_t is_r; /* Interrupt service register. */ - -#define usart_pecf (1 << 0) // Parity error clear flag -#define usart_fecf (1 << 1) // Framing error clear flag -#define usart_ncf (1 << 2) // Noise detected clear flag -#define usart_orecf (1 << 3) // Overrun error clear flag -#define usart_idlecf (1 << 4) // Idle line detected clear flag -#define usart_tccf (1 << 6) // Transmission complete clear flag -#define usart_tcbgtcf (1 << 7) // Transmission completed before guard time clear flag -#define usart_lbdcf (1 << 8) // LIN break detection clear flag -#define usart_ctscf (1 << 9) // CTS clear flag -#define usart_rtocf (1 << 11) // Receiver timeout clear flag -#define usart_eobcf (1 << 12) // End of block clear flag -#define usart_cmcf (1 << 17) // Character match clear flag -#define usart_wucf (1 << 20) // Wakeup from Stop mode clear flag. - __IO uint32_t ic_r; - uint32_t rd_r; - uint32_t td_r; -} usart_t; - -static_assert(offsetof(usart_t, ic_r) == 0x20, "Offset assertion failed."); -static_assert(offsetof(usart_t, rd_r) == 0x24, "Offset assertion failed."); - -typedef enum { - OVERSAMPLE_8, - OVERSAMPLE_16 -} oversampling_mode_t; - -static inline void usart_set_divisor( - __IO usart_t* usart, - uint32_t usartdiv) -{ - if (usart->c_r1 & (1 << 15)) { - /* OVER8 is set. */ - usart->br_r = - (usartdiv & ~7) | - ((usartdiv & 7) >> 1); - } else { - /* OVER8 is not set. */ - usart->br_r = usartdiv; - } -} - -static inline void usart_set_oversampling_mode( - __IO usart_t* usart, - oversampling_mode_t mode) -{ - if (mode == OVERSAMPLE_8) { - usart->c_r1 |= 1 << 15; - } else { - usart->c_r1 &= ~(1 << 15); - } -} - -typedef enum { - USART_PARITY_DISABLED = 0, - USART_PARITY_EVEN = 2 << 9, - USART_PARITY_ODD = 3 << 9, -} usart_parity_t; - -typedef enum { - USART_ENABLE_TX = 0x02, - USART_ENABLE_RX = 0x01, - USART_ENABLE_DISABLED = 0x00, -} usart_enable_t; - -void usart_set_parity(__IO usart_t* usart, usart_parity_t parity); - -void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled); - -void usart_enable_dma(__IO usart_t* usart, usart_enable_t enabled); - -/* - * Send a byte on the usart, This command blocks until the data - * is fully sent. - */ -void usart_transmit_byte_sync(__IO usart_t* usart, uint8_t byte); - -void set_usart1_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src); - -void set_usart1_clock_enabled(__IO rcc_t* rcc, bool enable); - -void set_usart2_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src); - -void set_usart2_clock_enabled(__IO rcc_t* rcc, bool enable); - -void usart_transmit_bytes_sync( - __IO usart_t* usart, const uint8_t* bytes, uint32_t n); - -void usart_transmit_str_sync(__IO usart_t* usart, const char* str); - -void usart_printf(__IO usart_t* usart, const char* fmt, ...); - -void usart_vprintf(__IO usart_t* usart, const char* fmt, va_list l); - - -#endif /* H__USART_ */ diff --git a/02-usart/include/arch/x86_64/arch.h b/02-usart/include/arch/x86_64/arch.h deleted file mode 100644 index c17721d..0000000 --- a/02-usart/include/arch/x86_64/arch.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ARCH_H_ -#define ARCH_H_ - -#include "fake_env.h" - -#define ARCH_PC -#define enable_all_interrupts() do {} while(0) - -#define RCC_BASE (load_fake_rcc__()) - -#define DMA1_BASE (load_fake_ahb1__() + 0x0) -#define DMA2_BASE (load_fake_ahb1__() + 0x400) - -#define USART1_BASE (load_fake_apb2__() + 0x3800) -#define USART2_BASE (load_fake_apb1__() + 0x4400) - -#define GPIOA_BASE (load_fake_ahb2__() + 0x0) -#define GPIOB_BASE (load_fake_ahb2__() + 0x400) -#define GPIOC_BASE (load_fake_ahb2__() + 0x800) -#define GPIOH_BASE (load_fake_ahb2__() + 0x1C00) - -#define SRAM1_BASE (load_fake_sram1__() + 0x0) -#define SRAM2_BASE (load_fake_sram2__() + 0x0) - -#define SYSTEM_CONFIG_BLOCK_BASE (load_fake_scb__()) -#define NVIC_BASE (load_fake_nvic__()) - -#define SPI1_BASE (load_fake_spi1__()) -#define SPI3_BASE (load_fake_spi3__()) - -// Pretend there's a data segement at the start of SRAM1 for more accurate -// testing. -#define GHOST_DATA_SEGMENT_SIZE 1234 -#define DATA_SEGMENT_START (*((uint8_t*)SRAM1_BASE)) -#define DATA_SEGMENT_STOP (*(((uint8_t*)SRAM1_BASE) + GHOST_DATA_SEGMENT_SIZE)) - -#endif /* ARCH_H_ */ diff --git a/02-usart/include/kern/common.h b/02-usart/include/kern/common.h deleted file mode 100644 index 653279e..0000000 --- a/02-usart/include/kern/common.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef COMMON__H -#define COMMON__H - -#include <stdint.h> -#include <stddef.h> -#include <assert.h> - -#define WEAK __attribute__((weak)) -#define NORETURN __attribute__((noreturn)) - -#ifndef static_assert -#define static_assert(a, b) -#endif - -/* Define __IO to be volatile if it's not already. */ -#ifndef __IO -#define __IO volatile -#endif - -#define CTZ(n) __builtin_ctz(n) - -#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__) - -#define ptr2reg(ptr) \ - ((uint32_t) (ptrdiff_t) (ptr)) - -typedef __IO uint32_t bits_t; - -#define regset(reg, mask, val) \ - ((reg) = ((reg) & ~mask) | (val << CTZ(mask))) - -#define regget(reg, mask) \ - (((reg) & mask) >> (CTZ(mask))) - -#endif /* COMMON_H */ 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/include/kern/dma/dma_manager.h b/02-usart/include/kern/dma/dma_manager.h deleted file mode 100644 index 0d17bd5..0000000 --- a/02-usart/include/kern/dma/dma_manager.h +++ /dev/null @@ -1,279 +0,0 @@ -#ifndef PERI_DMA_H_ -#define PERI_DMA_H_ - -#include "kern/common.h" -#include "arch/stm32l4xxx/peripherals/dma.h" /* Access to the DMA registers. */ -#include "arch/stm32l4xxx/peripherals/irq.h" - -#define DMA_ERROR_CHANNEL_IN_USE 1 - -#define CAT2(x, y) x ## y -#define CAT1(v, c) CAT2(v, c) -#define DMA_RESERVED(dma) CAT1(dma ## _PERIPH_RESERVED, __COUNTER__) - -#define ALTERNATE0 0x0000 -#define ALTERNATE1 0x0100 -#define ALTERNATE2 0x0200 -#define ALTERNATE3 0x0300 - -#define DMA_N_CHANNELS 7 -typedef enum { - DMA1_PERIPH_ADC1 = 0, - DMA1_PERIPH_ADC2 = 1, - DMA1_PERIPH_ADC3 = 2, - DMA1_PERIPH_DFSDM1_FLT0 = 3, - DMA1_PERIPH_DFSDM1_FLT1 = 4, - DMA1_PERIPH_DFSDM1_FLT2 = 5, - DMA1_PERIPH_DFSDM1_FLT3 = 6, - - DMA_RESERVED(DMA1) = 7, - DMA1_PERIPH_SPI1_RX = 8, - DMA1_PERIPH_SPI1_TX = 9, - DMA1_PERIPH_SPI2_RX = 10, - DMA1_PERIPH_SPI2_TX = 11, - DMA1_PERIPH_SAI2_A = 12, - DMA1_PERIPH_SAI2_B = 13, - - DMA_RESERVED(DMA1) = 14, - DMA1_PERIPH_USART3_TX = 15, - DMA1_PERIPH_USART3_RX = 16, - DMA1_PERIPH_USART1_TX = 17, - DMA1_PERIPH_USART1_RX = 18, - DMA1_PERIPH_USART2_RX = 19, - DMA1_PERIPH_USART2_TX = 20, - - DMA_RESERVED(DMA1) = 21, - DMA1_PERIPH_I2C3_TX = 22, - DMA1_PERIPH_I2C3_RX = 23, - DMA1_PERIPH_I2C2_TX = 24, - DMA1_PERIPH_I2C2_RX = 25, - DMA1_PERIPH_I2C1_TX = 26, - DMA1_PERIPH_I2C1_RX = 27, - - DMA1_PERIPH_TIM2_CH3 = 28, - DMA1_PERIPH_TIM2_UP = 29, - DMA1_PERIPH_TIM16_CH1_1 = 30 | ALTERNATE0, - DMA1_PERIPH_TIM16_UP_1 = 30 | ALTERNATE1, /* Same as TIM16_CH1. */ - DMA_RESERVED(DMA1) = 31, - DMA1_PERIPH_TIM2_CH1 = 32, - DMA1_PERIPH_TIM16_CH1_2 = 33, - DMA1_PERIPH_TIM16_UP_2 = 33 | ALTERNATE1, /* Same as TIM16_CH1. */ - DMA1_PERIPH_TIM2_CH2 = 34, - DMA1_PERIPH_TIM2_CH4 = 34 | ALTERNATE1, /* Same as TIM2_CH2. */ - - - DMA1_PERIPH_TIM17_CH1_1 = 35, - DMA1_PERIPH_TIM17_UP_1 = 35 | ALTERNATE1, /* Same as TIM17_CH1 */ - DMA1_PERIPH_TIM3_CH3 = 36, - DMA1_PERIPH_TIM3_CH4 = 37, - DMA1_PERIPH_TIM3_UP = 37 | ALTERNATE1, /* Same as TIM3_CH4 */ - DMA1_PERIPH_TIM7_UP = 38, - DMA1_PERIPH_DAC_CH2 = 38 | ALTERNATE1, /* Same as TIM7_UP */ - DMA1_PERIPH_QUADSPI = 39, - DMA1_PERIPH_TIM3_CH1 = 40, - DMA1_PERIPH_TIM3_TRIG = 40 | ALTERNATE1, /* Same as TIM3_CH1 */ - DMA1_PERIPH_TIM17_CH1_2 = 41, - DMA1_PERIPH_TIM17_UP_2 = 41 | ALTERNATE1, /* Same as TIM17_CH1 */ - - DMA1_PERIPH_TIM4_CH1 = 42, - DMA_RESERVED(DMA1) = 43, - DMA1_PERIPH_TIM6_UP = 44, - DMA1_PERIPH_DAC_CH1 = 44 | ALTERNATE1, /* Same as TIM6_UP */ - DMA1_PERIPH_TIM4_CH2 = 45, - DMA1_PERIPH_TIM4_CH3 = 46, - DMA_RESERVED(DMA1) = 47, - DMA1_PERIPH_TIM4_UP = 48, - - DMA_DMA1_PERIHP_RESERVED5 = 49, - DMA1_PERIPH_TIM1_CH1 = 50, - DMA1_PERIPH_TIM1_CH2 = 51, - DMA1_PERIPH_TIM1_CH4 = 52, - DMA1_PERIPH_TIM1_TRIG = 52 | ALTERNATE1, /* Same as TIM1_TRIG */ - DMA1_PERIPH_TIM1_COM = 52 | ALTERNATE2, /* Same as TIM1_TRIG */ - DMA1_PERIPH_TIM15_CH1 = 53, - DMA1_PERIPH_TIM15_UP = 53 | ALTERNATE1, /* Same as TIM15_CH1 */ - DMA1_PERIPH_TIM15_TRIG = 53 | ALTERNATE2, /* Same as TIM15_CH1 */ - DMA1_PERIPH_TIM15_COM = 53 | ALTERNATE3, /* Same as TIM15_CH1 */ - DMA1_PERIPH_TIM1_UP = 54, - DMA1_PERIPH_TIM1_CH3 = 55, - - DMA2_DMA1_SWITCH__ = 56, - - DMA2_PERIPH_I2C4_RX = 56, - DMA2_PERIPH_I2C4_TX = 57, - DMA2_PERIPH_ADC1 = 58, - DMA2_PERIPH_ADC2 = 59, - DMA2_PERIPH_ADC3 = 60, - DMA2_PERIPH_DCMI_1 = 61, - DMA_RESERVED(DMA2) = 62, - - DMA2_PERIPH_SAI1_A_1 = 63, - DMA2_PERIPH_SAI1_B_1 = 64, - DMA2_PERIPH_SAI2_A = 65, - DMA2_PERIPH_SAI2_B = 66, - DMA_RESERVED(DMA2) = 67, - DMA2_PERIPH_SAI1_A_2 = 68, - DMA2_PERIPH_SAI1_B_2 = 69, - - DMA2_PERIPH_UART5_TX = 70, - DMA2_PERIPH_UART5_RX = 71, - DMA2_PERIPH_UART4_TX = 72, - DMA_RESERVED(DMA2) = 73, - DMA2_PERIPH_UART4_RX = 74, - DMA2_PERIPH_USART1_TX = 75, - DMA2_PERIPH_USART1_RX = 76, - - DMA2_PERIPH_SPI3_RX = 77, - DMA2_PERIPH_SPI3_TX = 78, - DMA_RESERVED(DMA2) = 79, - DMA2_PERIPH_TIM6_UP = 80, - DMA2_PERIPH_DAC_CH1 = 80 | ALTERNATE1, /* Same as TIM6_UP */ - DMA2_PERIPH_TIM7_UP = 81, - DMA2_PERIPH_DAC_CH2 = 81 | ALTERNATE1, /* Same as TIM7_UP */ - DMA_RESERVED(DMA2) = 82, - DMA2_PERIPH_QUADSPI = 83, - - DMA2_PERIPH_SWPMI1_RX = 84, - DMA2_PERIPH_SWPMI1_TX = 85, - DMA2_PERIPH_SPI1_RX = 86, - DMA2_PERIPH_SPI1_TX = 87, - DMA2_PERIPH_DCMI_2 = 88, - DMA2_PERIPH_LPUART1_TX = 89, - DMA2_PERIPH_LPUART1_RX = 90, - - - DMA2_PERIPH_TIM5_CH4 = 91, - DMA2_PERIPH_TIM5_TRIG = 91 | ALTERNATE1, /* Same as TIM5_CH4 */ - DMA2_PERIPH_TIM5_CH3 = 92, - DMA2_PERIPH_TIM5_UP = 92 | ALTERNATE1, /* Same as TIM5_CH3 */ - DMA_RESERVED(DMA2) = 93, - DMA2_PERIPH_TIM5_CH2 = 94, - DMA2_PERIPH_TIM5_CH1 = 95, - DMA2_PERIPH_I2C1_RX = 96, - DMA2_PERIPH_I2C1_TX = 97, - - DMA2_PERIPH_AES_IN_1 = 98, - DMA2_PERIPH_AES_OUT_1 = 99, - DMA2_PERIPH_AES_OUT_2 = 100, - DMA_RESERVED(DMA2) = 101, - DMA2_PERIPH_AES_IN_2 = 102, - DMA_RESERVED(DMA2) = 103, - DMA2_PERIPH_HASH_IN = 104, - - DMA2_PERIPH_TIM8_CH3 = 105, - DMA2_PERIPH_TIM8_UP = 105 | ALTERNATE1, /* Same as TIM8_CH3 */ - DMA2_PERIPH_TIM8_CH4 = 106, - DMA2_PERIPH_TIM8_TRIG = 106 | ALTERNATE1, /* Same as TIM8_CH4 */ - DMA2_PERIPH_TIM8_COM = 106 | ALTERNATE2, /* Same as TIM8_CH4 */ - DMA_RESERVED(DMA2) = 107, - DMA2_PERIPH_SDMMC1_1 = 108, - DMA2_PERIPH_SDMMC1_2 = 109, - DMA2_PERIPH_TIM8_CH1 = 110, - DMA2_PERIPH_TIM8_CH2 = 111, - - - DMA_PERIPH_SENTINEL, -} dma_peripheral_t; - - -/* Defines a DMA channel. */ -typedef struct { - uint8_t dma; /* 0 = DMA1, 1 = DMA2 */ - uint8_t chan; /* 0 - 6 */ -} dma_channel_t; - - -/* - * Defines a DMA channel allocated for memory-to-peripheral transfers. This - * structure is only nominally different from dma_channel_t in order to provide - * rudimentary type-checking. - */ -typedef struct { - dma_channel_t c_; -} dma_mem2p_channel_t; - -/* - * Defines a DMA channel allocated for peripheral-to-memory transfers. This - * structure is only nominally different from dma_channel_t in order to provide - * rudimentary type-checking. - */ -typedef struct { - dma_channel_t c_; -} dma_p2mem_channel_t; - -/* Defines a DMA channel allocated for mem2mem transfers. - * This structure is only nominally different from dma_channel_t - * in order to provide rudimentary type-checking. - */ -typedef struct { - dma_channel_t c_; -} dma_mem2mem_channel_t; - -#define DMA_CHAN_ERROR ((dma_channel_t) { .dma = 0xff, .chan = 0xff }) - -typedef struct { - bool transfer_complete_interrupt_enable; - bool half_transfer_interrupt_enable; - bool transfer_error_interrupt_enable; - - bool circular_mode; - bool peripheral_increment; - bool memory_increment; - - dma_size_t peripheral_block_size; - dma_size_t memory_block_size; - - dma_priority_level_t priority; -} dma_opts_t; - -#define DEFAULT_DMA_OPTS \ - ((dma_opts_t) { .memory_increment = 1, \ - .peripheral_increment = 0, \ - .transfer_complete_interrupt_enable = 0, \ - .half_transfer_interrupt_enable = 0, \ - .transfer_error_interrupt_enable = 0, \ - .circular_mode = 0, \ - .peripheral_block_size = DMA_SIZE_8_BITS, \ - .memory_block_size = DMA_SIZE_8_BITS, \ - .priority = DMA_PRIORITY_LEVEL_MEDIUM }) - -dma_p2mem_channel_t select_dma_channel_p2mem( - dma_peripheral_t peripheral, - dma_opts_t* opts_in, - int* error); - -dma_mem2p_channel_t select_dma_channel_mem2p( - dma_peripheral_t peripheral, - dma_opts_t* opts_in, - int* error); - -/* Returns a dma channel used for memory-to-memory transfers. - * - * channel - the channel this dma should use. The channel should - * be on the range [0-13]. The channels [0-6] refer to the 7 channels - * on DMA1, where channels [7-13] refer to the 7 channels on DMA2. - * - * If `channel` is -1, then the highest unused dma channel is selected. - */ -dma_mem2mem_channel_t select_dma_channel_mem2mem( - int channel, - dma_opts_t* opts, - int* error_out); - -void dma_mem2p_initiate_transfer( - dma_mem2p_channel_t chan, const void* from_loc, uint16_t nblocks); - -void dma_p2mem_initiate_transfer( - dma_p2mem_channel_t chan, void* to_loc, uint16_t nblocks); - -void dma_mem2mem_initiate_transfer( - dma_mem2mem_channel_t chan, - void* to_loc, - const void* from_loc, - uint16_t nblocks); - -void release_dma_channel(dma_channel_t chan); - -interrupt_t dma_channel_get_interrupt(dma_channel_t chan); - -#endif diff --git a/02-usart/include/kern/gpio/gpio_manager.h b/02-usart/include/kern/gpio/gpio_manager.h deleted file mode 100644 index 922a423..0000000 --- a/02-usart/include/kern/gpio/gpio_manager.h +++ /dev/null @@ -1,187 +0,0 @@ -#ifndef KERN_GPIO_GPIO_MANAGE_H_ -#define KERN_GPIO_GPIO_MANAGE_H_ - -#include "kern/common.h" -#include "arch/stm32l4xxx/peripherals/gpio.h" - -#define GPIO_ERROR_IN_USE 1 -#define GPIO_ERROR_INVALID_PIN_FOR_ALTERNATE_FUNCTION 2 -#define GPIO_ERROR_INVALID_PIN 3 - -typedef enum { -/* Creates vaules GPIO_PIN_<port><num> i.e. GPIO_PIN_A0 */ -#define PORT(p, pn) \ - GPIO_PIN_P ## p ## pn, -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" -#undef PORT - - N_GPIO_PINS -} gpio_pin_t; - -/* Alternate functions. */ -typedef enum { -#define AFN(fn, ...) \ - GPIO_ALTERNATE_FUNCTION_ ## fn, -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc" -#undef AFN - GPIO_ALTERNATE_FUNCTION_EVENTOUT, -} gpio_alternate_function_t; - -#define gpio_pin_for_alternate_function(af) ((af) / 16) -#define gpio_pin_out_of_range(pin) \ - ((pin) < 0 || (pin) >= N_GPIO_PINS) - -typedef enum { - GPIO_PORT_A, - GPIO_PORT_B, - GPIO_PORT_C, - GPIO_PORT_D, - GPIO_PORT_E, - GPIO_PORT_F, - GPIO_PORT_G, - GPIO_PORT_H, - GPIO_PORT_I, - - N_GPIO_PORTS, -} gpio_port_t; - -typedef enum { - GPIO_MODE_INPUT, - GPIO_MODE_OUTPUT, - GPIO_MODE_ALTERNATE, - GPIO_MODE_ANALOG -} gpio_mode_t; - -/* - * Enum defining the pin speeds that are possible. - */ -typedef enum { - SPEED_2MHZ = 0, - SPEED_10MHZ = 1, - SPEED_50MHZ = 3, -} gpio_speed_t; - -typedef enum { - GPIO_OUTPUT_TYPE_PUSH_PULL, - GPIO_OUTPUT_TYPE_OPEN_DRAIN -} gpio_output_type_t; - -typedef enum { - GPIO_OUTPUT_SPEED_LOW, - GPIO_OUTPUT_SPEED_MEDIUM, - GPIO_OUTPUT_SPEED_HIGH, - GPIO_OUTPUT_SPEED_VERY_HIGH, -} gpio_output_speed_t; - -typedef enum { - GPIO_PULL_DIR_NONE, - GPIO_PULL_DIR_UP, - GPIO_PULL_DIR_DOWN, -} gpio_pull_dir_t; - -/* Returns the appropriate gpio_port for the provided pin. */ -inline static gpio_port_t get_port_for_pin(gpio_pin_t pin) -{ - switch (pin) { -#define PORT(p, pn) \ - case GPIO_PIN_P ## p ## pn: return GPIO_PORT_ ## p; -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" -#undef PORT - case N_GPIO_PINS: return N_GPIO_PORTS; - } - - /* Should be unreachable. */ -} - -#define DEFAULT_GPIO_OPTS_OUTPUT \ - (gpio_pin_opts_t) { \ - .mode = GPIO_MODE_OUTPUT, \ - .pull_dir = GPIO_PULL_DIR_DOWN, \ - .output_opts.speed = GPIO_OUTPUT_SPEED_MEDIUM, \ - .output_opts.type = GPIO_OUTPUT_TYPE_PUSH_PULL, \ - } - -#define DEFAULT_GPIO_OPTS_INPUT \ - (gpio_pin_opts_t) { \ - .mode = GPIO_MODE_OUTPUT, \ - .pull_dir = GPIO_PULL_DIR_DOWN, \ - } - -typedef struct { - gpio_mode_t mode; - gpio_pull_dir_t pull_dir; - - union { - struct { - } input_opts; - - struct { - gpio_output_speed_t speed; - gpio_output_type_t type; - } output_opts; - - struct { - uint8_t function; - } alternate_opts; - - struct { - } analog_opts; - }; -} gpio_pin_opts_t; - -/* Differentiates at compile-time from the a gpio_pin_t enum value and a pin - * that's been reserved. */ -typedef struct { - gpio_pin_t v_; -} gpio_reserved_pin_t; - -/* Returns a pointer to the GPIO pin bus and offset. This is useful for when - * raw access to the values are needed. I.e. time critical applications. */ -void get_gpio_pin_port_off( - gpio_pin_t pin, gpio_port_config_t** out_cfg, int* out_off); - -/* Sets the given GPIO pin to high. */ -void set_gpio_pin_high(gpio_reserved_pin_t pin); - -/* Sets the given GPIO pin to low. */ -void set_gpio_pin_low(gpio_reserved_pin_t pin); - -/** returns true if a GPIO pin is in use. */ -bool gpio_pin_in_use(gpio_pin_t pin); - -/* - * Reserve the provided GPIO pin using the opts provided. - * - * sets error_out to GPIO_ERROR_IN_USE if the GPIO pin could not be reserved - * because it already has been reserved. - * - * The function will automatically enable the correct GPIO port bus. - */ -gpio_reserved_pin_t reserve_gpio_pin( - gpio_pin_t pin, gpio_pin_opts_t* opts, int* error_out); - -/* Enables and returns the pin reserved for the alternate function. - * - * If the `hint` parameter is defined (non -1) the manager will try - * to reserve that pin for the alternate function and fail if it can't. - * - * If `hint` is -1 then the first available pin for that alternate function - * will be reserved and returned. - * - * - */ -gpio_reserved_pin_t gpio_enable_alternate_function( - gpio_alternate_function_t fn, - gpio_pin_t hint, - int* error_out); - -/* - * Releases the GPIO pin so it can be reserved again in the future. - * - * The pin is reset during this process and if there are no more reserved pins - * on the corresponding port this function will disable the port. (last one out - * gets the lights.). - */ -void release_gpio_pin(gpio_reserved_pin_t gpio_pin); - -#endif /* KERN_GPIO_GPIO_MANAGE_H_ */ diff --git a/02-usart/include/kern/gpio/sysled.h b/02-usart/include/kern/gpio/sysled.h deleted file mode 100644 index b2c9056..0000000 --- a/02-usart/include/kern/gpio/sysled.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Headers for interacting and managing the system LED. - */ -#ifndef SYSLED_H_ -#define SYSLED_H_ - -#include "kern/gpio/gpio_manager.h" - -gpio_reserved_pin_t get_sysled(); - -#endif diff --git a/02-usart/include/kern/init.h b/02-usart/include/kern/init.h deleted file mode 100644 index 737b85f..0000000 --- a/02-usart/include/kern/init.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef INIT_H_ -#define INIT_H_ - -/** Globals annotated with _no_init will not be set during init1 bootup - * where the data segement is loaded from flash and the bss segment is - * cleared. - * - * This is useful for routines that run in the init0 boot procedure - * that need persistent globals. - * - * Note that initializing a global annotated with _no_init will have - * no effect as the variable will remain uninitialized until explicitly - * set by by the program. - */ -#define _no_init \ - __attribute((__section__(".noinit"))) - -#define init0 \ - static void init0fn(); \ - static __attribute((__section__(".init0"))) \ - __attribute((__used__)) \ - void(*init0_ptr)() = init0fn; \ - static void init0fn -#define init1 \ - static void init1fn(); \ - static __attribute((__section__(".init1"))) \ - __attribute((__used__)) \ - void(*init1_ptr)() = init1fn; \ - static void init1fn -#define init2 \ - static void init2fn(); \ - static __attribute((__section__(".init2"))) \ - __attribute((__used__)) \ - void(*init2_ptr)() = init2fn; \ - static void init2fn -#define init3 \ - static void init3fn(); \ - static __attribute((__section__(".init3"))) \ - __attribute((__used__)) \ - void(*init3_ptr)() = init3fn; \ - static void init3fn -#define init4 \ - static void init4fn(); \ - static __attribute((__section__(".init4"))) \ - __attribute((__used__)) \ - void(*init4_ptr)() = init4fn; \ - static void init4fn -#define init5 \ - static void init5fn(); \ - static __attribute((__section__(".init5"))) \ - __attribute((__used__)) \ - void(*init5_ptr)() = init5fn; \ - static void init5fn -#define init6 \ - static void init6fn(); \ - static __attribute((__section__(".init6"))) \ - __attribute((__used__)) \ - void(*init6_ptr)() = init6fn; \ - static void init6fn -#define init7 \ - static void init7fn(); \ - static __attribute((__section__(".init7"))) \ - __attribute((__used__)) \ - void(*init7_ptr)() = init7fn; \ - static void init7fn - -#endif /* INIT_H_ */ diff --git a/02-usart/include/kern/lib.h b/02-usart/include/kern/lib.h deleted file mode 100644 index be0e8e9..0000000 --- a/02-usart/include/kern/lib.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LIB_H_ -#define LIB_H_ - -#include <stdint.h> - -void hexify(uint32_t v, char* into); - -void decimalify(int v, char* into); - -#endif diff --git a/02-usart/include/kern/log.h b/02-usart/include/kern/log.h deleted file mode 100644 index 5e49def..0000000 --- a/02-usart/include/kern/log.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOG_H_ -#define LOG_H_ - -/* - * Defines logging capabilities. This logging unit will enable logging on - * the systems main USART output. - */ - -/** Similar to fprintf, but with a stripped-down format-string DSL. */ -void klogf(const char* fmt, ...); - -#endif diff --git a/02-usart/include/kern/mem.h b/02-usart/include/kern/mem.h deleted file mode 100644 index c0999f5..0000000 --- a/02-usart/include/kern/mem.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef MEM_H_ -#define MEM_H_ - -#include "arch.h" -#include <stddef.h> - -#define DATA_SEGMENT_STOP_ADDR ((uint8_t*) &DATA_SEGMENT_STOP) -#define DATA_SEGMENT_START_ADDR ((uint8_t*) &DATA_SEGMENT_START) - -#define MAX_HEAP_SIZE \ - ((16384 - (DATA_SEGMENT_STOP_ADDR - DATA_SEGMENT_START_ADDR)) / 4 * 4) - -/* allocates memory on the head, which is stored in sram2 */ -void* halloc(size_t n); - -/* Frees the memory allocated by halloc. */ -void hfree(void* mem); - -#ifdef FOR_TESTING - -void* debug_halloc_get_next_ptr(void* ptr); - -void* debug_halloc_get_prev_ptr(void* ptr); - -int debug_halloc_assert_consistency(char* error, size_t len); - -void debug_print_blocks(); - -#endif - - -#endif diff --git a/02-usart/include/kern/string.h b/02-usart/include/kern/string.h deleted file mode 100644 index 3c9f0b4..0000000 --- a/02-usart/include/kern/string.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef STRING_H_ -#define STRING_H_ - -void kstrcpy(char* into, const char* from); - -#endif /* STRING_H_ */ diff --git a/02-usart/linker/linker_script.ld b/02-usart/linker/linker_script.ld deleted file mode 100644 index 9a9f5b3..0000000 --- a/02-usart/linker/linker_script.ld +++ /dev/null @@ -1,55 +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 = .; - - INIT_ROUTINES_FLASH_START = - LOADADDR(.data) + (DATA_SEGMENT_STOP - DATA_SEGMENT_START); - - INITS_START = .; - *(.init0); - *(.init1); - *(.init2); - *(.init3); - *(.init4); - *(.init5); - *(.init6); - *(.init7); - INITS_END = .; - - INIT_ROUTINES_FLASH_STOP = - LOADADDR(.data) + (INITS_END - DATA_SEGMENT_START); - - /* Align by 4 so we can optimize the copier to use uint32's. */ - . = ALIGN(0x04); - - *(.noinit); - } >sram1 AT>flash - - BSS_START = .; - .bss : { - *(.bss); - . = ALIGN(0x04); - } > sram1 - BSS_END = .; -} diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/clock.c b/02-usart/src/arch/stm32l4xxx/peripherals/clock.c deleted file mode 100644 index 9051572..0000000 --- a/02-usart/src/arch/stm32l4xxx/peripherals/clock.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * This file sets the system clock to its full glory of 80Mhz - */ - -#include "arch/stm32l4xxx/peripherals/clock.h" -#include "arch/stm32l4xxx/peripherals/flash.h" - -#include "kern/init.h" - -#include <stdint.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; -} - -static _no_init uint8_t clock_mHz; -uint8_t get_clock_mhz() -{ - return clock_mHz; -} - -int set_system_clock_MHz(uint8_t mhz) -{ - clock_mHz = 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; - return 0; -} diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/irq.c b/02-usart/src/arch/stm32l4xxx/peripherals/irq.c deleted file mode 100644 index 364b9a7..0000000 --- a/02-usart/src/arch/stm32l4xxx/peripherals/irq.c +++ /dev/null @@ -1,96 +0,0 @@ -#include "arch/stm32l4xxx/peripherals/irq.h" -#include "arch/stm32l4xxx/peripherals/gpio.h" -#include "arch/stm32l4xxx/peripherals/nvic.h" - -#include "arch.h" -#include "kern/delay.h" -#include "kern/gpio/gpio_manager.h" - -#define IRQ_RESERVED(n) -#define IRQ(name, uname_, n) \ - void WEAK name () { \ - unhandled_isr(n); \ - } -#include "arch/stm32l4xxx/peripherals/isrs.inc" -#undef IRQ_RESERVED -#undef IRQ - -void isr_simple_pin_on() -{ - int ec; - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - gpio_reserved_pin_t pin3 = reserve_gpio_pin(GPIO_PIN_PB3, &opts, &ec); - - set_gpio_pin_high(pin3); -} - -#define IRQ_RESERVED(n) 0, -#define IRQ(name, uname_, n) name, -const void* vectors[] __attribute__((section(".vectors"))) = { - (void*)0x2000c000, /* Top of stack at top of sram1. 48k */ -#include "arch/stm32l4xxx/peripherals/isrs.inc" -}; -#undef IRQ_RESERVED -#undef IRQ - -/* Encodes the provided number as a series of flashes on the on-board - * LED. The flashes follow as such: - * - * Before the bits of the code are flashed, a rapid succession of 20 flashes - * followed by a pause will occur indicating that the next 8 flashes indicate - * the bits of the provided code. - * - * Eoch of the next eight flashes indicate either a 1 or 0 depending on the - * length of flash. The first flash is the least-significant bit, the next the - * second least, the third third least, etc. - * - * - A quick flash followed by a long pause indicates a 0 bit. - * - A "long" flash followed by a equally long pause indicates a 1 bit. - */ -void unhandled_isr(uint8_t number) -{ - int ec; - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - gpio_reserved_pin_t pin3 = reserve_gpio_pin(GPIO_PIN_PB3, &opts, &ec); - - for (;;) { - for (int i = 0; i < 20; ++ i) { - set_gpio_pin_high(pin3); - delay(1000000); - set_gpio_pin_low(pin3); - delay(1000000); - } - delay(50000000); - - int n = number; - for (int i = 0; i < 8; ++ i) { - if (n & 1) { - // LSB is a 1 - set_gpio_pin_high(pin3); - delay(15000000); - set_gpio_pin_low(pin3); - delay(15000000); - } else { - // LSB is a 0 - set_gpio_pin_high(pin3); - delay(1000000); - set_gpio_pin_low(pin3); - delay(29000000); - } - - n >>= 1; - } - } -} - -void enable_interrupts(interrupt_set_t* interrupts) -{ - for (int i = 0; i < sizeof(NVIC.ise_r) / sizeof(uint32_t); ++ i) - NVIC.ise_r[i] = interrupts->irqs[i]; -} - -void disable_interrupts(interrupt_set_t* interrupts) -{ - for (int i = 0; i < sizeof(NVIC.ise_r) / sizeof(uint32_t); ++ i) - NVIC.ice_r[i] = interrupts->irqs[i]; -} diff --git a/02-usart/src/arch/stm32l4xxx/peripherals/usart.c b/02-usart/src/arch/stm32l4xxx/peripherals/usart.c deleted file mode 100644 index 7309b48..0000000 --- a/02-usart/src/arch/stm32l4xxx/peripherals/usart.c +++ /dev/null @@ -1,152 +0,0 @@ -#include "arch/stm32l4xxx/peripherals/usart.h" -#include "kern/delay.h" -#include "kern/lib.h" -#include <stdarg.h> - -void set_usart1_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src) -{ - rcc->ccip_r = (rcc->ccip_r & (~0x03)) | usart_clk_src; -} - -void set_usart2_clock_src(__IO rcc_t* rcc, usart_clk_src_t usart_clk_src) -{ - rcc->ccip_r = (rcc->ccip_r & ~(0x03 << 2)) | (usart_clk_src << 2); -} - -void set_usart2_clock_enabled(__IO rcc_t* rcc, bool enable) -{ - if (enable) { - rcc->apb1en1_r |= BIT(17); - } else { - rcc->apb1en1_r &= ~BIT(17); - } -} - -void set_usart1_clock_enabled(__IO rcc_t* rcc, bool enable) -{ - if (enable) { - rcc->apb2en_r |= BIT(14); - } else { - rcc->apb2en_r &= ~BIT(14); - } -} - -void usart_set_parity(__IO usart_t* usart, usart_parity_t parity) -{ - uint32_t c_r1 = usart->c_r1; - c_r1 &= ~(0x3 << 9); - c_r1 |= parity; - usart->c_r1 = c_r1; -} - -void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled) -{ - if (!enabled) { - regset(usart->c_r1, usart_ue, 0); - } else { - /* Set the rx enabled. */ - regset(usart->c_r1, usart_re, !!(enabled & USART_ENABLE_RX)); - regset(usart->c_r1, usart_te, !!(enabled & USART_ENABLE_TX)); - regset(usart->c_r1, usart_ue, 1); - } -} - -void usart_transmit_byte_sync(__IO usart_t* usart, uint8_t byte) -{ - usart->td_r = byte; - /* Per the manual, when bit 7 of the IS register is set, then the usart - * data has been sent to the shift register. - * - * This bit is cleared by writing to the TD register. */ - while (!(usart->is_r & BIT(7))) - ; -} - -void usart_transmit_bytes_sync(__IO usart_t* usart, const uint8_t* bytes, uint32_t n) -{ - while (n --) { - usart_transmit_byte_sync(usart, *(bytes ++)); - } -} - -void usart_transmit_str_sync(__IO usart_t* usart, const char* str) -{ - while (*str) { - if (*str == '\n') { - usart_transmit_byte_sync(usart, '\r'); - } - usart_transmit_byte_sync(usart, *(str ++)); - } -} - -void usart_enable_dma(__IO usart_t* usart, usart_enable_t enabled) -{ - switch(enabled) { - case USART_ENABLE_DISABLED: - regset(usart->c_r3, usart_dmar, 0); - regset(usart->c_r3, usart_dmat, 0); - break; - - case USART_ENABLE_TX: - regset(usart->c_r3, usart_dmat, 1); - break; - - case USART_ENABLE_RX: - regset(usart->c_r3, usart_dmar, 1); - break; - }; -} - -void usart_vprintf(__IO usart_t* usart, const char* fmt, va_list l) -{ - union { - void* ptr; - char* str; - int i; - } b; - char buf[128]; - - while (*fmt != 0) { - if (*fmt == '%') { - switch (*(++fmt)) { - case 0: - goto end; - case '%': - usart_transmit_byte_sync(usart, '%'); - break; - case 'p': - b.ptr = va_arg(l, void*); - hexify(ptr2reg(b.ptr), buf); - usart_transmit_str_sync(usart, "0x"); - usart_transmit_str_sync(usart, buf); - break; - case 'd': - case 'i': - b.i = va_arg(l, int); - decimalify(b.i, buf); - usart_transmit_str_sync(usart, buf); - break; - case 's': - b.str = va_arg(l, char*); - usart_transmit_str_sync(usart, b.str); - } - ++ fmt; - } else { - if (*fmt == '\n') { - usart_transmit_byte_sync(usart, '\r'); - } - usart_transmit_byte_sync(usart, *(fmt ++)); - } - } - -end: - va_end(l); -} - -void usart_printf(__IO usart_t* usart, const char* fmt, ...) -{ - va_list l; - va_start(l, fmt); - - usart_vprintf(usart, fmt, l); -} diff --git a/02-usart/src/kern/delay.c b/02-usart/src/kern/delay.c deleted file mode 100644 index 28ef710..0000000 --- a/02-usart/src/kern/delay.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kern/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-usart/src/kern/dma/dma_manager.c b/02-usart/src/kern/dma/dma_manager.c deleted file mode 100644 index 00e9f3d..0000000 --- a/02-usart/src/kern/dma/dma_manager.c +++ /dev/null @@ -1,311 +0,0 @@ -#include "kern/dma/dma_manager.h" -#include "arch/stm32l4xxx/peripherals/dma.h" -#include "arch/stm32l4xxx/peripherals/usart.h" -#include "arch/stm32l4xxx/peripherals/rcc.h" - - -/* Bitmask of DMA2 channels in use. */ -static uint8_t dma_inuse[2]; - -static inline dma_t* get_dma(int dma) -{ - if (dma) { - return &DMA2; - } else { - return &DMA1; - } -} - -static dma_t* get_raw_dma(dma_channel_t chan) -{ - return get_dma(chan.dma); -} - -static dma_channel_config_t* get_raw_channel_config(dma_channel_t chan) -{ - dma_t* dma = get_raw_dma(chan); - return &dma->channel_config[chan.chan]; -} - -static uint32_t get_periph_location(dma_peripheral_t operipheral) -{ -#define CASE(p, n) case p: return ptr2reg(n); - switch (operipheral) { - CASE(DMA1_PERIPH_USART1_RX, &USART1.rd_r) - CASE(DMA1_PERIPH_USART1_TX, &USART1.td_r) - CASE(DMA1_PERIPH_USART2_RX, &USART2.rd_r) - CASE(DMA1_PERIPH_USART2_TX, &USART2.td_r) - - default: - return 0; - }; -#undef CASE -} - -static dma_channel_t allocate_dma_channel( - dma_peripheral_t operipheral, int* modesel) -{ - dma_peripheral_t peripheral = operipheral & 0xff; - int dmasel = peripheral >= DMA2_DMA1_SWITCH__; - if (dmasel) { - peripheral -= DMA2_DMA1_SWITCH__; - } - int chan = peripheral % DMA_N_CHANNELS; - - *modesel = peripheral / 7; - return (dma_channel_t) { - .dma = dmasel, - .chan = chan - }; -} - -/* - * Atomically reserves the DMA channel so other calls - * cannot erroneously reserve the same DMA channel. - * - * Returns 0 if this function was unable to reserve - * the channel. - */ -static int try_reserve_dma_channel( - dma_channel_t chan) -{ - int in_use = __sync_fetch_and_or( - &dma_inuse[chan.dma], 1 << chan.chan); - - return !(in_use & (1 << chan.chan)); -} - -void release_dma_channel(dma_channel_t chan) -{ - dma_channel_config_t* config = get_raw_channel_config(chan); - regset(config->cc_r, dma_cc_en, 0); /* Disable the register. */ - dma_inuse[chan.dma] &= ~(1 << chan.chan); /* Release the DMA. */ - - if (!dma_inuse[chan.dma]) { - /* Power-down the DMA if not in use. */ - if (chan.dma) { - regset(RCC.ahb1en_r, rcc_dma2en, 0); - } else { - regset(RCC.ahb1en_r, rcc_dma1en, 0); - } - } -} - -void configure_dma_channel( - dma_channel_t chan, - dma_peripheral_t operipheral, - dma_opts_t* opts, - dma_dir_t dir, - int selmode, - bool mem2mem, - int* error_out) -{ - if (chan.dma) { - regset(RCC.ahb1en_r, rcc_dma2en, 1); - } else { - regset(RCC.ahb1en_r, rcc_dma1en, 1); - } - - dma_t* dma = get_raw_dma(chan); - regset(dma->csel_r, 0xF << (4 * chan.chan), selmode); - dma_channel_config_t* config = - &dma->channel_config[chan.chan]; - - uint32_t reg = 0; - - regset(reg, dma_cc_dir, dir); - regset(reg, dma_cc_tcie, opts->transfer_complete_interrupt_enable); - regset(reg, dma_cc_htie, opts->half_transfer_interrupt_enable); - regset(reg, dma_cc_teie, opts->transfer_error_interrupt_enable); - regset(reg, dma_cc_circ, opts->circular_mode); - regset(reg, dma_cc_pinc, opts->peripheral_increment); - regset(reg, dma_cc_minc, opts->memory_increment); - regset(reg, dma_cc_psize, opts->peripheral_block_size); - regset(reg, dma_cc_msize, opts->memory_block_size); - regset(reg, dma_cc_pl, opts->priority); - regset(reg, dma_cc_mem2mem, mem2mem); - - config->cc_r = reg; - config->cpa_r = get_periph_location(operipheral); - - *error_out = 0; -} - -dma_mem2mem_channel_t select_dma_channel_mem2mem( - int channel, - dma_opts_t* opts, - int* error_out) -{ - -#define WRAP(c) ((dma_mem2mem_channel_t) { .c_ = c }) - // TODO this should probably be in a critical section. - dma_channel_t chan; - if (channel == -1) { - chan.dma = 1; - if ((dma_inuse[chan.dma] & 0x7F) == 0x7F) { - chan.dma = 0; - } - - if ((dma_inuse[chan.dma] & 0x7F) == 0x7F) { - *error_out = DMA_ERROR_CHANNEL_IN_USE; - return WRAP(DMA_CHAN_ERROR); - } - - uint8_t t = ~(dma_inuse[chan.dma] << 1); - chan.chan = 6 - (__builtin_clz(t) - 24); - } else { - if (channel < 7) { - chan.dma = 0; - chan.chan = channel; - } else { - chan.dma = 0; - chan.chan = channel - 7; - } - } - - if (!try_reserve_dma_channel(chan)) { - *error_out = DMA_ERROR_CHANNEL_IN_USE; - return WRAP(DMA_CHAN_ERROR); - } - - int ec = 0; - configure_dma_channel( - chan, - -1 /* No peripheral */, - opts, - READ_FROM_PERIPHERAL, - /* selmode = */ 0x8, - /* mem2mem = */ true, - &ec); - - if (ec) { - *error_out = ec; - return WRAP(DMA_CHAN_ERROR); - } - - *error_out = 0; - return WRAP(chan); -#undef WRAP -} - -dma_mem2p_channel_t select_dma_channel_mem2p( - dma_peripheral_t peripheral, - dma_opts_t* opts_in, - int* error_out) -{ -#define WRAP(c) ((dma_mem2p_channel_t) { .c_ = c }) - *error_out = 0; - - int modesel; - dma_channel_t ret = - allocate_dma_channel(peripheral, &modesel); - - if (!try_reserve_dma_channel(ret)) { - *error_out = DMA_ERROR_CHANNEL_IN_USE; - return WRAP(DMA_CHAN_ERROR); - } - - configure_dma_channel( - ret, - peripheral, - opts_in, - READ_FROM_MEMORY, - modesel, - /* mem2mem = */ false, - error_out); - - if (*error_out) { - return WRAP(DMA_CHAN_ERROR); - } - - *error_out = 0; - return WRAP(ret); -#undef WRAP -} - -dma_p2mem_channel_t select_dma_channel_p2mem( - dma_peripheral_t peripheral, - dma_opts_t* opts_in, - int* error_out) -{ -#define WRAP(c) ((dma_p2mem_channel_t) { .c_ = c }) - *error_out = 0; - - int modesel; - dma_channel_t ret = - allocate_dma_channel(peripheral, &modesel); - - if (!try_reserve_dma_channel(ret)) { - *error_out = DMA_ERROR_CHANNEL_IN_USE; - return WRAP(DMA_CHAN_ERROR); - } - - configure_dma_channel( - ret, - peripheral, - opts_in, - READ_FROM_PERIPHERAL, - modesel, - /* mem2mem = */ false, - error_out); - - if (*error_out) { - return WRAP(DMA_CHAN_ERROR); - } - - *error_out = 0; - return WRAP(ret); -#undef WRAP -} - - -void dma_mem2p_initiate_transfer( - dma_mem2p_channel_t chan, const void* from_loc, uint16_t nblocks) -{ - dma_channel_config_t* config = get_raw_channel_config(chan.c_); - config->cma_r = ptr2reg(from_loc); - config->cndt_r = nblocks; - - regset(config->cc_r, dma_cc_en, 1); -} - -void dma_mem2mem_initiate_transfer( - dma_mem2mem_channel_t chan, - void* to_loc, - const void* from_loc, - uint16_t nblocks) -{ - dma_channel_config_t* config = get_raw_channel_config(chan.c_); - config->cma_r = ptr2reg(to_loc); - config->cpa_r = ptr2reg(from_loc); - config->cndt_r = nblocks; - - regset(config->cc_r, dma_cc_en, 1); -} - -void dma_p2mem_initiate_transfer( - dma_p2mem_channel_t chan, void* to_loc, uint16_t nblocks) -{ - dma_channel_config_t* config = get_raw_channel_config(chan.c_); - - config->cma_r = ptr2reg(to_loc); - config->cndt_r = nblocks; - - regset(config->cc_r, dma_cc_en, 1); -} - -interrupt_t dma_channel_get_interrupt(dma_channel_t chan) -{ - if (chan.dma == 0) { - return IRQ_DMA1_CHANNEL1_IRQ + chan.chan; - } else { - switch (chan.chan) { - case 5: - return IRQ_DMA1_CHANNEL6_IRQ; - case 6: - return IRQ_DMA1_CHANNEL7_IRQ; - default: - return IRQ_DMA2_CHANNEL1_IRQ + chan.chan; - } - } -} diff --git a/02-usart/src/kern/gpio/gpio_manager.c b/02-usart/src/kern/gpio/gpio_manager.c deleted file mode 100644 index 82dd0ba..0000000 --- a/02-usart/src/kern/gpio/gpio_manager.c +++ /dev/null @@ -1,402 +0,0 @@ -#include "kern/gpio/gpio_manager.h" - -#include "arch/stm32l4xxx/peripherals/irq.h" -#include "arch/stm32l4xxx/peripherals/rcc.h" - -/* A list of whether the pins are in use or not as a bitmask. */ -uint32_t pins_inuse[N_GPIO_PINS / 32 + (N_GPIO_PINS % 32 != 0)]; - -struct gpio_afn_and_pin { - int8_t afn_number; - gpio_pin_t gpio_pin; -}; - -/* - * Returns which (pin, afn) pairs provide the given alternate function. - * The out array needs to have 5 positions. - * - * This function will use afn_number = -1 as the terminal. - * - * Note that EVENTOUT is a special case because all pins have an event out - * at afn=15 and should be assumed by other logic and thus is not handled - * by this function. - */ -static void get_ports_and_pins_for_alternate_function( - gpio_alternate_function_t afn, struct gpio_afn_and_pin* out) -{ - switch (afn) { -#define AFN1(fn, ...) \ - static_assert(false, "Unable to parse afn_table at " #fn); -#define AFN3(fn, ...) \ - static_assert(false, "Unable to parse afn_table at " #fn); -#define AFN5(fn, ...) \ - static_assert(false, "Unable to parse afn_table at " #fn); -#define AFN7(fn, ...) \ - static_assert(false, "Unable to parse afn_table at " #fn); - -#define AFN2(fn, afn, pin) \ - out[0].afn_number = afn; \ - out[0].gpio_pin = GPIO_PIN_ ## pin - -#define AFN4(fn, afn0, pin0, afn1, pin1) \ - AFN2(fn, afn0, pin0); \ - out[1].afn_number = afn1; \ - out[1].gpio_pin = GPIO_PIN_ ## pin1 - -#define AFN6(fn, afn0, pin0, afn1, pin1, afn2, pin2) \ - AFN4(fn, afn0, pin0, afn1, pin1); \ - out[2].afn_number = afn2; \ - out[2].gpio_pin = GPIO_PIN_ ## pin2 - -#define AFN8(fn, afn0, pin0, afn1, pin1, afn2, pin2, afn3, pin3) \ - AFN6(fn, afn0, pin0, afn1, pin1, afn2, pin2); \ - out[2].afn_number = afn3; \ - out[2].gpio_pin = GPIO_PIN_ ## pin3 - -#define GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, NAME, ...) NAME -#define GET_N(_1, _2, _3, _4, _5, _6, _7, _8, NAME, ...) NAME -#define AFN(fn, ...) \ - case GPIO_ALTERNATE_FUNCTION_ ## fn: \ - GET_MACRO(__VA_ARGS__, AFN8, AFN7, AFN6, AFN5, AFN4, AFN3, AFN2, AFN1)\ - (fn, __VA_ARGS__); \ - out[GET_N(__VA_ARGS__, 4, 4, 3, 3, 2, 2, 1, 1)] = \ - (struct gpio_afn_and_pin){-1, -1}; \ - break; - -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/afn_table.inc" - case GPIO_ALTERNATE_FUNCTION_EVENTOUT: - return; - } -} - -static inline int offset_for_gpio_pin(gpio_pin_t pin) -{ - switch (pin) { -#define PORT(p, pn) \ - case GPIO_PIN_P ## p ## pn: return pn; -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" -#undef PORT - case N_GPIO_PINS: return -1; - } - - /* Should be unreachable. */ - return -1; -} - -inline bool gpio_pin_in_use(gpio_pin_t pin) -{ - return !!(pins_inuse[pin / 32] & (1 << (pin % 32))); -} - -#define A(...) -#define B(...) -#define C(...) -#define D(...) -#define E(...) -#define F(...) -#define G(...) -#define H(...) -#define I(...) -#define SELECT_MACRO(PORT) PORT -#define PORT(port, pin) \ - SELECT_MACRO(port)(GPIO_PIN_P ## port ## pin, pin) -static int gc_port_a() -{ - return 0 -#undef A -#define A(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef A -#define A(...) -} - -static int gc_port_b() -{ - return 0 -#undef B -#define B(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef B -#define B(...) -} - -static int gc_port_c() -{ - return 0 -#undef C -#define C(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef C -#define C(...) -} - -static int gc_port_d() -{ - return 0 -#undef D -#define D(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef D -#define D(...) -} - -static int gc_port_e() -{ - return 0 -#undef E -#define E(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef E -#define E(...) -} - -static int gc_port_f() -{ - return 0 -#undef F -#define F(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef F -#define F(...) -} - -static int gc_port_g() -{ - return 0 -#undef G -#define G(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef G -#define G(...) -} - -static int gc_port_h() -{ - return 0 -#undef H -#define H(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef H -#define H(...) -} - -static int gc_port_i() -{ - return 0 -#undef I -#define I(abspin, relpin) \ - | (gpio_pin_in_use(abspin) << (relpin)) -#include "arch/stm32l4xxx/peripherals/tables/stm32l432xx/gpio/port_table.inc" - ; -#undef I -#define I(...) -} - - -static inline bool gpio_pin_try_reserve(gpio_pin_t pin) -{ - int in_use = __sync_fetch_and_or( - &pins_inuse[pin / 32], 1 << (pin % 32)); - return !(in_use & (1 << (pin % 32))); -} - -inline static gpio_port_config_t* get_gpio_port_config(gpio_port_t port) -{ - switch(port) { - case GPIO_PORT_A: return (gpio_port_config_t*) GPIOA_BASE; - case GPIO_PORT_B: return (gpio_port_config_t*) GPIOB_BASE; - case GPIO_PORT_C: return (gpio_port_config_t*) GPIOC_BASE; - case GPIO_PORT_H: return (gpio_port_config_t*) GPIOH_BASE; - default: return NULL; - } -} - -inline static gpio_port_config_t* get_gpio_port_config_for_pin(gpio_pin_t pin) -{ - gpio_port_t port = get_port_for_pin(pin); - return get_gpio_port_config(port); -} - -gpio_reserved_pin_t reserve_gpio_pin( - gpio_pin_t pin, gpio_pin_opts_t* opts, int* error_out) -{ - *error_out = 0; - if (!gpio_pin_try_reserve(pin)) { - *error_out = GPIO_ERROR_IN_USE; - return (gpio_reserved_pin_t) { .v_ = -1 }; - } - - gpio_port_t port = get_port_for_pin(pin); - regset(RCC.ahb2en_r, rcc_gpioen(port), 1); - - gpio_port_config_t* port_config = get_gpio_port_config(port); - - - int off = offset_for_gpio_pin(pin); - - regset(port_config->mode_r, gpio_mode_n(off), opts->mode); - regset(port_config->pupd_r, gpio_pupd_n(off), opts->pull_dir); - - switch(opts->mode) { - case GPIO_MODE_INPUT: - break; - - case GPIO_MODE_OUTPUT: - regset(port_config->ospeed_r, gpio_ospeed_n(off), opts->output_opts.speed); - regset(port_config->otype_r, gpio_otype_n(off), opts->output_opts.type); - break; - - case GPIO_MODE_ALTERNATE: - if (off < 8) { - regset( - port_config->af_rl, - gpio_afsel_n(off), - opts->alternate_opts.function); - } else { - regset( - port_config->af_rh, - gpio_afsel_n(off - 8), - opts->alternate_opts.function); - } - break; - - case GPIO_MODE_ANALOG: - regset(port_config->asc_r, gpio_asc_n(off), 1); - break; - } - - return (gpio_reserved_pin_t) { .v_ = pin }; -} - -gpio_reserved_pin_t gpio_enable_alternate_function( - gpio_alternate_function_t fn, - gpio_pin_t hint, - int* error_out) -{ - int i = 0; - gpio_pin_opts_t opts; - struct gpio_afn_and_pin afn_and_pin[5]; - - if (gpio_pin_out_of_range(hint) && hint != -1) { - *error_out = GPIO_ERROR_INVALID_PIN; - return (gpio_reserved_pin_t) { .v_ = -1 }; - } - - opts.mode = GPIO_MODE_ALTERNATE; - - if (fn == GPIO_ALTERNATE_FUNCTION_EVENTOUT) { - afn_and_pin[i].afn_number = GPIO_ALTERNATE_FUNCTION_EVENTOUT; - if (hint == -1) { - hint = GPIO_PIN_PA0; - } - afn_and_pin[i].gpio_pin = hint; - } else { - get_ports_and_pins_for_alternate_function(fn, afn_and_pin); - - if (hint == -1) { - hint = afn_and_pin[0].gpio_pin; - } - - for(i = 0; - i < 5 - && afn_and_pin[i].gpio_pin != hint - && afn_and_pin[i].gpio_pin != -1; - ++ i); - - if (afn_and_pin[i].gpio_pin == -1 || i == 5) { - *error_out = GPIO_ERROR_INVALID_PIN_FOR_ALTERNATE_FUNCTION; - return (gpio_reserved_pin_t) { .v_ = -1 }; - } - } - - opts.alternate_opts.function = afn_and_pin[i].afn_number; - return reserve_gpio_pin(afn_and_pin[i].gpio_pin, &opts, error_out); -} - -void release_gpio_pin(gpio_reserved_pin_t rpin) -{ - gpio_pin_t pin = rpin.v_; - // TODO this should be a critical section. - gpio_port_t port = get_port_for_pin(pin); - pins_inuse[pin / 32] &= ~(1 << (pin % 32)); - - int used; - switch(port) { - case GPIO_PORT_A: - used = gc_port_a(); - break; - case GPIO_PORT_B: - used = gc_port_b(); - break; - case GPIO_PORT_C: - used = gc_port_c(); - break; - case GPIO_PORT_D: - used = gc_port_d(); - break; - case GPIO_PORT_E: - used = gc_port_e(); - break; - case GPIO_PORT_F: - used = gc_port_f(); - break; - case GPIO_PORT_G: - used = gc_port_g(); - break; - case GPIO_PORT_H: - used = gc_port_h(); - break; - case GPIO_PORT_I: - used = gc_port_i(); - break; - - case N_GPIO_PORTS: - used = 1; - break; - } - - if (!used) { - regset(RCC.ahb2en_r, rcc_gpioen(port), 0); - } -} - -inline void get_gpio_pin_port_off( - gpio_pin_t pin, gpio_port_config_t** out_cfg, int* out_off) -{ - *out_cfg = get_gpio_port_config_for_pin(pin); - *out_off = offset_for_gpio_pin(pin); -} - -void set_gpio_pin_high(gpio_reserved_pin_t pin) -{ - int off; - gpio_port_config_t* portcfg; - get_gpio_pin_port_off(pin.v_, &portcfg, &off); - - regset(portcfg->od_r, (1 << off), 1); -} - -void set_gpio_pin_low(gpio_reserved_pin_t pin) -{ - int off; - gpio_port_config_t* portcfg; - get_gpio_pin_port_off(pin.v_, &portcfg, &off); - - regset(portcfg->od_r, (1 << off), 0); -} diff --git a/02-usart/src/kern/gpio/sysled.c b/02-usart/src/kern/gpio/sysled.c deleted file mode 100644 index a728da3..0000000 --- a/02-usart/src/kern/gpio/sysled.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "kern/gpio/sysled.h" - -#define SYSLED GPIO_PIN_PB3 - -gpio_reserved_pin_t get_sysled() -{ - if (gpio_pin_in_use(SYSLED)) { - return (gpio_reserved_pin_t) { .v_ = SYSLED }; - } - - int ec; - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - return reserve_gpio_pin(SYSLED, &opts, &ec); -} diff --git a/02-usart/src/kern/init.c b/02-usart/src/kern/init.c deleted file mode 100644 index 2531ca9..0000000 --- a/02-usart/src/kern/init.c +++ /dev/null @@ -1,82 +0,0 @@ -#include "kern/init.h" - -#include "arch.h" -#include "arch/stm32l4xxx/peripherals/system.h" -#include "arch/stm32l4xxx/peripherals/clock.h" - -#include "kern/log.h" - -/* Forward-declare the main function. This is implemented in main.c. */ -int main(); - -/* These are defined in the linker script. */ - -#ifdef ARCH_STM32L4 -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; - -extern void(*INIT_ROUTINES_FLASH_START)(); -extern void(*INIT_ROUTINES_FLASH_STOP)(); - -init0() -{ - /* Enable a higher clock speed. This is the first thing we do - * beacuse it will boost the boot up time. */ - set_system_clock_MHz(80); -} - -init1() -{ - /* Next, we'll copy the data sections from flash to ram. */ - 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; - } -} - -init3() -{ - klogf("--- System Restart ---\n"); - klogf("Setting the vector offset table to point to the start of flash.\n"); - - /* Set the vector offset table to be at the start - * of FLASH memory. */ - SCB.vto_r = 0x08000000; -} - -/* - * Runs before main. Initializes the data and bss segments by loading them - * into memory. - */ -_Noreturn void on_reset() -{ - void (**initfn)(); - for(initfn = &INIT_ROUTINES_FLASH_START; - initfn < &INIT_ROUTINES_FLASH_STOP; - ++ initfn) { - - (*initfn)(); - } - - /* Jump to main. */ - main(); - - for(;;); -} - -#endif /* ARCH_STM32L4 */ diff --git a/02-usart/src/kern/lib.c b/02-usart/src/kern/lib.c deleted file mode 100644 index 88188cc..0000000 --- a/02-usart/src/kern/lib.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "kern/lib.h" - -#define nybble_to_hex(n) \ - ((n) < 10 ? 0x30 + (n) : ('A' + ((n) - 10))) - -void hexify(uint32_t v, char* into) -{ - into += 8; - - *(into--) = 0; - - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *(into--) = nybble_to_hex(v & 0x0F); - v >>= 4; - *into = nybble_to_hex(v & 0x0F); - v >>= 4; -} - -void decimalify(int v, char* into) -{ - int c = 0; - int i; - - if (v == 0) { - *(into ++) = '0'; - *into = 0; - return; - } else { - while (v > 0) { - *(into ++) = 0x30 + (v % 10); - v /= 10; - ++ c; - } - } - *into = 0; - - into -= c; - for (i = 0; i < c / 2; ++ i) { - char tmp = into[i]; - into[i] = into[c - i - 1]; - into[c - i - 1] = tmp; - } - -} diff --git a/02-usart/src/kern/log.c b/02-usart/src/kern/log.c deleted file mode 100644 index a217183..0000000 --- a/02-usart/src/kern/log.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "arch/stm32l4xxx/peripherals/usart.h" -#include "arch/stm32l4xxx/peripherals/clock.h" - -#include "kern/log.h" -#include "kern/init.h" -#include "kern/gpio/gpio_manager.h" - -#include "kern/common.h" - -void setup_usart2(uint32_t baud_rate); - -/** This module requires an initialization routine. This is a level2 routine, - * so anything running at level3 or lower is guaranteed to have access - * to the klong. */ -init2() -{ - setup_usart2(115200); - regset(USART2.c_r1, usart_txeie, 1); - regset(USART2.c_r1, usart_rxneie, 1); - usart_set_enabled(&USART2, USART_ENABLE_TX | USART_ENABLE_RX); - - klogf("klog() enabled on USART2\n"); -} - -void klogf(const char* fmt, ...) -{ - va_list l; - va_start(l, fmt); - - usart_vprintf(&USART2, fmt, l); -} - -void setup_usart2(uint32_t baud_rate) -{ - enable_hsi(&RCC, true); - - int ec = 0; - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_TX, GPIO_PIN_PA2, &ec); - - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_RX, GPIO_PIN_PA15, &ec); - - set_usart2_clock_src(&RCC, USART_CLK_SRC_HSI16); - set_usart2_clock_enabled(&RCC, USART_CLK_SRC_HSI16); - - /* De-assert reset of USART2 */ - regset(RCC.apb1rst1_r, rcc_usart2rst, 0); - - USART2.c_r1 = 0; - USART2.c_r2 = 0; - USART2.c_r3 = 0; - - usart_set_divisor(&USART2, 16000000 / baud_rate); -} diff --git a/02-usart/src/kern/main.c b/02-usart/src/kern/main.c deleted file mode 100644 index ebb2164..0000000 --- a/02-usart/src/kern/main.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "arch.h" -#include "kern/log.h" - -#include "arch/stm32l4xxx/peripherals/system.h" -#include "arch/stm32l4xxx/peripherals/clock.h" - -void on_systick() /* Overrides weak-symbol on_systick. */ -{ - klogf("Systick\n"); -} - -#ifdef ARCH_STM32L4 - -/* Main function. This gets executed from the interrupt vector defined above. */ -int main() -{ - klogf("Hello, World! Clock Mhz: %d\n", (uint32_t) get_clock_mhz()); - - /* Set the countdown to start from 10,000,0000. */ - SCB.strv_r = 10000000; - - /* Enable interrupts. */ - regset(SCB.stcs_r, scb_tickint, 1); - - /* Start the systick. */ - regset(SCB.stcs_r, scb_enable, 1); -} - -#endif diff --git a/02-usart/src/kern/mem.c b/02-usart/src/kern/mem.c deleted file mode 100644 index 5234fff..0000000 --- a/02-usart/src/kern/mem.c +++ /dev/null @@ -1,280 +0,0 @@ -#include "arch.h" -#include "kern/mem.h" -#include "kern/common.h" - -#ifdef ARCH_STM32L4 -/* Provide a definition for memset() when not provided for the - * microcontroller. */ -void* memset(void* dest, int c, size_t n) -{ - uint8_t c8 = (uint8_t) c; - uint8_t* dest8 = (uint8_t*) dest; - uint8_t* to = dest8 + n; - - while(dest8 < to) { - *(dest8 ++) = c8; - } - - return dest; -} - -#else - -void* memset(void* dest, int c, size_t n); - -#endif - -typedef uint16_t halloc_off_t; - -#define CANARY 0x5a - -// The sizes will count the number of WORDS allocated. -// Since there's a max size of 16k, only 12 bits will be -// needed for this. -typedef struct HALLOC_NODE { - union { - uint32_t header; - struct { - /* Is this memory block currently in use (hasn't been hfree'd) */ - uint8_t used:1; - /* Number of words allocated. Does not include the header. */ - uint16_t size:12; - /* The location of the previous block (in WORDS from offest) */ - halloc_off_t prev:12; - uint8_t canary:7; - } PACKED; - }; - - uint8_t mem[]; /* The memory to use. */ -} halloc_node_t; - -static_assert(offsetof(halloc_node_t, mem) == 4, "Offset check failed."); - -halloc_node_t* halloc_start; - -#define halloc_node_out_of_range(node) \ - ((uint8_t*) (node) == ((uint8_t*)&DATA_SEGMENT_STOP) + MAX_HEAP_SIZE) - -#define halloc_node_next(cur) \ - ((halloc_node_t*)(((uint8_t*)(cur)) + (((cur)->size + 1) * 4))) - -#define halloc_node_prev(cur) halloc_node_at_off(cur->prev) - -#define halloc_node_at_off(offset) \ - ((halloc_node_t*)(((uint8_t*) halloc_start) + (offset) * 4)) - -#define halloc_node_get_off(node) \ - (((uint32_t)(((uint8_t*)(node)) - ((uint8_t*)(halloc_start)))) / 4) - -#define get_halloc_node(mem) \ - ((halloc_node_t*)(((uint8_t*)mem) - 4)) - -#define size_for(n) \ - (((n) / 4) + ((n) % 4 != 0)) - -void* halloc(size_t size) -{ - if (!halloc_start) { - halloc_start = (halloc_node_t*) DATA_SEGMENT_STOP_ADDR; - memset(halloc_start, 0, sizeof(halloc_node_t)); - halloc_start->size = (MAX_HEAP_SIZE / 4) - 1; - halloc_start->canary = CANARY; - } - - size_t realsz = size_for(size); /* Clip the size to the nearest word. */ - halloc_off_t offset = 0; - while (offset < (MAX_HEAP_SIZE / 4)) { - halloc_node_t* cur = halloc_node_at_off(offset); - - if (!cur->used && (cur->size >= realsz)) { - cur->used = true; - size_t orig_size = cur->size; - cur->size = realsz; - - if (orig_size > realsz) { - /* This halloc node needs to split into two blocks. */ - halloc_node_t* next = halloc_node_next(cur); - next->used = 0; - next->size = orig_size - realsz - sizeof(halloc_node_t) / 4; - next->prev = offset; - next->canary = CANARY; - - halloc_node_t* nextnext = halloc_node_next(next); - if (halloc_node_get_off(nextnext) < (MAX_HEAP_SIZE / 4)) { - nextnext->prev = halloc_node_get_off(next); - } - } - - return (void*) cur->mem; - } - - offset += (sizeof(halloc_node_t) / 4) + cur->size; - } - - return NULL; -} - - -/* Joins this node with the previous and next nodes if they're free. */ -static void coalesce(halloc_node_t* cur) -{ - halloc_node_t* orig = cur; - halloc_node_t* last_freed; - halloc_node_t* next_used; - - /* Find the earliest contiguous free'd block. */ - while (!cur->used && cur != halloc_start) { - cur = halloc_node_prev(cur); - } - - if (cur == halloc_start && !cur->used) { - last_freed = cur; - } else { - last_freed = halloc_node_next(cur); - } - - /* Find the next used block. */ - cur = orig; - while (!cur->used && !halloc_node_out_of_range(cur)) { - cur = halloc_node_next(cur); - } - - next_used = cur; - - if (!halloc_node_out_of_range(next_used)) { - next_used->prev = halloc_node_get_off(last_freed); - } - - last_freed->size = ((uint8_t*) next_used - (last_freed->mem)) / 4; -} - -#ifdef FOR_TESTING -#include <assert.h> -#include <stdio.h> -void panic(const char* x) -{ - fprintf(stderr, "%s\n", x); - assert(0); -} -#else -void panic(const char* x) -{ - for(;;); -} -#endif - -void hfree(void* mem) -{ - /* Like normal free(), do nothing on free'ing NULL */ - if (!mem) return; - - halloc_node_t* header = get_halloc_node(mem); - if (!header->used) { - panic("Heap double free or corruption!\n"); - return; - } - - header->used = 0; - coalesce(header); -} - -#ifdef FOR_TESTING - -#include <stdio.h> - -void* debug_halloc_get_next_ptr(void* ptr) -{ - halloc_node_t* node = ptr - sizeof(halloc_node_t); - halloc_node_t* next = halloc_node_next(node); - - return next->mem; -} - -void* debug_halloc_get_prev_ptr(void* ptr) -{ - halloc_node_t* node = ptr - sizeof(halloc_node_t); - halloc_node_t* prev = halloc_node_prev(node); - - return prev->mem; -} - -void debug_print_blocks() -{ - printf("------ Print Blocks -------\n"); - halloc_node_t* cur = halloc_node_at_off(0); - - while (!halloc_node_out_of_range(cur)) { - printf("header (%04x) {used=%d, size=%5d, prev=%04x, canary=%02x}\n", - halloc_node_get_off(cur), cur->used, cur->size, cur->prev, cur->canary); - cur = halloc_node_next(cur); - } -} - -/* Tests that we can walk up and down the allocated blocks and that they - * are properly aligned. */ -int debug_halloc_assert_consistency(char* error, size_t len) -{ - halloc_node_t* cur = halloc_node_at_off(0); - size_t total_size = 0; - size_t loop_check = 0; - size_t n_blocks = 1; - size_t n_blocks_back = 1; - - while(1) { - if (cur->canary != CANARY) { - snprintf(error, len, "Node has corrupted canary. %02x vs expected %02x\n", - cur->canary, CANARY); - return 1; - } - - total_size += cur->size + 1; - - halloc_node_t* next = halloc_node_next(cur); - if ((uint8_t*) next == ((uint8_t*)&DATA_SEGMENT_STOP) + MAX_HEAP_SIZE) { - break; - } else if ((uint8_t*) next > (uint8_t*)DATA_SEGMENT_STOP_ADDR + MAX_HEAP_SIZE){ - snprintf( - error, len, "Next node points is out of bounds. %p vs max of %p\n", - next, - (void*)(DATA_SEGMENT_STOP_ADDR + MAX_HEAP_SIZE)); - return 1; - } - - cur = next; - ++ n_blocks; - } - - if (total_size * 4 != MAX_HEAP_SIZE) { - snprintf( - error, len, "Total recorded size is inconsistent. %lu vs %lu\n", - total_size * 4, MAX_HEAP_SIZE); - return 1; - } - - if (cur == halloc_start) { - return 0; - } - - while (loop_check < 10000) { - halloc_node_t* prev = halloc_node_prev(cur); - ++ n_blocks_back; - - if (prev == halloc_start) { - if (n_blocks != n_blocks_back) { - snprintf( - error, len, "Different number of blocks found on the way back. Found %lu on the way back vs %lu up.\n", - n_blocks_back, n_blocks); - return 1; - } - return 0; - } - - cur = prev; - ++ loop_check; - } - - snprintf(error, len, "Loop check failed.\n"); - return 1; -} - -#endif diff --git a/02-usart/src/kern/stdlibrepl.c b/02-usart/src/kern/stdlibrepl.c deleted file mode 100644 index 2d9d839..0000000 --- a/02-usart/src/kern/stdlibrepl.c +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Replacement for common stdlib functions that don't exist - * on the ARM bare-metal compilation environment. - */ - -#include <stddef.h> - -size_t strlen(char* ch) -{ - size_t ret = 0; - while(*(ch ++) != 0) ++ ret; - return ret; -} diff --git a/02-usart/src/kern/string.c b/02-usart/src/kern/string.c deleted file mode 100644 index 4afa228..0000000 --- a/02-usart/src/kern/string.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kern/string.h" - -void kstrcpy(char* into, const char* from) -{ - while(*from) { - *(into ++) = *(from ++); - } - *into = 0; -} 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-usart/test_harness/Makefile b/02-usart/test_harness/Makefile deleted file mode 100644 index 443292b..0000000 --- a/02-usart/test_harness/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -CC=gcc -CFLAGS=-g3 -ggdb -Wall - -test_harness.a: test_harness.c test_harness.h fake_env.o - gcc -o test_harness.o -c test_harness.c $(CFLAGS) - ar r test_harness.a test_harness.o fake_env.o - -fake_env.o: fake_env.c fake_env.h - gcc -o fake_env.o -c fake_env.c $(CFLAGS) diff --git a/02-usart/test_harness/fake_env.c b/02-usart/test_harness/fake_env.c deleted file mode 100644 index 6a32c99..0000000 --- a/02-usart/test_harness/fake_env.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "fake_env.h" - -#include <stdlib.h> -#include <assert.h> - -struct fakeenv_memseg { - const char* name; - void* segment; -}; - -#define DEFINE_MEMORY_SEGMENT(seg, start_addr, end_addr) \ - static __attribute((__section__("fakeenv"))) \ - struct fakeenv_memseg fake_##seg = { \ - .name = #seg, \ - .segment = NULL, \ - }; \ - void* load_fake_##seg##__ () \ - { \ - if (fake_##seg .segment == NULL) { \ - fake_##seg .segment = malloc((end_addr) - (start_addr)); \ - assert(fake_##seg .segment != NULL); \ - } \ - return fake_##seg.segment; \ - } - -extern struct fakeenv_memseg __start_fakeenv; -extern struct fakeenv_memseg __stop_fakeenv; - -void wipeout_fake_env() -{ - for (struct fakeenv_memseg* iter = &__start_fakeenv; - iter < &__stop_fakeenv; - ++ iter) { - free(iter->segment); - iter->segment = NULL; - } -} - -/* Reset and clock control. */ -DEFINE_MEMORY_SEGMENT(rcc, 0x40021000, 0x400210A0) - -/* Peripheral buses */ -DEFINE_MEMORY_SEGMENT(apb1, 0x40000000, 0x40010000) -DEFINE_MEMORY_SEGMENT(apb2, 0x40010000, 0x40020000) -DEFINE_MEMORY_SEGMENT(ahb1, 0x40020000, 0x40024400) -DEFINE_MEMORY_SEGMENT(ahb2, 0x48000000, 0x50060C00) - -/* System Control Block */ -DEFINE_MEMORY_SEGMENT(scb, 0xE000E008, 0xE000EF04) - -/* Nested Vector Interrupt Controller (NVIC) */ -/* Note that this memory space acutally overlaps with the SCB, but - * they are functionally distinct entitites and such are modeled as - * separate structures in memeory. */ -DEFINE_MEMORY_SEGMENT(nvic, 0xE000E004, 0xE000E4F0) - -/* SRAM */ -DEFINE_MEMORY_SEGMENT(sram1, 0x20000000, 0x2000C000) -DEFINE_MEMORY_SEGMENT(sram2, 0x2000C000, 0x20018000) - -/* Serial Peripheral Interface */ -DEFINE_MEMORY_SEGMENT(spi1, 0x40013000, 0x400133FF) -DEFINE_MEMORY_SEGMENT(spi3, 0x40003C00, 0x40003FFF) diff --git a/02-usart/test_harness/fake_env.h b/02-usart/test_harness/fake_env.h deleted file mode 100644 index 34056f4..0000000 --- a/02-usart/test_harness/fake_env.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef FAKE_ENV_H_ -#define FAKE_ENV_H_ - -/* Functions which wil lazily load fake chunks of memory - * corresponding to the*/ -void* load_fake_ahb1__(); -void* load_fake_ahb2__(); -void* load_fake_apb1__(); -void* load_fake_apb2__(); -void* load_fake_sram1__(); -void* load_fake_sram2__(); -void* load_fake_scb__(); -void* load_fake_nvic__(); -void* load_fake_rcc__(); -void* load_fake_spi1__(); -void* load_fake_spi3__(); - -void wipeout_fake_env(); - -#endif /* FAKE_ENV_H_ */ diff --git a/02-usart/test_harness/test_harness.c b/02-usart/test_harness/test_harness.c deleted file mode 100644 index bf9249c..0000000 --- a/02-usart/test_harness/test_harness.c +++ /dev/null @@ -1,181 +0,0 @@ -#include "test_harness.h" -#include "fake_env.h" - -#include <assert.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <unistd.h> -#include <stdlib.h> -#include <setjmp.h> - - -static jmp_buf jmpbuf; - -volatile test_t dummy - __attribute((__section__("tests"))) - __attribute((__used__)) = { - "dummy", - "dummy", - NULL -}; - -extern unsigned char __data_start; -extern unsigned char _end; -extern test_t __start_tests; -extern test_t __stop_tests; - -test_t* iter = &__start_tests; - -static int execute_test(test_t* test); - -void test_printll(size_t sz, long long v1, long long v2) -{ - fprintf(stderr, "%lld == %lld\n", v1, v2); -} -void test_printul(size_t sz, unsigned long v1, unsigned long v2) -{ - fprintf(stderr, "%lu == %lu\n", v1, v2); -} -void test_printd(size_t sz, int v1, int v2) -{ - fprintf(stderr, "%d == %d\n", v1, v2); -} -void test_printl(size_t sz, long v1, long v2) -{ - fprintf(stderr, "%lu == %lu\n", v1, v2); -} -void test_printui(size_t sz, unsigned int v1, unsigned int v2) -{ - fprintf(stderr, "%u == %u\n", v1, v2); -} -void test_prints(size_t sz, short v1, short v2) -{ - fprintf(stderr, "%hu == %hu\n", v1, v2); -} -void test_printus(size_t sz, unsigned short v1, unsigned short v2) -{ - fprintf(stderr, "%hu == %hu\n", v1, v2); -} -void test_printc(size_t sz, char v1, char v2) -{ - fprintf(stderr, "'%c' == '%c'\n", v1, v2); -} -void test_printf(size_t sz, double v1, double v2) -{ - fprintf(stderr, "%f == %f\n", v1, v2); -} -void test_printp(size_t sz, void* v1, void* v2) -{ - fprintf(stderr, "%p == %p\n", v1, v2); -} -void test_printuc( - size_t sz, unsigned char v1, unsigned char v2) -{ - fprintf(stderr, "%02x == %02x\n", (int) v1, (int) v2); -} - -static int do_fork = 1; -static size_t saved_data_size; -static unsigned char* saved_data = NULL; - -int main(int argc, char** argv) { - /* Save all initialized data. */ - saved_data_size = &_end - &__data_start; - saved_data = malloc(saved_data_size); - memcpy(saved_data, &__data_start, saved_data_size); - - - if (argc > 1 && strcmp(argv[1], "--nofork") == 0) { - do_fork = 0; - } - - for( ; iter < &__stop_tests; ++ iter) { - if (iter->fn_ptr != NULL) { - execute_test(iter); - } - } -} - -void test_harness_abort(int ec) -{ - longjmp(jmpbuf, ec); - assert("Long jump failed.\n"); -} - -/* - * When nofork is true, this function will be called after each - * test to try and make each test hermetic. - * - * It does this by reseting the data segment to what it was when - * the program was first initialized. - * - * Of course, without forking, there's no way to guarantee hermetic - * testing in C. In fact a simple segementation fault will break - * the hermetic testing, but this does a pretty good job of at least - * reseting the environment so tests don't directly depend on eachother. - */ -static void nofork_reset() -{ - wipeout_fake_env(); - - /* Reset the data segment to what it was before. */ - memcpy(&__data_start, saved_data, saved_data_size); -} - -static int execute_test(test_t* test) -{ - char fullname[512]; - int status; - int ec = 0; - pid_t pid; - - snprintf( - fullname, sizeof(fullname), "%s::%s", iter->test_suite, iter->test_name); - - if (!do_fork) { - if ((ec = setjmp(jmpbuf)) == 0) { - test->fn_ptr(); - printf(GREEN "[PASS]" RESET " %s\n", fullname); - nofork_reset(); - return 0; - } else { - printf(RED "[FAIL] (%d)" RESET " %s\n", ec, fullname); - nofork_reset(); - return ec; - } - } - - if (!(pid = fork())) { - // child - - if ((ec = setjmp(jmpbuf))) { - exit(ec); - } else { - test->fn_ptr(); - exit(0); - } - } else { - if (waitpid(pid, &status, 0) == -1) { - fprintf(stderr, "waitpid() failed\n"); - return 1; - } - - if (WIFEXITED(status)) { - switch ((ec = WEXITSTATUS(status))) { - case 0: - printf(GREEN "[PASS]" RESET " %s\n", fullname); - return 0; - default: - printf(RED "[FAIL] (%d)" RESET " %s\n", ec, fullname); - return ec; - } - } else if (WIFSIGNALED(status)) { - int ec = WTERMSIG(status); - printf("%s " RED "[FAIL] signaled %d" RESET "\n", fullname, ec); - return ec; - } - - return ec; - } -} diff --git a/02-usart/test_harness/test_harness.h b/02-usart/test_harness/test_harness.h deleted file mode 100644 index 698e2da..0000000 --- a/02-usart/test_harness/test_harness.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef TEST_HARNESS_H_ -#define TEST_HARNESS_H_ - -#include <stdio.h> -#include <string.h> - -#define YELLOW "\x1b[00;33m" -#define GREEN "\x1b[01;32m" -#define RED "\x1b[01;31m" -#define RESET "\x1b[0m" - -typedef struct { - const char* test_suite; - const char* test_name; - int (*fn_ptr)(); - void* alignment; -} test_t; - -#define GENPR(fmt, v1, v2) \ - fprintf(stderr, fmt "\n", v1, v2) - -void test_printll(size_t sz, long long v1, long long v2); -void test_printul(size_t sz, unsigned long v1, unsigned long v2); -void test_printd(size_t sz, int v1, int v2); -void test_printl(size_t sz, long v1, long v2); -void test_printui(size_t sz, unsigned int v1, unsigned int v2); -void test_prints(size_t sz, short v1, short v2); -void test_printus(size_t sz, unsigned short v1, unsigned short v2); -void test_printc(size_t sz, char v1, char v2); -void test_printf(size_t sz, double v1, double v2); -void test_printp(size_t sz, void* v1, void* v2); -void test_printuc(size_t sz, unsigned char v1, unsigned char v2); - -#define FORMAT_STRING(v1, v2) \ - _Generic((v1), \ - long long: test_printll, \ - unsigned long: test_printul, \ - int: test_printd, \ - long: test_printl, \ - unsigned int: test_printui, \ - short: test_prints, \ - unsigned short: test_printus, \ - char: test_printc, \ - unsigned char: test_printuc, \ - double: test_printf, \ - default: test_printp)(sizeof(v1), v1, v2) \ - -#define TRY_PRINT_TYPE(v1, v2, type, fmt) \ - else if (__builtin_types_compatible_p(typeof (v1), type)) { \ - fprintf(stderr, fmt " == " fmt "\n", v1, v2); \ - } - -#define TYPE_STR(t) #t - -#define ASSERT_TRUE(x) \ - do { \ - if (!(x)) { \ - fprintf(stderr, RED "ASSERT_TRUE FAILED!\n" RESET); \ - fprintf(stderr, " - " YELLOW "In expression ASSERT_TRUE(" #x ")\n"); \ - fprintf(stderr, RESET " - " YELLOW "At " __FILE__ ":%d\n" RESET, __LINE__); \ - test_harness_abort(1); \ - } \ - } while (0) - -#define ASSERT_EQ(x, y) \ - do { \ - if ((x) != (y)) { \ - fprintf(stderr, RED "ASSERT_EQ FAILED! " RESET "Not true that "); \ - FORMAT_STRING((x), (y)); \ - fprintf(stderr, " - " YELLOW "In expression ASSERT_EQ(" #x ", " #y ")\n"); \ - fprintf(stderr, RESET " - " YELLOW "At " __FILE__ ":%d\n" RESET, __LINE__); \ - test_harness_abort(1); \ - } \ - } while (0) - -#define ASSERT_EQ_STR(x, y) \ - do { \ - if (strcmp(x, y)) { \ - fprintf(stderr, \ - RED "ASSSERT_EQ_STR FAILED! " RESET "Not true that \"%s\" equals \"%s\"", \ - x, y); \ - fprintf(stderr, " - " YELLOW "In expression ASSERT_EQ_STR(" #x ", " #y ")\n"); \ - fprintf(stderr, RESET " - " YELLOW "At " __FILE__":%d\n" RESET, __LINE__); \ - test_harness_abort(1); \ - } \ - } while (0) - - -#define TEST(test_suite, test_name) \ - int test_suite ## _ ## test_name ## _fn (void); \ - volatile test_t test_suite ## _ ## test_name ## _testing_struct__ \ - __attribute((__section__("tests"))) __attribute((__used__)) = \ - {#test_suite, #test_name, test_suite ## _ ## test_name ## _fn}; \ - int test_suite ## _ ## test_name ## _fn (void) - -void test_harness_abort(int ec); - - -void wipeout_fake_env(); - -#endif diff --git a/02-usart/tests/metatest.c b/02-usart/tests/metatest.c deleted file mode 100644 index 1024156..0000000 --- a/02-usart/tests/metatest.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "test_harness.h" - -/* Tests the test harness itself. */ - -static int my_variable; -static int my_initialized_variable = 5; - -TEST(meta, clobbers_variables) -{ - my_variable = 6; - my_initialized_variable = 5; - - return 0; -} - -TEST(meta, variables_reset) -{ - ASSERT_EQ(my_variable, 0); - ASSERT_EQ(my_initialized_variable, 5); - - return 0; -} diff --git a/02-usart/tests/test_dma.c b/02-usart/tests/test_dma.c deleted file mode 100644 index 50cdb5b..0000000 --- a/02-usart/tests/test_dma.c +++ /dev/null @@ -1,189 +0,0 @@ -#include "test_harness.h" -#include "arch/stm32l4xxx/peripherals/dma.h" -#include "arch/stm32l4xxx/peripherals/rcc.h" -#include "arch/stm32l4xxx/peripherals/usart.h" -#include "kern/dma/dma_manager.h" - -#include <stdio.h> -#include <stdlib.h> -#include <memory.h> - -TEST(dma, smoke) -{ - dma_t* dma = &DMA1; - memset(dma, 0, sizeof(dma_t)); - - regset(dma->is_r, dma_tcif1, 1); - ASSERT_EQ(dma->is_r, 2); - - regset(dma->is_r, dma_htif7, 1); - ASSERT_EQ(dma->is_r, 67108866); - return 0; -} - -TEST(dma, cc_regset) -{ - dma_t* dma = &DMA1; - memset(dma, 0, sizeof(dma_t)); - - dma_channel_config_t* channel_config = &dma->channel_config[2]; - regset(channel_config->cc_r, dma_cc_msize, DMA_SIZE_32_BITS); - - ASSERT_EQ(channel_config->cc_r, 1 << 11); - return 0; -} - -TEST(dma, correct_align) -{ - dma_t dma; - - // Assert the DMA registers are aligned with what the spec says. - ASSERT_EQ((long)(&dma.csel_r) - (long)(&dma), 0xA8); - - return 0; -} - -TEST(dma, regset_pl) -{ - uint32_t reg = 0; - - regset(reg, dma_cc_pl, DMA_PRIORITY_LEVEL_MEDIUM); - - ASSERT_EQ(reg, (1 << 12)); - - ASSERT_EQ( - regget(reg, dma_cc_pl), - DMA_PRIORITY_LEVEL_MEDIUM); - return 0; -} - -TEST(dma_peri, select_peripheral) -{ - dma_opts_t opts = DEFAULT_DMA_OPTS; - int ec; - - dma_mem2p_channel_t chan = - select_dma_channel_mem2p( - DMA1_PERIPH_USART2_TX, - &opts, - &ec); - - ASSERT_EQ(DMA1.channel_config[6].cpa_r, ptr2reg(&USART2.td_r)); - - ASSERT_EQ( - regget(DMA1.channel_config[6].cc_r, dma_cc_dir), - READ_FROM_MEMORY); - - ASSERT_EQ( - regget(DMA1.channel_config[6].cc_r, dma_cc_minc), - 1); - - ASSERT_EQ( - regget(DMA1.channel_config[6].cc_r, dma_cc_pl), - DMA_PRIORITY_LEVEL_MEDIUM); - - ASSERT_EQ(regget(DMA1.csel_r, dma_c7s), 0x2); - - ASSERT_EQ(regget(RCC.ahb1en_r, rcc_dma1en), 1); - - release_dma_channel(chan.c_); - - ASSERT_EQ(regget(RCC.ahb1en_r, rcc_dma1en), 0); - return 0; -} - -TEST(dma_peri, unable_to_realloc) -{ - dma_opts_t opts = DEFAULT_DMA_OPTS; - - int ec = 0; - - dma_mem2p_channel_t chan = - select_dma_channel_mem2p( - DMA1_PERIPH_USART2_TX, - &opts, - &ec); - - ASSERT_EQ(ec, 0); - - select_dma_channel_p2mem( - DMA1_PERIPH_USART2_TX, - &opts, - &ec); - - ASSERT_EQ(ec, DMA_ERROR_CHANNEL_IN_USE); - - release_dma_channel(chan.c_); - - chan = select_dma_channel_mem2p( - DMA1_PERIPH_USART2_TX, - &opts, - &ec); - - ASSERT_EQ(ec, 0); - - release_dma_channel(chan.c_); - return 0; -} - -TEST(dma_peri, select_mem2mem) -{ - int ec = 0; - dma_opts_t opts = DEFAULT_DMA_OPTS; - dma_mem2mem_channel_t chan = - select_dma_channel_mem2mem(-1, &opts, &ec); - - ASSERT_EQ(ec, 0); - - ASSERT_EQ(chan.c_.dma, 1); - ASSERT_EQ(chan.c_.chan, 6); - - dma_mem2mem_channel_t chan2 = - select_dma_channel_mem2mem(-1, &opts, &ec); - - ASSERT_EQ(ec, 0); - - ASSERT_EQ(chan2.c_.dma, 1); - ASSERT_EQ(chan2.c_.chan, 5); - - release_dma_channel(chan.c_); - - dma_mem2mem_channel_t chan3 = - select_dma_channel_mem2mem(-1, &opts, &ec); - - ASSERT_EQ(chan3.c_.dma, 1); - ASSERT_EQ(chan3.c_.chan, 6); - - release_dma_channel(chan2.c_); - release_dma_channel(chan3.c_); - return 0; -} - -TEST(dma_peri, select_mem2mem_2) -{ - dma_opts_t opts = DEFAULT_DMA_OPTS; - dma_mem2mem_channel_t chans[14]; - int ec; - - for (int i = 0; i < 14; ++ i) { - chans[i] = select_dma_channel_mem2mem( - -1, &opts, &ec); - - ASSERT_EQ(ec, 0); - } - - select_dma_channel_mem2mem(-1, &opts, &ec); - ASSERT_EQ(ec, DMA_ERROR_CHANNEL_IN_USE); - - for (int i = 0; i < 14; ++ i) { - if (i < 7) { - ASSERT_EQ(chans[i].c_.chan, 6 - i); - ASSERT_EQ(chans[i].c_.dma, 1); - } else { - ASSERT_EQ(chans[i].c_.chan, 6 - (i - 7)); - ASSERT_EQ(chans[i].c_.dma, 0); - } - release_dma_channel(chans[i].c_); - } - return 0; -} diff --git a/02-usart/tests/test_gpio.c b/02-usart/tests/test_gpio.c deleted file mode 100644 index bcb953c..0000000 --- a/02-usart/tests/test_gpio.c +++ /dev/null @@ -1,194 +0,0 @@ -#include "test_harness.h" - -#include "arch/stm32l4xxx/peripherals/rcc.h" -#include "kern/gpio/gpio_manager.h" - -TEST(gpio_manager, smell) -{ - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - int ec = 5; - gpio_reserved_pin_t some_pin = reserve_gpio_pin(GPIO_PIN_PA15, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_TRUE(gpio_pin_in_use(GPIO_PIN_PA15)); - - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - release_gpio_pin(some_pin); - - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 0); - return 0; -} - -TEST(gpio_manager, multiplereserve) -{ - int ec; - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - reserve_gpio_pin(GPIO_PIN_PA15, &opts, &ec); - ASSERT_TRUE(ec == 0); - - reserve_gpio_pin(GPIO_PIN_PA15, &opts, &ec); - ASSERT_EQ(ec, GPIO_ERROR_IN_USE); - - return 0; -} - -TEST(gpio_manager, alternate) -{ - int ec; - - /* Pretending to start the USART. */ - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_TX, GPIO_PIN_PA2, &ec); - - ASSERT_EQ(ec, 0); - - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_RX, GPIO_PIN_PA15, &ec); - - ASSERT_EQ(ec, 0); - - gpio_port_config_t* gpioa = (gpio_port_config_t*) GPIOA_BASE; - - ASSERT_EQ(regget(gpioa->mode_r, gpio_mode_n(15)), GPIO_MODE_ALTERNATE); - ASSERT_EQ(regget(gpioa->mode_r, gpio_mode_n(2)), GPIO_MODE_ALTERNATE); - - ASSERT_EQ(regget(gpioa->af_rl, gpio_afsel_n(2)), 7); - ASSERT_EQ(regget(gpioa->af_rh, gpio_afsel_n(7)), 3); - - return 0; -} - -TEST(gpio_manager, bad_alternate) -{ - int ec; - - /* Pretending to start the USART. */ - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_RX, GPIO_PIN_PA2, &ec); - - ASSERT_EQ(ec, GPIO_ERROR_INVALID_PIN_FOR_ALTERNATE_FUNCTION); - - return 0; -} - -TEST(gpio_manager, bad_pin) -{ - int ec; - - /* Pretending to start the USART. */ - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_RX, 99, &ec); - - ASSERT_EQ(ec, GPIO_ERROR_INVALID_PIN); - - return 0; -} - -TEST(gpio_manager, alternate_then_reserve_fail) -{ - int ec; - - /* Pretending to start the USART. */ - gpio_enable_alternate_function( - GPIO_ALTERNATE_FUNCTION_USART2_TX, GPIO_PIN_PA2, &ec); - - ASSERT_EQ(ec, 0); - - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - reserve_gpio_pin(GPIO_PIN_PA2, &opts, &ec); - - ASSERT_EQ(ec, GPIO_ERROR_IN_USE); - - return 0; -} - -TEST(gpio_manager, get_gpio_pin_port_off) -{ - - gpio_port_config_t* cfg; - int off; - get_gpio_pin_port_off(GPIO_PIN_PA5, &cfg, &off); - - ASSERT_EQ(cfg, (void*)(GPIOA_BASE)); - ASSERT_EQ(off, 5); - - return 0; -} - -TEST(gpio_manager, sets_gpio_settings) -{ - gpio_pin_opts_t opts; - int ec; - - opts.mode = GPIO_MODE_OUTPUT; - opts.pull_dir = GPIO_PULL_DIR_NONE; - opts.output_opts.speed = GPIO_OUTPUT_SPEED_VERY_HIGH; - opts.output_opts.type = GPIO_OUTPUT_TYPE_PUSH_PULL; - - reserve_gpio_pin(GPIO_PIN_PA2, &opts, &ec); - ASSERT_EQ(ec, 0); - - gpio_port_config_t* gpioa = (gpio_port_config_t*) GPIOA_BASE; - - ASSERT_EQ(regget(gpioa->mode_r, gpio_mode_n(2)), GPIO_MODE_OUTPUT); - ASSERT_EQ(regget(gpioa->pupd_r, gpio_pupd_n(2)), GPIO_PULL_DIR_NONE); - ASSERT_EQ(regget(gpioa->ospeed_r, gpio_ospeed_n(2)), GPIO_OUTPUT_SPEED_VERY_HIGH); - ASSERT_EQ(regget(gpioa->otype_r, gpio_otype_n(2)), GPIO_OUTPUT_TYPE_PUSH_PULL); - - return 0; -} - -TEST(gpio_manager, gc) -{ - int ec; - gpio_pin_opts_t opts = DEFAULT_GPIO_OPTS_OUTPUT; - - gpio_reserved_pin_t p1 = reserve_gpio_pin(GPIO_PIN_PA0, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - - gpio_reserved_pin_t p2 = reserve_gpio_pin(GPIO_PIN_PA1, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - - gpio_reserved_pin_t p3 = reserve_gpio_pin(GPIO_PIN_PA15, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - - gpio_reserved_pin_t p4 = reserve_gpio_pin(GPIO_PIN_PB3, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - gpio_reserved_pin_t p5 = reserve_gpio_pin(GPIO_PIN_PB1, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - gpio_reserved_pin_t p6 = reserve_gpio_pin(GPIO_PIN_PB0, &opts, &ec); - ASSERT_EQ(ec, 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p1); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p2); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 1); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p3); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p4); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p5); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 1); - - release_gpio_pin(p6); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_A)), 0); - ASSERT_EQ(regget(RCC.ahb2en_r, rcc_gpioen(GPIO_PORT_B)), 0); - - return 0; -} diff --git a/02-usart/tests/test_irq.c b/02-usart/tests/test_irq.c deleted file mode 100644 index 3c4ee9c..0000000 --- a/02-usart/tests/test_irq.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "test_harness.h" - -#include "arch/stm32l4xxx/peripherals/irq.h" -#include "arch/stm32l4xxx/peripherals/nvic.h" - -TEST(irq, nvic) -{ - interrupt_set_t is = { 0 }; - - interrupt_set_add(&is, IRQ_USART2); - interrupt_set_add(&is, IRQ_USART3); - - enable_interrupts(&is); - - ASSERT_EQ(is.irqs[1], 0xC0); - ASSERT_EQ(NVIC.ise_r[1], 0xC0); - - return 0; -} - -TEST(irq, nvic_edgecase) -{ - interrupt_set_t is = { 0 }; - interrupt_set_add(&is, IRQ_WWDG_IRQ); - interrupt_set_add(&is, IRQ_I2C1_ER); - - enable_interrupts(&is); - - ASSERT_EQ(is.irqs[0], 1); - ASSERT_EQ(NVIC.ise_r[0], 1); - ASSERT_EQ(is.irqs[1], 1); - ASSERT_EQ(NVIC.ise_r[1], 1); - - return 0; -} - -TEST(irq, enable_single_interrupt) -{ - enable_interrupt(IRQ_USART2); - ASSERT_EQ(NVIC.ise_r[1], 0x40); - - return 0; -} diff --git a/02-usart/tests/test_lib.c b/02-usart/tests/test_lib.c deleted file mode 100644 index 33076c2..0000000 --- a/02-usart/tests/test_lib.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "test_harness.h" -#include "kern/lib.h" - -TEST(lib, hexify) -{ - char buf[10]; - - hexify(0xaaaaaaaa, buf); - ASSERT_EQ_STR(buf, "AAAAAAAA"); - - hexify(0xdddddddd, buf); - ASSERT_EQ_STR(buf, "DDDDDDDD"); - - hexify(0x02468ace, buf); - ASSERT_EQ_STR(buf, "02468ACE"); - - hexify(0xdeadbeef, buf); - ASSERT_EQ_STR(buf, "DEADBEEF"); - - return 0; -} diff --git a/02-usart/tests/test_memory.c b/02-usart/tests/test_memory.c deleted file mode 100644 index 04e9289..0000000 --- a/02-usart/tests/test_memory.c +++ /dev/null @@ -1,378 +0,0 @@ -#ifndef FOR_TESTING -#define FOR_TESTING -#endif - -#include <stdlib.h> - -#include "arch.h" -#include "test_harness.c" -#include "kern/common.h" -#include "kern/mem.h" - -struct TEST_STRUCT { - uint32_t array[3]; -}; - -struct TEST_STRUCT2 { - uint32_t array[10]; -}; - -/* Copy of the node structure. */ -typedef struct HALLOC_NODE { - union { - uint32_t header; - struct { - /* Is this memory block currently in use (hasn't been hfree'd) */ - bool used:1; - /* Number of words allocated. Does not include the header. */ - uint16_t size:12; - /* The location of the previous block (in WORDS from offest) */ - uint16_t prev:12; - uint8_t canary:7; - } PACKED; - }; - - uint8_t mem[]; /* The memory to use. */ -} halloc_node_t; - -extern halloc_node_t* halloc_start; - -static void wipeout_halloc() -{ - memset(halloc_start, 0, 1024); - halloc_start = NULL; -} - - -static struct TEST_STRUCT* new_test_struct() -{ - struct TEST_STRUCT* ret = halloc(sizeof(struct TEST_STRUCT)); - - ret->array[0] = 1; - ret->array[1] = 2; - ret->array[2] = 3; - - return ret; -} - -static struct TEST_STRUCT2* new_test_struct2() -{ - struct TEST_STRUCT2* ret = halloc(sizeof(struct TEST_STRUCT2)); - - for (int i = 0; i < 10; ++ i) { - ret->array[i] = i; - } - - return ret; -} - -#define ASSERT_CHAIN(t1, t2) \ - ASSERT_EQ(V(t1) + sizeof(*t1) + 4, V(t2)) - -TEST(memory, halloc) -{ - -#define V(x) ((void*)(x)) - struct TEST_STRUCT* test1 = new_test_struct(); - struct TEST_STRUCT2* test2 = new_test_struct2(); - struct TEST_STRUCT* test3 = new_test_struct(); - struct TEST_STRUCT2* test4 = new_test_struct2(); - struct TEST_STRUCT2* test5 = new_test_struct2(); - - ASSERT_TRUE(V(test1) != V(test2)); - ASSERT_TRUE(V(test2) != V(test3)); - ASSERT_TRUE(V(test3) != V(test1)); - ASSERT_TRUE(V(test2) != V(test5)); - ASSERT_TRUE(V(test4) != V(test5)); - - ASSERT_CHAIN(test1, test2); - ASSERT_CHAIN(test2, test3); - ASSERT_CHAIN(test3, test4); - ASSERT_CHAIN(test4, test5); - - - char buf[1024]; - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (%s:%d)\n", - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - wipeout_halloc(); - - return 0; -} - -struct UNEVEN_STRUCT { - uint8_t arr[5]; -}; - -struct UNEVEN_STRUCT* new_uneven_struct() -{ - struct UNEVEN_STRUCT* ret = halloc(sizeof(struct UNEVEN_STRUCT)); - - ret->arr[0] = 1; - ret->arr[1] = 2; - ret->arr[2] = 3; - ret->arr[3] = 4; - ret->arr[4] = 5; - - return ret; -} - -#define size_for(n) \ - (((n) / 4) + ((n) % 4 != 0)) - -TEST(memory, uneven_halloc) -{ - if (halloc_start) { - wipeout_halloc(); - } - - struct UNEVEN_STRUCT* test1 = new_uneven_struct(); - struct UNEVEN_STRUCT* test2 = new_uneven_struct(); - - ASSERT_EQ(V(test1) + 12, test2); - - wipeout_halloc(); - - return 0; -} - -TEST(memory, halloc_free) -{ - if (halloc_start) { - wipeout_halloc(); - } - - struct TEST_STRUCT* test1 = new_test_struct(); - struct TEST_STRUCT2* test2 = new_test_struct2(); - struct TEST_STRUCT* test3 = new_test_struct(); - struct TEST_STRUCT2* test4 = new_test_struct2(); - struct TEST_STRUCT2* test5 = new_test_struct2(); - - hfree(test2); - hfree(test4); - hfree(test3); - hfree(test1); - hfree(test5); - - ASSERT_EQ((int) halloc_start->size * 4, MAX_HEAP_SIZE - 4); - - test1 = new_test_struct(); - test2 = new_test_struct2(); - test3 = new_test_struct(); - test4 = new_test_struct2(); - test5 = new_test_struct2(); - - hfree(test1); - hfree(test3); - hfree(test2); - hfree(test4); - hfree(test5); - - ASSERT_EQ((int) halloc_start->size * 4, MAX_HEAP_SIZE - 4); - - test1 = new_test_struct(); - test2 = new_test_struct2(); - test3 = new_test_struct(); - test4 = new_test_struct2(); - test5 = new_test_struct2(); - - hfree(test4); - hfree(test3); - hfree(test1); - hfree(test2); - hfree(test5); - - ASSERT_EQ((int) halloc_start->size * 4, MAX_HEAP_SIZE - 4); - - wipeout_halloc(); - - return 0; -} - -TEST(memory, halloc_free_alloc2) -{ - if (halloc_start) { - wipeout_halloc(); - } - - struct TEST_STRUCT2* test1 = new_test_struct2(); - struct TEST_STRUCT2* test2 = new_test_struct2(); - - hfree(test1); - - struct TEST_STRUCT* test3 = new_test_struct(); - struct TEST_STRUCT* test4 = new_test_struct(); - - ASSERT_EQ(debug_halloc_get_next_ptr(test3), V(test4)); - - ASSERT_EQ( - // There should be a free block after test4. - debug_halloc_get_next_ptr(debug_halloc_get_next_ptr(test4)), - V(test2)); - - ASSERT_EQ( - // There should be a free block after test4. - debug_halloc_get_prev_ptr(debug_halloc_get_prev_ptr(test2)), - V(test4)); - - char buf[1024]; - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf(stderr, "Consistency check failed.\n"); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - return 0; -} - -TEST(memory, relink_backref_after_free) -{ - if (halloc_start) { - wipeout_halloc(); - } - - struct TEST_STRUCT* test2 = new_test_struct(); - struct TEST_STRUCT* test3 = new_test_struct(); - - hfree(test2); - hfree(test3); - - char buf[1024]; - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf(stderr, "Consistency check failed.\n"); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - return 0; -} - -TEST(memory, consistency_stress) -{ -#define NRUNS 500 - if (halloc_start) { - wipeout_halloc(); - } - - int i; - void* allocd[NRUNS] = { 0 }; - char buf[1024]; - - for (i = 0; i < NRUNS; ++ i) { - size_t nalloc = rand() % 20; - allocd[i] = halloc(nalloc); - - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (At index=%d, %s:%d)\n", - i, - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - ASSERT_TRUE(allocd[i]); - - memset(allocd[i], 0xFF, nalloc); - size_t idx = rand() % NRUNS; - - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (At index=%d, %s:%d)\n", - i, - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - hfree(allocd[idx]); - allocd[idx] = NULL; - - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (At index=%d, %s:%d)\n", - i, - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - - idx = rand() % NRUNS; - hfree(allocd[idx]); - allocd[idx] = NULL; - - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (At index=%d, %s:%d)\n", - i, - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - } - - for(i = 0; i < NRUNS; ++ i) { - if (allocd[i]) { - hfree(allocd[i]); - } - - if (debug_halloc_assert_consistency(buf, 1024)) { - fprintf( - stderr, - "Consistency check failed. (At index=%d, %s:%d)\n", - i, - __FILE__, - __LINE__); - fprintf(stderr, buf); - ASSERT_TRUE(false); - } - } - ASSERT_EQ((int) halloc_start->size * 4, MAX_HEAP_SIZE - 4); - - return 0; -} - -TEST(memory, halloc_free_alloc) -{ - if (halloc_start) { - wipeout_halloc(); - } - - new_test_struct(); - struct TEST_STRUCT2* test2 = new_test_struct2(); - new_test_struct(); - struct TEST_STRUCT2* test4 = new_test_struct2(); - new_test_struct2(); - - hfree(test4); - - struct TEST_STRUCT2* test6 = new_test_struct2(); - - // test_6 should have been allocated in test_4's spot. - ASSERT_EQ(test6, test4); - - hfree(test2); - struct TEST_STRUCT* test7 = new_test_struct(); - struct TEST_STRUCT* test8 = new_test_struct(); - - // Test 2 was large enough to accomodate 3 smaller structs. - ASSERT_EQ(V(test7), V(test2)); - ASSERT_EQ(V(test8), V(test2) + sizeof(*test7) + 4); - - return 0; -} diff --git a/02-usart/tests/test_spi.c b/02-usart/tests/test_spi.c deleted file mode 100644 index cc25d6e..0000000 --- a/02-usart/tests/test_spi.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "test_harness.h" - -#include "arch/stm32l4xxx/peripherals/spi.h" - -TEST(spi, smoke) -{ - __IO spi_t* spi = &SPI1; - spi->s_r = 1; - - return 0; -} diff --git a/02-usart/tests/test_usart.c b/02-usart/tests/test_usart.c deleted file mode 100644 index b19d687..0000000 --- a/02-usart/tests/test_usart.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "test_harness.h" -#include "arch/stm32l4xxx/peripherals/usart.h" - -#include <stdlib.h> - -TEST(usart, enable_dma) -{ - __IO usart_t* usart = &USART1; - - usart->c_r3 = 0; - - usart_enable_dma(usart, USART_ENABLE_TX); - ASSERT_EQ(usart->c_r3, 128); - - usart_enable_dma(usart, USART_ENABLE_RX); - ASSERT_EQ(usart->c_r3, 192); - - usart_enable_dma(usart, USART_ENABLE_DISABLED); - ASSERT_EQ(usart->c_r3, 0); - - return 0; -} |