From: Thomas Faber Date: Mon, 19 Oct 2015 08:00:47 +0000 (+0000) Subject: [HAL] X-Git-Tag: ReactOS-0.4.0~442 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=016e5d94663b7736dc52e21528c15330982d2248 [HAL] - Don't probe for EISA DMA capability on non-EISA machines (i.e. currently never). Patch by Andrey Kudravets. CORE-9895 #resolve svn path=/trunk/; revision=69613 --- diff --git a/reactos/hal/halx86/generic/dma.c b/reactos/hal/halx86/generic/dma.c index a78d8173b90..3f6c312a5e4 100644 --- a/reactos/hal/halx86/generic/dma.c +++ b/reactos/hal/halx86/generic/dma.c @@ -146,15 +146,18 @@ HalpInitDma(VOID) HalpDmaOperations.FreeMapRegisters = (PFREE_MAP_REGISTERS)IoFreeMapRegisters; HalpDmaOperations.MapTransfer = (PMAP_TRANSFER)IoMapTransfer; - /* - * Check if Extended DMA is available. We're just going to do a random - * read and write. - */ - WRITE_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2), 0x2A); - if (READ_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2)) == 0x2A) + if (HalpBusType == MACHINE_TYPE_EISA) { - DPRINT1("Machine supports EISA DMA. Bus type: %lu\n", HalpBusType); - HalpEisaDma = TRUE; + /* + * Check if Extended DMA is available. We're just going to do a random + * read and write. + */ + WRITE_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2), 0x2A); + if (READ_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2)) == 0x2A) + { + DPRINT1("Machine supports EISA DMA. Bus type: %lu\n", HalpBusType); + HalpEisaDma = TRUE; + } } /*