From 9b8afc8450fed17a3c01857f820b52861332b9c2 Mon Sep 17 00:00:00 2001
From: Ivan Velickovic <i.velickovic@unsw.edu.au>
Date: Fri, 19 Jan 2024 11:34:40 +1100
Subject: [PATCH] examples/virtio: fix for latest sDDF

Some minor breaking changes with includes and defines
---
 examples/virtio/Makefile | 3 ++-
 examples/virtio/sddf     | 2 +-
 examples/virtio/vmm.c    | 2 +-
 src/virtio/mmio.h        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile
index 9577d630..9b059aa8 100644
--- 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
index f135a1b9..91685a62 160000
--- a/examples/virtio/sddf
+++ b/examples/virtio/sddf
@@ -1 +1 @@
-Subproject commit f135a1b9f94f11a6ba63b972fc44dc41821e8f11
+Subproject commit 91685a6215af13bca7fa6080efd53cd7726eaef5
diff --git a/examples/virtio/vmm.c b/examples/virtio/vmm.c
index 22e675f4..953bb336 100644
--- 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
index a3231ec0..c9534190 100644
--- 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"