Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-08-27 02:54:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix segfault if FTD3 drain_data fails
Some checks failed
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 Win32 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 x64 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 ARM os:windows-2022]) (push) Has been cancelled
Details
CD / Create Pi Mono Setup (push) Has been cancelled
Details
CD / Publishing (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenzooone
2026-03-16 11:00:58 +01:00
parent 4e202b751b
commit a9d5902f95
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/CaptureDeviceSpecific/3DSCapture_FTD3/3dscapture_ftd3_shared.cpp
View File

@@ -97,7 +97,7 @@ static void preemptive_close_connection(CaptureData* capture_data) {
capture_data->handle = NULL;
}
static bool set_spi_access(bool print_failed, CaptureData* capture_data, bool enable) {
static bool set_spi_access(bool print_failed, CaptureData* capture_data, bool enable, bool skip_close = false) {
uint8_t buf[4] = {0x40, 0x00, 0x00, 0x00};
int transferred = 0;
ftd3_device_device_handlers* handlers = (ftd3_device_device_handlers*)capture_data->handle;
@@ -105,7 +105,7 @@ static bool set_spi_access(bool print_failed, CaptureData* capture_data, bool en
if(enable)
buf[1] |= 0x80;
if(ftd3_is_error_compat(handlers, ftd3_write_pipe_compat(handlers, BULK_OUT, buf, 4, &transferred))) {
if(ftd3_is_error_compat(handlers, ftd3_write_pipe_compat(handlers, BULK_OUT, buf, 4, &transferred)) && (!skip_close)) {
capture_error_print(print_failed, capture_data, "Setting SPI access failed");
preemptive_close_connection(capture_data);
return false;
@@ -222,13 +222,14 @@ static bool load_3ds_cc_firmware(bool print_failed, CaptureData* capture_data, u
return true;
}
static void drain_data(CaptureData* capture_data) {
// Try draining frames without doing any safety checks...
// Should "fix" some issues with the CC not answering, at times.
static void drain_data(bool print_failed, CaptureData* capture_data) {
set_spi_access(print_failed, capture_data, true, true);
uint8_t* in_buf = new uint8_t[0x100000];
int transferred = 0;
ftd3_device_device_handlers* handlers = (ftd3_device_device_handlers*)capture_data->handle;
set_spi_access(false, capture_data, true);
const auto base_time = std::chrono::high_resolution_clock::now();
ftd3_read_pipe_compat(handlers, BULK_IN, in_buf, 0x100000, &transferred, FTD3_N3DSXL_CFG_WAIT_MS);
@@ -248,8 +249,9 @@ bool connect_ftd3(bool print_failed, CaptureData* capture_data, CaptureDevice* d
capture_error_print(print_failed, capture_data, "Create failed");
return false;
}
drain_data(capture_data);
drain_data(print_failed, capture_data);
preemptive_close_connection(capture_data);
capture_data->handle = ftd3_reconnect_compat(device->serial_number, valid_3dscapture_descriptions);
if(capture_data->handle == NULL) {
capture_error_print(print_failed, capture_data, "Second Create failed");