Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
NOTE: I included some changes of the forks of O1L and Dante38490 to my
fork. However, a conflict appeared while merging their sources with the
ones of DH. I had to resolve this conflict manually and push all the
changes like a new commit, that's why there changes weren't recorded
individually and (probably) won't appear at in the commits list. I am
very sorry for this, I'll try to avoid this in the future.

In order to preserve the authors of those commits, I write this list
here:
O1L: Dummy Modules (cellAudio, cellSaveData, and more)

O1L@23ece01

O1L@784fc57

Dante38490: Spotted and fixed an issue in git-version-gen.cmd

https://github.com/Dante38490/rpcs3/commit/44e8867125deff3cecc29c6ed42f3a6fda998e5a

Regarding my changes:
* New lv2 SysCalls implemented (and others improved)
* SDATA unpacker implemented
* Changed layout of sc_table
  • Loading branch information
AlexAltea committed Nov 9, 2013
1 parent 099333c commit 6026140
Show file tree
Hide file tree
Showing 24 changed files with 2,323 additions and 34 deletions.
2 changes: 1 addition & 1 deletion Utilities/git-version-gen.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rem // A copy of the GPL 2.0 should have been included with the program.
rem // If not, see http://www.gnu.org/licenses/

rem // Official git repository and contact information can be found at
rem // https://github.com/hrydgard/RPCS3 and http://www.RPCS3.org/.
rem // https://github.com/DHrpcs3/rpcs3 and http://code.google.com/p/rpcs3/.

setlocal ENABLEDELAYEDEXPANSION

Expand Down
4 changes: 4 additions & 0 deletions bin/dev_hdd1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
5 changes: 5 additions & 0 deletions rpcs3/Emu/FS/VFS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ void VFS::SaveLoadDevices(Array<VFSManagerEntry>& res, bool is_load)
res[idx].path = "$(EmulatorDir)\\dev_hdd0\\";
res[idx].mount = "/dev_hdd0/";
res[idx].device = vfsDevice_LocalFile;

idx = res.Move(new VFSManagerEntry());
res[idx].path = "$(EmulatorDir)\\dev_hdd1\\";
res[idx].mount = "/dev_hdd1/";
res[idx].device = vfsDevice_LocalFile;
/*
idx = res.Move(new VFSManagerEntry());
res[idx].path = "$(GameDir)";
Expand Down
Loading

2 comments on commit 6026140

@AlexAltea
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was the original pull request: https://github.com/DHrpcs3/rpcs3/pull/13

@Zangetsu38
Copy link
Contributor

Choose a reason for hiding this comment

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

error on compile
21>Emu\SysCalls\lv2\SC_PPU_Thread.cpp(52): error C2440: 'initialisation' : impossible de convertir de 'CPUThread *' en 'PPCThread *'
21> Cast de base en derived requiert dynamic_cast ou static_cast

Please sign in to comment.