nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-09 22:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

stratosphere: make tma non-kip, add to build system

Browse source
This commit is contained in:
Michael Scire 2018-12-05 23:36:12 -08:00
parent 94e527e763
commit 907f6fa72d
6 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -51,6 +51,8 @@ dist: all
cp stratosphere/set_mitm/set_mitm.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/exefs.nsp cp stratosphere/set_mitm/set_mitm.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/exefs.nsp
mkdir -p atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/flags mkdir -p atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/flags
touch atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/flags/boot2.flag touch atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/flags/boot2.flag
cp stratosphere/tma/tma.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000007/exefs.nsp
cp stratosphere/dmnt/dmnt.nsp atmosphere-$(AMSVER)/atmosphere/titles/010000000000000D/exefs.nsp
cd atmosphere-$(AMSVER); zip -r ../atmosphere-$(AMSVER).zip ./*; cd ../; cd atmosphere-$(AMSVER); zip -r ../atmosphere-$(AMSVER).zip ./*; cd ../;
rm -r atmosphere-$(AMSVER) rm -r atmosphere-$(AMSVER)
mkdir out mkdir out

2
stratosphere/Makefile
View file

@ -1,4 +1,4 @@
KIPS := loader pm sm boot fs_mitm set_mitm creport fatal KIPS := loader pm sm boot fs_mitm set_mitm creport fatal tma dmnt
#TODO: boot2 ? #TODO: boot2 ?

7
stratosphere/pm/source/pm_boot2.cpp
View file

@ -158,8 +158,11 @@ void EmbeddedBoot2::Main() {
/* Launch usb. */ /* Launch usb. */
LaunchTitle(Boot2KnownTitleId::usb, FsStorageId_NandSystem, 0, NULL); LaunchTitle(Boot2KnownTitleId::usb, FsStorageId_NandSystem, 0, NULL);
/* Don't launch tma, because atmosphere replaces it with a KIP. */ /* Launch Atmosphere tma, using FsStorageId_None to force SD card boot. */
/* LaunchTitle(Boot2KnownTitleId::tma, FsStorageId_NandSystem, 0, NULL); */ LaunchTitle(Boot2KnownTitleId::tma, FsStorageId_None, 0, NULL);
/* Launch Atmosphere dmnt, using FsStorageId_None to force SD card boot. */
LaunchTitle(Boot2KnownTitleId::dmnt, FsStorageId_None, 0, NULL);
/* Launch default programs. */ /* Launch default programs. */
bool maintenance = ShouldForceMaintenanceMode(); bool maintenance = ShouldForceMaintenanceMode();

10
stratosphere/tma/Makefile
View file

@ -132,9 +132,15 @@ DEPENDS := $(OFILES:.o=.d)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all : $(OUTPUT).kip all : $(OUTPUT).nsp
$(OUTPUT).kip : $(OUTPUT).elf ifeq ($(strip $(APP_JSON)),)
$(OUTPUT).nsp : $(OUTPUT).nso
else
$(OUTPUT).nsp : $(OUTPUT).nso $(OUTPUT).npdm
endif
$(OUTPUT).nso : $(OUTPUT).elf
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)

2
stratosphere/tma/client/Main.py
View file

@ -20,7 +20,7 @@ def main(argc, argv):
print 'Waiting for connection...' print 'Waiting for connection...'
c.wait_connected() c.wait_connected()
print 'Connected!' print 'Connected!'
c.intf.send_packet(Packet().set_service(ServiceId.SETTINGS_SERVICE).set_task(0x01000000).set_cmd(0).write_str('lm').write_str('sd_card_log_output_directory')) c.intf.send_packet(Packet().set_service(ServiceId.SETTINGS_SERVICE).set_task(0x01000000).set_cmd(0).write_str('platformconfig').write_str('platformtype'))
resp = c.intf.read_packet() resp = c.intf.read_packet()
success = resp.read_u8() != 0 success = resp.read_u8() != 0
print 'Succeeded: %s' % str(success) print 'Succeeded: %s' % str(success)

34
stratosphere/tma/tma.json
View file

@ -1,10 +1,44 @@
{ {
"name": "tma", "name": "tma",
"title_id": "0x0100000000000007", "title_id": "0x0100000000000007",
"title_id_range_min": "0x0100000000000007",
"title_id_range_max": "0x0100000000000007",
"main_thread_stack_size": "0x00004000", "main_thread_stack_size": "0x00004000",
"main_thread_priority": 38, "main_thread_priority": 38,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"default_cpu_id": 3,
"process_category": 0,
"is_retail": true,
"pool_partition": 2,
"is_64_bit": true,
"address_space_type": 1,
"filesystem_access": {
"permissions": "0xFFFFFFFFFFFFFFFF"
},
"service_access": [
"bsd:s",
"bsdcfg",
"dmnt:-",
"fatal:u",
"i2c",
"pcie",
"psc:m",
"set:cal",
"set:fd",
"set:sys",
"sfdnsres",
"spl:",
"usb:ds"
],
"service_host": [
"file_io",
"gds",
"htc",
"htcs",
"tma_log",
"tmagent"
],
"kernel_capabilities": [ "kernel_capabilities": [
{ {
"type": "syscalls", "type": "syscalls",