Compare commits
2 Commits
137ec0fd74
...
6d0a60881c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d0a60881c
|
||
|
|
c265a35cc6
|
4
Makefile
4
Makefile
@@ -5,7 +5,7 @@ CPU = -mcpu=cortex-m4
|
||||
THUMB = -mthumb
|
||||
|
||||
LDFLAGS = -T linker.ld
|
||||
CFLAGS = $(CPU) $(THUMB)
|
||||
CFLAGS = $(CPU) $(THUMB) -I libc/ -I ./
|
||||
|
||||
QEMU = qemu-system-arm
|
||||
BOARD = netduino2
|
||||
@@ -13,7 +13,7 @@ BOARD = netduino2
|
||||
# Output file
|
||||
TARGET = main.elf
|
||||
# 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
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
#include "library.h"
|
||||
|
||||
volatile unsigned int *const USART1_PTR = (unsigned int *)0x40011004;
|
||||
#include "os/driver/usart.h"
|
||||
|
||||
void puts(const char *s) {
|
||||
while(*s != '\0') { /* Loop until end of string */
|
||||
*USART1_PTR= (unsigned int)(*s); /* Transmit char */
|
||||
s++; /* Next char */
|
||||
}
|
||||
usart_tx_write_string(s);
|
||||
}
|
||||
|
||||
18
os/delay.c
Normal file
18
os/delay.c
Normal 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
2
os/delay.h
Normal 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
57
os/driver/usart.c
Normal 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
12
os/driver/usart.h
Normal 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);
|
||||
@@ -1,15 +1,23 @@
|
||||
#include "process.h"
|
||||
#include "alloc.h"
|
||||
#include <stdint.h>
|
||||
|
||||
void create_process_table(ProcessTable **table) {
|
||||
*table = malloc(sizeof(ProcessTable));
|
||||
(*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) {
|
||||
if (table->entries>=MAX_PROCESS) return 1;
|
||||
|
||||
Process *pentry = &table->process_list[table->entries++];
|
||||
pentry->entrypoint = entrypoint;
|
||||
pentry->stack = create_stack(STACK_SIZE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
10
os/process.h
10
os/process.h
@@ -1,3 +1,4 @@
|
||||
#include <stddef.h>
|
||||
#ifndef PROCESS_H
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -7,9 +8,14 @@
|
||||
#define STACK_SIZE 32
|
||||
#define STACK_START(stack) (&stack[STACK_SIZE-1])
|
||||
|
||||
typedef struct {
|
||||
uint32_t stack_size;
|
||||
uint32_t stack[];
|
||||
} ProcessStack;
|
||||
|
||||
typedef struct {
|
||||
int (*entrypoint)();
|
||||
uint32_t stack[STACK_SIZE];
|
||||
ProcessStack* stack;
|
||||
} Process;
|
||||
|
||||
typedef struct {
|
||||
@@ -19,5 +25,7 @@ typedef struct {
|
||||
|
||||
void create_process_table(ProcessTable **table);
|
||||
|
||||
ProcessStack* create_stack(size_t size);
|
||||
|
||||
int create_process(ProcessTable *table, void *entrypoint);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user