From 38abd2ba7d57f3f4e70e0cb0647e62536fe16479 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 6 May 2018 17:19:17 +0100 Subject: [PATCH] devide: allow for private reset amd transfer methods (ubee) --- Kernel/dev/devide.c | 2 +- Kernel/dev/devide_discard.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Kernel/dev/devide.c b/Kernel/dev/devide.c index 231359d1..15027a8c 100644 --- a/Kernel/dev/devide.c +++ b/Kernel/dev/devide.c @@ -136,7 +136,7 @@ fail: /* The innermost part of the transfer routines has to live in common memory */ /* since it must be able to bank switch to the user memory bank. */ /****************************************************************************/ -#ifndef IDE_REG_INDIRECT +#if !defined(IDE_REG_INDIRECT) && !defined(IDE_NONSTANDARD_XFER) #ifndef IDE_IS_MMIO diff --git a/Kernel/dev/devide_discard.c b/Kernel/dev/devide_discard.c index 43d949dc..ce4d4f86 100644 --- a/Kernel/dev/devide_discard.c +++ b/Kernel/dev/devide_discard.c @@ -26,6 +26,9 @@ /****************************************************************************/ #ifdef IDE_REG_CONTROL + +#define IDE_HAS_RESET + static void devide_delay(void) { timer_t timeout; @@ -146,7 +149,7 @@ void devide_init(void) { uint8_t d; -#ifdef IDE_REG_CONTROL +#ifdef IDE_HAS_RESET devide_reset(); #endif -- 2.34.1