From 91f828411617247abde3f0ace64389bb2050f794 Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Sun, 13 Feb 2022 13:01:59 -0700 Subject: Unhook old mutex handles --- src/sys/core.c | 2 -- src/sys/schedule.c | 2 +- src/sys/timer.c | 10 ---------- 3 files changed, 1 insertion(+), 13 deletions(-) (limited to 'src/sys') diff --git a/src/sys/core.c b/src/sys/core.c index e987e8c..9803488 100644 --- a/src/sys/core.c +++ b/src/sys/core.c @@ -18,8 +18,6 @@ void sysinit(void) { // Initialize System Globals - exe_cnt_m.addr = &exe_cnt; - exe_cnt_m.pid = NULL_PID; stimeh = *(unsigned long*)SYS_TIMER_CHI; stimel = *(unsigned long*)SYS_TIMER_CLO; *(unsigned long*) SYS_TIMER_C0 = 60000000 + stimeh; // 60 second trigger diff --git a/src/sys/schedule.c b/src/sys/schedule.c index 5a45b53..5c7a546 100644 --- a/src/sys/schedule.c +++ b/src/sys/schedule.c @@ -34,7 +34,7 @@ void init_scheduler(void) } } // Initialize nextpid - nextpid = SCHED_PID + 1; + nextpid = FIRST_AVAIL_PID; } struct RStack get_stack(void) diff --git a/src/sys/timer.c b/src/sys/timer.c index 548bf1a..c8f9922 100644 --- a/src/sys/timer.c +++ b/src/sys/timer.c @@ -8,20 +8,10 @@ #include #include -void increase_counter(void) -{ - if (lock_mutex(&exe_cnt_m, SCHED_PID) == 0) { - unsigned long* counter = (unsigned long*)exe_cnt_m.addr; - *counter += 1; - release_mutex(&exe_cnt_m, SCHED_PID); - } -} - void c_timer(void) { // Reset the counter write_cntv_tval(cntfrq/CPS); - increase_counter(); status(); } -- cgit v1.2.1