2020-07-23 10:25:41 +00:00
|
|
|
using Ryujinx.Common;
|
2020-05-03 22:54:50 +00:00
|
|
|
using Ryujinx.Cpu;
|
2018-08-16 23:47:36 +00:00
|
|
|
using Ryujinx.HLE.HOS.Ipc;
|
2018-12-18 05:33:36 +00:00
|
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
2020-04-22 04:10:27 +00:00
|
|
|
using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
|
2019-09-19 00:45:11 +00:00
|
|
|
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
|
2018-09-23 18:11:46 +00:00
|
|
|
using System;
|
2018-07-24 21:38:44 +00:00
|
|
|
using System.Text;
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-09-19 00:45:11 +00:00
|
|
|
namespace Ryujinx.HLE.HOS.Services.Vi.RootService
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-03-19 18:58:46 +00:00
|
|
|
class IApplicationDisplayService : IpcService
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2020-12-01 23:23:43 +00:00
|
|
|
private readonly IdDictionary _displays;
|
|
|
|
|
|
|
|
private int _vsyncEventHandle;
|
2018-03-12 04:04:52 +00:00
|
|
|
|
2018-02-10 00:14:55 +00:00
|
|
|
public IApplicationDisplayService()
|
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
_displays = new IdDictionary();
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(100)]
|
|
|
|
// GetRelayService() -> object<nns::hosbinder::IHOSBinderDriver>
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetRelayService(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2020-04-22 04:10:27 +00:00
|
|
|
MakeObject(context, new HOSBinderDriverServer());
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(101)]
|
|
|
|
// GetSystemDisplayService() -> object<nn::visrv::sf::ISystemDisplayService>
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetSystemDisplayService(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2019-01-05 21:26:16 +00:00
|
|
|
MakeObject(context, new ISystemDisplayService(this));
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(102)]
|
|
|
|
// GetManagerDisplayService() -> object<nn::visrv::sf::IManagerDisplayService>
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetManagerDisplayService(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2019-04-25 22:57:18 +00:00
|
|
|
MakeObject(context, new IManagerDisplayService(this));
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(103)] // 2.0.0+
|
|
|
|
// GetIndirectDisplayTransactionService() -> object<nns::hosbinder::IHOSBinderDriver>
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetIndirectDisplayTransactionService(ServiceCtx context)
|
2018-02-06 23:28:32 +00:00
|
|
|
{
|
2020-04-22 04:10:27 +00:00
|
|
|
MakeObject(context, new HOSBinderDriverServer());
|
2018-02-06 23:28:32 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-06 23:28:32 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(1000)]
|
|
|
|
// ListDisplays() -> (u64, buffer<nn::vi::DisplayInfo, 6>)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode ListDisplays(ServiceCtx context)
|
2018-07-24 21:38:44 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
long recBuffPtr = context.Request.ReceiveBuff[0].Position;
|
2018-07-24 21:38:44 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
MemoryHelper.FillWithZeros(context.Memory, recBuffPtr, 0x60);
|
2018-07-24 21:38:44 +00:00
|
|
|
|
2019-07-02 02:39:22 +00:00
|
|
|
// Add only the default display to buffer
|
2020-05-03 22:54:50 +00:00
|
|
|
context.Memory.Write((ulong)recBuffPtr, Encoding.ASCII.GetBytes("Default"));
|
|
|
|
context.Memory.Write((ulong)recBuffPtr + 0x40, 0x1L);
|
|
|
|
context.Memory.Write((ulong)recBuffPtr + 0x48, 0x1L);
|
|
|
|
context.Memory.Write((ulong)recBuffPtr + 0x50, 1280L);
|
|
|
|
context.Memory.Write((ulong)recBuffPtr + 0x58, 720L);
|
2018-07-24 21:38:44 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write(1L);
|
2018-07-24 21:38:44 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-07-24 21:38:44 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(1010)]
|
|
|
|
// OpenDisplay(nn::vi::DisplayName) -> u64
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode OpenDisplay(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
string name = GetDisplayName(context);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
long displayId = _displays.Add(new Display(name));
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write(displayId);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(1020)]
|
|
|
|
// CloseDisplay(u64)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode CloseDisplay(ServiceCtx context)
|
2018-03-06 13:25:26 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
int displayId = context.RequestData.ReadInt32();
|
2018-03-06 13:25:26 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
_displays.Delete(displayId);
|
2018-03-06 13:25:26 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-03-06 13:25:26 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(1102)]
|
|
|
|
// GetDisplayResolution(u64) -> (u64, u64)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetDisplayResolution(ServiceCtx context)
|
2018-04-04 22:16:59 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
long displayId = context.RequestData.ReadInt32();
|
2018-04-04 22:16:59 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write(1280);
|
|
|
|
context.ResponseData.Write(720);
|
2018-04-04 22:16:59 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-04-04 22:16:59 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2020)]
|
|
|
|
// OpenLayer(nn::vi::DisplayName, u64, nn::applet::AppletResourceUserId, pid) -> (u64, buffer<bytes, 6>)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode OpenLayer(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2020-04-22 04:10:27 +00:00
|
|
|
// TODO: support multi display.
|
|
|
|
byte[] displayName = context.RequestData.ReadBytes(0x40);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-04-22 04:10:27 +00:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
long userId = context.RequestData.ReadInt64();
|
2018-12-06 11:16:24 +00:00
|
|
|
long parcelPtr = context.Request.ReceiveBuff[0].Position;
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
IBinder producer = context.Device.System.SurfaceFlinger.OpenLayer(context.Request.HandleDesc.PId, layerId);
|
2020-04-22 04:10:27 +00:00
|
|
|
|
|
|
|
Parcel parcel = new Parcel(0x28, 0x4);
|
|
|
|
|
|
|
|
parcel.WriteObject(producer, "dispdrv\0");
|
|
|
|
|
|
|
|
ReadOnlySpan<byte> parcelData = parcel.Finish();
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-05-03 22:54:50 +00:00
|
|
|
context.Memory.Write((ulong)parcelPtr, parcelData);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-04-22 04:10:27 +00:00
|
|
|
context.ResponseData.Write((long)parcelData.Length);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2021)]
|
|
|
|
// CloseLayer(u64)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode CloseLayer(ServiceCtx context)
|
2018-03-06 20:27:50 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
2018-03-12 04:04:52 +00:00
|
|
|
|
2020-04-22 04:10:27 +00:00
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-03-06 20:27:50 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2030)]
|
|
|
|
// CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode CreateStrayLayer(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
long layerFlags = context.RequestData.ReadInt64();
|
|
|
|
long displayId = context.RequestData.ReadInt64();
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
long parcelPtr = context.Request.ReceiveBuff[0].Position;
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-04-22 04:10:27 +00:00
|
|
|
// TODO: support multi display.
|
2018-12-06 11:16:24 +00:00
|
|
|
Display disp = _displays.GetData<Display>((int)displayId);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
IBinder producer = context.Device.System.SurfaceFlinger.CreateLayer(0, out long layerId);
|
2020-04-22 04:10:27 +00:00
|
|
|
|
|
|
|
Parcel parcel = new Parcel(0x28, 0x4);
|
|
|
|
|
|
|
|
parcel.WriteObject(producer, "dispdrv\0");
|
|
|
|
|
|
|
|
ReadOnlySpan<byte> parcelData = parcel.Finish();
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-05-03 22:54:50 +00:00
|
|
|
context.Memory.Write((ulong)parcelPtr, parcelData);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-04-22 04:10:27 +00:00
|
|
|
context.ResponseData.Write(layerId);
|
|
|
|
context.ResponseData.Write((long)parcelData.Length);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2031)]
|
|
|
|
// DestroyStrayLayer(u64)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode DestroyStrayLayer(ServiceCtx context)
|
2018-03-12 04:04:52 +00:00
|
|
|
{
|
2020-04-22 04:10:27 +00:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
|
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-03-12 04:04:52 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2101)]
|
|
|
|
// SetLayerScalingMode(u32, u64)
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode SetLayerScalingMode(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
int scalingMode = context.RequestData.ReadInt32();
|
2020-07-23 10:25:41 +00:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(2102)] // 5.0.0+
|
|
|
|
// ConvertScalingMode(unknown) -> unknown
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode ConvertScalingMode(ServiceCtx context)
|
2019-02-15 04:47:40 +00:00
|
|
|
{
|
2019-09-19 00:45:11 +00:00
|
|
|
SourceScalingMode scalingMode = (SourceScalingMode)context.RequestData.ReadInt32();
|
2019-02-15 04:47:40 +00:00
|
|
|
|
2019-09-19 00:45:11 +00:00
|
|
|
DestinationScalingMode? convertedScalingMode = ConvertScalingMode(scalingMode);
|
2019-02-19 00:12:53 +00:00
|
|
|
|
|
|
|
if (!convertedScalingMode.HasValue)
|
2019-02-15 04:47:40 +00:00
|
|
|
{
|
2019-07-02 02:39:22 +00:00
|
|
|
// Scaling mode out of the range of valid values.
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.InvalidArguments;
|
2019-02-15 04:47:40 +00:00
|
|
|
}
|
|
|
|
|
2019-09-19 00:45:11 +00:00
|
|
|
if (scalingMode != SourceScalingMode.ScaleToWindow &&
|
|
|
|
scalingMode != SourceScalingMode.PreserveAspectRatio)
|
2019-02-19 00:12:53 +00:00
|
|
|
{
|
2019-07-02 02:39:22 +00:00
|
|
|
// Invalid scaling mode specified.
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.InvalidScalingMode;
|
2019-02-19 00:12:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
context.ResponseData.Write((ulong)convertedScalingMode);
|
2019-02-15 04:47:40 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2019-02-15 04:47:40 +00:00
|
|
|
}
|
|
|
|
|
2019-09-19 00:45:11 +00:00
|
|
|
private DestinationScalingMode? ConvertScalingMode(SourceScalingMode source)
|
2019-02-15 04:47:40 +00:00
|
|
|
{
|
2019-02-19 00:12:53 +00:00
|
|
|
switch (source)
|
2019-02-15 04:47:40 +00:00
|
|
|
{
|
2019-09-19 00:45:11 +00:00
|
|
|
case SourceScalingMode.None: return DestinationScalingMode.None;
|
|
|
|
case SourceScalingMode.Freeze: return DestinationScalingMode.Freeze;
|
|
|
|
case SourceScalingMode.ScaleAndCrop: return DestinationScalingMode.ScaleAndCrop;
|
|
|
|
case SourceScalingMode.ScaleToWindow: return DestinationScalingMode.ScaleToWindow;
|
|
|
|
case SourceScalingMode.PreserveAspectRatio: return DestinationScalingMode.PreserveAspectRatio;
|
2019-02-15 04:47:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2020-07-23 10:25:41 +00:00
|
|
|
[Command(2460)]
|
|
|
|
// GetIndirectLayerImageRequiredMemoryInfo(u64 width, u64 height) -> (u64 size, u64 alignment)
|
|
|
|
public ResultCode GetIndirectLayerImageRequiredMemoryInfo(ServiceCtx context)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
// Doesn't occur in our case.
|
|
|
|
if (sizePtr == null || address_alignmentPtr == null)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidArguments;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
int width = (int)context.RequestData.ReadUInt64();
|
|
|
|
int height = (int)context.RequestData.ReadUInt64();
|
|
|
|
|
|
|
|
if (height < 0 || width < 0)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidLayerSize;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
// Doesn't occur in our case.
|
|
|
|
if (!service_initialized)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidArguments;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
const ulong defaultAlignment = 0x1000;
|
|
|
|
const ulong defaultSize = 0x20000;
|
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
// NOTE: The official service setup a A8B8G8R8 texture with a linear layout and then query its size.
|
|
|
|
// As we don't need this texture on the emulator, we can just simplify this logic and directly
|
2020-07-23 10:25:41 +00:00
|
|
|
// do a linear layout size calculation. (stride * height * bytePerPixel)
|
|
|
|
int pitch = BitUtils.AlignUp(BitUtils.DivRoundUp(width * 32, 8), 64);
|
|
|
|
int memorySize = pitch * BitUtils.AlignUp(height, 64);
|
|
|
|
ulong requiredMemorySize = (ulong)BitUtils.AlignUp(memorySize, (int)defaultAlignment);
|
|
|
|
ulong size = (requiredMemorySize + defaultSize - 1) / defaultSize * defaultSize;
|
|
|
|
|
|
|
|
context.ResponseData.Write(size);
|
|
|
|
context.ResponseData.Write(defaultAlignment);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2019-07-12 01:13:43 +00:00
|
|
|
[Command(5202)]
|
|
|
|
// GetDisplayVsyncEvent(u64) -> handle<copy>
|
2019-07-14 19:04:38 +00:00
|
|
|
public ResultCode GetDisplayVSyncEvent(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
string name = GetDisplayName(context);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
if (_vsyncEventHandle == 0)
|
2018-09-23 18:11:46 +00:00
|
|
|
{
|
2020-12-01 23:23:43 +00:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(context.Device.System.VsyncEvent.ReadableEvent, out _vsyncEventHandle) != KernelResult.Success)
|
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-09-23 18:11:46 +00:00
|
|
|
}
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_vsyncEventHandle);
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2019-07-14 19:04:38 +00:00
|
|
|
return ResultCode.Success;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
private string GetDisplayName(ServiceCtx context)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
string name = string.Empty;
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
for (int index = 0; index < 8 &&
|
|
|
|
context.RequestData.BaseStream.Position <
|
|
|
|
context.RequestData.BaseStream.Length; index++)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
byte chr = context.RequestData.ReadByte();
|
2018-02-04 23:08:20 +00:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
if (chr >= 0x20 && chr < 0x7f)
|
2018-02-04 23:08:20 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
name += (char)chr;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
return name;
|
2018-02-04 23:08:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|