OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Add -clock option, by Luca Tettamanti.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3126 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-08-19 22:09:40 +00:00
parent c89940133c
commit c40ec5a966
1 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
vl.c
View File

@ -56,6 +56,7 @@
#include <pty.h> #include <pty.h>
#include <malloc.h> #include <malloc.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/hpet.h>
#include <linux/ppdev.h> #include <linux/ppdev.h>
#include <linux/parport.h> #include <linux/parport.h>
#else #else
@ -809,6 +810,9 @@ static void unix_stop_timer(struct qemu_alarm_timer *t);
#ifdef __linux__ #ifdef __linux__
static int hpet_start_timer(struct qemu_alarm_timer *t);
static void hpet_stop_timer(struct qemu_alarm_timer *t);
static int rtc_start_timer(struct qemu_alarm_timer *t); static int rtc_start_timer(struct qemu_alarm_timer *t);
static void rtc_stop_timer(struct qemu_alarm_timer *t); static void rtc_stop_timer(struct qemu_alarm_timer *t);
@ -818,7 +822,9 @@ static void rtc_stop_timer(struct qemu_alarm_timer *t);
static struct qemu_alarm_timer alarm_timers[] = { static struct qemu_alarm_timer alarm_timers[] = {
#ifdef __linux__ #ifdef __linux__
/* RTC - if available - is preferred */ /* HPET - if available - is preferred */
{"hpet", hpet_start_timer, hpet_stop_timer, NULL},
/* ...otherwise try RTC */
{"rtc", rtc_start_timer, rtc_stop_timer, NULL}, {"rtc", rtc_start_timer, rtc_stop_timer, NULL},
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
@ -1088,6 +1094,55 @@ static void enable_sigio_timer(int fd)
fcntl(fd, F_SETOWN, getpid()); fcntl(fd, F_SETOWN, getpid());
} }
static int hpet_start_timer(struct qemu_alarm_timer *t)
{
struct hpet_info info;
int r, fd;
fd = open("/dev/hpet", O_RDONLY);
if (fd < 0)
return -1;
/* Set frequency */
r = ioctl(fd, HPET_IRQFREQ, RTC_FREQ);
if (r < 0) {
fprintf(stderr, "Could not configure '/dev/hpet' to have a 1024Hz timer. This is not a fatal\n"
"error, but for better emulation accuracy type:\n"
"'echo 1024 > /proc/sys/dev/hpet/max-user-freq' as root.\n");
goto fail;
}
/* Check capabilities */
r = ioctl(fd, HPET_INFO, &info);
if (r < 0)
goto fail;
/* Enable periodic mode */
r = ioctl(fd, HPET_EPI, 0);
if (info.hi_flags && (r < 0))
goto fail;
/* Enable interrupt */
r = ioctl(fd, HPET_IE_ON, 0);
if (r < 0)
goto fail;
enable_sigio_timer(fd);
t->priv = (void *)fd;
return 0;
fail:
close(fd);
return -1;
}
static void hpet_stop_timer(struct qemu_alarm_timer *t)
{
int fd = (int)t->priv;
close(fd);
}
static int rtc_start_timer(struct qemu_alarm_timer *t) static int rtc_start_timer(struct qemu_alarm_timer *t)
{ {
int rtc_fd; int rtc_fd;