mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-04 23:35:18 +02:00
hwaccess_x86_msr: rename msr function to msr_xxx
This eliminates the need to redefine the rdmsr and wrmsr symbols, resulting in more understandable code. The common prefix clarify the relation between the functions. Change-Id: Ie5ad54d198312578e0a1ee719eec67b37d2bf6a4 Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/62851 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:

committed by
Nico Huber

parent
82604bd738
commit
4bd41e6bb5
@ -18,35 +18,11 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__)
|
||||
typedef struct { uint32_t hi, lo; } msr_t;
|
||||
msr_t rdmsr(int addr);
|
||||
int wrmsr(int addr, msr_t msr);
|
||||
#endif
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
||||
/* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */
|
||||
#undef rdmsr
|
||||
#undef wrmsr
|
||||
#define rdmsr freebsd_rdmsr
|
||||
#define wrmsr freebsd_wrmsr
|
||||
typedef struct { uint32_t hi, lo; } msr_t;
|
||||
msr_t freebsd_rdmsr(int addr);
|
||||
int freebsd_wrmsr(int addr, msr_t msr);
|
||||
#endif
|
||||
|
||||
#if defined(__LIBPAYLOAD__)
|
||||
#include <arch/io.h>
|
||||
#include <arch/msr.h>
|
||||
typedef struct { uint32_t hi, lo; } msr_t;
|
||||
msr_t libpayload_rdmsr(int addr);
|
||||
int libpayload_wrmsr(int addr, msr_t msr);
|
||||
#undef rdmsr
|
||||
#define rdmsr libpayload_rdmsr
|
||||
#define wrmsr libpayload_wrmsr
|
||||
#endif
|
||||
|
||||
int setup_cpu_msr(int cpu);
|
||||
void cleanup_cpu_msr(void);
|
||||
msr_t msr_read(int addr);
|
||||
int msr_write(int addr, msr_t msr);
|
||||
int msr_setup(int cpu);
|
||||
void msr_cleanup(void);
|
||||
|
||||
#endif /* __HWACCESS_X86_MSR_H__ */
|
Reference in New Issue
Block a user