nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-10 07:06:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
3487 commits 42 branches 82 tags 31 MiB
Commit graph

1164 commits

Author SHA1 Message Date
Tony Wasserka
ad636f7216 Modernize C++ usage (#144) 
* Stratosphere: Use modern C++ idioms in some places

* algorithms like std::for_each are used instead of raw loops

* Stratosphere: Replace more raw loops with algorithms

* Stratosphere: Add a utility predicate function to test for equality with a reference element

This can be used to rewrite some common raw loops using algorithms instead

* fs.mitm: Use variant

* fs.mitm: Use enum class

* fs.mitm: Turn RomFSSourceInfo::Cleanup into a destructor

This obsoletes the need for a custom deleter in other places

* fs.mitm: Use enum class some more

* fs.mitm: Use unique_ptr

* fs.mitm: Simplify initialization

* Stratosphere: Simplify initialization

* fs.mitm: Use unique_ptr (fix memory leak along the way)

The previous code was using "delete" rather than "delete[]"

* fs.mitm: Use vector::emplace_back rather than push_back

emplace_back constructs elements in-place, hence avoiding a redundant element copy.

* Stratosphere: Replace more raw loops with algorithms

* Stratosphere: Use unique_ptr

* fs.mitm: Replace more raw loops with algorithms

* Stratosphere: Prefer move-construction over copy-construction when moving sink parameters around
 2018-06-19 11:07:31 -07:00
Michael Scire
f41b780c0a PM: Fix remaining issues, now works properly again. 2018-06-15 00:47:07 -06:00
Michael Scire
4d36697080 Make PM Compile. Note: Currently broken. 2018-06-14 23:32:01 -06:00
Michael Scire
c2d9ac8f5c fs.mitm: WIP LayeredFS impl (NOTE: UNUSABLE ATM) 
Also greatly refactors libstratosphere, and does a lot of other things.
There is a lot of code in this one.
 2018-06-14 17:51:18 -06:00
Michael Scire
237ff0d1e7 libstratosphere/fs.mitm: Push WIP support for Domains. Not yet fully working. 2018-06-12 16:01:04 -06:00
Michael Scire
5c80016c81 fs.mitm: Add HANS-style redirection for System Data Archives. 2018-06-10 11:11:23 -06:00
Michael Scire
931e38742b fs.mitm: Fix sm^H^Hfshax 2018-06-10 03:12:34 -06:00
Michael Scire
3cbdf0b2b9 fs.mitm: Get Title ID on fsp-srv init, Add worker to handle subinterfaces. 2018-06-10 03:07:15 -06:00
misson20000
ec78fa5977 sm: add compile-time option to put a lower bound on session limits, which lets us do things like accessing fsp-ldr without killing ldr. (#136) 
This time with style fixes.
 2018-06-10 00:29:42 -07:00
Michael Scire
548903e3fb fs.mitm: Remove debugging test, fix postprocessing. 2018-06-10 01:19:29 -06:00
Michael Scire
ff9412feef fs.mitm: Add hook for postprocessing mitm messages. 2018-06-10 01:17:00 -06:00
Michael Scire
40a6b7bb54 fs.mitm: Fix pointer buffer size passed to mitm'd commands 2018-06-09 19:36:01 -06:00
Michael Scire
6a58307d83 fs.mitm: Remove unnecessary permissions from json. 2018-06-09 19:34:25 -06:00
Michael Scire
c1c211f542 fs.mitm: Implement basic passthrough framework for input commands. 2018-06-09 19:33:22 -06:00
misson20000
28d630a23e pm: add Atmosphere GetProcessHandle command to pm:dmnt (#133) 2018-06-07 23:32:45 -07:00
Tony Wasserka
0359d6535b Build fix 2018-06-03 18:31:03 +02:00
Tony Wasserka
edc099f026 Use "final" and "override" where appropriate (#117) 2018-06-02 22:46:27 -07:00
Michael Scire
bb636dc05a SM: Make Mitm compile-time toggleable, to forestall whining. 2018-06-02 23:42:01 -06:00
Michael Scire
80f40caf67 SM: Add IPC commands for first-class MITM installation. 2018-06-02 23:38:01 -06:00
hexkyz
7a27322044
Boot: Fully implemented GPIO and PINMUX handling 2018-06-02 22:32:51 +01:00
hexkyz
b777844d2d
Boot: Implement PMC wake pin events 2018-05-21 21:32:57 +01:00
TuxSH
b4eeddd7e1 Revamp all the Makefiles (thanks @fincs @WinterMute) 
... dependencies are now properly handled (e.g. header changes, etc.)
 2018-05-19 01:07:27 +02:00
hexkyz
bf3eea7031
Boot: Implement pinmux drive pad configuration 2018-05-15 21:25:40 +01:00
TuxSH
6efe91b083 boot: build as KIP (thanks @fincs !) 2018-05-15 19:38:04 +02:00
TuxSH
40521a8f63 Fix the syntax errors in the boot JSON files 2018-05-15 19:23:22 +02:00
TuxSH
4e12d55993 loader, pm, sm: build kip as only taget (thanks @fincs !) 2018-05-15 02:28:41 +02:00
TuxSH
d9c2a54464 Make a top-level make build everything in order 2018-05-15 01:30:56 +02:00
TuxSH
cae107557d Fix the remaining warnings in stratosphère 2018-05-15 00:54:12 +02:00
TuxSH
52114760b3 Ignore unused-but-set-variable in ipc_templating.h 2018-05-15 00:44:10 +02:00
TuxSH
ce891c990f Fix latest commit not building 2018-05-15 00:37:07 +02:00
hexkyz
a28924fa10
Boot: Implement pinmux setup 2018-05-14 22:02:40 +01:00
hexkyz
3273cc5357
Merge pull request #84 from leoetlino/printf-format 
ldr: Fix printf format string for size_t
 2018-05-09 22:49:01 +01:00
Luke Street
96391ffca6 boot: Use fsdevMountSdmc & fsdevUnmountAll 2018-05-09 12:07:53 -04:00
Michael Scire
ba7d0c2cb6 Exosphere: Add API for retrieving versioning info. 2018-05-09 06:29:56 -06:00
Michael Scire
173e6c8c0f PM: Fix missing flags set/missing wait. Now works on 5.x. 2018-05-08 18:46:49 -06:00
hexkyz
a39ad22841
Boot: Fleshing out more low level stuff 
Add register read/write for 2.0.0+ (with svcReadWriteRegister)
Add hardware type recognition
Implement PMC clock out configuration
Implement PINMUX park updating
 2018-05-08 22:48:43 +01:00
Michael Scire
c800421a36 Loader: Fix char * const correctness. 2018-05-08 04:43:07 -06:00
Michael Scire
5c6f0fc14c SM: Match official SAC validation behavior. 2018-05-08 03:02:57 -06:00
Michael Scire
aa158dbb5a Loader: Fix game update content loading, fix SD card mounting on newer firmwares. Closes #61. 2018-05-08 02:59:18 -06:00
Michael Scire
44127faa17 SM: Fix svcGetSystemInfo bug, now works on 5.0.2. 2018-05-07 22:48:08 -06:00
Michael Scire
b346c8f375 Fix minor bugs in loader/sm 2018-05-07 07:31:36 -06:00
Michael Scire
9e558dafee libstratosphere: Make boolean autoparsing match official semantics. 2018-05-07 07:22:41 -06:00
Michael Scire
ae78ee22da ProcessManager: Fully implement pm:dmnt. Remove debug logging. 2018-05-07 04:45:44 -06:00
Michael Scire
6dc8ab6f17 ProcessManager: Refactor resource limits, complete pm:shell. 2018-05-07 03:50:45 -06:00
Michael Scire
700f92162d ProcessManager: Fix Synchronization. Now works on 1.0.0 hardware. 2018-05-06 23:00:05 -06:00
Léo Lam
bd42514af0 ldr: Fix printf format string for size_t 
%z should be used for size_t, otherwise the wrong value may be printed.

Fixes two -Wformat warnings.
 2018-05-06 21:07:34 +02:00
Léo Lam
999a15c887 boot: Make gpio helper functions internally linked 2018-05-06 13:09:33 +02:00
Léo Lam
555ed96e80 boot: Fix missing argument for gpio_base_vaddr 2018-05-06 13:09:33 +02:00
Léo Lam
d1e9de50e8 boot: Fix invalid usage of svcQueryIoMapping 2018-05-06 13:09:33 +02:00
Michael Scire
6d6ecb503a ProcessManager: Fix svcCreateEvent handle inversion bug, and others. 
NOTE: Debugging logs have been left in, and will be cleaned up once PM
is working.
 2018-05-06 02:23:47 -06:00
Léo Lam
a097babe18 Replace std::make_tuple with simpler syntax (#77) 
* boot2: Simplify g_additional_launch_programs

It appears that Stratosphère is targeting C++17. In C++17,
std::make_tuple is not required for initialisating a tuple anymore.
Same thing, but less typing

* Replace std::make_tuple with {}

More readable and less noise. Also fixes two missing return statements.
 2018-05-05 11:41:39 -07:00
Léo Lam
cf50bad36c ipc_templating: Avoid depending on order of evaluation (#83) 
f(x, x++) is unspecified behaviour in C++. An implementation could
evaluate arguments from left to right or from right to left.

`T(r.Buffers[a_index], r.BufferSizes[a_index++])` might
access the wrong buffer if `a_index++` is evaluated before the first
argument.

Fixes -Wsequence-point warnings
 2018-05-05 11:41:08 -07:00
Michael Scire
772401b81f ProcessManager: Add pm:info, fix pm:shell missing qualifiers 2018-05-04 20:16:40 -06:00
Michael Scire
e596fd0de5 ProcessManager: Implement almost all of pm:shell 2018-05-04 19:57:11 -06:00
Michael Scire
ae830fea95 Process Manager: Add stub for pm:shell 2018-05-04 18:25:26 -06:00
Michael Scire
5d215ef299 Process Manager: Make process flag updating version agnostic, handle 5.x dead process semantics. 2018-05-04 17:55:48 -06:00
Michael Scire
c19750a0d5 ProcessManager: Make launch flag parsing version agnostic. 2018-05-04 01:01:53 -06:00
Michael Scire
d6cf7c605f ProcessManager: Implement core process management logic. 2018-05-03 23:58:37 -06:00
Léo Lam
999498c0a0 Stratosphère: Simplify some for loops (#76) 
Simplifies some loops by removing the need to manually calculate or
re-specify the array size. Eliminates any chance of using the
wrong size and less typing.
 2018-05-03 16:24:34 -07:00
Michael Scire
7ab9f507cb ProcessManager: Fill out ProcessTracking::Initialize() 2018-05-03 16:15:12 -06:00
hexkyz
5025ba5e82
Boot: Implement initial GPIO configuration 2018-05-03 22:34:45 +01:00
Michael Scire
54a1529ef4 ProcessManager: fix critical typo in sarcastic comment 2018-05-03 04:10:41 -06:00
Michael Scire
3d2c3e1fe1 ProcessManager: Stub ProcessTracking code. 2018-05-03 04:10:05 -06:00
Michael Scire
0459bcee74 ProcessManager: Acquire ldr:pm during init. 2018-05-03 03:58:45 -06:00
Michael Scire
b5412df53b Stratosphere: Add IPC templating for non-member functions. 2018-05-03 03:14:48 -06:00
Michael Scire
593efedb2c ProcessManager: Add BootModeInterface 2018-05-03 02:58:11 -06:00
Michael Scire
bd1315022a Stratosphere: Begin work on PM. 2018-05-02 22:18:05 -06:00
Michael Scire
9e03852703 Loader: Fix bugs ldr:ro, Loader now works fully on hardware. 2018-05-02 01:39:24 -06:00
Michael Scire
361e9607a9 SM: After checking docs, kernelAbove400() -> kernelAbove500() 2018-05-01 23:24:57 -06:00
Michael Scire
3c87c4c3c3 SM: Add compile-time smhax flag, finishing module. (Closes #62) 2018-05-01 23:21:39 -06:00
Michael Scire
e05f199394 Loader: Fix (all?) remaining bugs in ldr:pm. 
Loader now works when booted as a KIP1. NOTE: ldr:ro still needs
debugging.
 2018-05-01 16:49:20 -06:00
Michael Scire
9944d8e7e1 Boot2: Remove svcExitProcess (handled by libnx). 2018-05-01 11:08:21 -06:00
Michael Scire
c12de33440 Boot2: Fix comment. 2018-05-01 11:04:39 -06:00
Michael Scire
64bf2052e5 boot2: exit process at end of main(). 2018-05-01 11:02:16 -06:00
Michael Scire
e7e28fbc57 Implement boot2 sysmodule. 2018-05-01 10:58:33 -06:00
Michael Scire
30f975a558 Stratosphere: Fix remaining bugs in sm, which now works as a KIP1 on hardware 2018-04-30 22:27:26 -06:00
Michael Scire
4e1a29f618 Loader: Finish ldr:ro 2018-04-27 03:33:44 -06:00
Michael Scire
772e41971d Loader: Add ldr:ro->LoadNro() 2018-04-27 03:17:18 -06:00
Michael Scire
e43c6df986 Loader: fix missing NULL assignment 2018-04-26 20:51:12 -06:00
Michael Scire
2e7b6de195 Loader: Automatically unload NRRs on service close. 2018-04-26 20:50:27 -06:00
Michael Scire
e7aa5c246b Loader: Implement ldr:ro->UnloadNrr() 2018-04-26 20:37:38 -06:00
Michael Scire
8524f284fd Loader: Implement ldr:ro->LoadNRR(). NOTE: No sigchecks, at the moment. 2018-04-26 20:27:52 -06:00
Michael Scire
789afe7929 Loader: fix missing reassignment in AutoCloseMap 2018-04-26 19:43:26 -06:00
Michael Scire
1d73bd0a12 Loader: Start work on LoadNRR, Add AutoCloseMap 2018-04-26 19:13:55 -06:00
Michael Scire
b34b9ba0e4 Loader: Greatly simplify mapping logic, add CodeMemory mapper. 2018-04-26 18:04:30 -06:00
Michael Scire
991357f309 Loader: Add NRRInfo to RegisteredProcess, refactor Registration:: 2018-04-26 17:03:10 -06:00
Michael Scire
977a51edb0 Loader: Service ldr:ro on <= 2.3.0 2018-04-26 16:50:43 -06:00
Michael Scire
fe2f227dfc Loader: Implement ldr:ro->Initialize() 2018-04-26 16:49:01 -06:00
Michael Scire
4f09c61bfa Loader: Push ldr:ro stub. 2018-04-26 16:45:09 -06:00
Michael Scire
1ec3eb1ace Loader: is_64_bit -> is_64_bit_addspace 2018-04-26 14:53:33 -06:00
Michael Scire
82d9728372 Loader: Save process->is_64_bit as prep for ldr:ro 2018-04-26 14:51:07 -06:00
Michael Scire
222ec1cd7f Boot: Fix JSON mappings to be RW (instead of RO) 2018-04-25 17:41:07 -06:00
hexkyz
c70e0edc18 Boot: Initial skeleton and 1.0.0 GPIO voltage switch. 2018-04-25 21:35:02 +01:00
Michael Scire
dba0d62ef7 Stratosphere: Add .jsons for loader, sm 2018-04-25 02:07:47 -06:00
Michael Scire
678bf5914a Loader: Properly map BSS as rw. 2018-04-25 01:50:23 -06:00
Michael Scire
3e36e81e80 Loader: Fix bugs in CreateProcess(), which now succeeds on hardware (1.0.0) 2018-04-24 17:56:32 -06:00
Michael Scire
195528adc6 Loader: Fix type definitions in picosha2.hpp 2018-04-24 06:55:54 -06:00
Michael Scire
e443b625ec Loader: Finish Loader::CreateProcess(). 2018-04-24 06:52:13 -06:00
Michael Scire
ba90d0f250 Loader: Include picosha2 as a SHA256 generator. 2018-04-24 06:28:57 -06:00
Michael Scire
80fedc51c1 Loader: Implement all remaining parts of CreateProcess except LoadNsoSegment. 2018-04-24 06:25:31 -06:00
Michael Scire
ee9bfd514c Loader: Implement argument passing. 2018-04-24 06:14:04 -06:00
Michael Scire
a96f862f11 Loader: Implement most of LoadNsosIntoProcessMemory 2018-04-24 06:01:32 -06:00
Michael Scire
d09c48c6c7 Loader: Implement RandomUtils (for ASLR) 2018-04-24 05:05:04 -06:00
Michael Scire
b11c2fe755 Loader: Implement NSO Extent calculation (note: ASLR currently disabled due to lack of entropy source.) 2018-04-24 04:41:29 -06:00
Michael Scire
6afd59d2a2 Loader: Implement mappable-region locating functions. 2018-04-24 03:53:10 -06:00
Michael Scire
5e5dd530c7 Clean up Nso fopen semantics 2018-04-24 03:14:40 -06:00
Michael Scire
1c47959bca Loader: Call svcCreateProcess() 2018-04-24 02:12:19 -06:00
Michael Scire
2d6445d2f9 Loader: Implement InitializeProcessInfo() 2018-04-24 02:08:11 -06:00
Michael Scire
7227817b99 Loader: Fix off-by-one in SDK nso header loading. 2018-04-23 20:10:01 -06:00
Michael Scire
73b6225d2e Loader: Add Nso Header loading, loadset validation in CreateProcess 2018-04-23 20:05:22 -06:00
Michael Scire
16439fd336 Loader: Fix KAC parsing infloop. 2018-04-23 18:29:23 -06:00
Michael Scire
5a7f9f10b1 Loader: Remove Kernel Caps parsing TODO. 2018-04-23 18:25:03 -06:00
Michael Scire
c9a40f358a Loader: Implement Kernel Capability parsing/validation. 2018-04-23 18:24:02 -06:00
Michael Scire
0e11788e43 Stratosphere: Make TODOs for Loader::CreateProcess(). 2018-04-23 13:34:32 -06:00
Michael Scire
8114a52d13 Stratosphere: Update sm.json to use new JSON format for elf2kip 2018-04-23 01:06:37 -06:00
Michael Scire
86d9f51e8a Stratosphere: Add sm.json for elf2kip 2018-04-23 00:33:30 -06:00
Michael Scire
ecf2517bd5 Stratosphere: Fix IServer constructors. SM is fully functional on hardware now. 2018-04-22 05:13:33 -06:00
Michael Scire
674528b246 Stratosphere: Implement support for deferred commands. Finish sm GetService()'s deferred path. 2018-04-22 03:02:19 -06:00
Michael Scire
809090e40d Stratosphere: Fix smhax. 2018-04-22 01:13:36 -06:00
Michael Scire
c8ef305880 Stratosphere: Create sm:m internally for sm, instead of using IPC. 2018-04-22 00:33:16 -06:00
Michael Scire
080816f2b6 Add ExistingPortServer to libstratosphere 2018-04-22 00:33:09 -06:00
Michael Scire
f1cf6dcf97 Implement all of sm. 2018-04-22 00:11:57 -06:00
Michael Scire
61cbb0f86e Stratosphere: Implement sm:->Initialize() 2018-04-21 21:40:26 -06:00
Michael Scire
d0ef3b1c71 Stratosphere: Skeleton all services for sm. 2018-04-21 21:17:57 -06:00
Michael Scire
7dc5a5914b Stratosphere: Move boost/callable_traits into libstratosphere 2018-04-21 21:15:54 -06:00
Michael Scire
044d367eda Stratosphere: ServiceServer<T> -> IServer<T> as abstract base class. 2018-04-21 20:57:24 -06:00
Michael Scire
4aa93ad354 IPC templating style fix 2018-04-21 20:38:13 -06:00
Michael Scire
b81ceeca21 Stratosphere: extract common code to libstratosphere. 2018-04-21 20:31:06 -06:00
Michael Scire
6a51ce25b3 Stratosphere: Skeleton create process up through the ProcessCreation::CreateProcess() call 2018-04-21 19:52:49 -06:00
Michael Scire
878d68f7e0 Stratosphere: Add handle/pid output to IPC templating, fix failure condition message preparation. 2018-04-21 05:17:31 -06:00
Michael Scire
b6ba7b94b9 Stratosphere: Implement ldr:pm->GetProgramInfo() 2018-04-20 23:58:42 -06:00
Michael Scire
0fb107fb86 Stratosphere: Add arguments to GetProgramInfo 2018-04-20 21:38:51 -06:00
Michael Scire
b69c6eff15 Fix padding for C descriptors 2018-04-20 21:06:32 -06:00
Michael Scire
a127233e41 Adjust padding for C descriptor size parsing 2018-04-20 21:03:26 -06:00
Michael Scire
7a2cfa4d60 Stratosphere: Add WrapIpcCommandImpl templating. 2018-04-20 19:34:39 -06:00
Michael Scire
271272e13b Stratosphere: Fix IPC rawdata out size, QueryPointerBufferSize works on hardware now. 2018-04-19 16:53:09 -06:00
Michael Scire
eded273328 Fix IpcControlCommand enum member name 2018-04-19 16:41:51 -06:00
Michael Scire
3aa51a375d Stratosphere: Skeleton more Control Command, implement QueryPointerBufferSize 2018-04-19 16:40:05 -06:00
Michael Scire
71427677cc Fix indentation 2018-04-19 16:29:44 -06:00
Michael Scire
0267a1ad71 Stratosphere: Skeleton framework for auto-hipc manager responses for IpcCommandType != Request 2018-04-19 16:28:19 -06:00
Michael Scire
b843938b1a Stratosphere: Implement ldr:dmnt->GetNsoInfos() 2018-04-19 16:14:48 -06:00
Michael Scire
b2660c661c Stratosphere: Move lr commands to ContentManagement, add Code FS Mounting/Unmounting 2018-04-19 15:28:27 -06:00
Michael Scire
7940981bb8 Stratosphere: Add lz4 library, add GetContentPath primitive to loader. 2018-04-19 07:34:56 -06:00
Michael Scire
5342f7248a Stratosphere: Assume fsldr code is provided by libnx 2018-04-19 07:12:13 -06:00
Michael Scire
d39c3b8efc Stratosphere: Properly overwrite appInit/appExit for libnx in loader 2018-04-19 07:07:43 -06:00
Michael Scire
f0759b0afc Stratosphere: Add libnx fsp-ldr wrapper to Loader 2018-04-19 00:37:01 -06:00
Michael Scire
af11f9fdec Stratosphere: Skeleton ldr:pm (RegisterTitle/UnregisterTitle are implemented) 2018-04-18 23:15:17 -06:00
Michael Scire
30e401d125 Stratosphere: Add Registration Management to Loader 2018-04-18 23:00:10 -06:00
Michael Scire
c5b7f39a67 Add support for receiving X descriptors (works on console) 2018-04-18 21:12:09 -06:00
Michael Scire
7fed8a4428 Stratosphere: Add debugging to loader, it can now be talked to on console successfully. 2018-04-18 16:24:40 -06:00
Michael Scire
8ba3894c3a Stratosphere: Skeleton actual IPC dispatch in ServiceSession 2018-04-18 12:53:04 -06:00
Michael Scire
49719c8a44 Stratosphere: Add missing priority updates 2018-04-18 12:23:06 -06:00
Michael Scire
321286ceab Stratosphere: Fill out Loader main(), fix template classes. 2018-04-18 12:10:45 -06:00
Michael Scire
ee1488a1ed Turns out WaitableManager->delete_waitable() wasn't needed 2018-04-18 11:44:03 -06:00
Michael Scire
cbb0a084a6 Stratosphere: Add IWaitable, WaitableManager 2018-04-18 11:41:17 -06:00
Michael Scire
8e25534912 Stratosphere: Skeleton templated IPC Server code 2018-04-18 08:57:06 -06:00
Michael Scire
5345d7c206 Stratosphere: Skeleton ldr:shel 2018-04-18 03:57:18 -06:00
Michael Scire
b8ad7125ca Stratosphere: Skeleton more of ldr:dmnt->Dispatch() 2018-04-18 03:52:19 -06:00
Michael Scire
c4db563261 Stratosphere: Skeleton ldr:dmnt 2018-04-18 03:30:34 -06:00
Michael Scire
21fa9ff17c Stratosphere: Fix removed add() in Launch Queue 2018-04-17 18:05:19 -06:00
Michael Scire
033cd8df24 Stratosphere: Launch Queue C style lib -> namespace 2018-04-17 18:04:41 -06:00
Michael Scire
c8d1342ddf Stratosphere: Add Launch Queue to Loader 
Modified from RE done by @ogniK5377
 2018-04-17 17:41:57 -06:00
Michael Scire
864979179a Fix C++ header includes 2018-04-17 17:31:57 -06:00
Michael Scire
79aba08295 Stratosphere: Make dir for loader 2018-04-17 17:26:28 -06:00