From 880831b2fdd80068f4bee91473ae7edba6b11a78 Mon Sep 17 00:00:00 2001
From: J Reece Wilson <me@reece.sx>
Date: Mon, 18 Sep 2023 07:21:05 +0100
Subject: [PATCH] [*] Fix IO regressions

---
 Aurora/Runtime                    |  2 +-
 Tests/Public/4. Hello FS/Main.cpp | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Aurora/Runtime b/Aurora/Runtime
index ab6f00f..5d12f1a 160000
--- a/Aurora/Runtime
+++ b/Aurora/Runtime
@@ -1 +1 @@
-Subproject commit ab6f00f0941317ea65781733b6c1c89d639b0c7e
+Subproject commit 5d12f1a203ff731b685c0163ad62671857b34f4d
diff --git a/Tests/Public/4. Hello FS/Main.cpp b/Tests/Public/4. Hello FS/Main.cpp
index 0cd9741..3d0c60f 100644
--- a/Tests/Public/4. Hello FS/Main.cpp	
+++ b/Tests/Public/4. Hello FS/Main.cpp	
@@ -43,20 +43,19 @@ Test 3)
 */
 TEST(FS, WriteRead)
 {
-    AuByteBuffer rngbuffer(32);
+    AuByteBuffer rngbuffer(32 * 1024);
     AuByteBuffer inputblob;
-    AuRng::RngFillRange(rngbuffer);
+    AuRng::RngFillBuffer(rngbuffer);
 
     for (int i = 0; i < 1000; i++)
     {
-        inputblob.writePtr = inputblob.base;
-
+        inputblob.writePtr = inputblob.readPtr = inputblob.base;
         // Write and read back the RNG blob from a read/writable CWD
         ASSERT_TRUE(AuIOFS::WriteFile("./test_rng_blob", rngbuffer));
         ASSERT_TRUE(AuIOFS::ReadFile("./test_rng_blob", inputblob));
         ASSERT_EQ(inputblob, rngbuffer);
 
-        inputblob.writePtr = inputblob.base;
+        inputblob.writePtr = inputblob.readPtr = inputblob.base;
 
         // Write and read back the RNG blob from a user specific application directory
         // Defer to brand: Aurora::RuntimeStartInfo#fio.defaultBrand
@@ -70,7 +69,7 @@ TEST(FS, WriteCopyRead)
 {
     AuByteBuffer rngbuffer(32);
     AuByteBuffer inputblob;
-    AuRng::RngFillRange(rngbuffer);
+    AuRng::RngFillBuffer(rngbuffer);
 
     ASSERT_TRUE(AuIOFS::WriteFile("./test_rng_blob_1", rngbuffer));
 
@@ -85,7 +84,7 @@ TEST(FS, WriteMove)
 {
     AuByteBuffer rngbuffer(32);
     AuByteBuffer inputblob;
-    AuRng::RngFillRange(rngbuffer);
+    AuRng::RngFillBuffer(rngbuffer);
 
     ASSERT_TRUE(AuIOFS::WriteFile("./test_rng_blob_1", rngbuffer));
 
@@ -423,8 +422,8 @@ void RunTests()
 {
     Aurora::RuntimeStartInfo info;
     info.console.fio.bEnableLogging = false;
-    info.fio.defaultBrand = "AuSdkBrand";
-    info.bFIODisableBatching = false;
+    info.fio.optDefaultBrand = "AuSdkBrand";
+    info.linuxConfig.bFIODisableBatching = false;
     Aurora::RuntimeStart(info);
 
     PrintSystemRoot();