External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-10-04 17:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement some missings todo, and add libpsprtc as standard library

Browse Source 
Remove -lm from examples because is also part of standard libraries
This commit is contained in:
Francisco Javier Trujillo Mata
2021-11-16 11:24:36 +01:00
parent c0f526059a
commit 77ab536474
29 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -13,10 +13,11 @@ RUN cd /src && \
make -j $(getconf _NPROCESSORS_ONLN) && \ make -j $(getconf _NPROCESSORS_ONLN) && \
make -j $(getconf _NPROCESSORS_ONLN) install make -j $(getconf _NPROCESSORS_ONLN) install
## gcc needs to include libcglue libpsputility libpspnet_inet libpspnet_resolver libpspuser libpspkernel ## gcc needs to include libcglue libpsputility libpsprtc libpspnet_inet libpspnet_resolver libpspuser libpspkernel
## from pspsdk to be able to build executables, because they are part of the standard libraries ## from pspsdk to be able to build executables, because they are part of the standard libraries
RUN ln -sf "$PSPDEV/psp/sdk/lib/libcglue.a" "$PSPDEV/psp/lib/libcglue.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libcglue.a" "$PSPDEV/psp/lib/libcglue.a" || { exit 1; }
RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsputility.a" "$PSPDEV/psp/lib/libpsputility.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsputility.a" "$PSPDEV/psp/lib/libpsputility.a" || { exit 1; }
RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsprtc.a" "$PSPDEV/psp/lib/libpsprtc.a" || { exit 1; }
RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_inet.a" "$PSPDEV/psp/lib/libpspnet_inet.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_inet.a" "$PSPDEV/psp/lib/libpspnet_inet.a" || { exit 1; }
RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_resolver.a" "$PSPDEV/psp/lib/libpspnet_resolver.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_resolver.a" "$PSPDEV/psp/lib/libpspnet_resolver.a" || { exit 1; }
RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspuser.a" "$PSPDEV/psp/lib/libpspuser.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspuser.a" "$PSPDEV/psp/lib/libpspuser.a" || { exit 1; }

6
src/libcglue/Makefile.am
View File

@@ -8,9 +8,11 @@ RANLIB = @PSP_RANLIB@
CPPFLAGS = -I$(top_srcdir)/src/base \ CPPFLAGS = -I$(top_srcdir)/src/base \
-I$(top_srcdir)/src/debug \ -I$(top_srcdir)/src/debug \
-I$(top_srcdir)/src/sdk \
-I$(top_srcdir)/src/kernel \ -I$(top_srcdir)/src/kernel \
-I$(top_srcdir)/src/net \ -I$(top_srcdir)/src/net \
-I$(top_srcdir)/src/sdk \ -I$(top_srcdir)/src/user \
-I$(top_srcdir)/src/rtc \
-I$(top_srcdir)/src/user \ -I$(top_srcdir)/src/user \
-I$(top_srcdir)/src/utility -I$(top_srcdir)/src/utility
CFLAGS = @PSPSDK_CFLAGS@ CFLAGS = @PSPSDK_CFLAGS@
@@ -25,7 +27,7 @@ FDMAN_OBJS = __descriptor_data_pool.o __descriptormap.o __fdman_init.o __fdman_g
GLUE_OBJS = __fill_stat.o __psp_heap_blockid.o __psp_free_heap.o _fork.o _wait.o _open.o _close.o _read.o _write.o _fstat.o \ GLUE_OBJS = __fill_stat.o __psp_heap_blockid.o __psp_free_heap.o _fork.o _wait.o _open.o _close.o _read.o _write.o _fstat.o \
_stat.o lstat.o access.o _fcntl.o _lseek.o chdir.o mkdir.o rmdir.o getdents.o _seekdir.o _link.o _unlink.o \ _stat.o lstat.o access.o _fcntl.o _lseek.o chdir.o mkdir.o rmdir.o getdents.o _seekdir.o _link.o _unlink.o \
_rename.o getcwd.o _getpid.o _kill.o _sbrk.o _gettimeofday.o _times.o _internal_malloc_lock.o _internal_malloc_unlock.o \ _rename.o _getpid.o _kill.o _sbrk.o _gettimeofday.o _times.o _internal_malloc_lock.o _internal_malloc_unlock.o \
_isatty.o symlink.o truncate.o chmod.o fchmod.o fchmodat.o pathconf.o readlink.o utime.o fchown.o getentropy.o _isatty.o symlink.o truncate.o chmod.o fchmod.o fchmodat.o pathconf.o readlink.o utime.o fchown.o getentropy.o

