From 165db546bff6c11c43debb58843aac6817344689 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 5 Jul 2008 20:45:17 +0000 Subject: [PATCH] should've been part of the previous commit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26266 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/arch/x86/arch_hpet.h | 49 --------------------- 1 file changed, 49 deletions(-) delete mode 100644 headers/private/kernel/arch/x86/arch_hpet.h diff --git a/headers/private/kernel/arch/x86/arch_hpet.h b/headers/private/kernel/arch/x86/arch_hpet.h deleted file mode 100644 index e9dd692aa1..0000000000 --- a/headers/private/kernel/arch/x86/arch_hpet.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2008, Dustin Howett, dustin.howett@gmail.com. All rights reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _KERNEL_ARCH_x86_HPET_H -#define _KERNEL_ARCH_x86_HPET_H - -#include - -/* All masks are 64 bits wide to represent bit locations; - the HPET registers are 64 bits wide. */ - -/* Global Capability Register Masks */ -#define HPET_CAP_MASK_ID 0x00000000000000FF -#define HPET_CAP_MASK_NUMTIMERS 0x0000000000001F00 -#define HPET_CAP_MASK_WIDTH 0x0000000000002000 -#define HPET_CAP_MASK_LEGACY 0x0000000000008000 -#define HPET_CAP_MASK_VENDOR_ID 0x00000000FFFF0000 -#define HPET_CAP_MASK_PERIOD 0xFFFFFFFF00000000 - -/* Retrieve Global Capabilities */ -#define HPET_GET_ID(regs) ((regs)->caps & HPET_CAP_MASK_ID) -#define HPET_GET_NUM_TIMERS(regs) (((regs)->caps & HPET_CAP_MASK_NUMTIMERS) >> 8) -#define HPET_IS_64BIT_CAPABLE(regs) (((regs)->caps & HPET_CAP_MASK_WIDTH) >> 13) -#define HPET_IS_LEGACY_CAPABLE(regs) (((regs)->caps & HPET_CAP_MASK_LEGACY) >> 15) -#define HPET_GET_VENDOR_ID(regs) (((regs)->caps & HPET_CAP_MASK_VENDOR_ID) >> 16) -#define HPET_GET_PERIOD(regs) (((regs)->caps & HPET_CAP_MASK_PERIOD) >> 32) - -struct hpet_timer { - uint64 config; /* Timer configuration and capabilities */ - uint64 comparator; /* Comparator value */ - uint64 introute; /* FSB Interrupt Routing */ - uint64 reserved; -}; - - -struct hpet_regs { - uint64 caps; /* HPET Capabilities and ID */ - uint64 reserved1; - uint64 config; /* General Configuration */ - uint64 reserved2; - uint64 intstatus; /* General Interrupt Status */ - uint8 reserved3[200]; - uint64 mainvalue; /* Main Counter Value */ - uint64 reserved4; - struct hpet_timer timers[1]; /* Timers */ -}; - -#endif