From 9e11d772884ff147e56c3cd3e852d73d1b1bd617 Mon Sep 17 00:00:00 2001
From: Matias Israelson <57065102+israpps@users.noreply.github.com>
Date: Thu, 5 Sep 2024 12:43:33 -0300
Subject: [PATCH] add arcade UART variant

---
 .github/workflows/compile.yml    |   6 +++---
 Makefile                         |   8 +++++++-
 embed.make                       |   4 ++--
 iop/__precompiled/acuart_tty.irx | Bin 0 -> 6672 bytes
 src/main.c                       |  28 ++++++++++++++++++++++------
 5 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 iop/__precompiled/acuart_tty.irx

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 744b01c..c56cf31 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -15,9 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         eth: ["ETH=0", "ETH=1"]
-        bdmstuff: ["EXFAT=0", "EXFAT=1", "EXFAT=1 MX4SIO=1"]
-        ds34: ["DS34=0", "DS34=1"]
-        coh: ["COH=0", "COH=1"]
+        bdmstuff: ["EXFAT=1", "EXFAT=1 MX4SIO=1"] #"EXFAT=0", 
+        #ds34: ["DS34=0", "DS34=1"]
+        coh: ["COH=1", "COH=1 ACUART=1"] #"COH=0",
         exclude:
           - bdmstuff: "EXFAT=1 MX4SIO=1"
             coh: "COH=1"
diff --git a/Makefile b/Makefile
index c8c176a..bbe79d5 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ CDVDFSV ?= 1
 # ----------------------------- #
 .SILENT:
 
-BIN_NAME = $(HAS_EXFAT)$(HAS_DS34)$(HAS_ETH)$(HAS_SMB)$(HAS_DVRP)$(HAS_XFROM)$(HAS_MX4SIO)$(HAS_COH)$(HAS_EESIO)$(HAS_UDPTTY)$(HAS_TTY2SIOR)$(HAS_IOP_RESET)
+BIN_NAME = $(HAS_EXFAT)$(HAS_DS34)$(HAS_ETH)$(HAS_SMB)$(HAS_DVRP)$(HAS_XFROM)$(HAS_MX4SIO)$(HAS_COH)$(HAS_EESIO)$(HAS_UDPTTY)$(HAS_ACUART)$(HAS_IOP_RESET)
 ifeq ($(DEBUG), 0)
   EE_BIN = UNC-BOOT$(BIN_NAME).ELF
   EE_BIN_PKD = BOOT$(BIN_NAME).ELF
@@ -65,6 +65,12 @@ ifeq ($(COH), 1)
   EE_CFLAGS += -DSUPPORT_SYSTEM_2X6
   HOMEBREW_DONGLEMAN = 1
   EE_OBJS += mcman_irx.o
+  ifeq ($(ACUART), 1)
+    $(info -- adding support for arcade UART)
+    EE_OBJS += acuart_tty_irx.o
+    EE_CFLAGS += -DACUART
+    HAS_ACUART = -ACUART
+  endif
 endif
 
 ifeq ($(XFROM),1)
diff --git a/embed.make b/embed.make
index 9971847..6df918b 100644
--- a/embed.make
+++ b/embed.make
@@ -171,8 +171,8 @@ $(EE_ASM_DIR)ps2kbd_irx.s: $(PS2SDK)/iop/irx/ps2kbd.irx | $(EE_ASM_DIR)
 $(EE_ASM_DIR)sior_irx.s: $(PS2SDK)/iop/irx/sior.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ sior_irx
 
-$(EE_ASM_DIR)tty2sior_irx.s:iop/__precompiled/tty2sior.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ tty2sior_irx
+$(EE_ASM_DIR)acuart_tty_irx.s: iop/__precompiled/acuart_tty.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ acuart_tty_irx
 
 iop/AllowDVDV.irx: iop/AllowDVDV
 	$(MAKE) -C $<
diff --git a/iop/__precompiled/acuart_tty.irx b/iop/__precompiled/acuart_tty.irx
new file mode 100644
index 0000000000000000000000000000000000000000..bf9b247e44e02fef3eff317038446095b0e3fa34
GIT binary patch
literal 6672
zcmb7Je{9v&6+iFx6$%#kwmh)9I={8wZ~Im&dz$JhdC6W|&~9T15S%PA(w|C`La}{w
zxR~v$R_(H;ub4vkgC#G}R{rSPS_-m+ZOtHzEM#$!Y?^7tf*R&rWQj3EH{U*=`_8wt
zB8$7pm(RWDoO|xM=bm%!?c*mKH$4!EL?moMu1LaB9f(C`A`wTVPFyh(mlaYhfykbC
zX*ffqO1n`YKh6*Eh3#mG$VGfhL4c}7?Q-r{)iL?a)UbhKv}KZ_3bbf)q(F*;RsCL6
zQn4#J<3TQi1z?h$lc7|RTrA+2eYQ~F6y|cwIX)H*<=()0enO;Nrl<TM3wy?@U3q27
zgAL=D;|~O&9kIHNJYmiCgOq@ufgE)i%*{|=+^$=goGuxIjYkIWF(xUu6kzj>bw*lZ
zw@MTIwG?X~8N7&fSIT4YIf;7ZSgRD8m&%+|20MyCkD?!d7nSySMB3|viUMhvagxQD
zD}i(05-IeI$aq8=AyYX19LAuHH^q%Kl^V(A#uB+)BX(9eerH($&dOjr1~O(`N(y9^
zG}c9=zpe=5s6@wqioH5AT8$5TjU>;PxD&*4if<|Y403Ov51TU)=%ZfPZ1?YC|3&iR
zV6i+mNMC<lE;;mdjdKa37Y55D<-lFA_j${&j31E_IUKLXc~)#c4L`Sg4)#HrhMDEb
zN@t_^sg{TY-@Z2@MSf-T&PYYGAGu8`3aLK^eZ-ph<It0}{mRrOsfeGJnnbgd!H48m
zl(j)m3jSLLoz3DWvN)5kLFZYovVL4D>Mz3|f3tDsNMjuKPox}UV}$enk`u>A+~;!3
z_Hiuot+BU2qfPHy-bL_!H=O5HkC8^*=Wxc(F_U!V*i^&J>SRJ*ovM`+Q*k+t_?n$6
zmzk+D#99nzzC7r=uMTk_k{T6hI}n$BgSGO~peqLkJ=s6#2Z7|IG2yp}e4P6sQY@An
zbVjOfm!`y8#FhhWm|2lr9{l27k;D7rQZng6z7{^JmD0&Q!t;$*6~foF^J?z!e&T;1
zgZ`M2LClK|on_3&gNUoCxlCHD4+GNO!1!e@!mjOrKhR?B`K#S)v4=Q>p8R=;ymO$!
z`J;)*-LP{*w#K>F7(FY_|1j6I7E7ZpY^|zs9y0&P<!$;qeF-nVoeS2G4}WCfvkZKe
zfzLAV8FKDe27b%HZyET_#vpUA9<di7G2YJ=dvox+2j3>)&wBX04n9x7=e6*89B0A&
zX1+%y8})~?vQo0vC-g1mWH2X#IavER)}F=M$FTN{&3ERy?*tL9nX>sFL%xq-p9h9$
z^M|>)(obN6e=v|Rr^;k_s9g3BF}IjM{z)-4&Kl#$3qvt^erPSu#2-kRN@rSX${J0*
z`n)12HNFG-KqLIl_<PW+bT7$0@{Enun7Fp;)|9O=B|67QgXJ;rDh{?$r>QBs!_<QB
z*NdqLN}$t)&O20RBXl;QW<L|HaNA9dtg&a4%Q;m>B1^cZTy7fYdv_J~F?k}lrL?kT
zi&+?Jlwqt*&!2xZ$#|P9>G#4oV=XeMIWOak8E?PmSqHEYYl;jESGbo<g?k2?2C`>u
zOtpJ|vNG9_57|8bb>$n>iZeDY=gga+(LSCF&!@}Ag89E=VMQ1V@ZXn-g==xJ261p4
zad5)M!4(?^W>Fl}%JfiNW*5c5ySd@g8fVzJGB(8e$T;xiu+>rNY_{>>-!L8?z}cOa
z+pmj<*#C%!VH*#(Fdh;&j)&DY9!}$Wjg`Xg$;bj<{}R5gbhenc?fLKwd3K{XyBBee
zJkJ-iJP+Jkp3UhXxQ_px^65WJ6xK=?ImsHBK%UkjPvgj854n1uJxj-9&CBQ7v(`Te
z`0JCL<MEDug>i5&EB<f_+DtOOs?l36Ew}PMf7QlFi}4dF*jAX_EMwj=(0Jcb)`hG{
zKm7l4b%`wT{J3kDT}|Qs$l^_ql1D!?-W_5}cYJ1Q%8{!NV+=($_ddn?e4A{Re(yNf
ziKonRk+s$F63jnr-wj^;uz0~1_%e$a9Yc-pA7b2c-}xFhi#l@*b!G;2CjX{@FYKMl
zy7peqtmQu6h0i$W5^xaX+cm~T3gDM^*wJb4)myO6CwL!4<ynlMA1spoLB50TbaB&5
z=fq0ch&!$W81;%E8-ve_Kr2MQ$i6um@rp>rBDNp(63FEu$U|<?+bKM|k{j4@)4UyR
z)-I7}CyFHBhiwzZ+Al(%^(xfIw-L_<Z;UC{P`-)s?-B?5bcR?%?+hHg*{nTg;rrtx
z<}Qq%4bYL2U*j%#6?ef2#24@0SEd+i{%|1A;GN01*@yjJ$;IG9yGE6tO~F?NaTZCQ
z!h47Q2z>g~pvI7n$gw^$@S&NEEucw+Z&NerDXqZDm0)N*{4;r%tns>Kt=B6zdu{Sn
zug19tdw_nY1aBHM<Vgu@M0EvfG~QRRDUzIn4UQbfdm%eDhyBNZ_e-kGKbR86E8nnB
zgYLT`4?-8}2rMj2PB>%UH?XOXa;08{(}u9!5S~Q<0l7&YvUguZp0(q0`JS^&n&L~f
z=B$)QoyVlWE0HD}dlzip-d(ju9(MME{%Nks&W}kU?l>tn$b*j|!~Nr3I#2r-XnEgV
zqkRAxeaCks>qN2j*){$<pwVB<uM1AU_jB$qj{Od|U>}9aEcWIPa2L_!m5`4dFVK7O
z$JQS%?zEP#QVLfn@`7i)1aWj0SeQI-#=KpSGl=!u@V5r*#}hhUg1eOC9vxGjHl4$|
zJSPWlES?eb!$n_Y^(5jggLumz-tdk%kwLsI%5CN~?kCKdwfWs_-w=h#KS1wE=>4s=
zxyAewW7-=2{lYkP5VJR<<~7Wiq`}`5OW}XPdy%&HSsR;1!}twt#+%Q^Y5{VTKA=yC
z@L5QQTST}nkvWcauFLbIs3+v(FSiE%%RdoY+uM73JM(#qKj)AK7Yk4nEv{BXaOk|n
zbNim^+ts-%KR2qfc+}guE5Be49+T3wJKejhb+@e(3)iFOe7j~_cTZ~vt)oqN#9U_s
z_4TDYx_U5?GPEJovT%>Ev%R~k&B{RF3uV$f+gkh74-5BAy_J|l^c8X8+(1X?lbyTM
z^R{qK=nvY@@lr+HFLr#>4Rm$&&`bG!(f^!_2erjeXLQlrYdaU2TX4QVXzfksdFNM&
zgx|;tL>-KX;&ae%hJi^ayb1$nmx<KkW8=E{-nD;8`w?QvceApJe?Z0Og#DMa&v<7(
zr|@=Uyz_2)9kCffDOk<A=8F6oW8TY@D~8;g7#BE&9_hTZ7Sj1fB%L|(dAi<bc!%fj
zTK;bEP{Y=3J34y1p6u*Jd~^Tn8FuU4#;qG0zO!6#N;_J+yL;NPIs$mUPoW*XosW0*
zr7<%ft2;V(x3+b6hI;0wu6H|odwY6azhimG>)PFwUhnrU<cOrxPbCuTEy}iS-*=zv
zYIR$C+gm$2U7Cqi#Afw^pKBzB#Gum=-cpACHhdRxcAx(~0`2k_&_6F1j=2_FPFn(c
z*{1j9ZAf52)IrpRg&wpbH~go-T6vAlUn$t~m5Td7P@#ou6$qjiEvsu62m%gmbbef9
z$J6uUd?1oaO)PZO;NnBb;{A}P({A#&EAoQmcn%-s&)}o{UhI+dejw=sK+*?wJgnmp
z9Us*3AsvtEI18knI1Y+>YJt?V9Y}hhcu;W~M9R$qDR&-7xr>Ttz$E`X{vrPyko*J&
z#FIesPXWolp!Ca%hu}uamBUe#bAgnr2a>))>CH;trt}u2cPM?Q()TDmt@K$PpVaXw
zAoX5Wtiv&J-FhI`9RZSmO6hY-cUW^kF9%vXft2@@zDF@oe!udEbv&Zu7z!unmjUg3
zAoV5{Hz|L!@=q!KHN|%nqqs3SF9x*wfYev6bUd;xy;kXUI<D6-e$2D;Hz{@~f2Z=h
zb-YK%X&~3@R~%711myaoK(0Tl^pBMOZ>8hMM?1evv0gC+<opdl&Tm$Fi{f6z5!4H2
z=t0Fpidn@`#iNQ7iqnd-iYFCMDb6XLQTzbNeO^_J;^jj7ih#5aKXzF@E(nXY%1<c2
zPU%U-4a#p;{wAewQ+!1EEz0juI_nPin^N4QxLJ|4mHh3Bk0`b%b|~&t>{i^Pm{#1Y
z__Si6*snOCIH)+RIHD-)`kvaAZfygmd-J$6>~;0*+11k_>v}u8*QGo6rqS!^Xic}~
zDfwP|x~I2K)^+5et*;Mz`m*gS5Df79e<;uY2dD}MK%OHTE_GY&d46mGKlnLpVYd<l
zq`Rb)aRK`3p#-UGeNBBR8*&#ulu`T^rh4Fu3G~B8Ir8sUL@BlR$TZ~UjRh@S7e9V3
zTDSOSk)xn-UB+Ix?l;k=Uh3mL#9!dZ3mbWC58w;sct3eJkozv=xF71HZS-FP{ji1h
tQ5Rz^Y?~n$V1QC&=hFtt(s$Gqw$~sR+C*B|$5M;rX0hL`;iLs}{{^NUW5xgg

literal 0
HcmV?d00001

diff --git a/src/main.c b/src/main.c
index 1a7af21..c3ba82d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,6 +68,10 @@ IMPORT_BIN2C(dvrfile_irx);
 IMPORT_BIN2C(cdvd_irx);
 #endif
 
+#ifdef ACUART
+IMPORT_BIN2C(acuart_tty_irx);
+#endif
+
 // Mandatory IRX
 IMPORT_BIN2C(iomanx_irx);
 IMPORT_BIN2C(filexio_irx);
@@ -440,7 +444,7 @@ static void Show_build_info(void)
 " MX4SIO=0"
 #endif
 , COLOR_TEXT);
-#if defined(UDPTTY) || defined(SIO_DEBUG) || defined(TTY2SIOR) || defined(NO_IOP_RESET)
+#if defined(UDPTTY) || defined(SIO_DEBUG) || defined(ACUART) || defined(NO_IOP_RESET)
 
 
 			PrintPos(-1, hpos, "Debug Features:", COLOR_SELECT);
@@ -462,10 +466,10 @@ static void Show_build_info(void)
 #else
 " SIO_DEBUG=0"
 #endif
-#ifdef TTY2SIOR
-" TTY2SIOR=1"
+#ifdef ACUART
+" ACUART=1"
 #else
-" TTY2SIOR=0"
+" ACUART=0"
 #endif
 , COLOR_TEXT);
 #endif
@@ -2480,12 +2484,19 @@ static void Reset()
 #ifdef XFROM
 	have_Flash_modules = 0;
 #endif
+
 #ifdef UDPTTY
-int i, d;
+	int i, d;
 	load_ps2ip();
 	i = SifExecModuleBuffer(&udptty_irx, size_udptty_irx, 0, NULL, &d);
     DPRINTF(" [UDPTTY]: id=%d, ret=%d\n", i, d);
 #endif
+#ifdef ACUART
+	int i, d;
+	i = SifExecModuleBuffer(&acuart_tty_irx, size_acuart_tty_irx, 0, NULL, &d);
+    DPRINTF(" [ACUART]: id=%d, ret=%d\n", i, d);
+#endif
+
 	loadBasicModules();
 #ifndef SUPPORT_SYSTEM_2X6
 	loadCdModules();
@@ -2798,7 +2809,12 @@ int main(int argc, char *argv[])
 			break;
 		}
 	}
-	sprintf(mainMsg + strlen(mainMsg), (i == -1) ? " | ACJVLOAD.IRX loaded" : " | ACJVLOAD.IRX not found");
+	sprintf(mainMsg + strlen(mainMsg), (i == -1) ? " | ACJVLOAD loaded" : " | ACJVLOAD not found");
+	if (exists("mass:watchdog.opt") || exists("watchdog.opt")) {
+		DPRINTF("Starting watchdog\n");
+		id = SifLoadStartModule("rom0:DAEMON", 0, NULL, &ret);
+		sprintf(mainMsg + strlen(mainMsg), (id > 0 && ret != 1) ? " | watchdog running" : " | watchdog error");
+	}
 	DPRINTF("%s\n",mainMsg);
 #endif