diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-17 14:54:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-17 14:54:33 +0000 |
| commit | 707304aa147cefc675651c84c93c78f48fb487ee (patch) | |
| tree | e8579099cf17135e7b91004e410b9c1366e98680 /usr.bin/pctr/pctrvar.h | |
| parent | 3a4010fc1c0222c78909065b86bc4afb348fb7d5 (diff) | |
more unification between amd64 and i386 (API changes, but we think
noone else uses this acpi except the command); from Mike Belopuhov
Diffstat (limited to 'usr.bin/pctr/pctrvar.h')
| -rw-r--r-- | usr.bin/pctr/pctrvar.h | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/usr.bin/pctr/pctrvar.h b/usr.bin/pctr/pctrvar.h index c10955ef15f..ce1e46bf305 100644 --- a/usr.bin/pctr/pctrvar.h +++ b/usr.bin/pctr/pctrvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pctrvar.h,v 1.1 2007/10/17 02:30:23 deraadt Exp $ */ +/* $OpenBSD: pctrvar.h,v 1.2 2007/10/17 14:54:30 deraadt Exp $ */ /* * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev @@ -51,27 +51,15 @@ #define CFL_ED 0x10 /* Edge detect is needed */ /* Pentium defines */ -#define PCTR_P5_K 0x040 -#define PCTR_P5_U 0x080 -#define PCTR_P5_C 0x100 - -/* AMD & Intel shared defines */ -#define PCTR_X86_U 0x010000 -#define PCTR_X86_K 0x020000 -#define PCTR_X86_E 0x040000 -#define PCTR_X86_EN 0x400000 -#define PCTR_X86_I 0x800000 -#define PCTR_X86_UM_M 0x0800 -#define PCTR_X86_UM_E 0x0400 -#define PCTR_X86_UM_S 0x0200 -#define PCTR_X86_UM_I 0x0100 -#define PCTR_X86_UM_MESI (PCTR_X86_UM_M | PCTR_X86_UM_E | \ - PCTR_X86_UM_S | PCTR_X86_UM_I) -#define PCTR_X86_UM_A 0x2000 - -#define PCTR_X86_UM_SHIFT 8 -#define PCTR_X86_CM_SHIFT 24 - +#ifndef P5CTR_K +#define P5CTR_K 0x040 +#endif +#ifndef P5CTR_U +#define P5CTR_U 0x080 +#endif +#ifndef P5CTR_C +#define P5CTR_C 0x100 +#endif struct ctrfn { u_int32_t fn; |