Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 18:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- DmaSize is NDIS_DMA_SIZE not BOOLEAN

Browse source 
- DmaWidth and DmaSpeed aren't used for bus-master DMA

svn path=/trunk/; revision=40110
This commit is contained in:
Cameron Gutman 2009-03-20 01:07:09 +00:00
parent ac73f877b3
commit b2490d5d64
1 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
reactos/drivers/network/ndis/ndis/io.c
View file

@ -238,11 +238,11 @@ IO_ALLOCATION_ACTION NTAPI NdisMapRegisterCallback (
NDIS_STATUS NDIS_STATUS
EXPORT EXPORT
NdisMAllocateMapRegisters( NdisMAllocateMapRegisters(
IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE MiniportAdapterHandle,
IN UINT DmaChannel, IN UINT DmaChannel,
IN BOOLEAN DmaSize, IN NDIS_DMA_SIZE DmaSize,
IN ULONG BaseMapRegistersNeeded, IN ULONG BaseMapRegistersNeeded,
IN ULONG MaximumBufferSize) IN ULONG MaximumBufferSize)
/* /*
* FUNCTION: Allocate map registers for use in DMA transfers * FUNCTION: Allocate map registers for use in DMA transfers
* ARGUMENTS: * ARGUMENTS:
@ -293,9 +293,8 @@ NdisMAllocateMapRegisters(
ASSERT(Adapter); ASSERT(Adapter);
/* only bus masters may call this routine */ /* only bus masters may call this routine */
ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER);
if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER))
return NDIS_STATUS_SUCCESS; return NDIS_STATUS_NOT_SUPPORTED;
DeviceObject = Adapter->NdisMiniportBlock.DeviceObject; DeviceObject = Adapter->NdisMiniportBlock.DeviceObject;
@ -319,34 +318,15 @@ NdisMAllocateMapRegisters(
Description.Version = DEVICE_DESCRIPTION_VERSION; Description.Version = DEVICE_DESCRIPTION_VERSION;
Description.Master = TRUE; /* implied by calling this function */ Description.Master = TRUE; /* implied by calling this function */
Description.ScatterGather = TRUE; /* XXX UNTRUE: All BM DMA are S/G (ms seems to do this) */ Description.ScatterGather = TRUE; /* XXX UNTRUE: All BM DMA are S/G (ms seems to do this) */
Description.Dma32BitAddresses = DmaSize;
Description.BusNumber = Adapter->NdisMiniportBlock.BusNumber; Description.BusNumber = Adapter->NdisMiniportBlock.BusNumber;
Description.InterfaceType = Adapter->NdisMiniportBlock.BusType; Description.InterfaceType = Adapter->NdisMiniportBlock.BusType;
Description.DmaChannel = DmaChannel; Description.DmaChannel = DmaChannel;
Description.MaximumLength = MaximumBufferSize; Description.MaximumLength = MaximumBufferSize;
if(Adapter->NdisMiniportBlock.AdapterType == Isa) if(DmaSize == NDIS_DMA_64BITS)
{ Description.Dma64BitAddresses = TRUE;
/* system dma */
if(DmaChannel < 4)
Description.DmaWidth = Width8Bits;
else
Description.DmaWidth = Width16Bits;
Description.DmaSpeed = Compatible;
}
else if(Adapter->NdisMiniportBlock.AdapterType == PCIBus)
{
if(DmaSize == NDIS_DMA_64BITS)
Description.Dma64BitAddresses = TRUE;
else
Description.Dma32BitAddresses = TRUE;
}
else else
{ Description.Dma32BitAddresses = TRUE;
NDIS_DbgPrint(MIN_TRACE, ("Unsupported bus type\n"));
ASSERT(0);
}
AdapterObject = IoGetDmaAdapter( AdapterObject = IoGetDmaAdapter(
Adapter->NdisMiniportBlock.PhysicalDeviceObject, &Description, &AvailableMapRegisters); Adapter->NdisMiniportBlock.PhysicalDeviceObject, &Description, &AvailableMapRegisters);