Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify getting DI pointer in IOCtl callback #3125

Merged
merged 1 commit into from Oct 4, 2015

Conversation

JosJuice
Copy link
Member

@JosJuice JosJuice commented Oct 3, 2015

Gets rid of an odd code construct, and fixes the "Trying to run two DI devices at once" ERROR_LOG appearing at the wrong times.

Gets rid of an odd code construct, and fixes the "Trying to run two DI
devices at once" ERROR_LOG appearing at the wrong times.
g_di_pointer->FinishIOCtl((DVDInterface::DIInterruptType)userdata);
std::shared_ptr<IWII_IPC_HLE_Device> di = WII_IPC_HLE_Interface::GetDeviceByName("/dev/di");
if (di)
std::static_pointer_cast<CWII_IPC_HLE_Device_di>(di)->FinishIOCtl((DVDInterface::DIInterruptType)userdata);

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@phire
Copy link
Member

phire commented Oct 3, 2015

LGTM

shuffle2 added a commit that referenced this pull request Oct 4, 2015
Simplify getting DI pointer in IOCtl callback
@shuffle2 shuffle2 merged commit f5c88fc into dolphin-emu:master Oct 4, 2015
@JosJuice JosJuice deleted the di-callback-pointer branch October 4, 2015 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants