diff --git a/VirtIO/kdebugprint.h b/VirtIO/kdebugprint.h index 4401c6e8f..170e3dedd 100644 --- a/VirtIO/kdebugprint.h +++ b/VirtIO/kdebugprint.h @@ -1,10 +1,4 @@ -#if defined(IGNORE_VIRTIO_OSDEP_H) -// to make simulation environment easy -#include "external_os_dep.h" -#else - -#ifndef _K_DEBUG_PRINT_H -#define _K_DEBUG_PRINT_H +#pragma once extern int virtioDebugLevel; extern int bDebugPrint; @@ -15,6 +9,3 @@ extern tDebugPrintFunc VirtioDebugPrintProc; #define DEBUG_ENTRY(level) DPrintf(level, ("[%s]=>\n", __FUNCTION__)) #define DEBUG_EXIT_STATUS(level, status) DPrintf((status == NDIS_STATUS_SUCCESS ? level : 0), ("[%s]<=0x%X\n", __FUNCTION__, (status))) - -#endif -#endif diff --git a/VirtIO/osdep.h b/VirtIO/osdep.h index 3f1f7d42a..d0ccc938d 100644 --- a/VirtIO/osdep.h +++ b/VirtIO/osdep.h @@ -12,26 +12,11 @@ // ////////////////////////////////////////////////////////////////////////////////////////// -#if defined(IGNORE_VIRTIO_OSDEP_H) -// to make simulation environment easy -#include "external_os_dep.h" -#else - -#ifndef __OS_DEP_H -#define __OS_DEP_H +#pragma once #include -#define ktime_t ULONGLONG -#define ktime_get() KeQueryPerformanceCounter(NULL).QuadPart - -#define likely(x) x -#define unlikely(x) x - #define ENOSPC 1 -#define BUG_ON(a) ASSERT(!(a)) -#define WARN_ON(a) -#define BUG() ASSERT(0) #if !defined(__cplusplus) && !defined(bool) // Important note: in MSFT C++ bool length is 1 bytes @@ -43,16 +28,4 @@ #endif #define inline __forceinline - -#ifdef DBG -#define DEBUG -#endif - -#define mb() KeMemoryBarrier() -#define rmb() KeMemoryBarrier() -#define wmb() KeMemoryBarrier() - #define SMP_CACHE_BYTES 64 - -#endif -#endif