X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mart%2Fex10%2Fex10dmaster.c;h=78ffc7b084180c9e31e71eff18e6a54e71708e1b;hb=b0bd8f724348ba4ec1adb341bc37ab556d7abb10;hp=bf4551a77b92c3f0b2979926901b5e3fc6361090;hpb=9fa12b6daf2e28a74141eea4b1e3c96feca23355;p=des2015.git

diff --git a/mart/ex10/ex10dmaster.c b/mart/ex10/ex10dmaster.c
index bf4551a..78ffc7b 100644
--- a/mart/ex10/ex10dmaster.c
+++ b/mart/ex10/ex10dmaster.c
@@ -16,20 +16,19 @@
 RT_TASK task;
 RTIME times[SAMPLES];
 
-void lpt1_handler(void *arg)
+void taskf(void *arg)
 {
 	RT_INTR intr;
-	rt_intr_create(&intr, "lpt1 handler", LPT1IRQ, 0);
+	rt_intr_create(&intr, "lpt1 handler", LPT1IRQ, I_PROPAGATE);
 	rt_task_set_periodic(NULL, TM_NOW, 1e5);
 
 	unsigned int i;
 	for(i = 0; i<SAMPLES; i++){
 		times[i] = rt_timer_read();	
-        outb(inb(0x37A) & 0xEF, 0x37A);
-        outb(inb(0x37A) | 0x01, 0x37A);
-        // Signal other machine
-        rt_intr_wait(&intr, TM_INFINITE);
-        times[i] = rt_timer_read()-times[i];
+		outb(inb(0x378) & 0xFE, 0x378);
+		outb(inb(0x378) | 0x01, 0x378);
+		rt_intr_wait(&intr, TM_INFINITE);
+		times[i] = rt_timer_read()-times[i];
 		rt_task_wait_period(NULL);
 	}
 
@@ -39,6 +38,7 @@ void lpt1_handler(void *arg)
 		fprintf(file, "%u,%llu\n", i, times[i]);
 	}
 	fclose(file);
+    rt_printf("Done, you can press CRTL+C now\n");
 }
 
 int main(int argc, char* argv[])
@@ -46,11 +46,14 @@ int main(int argc, char* argv[])
 	rt_print_auto_init(1);
 	mlockall(MCL_CURRENT | MCL_FUTURE);
 
-    ioperm(0x37A, 1, 1);
-    outb(inb(0x37A) | 0x01, 0x37A);
+	ioperm(0x37A, 1, 1);
+	outb(inb(0x37A) | 0x10, 0x37A);
+	ioperm(0x378, 1, 1);
+	outb(inb(0x378) | 0x01, 0x378);
 
 	rt_task_create(&task, "task", 0, 50, 0);
-	rt_task_start(&task, &lpt1_handler, 0);
+	rt_task_start(&task, &taskf, 0);
 
-    sleep(5);
+    pause();
+    outb(inb(0x37A) & 0xEF, 0x37A);
 }