Changeset f954906 in mainline

Timestamp:

2009-06-30T15:32:46Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

82346c50

Parents:

c063d96e

Message:

avoid compiler warnings and one small bug

Location:

uspace/srv/kbd

Files:

• ctl/pc.c (modified) (2 diffs)
• genarch/gsp.c (modified) (2 diffs)
• layout/cz.c (modified) (1 diff)
• port/i8042.c (modified) (1 diff)

uspace/srv/kbd/ctl/pc.c

@@ -208 +208 @@
                 map_length = sizeof(scanmap_e0) / sizeof(int);
                 break;
+        default:
+                map = NULL;
+                map_length = 0;
         }
 
@@ -219 +222 @@
         }
 
-        if (scancode < 0 || scancode >= map_length)
+        if ((scancode < 0) || ((size_t) scancode >= map_length))
                 return;
 

uspace/srv/kbd/genarch/gsp.c

@@ -245 +245 @@
         key[1] = t->input;
 
-        hash_table_insert(&p->trans, &key, &t->link);
+        hash_table_insert(&p->trans, key, &t->link);
 }
 
@@ -277 +277 @@
 
         t = hash_table_get_instance(item, gsp_trans_t, link);
-        return (key[0] == t->old_state && key[1] == t->input);
+        return ((key[0] == (unsigned long) t->old_state)
+            && (key[1] == (unsigned long) t->input));
 }
 

uspace/srv/kbd/layout/cz.c

@@ -400 +400 @@
                 return parse_ms_carka(ev);
         }
+        
+        return 0;
 }
 

uspace/srv/kbd/port/i8042.c

@@ -136 +136 @@
         
         /* Enable kbd */
-        i8042_kbd.cmds[0].addr = &((i8042_t *) i8042_kernel)->status;
-        i8042_kbd.cmds[3].addr = &((i8042_t *) i8042_kernel)->data;
+        i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
+        i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
         ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);