From d4dbe1415f4ac380379e8ce77380fe603eefa47c Mon Sep 17 00:00:00 2001
From: Divyam Khandelwal <divyam@Divyams-MacBook-Pro.local>
Date: Sat, 28 Apr 2018 23:50:02 -0500
Subject: [PATCH] RTC Update
---
student-distrib/rtc.c | 17 ++++++-----------
student-distrib/rtc.h | 2 +-
student-distrib/syscall.h | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/student-distrib/rtc.c b/student-distrib/rtc.c
index 964ed89..08f0457 100644
--- a/student-distrib/rtc.c
+++ b/student-distrib/rtc.c
@@ -1,13 +1,13 @@
#include "rtc.h"
/* Set interrupt flag */
-interrupt_flag = 1;
+//interrupt_flag = 1;
/* For virtualisation */
-rtc_active[MAX_TERMINAL] = {0,0,0};
-rtc_flag[MAX_TERMINAL] = {1,1,1};
-rtc_counter[MAX_TERMINAL] = {0,0,0};
-rtc_init_counter[MAX_TERMINAL] = {0,0,0};
+int rtc_active[MAX_TERMINAL] = {0,0,0};
+int rtc_flag[MAX_TERMINAL] = {1,1,1};
+int rtc_counter[MAX_TERMINAL] = {0,0,0};
+int rtc_init_counter[MAX_TERMINAL] = {0,0,0};
/* rtc_init()
* Inputs: void
@@ -104,12 +104,7 @@ int32_t rtc_read(int32_t fd, void* buf, int32_t nbytes)
*/
int32_t rtc_write(int32_t fd, const void* buf, int32_t nbytes)
{
- int32_t freq, temp_freq;
- int valid_freq;
- int i;
- uint8_t rate, prev;
-
- uint8_t bit_mask = 0x01;
+ int32_t freq, valid_freq;
/* Check for null pointer */
if (buf == NULL)
diff --git a/student-distrib/rtc.h b/student-distrib/rtc.h
index 1fc3020..b67dbfc 100644
--- a/student-distrib/rtc.h
+++ b/student-distrib/rtc.h
@@ -29,7 +29,7 @@
#define REGISTER_C 0x0C
/* Interrupt flag for read() */
-extern int interrupt_flag;
+// extern int interrupt_flag;
/* Global Variables for Virtualization */
extern int rtc_active[MAX_TERMINAL];
diff --git a/student-distrib/syscall.h b/student-distrib/syscall.h
index 2062696..fc157f1 100644
--- a/student-distrib/syscall.h
+++ b/student-distrib/syscall.h
@@ -37,7 +37,7 @@ extern int32_t sigreturn (void);
//from paging.h
void flush_tlb(void);
void remap_program(uint32_t pid);
-//uint8_t* remap_vidmem(uint32_t pid);
+extern void remap_vidmem();
//from proc.h
int32_t parse_cmd(const uint8_t* command, uint8_t* cmd, uint8_t (*argv)[MAX_ARGUMENT_SIZE]); /* Function for parsing commands */
--
GitLab