H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,859 Commits 7 Branches 3 Tags 145 MiB
6ae0086b39
Commit Graph

2405 Commits

Author SHA1 Message Date
wwylele
12bcf64ab5 ir: implement circle pad pro 2017-05-03 09:44:00 +03:00
Yuri Kunde Schlesner
941a3dda8a Merge pull request #2532 from wwylele/ldrro-ipc 
ldr_ro: use IPC helper
 2017-04-18 00:32:01 -07:00
wwylele
11ea159aa4 ldr_ro: use IPC helper 2017-04-17 10:11:18 +03:00
bunnei
6a72bd62b5 Merge pull request #2659 from MerryMage/dsp_dsp-correction 
dsp_dsp: Messages are modified by service before being sent to DSP
 2017-04-13 10:43:13 -04:00
MerryMage
172a362884 dsp_dsp: Messages are modified by service before being sent to DSP 2017-04-12 21:33:07 +01:00
Sebastian Valle
26745f28ea Merge pull request #2628 from Subv/uds 
Services/UDS: Initial support for hosting local-wlan networks.
 2017-04-12 11:57:24 -05:00
bunnei
26979cd6ef Merge pull request #2533 from Lectem/apt_ipchelper 
IpcHelper enhancement and APT refactor
 2017-04-06 14:44:52 -04:00
bunnei
37b7df9c59 Merge pull request #2634 from wwylele/battery 
shared_page: stub battery state
 2017-04-06 14:43:29 -04:00
noah the goodra
7ca9dedfd6 error conversion fixes for soc_u 2017-04-03 10:19:42 -05:00
Michael Theall
31f9c1ab5d Fix OutputDebugString syscall 2017-04-01 04:09:39 -05:00
Sebastian Valle
5c4bd3ef33 Services/UDS: Fixed a style mistake in GetChannel. 2017-03-27 13:08:26 -05:00
Subv
f8f3b27eb3 Services/UDS: Use consistent spelling for WiFi and simplify the GetChannel function. 2017-03-26 08:17:57 -05:00
Subv
0ae6d8be5b Services/UDS: Signal the connection event when closing down the network. 2017-03-26 08:17:56 -05:00
Subv
d7d5bf411a Services/UDS: Do not allow trying to start up a network that only the host can connect to. 2017-03-26 08:17:55 -05:00
Subv
97f1e62b66 Service/UDS: Schedule an event to broadcast the beacon frames every 102.4ms. 2017-03-26 08:17:53 -05:00
Subv
4243c1198f Services/UDS: Store the entire NetworkInfo structure that was used to create the network. 
It will be needed when generating the beacon frames.
 2017-03-26 08:17:52 -05:00
Subv
9771615f16 Services/UDS: Initial support for hosting local-wlan networks. 
Currently it will let games create a network as hosts, but will not broadcast it anywhere and will not allow clients to connect.
 2017-03-26 08:17:51 -05:00
wwylele
a37c9fb9d3 ptm: create SharedExtSave file before openning it 2017-03-25 14:22:07 +03:00
bunnei
ccc3985cc0 Merge pull request #2512 from SonofUgly/custom-layout 
Add custom layout settings.
 2017-03-21 22:57:31 -04:00
wwylele
f7a0328a6e shared_page: stub battery state 2017-03-21 13:25:56 +02:00
Lectem
e60b433efa hopefully fix clang-format issues with old version 2017-03-20 22:47:06 +01:00
Lectem
e9c80ea5b7 address more comments 2017-03-19 01:33:56 +01:00
Lectem
979d2000d2 Cast size_t to u32 for PushStaticBuffer usages 2017-03-18 11:56:21 +01:00
Lectem
12ed746477 IPCHelper Skip method + address comments for apt 2017-03-18 11:47:40 +01:00
wwylele
0123411468 apt: fix RequestBuilder parameters for Unwrap 2017-03-18 11:45:19 +02:00
Lectem
77f4fc473f fix #2560 and other comments 2017-03-18 10:44:01 +01:00
Lectem
fb70c9683c move push out of class body and add u8 u16 bool specializations 2017-03-18 10:44:01 +01:00
Lectem
501e23ce59 refactor APT service to use the new IPC helpers 2017-03-18 10:44:01 +01:00
bunnei
423ab5e2bc Merge pull request #2497 from wwylele/input-2 
Refactor input emulation & add SDL gamepad support
 2017-03-17 14:59:39 -04:00
