Converted to the new debug interface, using script written by Patrik
Stridvall.
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index 75db238..30d11f0 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -13,7 +13,7 @@
#include "wnaspi32.h"
#include "options.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(aspi)
@@ -50,19 +50,19 @@
sprintf(idstr, "scsi c%1dt%1dd%1d", prb->SRB_HaId, prb->SRB_Target, prb->SRB_Lun);
if (!PROFILE_GetWineIniString(idstr, "Device", "", device_str, sizeof(device_str))) {
- TRACE(aspi, "Trying to open unlisted scsi device %s\n", idstr);
+ TRACE("Trying to open unlisted scsi device %s\n", idstr);
return -1;
}
- TRACE(aspi, "Opening device %s=%s\n", idstr, device_str);
+ TRACE("Opening device %s=%s\n", idstr, device_str);
fd = open(device_str, O_RDWR);
if (fd == -1) {
int save_error = errno;
#ifdef HAVE_STRERROR
- ERR(aspi, "Error opening device %s, error '%s'\n", device_str, strerror(save_error));
+ ERR("Error opening device %s, error '%s'\n", device_str, strerror(save_error));
#else
- ERR(aspi, "Error opening device %s, error %d\n", device_str, save_error);
+ ERR("Error opening device %s, error %d\n", device_str, save_error);
#endif
return -1;
}
@@ -91,51 +91,51 @@
switch (prb->CDBByte[0]) {
case CMD_INQUIRY:
- TRACE(aspi, "{\n");
- TRACE(aspi, "\tEVPD: %d\n", prb->CDBByte[1] & 1);
- TRACE(aspi, "\tLUN: %d\n", (prb->CDBByte[1] & 0xc) >> 1);
- TRACE(aspi, "\tPAGE CODE: %d\n", prb->CDBByte[2]);
- TRACE(aspi, "\tALLOCATION LENGTH: %d\n", prb->CDBByte[4]);
- TRACE(aspi, "\tCONTROL: %d\n", prb->CDBByte[5]);
- TRACE(aspi, "}\n");
+ TRACE("{\n");
+ TRACE("\tEVPD: %d\n", prb->CDBByte[1] & 1);
+ TRACE("\tLUN: %d\n", (prb->CDBByte[1] & 0xc) >> 1);
+ TRACE("\tPAGE CODE: %d\n", prb->CDBByte[2]);
+ TRACE("\tALLOCATION LENGTH: %d\n", prb->CDBByte[4]);
+ TRACE("\tCONTROL: %d\n", prb->CDBByte[5]);
+ TRACE("}\n");
break;
case CMD_SCAN_SCAN:
- TRACE(aspi, "Transfer Length: %d\n", prb->CDBByte[4]);
+ TRACE("Transfer Length: %d\n", prb->CDBByte[4]);
break;
}
- TRACE(aspi, "Host Adapter: %d\n", prb->SRB_HaId);
- TRACE(aspi, "Flags: %d\n", prb->SRB_Flags);
+ TRACE("Host Adapter: %d\n", prb->SRB_HaId);
+ TRACE("Flags: %d\n", prb->SRB_Flags);
if (TARGET_TO_HOST(prb)) {
- TRACE(aspi, "\tData transfer: Target to host. Length checked.\n");
+ TRACE("\tData transfer: Target to host. Length checked.\n");
}
else if (HOST_TO_TARGET(prb)) {
- TRACE(aspi, "\tData transfer: Host to target. Length checked.\n");
+ TRACE("\tData transfer: Host to target. Length checked.\n");
}
else if (NO_DATA_TRANSFERED(prb)) {
- TRACE(aspi, "\tData transfer: none\n");
+ TRACE("\tData transfer: none\n");
}
else {
- WARN(aspi, "\tTransfer by scsi cmd. Length not checked.\n");
+ WARN("\tTransfer by scsi cmd. Length not checked.\n");
}
- TRACE(aspi, "\tResidual byte length reporting %s\n", prb->SRB_Flags & 0x4 ? "enabled" : "disabled");
- TRACE(aspi, "\tLinking %s\n", prb->SRB_Flags & 0x2 ? "enabled" : "disabled");
- TRACE(aspi, "\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled");
- TRACE(aspi, "Target: %d\n", prb->SRB_Target);
- TRACE(aspi, "Lun: %d\n", prb->SRB_Lun);
- TRACE(aspi, "BufLen: %ld\n", prb->SRB_BufLen);
- TRACE(aspi, "SenseLen: %d\n", prb->SRB_SenseLen);
- TRACE(aspi, "BufPtr: %p\n", prb->SRB_BufPointer);
- TRACE(aspi, "CDB Length: %d\n", prb->SRB_CDBLen);
- TRACE(aspi, "POST Proc: %lx\n", (DWORD) prb->SRB_PostProc);
+ TRACE("\tResidual byte length reporting %s\n", prb->SRB_Flags & 0x4 ? "enabled" : "disabled");
+ TRACE("\tLinking %s\n", prb->SRB_Flags & 0x2 ? "enabled" : "disabled");
+ TRACE("\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled");
+ TRACE("Target: %d\n", prb->SRB_Target);
+ TRACE("Lun: %d\n", prb->SRB_Lun);
+ TRACE("BufLen: %ld\n", prb->SRB_BufLen);
+ TRACE("SenseLen: %d\n", prb->SRB_SenseLen);
+ TRACE("BufPtr: %p\n", prb->SRB_BufPointer);
+ TRACE("CDB Length: %d\n", prb->SRB_CDBLen);
+ TRACE("POST Proc: %lx\n", (DWORD) prb->SRB_PostProc);
cdb = &prb->CDBByte[0];
cmd = prb->CDBByte[0];
for (i = 0; i < prb->SRB_CDBLen; i++) {
if (i != 0) dsprintf(aspi, ",");
dsprintf(aspi, "%02x", *cdb++);
}
- TRACE(aspi, "CDB buffer[%s]\n", dbg_str(aspi));
+ TRACE("CDB buffer[%s]\n", dbg_str(aspi));
}
static void
@@ -150,7 +150,7 @@
if (i) dsprintf(aspi, ",");
dsprintf(aspi, "%02x", *cdb++);
}
- TRACE(aspi, "SenseArea[%s]\n", dbg_str(aspi));
+ TRACE("SenseArea[%s]\n", dbg_str(aspi));
}
static void
@@ -159,7 +159,7 @@
switch (prb->CDBByte[0]) {
case CMD_INQUIRY:
- TRACE(aspi, "Vendor: '%s'\n", prb->SRB_BufPointer + INQUIRY_VENDOR);
+ TRACE("Vendor: '%s'\n", prb->SRB_BufPointer + INQUIRY_VENDOR);
break;
case CMD_TEST_UNIT_READY:
ASPI_PrintSenseArea(prb);
@@ -180,7 +180,7 @@
fd = ASPI_OpenDevice(lpPRB);
if (fd == -1) {
- ERR(aspi, "Failed: could not open device c%01dt%01dd%01d. Device permissions !?\n",
+ ERR("Failed: could not open device c%01dt%01dd%01d. Device permissions !?\n",
lpPRB->SRB_HaId,lpPRB->SRB_Target,lpPRB->SRB_Lun);
lpPRB->SRB_Status = SS_NO_DEVICE;
return SS_NO_DEVICE;
@@ -192,7 +192,7 @@
lpPRB->SRB_Status = SS_PENDING;
if (!lpPRB->SRB_CDBLen) {
- WARN(aspi, "Failed: lpPRB->SRB_CDBLen = 0.\n");
+ WARN("Failed: lpPRB->SRB_CDBLen = 0.\n");
lpPRB->SRB_Status = SS_ERR;
return SS_ERR;
}
@@ -233,15 +233,15 @@
if (status < 0 || status != in_len) {
int save_error = errno;
- WARN(aspi, "Not enough bytes written to scsi device bytes=%d .. %d\n", in_len, status);
+ WARN("Not enough bytes written to scsi device bytes=%d .. %d\n", in_len, status);
if (status < 0) {
if (save_error == ENOMEM) {
- MSG("ASPI: Linux generic scsi driver\n You probably need to re-compile your kernel with a larger SG_BIG_BUFF value (sg.h)\n Suggest 130560\n");
+ MESSAGE("ASPI: Linux generic scsi driver\n You probably need to re-compile your kernel with a larger SG_BIG_BUFF value (sg.h)\n Suggest 130560\n");
}
#ifdef HAVE_STRERROR
- WARN(aspi, "error:= '%s'\n", strerror(save_error));
+ WARN("error:= '%s'\n", strerror(save_error));
#else
- WARN(aspi, "error:= %d\n", save_error);
+ WARN("error:= %d\n", save_error);
#endif
}
goto error_exit;
@@ -249,13 +249,13 @@
status = read(fd, sg_reply_hdr, out_len);
if (status < 0 || status != out_len) {
- WARN(aspi, "not enough bytes read from scsi device%d\n", status);
+ WARN("not enough bytes read from scsi device%d\n", status);
goto error_exit;
}
if (sg_reply_hdr->result != 0) {
error_code = sg_reply_hdr->result;
- WARN(aspi, "reply header error (%d)\n", sg_reply_hdr->result);
+ WARN("reply header error (%d)\n", sg_reply_hdr->result);
goto error_exit;
}
@@ -280,12 +280,12 @@
if (lpPRB->SRB_PostProc) {
if (ASPI_POSTING(lpPRB)) {
- TRACE(aspi, "Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc);
+ TRACE("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc);
(*lpPRB->SRB_PostProc)(lpPRB);
}
else
if (lpPRB->SRB_Flags & SRB_EVENT_NOTIFY) {
- TRACE(aspi, "Setting event %04x\n", (HANDLE)lpPRB->SRB_PostProc);
+ TRACE("Setting event %04x\n", (HANDLE)lpPRB->SRB_PostProc);
SetEvent((HANDLE)lpPRB->SRB_PostProc); /* FIXME: correct ? */
}
}
@@ -297,17 +297,17 @@
error_exit:
if (error_code == EBUSY) {
lpPRB->SRB_Status = SS_ASPI_IS_BUSY;
- TRACE(aspi, "Device busy\n");
+ TRACE("Device busy\n");
}
else {
- WARN(aspi, "Failed\n");
+ WARN("Failed\n");
lpPRB->SRB_Status = SS_ERR;
}
/* I'm not sure exactly error codes work here
* We probably should set lpPRB->SRB_TargStat, SRB_HaStat ?
*/
- WARN(aspi, "error_exit\n");
+ WARN("error_exit\n");
free(sg_reply_hdr);
free(sg_hd);
return lpPRB->SRB_Status;
@@ -346,19 +346,19 @@
strcat(lpSRB->inquiry.HA_Identifier, "Wine host"); /* FIXME: return host adapter name */
memset(lpSRB->inquiry.HA_Unique, 0, 16); /* default HA_Unique content */
lpSRB->inquiry.HA_Unique[6] = 0x02; /* Maximum Transfer Length (128K, Byte> 4-7) */
- FIXME(aspi, "ASPI: Partially implemented SC_HA_INQUIRY for adapter %d.\n", lpSRB->inquiry.SRB_HaId);
+ FIXME("ASPI: Partially implemented SC_HA_INQUIRY for adapter %d.\n", lpSRB->inquiry.SRB_HaId);
return SS_COMP;
case SC_GET_DEV_TYPE:
- FIXME(aspi, "Not implemented SC_GET_DEV_TYPE\n");
+ FIXME("Not implemented SC_GET_DEV_TYPE\n");
break;
case SC_EXEC_SCSI_CMD:
return ASPI_ExecScsiCmd(&lpSRB->cmd);
break;
case SC_RESET_DEV:
- FIXME(aspi, "Not implemented SC_RESET_DEV\n");
+ FIXME("Not implemented SC_RESET_DEV\n");
break;
default:
- WARN(aspi, "Unknown command %d\n", lpSRB->common.SRB_Cmd);
+ WARN("Unknown command %d\n", lpSRB->common.SRB_Cmd);
}
return SS_INVALID_SRB;
#else
