From 4a19fb7022e6c6d7ac15fc87340b5e87c31ae56d Mon Sep 17 00:00:00 2001 From: plutoo Date: Thu, 11 Jan 2018 21:38:12 +0100 Subject: [PATCH] Hide utf under runtime/, fix headers --- nx/Makefile | 2 +- nx/include/switch.h | 8 ++++---- nx/include/switch/{ => runtime}/devices/console.h | 0 nx/include/switch/{ => runtime}/devices/fs_dev.h | 0 nx/include/switch/{ => runtime}/devices/usb_comms.h | 0 nx/include/switch/{ => runtime}/util/utf.h | 0 nx/source/{ => runtime}/util/utf/decode_utf16.c | 2 +- nx/source/{ => runtime}/util/utf/decode_utf8.c | 2 +- nx/source/{ => runtime}/util/utf/encode_utf16.c | 2 +- nx/source/{ => runtime}/util/utf/encode_utf8.c | 2 +- nx/source/{ => runtime}/util/utf/utf16_to_utf32.c | 2 +- nx/source/{ => runtime}/util/utf/utf16_to_utf8.c | 2 +- nx/source/{ => runtime}/util/utf/utf32_to_utf16.c | 2 +- nx/source/{ => runtime}/util/utf/utf32_to_utf8.c | 2 +- nx/source/{ => runtime}/util/utf/utf8_to_utf16.c | 2 +- nx/source/{ => runtime}/util/utf/utf8_to_utf32.c | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename nx/include/switch/{ => runtime}/devices/console.h (100%) rename nx/include/switch/{ => runtime}/devices/fs_dev.h (100%) rename nx/include/switch/{ => runtime}/devices/usb_comms.h (100%) rename nx/include/switch/{ => runtime}/util/utf.h (100%) rename nx/source/{ => runtime}/util/utf/decode_utf16.c (91%) rename nx/source/{ => runtime}/util/utf/decode_utf8.c (97%) rename nx/source/{ => runtime}/util/utf/encode_utf16.c (89%) rename nx/source/{ => runtime}/util/utf/encode_utf8.c (95%) rename nx/source/{ => runtime}/util/utf/utf16_to_utf32.c (93%) rename nx/source/{ => runtime}/util/utf/utf16_to_utf8.c (95%) rename nx/source/{ => runtime}/util/utf/utf32_to_utf16.c (93%) rename nx/source/{ => runtime}/util/utf/utf32_to_utf8.c (94%) rename nx/source/{ => runtime}/util/utf/utf8_to_utf16.c (95%) rename nx/source/{ => runtime}/util/utf/utf8_to_utf32.c (93%) diff --git a/nx/Makefile b/nx/Makefile index 330d3366..b2a3ffc7 100644 --- a/nx/Makefile +++ b/nx/Makefile @@ -24,7 +24,7 @@ VERSION := $(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH) #--------------------------------------------------------------------------------- TARGET := nx #BUILD := build -SOURCES := source/arm source/runtime source/kernel source/runtime/devices source/services source/gfx source/gfx/ioctl source/util/utf +SOURCES := source/arm source/runtime source/kernel source/runtime/devices source/services source/gfx source/gfx/ioctl source/runtime/util/utf DATA := data INCLUDES := include diff --git a/nx/include/switch.h b/nx/include/switch.h index b000c904..0ab59a6d 100644 --- a/nx/include/switch.h +++ b/nx/include/switch.h @@ -43,11 +43,11 @@ extern "C" { #include #include -#include +#include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus } diff --git a/nx/include/switch/devices/console.h b/nx/include/switch/runtime/devices/console.h similarity index 100% rename from nx/include/switch/devices/console.h rename to nx/include/switch/runtime/devices/console.h diff --git a/nx/include/switch/devices/fs_dev.h b/nx/include/switch/runtime/devices/fs_dev.h similarity index 100% rename from nx/include/switch/devices/fs_dev.h rename to nx/include/switch/runtime/devices/fs_dev.h diff --git a/nx/include/switch/devices/usb_comms.h b/nx/include/switch/runtime/devices/usb_comms.h similarity index 100% rename from nx/include/switch/devices/usb_comms.h rename to nx/include/switch/runtime/devices/usb_comms.h diff --git a/nx/include/switch/util/utf.h b/nx/include/switch/runtime/util/utf.h similarity index 100% rename from nx/include/switch/util/utf.h rename to nx/include/switch/runtime/util/utf.h diff --git a/nx/source/util/utf/decode_utf16.c b/nx/source/runtime/util/utf/decode_utf16.c similarity index 91% rename from nx/source/util/utf/decode_utf16.c rename to nx/source/runtime/util/utf/decode_utf16.c index 086f10b8..47cc2f4d 100644 --- a/nx/source/util/utf/decode_utf16.c +++ b/nx/source/runtime/util/utf/decode_utf16.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t decode_utf16(uint32_t *out, diff --git a/nx/source/util/utf/decode_utf8.c b/nx/source/runtime/util/utf/decode_utf8.c similarity index 97% rename from nx/source/util/utf/decode_utf8.c rename to nx/source/runtime/util/utf/decode_utf8.c index a4bd3f25..7554ad92 100644 --- a/nx/source/util/utf/decode_utf8.c +++ b/nx/source/runtime/util/utf/decode_utf8.c @@ -1,4 +1,4 @@ -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t decode_utf8(uint32_t *out, diff --git a/nx/source/util/utf/encode_utf16.c b/nx/source/runtime/util/utf/encode_utf16.c similarity index 89% rename from nx/source/util/utf/encode_utf16.c rename to nx/source/runtime/util/utf/encode_utf16.c index 4a56fc9f..baed345b 100644 --- a/nx/source/util/utf/encode_utf16.c +++ b/nx/source/runtime/util/utf/encode_utf16.c @@ -1,4 +1,4 @@ -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t encode_utf16(uint16_t *out, diff --git a/nx/source/util/utf/encode_utf8.c b/nx/source/runtime/util/utf/encode_utf8.c similarity index 95% rename from nx/source/util/utf/encode_utf8.c rename to nx/source/runtime/util/utf/encode_utf8.c index 611606c7..c5dc42cf 100644 --- a/nx/source/util/utf/encode_utf8.c +++ b/nx/source/runtime/util/utf/encode_utf8.c @@ -1,4 +1,4 @@ -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t encode_utf8(uint8_t *out, diff --git a/nx/source/util/utf/utf16_to_utf32.c b/nx/source/runtime/util/utf/utf16_to_utf32.c similarity index 93% rename from nx/source/util/utf/utf16_to_utf32.c rename to nx/source/runtime/util/utf/utf16_to_utf32.c index fd119842..5e2af244 100644 --- a/nx/source/util/utf/utf16_to_utf32.c +++ b/nx/source/runtime/util/utf/utf16_to_utf32.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf16_to_utf32(uint32_t *out, diff --git a/nx/source/util/utf/utf16_to_utf8.c b/nx/source/runtime/util/utf/utf16_to_utf8.c similarity index 95% rename from nx/source/util/utf/utf16_to_utf8.c rename to nx/source/runtime/util/utf/utf16_to_utf8.c index 187531f3..b5fed36f 100644 --- a/nx/source/util/utf/utf16_to_utf8.c +++ b/nx/source/runtime/util/utf/utf16_to_utf8.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf16_to_utf8(uint8_t *out, diff --git a/nx/source/util/utf/utf32_to_utf16.c b/nx/source/runtime/util/utf/utf32_to_utf16.c similarity index 93% rename from nx/source/util/utf/utf32_to_utf16.c rename to nx/source/runtime/util/utf/utf32_to_utf16.c index d3385153..75b3643f 100644 --- a/nx/source/util/utf/utf32_to_utf16.c +++ b/nx/source/runtime/util/utf/utf32_to_utf16.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf32_to_utf16(uint16_t *out, diff --git a/nx/source/util/utf/utf32_to_utf8.c b/nx/source/runtime/util/utf/utf32_to_utf8.c similarity index 94% rename from nx/source/util/utf/utf32_to_utf8.c rename to nx/source/runtime/util/utf/utf32_to_utf8.c index f195765e..b7025fd0 100644 --- a/nx/source/util/utf/utf32_to_utf8.c +++ b/nx/source/runtime/util/utf/utf32_to_utf8.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf32_to_utf8(uint8_t *out, diff --git a/nx/source/util/utf/utf8_to_utf16.c b/nx/source/runtime/util/utf/utf8_to_utf16.c similarity index 95% rename from nx/source/util/utf/utf8_to_utf16.c rename to nx/source/runtime/util/utf/utf8_to_utf16.c index 07878860..48653cb6 100644 --- a/nx/source/util/utf/utf8_to_utf16.c +++ b/nx/source/runtime/util/utf/utf8_to_utf16.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf8_to_utf16(uint16_t *out, diff --git a/nx/source/util/utf/utf8_to_utf32.c b/nx/source/runtime/util/utf/utf8_to_utf32.c similarity index 93% rename from nx/source/util/utf/utf8_to_utf32.c rename to nx/source/runtime/util/utf/utf8_to_utf32.c index ada522e5..fe70a560 100644 --- a/nx/source/util/utf/utf8_to_utf32.c +++ b/nx/source/runtime/util/utf/utf8_to_utf32.c @@ -1,5 +1,5 @@ #include "switch/types.h" -#include "switch/util/utf.h" +#include "switch/runtime/util/utf.h" ssize_t utf8_to_utf32(uint32_t *out,