rebellion/libpinproc
1
0
Fork 0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00
Code Releases Activity

Split kPRMachineWPC into WPC and WPC95

Browse Source
This commit is contained in:
gstellenberg
2009-10-10 22:58:58 -05:00
parent 55f70dfcfb
commit e496c5d35e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/PRDevice.cpp
View File

@@ -61,8 +61,11 @@ PRDevice* PRDevice::Create(PRMachineType machineType)
PRMachineType readMachineType = dev->GetReadMachineType(); PRMachineType readMachineType = dev->GetReadMachineType();
if (machineType != kPRMachineCustom && if (machineType != kPRMachineCustom &&
( (machineType == kPRMachineWPC && readMachineType != kPRMachineWPC) || ( ((machineType == kPRMachineWPC) || (machineType == kPRMachineWPC95)) &&
(machineType != kPRMachineWPC && readMachineType == kPRMachineWPC) )) (readMachineType != kPRMachineWPC &&
readMachineType != kPRMachineWPC95)) ||
(machineType != kPRMachineWPC && machineType != kPRMachineWPC95 &&
readMachineType == kPRMachineWPC) )
{ {
dev->Close(); dev->Close();
return NULL; return NULL;
@@ -223,7 +226,8 @@ PRResult PRDevice::DriverUpdateState(PRDriverState *driverState)
// Note, the driver numbers depend on the driver group settings from DriverLoadMachineTypeDefaults. // Note, the driver numbers depend on the driver group settings from DriverLoadMachineTypeDefaults.
// TODO: Create some constants that are used both here and in DriverLoadMachineTypeDefaults. // TODO: Create some constants that are used both here and in DriverLoadMachineTypeDefaults.
switch (readMachineType) { switch (readMachineType) {
kPRMachineWPC: { kPRMachineWPC:
kPRMachineWPC95: {
if ((driverState->driverNum >= 40 && driverState->driverNum <= 47) || if ((driverState->driverNum >= 40 && driverState->driverNum <= 47) ||
(driverState->driverNum == 32) || (driverState->driverNum == 32) ||
(driverState->driverNum == 34) || (driverState->driverNum == 34) ||
@@ -295,6 +299,7 @@ PRResult PRDevice::DriverLoadMachineTypeDefaults(PRMachineType machineType, uint
switch (machineType) switch (machineType)
{ {
case kPRMachineWPC: case kPRMachineWPC:
case kPRMachineWPC95:
{ {
memcpy(mappedDriverGroupEnableIndex,mappedWPCDriverGroupEnableIndex, memcpy(mappedDriverGroupEnableIndex,mappedWPCDriverGroupEnableIndex,
sizeof(mappedDriverGroupEnableIndex)); sizeof(mappedDriverGroupEnableIndex));
@@ -861,7 +866,7 @@ PRResult PRDevice::VerifyChipID()
DEBUG(PRLog(kPRLogInfo, "Switches: 0x%x\n", buffer[4])); DEBUG(PRLog(kPRLogInfo, "Switches: 0x%x\n", buffer[4]));
if (IsStern(buffer[4])) readMachineType = kPRMachineSternWhitestar; // Choose SAM or Whitestar, doesn't matter. if (IsStern(buffer[4])) readMachineType = kPRMachineSternWhitestar; // Choose SAM or Whitestar, doesn't matter.
else readMachineType = kPRMachineWPC; else readMachineType = kPRMachineWPC; // Choose WPC or WPC95, doesn't matter.
rc = kPRSuccess; rc = kPRSuccess;
} }
else { else {