/ - Diff - LCOM1920-T7G03.old1 - FEUP Project Manager

Revision 12

Added by Goncalo Alves about 5 years ago

All functions working, errors dealt with

     PROG=lab3
     # source code files to be compiled
     SRCS = lab3.c keyboard.c
     SRCS = lab3.c keyboard.c timer.c
     # additional compilation flags
     # "-Wall -Wextra -Werror -I . -std=c11 -Wno-unused-parameter" are already set

lab3/keyboard.c
24	24	uint8_t status_reg;
25	25
26	26	if(util_sys_inb(STATUS_REG,&status_reg)!=0){ //checks if there is an error
	27	printf("Error reading status register in the keyboard interruption\n");
27	28	return;
28	29	}
29	30	if(((status_reg & STAT_REG_OBF)==0) \|\|((status_reg&(STAT_REG_PAR\|STAT_REG_TIMEOUT))!=0)\|\| ((status_reg&STAT_REG_AUX)!=0)){ //checks if there is a parity or timeout error (mask -> 0xC0, bit 7 and 6 set), checks if output buffer is empty and checks if there is data coming from the mouse
	31	printf("Parity/Timeout error or output buffer is empty or data coming from the mouse\n");
30	32	return;
31	33	}
32		util_sys_inb(OUTPUT_BUF,&scan_code);
	34	if(util_sys_inb(OUTPUT_BUF,&scan_code)!=0){//checks if there is an error
	35	printf("Error reading output buffer in the keyboard interruption\n");
	36	return;
	37	}
