Compare commits

...

2 Commits

Author SHA1 Message Date
Matte23
6d0a60881c Add example USART driver 2024-11-03 12:04:40 +01:00
Matte23
c265a35cc6 Add base code for custom stack length 2024-11-03 11:51:19 +01:00
8 changed files with 110 additions and 9 deletions

View File

@@ -5,7 +5,7 @@ CPU = -mcpu=cortex-m4
THUMB = -mthumb THUMB = -mthumb
LDFLAGS = -T linker.ld LDFLAGS = -T linker.ld
CFLAGS = $(CPU) $(THUMB) CFLAGS = $(CPU) $(THUMB) -I libc/ -I ./
QEMU = qemu-system-arm QEMU = qemu-system-arm
BOARD = netduino2 BOARD = netduino2
@@ -13,7 +13,7 @@ BOARD = netduino2
# Output file # Output file
TARGET = main.elf TARGET = main.elf
# Source files # Source files
SRCS = os/main.c os/process.c os/scheduler.c os/alloc.c tasks/library.c tasks/tasks.c SRCS = os/main.c os/process.c os/scheduler.c os/alloc.c os/delay.c os/driver/usart.c libc/library.c tasks/tasks.c
# Object files # Object files
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)

View File

@@ -1,10 +1,6 @@
#include "library.h" #include "library.h"
#include "os/driver/usart.h"
volatile unsigned int *const USART1_PTR = (unsigned int *)0x40011004;
void puts(const char *s) { void puts(const char *s) {
while(*s != '\0') { /* Loop until end of string */ usart_tx_write_string(s);
*USART1_PTR= (unsigned int)(*s); /* Transmit char */
s++; /* Next char */
}
} }

18
os/delay.c Normal file
View File

@@ -0,0 +1,18 @@
#define CLOCK_FREQUENCY 120000
unsigned int ms_to_ticks(unsigned int ms) {
return ms * (CLOCK_FREQUENCY/3);
}
void delay_routine(unsigned int delay_counter) {
asm("mov r1, %[input]\n"
"loop_2:\n"
"subs r1, #1\n"
"cmp r1, #0\n"
"bne loop_2\n"
: [input] "=r" (delay_counter));
}
void delay_ms(unsigned int seconds) {
delay_routine(ms_to_ticks(seconds));
}

2
os/delay.h Normal file
View File

@@ -0,0 +1,2 @@
void delay_routine(unsigned int delay_counter);
void delay_ms(unsigned int ms);

57
os/driver/usart.c Normal file
View File

@@ -0,0 +1,57 @@
#include "usart.h"
#include "os/delay.h"
#include <stddef.h>
#include <stdint.h>
#define USART_SR_TXE (1 << 7)
typedef struct uart_s {
uint32_t USART_SR;
uint32_t USART_DR;
uint32_t USART_BRR;
uint32_t USART_CR1;
uint32_t USART_CR2;
uint32_t USART_CR3;
uint32_t USART_GTPR;
} uart_c;
volatile uart_c *const USART1 = (uart_c *)0x40011000;
static uint32_t usart_tx_ready(void) {
return (USART1->USART_SR & USART_SR_TXE) >> 7;
}
uint32_t usart_tx_write(const uint8_t *data_bytes, uint32_t n_bytes) {
if (data_bytes == NULL) return USART_TX_ERROR;
for (int i = 0; i < n_bytes; i++) {
unsigned int timeout = TIMEOUT;
while (!usart_tx_ready()) {
delay_ms(1);
timeout--;
if (timeout == 0) return USART_TX_BUSY;
}
USART1->USART_DR = *data_bytes;
data_bytes++;
}
return USART_TX_COMPLETE;
}
uint32_t usart_tx_write_string(const uint8_t *data_bytes) {
if (data_bytes == NULL) return USART_TX_ERROR;
while (*data_bytes != '\0') {
unsigned int timeout = TIMEOUT;
while (!usart_tx_ready()) {
delay_ms(1);
timeout--;
if (timeout == 0) return USART_TX_BUSY;
}
USART1->USART_DR = *data_bytes;
data_bytes++;
}
return USART_TX_COMPLETE;
}

12
os/driver/usart.h Normal file
View File

@@ -0,0 +1,12 @@
#include <stdint.h>
#define TIMEOUT 1000
enum UartErrorCode {
USART_TX_ERROR,
USART_TX_BUSY,
USART_TX_COMPLETE
};
static uint32_t usart_tx_ready(void);
uint32_t usart_tx_write(const uint8_t *data_bytes, uint32_t n_bytes);
uint32_t usart_tx_write_string(const uint8_t *data_bytes);

View File

@@ -1,15 +1,23 @@
#include "process.h" #include "process.h"
#include "alloc.h" #include "alloc.h"
#include <stdint.h>
void create_process_table(ProcessTable **table) { void create_process_table(ProcessTable **table) {
*table = malloc(sizeof(ProcessTable)); *table = malloc(sizeof(ProcessTable));
(*table)->entries = 0; (*table)->entries = 0;
} }
ProcessStack* create_stack(size_t size) {
ProcessStack* stack = malloc(sizeof(ProcessStack) + size*sizeof(uint32_t));
stack->stack_size = size;
return stack;
}
int create_process(ProcessTable *table, void *entrypoint) { int create_process(ProcessTable *table, void *entrypoint) {
if (table->entries>=MAX_PROCESS) return 1; if (table->entries>=MAX_PROCESS) return 1;
Process *pentry = &table->process_list[table->entries++]; Process *pentry = &table->process_list[table->entries++];
pentry->entrypoint = entrypoint; pentry->entrypoint = entrypoint;
pentry->stack = create_stack(STACK_SIZE);
return 0; return 0;
} }

View File

@@ -1,3 +1,4 @@
#include <stddef.h>
#ifndef PROCESS_H #ifndef PROCESS_H
#include <stdint.h> #include <stdint.h>
@@ -7,9 +8,14 @@
#define STACK_SIZE 32 #define STACK_SIZE 32
#define STACK_START(stack) (&stack[STACK_SIZE-1]) #define STACK_START(stack) (&stack[STACK_SIZE-1])
typedef struct {
uint32_t stack_size;
uint32_t stack[];
} ProcessStack;
typedef struct { typedef struct {
int (*entrypoint)(); int (*entrypoint)();
uint32_t stack[STACK_SIZE]; ProcessStack* stack;
} Process; } Process;
typedef struct { typedef struct {
@@ -19,5 +25,7 @@ typedef struct {
void create_process_table(ProcessTable **table); void create_process_table(ProcessTable **table);
ProcessStack* create_stack(size_t size);
int create_process(ProcessTable *table, void *entrypoint); int create_process(ProcessTable *table, void *entrypoint);
#endif #endif