Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PCNET]

Browse source 
- Remove excessive BREAKPOINT usage
- Promote some DPRINTs to DPRINT1s

svn path=/trunk/; revision=53138
This commit is contained in:
Cameron Gutman 2011-08-08 12:06:26 +00:00
parent e58eab7411
commit dc37c61e1d
2 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

43
reactos/drivers/network/dd/pcnet/pcnet.c
View file

@ -246,16 +246,14 @@ MiQueryCard(
if(Status != 4) if(Status != 4)
{ {
Status = NDIS_STATUS_FAILURE; Status = NDIS_STATUS_FAILURE;
DPRINT("NdisReadPciSlotInformation failed\n"); DPRINT1("NdisReadPciSlotInformation failed\n");
BREAKPOINT;
return Status; return Status;
} }
if(buf32 != PCI_ID) if(buf32 != PCI_ID)
{ {
Status = NDIS_STATUS_ADAPTER_NOT_FOUND; Status = NDIS_STATUS_ADAPTER_NOT_FOUND;
DPRINT("card in slot isn't our: 0x%x\n", 0, buf32); DPRINT1("card in slot isn't our: 0x%x\n", 0, buf32);
BREAKPOINT;
return Status; return Status;
} }
@ -269,14 +267,13 @@ MiQueryCard(
if(Status != 4) if(Status != 4)
{ {
Status = NDIS_STATUS_FAILURE; Status = NDIS_STATUS_FAILURE;
DPRINT("NdisReadPciSlotInformation failed\n"); DPRINT1("NdisReadPciSlotInformation failed\n");
BREAKPOINT;
return Status; return Status;
} }
if(!buf32) if(!buf32)
{ {
DPRINT("No base i/o address set\n"); DPRINT1("No base i/o address set\n");
return NDIS_STATUS_FAILURE; return NDIS_STATUS_FAILURE;
} }
@ -291,7 +288,6 @@ MiQueryCard(
{ {
Status = NDIS_STATUS_FAILURE; Status = NDIS_STATUS_FAILURE;
DPRINT1("NdisReadPciSlotInformation failed\n"); DPRINT1("NdisReadPciSlotInformation failed\n");
BREAKPOINT;
return Status; return Status;
} }
@ -325,14 +321,12 @@ MiAllocateSharedMemory(
if(!Adapter->InitializationBlockVirt) if(!Adapter->InitializationBlockVirt)
{ {
DPRINT1("insufficient resources\n"); DPRINT1("insufficient resources\n");
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0)
{ {
DPRINT("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); DPRINT1("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt);
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
@ -345,14 +339,12 @@ MiAllocateSharedMemory(
if(!Adapter->TransmitDescriptorRingVirt) if(!Adapter->TransmitDescriptorRingVirt)
{ {
DPRINT1("insufficient resources\n"); DPRINT1("insufficient resources\n");
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0)
{ {
DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt);
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
@ -366,14 +358,12 @@ MiAllocateSharedMemory(
if(!Adapter->ReceiveDescriptorRingVirt) if(!Adapter->ReceiveDescriptorRingVirt)
{ {
DPRINT1("insufficient resources\n"); DPRINT1("insufficient resources\n");
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0)
{ {
DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt);
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
@ -387,14 +377,12 @@ MiAllocateSharedMemory(
if(!Adapter->TransmitBufferPtrVirt) if(!Adapter->TransmitBufferPtrVirt)
{ {
DPRINT1("insufficient resources\n"); DPRINT1("insufficient resources\n");
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0)
{ {
DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt);
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
@ -408,14 +396,12 @@ MiAllocateSharedMemory(
if(!Adapter->ReceiveBufferPtrVirt) if(!Adapter->ReceiveBufferPtrVirt)
{ {
DPRINT1("insufficient resources\n"); DPRINT1("insufficient resources\n");
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0)
{ {
DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt);
BREAKPOINT;
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
} }
@ -874,7 +860,6 @@ MiniportInitialize(
{ {
Status = NDIS_STATUS_UNSUPPORTED_MEDIA; Status = NDIS_STATUS_UNSUPPORTED_MEDIA;
DPRINT1("unsupported media\n"); DPRINT1("unsupported media\n");
BREAKPOINT;
*OpenErrorStatus = Status; *OpenErrorStatus = Status;
return Status; return Status;
} }
@ -887,7 +872,6 @@ MiniportInitialize(
{ {
Status = NDIS_STATUS_RESOURCES; Status = NDIS_STATUS_RESOURCES;
DPRINT1("Insufficient resources\n"); DPRINT1("Insufficient resources\n");
BREAKPOINT;
*OpenErrorStatus = Status; *OpenErrorStatus = Status;
return Status; return Status;
} }
@ -907,7 +891,6 @@ MiniportInitialize(
{ {
DPRINT1("MiQueryCard failed\n"); DPRINT1("MiQueryCard failed\n");
Status = NDIS_STATUS_ADAPTER_NOT_FOUND; Status = NDIS_STATUS_ADAPTER_NOT_FOUND;
BREAKPOINT;
break; break;
} }
@ -917,7 +900,6 @@ MiniportInitialize(
if(Status != NDIS_STATUS_SUCCESS) if(Status != NDIS_STATUS_SUCCESS)
{ {
DPRINT1("NdisMRegisterIoPortRange failed: 0x%x\n", Status); DPRINT1("NdisMRegisterIoPortRange failed: 0x%x\n", Status);
BREAKPOINT
break; break;
} }
@ -927,7 +909,6 @@ MiniportInitialize(
if(Status != NDIS_STATUS_SUCCESS) if(Status != NDIS_STATUS_SUCCESS)
{ {
DPRINT1("NdisMAllocateMapRegisters failed: 0x%x\n", Status); DPRINT1("NdisMAllocateMapRegisters failed: 0x%x\n", Status);
BREAKPOINT
break; break;
} }
@ -936,8 +917,7 @@ MiniportInitialize(
Adapter->InterruptVector, TRUE, TRUE, NdisInterruptLevelSensitive); Adapter->InterruptVector, TRUE, TRUE, NdisInterruptLevelSensitive);
if(Status != NDIS_STATUS_SUCCESS) if(Status != NDIS_STATUS_SUCCESS)
{ {
DPRINT("NdisMRegisterInterrupt failed: 0x%x\n", Status); DPRINT1("NdisMRegisterInterrupt failed: 0x%x\n", Status);
BREAKPOINT
break; break;
} }
@ -948,8 +928,7 @@ MiniportInitialize(
if(Status != NDIS_STATUS_SUCCESS) if(Status != NDIS_STATUS_SUCCESS)
{ {
Status = NDIS_STATUS_RESOURCES; Status = NDIS_STATUS_RESOURCES;
DPRINT("MiAllocateSharedMemory failed", Status); DPRINT1("MiAllocateSharedMemory failed", Status);
BREAKPOINT
break; break;
} }

6
reactos/drivers/network/dd/pcnet/pcnet.h
View file

@ -153,11 +153,5 @@ MiGetMediaDuplex(PADAPTER Adapter);
/* Maximum number of interrupts handled per call to MiniportHandleInterrupt */ /* Maximum number of interrupts handled per call to MiniportHandleInterrupt */
#define INTERRUPT_LIMIT 10 #define INTERRUPT_LIMIT 10
#if DBG
#define BREAKPOINT DbgBreakPoint();
#else
#define BREAKPOINT
#endif
/* memory pool tag */ /* memory pool tag */
#define PCNET_TAG 'tNcP' #define PCNET_TAG 'tNcP'