Merge pull request #748 from Ziemas/deci2-tty

Implement DECI2 TTY functions

Author: uyjulian

ee/kernel/Makefile

@@ -225,7 +225,7 @@ KERNEL_OBJS = ResetEE.o SetGsCrt.o $(EXEC_SYSCALLS) \
 EE_OBJS = $(KERNEL_OBJS) $(SIFCMD_OBJS) $(SIFRPC_OBJS) $(FILEIO_OBJS) \
 	$(LOADFILE_OBJS) $(IOPHEAP_OBJS) $(IOPCONTROL_OBJS) $(ROM0_OBJS) $(CONFIG_OBJS) \
 	$(GLUE_OBJS) $(SIO_OBJS) $(TIMER_OBJS) $(TIMER_ALARM_OBJS) $(DELAYTHREAD_OBJS) $(GETKERNEL_OBJS) \
-	$(INITSYS_OBJS) $(KERNEL_UTIL_OBJS) erl-support.o
+	$(INITSYS_OBJS) $(KERNEL_UTIL_OBJS) deci2.o tty.o erl-support.o
 
 
 EE_OBJS += $(THREAD_OBJS) $(LIBOSD_OBJS) $(TLBFUNC_OBJS) $(ALARM_OBJS) $(EXIT_OBJS) $(SETUP_OBJS) setup_syscalls.o debug.o

ee/kernel/include/deci2.h

@@ -0,0 +1,53 @@
+/*
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+*/
+
+/**
+ * @file
+ * DECI2 library functions
+ */
+
+#ifndef DECI2_H_
+#define DECI2_H_
+
+enum {
+    DECI2_ERR_INVALID     = -1,
+    DECI2_ERR_INVALSOCK   = -2,
+    DECI2_ERR_ALREADYUSE  = -3,
+    DECI2_ERR_MFILE       = -4,
+    DECI2_ERR_INVALADDR   = -5,
+    DECI2_ERR_PKTSIZE     = -6,
+    DECI2_ERR_WOULDBLOCK  = -7,
+    DECI2_ERR_ALREADYLOCK = -8,
+    DECI2_ERR_NOTLOCKED   = -9,
+    DECI2_ERR_NOROUTE     = -10,
+    DECI2_ERR_NOSPACE     = -11,
+    DECI2_ERR_INVALHEAD   = -12,
+};
+
+enum {
+    DECI2_READ       = 1,
+    DECI2_READ_DONE  = 2,
+    DECI2_WRITE      = 3,
+    DECI2_WRITE_DONE = 4,
+    DECI2_CHSTATUS   = 5,
+    DECI2_ERROR      = 6,
+};
+
+int sceDeci2Open(unsigned short protocol, void *opt, void (*handler)(int event, int param, void *opt));
+int sceDeci2Close(int s);
+int sceDeci2ReqSend(int s, char dest);
+void sceDeci2Poll(int s);
+int sceDeci2ExRecv(int s, void *buf, unsigned short len);
+int sceDeci2ExSend(int s, void *buf, unsigned short len);
+int sceDeci2ExReqSend(int s, char dest);
+int sceDeci2ExLock(int s);
+int sceDeci2ExUnLock(int s);
+int kputs(char *s);
+
+#endif // DECI2_H_

ee/kernel/include/tty.h

@@ -0,0 +1,24 @@
+/*
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+*/
+
+/**
+ * @file
+ * DECI2 TTY
+ */
+
+#ifndef TTY_H_
+#define TTY_H_
+
+extern int ttyinit;
+
+int sceTtyInit();
+int sceTtyWrite(const char *buf, int len);
+int sceTtyRead(char *buf, int len);
+
+#endif // TTY_H_

ee/kernel/src/deci2.c

@@ -0,0 +1,119 @@
+/*
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+*/
+
+/**
+ * @file
+ * DECI2
+ */
+
+#include "kernel.h"
+
+// actual size?
+static char userarea[56];
+
+int sceDeci2Open(unsigned short protocol, void *opt,
+                 void (*handler)(int event, int param, void *opt))
+{
+
+    u32 args[4];
+
+    args[0] = protocol & 0xffff;
+    args[1] = (u32)opt;
+    args[2] = (u32)handler;
+    args[3] = (u32)UNCACHED_SEG(userarea);
+
+    return Deci2Call(1, args);
+}
+
+int sceDeci2Close(int s)
+{
+    u32 args[4];
+
+    args[0] = s;
+
+    return Deci2Call(2, args);
+}
+
+int sceDeci2ReqSend(int s, char dest)
+{
+    u32 args[4];
+
+    args[0] = s;
+    args[1] = dest;
+
+    return Deci2Call(3, args);
+}
+
+void sceDeci2Poll(int s)
+{
+    u32 args[4];
+
+    args[0] = s;
+
+    Deci2Call(4, args);
+}
+
+int sceDeci2ExRecv(int s, void *buf, unsigned short len)
+{
+    u32 args[4];
+
+    args[0] = s;
+    args[1] = (u32)buf;
+    args[2] = len & 0xffff;
+
+    return Deci2Call(-5, args);
+}
+
+int sceDeci2ExSend(int s, void *buf, unsigned short len)
+{
+    u32 args[4];
+
+    args[0] = s;
+    args[1] = (u32)buf;
+    args[2] = len & 0xffff;
+
+    return Deci2Call(-6, args);
+}
+
+int sceDeci2ExReqSend(int s, char dest)
+{
+    u32 args[4];
+
+    args[0] = s;
+    args[1] = dest;
+
+    return Deci2Call(-7, args);
+}
+
+int sceDeci2ExLock(int s)
+{
+    u32 args[4];
+
+    args[0] = s;
+
+    return Deci2Call(-8, args);
+}
+
+int sceDeci2ExUnLock(int s)
+{
+    u32 args[4];
+
+    args[0] = s;
+
+    return Deci2Call(-9, args);
+}
+
+int kputs(char *s)
+{
+    u32 args[4];
+
+    args[0] = (u32)s;
+
+    return Deci2Call(16, args);
+}