reactos/hal/halx86/generic
diff -u -r1.1 -r1.2
--- dma.c 3 Dec 2004 20:10:43 -0000 1.1
+++ dma.c 10 Dec 2004 19:05:33 -0000 1.2
@@ -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 @@
}
/* 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 @@
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) {
reactos/hal/halx86/include
diff -u -r1.18 -r1.19
--- hal.h 4 Dec 2004 22:52:59 -0000 1.18
+++ hal.h 10 Dec 2004 19:05:33 -0000 1.19
@@ -284,10 +284,10 @@
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 */