openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

Reduce diffs with upstreams. No functional change.

Browse Source
This commit is contained in:
matthieu
2014-09-24 06:36:07 +00:00
parent 9cd0504ba3
commit 8b73a0ce20
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
driver/xf86-video-geode/src/geode_msr.c
View File

@@ -1,12 +1,3 @@
#define _LARGEFILE64_SOURCE
#include <sys/types.h>
#include <sys/ioctl.h>
#ifdef __OpenBSD__
#include <machine/amdmsr.h>
#endif
#include <errno.h>
/*
* Copyright (c) 2008 Advanced Micro Devices, Inc.
*
@@ -39,6 +30,14 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <errno.h>
#ifdef __OpenBSD__
#include <sys/ioctl.h>
#include <machine/amdmsr.h>
#endif
#include "os.h"
#include "geode.h"
@@ -74,10 +73,8 @@ GeodeReadMSR(unsigned long addr, unsigned long *lo, unsigned long *hi)
{
#ifdef __OpenBSD__
struct amdmsr_req req;
#endif
int fd = _msr_open();
#ifdef __OpenBSD__
req.addr = addr;
if (ioctl(fd, RDMSR, &req) == -1)
@@ -115,10 +112,8 @@ GeodeWriteMSR(unsigned long addr, unsigned long lo, unsigned long hi)
{
#ifdef __OpenBSD__
struct amdmsr_req req;
#endif
int fd = _msr_open();
#ifdef __OpenBSD__
req.addr = addr;
req.val = (u_int64_t) hi << 32 | (u_int64_t)lo;