ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USBqemu: Some small changes to init & savestates. The savestates are still incomplete though. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4907 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2011-09-04 16:10:00 +00:00
parent 2e6a0eaf46
commit 537dbcc58c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/USBqemu/USB.cpp
View File

@ -61,7 +61,7 @@ void __Log(char *fmt, ...) {
static void InitLibraryName() static void InitLibraryName()
{ {
#ifdef SPU2X_PUBLIC_RELEASE #ifdef USBQEMU_PUBLIC_RELEASE
// Public Release! // Public Release!
// Output a simplified string that's just our name: // Output a simplified string that's just our name:
@ -145,6 +145,9 @@ s32 CALLBACK USBinit() {
qemu_ohci->rhport[0].port.dev = usb_keyboard_init(); qemu_ohci->rhport[0].port.dev = usb_keyboard_init();
qemu_ohci->rhport[0].port.ops->attach(&(qemu_ohci->rhport[0].port)); qemu_ohci->rhport[0].port.ops->attach(&(qemu_ohci->rhport[0].port));
clocks = 0;
remaining = 0;
return 0; return 0;
} }
@ -245,6 +248,8 @@ char USBfreezeID[] = "USBqemu01";
typedef struct { typedef struct {
char freezeID[10]; char freezeID[10];
int cycles;
int remaining;
OHCIState t; OHCIState t;
int extraData; // for future expansion with the device state int extraData; // for future expansion with the device state
} USBfreezeData; } USBfreezeData;
@ -262,7 +267,9 @@ s32 CALLBACK USBfreeze(int mode, freezeData *data) {
usbd = *(USBfreezeData*)data->data; usbd = *(USBfreezeData*)data->data;
usbd.freezeID[9] = 0; usbd.freezeID[9] = 0;
usbd.cycles = clocks;
usbd.remaining = remaining;
if( strcmp(usbd.freezeID, USBfreezeID) != 0) if( strcmp(usbd.freezeID, USBfreezeID) != 0)
{ {
SysMessage("ERROR: Unable to load freeze data! Found ID '%s', expected ID '%s'.", usbd.freezeID, USBfreezeID); SysMessage("ERROR: Unable to load freeze data! Found ID '%s', expected ID '%s'.", usbd.freezeID, USBfreezeID);
@ -300,6 +307,9 @@ s32 CALLBACK USBfreeze(int mode, freezeData *data) {
usbd.t.rhport[i].port.dev = NULL; // pointers usbd.t.rhport[i].port.dev = NULL; // pointers
} }
clocks = usbd.cycles;
remaining = usbd.remaining;
// WARNING: TODO: Save the state of the attached devices! // WARNING: TODO: Save the state of the attached devices!
} }