HLE: add some more constants

This commit is contained in:
Megamouse 2020-01-22 22:36:14 +01:00
parent 18f167ddd0
commit 3e8a5c6395
3 changed files with 63 additions and 50 deletions

View file

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "Utilities/BEType.h"
@ -15,11 +15,12 @@ enum CellAudioInError
CELL_AUDIO_IN_ERROR_CONDITION_BUSY = 0x8002b267,
};
enum
enum CellAudioInDeviceMode
{
CELL_AUDIO_IN_SINGLE_DEVICE_MODE = 0,
CELL_AUDIO_IN_MULTI_DEVICE_MODE = 1,
CELL_AUDIO_IN_MULTI_DEVICE_MODE_2 = 2,
CELL_AUDIO_IN_MULTI_DEVICE_MODE_10 = 10,
};
enum CellAudioInPortType
@ -80,7 +81,7 @@ struct CellAudioInDeviceInfo
struct CellAudioInRegistrationOption
{
//(Omitted)
be_t<u32> reserved;
};
struct CellAudioInDeviceConfiguration

View file

@ -29,7 +29,7 @@ enum CellAudioOutDownMixer
CELL_AUDIO_OUT_DOWNMIXER_TYPE_B = 2,
};
enum
enum CellAudioOutDeviceMode
{
CELL_AUDIO_OUT_SINGLE_DEVICE_MODE = 0,
CELL_AUDIO_OUT_MULTI_DEVICE_MODE = 1,
@ -69,6 +69,8 @@ enum CellAudioOutCodingType
CELL_AUDIO_OUT_CODING_TYPE_AAC = 5,
CELL_AUDIO_OUT_CODING_TYPE_DTS = 6,
CELL_AUDIO_OUT_CODING_TYPE_ATRAC = 7,
// ...
CELL_AUDIO_OUT_CODING_TYPE_DOLBY_DIGITAL_PLUS = 9,
CELL_AUDIO_OUT_CODING_TYPE_BITSTREAM = 0xff,
};
@ -91,14 +93,24 @@ enum CellAudioOutFs
CELL_AUDIO_OUT_FS_192KHZ = 0x40,
};
enum
enum CellAudioOutSpeakerLayout
{
CELL_AUDIO_OUT_SPEAKER_LAYOUT_DEFAULT = 0x00000000,
CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH = 0x00000001,
CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr = 0x00010000,
CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy = 0x40000000,
};
enum
enum CellAudioOutEvent
{
CELL_AUDIO_OUT_EVENT_DEVICE_CHANGED = 0,
CELL_AUDIO_OUT_EVENT_OUTPUT_DISABLED = 1,
CELL_AUDIO_OUT_EVENT_DEVICE_AUTHENTICATED = 2,
CELL_AUDIO_OUT_EVENT_OUTPUT_ENABLED = 3,
};
enum CellAudioOutCopyControl
{
CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE = 0,
CELL_AUDIO_OUT_COPY_CONTROL_COPY_ONCE = 1,

View file

@ -206,7 +206,7 @@ error_code cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDevic
{
cellAvconfExt.todo("cellAudioInGetAvailableDeviceInfo(count=0x%x, info=*0x%x)", count, device_info);
if (count > 16 || !device_info.addr())
if (count > 16 || !device_info)
{
return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER;
}