Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add CAM::SetReceiving, fix ports

Browse source
This commit is contained in:
wheremyfoodat 2024-01-23 18:10:18 +02:00
parent ecf0416b64
commit 442ae3a210
2 changed files with 44 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/services/cam.hpp
View file

@ -15,11 +15,13 @@ class CAMService {
using Event = std::optional<Handle>; using Event = std::optional<Handle>;
struct Port { struct Port {
Event bufferErrorInterruptevent = std::nullopt; Event bufferErrorInterruptEvent = std::nullopt;
Event receiveEvent = std::nullopt;
u16 transferBytes; u16 transferBytes;
void reset() { void reset() {
bufferErrorInterruptevent = std::nullopt; bufferErrorInterruptEvent = std::nullopt;
receiveEvent = std::nullopt;
transferBytes = 256; transferBytes = 256;
} }
}; };
@ -41,6 +43,7 @@ class CAMService {
void getTransferBytes(u32 messagePointer); void getTransferBytes(u32 messagePointer);
void setContrast(u32 messagePointer); void setContrast(u32 messagePointer);
void setFrameRate(u32 messagePointer); void setFrameRate(u32 messagePointer);
void setReceiving(u32 messagePointer);
void setSize(u32 messagePointer); void setSize(u32 messagePointer);
void setTransferLines(u32 messagePointer); void setTransferLines(u32 messagePointer);
void setTrimming(u32 messagePointer); void setTrimming(u32 messagePointer);

47
src/core/services/cam.cpp
View file

@ -8,6 +8,7 @@
namespace CAMCommands { namespace CAMCommands {
enum : u32 { enum : u32 {
GetBufferErrorInterruptEvent = 0x00060040, GetBufferErrorInterruptEvent = 0x00060040,
SetReceiving = 0x00070102,
DriverInitialize = 0x00390000, DriverInitialize = 0x00390000,
DriverFinalize = 0x003A0000, DriverFinalize = 0x003A0000,
SetTransferLines = 0x00090100, SetTransferLines = 0x00090100,
@ -76,12 +77,16 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
case CAMCommands::GetTransferBytes: getTransferBytes(messagePointer); break; case CAMCommands::GetTransferBytes: getTransferBytes(messagePointer); break;
case CAMCommands::SetContrast: setContrast(messagePointer); break; case CAMCommands::SetContrast: setContrast(messagePointer); break;
case CAMCommands::SetFrameRate: setFrameRate(messagePointer); break; case CAMCommands::SetFrameRate: setFrameRate(messagePointer); break;
case CAMCommands::SetReceiving: setReceiving(messagePointer); break;
case CAMCommands::SetSize: setSize(messagePointer); break;
case CAMCommands::SetTransferLines: setTransferLines(messagePointer); break; case CAMCommands::SetTransferLines: setTransferLines(messagePointer); break;
case CAMCommands::SetTrimming: setTrimming(messagePointer); break; case CAMCommands::SetTrimming: setTrimming(messagePointer); break;
case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break; case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break;
case CAMCommands::SetSize: setSize(messagePointer); break;
default: Helpers::panic("Unimplemented CAM service requested. Command: %08X\n", command); break; default:
Helpers::warn("Unimplemented CAM service requested. Command: %08X\n", command);
mem.write32(messagePointer + 4, 0);
break;
} }
} }
@ -108,7 +113,7 @@ void CAMService::setContrast(u32 messagePointer) {
} }
void CAMService::setTransferLines(u32 messagePointer) { void CAMService::setTransferLines(u32 messagePointer) {
const u32 portIndex = mem.read32(messagePointer + 4); const u32 portIndex = mem.read8(messagePointer + 4);
const u16 lines = mem.read16(messagePointer + 8); const u16 lines = mem.read16(messagePointer + 8);
const u16 width = mem.read16(messagePointer + 12); const u16 width = mem.read16(messagePointer + 12);
const u16 height = mem.read16(messagePointer + 16); const u16 height = mem.read16(messagePointer + 16);
@ -152,7 +157,7 @@ void CAMService::setSize(u32 messagePointer) {
} }
void CAMService::setTrimming(u32 messagePointer) { void CAMService::setTrimming(u32 messagePointer) {
const u32 port = mem.read32(messagePointer + 4); const u32 port = mem.read8(messagePointer + 4);
const bool trim = mem.read8(messagePointer + 8) != 0; const bool trim = mem.read8(messagePointer + 8) != 0;
log("CAM::SetTrimming (port = %d, trimming = %s)\n", port, trim ? "enabled" : "disabled"); log("CAM::SetTrimming (port = %d, trimming = %s)\n", port, trim ? "enabled" : "disabled");
@ -162,7 +167,7 @@ void CAMService::setTrimming(u32 messagePointer) {
} }
void CAMService::setTrimmingParamsCenter(u32 messagePointer) { void CAMService::setTrimmingParamsCenter(u32 messagePointer) {
const u32 port = mem.read32(messagePointer + 4); const u32 port = mem.read8(messagePointer + 4);
const s16 trimWidth = s16(mem.read16(messagePointer + 8)); const s16 trimWidth = s16(mem.read16(messagePointer + 8));
const s16 trimHeight = s16(mem.read16(messagePointer + 12)); const s16 trimHeight = s16(mem.read16(messagePointer + 12));
const s16 cameraWidth = s16(mem.read16(messagePointer + 16)); const s16 cameraWidth = s16(mem.read16(messagePointer + 16));
@ -216,7 +221,7 @@ void CAMService::getSuitableY2RCoefficients(u32 messagePointer) {
} }
void CAMService::getTransferBytes(u32 messagePointer) { void CAMService::getTransferBytes(u32 messagePointer) {
const u32 portIndex = mem.read32(messagePointer + 4); const u32 portIndex = mem.read8(messagePointer + 4);
const PortSelect port(portIndex); const PortSelect port(portIndex);
log("CAM::GetTransferBytes (port = %d)\n", portIndex); log("CAM::GetTransferBytes (port = %d)\n", portIndex);
@ -233,14 +238,14 @@ void CAMService::getTransferBytes(u32 messagePointer) {
} }
void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) { void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
const u32 portIndex = mem.read32(messagePointer + 4); const u32 portIndex = mem.read8(messagePointer + 4);
const PortSelect port(portIndex); const PortSelect port(portIndex);
log("CAM::GetBufferErrorInterruptEvent (port = %d)\n", portIndex); log("CAM::GetBufferErrorInterruptEvent (port = %d)\n", portIndex);
mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 2)); mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 2));
if (port.isSinglePort()) { if (port.isSinglePort()) {
auto& event = ports[port.getSingleIndex()].bufferErrorInterruptevent; auto& event = ports[port.getSingleIndex()].bufferErrorInterruptEvent;
if (!event.has_value()) { if (!event.has_value()) {
event = kernel.makeEvent(ResetType::OneShot); event = kernel.makeEvent(ResetType::OneShot);
} }
@ -252,3 +257,29 @@ void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
Helpers::panic("CAM::GetBufferErrorInterruptEvent: Invalid port"); Helpers::panic("CAM::GetBufferErrorInterruptEvent: Invalid port");
} }
} }
void CAMService::setReceiving(u32 messagePointer) {
const u32 destination = mem.read32(messagePointer + 4);
const u32 portIndex = mem.read8(messagePointer + 8);
const u32 size = mem.read32(messagePointer + 12);
const u16 transferUnit = mem.read16(messagePointer + 16);
const Handle process = mem.read32(messagePointer + 24);
const PortSelect port(portIndex);
log("CAM::SetReceiving (port = %d)\n", portIndex);
mem.write32(messagePointer, IPC::responseHeader(0x7, 1, 2));
if (port.isSinglePort()) {
auto& event = ports[port.getSingleIndex()].receiveEvent;
if (!event.has_value()) {
event = kernel.makeEvent(ResetType::OneShot);
}
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, 0);
mem.write32(messagePointer + 12, event.value());
} else {
Helpers::panic("CAM::SetReceiving: Invalid port");
}
}