mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 09:09:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellGem: Fix headers

Browse source
This commit is contained in:
Jake 2017-06-19 00:17:19 -05:00 • committed by Ivan
commit 72590e2c93
2 changed files with 46 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/Cell/Modules/cellGem.cpp
View file

@ -131,6 +131,7 @@ s32 cellGemGetInfo(vm::ptr<CellGemInfo> info)
for (int i = 0; i < CELL_GEM_MAX_NUM; i++) for (int i = 0; i < CELL_GEM_MAX_NUM; i++)
{ {
info->status[i] = CELL_GEM_STATUS_DISCONNECTED; info->status[i] = CELL_GEM_STATUS_DISCONNECTED;
info->port[i] = 0;
} }
return CELL_OK; return CELL_OK;
@ -160,10 +161,18 @@ s32 cellGemGetRumble()
return CELL_OK; return CELL_OK;
} }
s32 cellGemGetState() s32 cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<CellGemState> gem_state)
{ {
UNIMPLEMENTED_FUNC(cellGem); cellGem.todo("cellGemGetState(gem_num=%d, flag=0x%x, time=0x%llx, gem_state=*0x%x)", gem_num, flag, time_parameter, gem_state);
return CELL_OK; const auto gem = fxm::get<gem_t>();
if (!gem)
return CELL_GEM_ERROR_UNINITIALIZED;
// clear out gem_state so no games get any funny ideas about them being connected...
std::memset(gem_state.get_ptr(), 0, sizeof(CellGemState));
return CELL_GEM_NOT_CONNECTED;
} }
s32 cellGemGetStatusFlags() s32 cellGemGetStatusFlags()

68
rpcs3/Emu/Cell/Modules/cellGem.h
View file

@ -96,10 +96,10 @@ struct CellGemAttribute
struct CellGemCameraState struct CellGemCameraState
{ {
be_t<s32> exposure; be_t<s32> exposure;
float exposure_time; be_t<f32> exposure_time;
float gain; be_t<f32> gain;
float pitch_angle; be_t<f32> pitch_angle;
float pitch_angle_estimate; be_t<f32> pitch_angle_estimate;
}; };
struct CellGemExtPortData struct CellGemExtPortData
@ -116,14 +116,14 @@ struct CellGemExtPortData
struct CellGemImageState struct CellGemImageState
{ {
//system_time_t frame_timestamp; // TODO: Figure what to use for them be_t<u64> frame_timestamp;
//system_time_t timestamp; be_t<u64> timestamp;
float u; be_t<f32> u;
float v; be_t<f32> v;
float r; be_t<f32> r;
float projectionx; be_t<f32> projectionx;
float projectiony; be_t<f32> projectiony;
float distance; be_t<f32> distance;
u8 visible; u8 visible;
u8 r_valid; u8 r_valid;
}; };
@ -136,15 +136,15 @@ struct CellGemPadData
struct CellGemInertialState struct CellGemInertialState
{ {
//vec_float4 accelerometer; // TODO: Figure what to use as replacement for vec_float4 be_t<f32> accelerometer[4];
//vec_float4 gyro; be_t<f32> gyro[4];
//vec_float4 accelerometer_bias; be_t<f32> accelerometer_bias[4];
//vec_float4 gyro_bias; be_t<f32> gyro_bias[4];
CellGemPadData pad; CellGemPadData pad;
CellGemExtPortData ext; CellGemExtPortData ext;
//system_time_t timestamp; be_t<u64> timestamp;
be_t<s32> counter; be_t<s32> counter;
float temperature; be_t<f32> temperature;
}; };
struct CellGemInfo struct CellGemInfo
@ -157,20 +157,20 @@ struct CellGemInfo
struct CellGemState struct CellGemState
{ {
//vec_float4 pos; be_t<f32> pos[4];
//vec_float4 vel; be_t<f32> vel[4];
//vec_float4 accel; be_t<f32> accel[4];
//vec_float4 quat; be_t<f32> quat[4];
//vec_float4 angvel; be_t<f32> angvel[4];
//vec_float4 angaccel; be_t<f32> angaccel[4];
//vec_float4 handle_pos; be_t<f32> handle_pos[4];
//vec_float4 handle_vel; be_t<f32> handle_vel[4];
//vec_float4 handle_accel; be_t<f32> handle_accel[4];
CellGemPadData pad; CellGemPadData pad;
CellGemExtPortData ext; CellGemExtPortData ext;
//system_time_t timestamp; be_t<u64> timestamp;
float temperature; be_t<f32> temperature;
float camera_pitch_angle; be_t<f32> camera_pitch_angle;
be_t<u32> tracking_flags; be_t<u32> tracking_flags;
}; };
@ -179,10 +179,10 @@ struct CellGemVideoConvertAttribute
be_t<s32> version; be_t<s32> version;
be_t<s32> output_format; be_t<s32> output_format;
be_t<s32> conversion_flags; be_t<s32> conversion_flags;
float gain; be_t<f32> gain;
float red_gain; be_t<f32> red_gain;
float green_gain; be_t<f32> green_gain;
float blue_gain; be_t<f32> blue_gain;
be_t<u32> buffer_memory; be_t<u32> buffer_memory;
be_t<u32> video_data_out; be_t<u32> video_data_out;
u8 alpha; u8 alpha;