Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Small patch to allow build on OS X #2

Open
jimmoores wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Small patch to allow build on OS X #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55953cd
Added MacOS X timer support via __MACH__ section.
jimmoores Jul 25, 2017
e7bd210
Removed commented out sections where we switched from ioctl(0, TCGETS…
jimmoores Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions v68.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
#include <string.h>
#include <time.h>
#include <sys/time.h>
#ifdef __MACH__
#include <mach/clock_types.h>
#include <mach/clock.h>
#include <mach/mach.h>
#endif
#include <sys/select.h>
#include <signal.h>
#include <termios.h>
Expand Down Expand Up @@ -425,7 +430,17 @@ static struct timespec last_time;

static void device_init(void)
{
#ifdef __MACH__
clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock);
last_time.tv_sec = mts.tv_sec;
last_time.tv_nsec = mts.tv_nsec;
#else
clock_gettime(CLOCK_MONOTONIC, &last_time);
#endif
irq_pending = 0;
if (mmu_type == 1)
mmu_mask = 0xFFFFFFFF;
Expand All @@ -440,7 +455,17 @@ static void device_update(void)
{
struct timespec tv, tmp;
unsigned long n;
#ifdef __MACH__
clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock);
tv.tv_sec = mts.tv_sec;
tv.tv_nsec = mts.tv_nsec;
#else
clock_gettime(CLOCK_MONOTONIC, &tv);
#endif
tmp.tv_sec = tv.tv_sec - last_time.tv_sec;
tmp.tv_nsec = tv.tv_nsec - last_time.tv_nsec;
/* Difference in hundredths */
Expand All @@ -456,13 +481,14 @@ static struct termios saved_term, term;

static void cleanup(int sig)
{
ioctl(0, TCSETS, &saved_term);
tcsetattr(0, 0, &saved_term);

exit(1);
}

static void exit_cleanup(void)
{
ioctl(0, TCSETS, &saved_term);
tcsetattr(0, 0, &saved_term);
}


Expand All @@ -484,7 +510,7 @@ int main(int argc, char* argv[])
{
int fd;

if (ioctl(0, TCGETS, &term) == 0) {
if (tcgetattr(0, &term) == 0) {
saved_term = term;
atexit(exit_cleanup);
signal(SIGINT, cleanup);
Expand All @@ -495,7 +521,7 @@ int main(int argc, char* argv[])
term.c_cc[VINTR] = 0;
term.c_cc[VEOF] = 0;
term.c_lflag &= ~(ECHO|ECHOE|ECHOK);
ioctl(0, TCSETS, &term);
tcsetattr(0, 0, &term);
}

if (argc >= 2 && strcmp(argv[1], "-p") == 0) {
Expand Down