33	38
34	39	}
35	40
36	41
37	42	int (kbc_subscribe_int)(uint8_t *bit_no) { //similar function to that of timer_subscribe_int
38	43	*bit_no = BIT(keyboard_id);
39		if(sys_irqsetpolicy(KEYBOARD_IRQ,(IRQ_REENABLE\|IRQ_EXCLUSIVE),&keyboard_id)==1){ //operation to subscribe int
	44	if(sys_irqsetpolicy(KEYBOARD_IRQ,(IRQ_REENABLE\|IRQ_EXCLUSIVE),&keyboard_id)==1){ //operation to subscribe int
40	45	printf("Error subscribing int\n");
41	46	return 1;
42	47	}
...	...
51	56	return 0;
52	57	}
53	58
54		int (enable_interrupt)()
	59	int (reenable_interrupt)()
55	60	{
56	61	uint8_t command;
57	62
...	...
61	66	}
62	67
63	68	if(util_sys_inb(OUTPUT_BUF, &command)!=0){
64		printf("Error reading output buffer\n");
	69	printf("Error reading output buffer in enable_interrupt\n");
65	70	return 1;
66	71	}
67	72

lab3/keyboard.h
48	48	*
49	49	* @return Return 0 upon success and non-zero otherwise
50	50	*/
51		int (enable_interrupt)();
	51	int (reenable_interrupt)();
52	52
53	53	#endif /_KEYBOARD_H /

     #include <lcom/lab3.h>
     #include <stdbool.h>
     #include <stdint.h>
     #include "timer.h"
     #include "keyboard.h"
-...
     extern uint8_t scan_code;
     extern uint32_t cnt;
     extern int count;
     int(kbd_test_scan)() {
       int r, ipc_status;
       uint8_t keyboard_irq, size, bytes[2]; //size of scancode can be 2 byte long
       message msg;
       bool make=false; //to check if code is make or break
       if(kbc_subscribe_int(&keyboard_irq)==1){
       if(kbc_subscribe_int(&keyboard_irq)!=0){    //check if subscription worked
         printf("Error subscribing int\n");
         return 1;
+      }
       while(scan_code!=ESC_BREAK){      //looping until scan_code is the breakcode of ESC key
       while(scan_code!=ESC_BREAK){            //looping until scan_code is the breakcode of ESC key
         if ((r = driver_receive(ANY, &msg, &ipc_status))==1){
           printf("driver_receive failed with: %d",r);
           continue;
+        }
         if (is_ipc_notify(ipc_status)){                             //received notification
         if (is_ipc_notify(ipc_status)){                                //received notification
           switch (_ENDPOINT_P(msg.m_source)){
             case HARDWARE:                                          //hardware interrupt notification
                     if (msg.m_notify.interrupts &keyboard_irq){          // subscribed interrupt
             case HARDWARE:                                             //hardware interrupt notification
                     if (msg.m_notify.interrupts &keyboard_irq){        // subscribed interrupt
                       kbc_ih();
                       bytes[0]=scan_code;
-...
+                      }
                       if (scan_code & MAKE_CODE){	//checks if code is make or break
                           make = false;	//break code
                           make = false;	          //is break code
+                        }
                       else {
                         make = true;  //make code
                         make = true;              //is make code
+                      }
                       if(kbd_print_scancode(make, size, bytes)!=0){ //prints the code
                       if(kbd_print_scancode(make, size, bytes)!=0){         //prints the code
                         printf("Error printing scan code\n");
                         return 1;
+                      }
+                          }
                    break;
             default:
                   break;                                            //no other notifications expected: do nothing
                   break;                             //no other notifications expected: do nothing
+            }
+        }
         else {                                                      //received a standard message, not a notification
         else {                                       //received a standard message, not a notification
           //no standard messages expected: do nothing
+        }
+      }
        if (kbc_unsubscribe_int() != 0) { // Check if subscription worked
        if (kbc_unsubscribe_int() != 0) {            //check if unsubscription worked
     		printf("Error unsubscribing int \n");
     		return 1;
+    	}
       if(kbd_print_no_sysinb(cnt)!=0){
       if(kbd_print_no_sysinb(cnt)!=0){                  //prints the number of sys calls
         printf("Error printing number of sys used\n");
         return 1;
+      }
-...
+    }
     int(kbd_test_poll)() {
       uint8_t status, size, bytes[2]; //size of scancode can be 2 byte long
       bool make=false; //to check if code is make or break
       while(scan_code!=ESC_BREAK){      //looping until scan_code is the breakcode of ESC key, can't do interruptions
       while(scan_code!=ESC_BREAK){      //looping until scan_code is the breakcode of ESC key, can't do                                     interruptions
         if(util_sys_inb(STATUS_REG, &status)!=0){     //checks the status register
           printf("Error reading status register\n");
           return 1;
+        }
     		if ((status & STAT_REG_OBF) && !(status & STAT_REG_AUX) && !(status & STAT_REG_PAR || status & STAT_REG_TIMEOUT)) {      //checks if there is no parity ot timeout error, if the output buffer is full and if there is mouse data
     		if ((status & STAT_REG_OBF) && !(status & STAT_REG_AUX) && !(status & STAT_REG_PAR || status & STAT_REG_TIMEOUT)) {      //checks if there is no parity ot timeout error, if the output buffer                             is full and if there is mouse data
     			if(util_sys_inb(OUTPUT_BUF, &scan_code)!=0){
     			if(util_sys_inb(OUTPUT_BUF, &scan_code)!=0){  //reads output buffer
             printf("Error reading output buffer\n");
           return 1;
+          }
-...
+    		}
+      }
       if(kbd_print_no_sysinb(cnt)!=0){
       if(kbd_print_no_sysinb(cnt)!=0){                      //prints the number of sys calls
         printf("Error printing number of sys used\n");
         return 1;
+      }
       if(enable_interrupt()!=0){
         printf("Coulnd re-enable the interruptions\n");
       if(reenable_interrupt()!=0){                          //re-enables interruptions
         printf("Couldn't re-enable the interruptions\n");
         return 1;
+      }
-...
        return 0;
+    }
     int(kbd_test_timed_scan)(uint8_t n) {
       /* To be completed by the students */
       printf("%s is not yet implemented!\n", __func__);
       return 1;
     int(kbd_test_timed_scan)(uint8_t n) { //similar function to that of test_time_scan but with timer interruptions
       if(n<0){                    //checks if n is a valid input
         printf("Invalid time\n");
         return 1;
+      }
       int r, ipc_status;
       uint8_t keyboard_irq, size, bytes[2], timer_irq;  //size of scancode can be 2 byte long
       message msg;
       bool make=false;                                  //to check if code is make or break
       if(timer_subscribe_int(&timer_irq)!=0){
         printf("Error subscribing int (timer)\n");
         return 1;
+      }
       if(kbc_subscribe_int(&keyboard_irq)!=0){
         printf("Error subscribing int (keyboard)\n");
         return 1;
+      }
       while((scan_code!=ESC_BREAK)&&(count/sys_hz()<n)){      //looping until scan_code is the breakcode of ESC key or until a command is issued within the time interval
         if ((r = driver_receive(ANY, &msg, &ipc_status))==1){
           printf("driver_receive failed with: %d",r);
           continue;
+        }
         if (is_ipc_notify(ipc_status)){                             //received notification
           switch (_ENDPOINT_P(msg.m_source)){
             case HARDWARE:                                          //hardware interrupt notification
                     if (msg.m_notify.interrupts &keyboard_irq){     // subscribed interrupt (keyboard)
                       kbc_ih();
                       bytes[0]=scan_code;
                       bytes[1]=scan_code;
                       if(bytes[0]==TWO_BYTE_SCANCODE){
                         size=2;
+                      }
                       else{
                         size=1;
+                      }
                       if (scan_code & MAKE_CODE){	//checks if code is make or break
                           make = false;	//break code
+                        }
                       else {
                         make = true;  //make code
+                      }
                       if(kbd_print_scancode(make, size, bytes)!=0){  //prints the code
                         printf("Error printing scan code\n");
                         return 1;
+                      }
                       count=0;                                      //resets counter, since a keyboard                                                  interruption has ocurred
+                    }
                     else if (msg.m_notify.interrupts &timer_irq) {  // subscribed interrupt (timer)
                       timer_int_handler();              //if a timer interruption occurs increment timer
+    				        }
                    break;
             default:
                   break;                                     //no other notifications expected: do nothing
+            }
+        }
         else {                                         //received a standard message, not a notification
           //no standard messages expected: do nothing
+        }
+      }
        if (kbc_unsubscribe_int() != 0) {        //check if unsubscription worked
     		printf("Error unsubscribing int \n");
     		return 1;
+    	}
       if(timer_unsubscribe_int()!=0){           //check if unsubscription worked
         printf("Error unsubscribing int\n");
         return 1;
+      }
       if(kbd_print_no_sysinb(cnt)!=0){                  //prints the number of sys calls
         printf("Error printing number of sys used\n");
         return 1;
+      }
       cnt=0;
       scan_code=0;
       return 0;
+    }

Also available in: Unified diff

Project

General

Profile

LCOM1920-T7G03.old1

Revision 12