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

Fixed part14's Makefile.gcc after testing and made some required changes to the codebase

Browse source
This commit is contained in:
isometimes 2021-10-18 10:31:02 +01:00
parent 0646fe7c22
commit cd2b15ef6a
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
part14-ethernet/Makefile.gcc
View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c) CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c)
SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S) SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S)
OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o) OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles GCCFLAGS = -Wall -O2 -ffreestanding -nostdlib -nostartfiles
GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

2
part14-ethernet/lib/spi.c
View file

@ -1,4 +1,5 @@
#include "../include/io.h" #include "../include/io.h"
#include "../include/fb.h"
// SPI // SPI
@ -83,6 +84,7 @@ void spi_send_recv(unsigned char *sbuffer, unsigned char *rbuffer, unsigned int
while(!(REGS_SPI0->cs & CS_DONE)) { while(!(REGS_SPI0->cs & CS_DONE)) {
while(REGS_SPI0->cs & CS_RXD) { while(REGS_SPI0->cs & CS_RXD) {
unsigned int r = REGS_SPI0->fifo; unsigned int r = REGS_SPI0->fifo;
debughex(r);
} }
} }

2
part14-ethernet/net/enc28j60.c
View file

@ -191,7 +191,7 @@ static void calibrate(void)
* Software delay in µs * Software delay in µs
* us: the number of µs to wait * us: the number of µs to wait
**/ **/
__inline void up_udelay(uint32_t us) static __inline void up_udelay(uint32_t us)
{ {
volatile uint32_t i; volatile uint32_t i;

2
part14-ethernet/net/enc28j60.h
View file

@ -811,6 +811,6 @@ void ENC_GetPkcnt(ENC_HandleTypeDef *handle);
* *
****************************************************************************/ ****************************************************************************/
__inline void up_udelay(uint32_t us); //__inline void up_udelay(uint32_t us);
#endif /* ENC28J60_H_INCLUDED */ #endif /* ENC28J60_H_INCLUDED */