Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-24 12:30:20 +00:00
Code Issues Projects Releases Wiki Activity

Logging update

Browse Source
This commit is contained in:
Uwe Seimet 2021-08-28 14:04:05 +02:00
parent cfd88e9ed2
commit b9633ea46f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/raspberrypi/rascsi.cpp
View File

@ -738,10 +738,8 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
// drive checks files // drive checks files
if (fileSupport && !filename.empty()) { if (fileSupport && !filename.empty()) {
// Set the Path
filepath.SetPath(filename.c_str()); filepath.SetPath(filename.c_str());
// Open the file path
try { try {
fileSupport->Open(filepath); fileSupport->Open(filepath);
} }
@ -777,7 +775,7 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
} }
if (!device->Init(pbDevice.params())) { if (!device->Init(pbDevice.params())) {
error << "Initialization of " << device->GetType() << " device, ID: " << id << ", unit: " << unit << " failed"; error << "Initialization of " << device->GetType() << " device, ID " << id << ", unit " << unit << " failed";
delete device; delete device;
@ -790,7 +788,7 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
// Re-map the controller // Re-map the controller
bool status = MapController(map); bool status = MapController(map);
if (status) { if (status) {
LOGINFO("Added new %s device, ID: %d unit: %d", device->GetType().c_str(), id, unit); LOGINFO("Added new %s device, ID %d, unit %d", device->GetType().c_str(), id, unit);
return true; return true;
} }
@ -881,7 +879,8 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
} }
filepath.SetPath(filename.c_str()); filepath.SetPath(filename.c_str());
LOGINFO("Insert file '%s' requested into %s ID: %d unit: %d", filename.c_str(), device->GetType().c_str(), id, unit);
LOGINFO("Insert file '%s' requested into %s ID %d, unit %d", filename.c_str(), device->GetType().c_str(), id, unit);
try { try {
fileSupport->Open(filepath); fileSupport->Open(filepath);
@ -906,6 +905,7 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
} }
LOGINFO("Eject requested for %s ID %d, unit %d", device->GetType().c_str(), id, unit); LOGINFO("Eject requested for %s ID %d, unit %d", device->GetType().c_str(), id, unit);
// EJECT is idempotent // EJECT is idempotent
device->Eject(true); device->Eject(true);
break; break;
@ -916,6 +916,7 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
} }
LOGINFO("Write protection requested for %s ID %d, unit %d", device->GetType().c_str(), id, unit); LOGINFO("Write protection requested for %s ID %d, unit %d", device->GetType().c_str(), id, unit);
// PROTECT is idempotent // PROTECT is idempotent
device->SetProtected(true); device->SetProtected(true);
break; break;
@ -925,7 +926,8 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
return true; return true;
} }
LOGINFO("Write unprotection requested for %s ID: %d unit: %d", device->GetType().c_str(), id, unit); LOGINFO("Write unprotection requested for %s ID %d, unit %d", device->GetType().c_str(), id, unit);
// UNPROTECT is idempotent // UNPROTECT is idempotent
device->SetProtected(false); device->SetProtected(false);
break; break;
@ -938,7 +940,7 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
return true; return true;
default: default:
return ReturnStatus(fd, false, "Received unknown command: " + PbOperation_Name(operation)); return ReturnStatus(fd, false, "Received unknown operation: " + PbOperation_Name(operation));
} }
return true; return true;