bunnei
3e7459bbf9 Merge pull request #2618 from wwylele/log-less-filename 
Reduce host file name and path logging
 2017-03-16 23:35:36 -04:00
bunnei
709e4fa5d2 Merge pull request #2620 from FernandoS27/syscore_error 
Refined thread launch on syscore error messages
 2017-03-15 21:17:43 -04:00
wwylele
363f36b904 cfg: implement GenHashConsoleUnique 2017-03-12 12:24:57 +02:00
Fernando Sahmkow
b5dbc6cb98 Refined thread launch on syscore error messages 2017-03-09 08:18:18 -05:00
wwylele
047a1586fe file_sys: lower log level for setting host path 2017-03-08 17:47:24 +02:00
wwylele
6551a72ec8 loader/ncch: less verbose log for loading game list. only log program ID when booting 2017-03-08 17:37:24 +02:00
wwylele
4b931bb913 loader: lower file name logging level 2017-03-08 17:25:09 +02:00
wwylele
e02c4b7195 Input: remove unused stuff & clean up 
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID
2. removed button handling in EmuWindow
3. removed key_map
4. cleanup #include
 2017-03-01 23:30:57 +02:00
wwylele
38e800f70d InputCommon: add Keyboard 2017-03-01 23:30:57 +02:00
wwylele
70420272ca HID: use AnalogDevice 2017-03-01 23:30:57 +02:00
wwylele
1d1329af23 HID: use ButtonDevice 2017-03-01 23:30:57 +02:00
wwylele
3974895e08 Input: add device and factory template 2017-03-01 23:30:57 +02:00
wwylele
85ba60d5ec Timer: restore missing signaled=true from #2421 2017-02-27 22:49:46 +02:00
bunnei
5e334af369 Merge pull request #2594 from wwylele/ir-separate 
IR: separate functions of each port to their own files
 2017-02-27 14:25:50 -05:00
