mirror of
https://github.com/reactos/reactos.git
synced 2024-08-02 09:30:55 +00:00
- Fix HalGetAdapter for ISA adapters.
- Fix layout of EISA_CONTROL structure. svn path=/trunk/; revision=12003
This commit is contained in:
parent
821da7d6f9
commit
40d1739c83
|
@ -1,4 +1,4 @@
|
|||
/* $Id: dma.c,v 1.1 2004/12/03 20:10:43 gvg Exp $
|
||||
/* $Id: dma.c,v 1.2 2004/12/10 19:05:33 navaraf Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -154,9 +154,8 @@ HalGetAdapter (PDEVICE_DESCRIPTION DeviceDescription,
|
|||
}
|
||||
|
||||
/* Devices that support Scatter/Gather do not need Map Registers */
|
||||
if (DeviceDescription->ScatterGather &&
|
||||
(DeviceDescription->InterfaceType == Eisa ||
|
||||
DeviceDescription->InterfaceType == PCIBus)) {
|
||||
if (DeviceDescription->ScatterGather ||
|
||||
DeviceDescription->InterfaceType == PCIBus) {
|
||||
*NumberOfMapRegisters = 0;
|
||||
}
|
||||
|
||||
|
@ -176,7 +175,7 @@ HalGetAdapter (PDEVICE_DESCRIPTION DeviceDescription,
|
|||
ChannelSelect = DeviceDescription->DmaChannel & 0x03;
|
||||
|
||||
/* Get the Controller Setup */
|
||||
Controller = (DeviceDescription->DmaChannel & 0x04) ? 1 : 2;
|
||||
Controller = (DeviceDescription->DmaChannel & 0x04) ? 2 : 1;
|
||||
|
||||
/* Get the Adapter Object */
|
||||
if (HalpEisaAdapter[DeviceDescription->DmaChannel] != NULL) {
|
||||
|
|
|
@ -284,10 +284,10 @@ typedef struct _EISA_CONTROL {
|
|||
UCHAR Reserved9[30]; /* 0A2h-0BFh */
|
||||
|
||||
/* DMA Controller 2 */
|
||||
DMA1_CONTROL DmaController2; /* 0C0h-0DFh */
|
||||
DMA1_CONTROL DmaController2; /* 0C0h-0CFh */
|
||||
|
||||
/* System Reserved Ports */
|
||||
UCHAR SystemReserved[800]; /* 0E0h-3FFh */
|
||||
UCHAR SystemReserved[816]; /* 0D0h-3FFh */
|
||||
|
||||
/* Extended DMA Registers, Controller 1 */
|
||||
UCHAR DmaHighByteCount1[8]; /* 400h-407h */
|
||||
|
|
Loading…
Reference in a new issue