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

Update 360 port #4716

Closed
wants to merge 73 commits into from
Closed

Update 360 port #4716

wants to merge 73 commits into from

Conversation

Ced2911
Copy link
Contributor

@Ced2911 Ced2911 commented Dec 3, 2013

Sorry for the big pull request :s
I only tested the Windows with gles gpu

@@ -2062,7 +2067,7 @@ u32 sceIoIoctlAsync(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u
u32 sceIoGetFdList(u32 outAddr, int outSize, u32 fdNumAddr) {
WARN_LOG(SCEIO, "sceIoGetFdList(%08x, %i, %08x)", outAddr, outSize, fdNumAddr);

PSPPointer<SceUID> out;
PSPPointer<s32_le> out;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SceUID_le

-[Unknown]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a good catch ! 👍

@xsacha
Copy link
Collaborator

xsacha commented Dec 4, 2013

Just a note that travis reports this broke Symbian.
/home/travis/build/hrydgard/ppsspp/Common/MemArena.cpp:321:3: error: expected ';' before 'last_position'

@@ -273,7 +290,13 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32
*(view.out_ptr_low) = (u8*)((int)arena->memmap->Base() + view.virtual_address);
arena->memmap->Commit(view.virtual_address & 0x3FFFFFFF, view.size);
}
*(view.out_ptr) = (u8*)((int)arena->memmap->Base() + view.virtual_address & 0x3FFFFFFF);
*(view.out_ptr) = (u8*)((int)arena->memmap->Base() + view.virtual_address & 0x3FFFFFFF)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line broke Symbian.
Missing semicolon.

@hrydgard
Copy link
Owner

hrydgard commented Dec 5, 2013

Ready for merge? needs a quick rebase at least.

@Ced2911
Copy link
Contributor Author

Ced2911 commented Dec 5, 2013

@thedax
Copy link
Collaborator

thedax commented Dec 5, 2013

No need to remove it, just update native & PPSSPP once #4728 is accepted.

@Ced2911
Copy link
Contributor Author

Ced2911 commented Dec 5, 2013

ah nice :) thanks !

@thedax
Copy link
Collaborator

thedax commented Dec 5, 2013

Not a problem. It broke Windows too, so this should fix Xbox as well I'd guess (it defines _WIN32, right?).

@Ced2911
Copy link
Contributor Author

Ced2911 commented Dec 5, 2013

yes it's ok :)

@hrydgard
Copy link
Owner

hrydgard commented Dec 5, 2013

Wipeout Pure hangs after the title screen with this pull request merged on Win64...

@hrydgard
Copy link
Owner

hrydgard commented Dec 5, 2013

I can bisect it later btw but not right now.

@Ced2911
Copy link
Contributor Author

Ced2911 commented Dec 5, 2013

ah bad ! i can check about it tomorrow :)

@Ced2911
Copy link
Contributor Author

Ced2911 commented Dec 6, 2013

it was "[core/MediaEndigne] endian fix for video" Wipeout Pure is working :)

@hrydgard
Copy link
Owner

hrydgard commented Jan 3, 2014

Urgh, totally forgot about merging this. I'll deal with it soon.

@unknownbrackets
Copy link
Collaborator

@Ced2911 fwiw, I did a quick rebase of this, but it doesn't compile cleanly anymore:
https://github.com/unknownbrackets/ppsspp/tree/xbox-4716

Probably because of other changes since. So I cherry-picked out a bunch of commits in #5590, at least getting it closer.

-[Unknown]

hrydgard added a commit that referenced this pull request Mar 3, 2014
@Joshua-Anderson
Copy link

Very cool looking, as I've never got the chance to see Xbox 360 source code before 😄! Quick question: How would one even install this on their Xbox 360?

@xsacha
Copy link
Collaborator

xsacha commented Jun 9, 2014

Did the rest of this ever get merged? Any changes still needed?

@hrydgard
Copy link
Owner

hrydgard commented Jun 9, 2014

As @Ced2911 is no longer working on this, and nobody has picked up the flag, I'm going to close.

@hrydgard hrydgard closed this Jun 9, 2014
@unknownbrackets unknownbrackets mentioned this pull request Jul 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants