From 0dae0b1cd48476a9f4c0668bd8307bef04fc4468 Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Sun, 14 May 2017 09:59:42 +0000 Subject: [PATCH] removed obsolete stuff --- boot/3ds/arm9loaderhax.bin | Bin 83308 -> 82456 bytes boot/3ds/main.c | 30 ++++-------------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/boot/3ds/arm9loaderhax.bin b/boot/3ds/arm9loaderhax.bin index c05d01cada1438f3f10fd677446d3896d3df311d..bedc3128bdfdf1864699906b7daebb5e2fd035d1 100755 GIT binary patch delta 1201 zcmX}pPfQb890%~H!Gvr!i{F82lTW_y{pL6G z{`AvLOCn|&pJm>=&l`pVYSQ59SjMj<4N03=v8xM4iLzj@U8yWruVo$P*u67$Y72%G z#8|tLJ+gH;`~TL~$I&Ql|CDge2iwf;+|=Lgx#gCmAvcd@3Y#K1Qd3KduB5?~v5Z8i z?C%P#O`VM780xQG$>Hx0tfjO@S}IHQ%hEJaS=EV1Zps&%VD zR|uO4q1S=lk$jDz_7iG_sP*M*9JLPAWYoIyH3_wL)QH4s?qYuNm{*7)?q?ZsQ93Bn z+*fMukt?aJx#ubut&QMGL|l;UmQpQZRATlsPix|(baq0Li_DGM(fvUYW%2>f)w;}* zTPrr)+CJk<{(?!pVFX2?<#5@ztMlXP(w#(eVE)$s(+4b1n02P5=Ga_vS7(K4jrH9Up;Fb{Ju11T7Xkrq+6yM^1D z^((u%G#ogI)qxc-BINoBqDA0VMlX;L;TA|Tqsz!1XoW&N_aVz+vkA+?BFsSndZ&>I z7zAR^B&&r{H^$NJ`E%(I(%nQq&}NXR1TSQe^Pre7BNH$Pz1w5m>-i`RzdeoxyGe;5 zA7H;W^!8zV0fNwgc_s2!^DxNOWB4Y#fN?MnHHhp5^FYl=4HO{QXxus2pU8JG4RIKS z{zi&W0Z!3{Nf-`+0tA@=Q3xM=i=2f7n1>oc_Jet-Ffsscum!{)`zMR20T*76*XzZA zw~kNOi|UHAV#Dj_z2@*bUp^`xRdn#~qdHe_7Fz?gc(qoa`0)<2#(YGbKE0|YWVfo7 z_@h*Ppz&Vup8mZ=U!1UoeJfZVdKA67ZIW5tsLwm}H=*~8yB(ss#;ZRK+iXSsLqva- qV;?s0Ci==T`VX!MT0vgdC(n7A96z^yQ2(vtp)C5&D|+I5dhIKP@Z6vxkVZxW-%c(qyAnwVZxoUEC>Q^8EFX6k%tTz#o?g$*X7Ee=8vmVqCJ zO6`YI+>CvKI1s#aFO}hkuv?ggGGz5bKgf`|!B+N?mtJhujZn7Hxia^^@w$S6U;gJj z&pFR|&biO*W$X4;Yh;O)PT#5>>yYPlL7s}YD)YLiT-$I+>v|ro>tsF*Z^CZNQjb}aG5zGsfibNPbB``-Q8U3C9>1rPwIH#p*{9N^3z{mO{QDsbxU9> zKHU^dlB}lgADY*hG&L4Ck`EWqmQbapTuQFKR&87)x*?RPDUv7jWz#p3Ebwn0*#G3f zetBas$q*YklqrxozaHn4q9%yWq<$nS`UsaOcLtM!uS-pZGJ(;J&k!`Ye;7J#L$DLU zUFI6YS|`@BvF10|1g!O8&4RVEYW@o=5vZCE2wpA=HEfYH;TTs$3m*}DJSJN51We6n z_>Dr^>N0nI*F=Z)86~Kvd4br?RQw;~M2NB=wc8~4^Y4nUri~pYIf(<}1ZD!mwdp61HpksJBlTs@1;rUd^?=so+g2+S|{6$ZQLhIJ#2% z>v)^P)>=-qR-!fgujd{fIZE_rKG?;*3lRfCh1yQb4714vn1`gzyz&hbWQp$__iC5h z?e?7LDACUzy#HK2)BUw`F^zW%hCsz5?Lv>2Iad49rK@K^f4Wqg?)})JslC|(uNjcs e=iVKDD?Adeymr0?@Mn diff --git a/boot/3ds/main.c b/boot/3ds/main.c index b17ac90..e1f1fc1 100644 --- a/boot/3ds/main.c +++ b/boot/3ds/main.c @@ -25,32 +25,22 @@ struct FIRM_sect { struct FIRM_header { char magic[4]; //! Magic "FIRM" string (not-null terminated) int version; //! Version. Currently 1 - void(*entrypoint)(void**); //! Address where the processor jumps to after loading - void (*arm11entry)(void**); + void(*entrypoint)(); //! Address where the processor jumps to after loading + void (*arm11entry)(); unsigned int reserved[0xC]; struct FIRM_sect sections[4]; //! The four internal sections unsigned char RSA2048[0x100]; //! Currently unused }__attribute__((packed)); -/** - * \brief Module table for the kernel (Up to 1024 mods) - */ -void *arm9modtable[64]; -void *arm11modtable[64]; struct FIRM_header hdr; void doARM11() { DIAGPXL(0); - hdr.arm11entry(arm11modtable); + hdr.arm11entry(); for(;;); } void init() { FATFS fs; FIL firm; f_mount(&fs, "0:", 0); - unsigned int off=0x20000000; - arm9modtable[0]=0x20000000; - arm9modtable[1]=0; - arm11modtable[0]=0x20000000; - arm11modtable[1]=0; if(f_open(&firm, "mtgos.firm", FA_READ | FA_OPEN_EXISTING) == FR_OK) { DIAGPXL(1); unsigned int br; @@ -71,21 +61,9 @@ void init() { DIAGPXL(i+8); } DIAGPXL(12); - FIL dsp_txt9; - f_open(&dsp_txt9, "dsp_txt.neun", FA_READ | FA_OPEN_EXISTING); - f_read(&dsp_txt9, (void*)off, f_size(&dsp_txt9), &br); - off+=f_size(&dsp_txt9); - off&=~0xfff; - off+=0x1000; - FIL dsp_txt11; - arm11modtable[0]=off; - arm11modtable[1]=0; - f_open(&dsp_txt11, "dsp_txt.elf", FA_READ | FA_OPEN_EXISTING); - f_read(&dsp_txt11, (void*)off, f_size(&dsp_txt11), &br); - off+=f_size(&dsp_txt11); void(**a11fpointer)(void)=(void(**)(void**))0x1FFFFFF8; *a11fpointer=&doARM11; - hdr.entrypoint(arm9modtable); //Jump to kernel + hdr.entrypoint(); //Jump to kernel } for(;;); }