examples/virtio: fix for latest sDDF

Some minor breaking changes with includes and defines
au-ts · Jan 19, 2024 · 9b8afc8 · 9b8afc8
1 parent 849fade
commit 9b8afc8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile
@@ -119,6 +119,7 @@ CFLAGS := -mstrict-align \
 		  -I$(SDDF_SERIAL_RINGBUFFER)/include \
 		  -I$(SDDF_SERIAL_DRIVER)/include \
 		  -I$(SDDF) \
+		  -I$(SDDF)/include \
 		  -DBOARD_$(BOARD) \
 		  -DCONFIG_$(CONFIG) \
 		  -target aarch64-none-elf
@@ -173,7 +174,7 @@ $(BUILD_DIR)/%.o: $(VMM_SRC_DIR)/virtio/%.c Makefile
 	$(CC) -c $(CFLAGS) $< -o $@
 
 $(BUILD_DIR)/%.o: $(SDDF_SERIAL_COMPONENTS)/%.c Makefile
-	$(CC) -c $(CFLAGS) -DNUM_CLIENTS=2 -DTRANSFER_WITH_COLOUR=1 $< -o $@
+	$(CC) -c $(CFLAGS) -DSERIAL_NUM_CLIENTS=2 -DSERIAL_TRANSFER_WITH_COLOUR=1 $< -o $@
 
 $(BUILD_DIR)/%.o: $(SDDF_SERIAL_RINGBUFFER)/%.c Makefile
 	$(CC) -c $(CFLAGS) $< -o $@

diff --git a/examples/virtio/sddf b/examples/virtio/sddf
diff --git a/examples/virtio/vmm.c b/examples/virtio/vmm.c
@@ -16,7 +16,7 @@
 #include "vcpu.h"
 #include "virtio/virtio.h"
 #include "virtio/console.h"
-#include "serial/libserialsharedringbuffer/include/shared_ringbuffer.h"
+#include <sddf/serial/shared_ringbuffer.h>
 
 /*
  * As this is just an example, for simplicity we just make the size of the

diff --git a/src/virtio/mmio.h b/src/virtio/mmio.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include "util/util.h"
 #include "virtio/virtq.h"
-#include "serial/libserialsharedringbuffer/include/shared_ringbuffer.h"
+#include <sddf/serial/shared_ringbuffer.h>
 
 // table 4.1
 #define VIRTIO_MMIO_DEV_MAGIC               0x74726976 // "virt"
+52 −0		.github/workflows/ci.yaml
+56 −38		README.md
+73 −0		ci/examples.sh
+1 −1		drivers/i2c/meson/include/sw_shared_ringbuffer.h
+40 −28		drivers/network/imx/ethernet.c
+19 −35		drivers/network/meson/ethernet.c
+1 −1		drivers/serial/arm/include/uart.h
+1 −1		drivers/serial/arm/uart.c
+1 −1		drivers/serial/meson/include/uart.h
+1 −5		drivers/serial/meson/uart.c
+4 −11		examples/echo_server/Makefile
+18 −0		examples/echo_server/README.md
+5 −4		examples/echo_server/echo_server.system
+4 −9		examples/serial_two_client/Makefile
+2 −1		examples/serial_two_client/include/serial_server.h
+1 −2		examples/serial_two_client/serial_server_1.c
+1 −2		examples/serial_two_client/serial_server_2.c
+1 −1		examples/timer/Makefile
+1 −1		include/sddf/network/shared_ringbuffer.h
+13 −90		include/sddf/serial/shared_ringbuffer.h
+20 −0		include/sddf/serial/util.h
+83 −9		network/components/arp.c
+30 −33		network/components/copy.c
+47 −18		network/components/lwip.c
+37 −31		network/components/mux_rx.c
+37 −19		network/components/mux_tx.c
+14 −1		network/components/udp_echo_socket.c
+2 −4		network/components/utilization_socket.c
+0 −1		network/ipstacks/lwip/src/core/ipv4/ip4.c
+0 −1		network/ipstacks/lwip/src/core/tcp_in.c
+0 −1		network/ipstacks/lwip/src/core/udp.c
+1 −1		network/libethsharedringbuffer/shared_ringbuffer.c
+14 −12		serial/components/mux_rx.c
+14 −12		serial/components/mux_tx.c
+32 −0		serial/libserialsharedringbuffer/Makefile
+103 −1		serial/libserialsharedringbuffer/shared_ringbuffer.c
+2 −9		util/include/util.h