jordan/rpi4-osdev
1
0
Fork 0
mirror of https://github.com/isometimes/rpi4-osdev synced 2024-11-09 20:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated part14 to reflect changes to part13

Browse source
This commit is contained in:
babbleberry 2024-02-06 12:22:54 +00:00
parent 31bb21b323
commit 71c3b30bd0
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
part14-spi-ethernet/kernel/irq.c
View file

@ -11,7 +11,7 @@ void disable_interrupt_controller() {
void handle_irq() { void handle_irq() {
unsigned int irq = REGS_IRQ->irq0_pending_0; unsigned int irq = REGS_IRQ->irq0_pending_0;
while(irq) { while(irq & (SYS_TIMER_IRQ_1 | SYS_TIMER_IRQ_3)) {
if (irq & SYS_TIMER_IRQ_1) { if (irq & SYS_TIMER_IRQ_1) {
irq &= ~SYS_TIMER_IRQ_1; irq &= ~SYS_TIMER_IRQ_1;

1
part14-spi-ethernet/kernel/kernel.c
View file

@ -147,6 +147,7 @@ void main(void)
irq_init_vectors(); irq_init_vectors();
enable_interrupt_controller(); enable_interrupt_controller();
irq_barrier();
irq_enable(); irq_enable();
timer_init(); timer_init();

1
part14-spi-ethernet/kernel/kernel.h
View file

@ -38,6 +38,7 @@ enum vc_irqs {
void irq_init_vectors(); void irq_init_vectors();
void irq_enable(); void irq_enable();
void irq_barrier();
void irq_disable(); void irq_disable();
void enable_interrupt_controller(); void enable_interrupt_controller();
void disable_interrupt_controller(); void disable_interrupt_controller();

5
part14-spi-ethernet/kernel/utils.S
View file

@ -13,3 +13,8 @@ irq_enable:
irq_disable: irq_disable:
msr daifset, #2 msr daifset, #2
ret ret
.globl irq_barrier
irq_barrier:
dsb sy
ret