Skip to content

Commit

Permalink
bad merge fix 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Neumann committed Oct 9, 2016
1 parent 95fe77a commit 3bc847a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pcsx2/Sio.h
Expand Up @@ -30,8 +30,8 @@ struct _mcd
u32 transferAddr; // Transfer address

u8 FLAG; // for PSX;

u8 port; // port
u8 port; // port
u8 slot; // and slot for this memcard

// Auto Eject
Expand All @@ -55,13 +55,13 @@ struct _mcd
}

// Read from memorycard to dest
void Read(u8 *dest, int size)
void Read(u8 *dest, int size)
{
SysPlugins.McdRead(port, slot, dest, transferAddr, size);
}

// Write to memorycard from src
void Write(u8 *src, int size)
void Write(u8 *src, int size)
{
SysPlugins.McdSave(port, slot, src,transferAddr, size);
}
Expand Down

0 comments on commit 3bc847a

Please sign in to comment.