87
src/libcglue/glue.c
View File

@@ -36,6 +36,7 @@
#include <pspthreadman.h> #include <pspthreadman.h>
#include <psputils.h> #include <psputils.h>
#include <pspsdk.h> #include <pspsdk.h>
#include <psprtc.h>
#include "fdman.h" #include "fdman.h"
@@ -617,13 +618,6 @@ int _rename(const char *old, const char *new)
} }
#endif #endif
#ifdef F_getcwd
char *getcwd(char *buf, size_t len) {
strncpy(buf, __cwd, len);
return buf;
}
#endif
#ifdef F__getpid #ifdef F__getpid
pid_t _getpid(void) pid_t _getpid(void)
{ {
@@ -642,7 +636,7 @@ int _kill(pid_t pid, int sig)
pid_t _fork(void) pid_t _fork(void)
{ {
errno = ENOSYS; errno = ENOSYS;
return (pid_t) -1; return (pid_t) -1; /* not supported */
} }
#endif #endif
@@ -650,7 +644,7 @@ pid_t _fork(void)
pid_t _wait(int *unused) pid_t _wait(int *unused)
{ {
errno = ENOSYS; errno = ENOSYS;
return (pid_t) -1; return (pid_t) -1; /* not supported */
} }
#endif #endif
@@ -786,45 +780,62 @@ int truncate(const char *path, off_t length)
int _isatty(int fd) int _isatty(int fd)
{ {
errno = ENOTTY; errno = ENOTTY;
return 0; return -1; /* not supported */
} }
#endif #endif
#ifdef F_chmod #ifdef F_chmod
int chmod(const char *pathname, mode_t mode) int chmod(const char *pathname, mode_t mode)
{ {
// TODO: Implement proper functionality SceIoStat psp_stat;
char dest[MAXNAMLEN + 1];
int ret;
if(__path_absolute(pathname, dest, MAXNAMLEN) < 0) {
errno = ENAMETOOLONG;
return -1;
}
ret = sceIoGetstat(dest, &psp_stat);
if (ret < 0) {
return __set_errno(ret);
}
psp_stat.st_mode = (SceMode)mode;
ret = sceIoChstat(dest, &psp_stat, 0x0001);
if (ret < 0) {
return __set_errno(ret);
}
return 0; return 0;
} }
#endif #endif
#ifdef F_fchmod #ifdef F_fchmod
int fchmod(int filedes, mode_t mode) int fchmod(int fd, mode_t mode)
{ {
// TODO: Implement proper functionality return chmod(__descriptormap[fd]->filename, mode);
return 0;
} }
#endif #endif
#ifdef F_fchmodat #ifdef F_fchmodat
int fchmodat(int fd, const char *path, mode_t mode, int flag) int fchmodat(int fd, const char *path, mode_t mode, int flag)
{ {
// TODO: Implement proper functionality return chmod(path, mode);
return 0;
} }
#endif #endif
#ifdef F_pathconf #ifdef F_pathconf
long int pathconf(const char *path, int name) { long int pathconf(const char *path, int name) {
// TODO: Implement proper functionality errno = ENOSYS;
return 0; return -1; /* not supported */
} }
#endif #endif
#ifdef F_readlink #ifdef F_readlink
ssize_t readlink(const char *path, char *buf, size_t bufsiz) { ssize_t readlink(const char *path, char *buf, size_t bufsiz) {
// TODO: Implement proper functionality errno = ENOSYS;
return 0; return -1; /* not supported */
} }
#endif #endif
@@ -834,9 +845,37 @@ struct utimbuf {
time_t modtime; /* Modification time */ time_t modtime; /* Modification time */
}; };
int utime(const char *path, const struct utimbuf *times) int utime(const char *pathname, const struct utimbuf *times)
{ {
// TODO: Implement proper functionality SceIoStat psp_stat;
char dest[MAXNAMLEN + 1];
int ret;
if(__path_absolute(pathname, dest, MAXNAMLEN) < 0) {
errno = ENAMETOOLONG;
return -1;
}
ret = sceIoGetstat(dest, &psp_stat);
if (ret < 0) {
return __set_errno(ret);
}
ret = sceRtcSetTime_t((pspTime *)&psp_stat.sce_st_atime, times->actime);
if (ret < 0) {
return __set_errno(ret);
}
ret = sceRtcSetTime_t((pspTime *)&psp_stat.sce_st_mtime, times->modtime);
if (ret < 0) {
return __set_errno(ret);
}
ret = sceIoChstat(dest, &psp_stat, 0x0030);
if (ret < 0) {
return __set_errno(ret);
}
return 0; return 0;
} }
#endif #endif
@@ -844,8 +883,8 @@ int utime(const char *path, const struct utimbuf *times)
#ifdef F_fchown #ifdef F_fchown
int fchown(int fd, uid_t owner, gid_t group) int fchown(int fd, uid_t owner, gid_t group)
{ {
// TODO: Implement proper functionality errno = ENOSYS;
return 0; return -1; /* not supported */
} }
#endif #endif

2
src/samples/audio/wavegen/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspaudiolib -lpspaudio -lm LIBS = -lpspaudiolib -lpspaudio
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Audiolib Wave Generator PSP_EBOOT_TITLE = Audiolib Wave Generator

2
src/samples/gu/beginobject/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = BeginObject Sample PSP_EBOOT_TITLE = BeginObject Sample

2
src/samples/gu/blit/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lpsprtc LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Blit Sample PSP_EBOOT_TITLE = Blit Sample

2
src/samples/gu/celshading/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Celshading Sample PSP_EBOOT_TITLE = Celshading Sample

2
src/samples/gu/cube/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Cube Sample PSP_EBOOT_TITLE = Cube Sample

2
src/samples/gu/envmap/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Environment Mapping Sample PSP_EBOOT_TITLE = Environment Mapping Sample

2
src/samples/gu/integerdrawing/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Integer Drawing Sample PSP_EBOOT_TITLE = Integer Drawing Sample

2
src/samples/gu/lights/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Lights Sample PSP_EBOOT_TITLE = Lights Sample

2
src/samples/gu/logic/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgu -lm LIBS= -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Logic Sample PSP_EBOOT_TITLE = Logic Sample

2
src/samples/gu/mipmapping/Makefile.sample
View File

@@ -9,7 +9,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = MIP Mapping Sample PSP_EBOOT_TITLE = MIP Mapping Sample

2
src/samples/gu/morph/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Morph Sample PSP_EBOOT_TITLE = Morph Sample

2
src/samples/gu/morphskin/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Simultaneous Morphing and Skinning Sample PSP_EBOOT_TITLE = Simultaneous Morphing and Skinning Sample

2
src/samples/gu/ortho/Makefile.sample
View File

@@ -9,7 +9,7 @@ CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
LDFLAGS = LDFLAGS =
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP

2
src/samples/gu/reflection/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Reflection Sample PSP_EBOOT_TITLE = Reflection Sample

2
src/samples/gu/rendertarget/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Render-To-Texture Sample PSP_EBOOT_TITLE = Render-To-Texture Sample

2
src/samples/gu/shadowprojection/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Shadow Projection Sample PSP_EBOOT_TITLE = Shadow Projection Sample

2
src/samples/gu/signals/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Signals Sample PSP_EBOOT_TITLE = Signals Sample

2
src/samples/gu/skinning/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Matrix Skinning Sample PSP_EBOOT_TITLE = Matrix Skinning Sample

2
src/samples/gu/speed/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lpsprtc LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Memory Speed Sample PSP_EBOOT_TITLE = Memory Speed Sample

2
src/samples/gu/spharm/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = convlogo EBOOT.PBP EXTRA_TARGETS = convlogo EBOOT.PBP
PSP_EBOOT_TITLE = adresd - spharm v1.0 PSP_EBOOT_TITLE = adresd - spharm v1.0

2
src/samples/gu/splinesurface/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Spline Surface Sample PSP_EBOOT_TITLE = Spline Surface Sample

2
src/samples/gu/sprite/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Sprite Sample PSP_EBOOT_TITLE = Sprite Sample

2
src/samples/gu/text/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = GUFont Sample by McZonk PSP_EBOOT_TITLE = GUFont Sample by McZonk

2
src/samples/gu/timing/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lpspgum -lpspgu -lm LIBS = -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Timing Sample PSP_EBOOT_TITLE = Timing Sample

2
src/samples/gu/vertex/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm -lpsprtc LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Vertex Speed Sample PSP_EBOOT_TITLE = Vertex Speed Sample

2
src/samples/gu/zbufferfog/Makefile.sample
View File

@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS= -lpspgum -lpspgu -lm LIBS= -lpspgum -lpspgu
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Depth Buffer Fog Sample PSP_EBOOT_TITLE = Depth Buffer Fog Sample