aboutsummaryrefslogtreecommitdiff
path: root/libpsn00b/psxsio
diff options
context:
space:
mode:
authorJohn Wilbert M. Villamor <lameguy64@gmail.com>2019-07-17 11:30:07 +0800
committerJohn Wilbert M. Villamor <lameguy64@gmail.com>2019-07-17 11:30:07 +0800
commit0d4345a9bf2623df079c50a3bc73cbb7deca1176 (patch)
tree6cda70b844f39fc2d65a806b91a6010066433b56 /libpsn00b/psxsio
parentb956c5391b955e793a4d54572aa58872b4c66c30 (diff)
downloadpsn00bsdk-0d4345a9bf2623df079c50a3bc73cbb7deca1176.tar.gz
Added C++ support, updated build instructions and makefiles, consolidated libc and libgcc (during build process), libraries now v0.12b and more
Diffstat (limited to 'libpsn00b/psxsio')
-rw-r--r--libpsn00b/psxsio/_sio_control.s10
-rw-r--r--libpsn00b/psxsio/makefile8
2 files changed, 9 insertions, 9 deletions
diff --git a/libpsn00b/psxsio/_sio_control.s b/libpsn00b/psxsio/_sio_control.s
index bae7822..bf3b9b9 100644
--- a/libpsn00b/psxsio/_sio_control.s
+++ b/libpsn00b/psxsio/_sio_control.s
@@ -90,8 +90,9 @@ _sio_control:
div $v1, $v0
nop
nop
- jr $ra
mflo $v0
+ jr $ra
+ nop
.Lcmd0arg4: # Serial RX read
@@ -117,14 +118,15 @@ _sio_control:
.Lcmd1arg1:
andi $v0, $a2, 0x1CFF
-
- jr $ra
sh $a2, SIO_CTRL($a3)
+ jr $ra
+ nop
.Lcmd1arg2:
- jr $ra
sh $a2, SIO_MODE($a3)
+ jr $ra
+ nop
.Lcmd1arg3:
diff --git a/libpsn00b/psxsio/makefile b/libpsn00b/psxsio/makefile
index ecd6c65..b59f3c6 100644
--- a/libpsn00b/psxsio/makefile
+++ b/libpsn00b/psxsio/makefile
@@ -2,7 +2,7 @@
# Part of the PSn00bSDK Project
# 2019 Lameguy64 / Meido-Tek Productions
-PREFIX = mipsel-unknown-elf-
+include ../common.mk
TARGET = ../libpsxsio.a
@@ -10,10 +10,8 @@ CFILES = $(notdir $(wildcard ./*.c))
AFILES = $(notdir $(wildcard ./*.s))
OFILES = $(addprefix build/,$(CFILES:.c=.o) $(AFILES:.s=.o))
-INCLUDE = -I../include
-
-CFLAGS = -O2 -msoft-float -fno-builtin -Wa,--strip-local-absolute
-AFLAGS = -msoft-float -Wa,--strip-local-absolute
+CFLAGS = -g -O2 -msoft-float -fno-builtin -Wa,--strip-local-absolute
+AFLAGS = -g -msoft-float -Wa,--strip-local-absolute
CC = $(PREFIX)gcc
AS = $(PREFIX)as