misc : libnds includes, Result => s32

diff --git a/arm11u/Makefile b/arm11u/Makefile
index 8690c1d691f1c475d83d2d7e556817346ee6495c..8f02861235942d35b135f39472bf2f3eeca00f06 100644 (file)
--- a/arm11u/Makefile
+++ b/arm11u/Makefile
@@ -2,7 +2,7 @@ CC = arm-none-eabi-gcc
 LINK = arm-none-eabi-ld
 OBJCOPY = arm-none-eabi-objcopy
 CTRULIB = "../libctru"
-CFLAGS += -Wall -std=c99 -march=armv6 -O3 -I"$(CTRULIB)/include"
+CFLAGS += -Wall -std=c99 -march=armv6 -O3 -I"$(CTRULIB)/include" -I$(DEVKITPRO)/libnds/include
 LDFLAGS += --script=ccd00.ld -L"$(DEVKITARM)/arm-none-eabi/lib" -L"$(CTRULIB)/lib"
 
 CFILES = $(wildcard source/*.c)

diff --git a/libctru/Makefile b/libctru/Makefile
index 92c78e4dfab22243cbbf3aaa35e3532532c9083a..7279fec0389b67844cef7477f0cc207acf703201 100644 (file)
--- a/libctru/Makefile
+++ b/libctru/Makefile
@@ -1,6 +1,6 @@
 CC = arm-none-eabi-gcc
 AR = arm-none-eabi-ar
-CFLAGS += -Wall -std=c99 -march=armv6 -O0 -I"$(CURDIR)/include/"
+CFLAGS += -Wall -std=c99 -march=armv6 -O0 -I"$(CURDIR)/include/" -I$(DEVKITPRO)/libnds/include
 
 CFILES = $(wildcard source/*.c)
 OFILES = $(CFILES:source/%.c=build/%.o)

diff --git a/libctru/include/ctr/types.h b/libctru/include/ctr/types.h
index b3b49878d65933410a222cf124dc3d2962fa1df3..c272e538608365b0eb6a351d6baa9fe65fc1bb1c 100644 (file)
--- a/libctru/include/ctr/types.h
+++ b/libctru/include/ctr/types.h
@@ -19,6 +19,6 @@
        typedef u16 wchar;
 
        typedef u32 Handle;
-       typedef u32 Result;
+       typedef s32 Result;
 
 #endif

diff --git a/libctru/source/srv.c b/libctru/source/srv.c
index e853b9e3d5e02ca570c9d31c0718ddc74f90aa2d..aec7941c8d986678b0b2cecbddf7a6337039f343 100644 (file)
--- a/libctru/source/srv.c
+++ b/libctru/source/srv.c
@@ -31,7 +31,7 @@ Result srv_getServiceHandle(Handle* handleptr, Handle* out, char* server)
 {
        if(!handleptr)handleptr=&srvHandle;
        u8 l=strlen(server);
-       if(!out || !server || l>8)return;
+       if(!out || !server || l>8)return -1;
 
        u32* cmdbuf=getThreadCommandBuffer();
 

diff --git a/sdmc/Makefile b/sdmc/Makefile
index 4065b70a1d7219b6f07604b6211efe8907e76ad2..4196b20d5c27c753bb3fd612fcaa0c0f4f3df610 100644 (file)
--- a/sdmc/Makefile
+++ b/sdmc/Makefile
@@ -3,7 +3,7 @@ LINK = arm-none-eabi-ld
 AS = arm-none-eabi-as
 OBJCOPY = arm-none-eabi-objcopy
 CTRULIB = "../libctru"
-CFLAGS += -Wall -std=c99 -march=armv6 -O3 -I"$(CTRULIB)/include"
+CFLAGS += -Wall -std=c99 -march=armv6 -O3 -I"$(CTRULIB)/include" -I$(DEVKITPRO)/libnds/include
 LDFLAGS += --script=ccd00.ld -L"$(DEVKITARM)/arm-none-eabi/lib" -L"$(CTRULIB)/lib"
 
 CFILES = $(wildcard source/*.c)