B3n30
dcf115778a Fix log entry in timer::signal (#2600) 2017-02-27 11:04:03 -05:00
Mat M
0cb52ee74a Doxygen: Amend minor issues (#2593) 
Corrects a few issues with regards to Doxygen documentation, for example:

- Incorrect parameter referencing.
- Missing @param tags.
- Typos in @param tags.

and a few minor other issues.
 2017-02-26 17:58:51 -08:00
Yuri Kunde Schlesner
b250ce21b9 Merge pull request #2587 from yuriks/status-bar 
Replace built-in Profiler with indicators in status bar
 2017-02-26 17:51:15 -08:00
Yuri Kunde Schlesner
174464a87f PerfStats: Re-order and document members better 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
fb1979d7e2 Core: Re-write frame limiter 
Now based on std::chrono, and also works in terms of emulated time
instead of frames, so we can in the future frame-limit even when the
display is disabled, etc.

The frame limiter can also be enabled along with v-sync now, which
should be useful for those with displays running at more than 60 Hz.
 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
b285c2a4ed Core: Make PerfStats internally locked 
More ergonomic to use and will be required for upcoming changes.
 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
92c8bd4b1f PerfStats: Add method to get the instantaneous time ratio 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
c75ae6c585 Add performance statistics to status bar 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
441f8b5a4b Core: Remove unnecessary include in thread.h 2017-02-26 17:22:01 -08:00
wwylele
2d6113de09 IR: separate functions of each port to their own files 2017-02-26 11:11:35 +02:00
bunnei
892888ed9e Merge pull request #2569 from wwylele/wrap-unwrap 
APT: implemented Wrap and Unwrap
 2017-02-25 00:12:33 -05:00
Yuri Kunde Schlesner
fb5301cf6e Merge pull request #2421 from Subv/timers 
Timers: Immediately signal the timer if it was started with an initial value of 0
 2017-02-24 20:48:31 -08:00
SonofUgly
e0a4450bbd Add custom layout settings. 2017-02-23 10:49:56 -08:00
Subv
0be77c3ae4 Timers: Return an error when calling SetTimer with negative timeouts. 2017-02-21 20:51:56 -05:00
Subv
029a11030e Timers: Immediately signal the timer if it was started with an initial value of 0. 2017-02-21 20:51:54 -05:00
wwylele
d5b0e275e3 APT: implement Wrap and Unwrap 2017-02-21 23:57:31 +02:00
wwylele
ea1ea0224c HW: add AES engine & implement AES-CCM 2017-02-21 23:57:31 +02:00
bunnei
bb448ae66f Merge pull request #2585 from MerryMage/sxtb16-sxtab16 
dyncom: Correct SXTAB16 and SXTB16
 2017-02-19 22:45:46 -05:00
MerryMage
b125388152 dyncom: Correct SXTAB16 and SXTB16 2017-02-18 20:04:54 +00:00
Weiyi Wang
c7c1f56ce6 HID: move enable_accelerometer/gyroscope_count initialization into Init() (#2574) 
Fixes #2556
 2017-02-16 22:04:27 -08:00
wwylele
e4da1a54cf core: add missing errors.h in CMakeLists.txt 2017-02-15 15:49:07 +02:00
Yuri Kunde Schlesner
070daf4126 HLE/IPC: Fix uninitialized variables in helpers (#2568) 
Fixes #2567
 2017-02-13 21:41:59 -08:00
noah the goodra
ded09dc727 NWM changed to NIM 2017-02-13 18:34:01 -06:00
noah the goodra
ad49cec194 turned clang format back on 2017-02-13 18:34:01 -06:00
Weiyi Wang
dbc94efdb5 Core: add cryptopp library (#2412) 2017-02-13 12:03:55 -08:00
Yuri Kunde Schlesner
d60767d393 Merge pull request #2561 from wwylele/fs-rom 
file_sys: change RomFS archive to Self NCCH archive
 2017-02-13 09:18:23 -08:00
wwylele
20544977da loader: use self NCCH archive 2017-02-13 13:57:38 +02:00
wwylele
a0df747325 file_sys: add Self NCCH archive 2017-02-13 13:57:38 +02:00
Yuri Kunde Schlesner
da6a40e3d1 core: Free AppLoader on shutdown to release file (#2558) 
Fixes #2455
 2017-02-11 03:29:46 -08:00
Weiyi Wang
0dd007e9ba hid: remove the touch field from PadState (#2557) 2017-02-11 01:11:42 -08:00
Weiyi Wang
a1393dc70c Merge pull request #2027 from Lectem/ipcrefactor 
IPC helper
 2017-02-05 10:22:13 +02:00
Lectem
2ee472b9c7 fix wwylele's comment and use typename in templates 2017-02-05 00:29:07 +01:00
Yuri Kunde Schlesner
9590c932ec Merge pull request #2496 from mailwl/cfg-mem 
Core: update Kernel Config Memory to latest version (11.2)
 2017-02-03 21:17:48 -08:00
Yuri Kunde Schlesner
a630fa287e Merge pull request #2518 from MerryMage/coproc 
arm_dynarmic: Coprocessor support
 2017-02-03 18:22:28 -08:00
bunnei
632562f5cf Merge pull request #2509 from jfmherokiller/settingscastpatch 
removed the possibly uneeded cast on values.gdbstub_port
 2017-02-03 14:57:44 -05:00
MerryMage
e2815408fd arm_dynarmic: Update memory interface 2017-02-03 17:32:51 +00:00
MerryMage
2b36d4c9d7 arm_dynarmic: CP15 support 2017-02-03 17:32:47 +00:00
mailwl
a53714acd3 GSP_GPU::StoreDataCache stubbed (#2428) 2017-02-02 23:07:44 -08:00
noah the goodra
a0874d9b64 removed the possibly uneeded cast on values.gdbstub_port 
as far as i could tell this cast is unneeded because [GDBStub::SetServerPort](https://github.com/citra-emu/citra/blob/master/src/core/gdbstub/gdbstub.cpp#L897) takes a u16 and [values.gdbstub_port](https://github.com/citra-emu/citra/blob/master/src/core/settings.h#L116) is already a u16
 2017-01-31 11:44:23 -06:00
mailwl
d0bf7df5ba HLE/Applets: Stub Mint (eShop) Applet (#2463) 
This allows Phoenix Wright - Dual Destinies to boot.
 2017-01-31 01:16:58 -08:00
mailwl
0b0c5672c8 Core: update Kernel Config Memory to latest version (11.2) 2017-01-30 11:29:00 +03:00
Yuri Kunde Schlesner
1410aa1824 Merge pull request #2368 from wwylele/camera-2 
CAM: build the service framework with a dummy implementation
 2017-01-29 22:16:39 -08:00
Yuri Kunde Schlesner
a925473995 Merge pull request #2429 from wwylele/auto-language-fix 
CFG: move language override to the boot process
 2017-01-29 22:14:35 -08:00
Yuri Kunde Schlesner
5bb6753f2e Merge pull request #2494 from Kloen/killing-warnings-2-final-mix 
core: inline CPU, 132 warnings fixed on GCC
 2017-01-29 15:40:50 -08:00
Yuri Kunde Schlesner
f111cd66ce Merge pull request #2492 from Kloen/killing-warnings-HD1.5ReMIX 
Fix OSX build warnings about unhandled enumeration values.
 2017-01-29 15:38:49 -08:00
Kloen
b3a0b1489b core: inline CPU, 132 warnings fixed on GCC 2017-01-30 00:12:07 +01:00
Kloen
2ca3beb9d3 core: fix err_f.cpp warning about unhandled enumeration value on OSX 2017-01-29 22:01:19 +01:00
Kloen
f352a741d3 core: fix savedata_archive.cpp warnings about unhandled enumeration values on OSX 2017-01-29 21:50:25 +01:00
Kloen
c4f9cd3559 core: fix archive_sdmc.cpp warnings about unhandled enumeration value on OSX 2017-01-29 21:49:36 +01:00
Kloen
f14a53abd0 core: fix archive_extsavedata.cpp warning on OSX 2017-01-29 21:48:40 +01:00
Kloen
ff7d68d743 core: emu_window.cpp, fix conversion warnings from float to s16 on MSVC 2017-01-29 16:39:31 +01:00
Kloen Lansfiel
f852369986 SDL: Select audio device (#2403) 
* Initial Commit

Added Device logic to Sinks
Started on UI for selecting devices

Removed redundant import

* Audio Core: Complete Device Switching

Complete the device switching implementation by allowing the output
device to be loaded, changed and saved through the configurations menu.

Worked with the Sink abstraction and tuned the "Device Selection"
configuration so that the Device List is automatically populated when
the Sink is changed.
This hopefully addresses the concerns and recommendations mentioned in
the comments of the PR.

* Clean original implementation.

* Refactor GetSinkDetails
 2017-01-25 22:33:26 -05:00
Yuri Kunde Schlesner
3feb3ce283 Merge pull request #2434 from mailwl/nfc-amiibo 
Service/NFC: stub some functions
 2017-01-25 23:47:56 -03:00
Kloen
095f7c83fc core: fix mic_u warnings on MSVC 2017-01-23 16:53:05 +01:00
wwylele
2c7676d371 HID: reset acceleroeter and gyroscope index in Init 2017-01-20 23:33:50 +02:00
wwylele
0045ea662f CFG: override language setting on boot 2017-01-19 10:28:35 +02:00
Thomas Farr
bb1f277db1
loader: Add support for 3DSX special relocation types, fixes citra-emu/citra#2449 
As per devkitPro/3dstools@47bea18
 2017-01-19 01:34:58 +13:00
wwylele
47960b0659 CoreTiming: use named constant for ARM11 clock rate 2017-01-16 09:59:16 +02:00
wwylele
3c333c53f1 HID: manages updating itself using correct ticks 2017-01-16 09:51:44 +02:00
mailwl
efe7e245b2 Service/NFC: stub some functions 
Tested on: Mini-Mario & Friends - amiibo Challenge
 2017-01-14 16:15:16 +03:00
mailwl
b458d7447c GSP::WriteHWRegsWithMask: fix register mask 2017-01-14 13:37:04 +03:00
bunnei
7ddfd3054d Merge pull request #2425 from Subv/cleanup_todos 
Implement some TODOs in the code.
 2017-01-12 10:14:30 -05:00
bunnei
597a7c615c Merge pull request #2308 from mailwl/ac-i 
Service/AC: add ac:i service
 2017-01-12 10:12:46 -05:00
Subv
1ddff14511 Threads: Check the process' resource limit for the max allowed priority when creating a thread and remove the priority clamping code. 2017-01-11 16:38:05 -05:00
Subv
f2f2572fed Thread: Added priority range checking to svcSetThreadPriority and removed priority clamping code from Thread::SetPriority. 2017-01-11 16:38:04 -05:00
Subv
5ddc2e09b1 Y2R: Use the proper error code when GetStandardCoefficient receives an invalid value. 2017-01-11 16:38:03 -05:00
wwylele
cf3a272332 CAM: implement basic camera functions with a blank camera 2017-01-11 11:46:44 +02:00
bunnei
84d72fd92f Merge pull request #2397 from Subv/pulse 
Kernel: Implemented Pulse event and timers.
 2017-01-10 10:45:00 -05:00
bunnei
9fc8ead842 Merge pull request #2384 from bunnei/internal-res-option 
config: Add option for specifying screen resolution scale factor.
 2017-01-08 12:25:12 -05:00
bunnei
7cfe3ef046 Merge pull request #1951 from wwylele/motion-sensor 
Emulate motion sensor in frontend
 2017-01-07 12:39:20 -05:00
bunnei
22ad9094e6 config: Add option for specifying screen resolution scale factor. 2017-01-07 03:23:22 -05:00
bunnei
b5eac78b43 Merge pull request #2410 from Subv/sleepthread 
Don't yield execution in SleepThread(0) if there are no available threads to run
 2017-01-06 22:01:33 -05:00
bunnei
59f4f1d7ff Merge pull request #2396 from Subv/sema_acquire 
Kernel/Semaphore: Fixed a regression in semaphore waits.
 2017-01-06 22:00:12 -05:00
Hyper
f0199a17f6 Kernel: Fix SharedMemory objects always returning error when addr = 0 (#2404) 
Closes #2400
 2017-01-06 08:21:22 -05:00
bunnei
1c792389e6 Merge pull request #2408 from Subv/priority_boosting 
Kernel: Removed the priority boost code for starved threads.
 2017-01-06 00:40:39 -05:00
Subv
fc2266130b Kernel: Don't attempt to yield execution in SleepThread(0) if there are no available threads to run. 
With this we avoid an useless temporary deschedule of the current thread.
 2017-01-05 19:11:34 -05:00
Subv
5e2a8ebabf Kernel: Remove some unused functions. 2017-01-05 13:17:06 -05:00
Subv
933df2606a Kernel: Removed the priority boost code for starved threads. 
After hwtesting and reverse engineering the kernel, it was found that the CTROS scheduler performs no priority boosting for threads like this, although some other forms of scheduling priority-starved threads might take place.

For example, it was found that hardware interrupts might cause low-priority threads to run if the CPU is preempted in the middle of an SVC handler that deschedules the current (high priority) thread before scheduling it again.
 2017-01-05 13:12:39 -05:00
Subv
e52ca85711 Kernel: Implemented Pulse event and timers. 
Closes #1904
 2017-01-05 13:06:17 -05:00
Subv
4251eb26ec Kernel/Semaphore: Fixed a regression in semaphore waits. 
The regression was caused by a missing check in #2260.

The new behavior is consistent with the real kernel.
 2017-01-05 13:00:05 -05:00
Sebastian Valle
f20d872643 Merge pull request #2393 from Subv/synch 
Kernel: Mutex priority inheritance and synchronization improvements.
 2017-01-05 12:55:01 -05:00
Subv
dda4ec93be Kernel: Add some asserts to enforce the invariants in the scheduler. 2017-01-05 09:40:18 -05:00
Subv
7f1dca8cd2 Kernel: Remove a thread from all of its waiting objects' waiting_threads list when it is awoken. 
This fixes a potential bug where threads would not get removed from said list if they awoke after waiting with WaitSynchronizationN with wait_all = false
 2017-01-05 09:40:15 -05:00
Subv
fd95b6ee26 Kernel: Remove Thread::wait_objects_index and use wait_objects to hold all the objects that a thread is waiting on. 2017-01-05 09:40:14 -05:00
Subv
cef5f45de2 Kernel: Use different thread statuses when a thread calls WaitSynchronization1 and WaitSynchronizationN with wait_all = true. 
This commit removes the overly general THREADSTATUS_WAIT_SYNCH and replaces it with two more granular statuses:

THREADSTATUS_WAIT_SYNCH_ANY when a thread waits on objects via WaitSynchronization1 or WaitSynchronizationN with wait_all = false.

THREADSTATUS_WAIT_SYNCH_ALL when a thread waits on objects via WaitSynchronizationN with wait_all = true.
 2017-01-04 15:58:50 -05:00
Subv
d3ff5b91e1 Kernel/Mutex: Propagate thread priority changes to other threads inheriting the priority via mutexes 2017-01-04 15:58:48 -05:00
Subv
b6a0355568 Kernel/Mutex: Update a mutex priority when a thread stops waiting on it. 2017-01-04 15:58:47 -05:00
Subv
7abf185390 Kernel/Mutex: Implemented priority inheritance. 
The implementation is based on reverse engineering of the 3DS's kernel.

A mutex holder's priority will be temporarily boosted to the best priority among any threads that want to acquire any of its held mutexes.
When the holder releases the mutex, it's priority will be boosted to the best priority among the threads that want to acquire any of its remaining held mutexes.
 2017-01-04 15:58:46 -05:00
Subv
e6a7723f2f Kernel: Object ShouldWait and Acquire calls now take a thread as a parameter. 
This will be useful when implementing mutex priority inheritance.
 2017-01-04 15:58:45 -05:00
Subv
38a90882a4 Kernel/Synch: Do not attempt a reschedule on every syscall. 
Not all syscalls should cause reschedules, this commit attempts to remedy that, however, it still does not cover all cases.
 2017-01-04 15:58:44 -05:00
Jonathan Hao
c18cb1b192 Fix some warnings (#2399) 2017-01-04 13:48:29 -03:00
Lectem
ee6e88fdb5 fix comments alignment 2016-12-30 15:55:42 +01:00
mailwl
f2985f7080 Service/NFC: stub GetTagInRangeEvent 
Fix Fatal Error in Mini-Mario & Friends - amiibo Challenge
 2016-12-30 09:40:54 +03:00
mailwl
c6f4b93f2e Service/AC: add ac:i service 2016-12-30 09:20:11 +03:00
bunnei
f556d6ee90 Merge pull request #2240 from wwylele/auto-region 
Config: auto-select region and language
 2016-12-29 22:09:01 -05:00
wwylele
d7d40b3c56 Frontend: make motion sensor interfaced thread-safe 2016-12-29 21:18:36 +02:00
wwylele
f927beb5e2 Core: remove unused hle.cpp 2016-12-27 10:27:48 +02:00
Lectem
f91c51467a move Pop methods out of class body 2016-12-26 14:42:06 +01:00
Lectem
8baae9d982 IPC helpers example 2016-12-26 14:07:29 +01:00
Lectem
8f2b642415 IPC helpers 2016-12-26 14:07:29 +01:00
wwylele
bcf9d20d57 Frontend: emulate motion sensor 2016-12-26 10:52:16 +02:00
wwylele
fe2ed4bf72 Core: reset cpu_core in Shutdown to make IsPoweredOn work properly 2016-12-24 20:55:38 +02:00
MerryMage
64f98f4d0f core: Move emu_window and key_map into core 
* Removes circular dependences (common should not depend on core)
 2016-12-23 13:42:39 +00:00
mailwl
069a88dad7 Service/NWM: add nwm services 2016-12-22 22:51:27 +03:00
bunnei
76890672a0 Merge pull request #2366 from MerryMage/MemoryReadCode 
arm_dynarmic: Provide MemoryReadCode callback
 2016-12-22 14:25:15 -05:00
bunnei
aa47af7fb6 Merge pull request #2343 from bunnei/core-cleanup 
Core: Top-level consolidate & misc cleanup
 2016-12-22 11:47:44 -05:00
MerryMage
f8cf87ce34 arm_dynarmic: Provide MemoryReadCode callback 
Change of interface in dynarmic 36082087ded632079b16d24137fdd0c450ce82ea
 2016-12-22 16:07:14 +00:00