From f3fbd4c9cef34ac632e5650026485bb007fcefb0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 17 Feb 2015 02:04:19 +0100
Subject: [PATCH] Move nbio to libretro-SDK - best place for it currently

---
 Makefile.common                               |  2 +-
 griffin/griffin.c                             |  2 +-
 {nbio => libretro-sdk/file/nbio}/Makefile     |  2 +-
 {nbio => libretro-sdk/file/nbio}/nbio_stdio.c |  3 ++-
 {nbio => libretro-sdk/file/nbio}/nbio_test.c  | 11 ++++++-----
 {nbio => libretro-sdk/include/file}/nbio.h    |  0
 6 files changed, 11 insertions(+), 9 deletions(-)
 rename {nbio => libretro-sdk/file/nbio}/Makefile (76%)
 rename {nbio => libretro-sdk/file/nbio}/nbio_stdio.c (99%)
 rename {nbio => libretro-sdk/file/nbio}/nbio_test.c (90%)
 rename {nbio => libretro-sdk/include/file}/nbio.h (100%)

diff --git a/Makefile.common b/Makefile.common
index 9ad95d5d7b..07e239d29c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -100,7 +100,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/file/dir_list.o \
 		libretro-sdk/string/string_list.o \
 		file_ops.o \
-		nbio/nbio_stdio.o \
+		libretro-sdk/file//nbio/nbio_stdio.o \
 		libretro-sdk/file/file_path.o \
 		hash.o \
 		audio/audio_driver.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 52080a9fd5..19574c3b8b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -566,7 +566,7 @@ FILE
 #include "../libretro-sdk/file/dir_list.c"
 #include "../libretro-sdk/string/string_list.c"
 #include "../file_ops.c"
-#include "../nbio/nbio_stdio.c"
+#include "../libretro-sdk/file/nbio/nbio_stdio.c"
 #include "../libretro-sdk/file/file_list.c"
 
 /*============================================================
diff --git a/nbio/Makefile b/libretro-sdk/file/nbio/Makefile
similarity index 76%
rename from nbio/Makefile
rename to libretro-sdk/file/nbio/Makefile
index cb5d46fa28..39f1c51092 100644
--- a/nbio/Makefile
+++ b/libretro-sdk/file/nbio/Makefile
@@ -3,7 +3,7 @@ TARGET := nbio_test
 SOURCES := $(wildcard *.c)
 OBJS := $(SOURCES:.c=.o)
 
-CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -I../libretro-sdk/include
+CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -I../../include
 
 all: $(TARGET)
 
diff --git a/nbio/nbio_stdio.c b/libretro-sdk/file/nbio/nbio_stdio.c
similarity index 99%
rename from nbio/nbio_stdio.c
rename to libretro-sdk/file/nbio/nbio_stdio.c
index 796dd3f2e0..3fd7a19df4 100644
--- a/nbio/nbio_stdio.c
+++ b/libretro-sdk/file/nbio/nbio_stdio.c
@@ -1,7 +1,8 @@
-#include "nbio.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <file/nbio.h>
+
 struct nbio_t
 {
    FILE* f;
diff --git a/nbio/nbio_test.c b/libretro-sdk/file/nbio/nbio_test.c
similarity index 90%
rename from nbio/nbio_test.c
rename to libretro-sdk/file/nbio/nbio_test.c
index 4e2f4ab9c2..3fadf8f888 100644
--- a/nbio/nbio_test.c
+++ b/libretro-sdk/file/nbio/nbio_test.c
@@ -1,10 +1,11 @@
-#include "nbio.h"
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
+#include <file/nbio.h>
 
 static void nbio_write_test(void)
 {
-   size_t size, prog;
+   size_t size;
    bool looped = false;
    void* ptr = NULL;
    struct nbio_t* write = nbio_open("test.bin", NBIO_WRITE);
@@ -18,7 +19,7 @@ static void nbio_write_test(void)
    memset(ptr, 0x42, 1024*1024);
    nbio_begin_write(write);
 
-   while (!nbio_iterate(write, &prog, &size)) looped=true;
+   while (!nbio_iterate(write)) looped=true;
 
    if (!looped)
       puts("Write finished immediately?");
@@ -28,7 +29,7 @@ static void nbio_write_test(void)
 
 static void nbio_read_test(void)
 {
-   size_t size, prog;
+   size_t size;
    bool looped = false;
    struct nbio_t* read = nbio_open("test.bin", NBIO_READ);
    void* ptr           = nbio_get_ptr(read, &size);
diff --git a/nbio/nbio.h b/libretro-sdk/include/file/nbio.h
similarity index 100%
rename from nbio/nbio.h
rename to libretro-sdk/include/file/nbio.h